Fix Ticket #4729

diff --git a/.gitattributes b/.gitattributes
index 894042fa6a6e2374491a8e4ff71f2a04bf1472da..5c28b56af0a3f9984fd1c5398e9b1052a74b9661 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -391,7 +391,6 @@ eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/group/
 eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/group/authority/CdmAuthorityEditorInput.java -text
 eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/group/authority/handler/EditCdmAuthoritiesHandler.java -text
 eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/EditNewTaxonHandler.java -text
-eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/FixClassificationHierarchyHandler.java -text
 eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/OpenChecklistEditorHandler.java -text
 eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/OpenDerivateViewHandler.java -text
 eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/OpenParentHandler.java -text
@@ -981,6 +980,7 @@ eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigatio
 eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/handler/CopyHandler.java -text
 eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/handler/DeleteHandler.java -text
 eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/handler/EditHandler.java -text
+eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/handler/FixClassificationHierarchyHandler.java -text
 eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/handler/MoveFactualDataHandler.java -text
 eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/handler/MoveTaxonHandler.java -text
 eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/handler/NewClassificationHandler.java -text

diff --git a/eu.etaxonomy.taxeditor.editor/OSGI-INF/l10n/plugin.properties b/eu.etaxonomy.taxeditor.editor/OSGI-INF/l10n/plugin.properties
index 9065d1203eb318beb6ca42406752d87559820960..7e5c3e34245e6a391124fb18dfd90ef0895a903c 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/OSGI-INF/l10n/plugin.properties
+++ b/eu.etaxonomy.taxeditor.editor/OSGI-INF/l10n/plugin.properties
@@ -152,6 +152,5 @@ command.name.41 = Show Only Individual Associations
 command.name.42 = Open Taxon Editor\r
 command.name.43 = Create Field Unit\r
 command.name.44 = Deep Delete\r
-command.name.45 = Fix Classification Hierarchy\r
 command.name.46 = Move Synonym (Homotypical Group) to another Accepted Taxon\r
 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 3bb28d9bea437a3ad21ab840366572a509fe6f50..e46102db4785b68872e5256e712aa934eb8c6183 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/OSGI-INF/l10n/plugin_de.properties
+++ b/eu.etaxonomy.taxeditor.editor/OSGI-INF/l10n/plugin_de.properties
@@ -139,19 +139,18 @@ marker.field.2 = Attribut
 marker.field.3 = Problematischer Wert
 marker.field.4 = Problembeschreibung
 marker.field.5 = Validierer
-marker.field.6 = Entitätsklasse
-marker.field.7 = Entitäts ID
+marker.field.6 = Entit�tsklasse
+marker.field.7 = Entit�ts ID
 extension.name.0 = Validierungs-Fehler
 command.label.51 = \u00d6ffne Specimen-Editor
 command.label.52 = L\u00f6schen
 command.label.53 = Neue Field Unit
 command.label.54 = L\u00f6schen (mit Kindern)
 command.tooltip = Nur Individuals Associations anzeigen
-command.label.55 = \u00d6ffne zugehörige Specimens
+command.label.55 = \u00d6ffne zugeh�rige Specimens
 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
 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/plugin.xml b/eu.etaxonomy.taxeditor.editor/plugin.xml
index f815f7718b31acc7149fa82f5a4ac742c4f7dbb2..98e9b29db321ea5ed81a431a87ce6ecfa6e63771 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/plugin.xml
+++ b/eu.etaxonomy.taxeditor.editor/plugin.xml
@@ -1118,10 +1118,6 @@
             class="eu.etaxonomy.taxeditor.editor.view.descriptive.handler.ToggleShowOnlyIndividualAssociationsHandler"
             commandId="eu.etaxonomy.taxeditor.editor.handler.showOnlyIndividualAssociations">
       </handler>
