ref 9337: rename all termtree related classes
authorKatja Luther <k.luther@bgbm.org>
Tue, 15 Dec 2020 11:40:52 +0000 (12:40 +0100)
committerKatja Luther <k.luther@bgbm.org>
Tue, 15 Dec 2020 11:40:52 +0000 (12:40 +0100)
40 files changed:
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptiveDataSet/DescriptiveDataSetComposite.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptiveDataSet/DescriptiveDataSetEditor.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptiveDataSet/character/CharacterDragListener.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptiveDataSet/character/CharacterDropAdapter.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptiveDataSet/character/CharacterEditor.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptiveDataSet/character/handler/AddFeatureToCharacterTreeHandler.java
eu.etaxonomy.taxeditor.printpublisher/src/main/java/eu/etaxonomy/taxeditor/printpublisher/wizard/SelectFeatureTreeWizardPage.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/AvailableTermsWizard.java [moved from eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/AvailableFeaturesWizard.java with 86% similarity]
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/AvailableTermsWizardPage.java [moved from eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/AvailableFeaturesWizardPage.java with 94% similarity]
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/TermNodeDtoTransfer.java [moved from eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/FeatureNodeDtoTransfer.java with 94% similarity]
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/TermNodeTransfer.java [moved from eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/FeatureNodeTransfer.java with 94% similarity]
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/TermTreeContentProvider.java [moved from eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/FeatureTreeContentProvider.java with 96% similarity]
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/TermTreeLabelProvider.java [moved from eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/FeatureTreeLabelProvider.java with 97% similarity]
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/TermTreePropertyTester.java [moved from eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/FeatureTreePropertyTester.java with 84% similarity]
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/FeatureTreeDtoEditorComposite.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/ICharacterEditor.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/ITermTreeEditor.java [moved from eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/IFeatureTreeEditor.java with 91% similarity]
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/TermNodeDragListener.java [moved from eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/FeatureNodeDragListener.java with 84% similarity]
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/TermNodeDtoDragListener.java [moved from eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/FeatureNodeDtoDragListener.java with 88% similarity]
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/TermTreeDropAdapter.java [moved from eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/FeatureTreeDropAdapter.java with 96% similarity]
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/TermTreeDtoDropAdapter.java [moved from eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/FeatureTreeDtoDropAdapter.java with 96% similarity]
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/TermTreeEditor.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/TermTreeEditorComposite.java [moved from eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/FeatureTreeEditorComposite.java with 91% similarity]
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/handler/AbstractAddTermHandler.java [moved from eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/handler/AbstractAddFeatureHandler.java with 93% similarity]
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/handler/AddChildTermHandler.java [moved from eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/handler/AddChildFeatureHandler.java with 87% similarity]
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/handler/AddTermHandler.java [moved from eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/handler/AddFeatureHandler.java with 96% similarity]
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/handler/CopyTermHandler.java [moved from eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/handler/CopyFeatureHandler.java with 97% similarity]
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/handler/CreateTermTreeHandler.java [moved from eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/handler/CreateFeatureTreeHandler.java with 90% similarity]
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/handler/RemoveTermHandler.java [moved from eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/handler/RemoveFeatureHandler.java with 94% similarity]
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/handler/RemoveTermTreeHandler.java [moved from eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/handler/RemoveFeatureTreeHandler.java with 90% similarity]
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/handler/TermTreeExportOntologyHandler.java [moved from eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/handler/FeatureTreeExportOntologyHandler.java with 94% similarity]
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/handler/TermTreeExportWordHandler.java [moved from eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/handler/FeatureTreeExportWordHandler.java with 93% similarity]
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/e4/out/owl/OwlTermExportComposite.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/Messages.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/messages.properties
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/messages_de.properties
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/DefaultFeatureTreePreferenecs.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/feature/FeatureStateWizardPage.java
eu.etaxonomy.taxeditor.workbench/src/main/java/eu/etaxonomy/taxeditor/l10n/messages.properties
eu.etaxonomy.taxeditor.workbench/src/main/java/eu/etaxonomy/taxeditor/l10n/messages_de.properties

index 93c252b6a2965ffa0d5aa96e20d89aacbd224965..bb5d7453eb4afe8bb72bccbc9a623a69be484549 100644 (file)
@@ -29,7 +29,7 @@ import eu.etaxonomy.cdm.model.term.TermTree;
 import eu.etaxonomy.cdm.model.term.TermType;
 import eu.etaxonomy.cdm.persistence.dto.TermDto;
 import eu.etaxonomy.taxeditor.editor.l10n.Messages;
-import eu.etaxonomy.taxeditor.featuretree.e4.FeatureTreeEditorComposite;
+import eu.etaxonomy.taxeditor.featuretree.e4.TermTreeEditorComposite;
 import eu.etaxonomy.taxeditor.model.ImageResources;
 import eu.etaxonomy.taxeditor.ui.combo.term.TermUuidComboViewer;
 import eu.etaxonomy.taxeditor.util.TaxonTreeNodeContentProvider;
@@ -44,7 +44,7 @@ public class DescriptiveDataSetComposite extends Composite {
     private Text txtDescriptiveDataSet;
     private TermUuidComboViewer comboRankMin;
     private TermUuidComboViewer comboRankMax;
-    private FeatureTreeEditorComposite<Feature> featureTreeEditorComposite;
+    private TermTreeEditorComposite<Feature> TermTreeEditorComposite;
     private TreeViewer taxonNodeTree;
     private List<TermDto> areas = new ArrayList<>();
     private Text textAreaText;
@@ -135,8 +135,8 @@ public class DescriptiveDataSetComposite extends Composite {
         btnChooseArea = new Button(composite, SWT.NONE);
         btnChooseArea.setImage(ImageResources.getImage(ImageResources.BROWSE_ICON));
 
-        featureTreeEditorComposite = new FeatureTreeEditorComposite<>(this, SWT.NONE);
-        featureTreeEditorComposite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 2, 1));
+        TermTreeEditorComposite = new TermTreeEditorComposite<>(this, SWT.NONE);
+        TermTreeEditorComposite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 2, 1));
     }
 
     @Override
@@ -161,15 +161,15 @@ public class DescriptiveDataSetComposite extends Composite {
         comboRankMax.setElement(max);
     }
 
-    public FeatureTreeEditorComposite<Feature> getFeatureTreeEditorComposite() {
-        return featureTreeEditorComposite;
+    public TermTreeEditorComposite<Feature> getTermTreeEditorComposite() {
+        return TermTreeEditorComposite;
     }
 
     public TermTree<Feature> getCharacters(){
-        return featureTreeEditorComposite.getFeatureTree();
+        return TermTreeEditorComposite.getFeatureTree();
     }
     public void setCharacters(TermTree<Feature> characters) {
-        featureTreeEditorComposite.setSelectedTree(characters);
+        TermTreeEditorComposite.setSelectedTree(characters);
     }
 
     public TreeViewer getTaxonNodeTree() {
index dcc2acd05db9faeed5a3bd4e4aeb804af0a9458e..38f9dacc96ed719dcd3283412daa7ce6f0f1af54 100644 (file)
@@ -174,7 +174,7 @@ IPartContentHasDetails, IPartContentHasSupplementalData, IDirtyMarkable, IDescri
             }
         });
 
