Move util method to StoreUtil

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/StoreUtil.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/StoreUtil.java
index 08a86aa30d1bec14f04626f55ad181ce4b9d0890..c3e4c469edd637ad5ffc0acbf01965e57f2ce9e2 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/StoreUtil.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/StoreUtil.java
@@ -22,6 +22,7 @@ import org.eclipse.ui.forms.widgets.ScrolledForm;
 
 import eu.etaxonomy.cdm.api.facade.DerivedUnitFacade;
 import eu.etaxonomy.cdm.model.common.CdmBase;
+import eu.etaxonomy.cdm.model.term.TermNode;
 import eu.etaxonomy.taxeditor.l10n.Messages;
 import eu.etaxonomy.taxeditor.model.AbstractUtility;
 import eu.etaxonomy.taxeditor.model.FeatureNodeContainer;
@@ -228,4 +229,14 @@ public class StoreUtil extends AbstractUtility {
         }
         return style;
     }
+
+    public static String getPath(TermNode node){
+        String path = node.getTerm().getLabel();
+        TermNode parent = node.getParent();
+        while(parent != null && parent.getTerm()!=null){
+            path = parent.getTerm().getLabel() + "/" + path;
+            parent = parent.getParent();
+        }
+        return path;
+    }
 }

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/feature/CharacterDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/feature/CharacterDetailElement.java
index 4b0ecbd8fe90fae7d54584aa340945d068a4e9ad..46fd2901a0b588f158aea16299de267627fa3a6e 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/feature/CharacterDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/feature/CharacterDetailElement.java
@@ -14,7 +14,6 @@ import eu.etaxonomy.cdm.model.common.Language;
 import eu.etaxonomy.cdm.model.description.Character;
 import eu.etaxonomy.cdm.model.term.DefinedTerm;
 import eu.etaxonomy.cdm.model.term.Representation;
-import eu.etaxonomy.cdm.model.term.TermNode;
 import eu.etaxonomy.cdm.model.term.TermType;
 import eu.etaxonomy.taxeditor.editor.definedterm.TermBasePropertyTester;
 import eu.etaxonomy.taxeditor.model.ColorResources;
@@ -71,13 +70,13 @@ public class CharacterDetailElement extends AbstractCdmDetailElement<Character>
            Label lblStructure = new Label(formElement.getLayoutComposite(), style);
            lblStructure.setText("Structure");
            Label lblStructureText = new Label(formElement.getLayoutComposite(), style);
-           lblStructureText.setText(getPath(entity.getStructure()));
+           lblStructureText.setText(StoreUtil.getPath(entity.getStructure()));
            lblStructureText.setForeground(ColorResources.getColor(Resources.BLACK));
            Label lblProperty = new Label(formElement.getLayoutComposite(), style);
            lblProperty.setText("Property");
            Label lblPropertyText = new Label(formElement.getLayoutComposite(), style);
            lblPropertyText.setForeground(ColorResources.getColor(Resources.BLACK));
-           lblPropertyText.setText(getPath(entity.getProperty()));
+           lblPropertyText.setText(StoreUtil.getPath(entity.getProperty()));
 
         comboStructuralModifier = formFactory.createDefinedTermComboElement(TermType.StructureModifier, formElement, "Structural Modifier", entity.getStructureModifier(), style);
 
@@ -110,16 +109,6 @@ public class CharacterDetailElement extends AbstractCdmDetailElement<Character>
 
     }
 
-       private String getPath(TermNode node){
-           String path = node.getTerm().getLabel();
-           TermNode parent = node.getParent();
-           while(parent != null && parent.getTerm()!=null){
-               path = parent.getTerm().getLabel() + "/" + path;
-               parent = parent.getParent();
-           }
-           return path;
-       }
-
     @Override
     public void setEntity(Character entity) {
         super.setEntity(entity);