-      <handler
-            class="eu.etaxonomy.taxeditor.editor.handler.FixClassificationHierarchyHandler"
-            commandId="eu.etaxonomy.taxeditor.editor.handler.FixClassificationHierarchyHandler">
-      </handler>
    </extension>
    <extension
          name="%extension.name"
@@ -1437,11 +1433,6 @@
             id="eu.etaxonomy.taxeditor.editor.derivate.deepDelete"
             name="%command.name.44">
       </command>
-      <command
-            defaultHandler="eu.etaxonomy.taxeditor.editor.handler.FixClassificationHierarchyHandler"
-            id="eu.etaxonomy.taxeditor.editor.handler.OpenFixClassificationHierarchyHandler"
-            name="%command.name.45">
-      </command>
    </extension>
    <extension
          point="org.eclipse.core.expressions.definitions">

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/FixClassificationHierarchyHandler.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/FixClassificationHierarchyHandler.java
deleted file mode 100644 (file)
index aeff573..0000000
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/FixClassificationHierarchyHandler.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package eu.etaxonomy.taxeditor.editor.handler;
-
-import org.apache.log4j.Logger;
-import org.eclipse.core.commands.AbstractHandler;
-import org.eclipse.core.commands.ExecutionEvent;
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ui.handlers.HandlerUtil;
-
-import eu.etaxonomy.cdm.api.service.IClassificationService;
-import eu.etaxonomy.cdm.model.taxon.Classification;
-import eu.etaxonomy.taxeditor.model.MessagingUtils;
-import eu.etaxonomy.taxeditor.preference.IPreferenceKeys;
-import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
-import eu.etaxonomy.taxeditor.store.CdmStore;
-
-public class FixClassificationHierarchyHandler extends AbstractHandler {
-
-    private static final Logger logger = Logger.getLogger(FixClassificationHierarchyHandler.class);
-
-    /*
-     * (non-Javadoc)
-     *
-     * @see
-     * org.eclipse.core.commands.IHandler#execute(org.eclipse.core.commands.
-     * ExecutionEvent)
-     */
-    @Override
-    public Object execute(ExecutionEvent event) throws ExecutionException {
-        boolean isChecklistEditorActivated = PreferencesUtil.getPreferenceStore().getBoolean(
-                IPreferenceKeys.DISTRIBUTION_AREA_PREFRENCES_ACTIVE);
-        if (isChecklistEditorActivated) {
-            ISelection currentSelection = HandlerUtil.getCurrentSelection(event);
-            if (currentSelection instanceof IStructuredSelection) {
-                Object selectedElement = ((IStructuredSelection) currentSelection).getFirstElement();
-                if (selectedElement instanceof Classification) {
-
-                    Classification classification = (Classification) selectedElement;
-                    try {
-                        IClassificationService service = CdmStore.getService(IClassificationService.class);
-
-                        // Map<String, List<TaxonNode>> sortedGenusList =
-                        // service.getSortedGenusList(classification.getAllNodes());
-
-                        Classification newClassification = service.createHierarchyInClassification(classification, null);
-
-                        MessagingUtils.messageDialog("Fix Hierarchy successful",
-                                FixClassificationHierarchyHandler.class, "Operation 'Fix Hierarchy' was successful. New classification is " + newClassification.getTitleCache());
-
-                    } catch (Exception e) {
-                        MessagingUtils.messageDialog("Failed to open Editor", FixClassificationHierarchyHandler.class,
-                                "Could not open ChecklistView. The hierarchy is corrupted!", e);
-                    }
-                }
-            }
-        }
-        return null;
-    }
-}

diff --git a/eu.etaxonomy.taxeditor.navigation/OSGI-INF/l10n/bundle.properties b/eu.etaxonomy.taxeditor.navigation/OSGI-INF/l10n/bundle.properties
index e723afba9a87d8c6de0d2e20cc2adf4167ea4d5f..27da5feba6a62044f99b2ae7d1079ab3d312e5ff 100644 (file)
--- a/eu.etaxonomy.taxeditor.navigation/OSGI-INF/l10n/bundle.properties
+++ b/eu.etaxonomy.taxeditor.navigation/OSGI-INF/l10n/bundle.properties
@@ -25,6 +25,7 @@ menu.label.0 = Refresh
 command.label.17 = List\r
 command.label.18 = Key Nodes\r
 command.label.19 = Delete\r