-        composite.getFeatureTreeEditorComposite().init("Character Tree",
+        composite.getTermTreeEditorComposite().init("Character Tree",
                 TermType.Character,
                 null,
                 null,
index f183b56e126ca434d5de7521b117cf9390f6065a..a23430e6f84719a3d5cf876063223d4ddd4a49b9 100644 (file)
@@ -24,14 +24,14 @@ 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.FeatureNodeDragListener;
+import eu.etaxonomy.taxeditor.featuretree.e4.TermNodeDragListener;
 
 /**
  * @author pplitzner
  * @since Jun 2, 2017
  *
  */
-public class CharacterDragListener extends FeatureNodeDragListener {
+public class CharacterDragListener extends TermNodeDragListener {
 
     private TreeViewer structureViewer;
     private TreeViewer propertyViewer;
index 0b5bf5eeb86219469a5c4f164bdacc66ad327c8b..c4cd6896795b5275d441fdf0d519133aa442303e 100644 (file)
@@ -19,7 +19,7 @@ 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.FeatureTreeDtoDropAdapter;
+import eu.etaxonomy.taxeditor.featuretree.e4.TermTreeDtoDropAdapter;
 import eu.etaxonomy.taxeditor.store.CdmStore;
 import eu.etaxonomy.taxeditor.store.StoreUtil;
 
@@ -29,7 +29,7 @@ import eu.etaxonomy.taxeditor.store.StoreUtil;
  * @date Jun 1, 2017
  *
  */
-public class CharacterDropAdapter extends FeatureTreeDtoDropAdapter {
+public class CharacterDropAdapter extends TermTreeDtoDropAdapter {
 
        private CharacterEditor characterEditor;
 
index 670089d81aafd8042f730b2792d51db4ca85b85c..5a1c9e5d8f6481053c683cd6ece8f3453b236132 100644 (file)
@@ -85,12 +85,12 @@ import eu.etaxonomy.taxeditor.editor.definedterm.FeatureTreeViewerComparator;
 import eu.etaxonomy.taxeditor.editor.l10n.Messages;
 import eu.etaxonomy.taxeditor.event.WorkbenchEventConstants;
 import eu.etaxonomy.taxeditor.featuretree.CharacterTransfer;
-import eu.etaxonomy.taxeditor.featuretree.FeatureTreeContentProvider;
-import eu.etaxonomy.taxeditor.featuretree.FeatureTreeLabelProvider;
-import eu.etaxonomy.taxeditor.featuretree.e4.FeatureNodeDtoDragListener;
-import eu.etaxonomy.taxeditor.featuretree.e4.FeatureTreeDtoDropAdapter;
+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;
@@ -265,8 +265,8 @@ public class CharacterEditor implements ICharacterEditor, IConversationEnabled,
         });
 
         characterTreeEditorComposite = addFeatureTreeEditor(composite_3);
-        initFeatureTreeComposite(TermType.Character, characterTreeEditorComposite, new FeatureNodeDtoDragListener(characterTreeEditorComposite.getViewer()),
-                new FeatureTreeDtoDropAdapter(this, characterTreeEditorComposite.getViewer(), sync),
+        initFeatureTreeComposite(TermType.Character, characterTreeEditorComposite, new TermNodeDtoDragListener(characterTreeEditorComposite.getViewer()),
+                new TermTreeDtoDropAdapter(this, characterTreeEditorComposite.getViewer(), sync),
                 null);
 
         characterTreeEditorComposite.getLabel_title().setText(Messages.CharacterEditor_CHARACTERS);
@@ -290,8 +290,8 @@ public class CharacterEditor implements ICharacterEditor, IConversationEnabled,
 
         TreeViewer viewer = new TreeViewer(composite);
         viewer.getControl().setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 2, 1));
-        viewer.setContentProvider(new FeatureTreeContentProvider());
-        viewer.setLabelProvider(new FeatureTreeLabelProvider());
+        viewer.setContentProvider(new TermTreeContentProvider());
+        viewer.setLabelProvider(new TermTreeLabelProvider());
         viewer.setComparator(new FeatureTreeViewerComparator());
         viewer.addSelectionChangedListener(this);
         viewer.setInput(CdmStore.getService(ITermTreeService.class).list(termType, null, null, null, TermTreeEditor.TREE_PROPERTY_PATH));
@@ -307,24 +307,24 @@ public class CharacterEditor implements ICharacterEditor, IConversationEnabled,
     }
 
     private <T extends DefinedTermBase> FeatureTreeDtoEditorComposite<T> addFeatureTreeEditor(Composite composite_3) {
-        FeatureTreeDtoEditorComposite<T> featureTreeEditorComposite = new FeatureTreeDtoEditorComposite<>(composite_3, SWT.NONE);
-        featureTreeEditorComposite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 1, 1));
-        return featureTreeEditorComposite;
+        FeatureTreeDtoEditorComposite<T> TermTreeEditorComposite = new FeatureTreeDtoEditorComposite<>(composite_3, SWT.NONE);
+        TermTreeEditorComposite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 1, 1));
+        return TermTreeEditorComposite;
     }
 
     private void initFeatureTreeComposite(
             TermType termType,
-            FeatureTreeDtoEditorComposite featureTreeEditorComposite,
-            FeatureNodeDtoDragListener featureNodeDragListener,
-            FeatureTreeDtoDropAdapter featureNodeDropAdapter,
+            FeatureTreeDtoEditorComposite TermTreeEditorComposite,
+            TermNodeDtoDragListener featureNodeDragListener,
+            TermTreeDtoDropAdapter featureNodeDropAdapter,
             Transfer[] transfers) {
 
-        featureTreeEditorComposite.init(
+        TermTreeEditorComposite.init(
                 featureNodeDragListener,
                 featureNodeDropAdapter,
                 transfers,
                 this,
-                new FeatureTreeChooserListener(featureTreeEditorComposite, termType),
+                new FeatureTreeChooserListener(TermTreeEditorComposite, termType),
                 this);
     }
 
@@ -539,21 +539,21 @@ public class CharacterEditor implements ICharacterEditor, IConversationEnabled,
     }
 
     private class FeatureTreeChooserListener extends SelectionAdapter{
-        private FeatureTreeDtoEditorComposite<Feature> featureTreeEditorComposite;
+        private FeatureTreeDtoEditorComposite<Feature> TermTreeEditorComposite;
         private TermType termType;
 
-        public FeatureTreeChooserListener(FeatureTreeDtoEditorComposite<Feature> featureTreeEditorComposite, TermType termType) {
+        public FeatureTreeChooserListener(FeatureTreeDtoEditorComposite<Feature> TermTreeEditorComposite, TermType termType) {
             super();
-            this.featureTreeEditorComposite = featureTreeEditorComposite;
+            this.TermTreeEditorComposite = TermTreeEditorComposite;
             this.termType = termType;
         }
 
         @Override
         public void widgetSelected(SelectionEvent e) {
-            TermTree tree = FeatureTreeSelectionDialog.select(featureTreeEditorComposite.getDisplay().getActiveShell(), null, termType);
+            TermTree tree = FeatureTreeSelectionDialog.select(TermTreeEditorComposite.getDisplay().getActiveShell(), null, termType);
             if(tree!=null){
                 cdmEntitySession.load(tree, true);
-                featureTreeEditorComposite.setSelectedTree(tree);
+                TermTreeEditorComposite.setSelectedTree(tree);
             }
         }
     }
index fa6559459672e47ecdae4c8f13e76ab2b6e0698a..1e1939396a9fa852f648e16a987a550818b8fdf0 100644 (file)
@@ -22,14 +22,14 @@ 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.AddFeatureHandler;
+import eu.etaxonomy.taxeditor.featuretree.e4.handler.AddTermHandler;
 
 /**
  * @author pplitzner
  * @since Jul 12, 2017
  *
  */
-public class AddFeatureToCharacterTreeHandler extends AddFeatureHandler {
+public class AddFeatureToCharacterTreeHandler extends AddTermHandler {
 
     @Execute
     @Override
index abe8d2ccf1460521553c9012848c029bffaebf4a..7ab82d065652613c7f60a25d678188cb32698717 100644 (file)
@@ -69,8 +69,8 @@ public class SelectFeatureTreeWizardPage extends AbstractPublishWizardPage
 
                viewer = new ListViewer(composite);
                viewer.getControl().setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
-               viewer.setContentProvider(new FeatureTreeContentProvider());
-               viewer.setLabelProvider(new FeatureTreeLabelProvider());
+               viewer.setContentProvider(new TermTreeContentProvider());
+               viewer.setLabelProvider(new TermTreeLabelProvider());
 
                viewer.addSelectionChangedListener(this);
 
@@ -175,7 +175,7 @@ public class SelectFeatureTreeWizardPage extends AbstractPublishWizardPage
                viewer.setInput(realFeatureTrees);
        }
 
-       private class FeatureTreeContentProvider implements IStructuredContentProvider {
+       private class TermTreeContentProvider implements IStructuredContentProvider {
 
                @Override
                public void dispose() {}
@@ -193,7 +193,7 @@ public class SelectFeatureTreeWizardPage extends AbstractPublishWizardPage
 
        }
 
-       private class FeatureTreeLabelProvider extends LabelProvider {
+       private class TermTreeLabelProvider extends LabelProvider {
 
                /*
                 * (non-Javadoc)
similarity index 86%
rename from eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/AvailableFeaturesWizard.java
rename to eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/AvailableTermsWizard.java
index 7508c9c7ee2b6f6369e91b4161079b5747908d5b..85fc9261aaa97ebf50a2c3839d3d37511682606b 100644 (file)
@@ -28,9 +28,9 @@ import eu.etaxonomy.taxeditor.store.CdmStore;
  * @created Aug 5, 2010
  * @version 1.0
  */
-public class AvailableFeaturesWizard extends Wizard {
+public class AvailableTermsWizard extends Wizard {
 
-       private AvailableFeaturesWizardPage page;
+       private AvailableTermsWizardPage page;
 
        private Set<DefinedTermBase> additionalFeatures;
 
@@ -38,18 +38,18 @@ public class AvailableFeaturesWizard extends Wizard {
 
     private boolean singleSelection = false;
 
-       public AvailableFeaturesWizard(TermType termType){
+       public AvailableTermsWizard(TermType termType){
         vocabularyDtos = CdmStore.getService(IVocabularyService.class).findVocabularyDtoByTermType(termType);
        }
 
-       public AvailableFeaturesWizard(List<TermVocabularyDto> vocabularyDtos){
+       public AvailableTermsWizard(List<TermVocabularyDto> vocabularyDtos){
            this.vocabularyDtos = vocabularyDtos;
        }
 
        /** {@inheritDoc} */
        @Override
        public void addPages() {
-               page = new AvailableFeaturesWizardPage(vocabularyDtos,singleSelection);
+               page = new AvailableTermsWizardPage(vocabularyDtos,singleSelection);
                addPage(page);
        }
 
similarity index 94%
rename from eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/AvailableFeaturesWizardPage.java
rename to eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/AvailableTermsWizardPage.java
index 84dc238a28e2e71257ce1042510c580507bd78e7..56549c8e1e1117903ec3711e9052357d01ce743b 100644 (file)
@@ -35,12 +35,12 @@ import eu.etaxonomy.taxeditor.store.CdmStore;
  * @created Aug 5, 2010
  * @version 1.0
  */
-public class AvailableFeaturesWizardPage extends WizardPage {
+public class AvailableTermsWizardPage extends WizardPage {
 
     private CheckBoxTreeComposite treeComposite;
     private List<TermVocabularyDto> vocabularies;
 
-       protected AvailableFeaturesWizardPage(List<TermVocabularyDto> vocabularies, boolean singleSelection) {
+       protected AvailableTermsWizardPage(List<TermVocabularyDto> vocabularies, boolean singleSelection) {
                super("Available Terms Wizard Page");
                this.vocabularies = vocabularies;
                setTitle("Available Terms");
similarity index 94%
rename from eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/FeatureNodeDtoTransfer.java
rename to eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/TermNodeDtoTransfer.java
index 528eb727762b106dc7c0c11404fd34f098eb7785..726c17db96360d2a6de8f776fb63d315313ccf2e 100755 (executable)
@@ -33,9 +33,9 @@ import eu.etaxonomy.taxeditor.store.CdmStore;
  * @author k.luther
  * @since Oct 13, 2020
  */
-public class FeatureNodeDtoTransfer extends ByteArrayTransfer {
+public class TermNodeDtoTransfer extends ByteArrayTransfer {
 
-    private static FeatureNodeDtoTransfer instance = new FeatureNodeDtoTransfer();
+    private static TermNodeDtoTransfer instance = new TermNodeDtoTransfer();
     private static final String TYPE_NAME = "featureNodeDto-transfer-format";
     private static final int TYPEID = registerType(TYPE_NAME);
 
@@ -44,11 +44,11 @@ public class FeatureNodeDtoTransfer extends ByteArrayTransfer {
      *
      * @return a {@link eu.etaxonomy.taxeditor.featuretree.FeatureNodeTransfer} object.
      */
-    public static synchronized FeatureNodeDtoTransfer getInstance() {
+    public static synchronized TermNodeDtoTransfer getInstance() {
         return instance;
     }
 
-    private FeatureNodeDtoTransfer() {
+    private TermNodeDtoTransfer() {
     }
 
     /** {@inheritDoc} */
similarity index 94%
rename from eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/FeatureNodeTransfer.java
rename to eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/TermNodeTransfer.java
index 08853abf3efc0e804cd0b15e4a52f7126da6a68f..15e7c4f77fa0247ae9197a247072730030d18549 100644 (file)
@@ -35,9 +35,9 @@ import eu.etaxonomy.taxeditor.store.CdmStore;
  * @author n.hoffmann
  * @created Aug 5, 2010
  */
-public class FeatureNodeTransfer extends ByteArrayTransfer {
+public class TermNodeTransfer extends ByteArrayTransfer {
 
-       private static FeatureNodeTransfer instance = new FeatureNodeTransfer();
+       private static TermNodeTransfer instance = new TermNodeTransfer();
        private static final String TYPE_NAME = "featureNode-transfer-format";
        private static final int TYPEID = registerType(TYPE_NAME);
 
@@ -46,11 +46,11 @@ public class FeatureNodeTransfer extends ByteArrayTransfer {
         *
         * @return a {@link eu.etaxonomy.taxeditor.featuretree.FeatureNodeTransfer} object.
         */
-       public static synchronized FeatureNodeTransfer getInstance() {
+       public static synchronized TermNodeTransfer getInstance() {
                return instance;
        }
 
-       private FeatureNodeTransfer() {
+       private TermNodeTransfer() {
        }
 
        /** {@inheritDoc} */
similarity index 96%
rename from eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/FeatureTreeContentProvider.java
rename to eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/TermTreeContentProvider.java
index 6c96ddfad4e584b54f5805fb64a46c5ba3c693b5..49a8ff1fdd858743a5f5c19034971fb0b1fbf96d 100644 (file)
@@ -24,13 +24,13 @@ import eu.etaxonomy.cdm.persistence.dto.TermNodeDto;
 import eu.etaxonomy.cdm.persistence.dto.TermTreeDto;
 
 /**
- * <p>FeatureTreeContentProvider class.</p>
+ * <p>TermTreeContentProvider class.</p>
  *
  * @author n.hoffmann
  * @created Aug 5, 2010
  * @version 1.0
  */
-public class FeatureTreeContentProvider<T extends DefinedTermBase> implements ITreeContentProvider {
+public class TermTreeContentProvider<T extends DefinedTermBase> implements ITreeContentProvider {
 
     Viewer viewer;
     TermNodeDto oldInput;
similarity index 97%
rename from eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/FeatureTreeLabelProvider.java
rename to eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/TermTreeLabelProvider.java
index 9ef9384556007f67e3c3ebfd4ab0a7789bddb146..de7ee4529edde75db1c09de2f27c17ecd378eb00 100644 (file)
@@ -29,7 +29,7 @@ import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
  * @created Aug 5, 2010
  * @version 1.0
  */
-public class FeatureTreeLabelProvider extends TermDtoLabelProvider{
+public class TermTreeLabelProvider extends TermDtoLabelProvider{
 
        /** {@inheritDoc} */
        @Override
similarity index 84%
rename from eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/FeatureTreePropertyTester.java
rename to eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/TermTreePropertyTester.java
index a7240e246a50a8a92af64a15933bd3b6a60f679a..6cc3ce7b658333ea742ebecc979dbd6fad842c35 100644 (file)
@@ -15,7 +15,7 @@ import eu.etaxonomy.cdm.model.term.TermTree;
  * @since Jan 30, 2019
  *
  */
-public class FeatureTreePropertyTester extends PropertyTester {
+public class TermTreePropertyTester extends PropertyTester {
 
        private static final String FEATURE_TREE= "isFeatureTree"; //$NON-NLS-1$
 
@@ -31,14 +31,14 @@ public class FeatureTreePropertyTester extends PropertyTester {
                }
 
                if(FEATURE_TREE.equals(property)){
-                   return isFeatureTree(selectedElements);
+                   return isTermTree(selectedElements);
                }
                else{
                        return false;
                }
        }
 
-       private boolean isFeatureTree(Object[] selectedElements) {
+       private boolean isTermTree(Object[] selectedElements) {
            for (Object object : selectedElements){
                if(!(object instanceof TermTree)){
                    return false;
index 2ba3251c027908f8ae17367eeafb2859ee9af053..df40a4b56e8b9769a22d7665c48397a674d74c2e 100755 (executable)
@@ -39,8 +39,8 @@ 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.FeatureTreeContentProvider;
-import eu.etaxonomy.taxeditor.featuretree.FeatureTreeLabelProvider;
+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;
@@ -76,7 +76,7 @@ public class FeatureTreeDtoEditorComposite <T extends DefinedTermBase> extends C
 
         label_title = new Label(composite_treeTitle, SWT.NULL);
         label_title.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false, 1, 1));
-        label_title.setText(Messages.FeatureTreeEditorComposite_FEATURE_TREE);
+        label_title.setText(Messages.TermTreeEditorComposite_FEATURE_TREE);
 
         text_title = new Text(composite_treeTitle, SWT.BORDER);
         text_title.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 1, 1));
@@ -84,7 +84,7 @@ public class FeatureTreeDtoEditorComposite <T extends DefinedTermBase> extends C
 
         btnOpenFeatureTree = new Button(composite_treeTitle, SWT.NONE);
         btnOpenFeatureTree.setLayoutData(new GridData(SWT.CENTER, SWT.CENTER, false, false, 1, 1));
-        btnOpenFeatureTree.setToolTipText(Messages.FeatureTreeEditorComposite_OPEN_TREE);
+        btnOpenFeatureTree.setToolTipText(Messages.TermTreeEditorComposite_OPEN_TREE);
         btnOpenFeatureTree.setImage(ImageResources.getImage(ImageResources.BROWSE_ICON));
 
         viewer = new TreeViewer(new Tree(this, SWT.H_SCROLL | SWT.V_SCROLL | SWT.MULTI));
@@ -156,8 +156,8 @@ public class FeatureTreeDtoEditorComposite <T extends DefinedTermBase> extends C
             label_title.setText(label);
         }
 
-        viewer.setContentProvider(new FeatureTreeContentProvider());
-        viewer.setLabelProvider(new FeatureTreeLabelProvider());
+        viewer.setContentProvider(new TermTreeContentProvider());
+        viewer.setLabelProvider(new TermTreeLabelProvider());
 
         int ops = DND.DROP_COPY | DND.DROP_MOVE;
         if(transfers==null){
index 972c49c3281a2236541dc756c595133db8f2aaea..5503471fafe9d92f596e683287a1279c0944cdcb 100755 (executable)
@@ -15,7 +15,7 @@ import eu.etaxonomy.cdm.model.description.Character;
  * @author k.luther
  * @since Oct 29, 2020
  */
-public interface ICharacterEditor extends IFeatureTreeEditor<Character> {
+public interface ICharacterEditor extends ITermTreeEditor<Character> {
 
 
 }
similarity index 91%
rename from eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/IFeatureTreeEditor.java
rename to eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/ITermTreeEditor.java
index 2648a3f9139eccc976e472ef6007f216fb9abce9..34ed36a0fb78d4b927a47bb6f2e2125ba3721fb9 100644 (file)
@@ -26,7 +26,7 @@ import eu.etaxonomy.taxeditor.workbench.part.IE4SavablePart;
  * @author pplitzner
  * @since Nov 22, 2018
  */
-public interface IFeatureTreeEditor<T extends DefinedTermBase> extends IPostOperationEnabled, IE4SavablePart, ICdmEntitySessionEnabled {
+public interface ITermTreeEditor<T extends DefinedTermBase> extends IPostOperationEnabled, IE4SavablePart, ICdmEntitySessionEnabled {
 
     public TermType getTermType();
 
similarity index 84%
rename from eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/FeatureNodeDragListener.java
rename to eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/TermNodeDragListener.java
index f18c25a07536ae3dac198d15c91bd23e3afbb655..cf018be44dd9551a353458614cfa6c43f64c1253 100644 (file)
@@ -15,13 +15,13 @@ import org.eclipse.swt.dnd.DragSourceAdapter;
 import org.eclipse.swt.dnd.DragSourceEvent;
 
 import eu.etaxonomy.cdm.model.term.TermNode;
-import eu.etaxonomy.taxeditor.featuretree.FeatureNodeTransfer;
+import eu.etaxonomy.taxeditor.featuretree.TermNodeTransfer;
 
-public class FeatureNodeDragListener extends DragSourceAdapter {
+public class TermNodeDragListener extends DragSourceAdapter {
 
        private final TreeViewer viewer;
 
-       public FeatureNodeDragListener(TreeViewer viewer) {
+       public TermNodeDragListener(TreeViewer viewer) {
                this.viewer = viewer;
        }
 
@@ -33,7 +33,7 @@ public class FeatureNodeDragListener extends DragSourceAdapter {
         IStructuredSelection selection = (IStructuredSelection) viewer.getSelection();
         if(selection!=null && !selection.isEmpty()){
             TermNode[] featureNodes = (TermNode[]) selection.toList().toArray(new TermNode[selection.size()]);
-            if (FeatureNodeTransfer.getInstance().isSupportedType(event.dataType)) {
+            if (TermNodeTransfer.getInstance().isSupportedType(event.dataType)) {
                 event.data = featureNodes;
             }
 
similarity index 88%
rename from eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/FeatureNodeDtoDragListener.java
rename to eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/TermNodeDtoDragListener.java
index b64e8f2088c3e32553b7bed2da7bfe69e33a7d73..96d74ca3098456b3366c209f5d54011c2c809bc5 100755 (executable)
@@ -17,13 +17,13 @@ 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.FeatureNodeDtoTransfer;
+import eu.etaxonomy.taxeditor.featuretree.TermNodeDtoTransfer;
 
-public class FeatureNodeDtoDragListener extends DragSourceAdapter {
+public class TermNodeDtoDragListener extends DragSourceAdapter {
 
        private final TreeViewer viewer;
 
-       public FeatureNodeDtoDragListener(TreeViewer viewer) {
+       public TermNodeDtoDragListener(TreeViewer viewer) {
                this.viewer = viewer;
        }
 
@@ -36,7 +36,7 @@ public class FeatureNodeDtoDragListener extends DragSourceAdapter {
         if(selection!=null && !selection.isEmpty()){
             if (selection instanceof TreeSelection && ((TreeSelection)selection).getFirstElement() instanceof TermNodeDto){
                 TermNodeDto[] featureNodes = (TermNodeDto[]) selection.toList().toArray(new TermNodeDto[selection.size()]);
-                if (FeatureNodeDtoTransfer.getInstance().isSupportedType(event.dataType)) {
+                if (TermNodeDtoTransfer.getInstance().isSupportedType(event.dataType)) {
                     event.data = featureNodes;
                 }
             }
similarity index 96%
rename from eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/FeatureTreeDropAdapter.java
rename to eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/TermTreeDropAdapter.java
index bfb1abaa4775c58b9d0352b5167f500de52dd042..46be22eec625aa14a2db8880e495345511ab5896 100644 (file)
@@ -31,7 +31,7 @@ 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.FeatureNodeTransfer;
+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;
@@ -41,12 +41,12 @@ import eu.etaxonomy.taxeditor.store.StoreUtil;
 import eu.etaxonomy.taxeditor.ui.dialog.selection.TermVocabularySelectionDialog;
 import eu.etaxonomy.taxeditor.view.webimport.termimport.wrapper.OntologyTermWrapper;
 
-public class FeatureTreeDropAdapter extends ViewerDropAdapter {
+public class TermTreeDropAdapter extends ViewerDropAdapter {
 
-    protected IFeatureTreeEditor editor;
+    protected ITermTreeEditor editor;
     private UISynchronize sync;
 
-    public FeatureTreeDropAdapter(IFeatureTreeEditor editor, Viewer viewer, UISynchronize sync) {
+    public TermTreeDropAdapter(ITermTreeEditor editor, Viewer viewer, UISynchronize sync) {
                super(viewer);
                this.editor = editor;
                this.sync = sync;
@@ -219,7 +219,7 @@ public class FeatureTreeDropAdapter extends ViewerDropAdapter {
     @Override
     public boolean validateDrop(Object target, int operation, TransferData transferData) {
         boolean
-        isSupported = FeatureNodeTransfer.getInstance().isSupportedType(transferData);
+        isSupported = TermNodeTransfer.getInstance().isSupportedType(transferData);
         isSupported |= TermTransfer.getInstance().isSupportedType(transferData);
         isSupported |= LocalSelectionTransfer.getTransfer().isSupportedType(transferData);
         isSupported &= getViewer().getInput()!=null;
similarity index 96%
rename from eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/FeatureTreeDtoDropAdapter.java
rename to eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/TermTreeDtoDropAdapter.java
index 11d668cb90668db2b6aaa8ea9ac31dfdd971c091..284a25da6ef3d49fb1d0cbdd697d09a3280840bc 100755 (executable)
@@ -31,7 +31,7 @@ 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.FeatureNodeDtoTransfer;
+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;
@@ -40,12 +40,12 @@ import eu.etaxonomy.taxeditor.model.MessagingUtils;
 import eu.etaxonomy.taxeditor.ui.dialog.selection.TermVocabularySelectionDialog;
 import eu.etaxonomy.taxeditor.view.webimport.termimport.wrapper.OntologyTermWrapper;
 
-public class FeatureTreeDtoDropAdapter extends ViewerDropAdapter {
+public class TermTreeDtoDropAdapter extends ViewerDropAdapter {
 
-    protected IFeatureTreeEditor editor;
+    protected ITermTreeEditor editor;
     private UISynchronize sync;
 
-    public FeatureTreeDtoDropAdapter(IFeatureTreeEditor editor, Viewer viewer, UISynchronize sync) {
+    public TermTreeDtoDropAdapter(ITermTreeEditor editor, Viewer viewer, UISynchronize sync) {
                super(viewer);
                this.editor = editor;
                this.sync = sync;
@@ -239,7 +239,7 @@ public class FeatureTreeDtoDropAdapter extends ViewerDropAdapter {
     @Override
     public boolean validateDrop(Object target, int operation, TransferData transferData) {
         boolean
-        isSupported = FeatureNodeDtoTransfer.getInstance().isSupportedType(transferData);
+        isSupported = TermNodeDtoTransfer.getInstance().isSupportedType(transferData);
         isSupported |= TermTransfer.getInstance().isSupportedType(transferData);
         isSupported |= LocalSelectionTransfer.getTransfer().isSupportedType(transferData);
         isSupported &= getViewer().getInput()!=null;
index c23673ff4642b3a8557113dce6c7de6a87563f79..09e95b41d9fba59a68a52adbadf38cc6fa81862a 100644 (file)
@@ -61,9 +61,10 @@ import eu.etaxonomy.cdm.persistence.hibernate.CdmDataChangeMap;
 import eu.etaxonomy.taxeditor.editor.definedterm.FeatureTreeViewerComparator;
 import eu.etaxonomy.taxeditor.editor.definedterm.TermTransfer;
 import eu.etaxonomy.taxeditor.event.WorkbenchEventConstants;
-import eu.etaxonomy.taxeditor.featuretree.FeatureNodeDtoTransfer;
-import eu.etaxonomy.taxeditor.featuretree.FeatureTreeContentProvider;
-import eu.etaxonomy.taxeditor.featuretree.FeatureTreeLabelProvider;
+import eu.etaxonomy.taxeditor.featuretree.TermTreeContentProvider;
+import eu.etaxonomy.taxeditor.featuretree.TermTreeLabelProvider;
+import eu.etaxonomy.taxeditor.featuretree.TermNodeDtoTransfer;
+import eu.etaxonomy.taxeditor.featuretree.TermTreeContentProvider;
 import eu.etaxonomy.taxeditor.featuretree.e4.operation.AddFeatureOperation;
 import eu.etaxonomy.taxeditor.model.AbstractUtility;
 import eu.etaxonomy.taxeditor.model.IContextListener;
@@ -83,7 +84,7 @@ import eu.etaxonomy.taxeditor.workbench.part.IE4ViewerPart;
  * @date 06.06.2017
  *
  */
-public class TermTreeEditor<T extends DefinedTermBase> implements IFeatureTreeEditor, ISelectionChangedListener,
+public class TermTreeEditor<T extends DefinedTermBase> implements ITermTreeEditor, ISelectionChangedListener,
         IE4ViewerPart, IPartContentHasDetails, IPartContentHasSupplementalData,
         IContextListener, IConversationEnabled, IDirtyMarkable {
 
@@ -139,18 +140,18 @@ public class TermTreeEditor<T extends DefinedTermBase> implements IFeatureTreeEd
         }
         parent.setLayout(new FillLayout());
         viewer = new TreeViewer(parent);
-        FeatureTreeContentProvider contentProvider = new FeatureTreeContentProvider();
+        TermTreeContentProvider contentProvider = new TermTreeContentProvider();
 
         viewer.setContentProvider(contentProvider);
-        viewer.setLabelProvider(new FeatureTreeLabelProvider());
+        viewer.setLabelProvider(new TermTreeLabelProvider());
 
         int ops = DND.DROP_COPY | DND.DROP_MOVE;
         Transfer[] transfers = new Transfer[] {
-                FeatureNodeDtoTransfer.getInstance(),
+                TermNodeDtoTransfer.getInstance(),
                 TermTransfer.getInstance(),
                 LocalSelectionTransfer.getTransfer()};
-        viewer.addDragSupport(ops, transfers, new FeatureNodeDtoDragListener(viewer));
-        viewer.addDropSupport(ops, transfers, new FeatureTreeDtoDropAdapter(this, viewer, sync));
+        viewer.addDragSupport(ops, transfers, new TermNodeDtoDragListener(viewer));
+        viewer.addDropSupport(ops, transfers, new TermTreeDtoDropAdapter(this, viewer, sync));
         viewer.addSelectionChangedListener(this);
         viewer.getTree().addKeyListener(new KeyAdapter() {
             @Override
@@ -177,7 +178,7 @@ public class TermTreeEditor<T extends DefinedTermBase> implements IFeatureTreeEd
         updateTrees();
         viewer.setComparator(new FeatureTreeViewerComparator());
         viewer.setInput(getTrees());
-        ((FeatureTreeContentProvider)viewer.getContentProvider()).setUuidTermMap(uuidTermMap);
+        ((TermTreeContentProvider)viewer.getContentProvider()).setUuidTermMap(uuidTermMap);
         thisPart.setLabel(label);
     }
 
@@ -464,7 +465,7 @@ public class TermTreeEditor<T extends DefinedTermBase> implements IFeatureTreeEd
         for (TermTreeDto tree: trees.values()){
             addAllNodesToMap(tree.getRoot());
         }
-        ((FeatureTreeContentProvider<T>)viewer.getContentProvider()).setUuidTermMap(uuidTermMap);
+        ((TermTreeContentProvider<T>)viewer.getContentProvider()).setUuidTermMap(uuidTermMap);
 //        viewer.refresh();
 
     }
similarity index 91%
rename from eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/FeatureTreeEditorComposite.java
rename to eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/TermTreeEditorComposite.java
index 7bc710245fc286d6f97578ff323e82847a5b6e5d..9b2b281618ec39ea5bf82a71f761f5685d035935 100644 (file)
@@ -31,9 +31,9 @@ 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.FeatureNodeTransfer;
-import eu.etaxonomy.taxeditor.featuretree.FeatureTreeContentProvider;
-import eu.etaxonomy.taxeditor.featuretree.FeatureTreeLabelProvider;
+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;
@@ -44,7 +44,7 @@ import eu.etaxonomy.taxeditor.ui.dialog.selection.FeatureTreeSelectionDialog;
  * @author pplitzner
  * @since Jun 19, 2017
  */
-public class FeatureTreeEditorComposite <T extends DefinedTermBase> extends Composite{
+public class TermTreeEditorComposite <T extends DefinedTermBase> extends Composite{
 
     private TermTree<T> featureTree;
 
@@ -53,7 +53,7 @@ public class FeatureTreeEditorComposite <T extends DefinedTermBase> extends Comp
     private Button btnOpenFeatureTree;
     private TreeViewer viewer;
 
-    public FeatureTreeEditorComposite(Composite parent, int style) {
+    public TermTreeEditorComposite(Composite parent, int style) {
         super(parent, style);
         setLayout(new GridLayout(1, false));
 
@@ -66,7 +66,7 @@ public class FeatureTreeEditorComposite <T extends DefinedTermBase> extends Comp
 
         label_title = new Label(composite_treeTitle, SWT.NULL);
         label_title.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false, 1, 1));
-        label_title.setText(Messages.FeatureTreeEditorComposite_FEATURE_TREE);
+        label_title.setText(Messages.TermTreeEditorComposite_FEATURE_TREE);
 
         text_title = new Text(composite_treeTitle, SWT.BORDER);
         text_title.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 1, 1));
@@ -74,7 +74,7 @@ public class FeatureTreeEditorComposite <T extends DefinedTermBase> extends Comp
 
         btnOpenFeatureTree = new Button(composite_treeTitle, SWT.NONE);
         btnOpenFeatureTree.setLayoutData(new GridData(SWT.CENTER, SWT.CENTER, false, false, 1, 1));
-        btnOpenFeatureTree.setToolTipText(Messages.FeatureTreeEditorComposite_OPEN_TREE);
+        btnOpenFeatureTree.setToolTipText(Messages.TermTreeEditorComposite_OPEN_TREE);
         btnOpenFeatureTree.setImage(ImageResources.getImage(ImageResources.BROWSE_ICON));
 
         viewer = new TreeViewer(new Tree(this, SWT.H_SCROLL | SWT.V_SCROLL | SWT.MULTI));
@@ -146,13 +146,13 @@ public class FeatureTreeEditorComposite <T extends DefinedTermBase> extends Comp
             label_title.setText(label);
         }
 
-        viewer.setContentProvider(new FeatureTreeContentProvider());
-        viewer.setLabelProvider(new FeatureTreeLabelProvider());
+        viewer.setContentProvider(new TermTreeContentProvider());
+        viewer.setLabelProvider(new TermTreeLabelProvider());
 
         int ops = DND.DROP_COPY | DND.DROP_MOVE;
         if(transfers==null){
         transfers = new Transfer[] {
-                FeatureNodeTransfer.getInstance(),
+                TermNodeTransfer.getInstance(),
                 TermTransfer.getInstance(),
                 };
         }
@@ -30,9 +30,9 @@ 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.AvailableFeaturesWizard;
+import eu.etaxonomy.taxeditor.featuretree.AvailableTermsWizard;
 import eu.etaxonomy.taxeditor.featuretree.e4.ICharacterEditor;
-import eu.etaxonomy.taxeditor.featuretree.e4.IFeatureTreeEditor;
+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;
@@ -42,13 +42,13 @@ import eu.etaxonomy.taxeditor.model.MessagingUtils;
  * @author k.luther
  * @since Nov 10, 2020
  */
-public abstract class AbstractAddFeatureHandler {
+public abstract class AbstractAddTermHandler {
     @Execute
     public void execute(@Named(IServiceConstants.ACTIVE_SHELL) Shell shell,
             @Named(IServiceConstants.ACTIVE_PART)MPart thisPart,
             @Named(IServiceConstants.ACTIVE_SELECTION)IStructuredSelection selection,
             UISynchronize sync) {
-        IFeatureTreeEditor editor = ((IFeatureTreeEditor) thisPart.getObject());
+        ITermTreeEditor editor = ((ITermTreeEditor) thisPart.getObject());
 
         TermNodeDto parent = getParent(selection);
         TermType type = null;
@@ -57,7 +57,7 @@ public abstract class AbstractAddFeatureHandler {
         }else{
             type = parent.getTerm().getTermType();
         }
-        AvailableFeaturesWizard wizard = new AvailableFeaturesWizard(type);
+        AvailableTermsWizard wizard = new AvailableTermsWizard(type);
         WizardDialog dialog = new WizardDialog(shell, wizard);
 
         if (dialog.open() == IStatus.OK) {
@@ -18,13 +18,13 @@ 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.IFeatureTreeEditor;
+import eu.etaxonomy.taxeditor.featuretree.e4.ITermTreeEditor;
 
 /**
  * @author pplitzner
  * @since Jul 12, 2017
  */
-public class AddChildFeatureHandler extends AbstractAddFeatureHandler{
+public class AddChildTermHandler extends AbstractAddTermHandler{
 
     @CanExecute
     public boolean canExecute(
@@ -32,7 +32,7 @@ public class AddChildFeatureHandler extends AbstractAddFeatureHandler{
             @Named(IServiceConstants.ACTIVE_PART)MPart thisPart,
             MHandledMenuItem menuItem) {
         boolean canExecute = false;
-        canExecute = thisPart.getObject() instanceof IFeatureTreeEditor
+        canExecute = thisPart.getObject() instanceof ITermTreeEditor
                 && selection!=null
                 && selection.size()==1
                 && selection.getFirstElement() instanceof TermNodeDto;
similarity index 96%
rename from eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/handler/AddFeatureHandler.java
rename to eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/handler/AddTermHandler.java
index 3575fee1c3a52e3d21b21be20fe944d0755b60c9..bcb4ec85875f6089c643d005a21b49d399743046 100644 (file)
@@ -22,14 +22,14 @@ 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.IFeatureTreeEditor;
+import eu.etaxonomy.taxeditor.featuretree.e4.ITermTreeEditor;
 
 /**
  * @author pplitzner
  * @since Jul 12, 2017
  *
  */
-public class AddFeatureHandler extends AbstractAddFeatureHandler{
+public class AddTermHandler extends AbstractAddTermHandler{
 
     @Execute
     public void execute(@Named(IServiceConstants.ACTIVE_SHELL) Shell shell,
@@ -99,7 +99,7 @@ public class AddFeatureHandler extends AbstractAddFeatureHandler{
             @Named(IServiceConstants.ACTIVE_PART)MPart thisPart,
             MHandledMenuItem menuItem) {
         boolean canExecute = false;
-        canExecute = thisPart.getObject() instanceof IFeatureTreeEditor
+        canExecute = thisPart.getObject() instanceof ITermTreeEditor
                 && selection!=null
                 && selection.size()==1
                 && selection.getFirstElement() instanceof TermTreeDto;
similarity index 97%
rename from eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/handler/CopyFeatureHandler.java
rename to eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/handler/CopyTermHandler.java
index ad1e8dbc8e203037b3b7b8dc8e253a52859669a1..4e3fefd6bca33acb30bfdd48af9716b357219631 100644 (file)
@@ -14,7 +14,7 @@ import org.eclipse.jface.viewers.IStructuredSelection;
 import eu.etaxonomy.cdm.persistence.dto.TermNodeDto;
 import eu.etaxonomy.taxeditor.featuretree.e4.TermTreeEditor;
 
-public class CopyFeatureHandler {
+public class CopyTermHandler {
 
     @Execute
     public void execute(@Named(IServiceConstants.ACTIVE_PART) MPart part,
@@ -19,7 +19,7 @@ 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.IFeatureTreeEditor;
+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;
@@ -28,11 +28,11 @@ import eu.etaxonomy.taxeditor.store.StoreUtil;
  * @author pplitzner
  * @since Jul 12, 2017
  */
-public class CreateFeatureTreeHandler {
+public class CreateTermTreeHandler {
 
     @Execute
     public void execute(@Named(IServiceConstants.ACTIVE_PART)MPart thisPart, UISynchronize sync){
-        IFeatureTreeEditor editor = (IFeatureTreeEditor) thisPart.getObject();
+        ITermTreeEditor editor = (ITermTreeEditor) thisPart.getObject();
 
         if (StoreUtil.promptCheckIsDirty(editor)) {
             return;
@@ -61,7 +61,7 @@ public class CreateFeatureTreeHandler {
             @Named(IServiceConstants.ACTIVE_PART)MPart thisPart,
             MHandledMenuItem menuItem) {
         boolean canExecute = false;
-        canExecute = thisPart.getObject() instanceof IFeatureTreeEditor;
+        canExecute = thisPart.getObject() instanceof ITermTreeEditor;
         menuItem.setVisible(canExecute);
         return canExecute;
     }
@@ -24,7 +24,7 @@ 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.IFeatureTreeEditor;
+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;
@@ -34,12 +34,12 @@ import eu.etaxonomy.taxeditor.store.StoreUtil;
  * @since Jul 12, 2017
  *
  */
-public class RemoveFeatureHandler {
+public class RemoveTermHandler {
 
     @Execute
     public void execute(@Named(IServiceConstants.ACTIVE_PART)MPart thisPart,
             @Named(IServiceConstants.ACTIVE_SELECTION)IStructuredSelection selection, UISynchronize sync){
-        IFeatureTreeEditor editor = (IFeatureTreeEditor) thisPart.getObject();
+        ITermTreeEditor editor = (ITermTreeEditor) thisPart.getObject();
 
 //        if (StoreUtil.promptCheckIsDirty(editor)) {
 //            return;
@@ -98,7 +98,7 @@ public class RemoveFeatureHandler {
                 canExecute &= object instanceof TermNodeDto;
             }
         }
-        canExecute &= thisPart.getObject() instanceof IFeatureTreeEditor;
+        canExecute &= thisPart.getObject() instanceof ITermTreeEditor;
         menuItem.setVisible(canExecute);
         return canExecute;
     }
@@ -20,7 +20,7 @@ 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.IFeatureTreeEditor;
+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;
@@ -30,12 +30,12 @@ import eu.etaxonomy.taxeditor.store.StoreUtil;
  * @since Jul 12, 2017
  *
  */
-public class RemoveFeatureTreeHandler {
+public class RemoveTermTreeHandler {
 
     @Execute
     public void execute(@Named(IServiceConstants.ACTIVE_PART)MPart thisPart,
             @Named(IServiceConstants.ACTIVE_SELECTION)IStructuredSelection selection, UISynchronize sync){
-        IFeatureTreeEditor editor = (IFeatureTreeEditor) thisPart.getObject();
+        ITermTreeEditor editor = (ITermTreeEditor) thisPart.getObject();
 
         if (StoreUtil.promptCheckIsDirty(editor)) {
             return;
@@ -67,7 +67,7 @@ public class RemoveFeatureTreeHandler {
                 canExecute &= object instanceof TermTreeDto;
             }
         }
-        canExecute &= thisPart.getObject() instanceof IFeatureTreeEditor;
+        canExecute &= thisPart.getObject() instanceof ITermTreeEditor;
         menuItem.setVisible(canExecute);
         return canExecute;
     }
@@ -30,7 +30,7 @@ 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.IFeatureTreeEditor;
+import eu.etaxonomy.taxeditor.featuretree.e4.ITermTreeEditor;
 import eu.etaxonomy.taxeditor.store.CdmStore;
 import eu.etaxonomy.taxeditor.store.StoreUtil;
 
@@ -39,13 +39,13 @@ import eu.etaxonomy.taxeditor.store.StoreUtil;
  * @since Jul 12, 2017
  *
  */
-public class FeatureTreeExportOntologyHandler {
+public class TermTreeExportOntologyHandler {
 
     @Execute
     public void execute(@Named(IServiceConstants.ACTIVE_SHELL) Shell shell,
             @Named(IServiceConstants.ACTIVE_SELECTION)IStructuredSelection selection,
             @Named(IServiceConstants.ACTIVE_PART)MPart thisPart){
-        IFeatureTreeEditor editor = (IFeatureTreeEditor) thisPart.getObject();
+        ITermTreeEditor editor = (ITermTreeEditor) thisPart.getObject();
 
         if(StoreUtil.promptCheckIsDirty(editor)){
             return;
@@ -27,7 +27,7 @@ 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.IFeatureTreeEditor;
+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;
@@ -38,13 +38,13 @@ import eu.etaxonomy.taxeditor.store.StoreUtil;
  * @since Jul 12, 2017
  *
  */
-public class FeatureTreeExportWordHandler {
+public class TermTreeExportWordHandler {
 
     @Execute
     public void execute(@Named(IServiceConstants.ACTIVE_SHELL) Shell shell,
             @Named(IServiceConstants.ACTIVE_SELECTION)IStructuredSelection selection,
             @Named(IServiceConstants.ACTIVE_PART)MPart thisPart){
-        IFeatureTreeEditor editor = (IFeatureTreeEditor) thisPart.getObject();
+        ITermTreeEditor editor = (ITermTreeEditor) thisPart.getObject();
 
         if(StoreUtil.promptCheckIsDirty(editor)){
             return;
index 3b6f1008ae57d8f0b0c5eb2ad0b1f9445fc11598..072a9a60dd4032dbac8f8eae477867cb0841db09 100644 (file)
@@ -19,7 +19,7 @@ import eu.etaxonomy.taxeditor.editor.definedterm.DefinedTermSorter;
 import eu.etaxonomy.taxeditor.editor.definedterm.FeatureTreeViewerComparator;
 import eu.etaxonomy.taxeditor.editor.definedterm.RootElementsOnlyTreeContentProvider;
 import eu.etaxonomy.taxeditor.editor.definedterm.TermDtoLabelProvider;
-import eu.etaxonomy.taxeditor.featuretree.FeatureTreeLabelProvider;
+import eu.etaxonomy.taxeditor.featuretree.TermTreeLabelProvider;
 import eu.etaxonomy.taxeditor.model.ImageResources;
 import eu.etaxonomy.taxeditor.preference.wizard.CheckBoxTreeComposite;
 
@@ -46,7 +46,7 @@ public class OwlTermExportComposite extends Composite {
         selectVocabularyComposite.getViewer().setComparator(new DefinedTermSorter());
         selectVocabularyComposite.setLayoutData(layoutData);
 
-        selectFeatureTreeComposite = new CheckBoxTreeComposite(this, new RootElementsOnlyTreeContentProvider(), new FeatureTreeLabelProvider(), SWT.NONE);
+        selectFeatureTreeComposite = new CheckBoxTreeComposite(this, new RootElementsOnlyTreeContentProvider(), new TermTreeLabelProvider(), SWT.NONE);
         selectFeatureTreeComposite.setAllowTopLevelSelection(true);
         selectFeatureTreeComposite.getViewer().setComparator(new FeatureTreeViewerComparator());
         selectFeatureTreeComposite.setLayoutData(layoutData);
index c2c0dfb2c839fb5fab6c3ab8f9136c12b7074ccd..fdd284acc633293754064cb196d4f7caed608a87 100644 (file)
@@ -363,10 +363,10 @@ public class Messages extends NLS {
     public static String FeatureTreeDropAdapter_ONLY_MOVE_FEATURES;
     public static String FeatureTreeDropAdapter_ORDER_VOC_NOT_POSSIBLE;
 
-    public static String FeatureTreeEditorComposite_ADD_FEATURE;
-    public static String FeatureTreeEditorComposite_FEATURE_TREE;
-    public static String FeatureTreeEditorComposite_OPEN_TREE;
-    public static String FeatureTreeEditorComposite_REMOVE_FEATURE;
+    public static String TermTreeEditorComposite_ADD_FEATURE;
+    public static String TermTreeEditorComposite_FEATURE_TREE;
+    public static String TermTreeEditorComposite_OPEN_TREE;
+    public static String TermTreeEditorComposite_REMOVE_FEATURE;
 
     public static String FeatureTreeSelectionDialog_CHOOSE_TREE;
     public static String FeatureTreeSelectionDialog_ENTER_LABEL;
index dbd70124be496a53762586189f4258539d925e08..b665eb5fd1f8985f3131dbb2474ff552758557f1 100644 (file)
@@ -297,10 +297,10 @@ TaxonRelationshipTypeMenuPreferences_configure=Configure taxon relationship type
 TaxonSearchPreferences_0=Open search results in separate windows
 TCSImportWizard_ConfiguratorWizard_label=Configure the TCS import
 FeatureMenuPreferences_display=Choose available features
-FeatureTreeEditorComposite_ADD_FEATURE=Add a term to this term tree.
-FeatureTreeEditorComposite_FEATURE_TREE=Term Tree
-FeatureTreeEditorComposite_OPEN_TREE=Open Tree
-FeatureTreeEditorComposite_REMOVE_FEATURE=Remove a term from this term tree.
+TermTreeEditorComposite_ADD_FEATURE=Add a term to this term tree.
+TermTreeEditorComposite_FEATURE_TREE=Term Tree
+TermTreeEditorComposite_OPEN_TREE=Open Tree
+TermTreeEditorComposite_REMOVE_FEATURE=Remove a term from this term tree.
 FeatureTreeSelectionDialog_CHOOSE_TREE=Choose a term tree
 FeatureTreeSelectionDialog_ENTER_LABEL=Enter label for term tree
 FeatureTreeSelectionDialog_NEW_TREE=New Term tree
index ecde01ab48126c09062c702b909c920d949460fa..19a3235d88637e4e6b1599d53dfb7d0271eeb54c 100644 (file)
@@ -297,10 +297,10 @@ TaxonRelationshipTypeMenuPreferences_configure=Auswahl der zur Verf\u00FCgung st
 TaxonSearchPreferences_0=Öffne Suchergebnisse in eigenem Fenster
 TCSImportWizard_ConfiguratorWizard_label=Konfiguration des TCS Imports
 FeatureMenuPreferences_display=Auswahl der zur Verf\u00FCgung stehenden Features
-FeatureTreeEditorComposite_ADD_FEATURE=Term zum Termbaum hinzufügen
-FeatureTreeEditorComposite_FEATURE_TREE=Termbaum
-FeatureTreeEditorComposite_OPEN_TREE=Termbaum öffnen
-FeatureTreeEditorComposite_REMOVE_FEATURE=Term vom Termbaum entfernen
+TermTreeEditorComposite_ADD_FEATURE=Term zum Termbaum hinzufügen
+TermTreeEditorComposite_FEATURE_TREE=Termbaum
+TermTreeEditorComposite_OPEN_TREE=Termbaum öffnen
+TermTreeEditorComposite_REMOVE_FEATURE=Term vom Termbaum entfernen
 FeatureTreeSelectionDialog_CHOOSE_TREE=Termbaum auswählen
 FeatureTreeSelectionDialog_ENTER_LABEL=Namen für Termbaum eingeben
 FeatureTreeSelectionDialog_NEW_TREE=Neuer Termbaum
index 5c48eccbc1757c606a3aa6b2d02dc4e4d3c61210..9637c07f2819f5381cfd590bb91983b1a10c9149 100644 (file)
@@ -25,8 +25,10 @@ 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.FeatureTreeContentProvider;
-import eu.etaxonomy.taxeditor.featuretree.FeatureTreeLabelProvider;
+import eu.etaxonomy.taxeditor.featuretree.TermTreeContentProvider;
+import eu.etaxonomy.taxeditor.featuretree.TermTreeLabelProvider;
+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;
@@ -68,8 +70,8 @@ public class DefaultFeatureTreePreferenecs extends CdmPreferencePage {
                final ListViewer viewer = new ListViewer(parent);
                viewer.getControl().setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
 
-               viewer.setContentProvider(new FeatureTreeContentProvider());
-               viewer.setLabelProvider(new FeatureTreeLabelProvider());
+               viewer.setContentProvider(new TermTreeContentProvider());
+               viewer.setLabelProvider(new TermTreeLabelProvider());
 
                viewer.addSelectionChangedListener(new ISelectionChangedListener() {
 
@@ -99,8 +101,8 @@ public class DefaultFeatureTreePreferenecs extends CdmPreferencePage {
                final ListViewer viewer = new ListViewer(parent);
                viewer.getControl().setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
 
-               viewer.setContentProvider(new FeatureTreeContentProvider());
-               viewer.setLabelProvider(new FeatureTreeLabelProvider());
+               viewer.setContentProvider(new TermTreeContentProvider());
+               viewer.setLabelProvider(new TermTreeLabelProvider());
 
                viewer.addSelectionChangedListener(new ISelectionChangedListener() {
 
index 702c2c4809e59463287a89d67f0c1a8a1f898b48..68182ac1cf00689ecc3951ebf83b28fea7a29673 100644 (file)
@@ -37,7 +37,7 @@ 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.AvailableFeaturesWizard;
+import eu.etaxonomy.taxeditor.featuretree.AvailableTermsWizard;
 import eu.etaxonomy.taxeditor.model.ImageResources;
 import eu.etaxonomy.taxeditor.store.CdmStore;
 import eu.etaxonomy.taxeditor.ui.AbstractEntityCollectionElementWizardPage;
@@ -87,7 +87,7 @@ public class FeatureStateWizardPage extends AbstractEntityCollectionElementWizar
 
             @Override
             public void widgetSelected(SelectionEvent e) {
-                AvailableFeaturesWizard wizard = new AvailableFeaturesWizard(stateVocabulariesDtos);
+                AvailableTermsWizard wizard = new AvailableTermsWizard(stateVocabulariesDtos);
                 wizard.setSingleSelection(true);
                 WizardDialog dialog = new WizardDialog(getShell(), wizard);
 
index 3d2f25fbeef12efd0ead5813da5bdd6adaf0d2d0..ed2c944e8695218bc851ea152b5c1cbf49810651 100755 (executable)
@@ -297,10 +297,10 @@ TaxonRelationshipTypeMenuPreferences_configure=Configure taxon relationship type
 TaxonSearchPreferences_0=Open search results in separate windows
 TCSImportWizard_ConfiguratorWizard_label=Configure the TCS import
 FeatureMenuPreferences_display=Choose available features
-FeatureTreeEditorComposite_ADD_FEATURE=Add a term to this term tree.
-FeatureTreeEditorComposite_FEATURE_TREE=Term Tree
-FeatureTreeEditorComposite_OPEN_TREE=Open Tree
-FeatureTreeEditorComposite_REMOVE_FEATURE=Remove a term from this term tree.
+TermTreeEditorComposite_ADD_FEATURE=Add a term to this term tree.
+TermTreeEditorComposite_FEATURE_TREE=Term Tree
+TermTreeEditorComposite_OPEN_TREE=Open Tree
+TermTreeEditorComposite_REMOVE_FEATURE=Remove a term from this term tree.
 FeatureTreeSelectionDialog_CHOOSE_TREE=Choose a term tree
 FeatureTreeSelectionDialog_ENTER_LABEL=Enter label for term tree
 FeatureTreeSelectionDialog_NEW_TREE=New Term tree
index 8525673df0ff2e38d261e37b34b85d3a36d79f90..49c267d108c2a4df0345ee579f1f9c9dcd6b4a6d 100755 (executable)
@@ -297,10 +297,10 @@ TaxonRelationshipTypeMenuPreferences_configure=Auswahl der zur Verf\u00FCgung st
 TaxonSearchPreferences_0=Öffne Suchergebnisse in eigenem Fenster
 TCSImportWizard_ConfiguratorWizard_label=Konfiguration des TCS Imports
 FeatureMenuPreferences_display=Auswahl der zur Verf\u00FCgung stehenden Features
-FeatureTreeEditorComposite_ADD_FEATURE=Term zum Termbaum hinzufügen
-FeatureTreeEditorComposite_FEATURE_TREE=Termbaum
-FeatureTreeEditorComposite_OPEN_TREE=Termbaum öffnen
-FeatureTreeEditorComposite_REMOVE_FEATURE=Term vom Termbaum entfernen
+TermTreeEditorComposite_ADD_FEATURE=Term zum Termbaum hinzufügen
+TermTreeEditorComposite_FEATURE_TREE=Termbaum
+TermTreeEditorComposite_OPEN_TREE=Termbaum öffnen
+TermTreeEditorComposite_REMOVE_FEATURE=Term vom Termbaum entfernen
 FeatureTreeSelectionDialog_CHOOSE_TREE=Termbaum auswählen
 FeatureTreeSelectionDialog_ENTER_LABEL=Namen für Termbaum eingeben
 FeatureTreeSelectionDialog_NEW_TREE=Neuer Termbaum