From e3259fb30df7e1f554d693127cf0cbce59a67d4d Mon Sep 17 00:00:00 2001 From: Katja Luther Date: Tue, 14 Apr 2015 11:52:46 +0000 Subject: [PATCH 1/1] --- eu.etaxonomy.taxeditor.application/.classpath | 18 +- .../ApplicationWorkbenchAdvisor.java | 2 +- eu.etaxonomy.taxeditor.bulkeditor/.classpath | 16 +- eu.etaxonomy.taxeditor.cdmlib/.classpath | 438 +++++++++--------- .../META-INF/MANIFEST.MF | 1 + eu.etaxonomy.taxeditor.editor/.classpath | 18 +- .../OSGI-INF/l10n/plugin.properties | 7 +- .../OSGI-INF/l10n/plugin_de.properties | 6 +- .../OSGI-INF/l10n/plugin_en.properties | 2 + eu.etaxonomy.taxeditor.editor/plugin.xml | 16 + .../editor/MultiPageTaxonEditor.java | 5 +- .../name/dnd/NameEditorDragSourceEffect.java | 4 +- .../dnd/NameEditorDropTargetListener.java | 6 +- .../handler/NameEditorMenuPropertyTester.java | 4 + ...ynonymToAnotherAcceptedTaxonOperation.java | 10 +- eu.etaxonomy.taxeditor.help/.classpath | 14 +- eu.etaxonomy.taxeditor.navigation/.classpath | 18 +- .../.classpath | 16 +- eu.etaxonomy.taxeditor.store/.classpath | 20 +- eu.etaxonomy.taxeditor.store/plugin.xml | 6 + eu.etaxonomy.taxeditor.test/.classpath | 16 +- eu.etaxonomy.taxeditor/.classpath | 24 +- 22 files changed, 357 insertions(+), 310 deletions(-) diff --git a/eu.etaxonomy.taxeditor.application/.classpath b/eu.etaxonomy.taxeditor.application/.classpath index 50dd3a50b..bfb7a7aeb 100644 --- a/eu.etaxonomy.taxeditor.application/.classpath +++ b/eu.etaxonomy.taxeditor.application/.classpath @@ -1,9 +1,9 @@ - - - - - - - - - + + + + + + + + + diff --git a/eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/ApplicationWorkbenchAdvisor.java b/eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/ApplicationWorkbenchAdvisor.java index cf565a622..414b2f47f 100644 --- a/eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/ApplicationWorkbenchAdvisor.java +++ b/eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/ApplicationWorkbenchAdvisor.java @@ -104,7 +104,7 @@ public class ApplicationWorkbenchAdvisor extends WorkbenchAdvisor { // leading to a recursive infinite loop of : // initial exception thrown -> status handling -> dialog opening + logging of status -> // status handling -> dialog opening + logging of status ... and so on - if(t != null && t instanceof RuntimeException) { + if(t != null && t instanceof RuntimeException && !t.getMessage().equals("Widget is disposed")){ MessagingUtils.errorDialog("Unexpected error", null, MessagingUtils.UNEXPECTED_ERROR_MESSAGE, diff --git a/eu.etaxonomy.taxeditor.bulkeditor/.classpath b/eu.etaxonomy.taxeditor.bulkeditor/.classpath index 3bf936df7..5ff90b230 100644 --- a/eu.etaxonomy.taxeditor.bulkeditor/.classpath +++ b/eu.etaxonomy.taxeditor.bulkeditor/.classpath @@ -1,8 +1,8 @@ - - - - - - - - + + + + + + + + diff --git a/eu.etaxonomy.taxeditor.cdmlib/.classpath b/eu.etaxonomy.taxeditor.cdmlib/.classpath index 2673aef7c..e97e6629e 100644 --- a/eu.etaxonomy.taxeditor.cdmlib/.classpath +++ b/eu.etaxonomy.taxeditor.cdmlib/.classpath @@ -1,219 +1,219 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF index 25285cae4..14bdbdb63 100644 --- a/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF +++ b/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF @@ -57,6 +57,7 @@ Export-Package: com.google.api, eu.etaxonomy.cdm.io.common.events, eu.etaxonomy.cdm.io.common.mapping, eu.etaxonomy.cdm.io.common.mapping.out, + eu.etaxonomy.cdm.io.csv.caryophyllales.out, eu.etaxonomy.cdm.io.csv.redlist.demo, eu.etaxonomy.cdm.io.csv.redlist.out, eu.etaxonomy.cdm.io.dwca, diff --git a/eu.etaxonomy.taxeditor.editor/.classpath b/eu.etaxonomy.taxeditor.editor/.classpath index 856e9f909..1389dff1f 100644 --- a/eu.etaxonomy.taxeditor.editor/.classpath +++ b/eu.etaxonomy.taxeditor.editor/.classpath @@ -1,9 +1,9 @@ - - - - - - - - - + + + + + + + + + diff --git a/eu.etaxonomy.taxeditor.editor/OSGI-INF/l10n/plugin.properties b/eu.etaxonomy.taxeditor.editor/OSGI-INF/l10n/plugin.properties index 3a10fe5b0..be431014a 100644 --- a/eu.etaxonomy.taxeditor.editor/OSGI-INF/l10n/plugin.properties +++ b/eu.etaxonomy.taxeditor.editor/OSGI-INF/l10n/plugin.properties @@ -37,6 +37,7 @@ command.label.14 = Misapplication command.label.15 = Delete command.label.16 = Delete All Empty Names command.label.17 = Swap Synonym With Accepted + command.label.18 = Show Details command.label.19 = Save command.label.20 = New Node @@ -78,6 +79,7 @@ command.name.3 = Change To Synonym command.name.4 = Change To Accepted Taxon command.name.5 = Change To Misapplication command.name.6 = Swap Synonym With Accepted + command.name.7 = Set Basionym / Original Combination command.name.8 = Remove Basionym / Original Combination command.name.9 = Delete All Empty Names @@ -151,4 +153,7 @@ command.name.41 = Show Only Individual Associations command.name.42 = Open Taxon Editor command.name.43 = Create Field Unit command.name.44 = Deep Delete -command.name.45 = Fix Classification Hierarchy \ No newline at end of file +command.name.45 = Fix Classification Hierarchy + +command.name.46 = Move Synonym (Homotypical Group) To Another Accepted Taxon +command.label.56 = Move Synonym (Homotypical Group) To Another Accepted Taxon \ No newline at end of file diff --git a/eu.etaxonomy.taxeditor.editor/OSGI-INF/l10n/plugin_de.properties b/eu.etaxonomy.taxeditor.editor/OSGI-INF/l10n/plugin_de.properties index a0b500079..91f690a59 100644 --- a/eu.etaxonomy.taxeditor.editor/OSGI-INF/l10n/plugin_de.properties +++ b/eu.etaxonomy.taxeditor.editor/OSGI-INF/l10n/plugin_de.properties @@ -78,6 +78,7 @@ command.name.3 = \u00c4ndere zu Synonym command.name.4 = \u00c4ndere zu akzeptiertem Taxon command.name.5 = \u00c4ndere zu Misapplication command.name.6 = Tausche Synonym mit Akzeptiertem Namen + command.name.7 = Setze Basionym / Originalkombination command.name.8 = Entferne Basionym / Originalkombination command.name.9 = L\u00f6sche alle leeren Namen @@ -150,4 +151,7 @@ command.name.41 = Nur Individuals Associations anzeigen command.name.42 = \u00d6ffne Taxon Editor command.name.43 = Neue Field Unit command.name.44 = L\u00f6schen (mit Kindern) -command.name.45 = Erzeuge Taxon-Hierarchie \ No newline at end of file +command.name.45 = Erzeuge Taxon-Hierarchie + +command.name.46 = Verschiebe Synonym(Homotypische Gruppe) zu neuem Akzeptierten Taxon +command.label.56 = Verschiebe Synonym(Homotypische Gruppe) zu neuem Akzeptierten Taxon \ No newline at end of file diff --git a/eu.etaxonomy.taxeditor.editor/OSGI-INF/l10n/plugin_en.properties b/eu.etaxonomy.taxeditor.editor/OSGI-INF/l10n/plugin_en.properties index 65d48bae5..e8b26fb2d 100644 --- a/eu.etaxonomy.taxeditor.editor/OSGI-INF/l10n/plugin_en.properties +++ b/eu.etaxonomy.taxeditor.editor/OSGI-INF/l10n/plugin_en.properties @@ -37,6 +37,7 @@ command.label.14 = Misapplication command.label.15 = Delete command.label.16 = Delete All Empty Names command.label.17 = Swap Synonym With Accepted + command.label.18 = Show Details command.label.19 = Save command.label.20 = New Node @@ -78,6 +79,7 @@ command.name.3 = Change To Synonym command.name.4 = Change To Accepted Taxon command.name.5 = Change To Misapplication command.name.6 = Swap Synonym With Accepted + command.name.7 = Set Basionym / Original Combination command.name.8 = Remove Basionym / Original Combination command.name.9 = Delete All Empty Names diff --git a/eu.etaxonomy.taxeditor.editor/plugin.xml b/eu.etaxonomy.taxeditor.editor/plugin.xml index 7b5080db3..f815f7718 100644 --- a/eu.etaxonomy.taxeditor.editor/plugin.xml +++ b/eu.etaxonomy.taxeditor.editor/plugin.xml @@ -523,6 +523,16 @@ + + + + + + @@ -1178,6 +1188,12 @@ defaultHandler="eu.etaxonomy.taxeditor.editor.name.handler.SwapSynonymAndAcceptedHandler" id="eu.etaxonomy.taxeditor.editor.name.swapSynonymAndAccepted" name="%command.name.6"> + + propertyPaths = new ArrayList(); propertyPaths.add("synonymRelations"); - this.element = (Taxon) CdmStore.getService(ITaxonService.class).load(taxon.getUuid(),propertyPaths); + this.element = (Taxon) CdmStore.getService(ITaxonService.class).load(taxon.getUuid(), propertyPaths); this.oldTaxon = (Taxon) CdmStore.getService(ITaxonService.class).load(oldTaxonUUID); - this.synonym = (Synonym) CdmStore.getService(ITaxonService.class).load(synonymUUID); + this.synonym = (Synonym) CdmStore.getService(ITaxonService.class).load(synonymUUID, propertyPaths); if(synonym == null){ throw new IllegalArgumentException( "A null synonym was provided."); @@ -85,8 +87,8 @@ public class MoveSynonymToAnotherAcceptedTaxonOperation extends try { synRel = CdmStore.getService(ITaxonService.class).moveSynonymToAnotherTaxon(synRel, this.element, true, synRel.getType(), null, null, true); } catch (HomotypicalGroupChangeException e) { - // TODO Auto-generated catch block - e.printStackTrace(); + MessagingUtils.warningDialog("Operation cancelled", getClass(), e.getMessage()); + return postExecute(null); } ((TaxonNameEditor)EditorUtil.getActiveMultiPageTaxonEditor().getActiveEditor()).getConversationHolder().commit(); diff --git a/eu.etaxonomy.taxeditor.help/.classpath b/eu.etaxonomy.taxeditor.help/.classpath index 334e33eea..46c533388 100644 --- a/eu.etaxonomy.taxeditor.help/.classpath +++ b/eu.etaxonomy.taxeditor.help/.classpath @@ -1,7 +1,7 @@ - - - - - - - + + + + + + + diff --git a/eu.etaxonomy.taxeditor.navigation/.classpath b/eu.etaxonomy.taxeditor.navigation/.classpath index a44d92420..5676d8def 100644 --- a/eu.etaxonomy.taxeditor.navigation/.classpath +++ b/eu.etaxonomy.taxeditor.navigation/.classpath @@ -1,9 +1,9 @@ - - - - - - - - - + + + + + + + + + diff --git a/eu.etaxonomy.taxeditor.printpublisher/.classpath b/eu.etaxonomy.taxeditor.printpublisher/.classpath index 6b50c26a8..32c94a0aa 100644 --- a/eu.etaxonomy.taxeditor.printpublisher/.classpath +++ b/eu.etaxonomy.taxeditor.printpublisher/.classpath @@ -1,8 +1,8 @@ - - - - - - - - + + + + + + + + diff --git a/eu.etaxonomy.taxeditor.store/.classpath b/eu.etaxonomy.taxeditor.store/.classpath index ee4c1eaf5..acbc97488 100644 --- a/eu.etaxonomy.taxeditor.store/.classpath +++ b/eu.etaxonomy.taxeditor.store/.classpath @@ -1,10 +1,10 @@ - - - - - - - - - - + + + + + + + + + + diff --git a/eu.etaxonomy.taxeditor.store/plugin.xml b/eu.etaxonomy.taxeditor.store/plugin.xml index 231e2bb63..4b45281d3 100644 --- a/eu.etaxonomy.taxeditor.store/plugin.xml +++ b/eu.etaxonomy.taxeditor.store/plugin.xml @@ -777,6 +777,12 @@ id="eu.etaxonomy.taxeditor.io.export.csv" name="CSV"> + + diff --git a/eu.etaxonomy.taxeditor.test/.classpath b/eu.etaxonomy.taxeditor.test/.classpath index 12d3a7cdd..4deb39a8f 100644 --- a/eu.etaxonomy.taxeditor.test/.classpath +++ b/eu.etaxonomy.taxeditor.test/.classpath @@ -1,8 +1,8 @@ - - - - - - - - + + + + + + + + diff --git a/eu.etaxonomy.taxeditor/.classpath b/eu.etaxonomy.taxeditor/.classpath index 7c95b583f..3446faf90 100644 --- a/eu.etaxonomy.taxeditor/.classpath +++ b/eu.etaxonomy.taxeditor/.classpath @@ -1,12 +1,12 @@ - - - - - - - - - - - - + + + + + + + + + + + + -- 2.34.1