+command.label.fixClassificationHierarchy = Create taxon hierarchy\r
 command.name = New Taxon Node\r
 command.name.0 = New classification\r
 command.name.1 = Edit\r
@@ -36,10 +37,11 @@ command.name.6 = New Polytomous Key
 command.name.7 = Edit Polytomous Key nodes\r
 command.name.8 = Refresh Polytomous Key list\r
 command.name.9 = Refresh Polytomous Key nodes\r
+command.name.10 = Fix Classification Hierarchy\r
+\r
 view.name.2 = Taxonomic Tree\r
 navigatorContent.name = Classification\r
 navigatorContent.name.0 = TaxonNode\r
 navigatorContent.name.1 = Synonyms (experimental)\r
-command.label.fixClassificationHierarchy = Create taxon hierarchy\r
 command.label.moveFactualData = Move factual data to another taxon\r
 command.name.moveFactualData = Move factual data
\ No newline at end of file

diff --git a/eu.etaxonomy.taxeditor.navigation/OSGI-INF/l10n/bundle_de.properties b/eu.etaxonomy.taxeditor.navigation/OSGI-INF/l10n/bundle_de.properties
index a023560a0c1d4bac247a27a2b5223f75715bbd0d..12b1f1376a8b6d5865472a865a6fb9183bbce29e 100644 (file)
--- a/eu.etaxonomy.taxeditor.navigation/OSGI-INF/l10n/bundle_de.properties
+++ b/eu.etaxonomy.taxeditor.navigation/OSGI-INF/l10n/bundle_de.properties
@@ -21,9 +21,11 @@ command.label.13 = Taxon
 command.label.14 = Klassifikation\r
 command.label.15 = Neu\r
 command.label.16 = Bearbeiten\r
+command.label.fixClassificationHierarchy = Erzeuge Taxon-Hierarchie\r
+\r
 menu.label.0 = Aktualisieren\r
 command.label.17 = Liste\r
-command.label.18 = Schlüsselknoten\r
+command.label.18 = Schl�sselknoten\r
 command.label.19 = L\u00F6schen\r
 command.name = Neuer Taxonknoten\r
 command.name.0 = Neue Klassifikation\r
@@ -32,14 +34,14 @@ command.name.2 = Verschiebe Taxon
 command.name.3 = Aktualisieren\r
 command.name.4 = Kopieren\r
 command.name.5 = Verschiebe akzeptiertes Taxon in Synonymie\r
-command.name.6 = Neuer Polytomer Schlüssel\r
-command.name.7 = Bearbeite Schlüssel-Knoten\r
-command.name.8 = Aktualisiere Schlüssel-Liste\r
-command.name.9 = Aktualisiere Schlüssel-Knoten\r
+command.name.6 = Neuer Polytomer Schl�ssel\r
+command.name.7 = Bearbeite Schl�ssel-Knoten\r
+command.name.8 = Aktualisiere Schl�ssel-Liste\r
+command.name.9 = Aktualisiere Schl�ssel-Knoten\r
+command.name.10 = Erzeuge Taxon-Hierarchie\r
 view.name.2 = Taxonomiebaum\r
 navigatorContent.name = Klassifikation\r
 navigatorContent.name.0 = Taxonknoten\r
 navigatorContent.name.1 = Synonyme (experimentell)\r
-command.label.fixClassificationHierarchy = Erzeuge Taxon-Hierarchie\r
 command.label.moveFactualData = Verschiebe Faktendaten zu Taxon\r
 command.name.moveFactualData = Verschiebe Faktendaten
\ No newline at end of file

