change label for classification in status bar and fix createClassificationHierarchyHa...

diff --git a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/l10n/Messages.java b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/l10n/Messages.java
index 4b4f810eded0ced4e3a1dd53e3d0ecac8a8a879f..57356a8fefd765a276c8c73ae3f93a8e1a559054 100644 (file)
--- a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/l10n/Messages.java
+++ b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/l10n/Messages.java
@@ -163,6 +163,7 @@ public class Messages extends NLS {
     public static String TaxonNodeLabelProvider_NO_TAXON;
     public static String TaxonNodeLabelProvider_NODE_WITH_NO_TAXON;
     public static String TaxonNodeLabelProvider_TAXON;
+    public static String TaxonNodeLabelProvider_CLASSIFICATION;
 
     public static String TreeNodeDropAdapter_10;
     public static String TreeNodeDropAdapter_BEHIND;

diff --git a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/l10n/messages.properties b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/l10n/messages.properties
index 37b1180bf891cd828546b3389bf50b80c5614029..b12a69a936d6cdbbaf8546e5feb75b7782ae6f85 100644 (file)
--- a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/l10n/messages.properties
+++ b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/l10n/messages.properties
@@ -138,6 +138,7 @@ TaxonNavigatorLabels_ONLY_SINGLE_TAXON=The chosen operation is available only fo
 TaxonNavigatorLabels_SET_SEC_FOR_CHILDREN=Set new Secundum Reference for all children.
 TaxonNavigatorLabels_UNSAVED_CHANGES=There are unsaved changes in the source taxon. Please save first.
 TaxonNodeLabelProvider_NO_TAXON=>NO TAXON<
+TaxonNodeLabelProvider_CLASSIFICATION=Classification: 
 TaxonNodeLabelProvider_NODE_WITH_NO_TAXON=The taxon node does not have a taxon attached to it. Please check your import. TaxonNode: %s
 TaxonNodeLabelProvider_TAXON=Taxon: 
 TreeNodeDropAdapter_10=\ 

diff --git a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/l10n/messages_de.properties b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/l10n/messages_de.properties
index 5bf8357bc77134a6a61814877cbe3d9bf1e589bb..1ad57fe98395a7df821d03d90a2a87ee81fb5c96 100644 (file)
--- a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/l10n/messages_de.properties
+++ b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/l10n/messages_de.properties
@@ -140,6 +140,7 @@ TaxonNavigatorLabels_UNSAVED_CHANGES=Es gibt 
 TaxonNodeLabelProvider_NO_TAXON=>KEIN TAXON<
 TaxonNodeLabelProvider_NODE_WITH_NO_TAXON=Der Taxonknoten enthält kein Taxon. Bitte überprüfen Sie den Import. Taxonknoten: %s
 TaxonNodeLabelProvider_TAXON=Taxon: 
+TaxonNodeLabelProvider_CLASSIFICATION=Klassifikation: 
 TreeNodeDropAdapter_10=\ 
 TreeNodeDropAdapter_BEHIND=Hinter
 TreeNodeDropAdapter_CANCEL=Abbrechen

diff --git a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNodeLabelProvider.java b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNodeLabelProvider.java
index 3430ce0b5600dcf92b6d5d48e68be718cbbf2298..b7ec191ac225abfec989831215d7461ec6ecc629 100644 (file)
--- a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNodeLabelProvider.java
+++ b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNodeLabelProvider.java
@@ -85,7 +85,9 @@ public class TaxonNodeLabelProvider extends ColumnLabelProvider
     public String getDescription(Object anElement) {
                if (anElement instanceof TaxonNode) {
                        Taxon data = ((TaxonNode) anElement).getTaxon();
-                       return Messages.TaxonNodeLabelProvider_TAXON + (data != null ? data.getTitleCache() : Messages.TaxonNodeLabelProvider_NO_TAXON);
+                       String text =  (data != null ? Messages.TaxonNodeLabelProvider_TAXON + data.getTitleCache() : Messages.TaxonNodeLabelProvider_CLASSIFICATION + ((TaxonNode)anElement).getClassification().getTitleCache());
+               
+                       return text;
                }
                return null;
        }

diff --git a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/handler/CreateClassificationHierarchyHandler.java b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/handler/CreateClassificationHierarchyHandler.java
index a890daf1744ffe3c1cf8f434f877daec8b5ed64c..ee633e0897ccae772b107f5bf771f3f854484911 100644 (file)
--- a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/handler/CreateClassificationHierarchyHandler.java
+++ b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/handler/CreateClassificationHierarchyHandler.java
@@ -9,6 +9,7 @@ import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.ui.handlers.HandlerUtil;
 
 import eu.etaxonomy.cdm.model.taxon.Classification;
+import eu.etaxonomy.cdm.model.taxon.TaxonNode;
 import eu.etaxonomy.taxeditor.model.AbstractUtility;
 import eu.etaxonomy.taxeditor.model.MessagingUtils;
 import eu.etaxonomy.taxeditor.navigation.NavigationUtil;
@@ -34,9 +35,9 @@ public class CreateClassificationHierarchyHandler extends AbstractHandler {
         ISelection currentSelection = HandlerUtil.getCurrentSelection(event);
         if (currentSelection instanceof IStructuredSelection) {
             Object selectedElement = ((IStructuredSelection) currentSelection).getFirstElement();
-            if (selectedElement instanceof Classification) {
+            if (selectedElement instanceof TaxonNode && !((TaxonNode)selectedElement).hasTaxon()) {
 
-                Classification classification = (Classification) selectedElement;
+                Classification classification = ((TaxonNode) selectedElement).getClassification();
                 try {
                     TaxonNavigator taxonNavigator = (TaxonNavigator)AbstractUtility.showView(TaxonNavigator.ID);
 //                    IClassificationService service = CdmStore.getService(IClassificationService.class);