rename featureTree package to termtree

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptiveDataSet/character/CharacterDragListener.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptiveDataSet/character/CharacterDragListener.java
index a23430e6f84719a3d5cf876063223d4ddd4a49b9..4c73938cb264d3036181f466d945fe59685cd457 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptiveDataSet/character/CharacterDragListener.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptiveDataSet/character/CharacterDragListener.java
@@ -23,8 +23,8 @@ import org.eclipse.swt.widgets.Display;
 
 import eu.etaxonomy.cdm.model.description.Character;
 import eu.etaxonomy.cdm.model.term.TermNode;
-import eu.etaxonomy.taxeditor.featuretree.CharacterTransfer;
-import eu.etaxonomy.taxeditor.featuretree.e4.TermNodeDragListener;
+import eu.etaxonomy.taxeditor.termtree.CharacterTransfer;
+import eu.etaxonomy.taxeditor.termtree.e4.TermNodeDragListener;
 
 /**
  * @author pplitzner

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptiveDataSet/character/CharacterDropAdapter.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptiveDataSet/character/CharacterDropAdapter.java
index c4cd6896795b5275d441fdf0d519133aa442303e..08d5ba9c95a7abde466cd154e4f32c86ef35cecd 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptiveDataSet/character/CharacterDropAdapter.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptiveDataSet/character/CharacterDropAdapter.java
@@ -18,10 +18,10 @@ import eu.etaxonomy.cdm.model.description.Character;
 import eu.etaxonomy.cdm.model.term.TermTree;
 import eu.etaxonomy.cdm.persistence.dto.TermNodeDto;
 import eu.etaxonomy.cdm.persistence.dto.TermTreeDto;
-import eu.etaxonomy.taxeditor.featuretree.CharacterTransfer;
-import eu.etaxonomy.taxeditor.featuretree.e4.TermTreeDtoDropAdapter;
 import eu.etaxonomy.taxeditor.store.CdmStore;
 import eu.etaxonomy.taxeditor.store.StoreUtil;
+import eu.etaxonomy.taxeditor.termtree.CharacterTransfer;
+import eu.etaxonomy.taxeditor.termtree.e4.TermTreeDtoDropAdapter;
 
 /**
  *

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptiveDataSet/character/CharacterEditor.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptiveDataSet/character/CharacterEditor.java
index 875b06e44202bf47600e55cb1fa07dff804f3486..22de740af1e4d0e7ae03db2ffa8484518f427d30 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptiveDataSet/character/CharacterEditor.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptiveDataSet/character/CharacterEditor.java
@@ -83,14 +83,6 @@ import eu.etaxonomy.taxeditor.editor.AppModelId;
 import eu.etaxonomy.taxeditor.editor.definedterm.TermTreeViewerComparator;
 import eu.etaxonomy.taxeditor.editor.l10n.Messages;
 import eu.etaxonomy.taxeditor.event.WorkbenchEventConstants;
-import eu.etaxonomy.taxeditor.featuretree.CharacterTransfer;
-import eu.etaxonomy.taxeditor.featuretree.TermTreeContentProvider;
-import eu.etaxonomy.taxeditor.featuretree.TermTreeLabelProvider;
-import eu.etaxonomy.taxeditor.featuretree.e4.FeatureTreeDtoEditorComposite;
-import eu.etaxonomy.taxeditor.featuretree.e4.ICharacterEditor;
-import eu.etaxonomy.taxeditor.featuretree.e4.TermNodeDtoDragListener;
-import eu.etaxonomy.taxeditor.featuretree.e4.TermTreeDtoDropAdapter;
-import eu.etaxonomy.taxeditor.featuretree.e4.TermTreeEditor;
 import eu.etaxonomy.taxeditor.model.AbstractUtility;
 import eu.etaxonomy.taxeditor.model.IDirtyMarkable;
 import eu.etaxonomy.taxeditor.model.IPartContentHasDetails;
@@ -102,6 +94,14 @@ import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
 import eu.etaxonomy.taxeditor.session.ICdmEntitySession;
 import eu.etaxonomy.taxeditor.store.CdmStore;
 import eu.etaxonomy.taxeditor.store.StoreUtil;
+import eu.etaxonomy.taxeditor.termtree.CharacterTransfer;
+import eu.etaxonomy.taxeditor.termtree.TermTreeContentProvider;
+import eu.etaxonomy.taxeditor.termtree.TermTreeLabelProvider;
+import eu.etaxonomy.taxeditor.termtree.e4.ICharacterEditor;
+import eu.etaxonomy.taxeditor.termtree.e4.TermNodeDtoDragListener;
+import eu.etaxonomy.taxeditor.termtree.e4.TermTreeDtoDropAdapter;
+import eu.etaxonomy.taxeditor.termtree.e4.TermTreeDtoEditorComposite;
+import eu.etaxonomy.taxeditor.termtree.e4.TermTreeEditor;
 import eu.etaxonomy.taxeditor.ui.dialog.selection.FeatureTreeSelectionDialog;
 import eu.etaxonomy.taxeditor.ui.dialog.selection.TermVocabularySelectionDialog;
 import eu.etaxonomy.taxeditor.workbench.part.IE4SavablePart;
@@ -116,7 +116,7 @@ public class CharacterEditor implements ICharacterEditor, IConversationEnabled,
         ModifyListener, IE4ViewerPart, IPartContentHasDetails, IPartContentHasSupplementalData,
         IDirtyMarkable, IE4SavablePart {
 
-    private FeatureTreeDtoEditorComposite characterTreeEditorComposite;
+    private TermTreeDtoEditorComposite characterTreeEditorComposite;
     private final FormToolkit formToolkit = new FormToolkit(Display.getDefault());
 
     @Inject
@@ -302,15 +302,15 @@ public class CharacterEditor implements ICharacterEditor, IConversationEnabled,
         return viewer;
     }
 
-    private <T extends DefinedTermBase> FeatureTreeDtoEditorComposite<T> addFeatureTreeEditor(Composite composite_3) {
-        FeatureTreeDtoEditorComposite<T> TermTreeEditorComposite = new FeatureTreeDtoEditorComposite<>(composite_3, SWT.NONE);
+    private <T extends DefinedTermBase> TermTreeDtoEditorComposite<T> addFeatureTreeEditor(Composite composite_3) {
+        TermTreeDtoEditorComposite<T> TermTreeEditorComposite = new TermTreeDtoEditorComposite<>(composite_3, SWT.NONE);
         TermTreeEditorComposite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 1, 1));
         return TermTreeEditorComposite;
     }
 
     private void initFeatureTreeComposite(
             TermType termType,
-            FeatureTreeDtoEditorComposite TermTreeEditorComposite,
+            TermTreeDtoEditorComposite TermTreeEditorComposite,
             TermNodeDtoDragListener featureNodeDragListener,
             TermTreeDtoDropAdapter featureNodeDropAdapter,
             Transfer[] transfers) {
@@ -535,10 +535,10 @@ public class CharacterEditor implements ICharacterEditor, IConversationEnabled,
     }
 
     private class FeatureTreeChooserListener extends SelectionAdapter{
-        private FeatureTreeDtoEditorComposite<Feature> TermTreeEditorComposite;
+        private TermTreeDtoEditorComposite<Feature> TermTreeEditorComposite;
         private TermType termType;
 
-        public FeatureTreeChooserListener(FeatureTreeDtoEditorComposite<Feature> TermTreeEditorComposite, TermType termType) {
+        public FeatureTreeChooserListener(TermTreeDtoEditorComposite<Feature> TermTreeEditorComposite, TermType termType) {
             super();
             this.TermTreeEditorComposite = TermTreeEditorComposite;
             this.termType = termType;

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptiveDataSet/character/handler/AddFeatureToCharacterTreeHandler.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptiveDataSet/character/handler/AddFeatureToCharacterTreeHandler.java
index 1e1939396a9fa852f648e16a987a550818b8fdf0..9a8617d33815acfe86f002952879514c3899e983 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptiveDataSet/character/handler/AddFeatureToCharacterTreeHandler.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptiveDataSet/character/handler/AddFeatureToCharacterTreeHandler.java
@@ -22,7 +22,7 @@ import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.swt.widgets.Shell;
 
 import eu.etaxonomy.taxeditor.editor.descriptiveDataSet.character.CharacterEditor;
-import eu.etaxonomy.taxeditor.featuretree.e4.handler.AddTermHandler;
+import eu.etaxonomy.taxeditor.termtree.e4.handler.AddTermHandler;
 
 /**
  * @author pplitzner

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptiveDataSet/matrix/CharacterMatrixBottomToolbar.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptiveDataSet/matrix/CharacterMatrixBottomToolbar.java
index 8963918861f26e6150dfd4f48b962468d42eb76f..4f0dcc20d291fcc616419a2698ee9aed9443ed08 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptiveDataSet/matrix/CharacterMatrixBottomToolbar.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptiveDataSet/matrix/CharacterMatrixBottomToolbar.java
@@ -161,7 +161,7 @@ public class CharacterMatrixBottomToolbar extends Composite{
                 UUID taxonUuid = parentDto.getTaxonUuid();
                 int response = MessagingUtils.confirmDialog(
                         "Choose taxonomic scope",
-                        String.format("The common parent taxon of this data set is :\n%s\n\n"
+                        String.format("The common parent taxon of this dataset is :\n%s\n\n"
                                 + "Do you want to use this as the taxonomic scope for the polytomous key?"
                                 , parentDto.getTaxonTitleCache()), "Yes", "Choose different taxon", "Cancel");
                 if(response==2){
@@ -222,7 +222,7 @@ public class CharacterMatrixBottomToolbar extends Composite{
         }
         UUID monitorUuid =  CdmApplicationState.getLongRunningTasksService().invoke(config);
 
-        String jobLabel = "Aggregate Descriptive Data Set";
+        String jobLabel = "Aggregate Descriptive Dataset";
         Job job = Job.create(jobLabel, (ICoreRunnable) monitor -> {
             SubMonitor subMonitor = SubMonitor.convert(monitor);
             subMonitor.beginTask(jobLabel, IProgressMonitor.UNKNOWN);

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/TermTreeViewerComparator.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/TermTreeViewerComparator.java
index a68e1656d23e27b18f551bec72b4ac22907e5b2f..db3cffd8ba0818ba0d94ce22c057c40fb9f359d7 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/TermTreeViewerComparator.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/TermTreeViewerComparator.java
@@ -14,7 +14,7 @@ import org.eclipse.jface.viewers.ViewerComparator;
 
 import eu.etaxonomy.cdm.common.CdmUtils;
 import eu.etaxonomy.cdm.persistence.dto.TermNodeDto;
-import eu.etaxonomy.taxeditor.featuretree.TermTreeLabelProvider;
+import eu.etaxonomy.taxeditor.termtree.TermTreeLabelProvider;
 
 /**
  * @author pplitzner

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/e4/handler/MoveDefinedTermHandler.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/e4/handler/MoveDefinedTermHandler.java
index 30bb7310c07255a2f66169d8fc5706bd4027d036..4de964be4c6d3f5a70aca64145280eb30baae4d2 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/e4/handler/MoveDefinedTermHandler.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/e4/handler/MoveDefinedTermHandler.java
@@ -32,11 +32,11 @@ import eu.etaxonomy.cdm.persistence.dto.AbstractTermDto;
 import eu.etaxonomy.cdm.persistence.dto.TermDto;
 import eu.etaxonomy.taxeditor.editor.definedterm.e4.DefinedTermEditorE4;
 import eu.etaxonomy.taxeditor.editor.definedterm.operation.MoveDefinedTermOperation;
-import eu.etaxonomy.taxeditor.featuretree.TermChooseWizard;
 import eu.etaxonomy.taxeditor.model.AbstractUtility;
 import eu.etaxonomy.taxeditor.model.MessagingUtils;
 import eu.etaxonomy.taxeditor.operation.AbstractPostOperation;
 import eu.etaxonomy.taxeditor.store.StoreUtil;
+import eu.etaxonomy.taxeditor.termtree.TermChooseWizard;
 
 /**
  *

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/e4/out/owl/OwlTermExportComposite.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/e4/out/owl/OwlTermExportComposite.java
index 0ae16a54831af4bb0c820e3ef59d69b883e86ef8..da1cf2e2714160be046980bc8d2a0a29630a44a4 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/e4/out/owl/OwlTermExportComposite.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/e4/out/owl/OwlTermExportComposite.java
@@ -19,9 +19,9 @@ import eu.etaxonomy.taxeditor.editor.definedterm.DefinedTermSorter;
 import eu.etaxonomy.taxeditor.editor.definedterm.TermTreeViewerComparator;
 import eu.etaxonomy.taxeditor.editor.definedterm.RootElementsOnlyTreeContentProvider;
 import eu.etaxonomy.taxeditor.editor.definedterm.TermDtoLabelProvider;
-import eu.etaxonomy.taxeditor.featuretree.TermTreeLabelProvider;
 import eu.etaxonomy.taxeditor.model.ImageResources;
 import eu.etaxonomy.taxeditor.preference.wizard.CheckBoxTreeComposite;
+import eu.etaxonomy.taxeditor.termtree.TermTreeLabelProvider;
 
 /**
  * @author pplitzner

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/DefaultFeatureTreePreferenecs.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/DefaultFeatureTreePreferenecs.java
index e475d0b29cbdb45f5abb11e61ef73d070a40d833..3a0085abba84a5b87f8cd3e2cd4e0a09f5dec79b 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/DefaultFeatureTreePreferenecs.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/DefaultFeatureTreePreferenecs.java
@@ -25,12 +25,12 @@ import org.eclipse.swt.widgets.Control;
 
 import eu.etaxonomy.cdm.api.service.ITermTreeService;
 import eu.etaxonomy.cdm.model.term.TermTree;
-import eu.etaxonomy.taxeditor.featuretree.TermTreeContentProvider;
-import eu.etaxonomy.taxeditor.featuretree.TermTreeLabelProvider;
 import eu.etaxonomy.taxeditor.l10n.Messages;
 import eu.etaxonomy.taxeditor.model.MessagingUtils;
 import eu.etaxonomy.taxeditor.preference.menu.CdmPreferencePage;
 import eu.etaxonomy.taxeditor.store.CdmStore;
+import eu.etaxonomy.taxeditor.termtree.TermTreeContentProvider;
+import eu.etaxonomy.taxeditor.termtree.TermTreeLabelProvider;
 
 /**
  * <p>DefaultFeatureTreePreferenecs class.</p>

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/AppModelId.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/AppModelId.java
index d6a77a67d978dca641a120af6faa0ebca95da6c8..704d7b6b6db853e99c1aba5ef80019d0175e2ca1 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/AppModelId.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/AppModelId.java
@@ -181,46 +181,46 @@ public class AppModelId {
        public static final String HANDLER_EU_ETAXONOMY_TAXEDITOR_EDITOR_DEFINEDTERM_E4_HANDLER_DELETETERMBASEHANDLERE4 = "eu.etaxonomy.taxeditor.editor.definedterm.e4.handler.DeleteTermBaseHandlerE4";
        public static final String HANDLER_EU_ETAXONOMY_TAXEDITOR_EDITOR_DEFINEDTERM_E4_HANDLER_MOVEDEFINEDTERMHANDLER = "eu.etaxonomy.taxeditor.editor.definedterm.e4.handler.MoveDefinedTermHandler";
        public static final String HANDLER_EU_ETAXONOMY_TAXEDITOR_EDITOR_DEFINEDTERM_E4_HANDLER_OPENDEFINEDTERMEDITORHANDLERE4 = "eu.etaxonomy.taxeditor.editor.definedterm.e4.handler.OpenDefinedTermEditorHandlerE4";
-       public static final String HANDLER_EU_ETAXONOMY_TAXEDITOR_FEATURETREE_E4_HANDLER_ADDCHILDFEATUREHANDLER = "eu.etaxonomy.taxeditor.featuretree.e4.handler.AddChildFeatureHandler";
-       public static final String HANDLER_EU_ETAXONOMY_TAXEDITOR_FEATURETREE_E4_HANDLER_ADDFEATUREHANDLER = "eu.etaxonomy.taxeditor.featuretree.e4.handler.AddFeatureHandler";
-       public static final String HANDLER_EU_ETAXONOMY_TAXEDITOR_FEATURETREE_E4_HANDLER_CHARACTER_ADDFEATUREHANDLER = "eu.etaxonomy.taxeditor.featuretree.e4.handler.character.AddFeatureHandler";
-       public static final String HANDLER_EU_ETAXONOMY_TAXEDITOR_FEATURETREE_E4_HANDLER_CHARACTER_CREATEFEATURETREEHANDLER = "eu.etaxonomy.taxeditor.featuretree.e4.handler.character.CreateFeatureTreeHandler";
-       public static final String HANDLER_EU_ETAXONOMY_TAXEDITOR_FEATURETREE_E4_HANDLER_CHARACTER_FEATURETREEEXPORTONTOLOGYHANDLER = "eu.etaxonomy.taxeditor.featuretree.e4.handler.character.FeatureTreeExportOntologyHandler";
-       public static final String HANDLER_EU_ETAXONOMY_TAXEDITOR_FEATURETREE_E4_HANDLER_CHARACTER_FEATURETREEEXPORTWORDHANDLER = "eu.etaxonomy.taxeditor.featuretree.e4.handler.character.FeatureTreeExportWordHandler";
-       public static final String HANDLER_EU_ETAXONOMY_TAXEDITOR_FEATURETREE_E4_HANDLER_CHARACTER_REMOVEFEATURETREEHANDLERS = "eu.etaxonomy.taxeditor.featuretree.e4.handler.character.RemoveFeatureTreeHandlers";
-       public static final String HANDLER_EU_ETAXONOMY_TAXEDITOR_FEATURETREE_E4_HANDLER_COPYFEATUREHANDLER = "eu.etaxonomy.taxeditor.featuretree.e4.handler.CopyFeatureHandler";
-       public static final String HANDLER_EU_ETAXONOMY_TAXEDITOR_FEATURETREE_E4_HANDLER_CREATEFEATURETREEHANDLER = "eu.etaxonomy.taxeditor.featuretree.e4.handler.CreateFeatureTreeHandler";
-       public static final String HANDLER_EU_ETAXONOMY_TAXEDITOR_FEATURETREE_E4_HANDLER_FEATURETREEEXPORTONTOLOGYHANDLER = "eu.etaxonomy.taxeditor.featuretree.e4.handler.FeatureTreeExportOntologyHandler";
-       public static final String HANDLER_EU_ETAXONOMY_TAXEDITOR_FEATURETREE_E4_HANDLER_FEATURETREEEXPORTWORDHANDLER = "eu.etaxonomy.taxeditor.featuretree.e4.handler.FeatureTreeExportWordHandler";
-       public static final String HANDLER_EU_ETAXONOMY_TAXEDITOR_FEATURETREE_E4_HANDLER_NAMEDAREA_ADDFEATUREHANDLER = "eu.etaxonomy.taxeditor.featuretree.e4.handler.namedArea.AddFeatureHandler";
-       public static final String HANDLER_EU_ETAXONOMY_TAXEDITOR_FEATURETREE_E4_HANDLER_NAMEDAREA_CREATEFEATURETREEHANDLER = "eu.etaxonomy.taxeditor.featuretree.e4.handler.namedArea.CreateFeatureTreeHandler";
-       public static final String HANDLER_EU_ETAXONOMY_TAXEDITOR_FEATURETREE_E4_HANDLER_NAMEDAREA_FEATURETREEEXPORTONTOLOGYHANDLER = "eu.etaxonomy.taxeditor.featuretree.e4.handler.namedArea.FeatureTreeExportOntologyHandler";
-       public static final String HANDLER_EU_ETAXONOMY_TAXEDITOR_FEATURETREE_E4_HANDLER_NAMEDAREA_FEATURETREEEXPORTWORDHANDLER = "eu.etaxonomy.taxeditor.featuretree.e4.handler.namedArea.FeatureTreeExportWordHandler";
-       public static final String HANDLER_EU_ETAXONOMY_TAXEDITOR_FEATURETREE_E4_HANDLER_NAMEDAREA_REMOVEFEATURETREEHANDLERS = "eu.etaxonomy.taxeditor.featuretree.e4.handler.namedArea.RemoveFeatureTreeHandlers";
-       public static final String HANDLER_EU_ETAXONOMY_TAXEDITOR_FEATURETREE_E4_HANDLER_PASTEFEATUREHANDLER = "eu.etaxonomy.taxeditor.featuretree.e4.handler.PasteFeatureHandler";
-       public static final String HANDLER_EU_ETAXONOMY_TAXEDITOR_FEATURETREE_E4_HANDLER_PRESENCEABSENCE_ADDFEATUREHANDLER = "eu.etaxonomy.taxeditor.featuretree.e4.handler.presenceAbsence.AddFeatureHandler";
-       public static final String HANDLER_EU_ETAXONOMY_TAXEDITOR_FEATURETREE_E4_HANDLER_PRESENCEABSENCE_CREATEFEATURETREEHANDLER = "eu.etaxonomy.taxeditor.featuretree.e4.handler.presenceAbsence.CreateFeatureTreeHandler";
-       public static final String HANDLER_EU_ETAXONOMY_TAXEDITOR_FEATURETREE_E4_HANDLER_PRESENCEABSENCE_FEATURETREEEXPORTONTOLOGYHANDLER = "eu.etaxonomy.taxeditor.featuretree.e4.handler.presenceAbsence.FeatureTreeExportOntologyHandler";
-       public static final String HANDLER_EU_ETAXONOMY_TAXEDITOR_FEATURETREE_E4_HANDLER_PRESENCEABSENCE_FEATURETREEEXPORTWORDHANDLER = "eu.etaxonomy.taxeditor.featuretree.e4.handler.presenceAbsence.FeatureTreeExportWordHandler";
-       public static final String HANDLER_EU_ETAXONOMY_TAXEDITOR_FEATURETREE_E4_HANDLER_PRESENCEABSENCE_REMOVEFEATURETREEHANDLERS = "eu.etaxonomy.taxeditor.featuretree.e4.handler.presenceAbsence.RemoveFeatureTreeHandlers";
-       public static final String HANDLER_EU_ETAXONOMY_TAXEDITOR_FEATURETREE_E4_HANDLER_PROPERTY_ADDFEATUREHANDLER = "eu.etaxonomy.taxeditor.featuretree.e4.handler.property.AddFeatureHandler";
-       public static final String HANDLER_EU_ETAXONOMY_TAXEDITOR_FEATURETREE_E4_HANDLER_PROPERTY_CREATEFEATURETREEHANDLER = "eu.etaxonomy.taxeditor.featuretree.e4.handler.property.CreateFeatureTreeHandler";
-       public static final String HANDLER_EU_ETAXONOMY_TAXEDITOR_FEATURETREE_E4_HANDLER_PROPERTY_FEATURETREEEXPORTONTOLOGYHANDLER = "eu.etaxonomy.taxeditor.featuretree.e4.handler.property.FeatureTreeExportOntologyHandler";
-       public static final String HANDLER_EU_ETAXONOMY_TAXEDITOR_FEATURETREE_E4_HANDLER_PROPERTY_FEATURETREEEXPORTWORDHANDLER = "eu.etaxonomy.taxeditor.featuretree.e4.handler.property.FeatureTreeExportWordHandler";
-       public static final String HANDLER_EU_ETAXONOMY_TAXEDITOR_FEATURETREE_E4_HANDLER_PROPERTY_REMOVEFEATURETREEHANDLERS = "eu.etaxonomy.taxeditor.featuretree.e4.handler.property.RemoveFeatureTreeHandlers";
-       public static final String HANDLER_EU_ETAXONOMY_TAXEDITOR_FEATURETREE_E4_HANDLER_RANK_ADDFEATUREHANDLER = "eu.etaxonomy.taxeditor.featuretree.e4.handler.rank.AddFeatureHandler";
-       public static final String HANDLER_EU_ETAXONOMY_TAXEDITOR_FEATURETREE_E4_HANDLER_RANK_CREATEFEATURETREEHANDLER = "eu.etaxonomy.taxeditor.featuretree.e4.handler.rank.CreateFeatureTreeHandler";
-       public static final String HANDLER_EU_ETAXONOMY_TAXEDITOR_FEATURETREE_E4_HANDLER_RANK_FEATURETREEEXPORTONTOLOGYHANDLER = "eu.etaxonomy.taxeditor.featuretree.e4.handler.rank.FeatureTreeExportOntologyHandler";
-       public static final String HANDLER_EU_ETAXONOMY_TAXEDITOR_FEATURETREE_E4_HANDLER_RANK_FEATURETREEEXPORTWORDHANDLER = "eu.etaxonomy.taxeditor.featuretree.e4.handler.rank.FeatureTreeExportWordHandler";
-       public static final String HANDLER_EU_ETAXONOMY_TAXEDITOR_FEATURETREE_E4_HANDLER_RANK_REMOVEFEATURETREEHANDLERS = "eu.etaxonomy.taxeditor.featuretree.e4.handler.rank.RemoveFeatureTreeHandlers";
-       public static final String HANDLER_EU_ETAXONOMY_TAXEDITOR_FEATURETREE_E4_HANDLER_REMOVEFEATUREHANDLER = "eu.etaxonomy.taxeditor.featuretree.e4.handler.RemoveFeatureHandler";
-       public static final String HANDLER_EU_ETAXONOMY_TAXEDITOR_FEATURETREE_E4_HANDLER_REMOVEFEATURETREEHANDLERS = "eu.etaxonomy.taxeditor.featuretree.e4.handler.RemoveFeatureTreeHandlers";
-       public static final String HANDLER_EU_ETAXONOMY_TAXEDITOR_FEATURETREE_E4_HANDLER_STRUCTURE_ADDFEATUREHANDLER = "eu.etaxonomy.taxeditor.featuretree.e4.handler.structure.AddFeatureHandler";
-       public static final String HANDLER_EU_ETAXONOMY_TAXEDITOR_FEATURETREE_E4_HANDLER_STRUCTURE_CREATEFEATURETREEHANDLER = "eu.etaxonomy.taxeditor.featuretree.e4.handler.structure.CreateFeatureTreeHandler";
-       public static final String HANDLER_EU_ETAXONOMY_TAXEDITOR_FEATURETREE_E4_HANDLER_STRUCTURE_FEATURETREEEXPORTONTOLOGYHANDLER = "eu.etaxonomy.taxeditor.featuretree.e4.handler.structure.FeatureTreeExportOntologyHandler";
-       public static final String HANDLER_EU_ETAXONOMY_TAXEDITOR_FEATURETREE_E4_HANDLER_STRUCTURE_FEATURETREEEXPORTWORDHANDLER = "eu.etaxonomy.taxeditor.featuretree.e4.handler.structure.FeatureTreeExportWordHandler";
-       public static final String HANDLER_EU_ETAXONOMY_TAXEDITOR_FEATURETREE_E4_HANDLER_STRUCTURE_REMOVEFEATURETREEHANDLERS = "eu.etaxonomy.taxeditor.featuretree.e4.handler.structure.RemoveFeatureTreeHandlers";
-       public static final String HANDLER_EU_ETAXONOMY_TAXEDITOR_FEATURETREE_HANDLER_SAVEHANDLER = "eu.etaxonomy.taxeditor.featuretree.handler.SaveHandler";
+       public static final String HANDLER_EU_ETAXONOMY_TAXEDITOR_FEATURETREE_E4_HANDLER_ADDCHILDFEATUREHANDLER = "eu.etaxonomy.taxeditor.termtree.e4.handler.AddChildFeatureHandler";
+       public static final String HANDLER_EU_ETAXONOMY_TAXEDITOR_FEATURETREE_E4_HANDLER_ADDFEATUREHANDLER = "eu.etaxonomy.taxeditor.termtree.e4.handler.AddFeatureHandler";
+       public static final String HANDLER_EU_ETAXONOMY_TAXEDITOR_FEATURETREE_E4_HANDLER_CHARACTER_ADDFEATUREHANDLER = "eu.etaxonomy.taxeditor.termtree.e4.handler.character.AddFeatureHandler";
+       public static final String HANDLER_EU_ETAXONOMY_TAXEDITOR_FEATURETREE_E4_HANDLER_CHARACTER_CREATEFEATURETREEHANDLER = "eu.etaxonomy.taxeditor.termtree.e4.handler.character.CreateFeatureTreeHandler";
+       public static final String HANDLER_EU_ETAXONOMY_TAXEDITOR_FEATURETREE_E4_HANDLER_CHARACTER_FEATURETREEEXPORTONTOLOGYHANDLER = "eu.etaxonomy.taxeditor.termtree.e4.handler.character.FeatureTreeExportOntologyHandler";
+       public static final String HANDLER_EU_ETAXONOMY_TAXEDITOR_FEATURETREE_E4_HANDLER_CHARACTER_FEATURETREEEXPORTWORDHANDLER = "eu.etaxonomy.taxeditor.termtree.e4.handler.character.FeatureTreeExportWordHandler";
+       public static final String HANDLER_EU_ETAXONOMY_TAXEDITOR_FEATURETREE_E4_HANDLER_CHARACTER_REMOVEFEATURETREEHANDLERS = "eu.etaxonomy.taxeditor.termtree.e4.handler.character.RemoveFeatureTreeHandlers";
+       public static final String HANDLER_EU_ETAXONOMY_TAXEDITOR_FEATURETREE_E4_HANDLER_COPYFEATUREHANDLER = "eu.etaxonomy.taxeditor.termtree.e4.handler.CopyFeatureHandler";
+       public static final String HANDLER_EU_ETAXONOMY_TAXEDITOR_FEATURETREE_E4_HANDLER_CREATEFEATURETREEHANDLER = "eu.etaxonomy.taxeditor.termtree.e4.handler.CreateFeatureTreeHandler";
+       public static final String HANDLER_EU_ETAXONOMY_TAXEDITOR_FEATURETREE_E4_HANDLER_FEATURETREEEXPORTONTOLOGYHANDLER = "eu.etaxonomy.taxeditor.termtree.e4.handler.FeatureTreeExportOntologyHandler";
+       public static final String HANDLER_EU_ETAXONOMY_TAXEDITOR_FEATURETREE_E4_HANDLER_FEATURETREEEXPORTWORDHANDLER = "eu.etaxonomy.taxeditor.termtree.e4.handler.FeatureTreeExportWordHandler";
+       public static final String HANDLER_EU_ETAXONOMY_TAXEDITOR_FEATURETREE_E4_HANDLER_NAMEDAREA_ADDFEATUREHANDLER = "eu.etaxonomy.taxeditor.termtree.e4.handler.namedArea.AddFeatureHandler";
+       public static final String HANDLER_EU_ETAXONOMY_TAXEDITOR_FEATURETREE_E4_HANDLER_NAMEDAREA_CREATEFEATURETREEHANDLER = "eu.etaxonomy.taxeditor.termtree.e4.handler.namedArea.CreateFeatureTreeHandler";
+       public static final String HANDLER_EU_ETAXONOMY_TAXEDITOR_FEATURETREE_E4_HANDLER_NAMEDAREA_FEATURETREEEXPORTONTOLOGYHANDLER = "eu.etaxonomy.taxeditor.termtree.e4.handler.namedArea.FeatureTreeExportOntologyHandler";
+       public static final String HANDLER_EU_ETAXONOMY_TAXEDITOR_FEATURETREE_E4_HANDLER_NAMEDAREA_FEATURETREEEXPORTWORDHANDLER = "eu.etaxonomy.taxeditor.termtree.e4.handler.namedArea.FeatureTreeExportWordHandler";
+       public static final String HANDLER_EU_ETAXONOMY_TAXEDITOR_FEATURETREE_E4_HANDLER_NAMEDAREA_REMOVEFEATURETREEHANDLERS = "eu.etaxonomy.taxeditor.termtree.e4.handler.namedArea.RemoveFeatureTreeHandlers";
+       public static final String HANDLER_EU_ETAXONOMY_TAXEDITOR_FEATURETREE_E4_HANDLER_PASTEFEATUREHANDLER = "eu.etaxonomy.taxeditor.termtree.e4.handler.PasteTermHandler";
+       public static final String HANDLER_EU_ETAXONOMY_TAXEDITOR_FEATURETREE_E4_HANDLER_PRESENCEABSENCE_ADDFEATUREHANDLER = "eu.etaxonomy.taxeditor.termtree.e4.handler.presenceAbsence.AddFeatureHandler";
+       public static final String HANDLER_EU_ETAXONOMY_TAXEDITOR_FEATURETREE_E4_HANDLER_PRESENCEABSENCE_CREATEFEATURETREEHANDLER = "eu.etaxonomy.taxeditor.termtree.e4.handler.presenceAbsence.CreateFeatureTreeHandler";
+       public static final String HANDLER_EU_ETAXONOMY_TAXEDITOR_FEATURETREE_E4_HANDLER_PRESENCEABSENCE_FEATURETREEEXPORTONTOLOGYHANDLER = "eu.etaxonomy.taxeditor.termtree.e4.handler.presenceAbsence.FeatureTreeExportOntologyHandler";
+       public static final String HANDLER_EU_ETAXONOMY_TAXEDITOR_FEATURETREE_E4_HANDLER_PRESENCEABSENCE_FEATURETREEEXPORTWORDHANDLER = "eu.etaxonomy.taxeditor.termtree.e4.handler.presenceAbsence.FeatureTreeExportWordHandler";
+       public static final String HANDLER_EU_ETAXONOMY_TAXEDITOR_FEATURETREE_E4_HANDLER_PRESENCEABSENCE_REMOVEFEATURETREEHANDLERS = "eu.etaxonomy.taxeditor.termtree.e4.handler.presenceAbsence.RemoveFeatureTreeHandlers";
+       public static final String HANDLER_EU_ETAXONOMY_TAXEDITOR_FEATURETREE_E4_HANDLER_PROPERTY_ADDFEATUREHANDLER = "eu.etaxonomy.taxeditor.termtree.e4.handler.property.AddFeatureHandler";
+       public static final String HANDLER_EU_ETAXONOMY_TAXEDITOR_FEATURETREE_E4_HANDLER_PROPERTY_CREATEFEATURETREEHANDLER = "eu.etaxonomy.taxeditor.termtree.e4.handler.property.CreateFeatureTreeHandler";
+       public static final String HANDLER_EU_ETAXONOMY_TAXEDITOR_FEATURETREE_E4_HANDLER_PROPERTY_FEATURETREEEXPORTONTOLOGYHANDLER = "eu.etaxonomy.taxeditor.termtree.e4.handler.property.FeatureTreeExportOntologyHandler";
+       public static final String HANDLER_EU_ETAXONOMY_TAXEDITOR_FEATURETREE_E4_HANDLER_PROPERTY_FEATURETREEEXPORTWORDHANDLER = "eu.etaxonomy.taxeditor.termtree.e4.handler.property.FeatureTreeExportWordHandler";
+       public static final String HANDLER_EU_ETAXONOMY_TAXEDITOR_FEATURETREE_E4_HANDLER_PROPERTY_REMOVEFEATURETREEHANDLERS = "eu.etaxonomy.taxeditor.termtree.e4.handler.property.RemoveFeatureTreeHandlers";
+       public static final String HANDLER_EU_ETAXONOMY_TAXEDITOR_FEATURETREE_E4_HANDLER_RANK_ADDFEATUREHANDLER = "eu.etaxonomy.taxeditor.termtree.e4.handler.rank.AddFeatureHandler";
+       public static final String HANDLER_EU_ETAXONOMY_TAXEDITOR_FEATURETREE_E4_HANDLER_RANK_CREATEFEATURETREEHANDLER = "eu.etaxonomy.taxeditor.termtree.e4.handler.rank.CreateFeatureTreeHandler";
+       public static final String HANDLER_EU_ETAXONOMY_TAXEDITOR_FEATURETREE_E4_HANDLER_RANK_FEATURETREEEXPORTONTOLOGYHANDLER = "eu.etaxonomy.taxeditor.termtree.e4.handler.rank.FeatureTreeExportOntologyHandler";
+       public static final String HANDLER_EU_ETAXONOMY_TAXEDITOR_FEATURETREE_E4_HANDLER_RANK_FEATURETREEEXPORTWORDHANDLER = "eu.etaxonomy.taxeditor.termtree.e4.handler.rank.FeatureTreeExportWordHandler";
+       public static final String HANDLER_EU_ETAXONOMY_TAXEDITOR_FEATURETREE_E4_HANDLER_RANK_REMOVEFEATURETREEHANDLERS = "eu.etaxonomy.taxeditor.termtree.e4.handler.rank.RemoveFeatureTreeHandlers";
+       public static final String HANDLER_EU_ETAXONOMY_TAXEDITOR_FEATURETREE_E4_HANDLER_REMOVEFEATUREHANDLER = "eu.etaxonomy.taxeditor.termtree.e4.handler.RemoveFeatureHandler";
+       public static final String HANDLER_EU_ETAXONOMY_TAXEDITOR_FEATURETREE_E4_HANDLER_REMOVEFEATURETREEHANDLERS = "eu.etaxonomy.taxeditor.termtree.e4.handler.RemoveFeatureTreeHandlers";
+       public static final String HANDLER_EU_ETAXONOMY_TAXEDITOR_FEATURETREE_E4_HANDLER_STRUCTURE_ADDFEATUREHANDLER = "eu.etaxonomy.taxeditor.termtree.e4.handler.structure.AddFeatureHandler";
+       public static final String HANDLER_EU_ETAXONOMY_TAXEDITOR_FEATURETREE_E4_HANDLER_STRUCTURE_CREATEFEATURETREEHANDLER = "eu.etaxonomy.taxeditor.termtree.e4.handler.structure.CreateFeatureTreeHandler";
+       public static final String HANDLER_EU_ETAXONOMY_TAXEDITOR_FEATURETREE_E4_HANDLER_STRUCTURE_FEATURETREEEXPORTONTOLOGYHANDLER = "eu.etaxonomy.taxeditor.termtree.e4.handler.structure.FeatureTreeExportOntologyHandler";
+       public static final String HANDLER_EU_ETAXONOMY_TAXEDITOR_FEATURETREE_E4_HANDLER_STRUCTURE_FEATURETREEEXPORTWORDHANDLER = "eu.etaxonomy.taxeditor.termtree.e4.handler.structure.FeatureTreeExportWordHandler";
+       public static final String HANDLER_EU_ETAXONOMY_TAXEDITOR_FEATURETREE_E4_HANDLER_STRUCTURE_REMOVEFEATURETREEHANDLERS = "eu.etaxonomy.taxeditor.termtree.e4.handler.structure.RemoveFeatureTreeHandlers";
+       public static final String HANDLER_EU_ETAXONOMY_TAXEDITOR_FEATURETREE_HANDLER_SAVEHANDLER = "eu.etaxonomy.taxeditor.termtree.handler.SaveHandler";
        public static final String HANDLER_EU_ETAXONOMY_TAXEDITOR_HANDLER_DEFAULTHANDLER_E4_DEFAULTOPENCLASSIFICATIONWIZARDHANDLERE4 = "eu.etaxonomy.taxeditor.handler.defaultHandler.e4.DefaultOpenClassificationWizardHandlerE4";
        public static final String HANDLER_EU_ETAXONOMY_TAXEDITOR_HANDLER_DEFAULTHANDLER_E4_DEFAULTOPENTAXONNODEWIZARDHANDLERE4 = "eu.etaxonomy.taxeditor.handler.defaultHandler.e4.DefaultOpenTaxonNodeWizardHandlerE4";
        public static final String HANDLER_EU_ETAXONOMY_TAXEDITOR_HANDLER_DEFAULTHANDLER_OPENREFERENCINGOBJECTSVIEWHANDLER = "eu.etaxonomy.taxeditor.handler.defaultHandler.OpenReferencingObjectsViewHandler";
@@ -337,15 +337,15 @@ public class AppModelId {
        public static final String PARAMETER_EU_ETAXONOMY_TAXEDITOR_STORE_SHOWVIEW_PARAMETER_SUPPLEMENTALDATAVIEW = "eu.etaxonomy.taxeditor.store.showView.parameter.supplementalDataView";
        public static final String PARAMETER_EU_ETAXONOMY_TAXEDITOR_STORE_SHOWVIEW_PARAMETER_TERMSEARCH = "eu.etaxonomy.taxeditor.store.showView.parameter.termsearch";
        public static final String PARTDESCRIPTOR_EU_ETAXONOMY_TAXEDITOR_EDITOR_DEFINEDTERM = "eu.etaxonomy.taxeditor.editor.definedTerm";
-       public static final String PARTDESCRIPTOR_EU_ETAXONOMY_TAXEDITOR_EDITOR_TERMTREE = "eu.etaxonomy.taxeditor.featuretree.e4.termTreeEditor";
-       public static final String PARTDESCRIPTOR_EU_ETAXONOMY_TAXEDITOR_FEATURETREE_E4_CHARACTERTREEEDITOR = "eu.etaxonomy.taxeditor.featuretree.e4.CharacterTreeEditor";
-       public static final String PARTDESCRIPTOR_EU_ETAXONOMY_TAXEDITOR_FEATURETREE_E4_FEATURETREEEDITOR = "eu.etaxonomy.taxeditor.featuretree.e4.FeatureTreeEditor";
-       public static final String PARTDESCRIPTOR_EU_ETAXONOMY_TAXEDITOR_FEATURETREE_E4_NAMEDAREATREEEDITOR = "eu.etaxonomy.taxeditor.featuretree.e4.NamedAreaTreeEditor";
-       public static final String PARTDESCRIPTOR_EU_ETAXONOMY_TAXEDITOR_FEATURETREE_E4_PRESENCEABSENCETREEEDITOR = "eu.etaxonomy.taxeditor.featuretree.e4.PresenceAbsenceTreeEditor";
-       public static final String PARTDESCRIPTOR_EU_ETAXONOMY_TAXEDITOR_FEATURETREE_E4_NOMENCLATURALSTATUSTYPETREEEDITOR = "eu.etaxonomy.taxeditor.featuretree.e4.nomenclaturalStatusTypeTreeEditor";
-       public static final String PARTDESCRIPTOR_EU_ETAXONOMY_TAXEDITOR_FEATURETREE_E4_PROPERTYTREEEDITOR = "eu.etaxonomy.taxeditor.featuretree.e4.PropertyTreeEditor";
-       public static final String PARTDESCRIPTOR_EU_ETAXONOMY_TAXEDITOR_FEATURETREE_E4_RANKTREEEDITOR = "eu.etaxonomy.taxeditor.featuretree.e4.RankTreeEditor";
-       public static final String PARTDESCRIPTOR_EU_ETAXONOMY_TAXEDITOR_FEATURETREE_E4_STRUCTURETREEEDITOR = "eu.etaxonomy.taxeditor.featuretree.e4.StructureTreeEditor";
+       public static final String PARTDESCRIPTOR_EU_ETAXONOMY_TAXEDITOR_EDITOR_TERMTREE = "eu.etaxonomy.taxeditor.termtree.e4.termTreeEditor";
+       public static final String PARTDESCRIPTOR_EU_ETAXONOMY_TAXEDITOR_FEATURETREE_E4_CHARACTERTREEEDITOR = "eu.etaxonomy.taxeditor.termtree.e4.CharacterTreeEditor";
+       public static final String PARTDESCRIPTOR_EU_ETAXONOMY_TAXEDITOR_FEATURETREE_E4_FEATURETREEEDITOR = "eu.etaxonomy.taxeditor.termtree.e4.FeatureTreeEditor";
+       public static final String PARTDESCRIPTOR_EU_ETAXONOMY_TAXEDITOR_FEATURETREE_E4_NAMEDAREATREEEDITOR = "eu.etaxonomy.taxeditor.termtree.e4.NamedAreaTreeEditor";
+       public static final String PARTDESCRIPTOR_EU_ETAXONOMY_TAXEDITOR_FEATURETREE_E4_PRESENCEABSENCETREEEDITOR = "eu.etaxonomy.taxeditor.termtree.e4.PresenceAbsenceTreeEditor";
+       public static final String PARTDESCRIPTOR_EU_ETAXONOMY_TAXEDITOR_FEATURETREE_E4_NOMENCLATURALSTATUSTYPETREEEDITOR = "eu.etaxonomy.taxeditor.termtree.e4.nomenclaturalStatusTypeTreeEditor";
+       public static final String PARTDESCRIPTOR_EU_ETAXONOMY_TAXEDITOR_FEATURETREE_E4_PROPERTYTREEEDITOR = "eu.etaxonomy.taxeditor.termtree.e4.PropertyTreeEditor";
+       public static final String PARTDESCRIPTOR_EU_ETAXONOMY_TAXEDITOR_FEATURETREE_E4_RANKTREEEDITOR = "eu.etaxonomy.taxeditor.termtree.e4.RankTreeEditor";
+       public static final String PARTDESCRIPTOR_EU_ETAXONOMY_TAXEDITOR_FEATURETREE_E4_STRUCTURETREEEDITOR = "eu.etaxonomy.taxeditor.termtree.e4.StructureTreeEditor";
        public static final String PARTDESCRIPTOR_EU_ETAXONOMY_TAXEDITOR_STORE_PARTDESCRIPTOR_OCCURENCESEARCH = "eu.etaxonomy.taxeditor.store.partdescriptor.occurencesearch";
        public static final String PARTDESCRIPTOR_EU_ETAXONOMY_TAXEDITOR_STORE_PARTDESCRIPTOR_SEARCHDIALOG = "eu.etaxonomy.taxeditor.store.partdescriptor.SearchDialog";
        public static final String PARTDESCRIPTOR_EU_ETAXONOMY_TAXEDITOR_STORE_PARTDESCRIPTOR_TERMSEARCH = "eu.etaxonomy.taxeditor.store.partdescriptor.termsearch";

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/AvailableTermsWizard.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/termtree/AvailableTermsWizard.java
similarity index 97%
rename from eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/AvailableTermsWizard.java
rename to eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/termtree/AvailableTermsWizard.java
index 85fc9261aaa97ebf50a2c3839d3d37511682606b..50484a6298758b68dd29d5250e172d36cdf1c5e7 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/AvailableTermsWizard.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/termtree/AvailableTermsWizard.java
@@ -7,7 +7,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.featuretree;
+package eu.etaxonomy.taxeditor.termtree;
 
 import java.util.List;
 import java.util.Set;

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/AvailableTermsWizardPage.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/termtree/AvailableTermsWizardPage.java
similarity index 98%
rename from eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/AvailableTermsWizardPage.java
rename to eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/termtree/AvailableTermsWizardPage.java
index 56549c8e1e1117903ec3711e9052357d01ce743b..127319f4919eef8255a7794e7a546b6f28f639a1 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/AvailableTermsWizardPage.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/termtree/AvailableTermsWizardPage.java
@@ -7,7 +7,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.featuretree;
+package eu.etaxonomy.taxeditor.termtree;
 
 import java.util.Arrays;
 import java.util.HashSet;

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/CharacterNodeDtoTransfer.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/termtree/CharacterNodeDtoTransfer.java
similarity index 97%
rename from eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/CharacterNodeDtoTransfer.java
rename to eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/termtree/CharacterNodeDtoTransfer.java
index ff502871010de85b1f9ab75d00e8a37489b4efb0..d711a54e98b7cba329ecb16272748693d8803c43 100755 (executable)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/CharacterNodeDtoTransfer.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/termtree/CharacterNodeDtoTransfer.java
@@ -6,7 +6,7 @@
 * The contents of this file are subject to the Mozilla Public License Version 1.1
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
-package eu.etaxonomy.taxeditor.featuretree;
+package eu.etaxonomy.taxeditor.termtree;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -44,7 +44,7 @@ public class CharacterNodeDtoTransfer extends ByteArrayTransfer {
     /**
      * <p>Getter for the field <code>instance</code>.</p>
      *
-     * @return a {@link eu.etaxonomy.taxeditor.featuretree.FeatureNodeTransfer} object.
+     * @return a {@link eu.etaxonomy.taxeditor.termtree.FeatureNodeTransfer} object.
      */
     public static synchronized CharacterNodeDtoTransfer getInstance() {
         return instance;

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/CharacterTransfer.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/termtree/CharacterTransfer.java
similarity index 99%
rename from eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/CharacterTransfer.java
rename to eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/termtree/CharacterTransfer.java
index 766f719f894e4b17a761de69f4d6c7695119bdfa..50fed2156d07dddd80022c5a45ec79dffbe9e5c7 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/CharacterTransfer.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/termtree/CharacterTransfer.java
@@ -6,7 +6,7 @@
 * The contents of this file are subject to the Mozilla Public License Version 1.1
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
-package eu.etaxonomy.taxeditor.featuretree;
+package eu.etaxonomy.taxeditor.termtree;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/TermChooseWizard.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/termtree/TermChooseWizard.java
similarity index 96%
rename from eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/TermChooseWizard.java
rename to eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/termtree/TermChooseWizard.java
index b68f393a2a7365f2f075fe62b14a0c2cfd12adb3..3ce8c204339daa48a355ce7cbc5ed421723676a2 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/TermChooseWizard.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/termtree/TermChooseWizard.java
@@ -7,7 +7,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.featuretree;
+package eu.etaxonomy.taxeditor.termtree;
 
 import java.util.List;
 

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/TermChooseWizardPage.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/termtree/TermChooseWizardPage.java
similarity index 97%
rename from eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/TermChooseWizardPage.java
rename to eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/termtree/TermChooseWizardPage.java
index e56809a2b58d916c1fe5e796db197bfdfb0e9e4b..c0c725971d3a7c191f661b01481816098bcc6962 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/TermChooseWizardPage.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/termtree/TermChooseWizardPage.java
@@ -7,7 +7,7 @@
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 
-package eu.etaxonomy.taxeditor.featuretree;
+package eu.etaxonomy.taxeditor.termtree;
 
 import java.util.ArrayList;
 import java.util.List;

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/TermNodeDtoTransfer.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/termtree/TermNodeDtoTransfer.java
similarity index 97%
rename from eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/TermNodeDtoTransfer.java
rename to eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/termtree/TermNodeDtoTransfer.java
index 726c17db96360d2a6de8f776fb63d315313ccf2e..45222cb8228666ce7ef6ce5bad68a676ecaef0a2 100755 (executable)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/TermNodeDtoTransfer.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/termtree/TermNodeDtoTransfer.java
@@ -6,7 +6,7 @@
 * The contents of this file are subject to the Mozilla Public License Version 1.1
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
-package eu.etaxonomy.taxeditor.featuretree;
+package eu.etaxonomy.taxeditor.termtree;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -42,7 +42,7 @@ public class TermNodeDtoTransfer extends ByteArrayTransfer {
     /**
      * <p>Getter for the field <code>instance</code>.</p>
      *
-     * @return a {@link eu.etaxonomy.taxeditor.featuretree.FeatureNodeTransfer} object.
+     * @return a {@link eu.etaxonomy.taxeditor.termtree.FeatureNodeTransfer} object.
      */
     public static synchronized TermNodeDtoTransfer getInstance() {
         return instance;

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/TermNodeTransfer.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/termtree/TermNodeTransfer.java
similarity index 97%
rename from eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/TermNodeTransfer.java
rename to eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/termtree/TermNodeTransfer.java
index 15e7c4f77fa0247ae9197a247072730030d18549..784758a9c219fe402cc5bc15c569b7e61b02fccf 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/TermNodeTransfer.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/termtree/TermNodeTransfer.java
@@ -7,7 +7,7 @@
  * See LICENSE.TXT at the top of this package for the full license terms.
  */
 
-package eu.etaxonomy.taxeditor.featuretree;
+package eu.etaxonomy.taxeditor.termtree;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -44,7 +44,7 @@ public class TermNodeTransfer extends ByteArrayTransfer {
        /**
         * <p>Getter for the field <code>instance</code>.</p>
         *
-        * @return a {@link eu.etaxonomy.taxeditor.featuretree.FeatureNodeTransfer} object.
+        * @return a {@link eu.etaxonomy.taxeditor.termtree.FeatureNodeTransfer} object.
         */
        public static synchronized TermNodeTransfer getInstance() {
                return instance;

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/TermTreeContentProvider.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/termtree/TermTreeContentProvider.java
similarity index 98%
rename from eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/TermTreeContentProvider.java
rename to eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/termtree/TermTreeContentProvider.java
index b4b2beaa953832da6e195c7a2fa4786a01b03573..486c09ea99fdbdfa1ef08e6fdfb9d8074dc53257 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/TermTreeContentProvider.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/termtree/TermTreeContentProvider.java
@@ -6,7 +6,7 @@
 * The contents of this file are subject to the Mozilla Public License Version 1.1
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
-package eu.etaxonomy.taxeditor.featuretree;
+package eu.etaxonomy.taxeditor.termtree;
 
 import java.util.HashMap;
 import java.util.List;

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/TermTreeLabelProvider.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/termtree/TermTreeLabelProvider.java
similarity index 98%
rename from eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/TermTreeLabelProvider.java
rename to eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/termtree/TermTreeLabelProvider.java
index c0c4b64e6f5e4712258aaab7024ac39b1919a722..b66cf55f4f8608440c01ae5530f3c010f4374187 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/TermTreeLabelProvider.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/termtree/TermTreeLabelProvider.java
@@ -6,7 +6,7 @@
 * The contents of this file are subject to the Mozilla Public License Version 1.1
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
-package eu.etaxonomy.taxeditor.featuretree;
+package eu.etaxonomy.taxeditor.termtree;
 
 import java.util.ArrayList;
 

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/TermTreePropertyTester.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/termtree/TermTreePropertyTester.java
similarity index 95%
rename from eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/TermTreePropertyTester.java
rename to eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/termtree/TermTreePropertyTester.java
index 6cc3ce7b658333ea742ebecc979dbd6fad842c35..562e4a025dd3d4103b6fe6350c7532db2a267924 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/TermTreePropertyTester.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/termtree/TermTreePropertyTester.java
@@ -1,7 +1,7 @@
 /**
  *
  */
-package eu.etaxonomy.taxeditor.featuretree;
+package eu.etaxonomy.taxeditor.termtree;
 
 import org.eclipse.core.expressions.PropertyTester;
 import org.eclipse.jface.viewers.IStructuredSelection;

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/ICharacterEditor.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/termtree/e4/ICharacterEditor.java
similarity index 90%
rename from eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/ICharacterEditor.java
rename to eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/termtree/e4/ICharacterEditor.java
index 0d04772b5e4ba609223da71cb98f710756393950..635642e2d8074cc83e12efa2cad86b8f1eeac113 100755 (executable)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/ICharacterEditor.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/termtree/e4/ICharacterEditor.java
@@ -6,7 +6,7 @@
 * The contents of this file are subject to the Mozilla Public License Version 1.1
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
-package eu.etaxonomy.taxeditor.featuretree.e4;
+package eu.etaxonomy.taxeditor.termtree.e4;
 
 
 import eu.etaxonomy.cdm.model.description.Character;

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/ITermTreeEditor.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/termtree/e4/ITermTreeEditor.java
similarity index 96%
rename from eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/ITermTreeEditor.java
rename to eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/termtree/e4/ITermTreeEditor.java
index d2e0c690a5c69a49aa4ee9b2ccf887c833a2b111..efa0b4e1da55e2f4a3d17bc7e061ec5e3d94444a 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/ITermTreeEditor.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/termtree/e4/ITermTreeEditor.java
@@ -6,7 +6,7 @@
 * The contents of this file are subject to the Mozilla Public License Version 1.1
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
-package eu.etaxonomy.taxeditor.featuretree.e4;
+package eu.etaxonomy.taxeditor.termtree.e4;
 
 import java.util.UUID;
 

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/TermNodeDragListener.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/termtree/e4/TermNodeDragListener.java
similarity index 93%
rename from eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/TermNodeDragListener.java
rename to eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/termtree/e4/TermNodeDragListener.java
index cf018be44dd9551a353458614cfa6c43f64c1253..b44d59168f74a4f4644a796bf3bac16ca357026a 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/TermNodeDragListener.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/termtree/e4/TermNodeDragListener.java
@@ -6,7 +6,7 @@
 * The contents of this file are subject to the Mozilla Public License Version 1.1
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
-package eu.etaxonomy.taxeditor.featuretree.e4;
+package eu.etaxonomy.taxeditor.termtree.e4;
 
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.IStructuredSelection;
@@ -15,7 +15,7 @@ import org.eclipse.swt.dnd.DragSourceAdapter;
 import org.eclipse.swt.dnd.DragSourceEvent;
 
 import eu.etaxonomy.cdm.model.term.TermNode;
-import eu.etaxonomy.taxeditor.featuretree.TermNodeTransfer;
+import eu.etaxonomy.taxeditor.termtree.TermNodeTransfer;
 
 public class TermNodeDragListener extends DragSourceAdapter {
 

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/TermNodeDtoDragListener.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/termtree/e4/TermNodeDtoDragListener.java
similarity index 95%
rename from eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/TermNodeDtoDragListener.java
rename to eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/termtree/e4/TermNodeDtoDragListener.java
index 96d74ca3098456b3366c209f5d54011c2c809bc5..d2e404c710b115fed7229594e77f00c0b607542b 100755 (executable)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/TermNodeDtoDragListener.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/termtree/e4/TermNodeDtoDragListener.java
@@ -6,7 +6,7 @@
 * The contents of this file are subject to the Mozilla Public License Version 1.1
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
-package eu.etaxonomy.taxeditor.featuretree.e4;
+package eu.etaxonomy.taxeditor.termtree.e4;
 
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.IStructuredSelection;
@@ -17,7 +17,7 @@ import org.eclipse.swt.dnd.DragSourceEvent;
 
 import eu.etaxonomy.cdm.model.term.TermNode;
 import eu.etaxonomy.cdm.persistence.dto.TermNodeDto;
-import eu.etaxonomy.taxeditor.featuretree.TermNodeDtoTransfer;
+import eu.etaxonomy.taxeditor.termtree.TermNodeDtoTransfer;
 
 public class TermNodeDtoDragListener extends DragSourceAdapter {
 

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/TermTreeDropAdapter.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/termtree/e4/TermTreeDropAdapter.java
similarity index 96%
rename from eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/TermTreeDropAdapter.java
rename to eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/termtree/e4/TermTreeDropAdapter.java
index 46be22eec625aa14a2db8880e495345511ab5896..c07c79a213b7cffe8527a2ae18a1dada423d0f4f 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/TermTreeDropAdapter.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/termtree/e4/TermTreeDropAdapter.java
@@ -6,7 +6,7 @@
 * The contents of this file are subject to the Mozilla Public License Version 1.1
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
-package eu.etaxonomy.taxeditor.featuretree.e4;
+package eu.etaxonomy.taxeditor.termtree.e4;
 
 import java.util.Arrays;
 import java.util.Collection;
@@ -31,13 +31,13 @@ import eu.etaxonomy.cdm.persistence.dto.TermDto;
 import eu.etaxonomy.cdm.persistence.dto.TermNodeDto;
 import eu.etaxonomy.taxeditor.editor.definedterm.TermTransfer;
 import eu.etaxonomy.taxeditor.editor.definedterm.e4.DefinedTermDropAdapterE4;
-import eu.etaxonomy.taxeditor.featuretree.TermNodeTransfer;
-import eu.etaxonomy.taxeditor.featuretree.e4.operation.AddFeatureOperation;
-import eu.etaxonomy.taxeditor.featuretree.e4.operation.AddOntologyTermOperation;
-import eu.etaxonomy.taxeditor.featuretree.e4.operation.MoveFeatureOperation;
 import eu.etaxonomy.taxeditor.l10n.Messages;
 import eu.etaxonomy.taxeditor.model.MessagingUtils;
 import eu.etaxonomy.taxeditor.store.StoreUtil;
+import eu.etaxonomy.taxeditor.termtree.TermNodeTransfer;
+import eu.etaxonomy.taxeditor.termtree.e4.operation.AddFeatureOperation;
+import eu.etaxonomy.taxeditor.termtree.e4.operation.AddOntologyTermOperation;
+import eu.etaxonomy.taxeditor.termtree.e4.operation.MoveFeatureOperation;
 import eu.etaxonomy.taxeditor.ui.dialog.selection.TermVocabularySelectionDialog;
 import eu.etaxonomy.taxeditor.view.webimport.termimport.wrapper.OntologyTermWrapper;
 

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/TermTreeDtoDropAdapter.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/termtree/e4/TermTreeDtoDropAdapter.java
similarity index 96%
rename from eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/TermTreeDtoDropAdapter.java
rename to eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/termtree/e4/TermTreeDtoDropAdapter.java
index 284a25da6ef3d49fb1d0cbdd697d09a3280840bc..5a1b31b6de7c2261c6add6873704b791760f74fe 100755 (executable)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/TermTreeDtoDropAdapter.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/termtree/e4/TermTreeDtoDropAdapter.java
@@ -6,7 +6,7 @@
 * The contents of this file are subject to the Mozilla Public License Version 1.1
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
-package eu.etaxonomy.taxeditor.featuretree.e4;
+package eu.etaxonomy.taxeditor.termtree.e4;
 
 import java.util.Arrays;
 import java.util.Collection;
@@ -31,12 +31,12 @@ import eu.etaxonomy.cdm.persistence.dto.TermNodeDto;
 import eu.etaxonomy.cdm.persistence.dto.TermTreeDto;
 import eu.etaxonomy.taxeditor.editor.definedterm.TermTransfer;
 import eu.etaxonomy.taxeditor.editor.definedterm.e4.DefinedTermDropAdapterE4;
-import eu.etaxonomy.taxeditor.featuretree.TermNodeDtoTransfer;
-import eu.etaxonomy.taxeditor.featuretree.e4.operation.AddFeatureOperation;
-import eu.etaxonomy.taxeditor.featuretree.e4.operation.AddOntologyTermOperation;
-import eu.etaxonomy.taxeditor.featuretree.e4.operation.MoveFeatureOperation;
 import eu.etaxonomy.taxeditor.l10n.Messages;
 import eu.etaxonomy.taxeditor.model.MessagingUtils;
+import eu.etaxonomy.taxeditor.termtree.TermNodeDtoTransfer;
+import eu.etaxonomy.taxeditor.termtree.e4.operation.AddFeatureOperation;
+import eu.etaxonomy.taxeditor.termtree.e4.operation.AddOntologyTermOperation;
+import eu.etaxonomy.taxeditor.termtree.e4.operation.MoveFeatureOperation;
 import eu.etaxonomy.taxeditor.ui.dialog.selection.TermVocabularySelectionDialog;
 import eu.etaxonomy.taxeditor.view.webimport.termimport.wrapper.OntologyTermWrapper;
 

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/FeatureTreeDtoEditorComposite.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/termtree/e4/TermTreeDtoEditorComposite.java
similarity index 95%
rename from eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/FeatureTreeDtoEditorComposite.java
rename to eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/termtree/e4/TermTreeDtoEditorComposite.java
index df40a4b56e8b9769a22d7665c48397a674d74c2e..1958846db6f1a0c3f4d93044c9a88d75483067f5 100755 (executable)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/FeatureTreeDtoEditorComposite.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/termtree/e4/TermTreeDtoEditorComposite.java
@@ -6,7 +6,7 @@
 * The contents of this file are subject to the Mozilla Public License Version 1.1
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
-package eu.etaxonomy.taxeditor.featuretree.e4;
+package eu.etaxonomy.taxeditor.termtree.e4;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -38,21 +38,21 @@ import eu.etaxonomy.cdm.model.term.TermType;
 import eu.etaxonomy.cdm.persistence.dto.TermNodeDto;
 import eu.etaxonomy.cdm.persistence.dto.TermTreeDto;
 import eu.etaxonomy.taxeditor.editor.definedterm.TermTransfer;
-import eu.etaxonomy.taxeditor.featuretree.CharacterNodeDtoTransfer;
-import eu.etaxonomy.taxeditor.featuretree.TermTreeContentProvider;
-import eu.etaxonomy.taxeditor.featuretree.TermTreeLabelProvider;
 import eu.etaxonomy.taxeditor.l10n.Messages;
 import eu.etaxonomy.taxeditor.model.IDirtyMarkable;
 import eu.etaxonomy.taxeditor.model.ImageResources;
 import eu.etaxonomy.taxeditor.store.CdmStore;
 import eu.etaxonomy.taxeditor.store.StoreUtil;
+import eu.etaxonomy.taxeditor.termtree.CharacterNodeDtoTransfer;
+import eu.etaxonomy.taxeditor.termtree.TermTreeContentProvider;
+import eu.etaxonomy.taxeditor.termtree.TermTreeLabelProvider;
 import eu.etaxonomy.taxeditor.ui.dialog.selection.FeatureTreeSelectionDialog;
 
 /**
  * @author pplitzner
  * @since Jun 19, 2017
  */
-public class FeatureTreeDtoEditorComposite <T extends DefinedTermBase> extends Composite{
+public class TermTreeDtoEditorComposite <T extends DefinedTermBase> extends Composite{
 
     private TermTreeDto featureTree;
 
@@ -63,7 +63,7 @@ public class FeatureTreeDtoEditorComposite <T extends DefinedTermBase> extends C
 
     private Map<UUID, TermNodeDto> nodeUuidMap = new HashMap<>();
 
-    public FeatureTreeDtoEditorComposite(Composite parent, int style) {
+    public TermTreeDtoEditorComposite(Composite parent, int style) {
         super(parent, style);
         setLayout(new GridLayout(1, false));
 

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/TermTreeEditor.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/termtree/e4/TermTreeEditor.java
similarity index 97%
rename from eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/TermTreeEditor.java
rename to eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/termtree/e4/TermTreeEditor.java
index 0b1f801bf8bc492666f300b5ffbfc0aa5ec4d8eb..35f5c7835c81966a402ea7de7fbcceb985436a98 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/TermTreeEditor.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/termtree/e4/TermTreeEditor.java
@@ -7,7 +7,7 @@
  * See LICENSE.TXT at the top of this package for the full license terms.
  */
 
-package eu.etaxonomy.taxeditor.featuretree.e4;
+package eu.etaxonomy.taxeditor.termtree.e4;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -61,11 +61,6 @@ import eu.etaxonomy.cdm.persistence.hibernate.CdmDataChangeMap;
 import eu.etaxonomy.taxeditor.editor.definedterm.TermTreeViewerComparator;
 import eu.etaxonomy.taxeditor.editor.definedterm.TermTransfer;
 import eu.etaxonomy.taxeditor.event.WorkbenchEventConstants;
-import eu.etaxonomy.taxeditor.featuretree.TermNodeDtoTransfer;
-import eu.etaxonomy.taxeditor.featuretree.TermTreeContentProvider;
-import eu.etaxonomy.taxeditor.featuretree.TermTreeLabelProvider;
-import eu.etaxonomy.taxeditor.featuretree.e4.operation.AddFeatureOperation;
-import eu.etaxonomy.taxeditor.featuretree.e4.operation.CreateFeatureTreeOperation;
 import eu.etaxonomy.taxeditor.l10n.Messages;
 import eu.etaxonomy.taxeditor.model.AbstractUtility;
 import eu.etaxonomy.taxeditor.model.IContextListener;
@@ -78,6 +73,11 @@ import eu.etaxonomy.taxeditor.session.ICdmEntitySession;
 import eu.etaxonomy.taxeditor.store.AppModelId;
 import eu.etaxonomy.taxeditor.store.CdmStore;
 import eu.etaxonomy.taxeditor.store.StoreUtil;
+import eu.etaxonomy.taxeditor.termtree.TermNodeDtoTransfer;
+import eu.etaxonomy.taxeditor.termtree.TermTreeContentProvider;
+import eu.etaxonomy.taxeditor.termtree.TermTreeLabelProvider;
+import eu.etaxonomy.taxeditor.termtree.e4.operation.AddFeatureOperation;
+import eu.etaxonomy.taxeditor.termtree.e4.operation.CreateFeatureTreeOperation;
 import eu.etaxonomy.taxeditor.workbench.part.IE4ViewerPart;
 
 /**

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/TermTreeEditorComposite.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/termtree/e4/TermTreeEditorComposite.java
similarity index 97%
rename from eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/TermTreeEditorComposite.java
rename to eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/termtree/e4/TermTreeEditorComposite.java
index 9b2b281618ec39ea5bf82a71f761f5685d035935..e92fb512cafbb842407f16792d5f2a63b4b2a6d3 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/TermTreeEditorComposite.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/termtree/e4/TermTreeEditorComposite.java
@@ -6,7 +6,7 @@
 * The contents of this file are subject to the Mozilla Public License Version 1.1
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
-package eu.etaxonomy.taxeditor.featuretree.e4;
+package eu.etaxonomy.taxeditor.termtree.e4;
 
 import org.eclipse.jface.viewers.ISelectionChangedListener;
 import org.eclipse.jface.viewers.TreeViewer;
@@ -31,13 +31,13 @@ import eu.etaxonomy.cdm.model.term.DefinedTermBase;
 import eu.etaxonomy.cdm.model.term.TermTree;
 import eu.etaxonomy.cdm.model.term.TermType;
 import eu.etaxonomy.taxeditor.editor.definedterm.TermTransfer;
-import eu.etaxonomy.taxeditor.featuretree.TermNodeTransfer;
-import eu.etaxonomy.taxeditor.featuretree.TermTreeContentProvider;
-import eu.etaxonomy.taxeditor.featuretree.TermTreeLabelProvider;
 import eu.etaxonomy.taxeditor.l10n.Messages;
 import eu.etaxonomy.taxeditor.model.IDirtyMarkable;
 import eu.etaxonomy.taxeditor.model.ImageResources;
 import eu.etaxonomy.taxeditor.store.StoreUtil;
+import eu.etaxonomy.taxeditor.termtree.TermNodeTransfer;
+import eu.etaxonomy.taxeditor.termtree.TermTreeContentProvider;
+import eu.etaxonomy.taxeditor.termtree.TermTreeLabelProvider;
 import eu.etaxonomy.taxeditor.ui.dialog.selection.FeatureTreeSelectionDialog;
 
 /**

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/termtree/e4/TermTreeSorter.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/termtree/e4/TermTreeSorter.java
new file mode 100755 (executable)
index 0000000..94ee238
--- /dev/null
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/termtree/e4/TermTreeSorter.java
@@ -0,0 +1,41 @@
+/**
+* Copyright (C) 2021 EDIT
+* European Distributed Institute of Taxonomy
+* http://www.e-taxonomy.eu
+*
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+package eu.etaxonomy.taxeditor.termtree.e4;
+
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.jface.viewers.ViewerComparator;
+
+import eu.etaxonomy.cdm.common.CdmUtils;
+import eu.etaxonomy.cdm.persistence.dto.TermNodeDto;
+import eu.etaxonomy.taxeditor.preference.IPreferenceKeys;
+import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
+
+
+/**
+ * @author k.luther
+ * @since Mar 1, 2021
+ */
+public class TermTreeSorter extends ViewerComparator {
+
+
+    @Override
+    public int compare(Viewer viewer, Object e1, Object e2) {
+        if (e1 instanceof TermNodeDto && e2 instanceof TermNodeDto){
+            boolean showIdInVoc = PreferencesUtil.getBooleanValue(IPreferenceKeys.SHOW_VOCABULARY_ID_FOR_TERM_LABELS, true);
+            String label1 = ((TermNodeDto) e1).getTerm().getRepresentation_L10n();
+            String label2 = ((TermNodeDto) e2).getTerm().getRepresentation_L10n();
+            if(showIdInVoc){
+                label1 = CdmUtils.concat(" : ", ((TermNodeDto) e1).getTerm().getIdInVocabulary(), label1);
+                label2 = CdmUtils.concat(" : ", ((TermNodeDto) e1).getTerm().getIdInVocabulary(), label2);
+            }
+            return label1.compareTo(label2);
+        }
+        return super.compare(viewer, e1, e2);
+    }
+}

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/handler/AbstractAddTermHandler.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/termtree/e4/handler/AbstractAddTermHandler.java
similarity index 92%
rename from eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/handler/AbstractAddTermHandler.java
rename to eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/termtree/e4/handler/AbstractAddTermHandler.java
index 0057de8d1189c976bdca3b50c7778b9d0c847d84..01040e6446fc75e3cf59256c438f36c4b6cc3eb0 100755 (executable)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/handler/AbstractAddTermHandler.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/termtree/e4/handler/AbstractAddTermHandler.java
@@ -6,7 +6,7 @@
 * The contents of this file are subject to the Mozilla Public License Version 1.1
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
-package eu.etaxonomy.taxeditor.featuretree.e4.handler;
+package eu.etaxonomy.taxeditor.termtree.e4.handler;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -30,13 +30,13 @@ import eu.etaxonomy.cdm.persistence.dto.CharacterDto;
 import eu.etaxonomy.cdm.persistence.dto.CharacterNodeDto;
 import eu.etaxonomy.cdm.persistence.dto.TermDto;
 import eu.etaxonomy.cdm.persistence.dto.TermNodeDto;
-import eu.etaxonomy.taxeditor.featuretree.AvailableTermsWizard;
-import eu.etaxonomy.taxeditor.featuretree.e4.ICharacterEditor;
-import eu.etaxonomy.taxeditor.featuretree.e4.ITermTreeEditor;
-import eu.etaxonomy.taxeditor.featuretree.e4.TermTreeEditor;
-import eu.etaxonomy.taxeditor.featuretree.e4.operation.AddFeatureOperation;
 import eu.etaxonomy.taxeditor.l10n.Messages;
 import eu.etaxonomy.taxeditor.model.MessagingUtils;
+import eu.etaxonomy.taxeditor.termtree.AvailableTermsWizard;
+import eu.etaxonomy.taxeditor.termtree.e4.ICharacterEditor;
+import eu.etaxonomy.taxeditor.termtree.e4.ITermTreeEditor;
+import eu.etaxonomy.taxeditor.termtree.e4.TermTreeEditor;
+import eu.etaxonomy.taxeditor.termtree.e4.operation.AddFeatureOperation;
 
 /**
  * @author k.luther

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/handler/AddChildTermHandler.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/termtree/e4/handler/AddChildTermHandler.java
similarity index 92%
rename from eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/handler/AddChildTermHandler.java
rename to eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/termtree/e4/handler/AddChildTermHandler.java
index bdcadc21c63b65d02c92203fde189bff0a2f8c74..3423d43c92de084ad2f949886233afb494fce88b 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/handler/AddChildTermHandler.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/termtree/e4/handler/AddChildTermHandler.java
@@ -6,7 +6,7 @@
 * The contents of this file are subject to the Mozilla Public License Version 1.1
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
-package eu.etaxonomy.taxeditor.featuretree.e4.handler;
+package eu.etaxonomy.taxeditor.termtree.e4.handler;
 
 import javax.inject.Named;
 
@@ -18,7 +18,7 @@ import org.eclipse.e4.ui.services.IServiceConstants;
 import org.eclipse.jface.viewers.IStructuredSelection;
 
 import eu.etaxonomy.cdm.persistence.dto.TermNodeDto;
-import eu.etaxonomy.taxeditor.featuretree.e4.ITermTreeEditor;
+import eu.etaxonomy.taxeditor.termtree.e4.ITermTreeEditor;
 
 /**
  * @author pplitzner

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/handler/AddTermHandler.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/termtree/e4/handler/AddTermHandler.java
similarity index 97%
rename from eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/handler/AddTermHandler.java
rename to eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/termtree/e4/handler/AddTermHandler.java
index bcb4ec85875f6089c643d005a21b49d399743046..ca211f8e936a7b938997de24ec763595afbb2e61 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/handler/AddTermHandler.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/termtree/e4/handler/AddTermHandler.java
@@ -6,7 +6,7 @@
 * The contents of this file are subject to the Mozilla Public License Version 1.1
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
-package eu.etaxonomy.taxeditor.featuretree.e4.handler;
+package eu.etaxonomy.taxeditor.termtree.e4.handler;
 
 import javax.inject.Named;
 
@@ -22,7 +22,7 @@ import org.eclipse.swt.widgets.Shell;
 
 import eu.etaxonomy.cdm.persistence.dto.TermNodeDto;
 import eu.etaxonomy.cdm.persistence.dto.TermTreeDto;
-import eu.etaxonomy.taxeditor.featuretree.e4.ITermTreeEditor;
+import eu.etaxonomy.taxeditor.termtree.e4.ITermTreeEditor;
 
 /**
  * @author pplitzner

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/handler/CopyTermHandler.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/termtree/e4/handler/CopyTermHandler.java
similarity index 91%
rename from eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/handler/CopyTermHandler.java
rename to eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/termtree/e4/handler/CopyTermHandler.java
index 4e3fefd6bca33acb30bfdd48af9716b357219631..a04a7a2713a9dbdcdf9fc3c88cef893b7fc73a1d 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/handler/CopyTermHandler.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/termtree/e4/handler/CopyTermHandler.java
@@ -1,5 +1,5 @@
 
-package eu.etaxonomy.taxeditor.featuretree.e4.handler;
+package eu.etaxonomy.taxeditor.termtree.e4.handler;
 
 import javax.inject.Named;
 
@@ -12,7 +12,7 @@ import org.eclipse.e4.ui.services.IServiceConstants;
 import org.eclipse.jface.viewers.IStructuredSelection;
 
 import eu.etaxonomy.cdm.persistence.dto.TermNodeDto;
-import eu.etaxonomy.taxeditor.featuretree.e4.TermTreeEditor;
+import eu.etaxonomy.taxeditor.termtree.e4.TermTreeEditor;
 
 public class CopyTermHandler {
 

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/handler/CreateTermTreeHandler.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/termtree/e4/handler/CreateTermTreeHandler.java
similarity index 90%
rename from eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/handler/CreateTermTreeHandler.java
rename to eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/termtree/e4/handler/CreateTermTreeHandler.java
index 9b9459e018ca7a709c7d20ae62e8eff16a0e4d6d..7629544d77c56228f5d6cda73004354a2e91453d 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/handler/CreateTermTreeHandler.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/termtree/e4/handler/CreateTermTreeHandler.java
@@ -6,7 +6,7 @@
 * The contents of this file are subject to the Mozilla Public License Version 1.1
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
-package eu.etaxonomy.taxeditor.featuretree.e4.handler;
+package eu.etaxonomy.taxeditor.termtree.e4.handler;
 
 import javax.inject.Named;
 
@@ -19,10 +19,10 @@ import org.eclipse.e4.ui.services.IServiceConstants;
 
 import eu.etaxonomy.cdm.model.term.TermTree;
 import eu.etaxonomy.cdm.persistence.dto.TermTreeDto;
-import eu.etaxonomy.taxeditor.featuretree.e4.ITermTreeEditor;
-import eu.etaxonomy.taxeditor.featuretree.e4.TermTreeEditor;
-import eu.etaxonomy.taxeditor.featuretree.e4.operation.CreateFeatureTreeOperation;
 import eu.etaxonomy.taxeditor.store.StoreUtil;
+import eu.etaxonomy.taxeditor.termtree.e4.ITermTreeEditor;
+import eu.etaxonomy.taxeditor.termtree.e4.TermTreeEditor;
+import eu.etaxonomy.taxeditor.termtree.e4.operation.CreateFeatureTreeOperation;
 
 /**
  * @author pplitzner

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/handler/OpenTermTreeEditorHandler.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/termtree/e4/handler/OpenTermTreeEditorHandler.java
similarity index 95%
rename from eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/handler/OpenTermTreeEditorHandler.java
rename to eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/termtree/e4/handler/OpenTermTreeEditorHandler.java
index 4dfed14a859b09ac402f0dbbfa179feb9e9ae2bf..d40fa69a2aecab6ba563453a772d4f2205d21770 100755 (executable)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/handler/OpenTermTreeEditorHandler.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/termtree/e4/handler/OpenTermTreeEditorHandler.java
@@ -6,7 +6,7 @@
 * The contents of this file are subject to the Mozilla Public License Version 1.1
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
-package eu.etaxonomy.taxeditor.featuretree.e4.handler;
+package eu.etaxonomy.taxeditor.termtree.e4.handler;
 
 import java.util.List;
 import java.util.stream.Collectors;
@@ -22,7 +22,7 @@ import org.eclipse.e4.ui.workbench.modeling.EPartService;
 import org.eclipse.e4.ui.workbench.modeling.EPartService.PartState;
 
 import eu.etaxonomy.cdm.model.term.TermType;
-import eu.etaxonomy.taxeditor.featuretree.e4.TermTreeEditor;
+import eu.etaxonomy.taxeditor.termtree.e4.TermTreeEditor;
 import eu.etaxonomy.taxeditor.workbench.WorkbenchUtility;
 
 /**

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/handler/PasteFeatureHandler.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/termtree/e4/handler/PasteTermHandler.java
similarity index 91%
rename from eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/handler/PasteFeatureHandler.java
rename to eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/termtree/e4/handler/PasteTermHandler.java
index 940e6a2a4137e1d9ecd3feafa8f96e12bb42f665..5c975ee16492ec4af333a3f4f4cbac8460351dbc 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/handler/PasteFeatureHandler.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/termtree/e4/handler/PasteTermHandler.java
@@ -1,5 +1,5 @@
 
-package eu.etaxonomy.taxeditor.featuretree.e4.handler;
+package eu.etaxonomy.taxeditor.termtree.e4.handler;
 
 import javax.inject.Named;
 
@@ -14,9 +14,9 @@ import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.IStructuredSelection;
 
 import eu.etaxonomy.cdm.persistence.dto.TermNodeDto;
-import eu.etaxonomy.taxeditor.featuretree.e4.TermTreeEditor;
+import eu.etaxonomy.taxeditor.termtree.e4.TermTreeEditor;
 
-public class PasteFeatureHandler {
+public class PasteTermHandler {
 
     @Execute
     public void execute(@Named(IServiceConstants.ACTIVE_PART) MPart part,

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/handler/RemoveTermHandler.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/termtree/e4/handler/RemoveTermHandler.java
similarity index 92%
rename from eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/handler/RemoveTermHandler.java
rename to eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/termtree/e4/handler/RemoveTermHandler.java
index ffe96b8258e798b798b0151d4eeb536f09b16285..56c3ad9e8f606790d2fd0efdabe8ad838218a935 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/handler/RemoveTermHandler.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/termtree/e4/handler/RemoveTermHandler.java
@@ -6,7 +6,7 @@
 * The contents of this file are subject to the Mozilla Public License Version 1.1
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
-package eu.etaxonomy.taxeditor.featuretree.e4.handler;
+package eu.etaxonomy.taxeditor.termtree.e4.handler;
 
 import javax.inject.Named;
 
@@ -23,11 +23,11 @@ import org.eclipse.jface.viewers.TreeSelection;
 
 import eu.etaxonomy.cdm.persistence.dto.TermNodeDto;
 import eu.etaxonomy.cdm.persistence.dto.TermTreeDto;
-import eu.etaxonomy.taxeditor.featuretree.e4.ICharacterEditor;
-import eu.etaxonomy.taxeditor.featuretree.e4.ITermTreeEditor;
-import eu.etaxonomy.taxeditor.featuretree.e4.TermTreeEditor;
-import eu.etaxonomy.taxeditor.featuretree.e4.operation.RemoveFeatureOperation;
 import eu.etaxonomy.taxeditor.store.StoreUtil;
+import eu.etaxonomy.taxeditor.termtree.e4.ICharacterEditor;
+import eu.etaxonomy.taxeditor.termtree.e4.ITermTreeEditor;
+import eu.etaxonomy.taxeditor.termtree.e4.TermTreeEditor;
+import eu.etaxonomy.taxeditor.termtree.e4.operation.RemoveFeatureOperation;
 
 /**
  * @author pplitzner

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/handler/RemoveTermTreeHandler.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/termtree/e4/handler/RemoveTermTreeHandler.java
similarity index 90%
rename from eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/handler/RemoveTermTreeHandler.java
rename to eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/termtree/e4/handler/RemoveTermTreeHandler.java
index 70d17b16d9081b0c63b02eefe198a95d7ac901a4..e515cd9c6f31ac233cc8c3c15e92f92f09179b06 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/handler/RemoveTermTreeHandler.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/termtree/e4/handler/RemoveTermTreeHandler.java
@@ -6,7 +6,7 @@
 * The contents of this file are subject to the Mozilla Public License Version 1.1
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
-package eu.etaxonomy.taxeditor.featuretree.e4.handler;
+package eu.etaxonomy.taxeditor.termtree.e4.handler;
 
 import javax.inject.Named;
 
@@ -20,10 +20,10 @@ import org.eclipse.e4.ui.services.IServiceConstants;
 import org.eclipse.jface.viewers.IStructuredSelection;
 
 import eu.etaxonomy.cdm.persistence.dto.TermTreeDto;
-import eu.etaxonomy.taxeditor.featuretree.e4.ITermTreeEditor;
-import eu.etaxonomy.taxeditor.featuretree.e4.TermTreeEditor;
-import eu.etaxonomy.taxeditor.featuretree.e4.operation.RemoveFeatureTreeOperation;
 import eu.etaxonomy.taxeditor.store.StoreUtil;
+import eu.etaxonomy.taxeditor.termtree.e4.ITermTreeEditor;
+import eu.etaxonomy.taxeditor.termtree.e4.TermTreeEditor;
+import eu.etaxonomy.taxeditor.termtree.e4.operation.RemoveFeatureTreeOperation;
 
 /**
  * @author pplitzner

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/handler/TermTreeExportOntologyHandler.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/termtree/e4/handler/TermTreeExportOntologyHandler.java
similarity index 96%
rename from eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/handler/TermTreeExportOntologyHandler.java
rename to eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/termtree/e4/handler/TermTreeExportOntologyHandler.java
index bff43d106bd9078130c79e2c8528dfb71bb7f737..a828d2cac62438979facd0ba492be2bfe0d6bbbd 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/handler/TermTreeExportOntologyHandler.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/termtree/e4/handler/TermTreeExportOntologyHandler.java
@@ -6,7 +6,7 @@
 * The contents of this file are subject to the Mozilla Public License Version 1.1
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
-package eu.etaxonomy.taxeditor.featuretree.e4.handler;
+package eu.etaxonomy.taxeditor.termtree.e4.handler;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -30,9 +30,9 @@ import org.eclipse.ui.progress.IProgressConstants;
 import eu.etaxonomy.cdm.io.descriptive.owl.out.StructureTreeOwlExportConfigurator;
 import eu.etaxonomy.cdm.model.term.TermTree;
 import eu.etaxonomy.cdm.persistence.dto.TermTreeDto;
-import eu.etaxonomy.taxeditor.featuretree.e4.ITermTreeEditor;
 import eu.etaxonomy.taxeditor.store.CdmStore;
 import eu.etaxonomy.taxeditor.store.StoreUtil;
+import eu.etaxonomy.taxeditor.termtree.e4.ITermTreeEditor;
 
 /**
  * @author pplitzner

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/handler/TermTreeExportWordHandler.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/termtree/e4/handler/TermTreeExportWordHandler.java
similarity index 96%
rename from eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/handler/TermTreeExportWordHandler.java
rename to eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/termtree/e4/handler/TermTreeExportWordHandler.java
index 7c7e765e37505872ba350c7d0fd033798b6d825c..d74d3c912979a615e87e2f4bb18f04b095a7586e 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/handler/TermTreeExportWordHandler.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/termtree/e4/handler/TermTreeExportWordHandler.java
@@ -6,7 +6,7 @@
 * The contents of this file are subject to the Mozilla Public License Version 1.1
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
-package eu.etaxonomy.taxeditor.featuretree.e4.handler;
+package eu.etaxonomy.taxeditor.termtree.e4.handler;
 
 import java.io.File;
 
@@ -27,11 +27,11 @@ import org.eclipse.ui.progress.IProgressConstants;
 import eu.etaxonomy.cdm.io.descriptive.word.out.WordExportConfigurator;
 import eu.etaxonomy.cdm.model.term.TermTree;
 import eu.etaxonomy.cdm.persistence.dto.TermTreeDto;
-import eu.etaxonomy.taxeditor.featuretree.e4.ITermTreeEditor;
 import eu.etaxonomy.taxeditor.preference.IPreferenceKeys;
 import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
 import eu.etaxonomy.taxeditor.store.CdmStore;
 import eu.etaxonomy.taxeditor.store.StoreUtil;
+import eu.etaxonomy.taxeditor.termtree.e4.ITermTreeEditor;
 
 /**
  * @author pplitzner

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/operation/AddFeatureOperation.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/termtree/e4/operation/AddFeatureOperation.java
similarity index 98%
rename from eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/operation/AddFeatureOperation.java
rename to eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/termtree/e4/operation/AddFeatureOperation.java
index aa1cf9bf4334732658e10ab3920859fc15e10ca3..8abbb9d3d963790d893afba25849afd69e54d2cc 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/operation/AddFeatureOperation.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/termtree/e4/operation/AddFeatureOperation.java
@@ -6,7 +6,7 @@
 * The contents of this file are subject to the Mozilla Public License Version 1.1
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
-package eu.etaxonomy.taxeditor.featuretree.e4.operation;
+package eu.etaxonomy.taxeditor.termtree.e4.operation;
 
 import java.util.UUID;
 

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/operation/AddOntologyTermOperation.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/termtree/e4/operation/AddOntologyTermOperation.java
similarity index 97%
rename from eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/operation/AddOntologyTermOperation.java
rename to eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/termtree/e4/operation/AddOntologyTermOperation.java
index 27f2e8f8bbcce12d760a29c6dae74e4b6a30801c..c64086a3f968e1434c4cd0192a419b825bcd434e 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/operation/AddOntologyTermOperation.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/termtree/e4/operation/AddOntologyTermOperation.java
@@ -6,7 +6,7 @@
 * The contents of this file are subject to the Mozilla Public License Version 1.1
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
-package eu.etaxonomy.taxeditor.featuretree.e4.operation;
+package eu.etaxonomy.taxeditor.termtree.e4.operation;
 
 import eu.etaxonomy.cdm.common.URI;
 import java.util.UUID;

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/operation/CreateFeatureTreeOperation.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/termtree/e4/operation/CreateFeatureTreeOperation.java
similarity index 96%
rename from eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/operation/CreateFeatureTreeOperation.java
rename to eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/termtree/e4/operation/CreateFeatureTreeOperation.java
index da0336568617ff70e92da03facdc04760482ec76..9cce3dcc17d8e93bd8c07358b673d8b402a61532 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/operation/CreateFeatureTreeOperation.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/termtree/e4/operation/CreateFeatureTreeOperation.java
@@ -6,7 +6,7 @@
 * The contents of this file are subject to the Mozilla Public License Version 1.1
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
-package eu.etaxonomy.taxeditor.featuretree.e4.operation;
+package eu.etaxonomy.taxeditor.termtree.e4.operation;
 
 import org.eclipse.core.commands.ExecutionException;
 import org.eclipse.core.runtime.IAdaptable;

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/operation/MoveFeatureOperation.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/termtree/e4/operation/MoveFeatureOperation.java
similarity index 98%
rename from eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/operation/MoveFeatureOperation.java
rename to eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/termtree/e4/operation/MoveFeatureOperation.java
index 3e038431b9a6435db078ea8bf3a83ed9efe48435..1ecc49b13a8038eef3e4dbb80f1463b301e757e2 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/operation/MoveFeatureOperation.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/termtree/e4/operation/MoveFeatureOperation.java
@@ -6,7 +6,7 @@
  * The contents of this file are subject to the Mozilla Public License Version 1.1
  * See LICENSE.TXT at the top of this package for the full license terms.
  */
-package eu.etaxonomy.taxeditor.featuretree.e4.operation;
+package eu.etaxonomy.taxeditor.termtree.e4.operation;
 
 import java.util.UUID;
 

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/operation/RemoveFeatureOperation.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/termtree/e4/operation/RemoveFeatureOperation.java
similarity index 97%
rename from eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/operation/RemoveFeatureOperation.java
rename to eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/termtree/e4/operation/RemoveFeatureOperation.java
index 735a75d792cc712d3d631ee0771e9f472bbdcb19..f24af24aaa4213a5b43b2a26f576839f48f98c5d 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/operation/RemoveFeatureOperation.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/termtree/e4/operation/RemoveFeatureOperation.java
@@ -6,7 +6,7 @@
 * The contents of this file are subject to the Mozilla Public License Version 1.1
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
-package eu.etaxonomy.taxeditor.featuretree.e4.operation;
+package eu.etaxonomy.taxeditor.termtree.e4.operation;
 
 import java.util.UUID;
 

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/operation/RemoveFeatureTreeOperation.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/termtree/e4/operation/RemoveFeatureTreeOperation.java
similarity index 96%
rename from eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/operation/RemoveFeatureTreeOperation.java
rename to eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/termtree/e4/operation/RemoveFeatureTreeOperation.java
index 2519ee4f6947417caed482777e6380eda921b986..00b7a96ac3713abb9a00e187f0863b6e0b51afcf 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/operation/RemoveFeatureTreeOperation.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/termtree/e4/operation/RemoveFeatureTreeOperation.java
@@ -6,7 +6,7 @@
 * The contents of this file are subject to the Mozilla Public License Version 1.1
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
-package eu.etaxonomy.taxeditor.featuretree.e4.operation;
+package eu.etaxonomy.taxeditor.termtree.e4.operation;
 
 import java.util.UUID;
 

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/feature/FeatureStateWizardPage.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/feature/FeatureStateWizardPage.java
index 68182ac1cf00689ecc3951ebf83b28fea7a29673..9c3ff96ce1366f27df5597f9de39081265a03192 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/feature/FeatureStateWizardPage.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/feature/FeatureStateWizardPage.java
@@ -37,9 +37,9 @@ import eu.etaxonomy.cdm.model.term.TermNode;
 import eu.etaxonomy.cdm.model.term.TermVocabulary;
 import eu.etaxonomy.cdm.persistence.dto.TermNodeDto;
 import eu.etaxonomy.cdm.persistence.dto.TermVocabularyDto;
-import eu.etaxonomy.taxeditor.featuretree.AvailableTermsWizard;
 import eu.etaxonomy.taxeditor.model.ImageResources;
 import eu.etaxonomy.taxeditor.store.CdmStore;
+import eu.etaxonomy.taxeditor.termtree.AvailableTermsWizard;
 import eu.etaxonomy.taxeditor.ui.AbstractEntityCollectionElementWizardPage;
 import eu.etaxonomy.taxeditor.ui.combo.term.TermComboElement;
 import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/search/facet/term/TermSearchController.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/search/facet/term/TermSearchController.java
index dc8634e05f028bef2519a3bc1a79717807930025..c39941c69fa56ae24335b214dca5e9939cbf5f67 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/search/facet/term/TermSearchController.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/search/facet/term/TermSearchController.java
@@ -26,9 +26,9 @@ import eu.etaxonomy.cdm.model.term.TermType;
 import eu.etaxonomy.cdm.persistence.dto.AbstractTermDto;
 import eu.etaxonomy.cdm.persistence.dto.TermDto;
 import eu.etaxonomy.cdm.persistence.dto.TermVocabularyDto;
-import eu.etaxonomy.taxeditor.featuretree.TermChooseWizardPage;
 import eu.etaxonomy.taxeditor.store.CdmStore;
 import eu.etaxonomy.taxeditor.store.StoreUtil;
+import eu.etaxonomy.taxeditor.termtree.TermChooseWizardPage;
 import eu.etaxonomy.taxeditor.view.search.facet.CheckBoxSearchResultComposite;
 import eu.etaxonomy.taxeditor.view.search.facet.SearchComposite;
 import eu.etaxonomy.taxeditor.view.search.facet.SearchController;