diff --git a/eu.etaxonomy.taxeditor.navigation/plugin.xml b/eu.etaxonomy.taxeditor.navigation/plugin.xml
index 0031fffd510e9ff787850bc0441a2df5bf849099..39cbba96e9db9ffc0dec61bda638239f8ebec956 100644 (file)
--- a/eu.etaxonomy.taxeditor.navigation/plugin.xml
+++ b/eu.etaxonomy.taxeditor.navigation/plugin.xml
@@ -128,7 +128,7 @@
             </visibleWhen>
          </command>
          <command
-               commandId="eu.etaxonomy.taxeditor.editor.handler.OpenFixClassificationHierarchyHandler"
+               commandId="eu.etaxonomy.taxeditor.navigation.navigator.handler.OpenFixClassificationHierarchyHandler"
                label="%command.label.fixClassificationHierarchy"
                style="push">
             <visibleWhen
@@ -417,6 +417,11 @@
             id="eu.etaxonomy.taxeditor.navigation.moveFactualData"
             name="%command.name.moveFactualData">
       </command>
+      <command
+            defaultHandler="eu.etaxonomy.taxeditor.navigation.navigator.handler.FixClassificationHierarchyHandler"
+            id="eu.etaxonomy.taxeditor.navigation.navigator.handler.OpenFixClassificationHierarchyHandler"
+            name="%command.name.10">
+      </command>
    </extension>
    <extension
          point="org.eclipse.ui.handlers">

diff --git a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/handler/FixClassificationHierarchyHandler.java b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/handler/FixClassificationHierarchyHandler.java
new file mode 100644 (file)
index 0000000..2505dfc
--- /dev/null
+++ b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/handler/FixClassificationHierarchyHandler.java
@@ -0,0 +1,54 @@
+package eu.etaxonomy.taxeditor.navigation.navigator.handler;
+
+import org.apache.log4j.Logger;
+import org.eclipse.core.commands.AbstractHandler;
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.ui.handlers.HandlerUtil;
+
+import eu.etaxonomy.cdm.api.service.IClassificationService;
+import eu.etaxonomy.cdm.model.taxon.Classification;
+import eu.etaxonomy.taxeditor.model.MessagingUtils;
+import eu.etaxonomy.taxeditor.store.CdmStore;
+
+public class FixClassificationHierarchyHandler extends AbstractHandler {
+
+    private static final Logger logger = Logger.getLogger(FixClassificationHierarchyHandler.class);
+
+    /*
+     * (non-Javadoc)
+     *
+     * @see
+     * org.eclipse.core.commands.IHandler#execute(org.eclipse.core.commands.
+     * ExecutionEvent)
+     */
+    @Override
+    public Object execute(ExecutionEvent event) throws ExecutionException {
+        ISelection currentSelection = HandlerUtil.getCurrentSelection(event);
+        if (currentSelection instanceof IStructuredSelection) {
+            Object selectedElement = ((IStructuredSelection) currentSelection).getFirstElement();
+            if (selectedElement instanceof Classification) {
+
+                Classification classification = (Classification) selectedElement;
+                try {
+                    IClassificationService service = CdmStore.getService(IClassificationService.class);
+
+                    // Map<String, List<TaxonNode>> sortedGenusList =
+                    // service.getSortedGenusList(classification.getAllNodes());
+
+                    Classification newClassification = service.createHierarchyInClassification(classification, null);
+
+                    MessagingUtils.messageDialog("Fix Hierarchy successful",
+                            FixClassificationHierarchyHandler.class, "Operation 'Fix Hierarchy' was successful. New classification is " + newClassification.getTitleCache());
+
+                } catch (Exception e) {
+                    MessagingUtils.messageDialog("Failed to open Editor", FixClassificationHierarchyHandler.class,
+                            "Could not open ChecklistView. The hierarchy is corrupted!", e);
+                }
+            }
+        }
+        return null;
+    }
+}