rename TaxonNameEditor to TaxonEditor and NameViewerE4 to NameViewer
authorKatja Luther <k.luther@bgbm.org>
Tue, 22 Nov 2022 14:13:30 +0000 (15:13 +0100)
committerKatja Luther <k.luther@bgbm.org>
Tue, 22 Nov 2022 14:14:23 +0000 (15:14 +0100)
51 files changed:
eu.etaxonomy.taxeditor.editor/fragment.e4xmi
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/AppModelId.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/EditorUtil.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/IDropTargetable.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/TaxonEditor.java [moved from eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/TaxonNameEditor.java with 98% similarity]
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/container/AbstractGroup.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/container/AbstractGroupedContainerE4.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/container/AbstractHomotypicalGroupContainer.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/container/AcceptedGroup.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/container/ConceptContainer.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/container/ContainerFactory.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/container/HomotypicalSynonymGroup.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/container/MisappliedGroup.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/container/NameViewer.java [moved from eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/container/NameViewerE4.java with 98% similarity]
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/container/SynonymContainerE4.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/dnd/NameEditorDropTargetListener.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/handler/ChangeSynonymToAcceptedTaxonHandler.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/handler/ChangeToMisapplicationHandler.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/handler/ChangeToProParteSynonymHandler.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/handler/ChangeToSynonymHandler.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/handler/CreateHeterotypicSynonymHandler.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/handler/CreateHomotypicSynonymHandler.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/handler/CreateMisapplicationHandler.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/handler/CreateProParteSynonymHandler.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/handler/CreateSynonymInHomotypicalGroupHandler.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/handler/DeleteAllEmptyNamesHandler.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/handler/DeleteTaxonBaseHandler.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/handler/MoveSynonymToAnotherAcceptedTaxonHandler.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/handler/SetBasionymHandler.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/handler/SwapSynonymAndAcceptedHandler.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/handler/NameEditorMenuPropertyTester.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/CreateNewTaxonBaseOperation.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/concept/e4/handler/CreateConceptRelationHandlerE4.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/concept/e4/handler/DeleteConceptRelationHandlerE4.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/concept/e4/handler/OpenRelatedConceptHandlerE4.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/concept/graph/e4/ConceptGraphViewE4.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/DerivateView.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/DescriptionElementDropAdapter.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/e4/FactualDataPartE4.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/e4/handler/DeleteHandlerE4.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/e4/handler/DescriptionsMenuPropertyTesterE4.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/e4/handler/MoveDescriptionElementsHandlerE4.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/e4/handler/MoveDescriptionElementsSetNameInSourceHandlerE5.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/e4/handler/MoveDescriptionToOtherTaxonHandlerE4.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/e4/handler/MoveDescriptionToOtherTaxonSetNameInSourceHandlerE5.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/media/e4/MediaViewPartE4.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/media/handler/AbstractMoveImageHandler.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/media/handler/DeleteMediaHandler.java
eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/NavigationUtil.java
eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/e4/TaxonNavigatorE4.java
eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/operation/ChangeAcceptedTaxonToSynonymOperation.java

index 8128c14f942502e7ff817120949ace51c62f62d3..486d54177cea1dfe708bfe6164981d419b14092f 100644 (file)
         <children xsi:type="menu:HandledMenuItem" xmi:id="_KT8rYIZ5EeeOc9DZcjNN7g" elementId="eu.etaxonomy.taxeditor.editor.handledmenuitem.commandlabel44" label="%command.label.44" command="_Ob4xIIZ5EeeOc9DZcjNN7g"/>
       </menus>
     </elements>
-    <elements xsi:type="basic:PartDescriptor" xmi:id="_tLceMIl4Eeeox7omhvOBWg" elementId="eu.etaxonomy.taxeditor.editor.name.e4.TaxonNameEditor" label="%partdescriptor.label.2" iconURI="platform:/plugin/eu.etaxonomy.taxeditor.editor/icons/edit_16x16.gif" tooltip="" allowMultiple="true" category="" closeable="true" dirtyable="true" contributionURI="bundleclass://eu.etaxonomy.taxeditor.editor/eu.etaxonomy.taxeditor.editor.name.e4.TaxonNameEditor">
+    <elements xsi:type="basic:PartDescriptor" xmi:id="_tLceMIl4Eeeox7omhvOBWg" elementId="eu.etaxonomy.taxeditor.editor.name.e4.TaxonNameEditor" label="%partdescriptor.label.2" iconURI="platform:/plugin/eu.etaxonomy.taxeditor.editor/icons/edit_16x16.gif" tooltip="" allowMultiple="true" category="" closeable="true" dirtyable="true" contributionURI="bundleclass://eu.etaxonomy.taxeditor.editor/eu.etaxonomy.taxeditor.editor.name.e4.TaxonEditor">
       <tags>View</tags>
       <tags>nonRestore</tags>
       <handlers xmi:id="_tLceQIl4Eeeox7omhvOBWg" elementId="eu.etaxonomy.taxeditor.editor.nameEditor.handler.SaveHandler" contributionURI="bundleclass://eu.etaxonomy.taxeditor.workbench/eu.etaxonomy.taxeditor.workbench.SaveHandler" command="_majwMEaQEeeXMc6kSYO7Xg"/>
index 2c4ff9184fc30e49b71b1dc8df31dcd4dac6537c..5e806cd69f34ec83435e3ba0b4f6f58f8d116d57 100644 (file)
@@ -277,7 +277,7 @@ public class AppModelId {
        public static final String PARTDESCRIPTOR_EU_ETAXONOMY_TAXEDITOR_EDITOR_GROUP_AUTHORITY_E4_CDMAUTHORITYEDITORE4 = "eu.etaxonomy.taxeditor.editor.group.authority.e4.CdmAuthorityEditorE4";
        public static final String PARTDESCRIPTOR_EU_ETAXONOMY_TAXEDITOR_EDITOR_KEY_POLYTOMOUS_E4_POLYTOMOUSKEYGRAPHEDITORE4 = "eu.etaxonomy.taxeditor.editor.key.polytomous.e4.PolytomousKeyGraphEditorE4";
        public static final String PARTDESCRIPTOR_EU_ETAXONOMY_TAXEDITOR_EDITOR_KEY_POLYTOMOUS_E4_POLYTOMOUSKEYLISTEDITORE4 = "eu.etaxonomy.taxeditor.editor.key.polytomous.e4.PolytomousKeyListEditorE4";
-       public static final String PARTDESCRIPTOR_EU_ETAXONOMY_TAXEDITOR_EDITOR_NAME_E4_TAXONNAMEEDITORE4 = "eu.etaxonomy.taxeditor.editor.name.e4.TaxonNameEditor";
+       public static final String PARTDESCRIPTOR_EU_ETAXONOMY_TAXEDITOR_EDITOR_NAME_E4_TAXONNAMEEDITORE4 = "eu.etaxonomy.taxeditor.editor.name.e4.TaxonEditor";
        //public static final String PARTDESCRIPTOR_EU_ETAXONOMY_TAXEDITOR_EDITOR_VIEW_CHECKLIST_E4_CHECKLISTEDITORE4 = "eu.etaxonomy.taxeditor.editor.view.checklist.e4.ChecklistEditorE4";
        public static final String PARTDESCRIPTOR_EU_ETAXONOMY_TAXEDITOR_EDITOR_VIEW_CHECKLIST_E4_DISTRIBUTIONEDITORPART = "eu.etaxonomy.taxeditor.editor.view.checklist.e4.DistributionEditorPart";
        public static final String PARTDESCRIPTOR_EU_ETAXONOMY_TAXEDITOR_EDITOR_VIEW_CONCEPT_E4_CONCEPTVIEWPARTE4 = "eu.etaxonomy.taxeditor.editor.view.concept.e4.ConceptViewPartE4";
index 5da5d7ae5a98104ec610c58d5ccd9a8acb33f2cc..bb8c5ef2c14152b1e317b8fe3a6a2f5231cab422 100644 (file)
@@ -50,7 +50,7 @@ import eu.etaxonomy.taxeditor.editor.group.authority.CdmAuthorityEditorInput;
 import eu.etaxonomy.taxeditor.editor.group.authority.e4.CdmAuthorityEditorE4;
 import eu.etaxonomy.taxeditor.editor.internal.TaxeditorEditorPlugin;
 import eu.etaxonomy.taxeditor.editor.l10n.Messages;
-import eu.etaxonomy.taxeditor.editor.name.e4.TaxonNameEditor;
+import eu.etaxonomy.taxeditor.editor.name.e4.TaxonEditor;
 import eu.etaxonomy.taxeditor.editor.view.checklist.e4.DistributionEditorPart;
 import eu.etaxonomy.taxeditor.editor.view.derivate.DerivateView;
 import eu.etaxonomy.taxeditor.editor.view.derivate.DerivateViewEditorInput;
@@ -220,23 +220,23 @@ public class EditorUtil extends AbstractUtility {
         //check if part is already opened
         MPart alreadyOpenInOtherClassification = null;
         for (MPart part : parts) {
-               if(part.getObject() instanceof TaxonNameEditor
-                    && ((TaxonNameEditor) part.getObject()).getTaxon()!=null
-                    && ((TaxonNameEditor) part.getObject()).getTaxon().getUuid().equals(input.getTaxon().getUuid())){
+               if(part.getObject() instanceof TaxonEditor
+                    && ((TaxonEditor) part.getObject()).getTaxon()!=null
+                    && ((TaxonEditor) part.getObject()).getTaxon().getUuid().equals(input.getTaxon().getUuid())){
 
                    UUID inputNode = input.getTaxonNode().getUuid();
-                   UUID editorNode = ((TaxonNameEditor) part.getObject()).getTaxonNode().getUuid();
+                   UUID editorNode = ((TaxonEditor) part.getObject()).getTaxonNode().getUuid();
                    if (!inputNode.equals(editorNode)){
                        alreadyOpenInOtherClassification = part;
                    }else{
-                       ((TaxonNameEditor) part.getObject()).init(input);
+                       ((TaxonEditor) part.getObject()).init(input);
                        partService.activate(part, true);
                        return;
                    }
             }
         }
         if (alreadyOpenInOtherClassification != null){
-            boolean doSave = forceUserSaveE4Editor(((TaxonNameEditor) alreadyOpenInOtherClassification.getObject()), getShell());
+            boolean doSave = forceUserSaveE4Editor(((TaxonEditor) alreadyOpenInOtherClassification.getObject()), getShell());
             if (doSave){
                 input = TaxonEditorInput.NewInstance(input.getTaxonNode().getUuid());
                 partService.hidePart(alreadyOpenInOtherClassification);
@@ -247,20 +247,20 @@ public class EditorUtil extends AbstractUtility {
 
         MPart part = showPart(NAME_EDITOR_ID, modelService, partService, application);
 
-        TaxonNameEditor editor = (TaxonNameEditor) part.getObject();
+        TaxonEditor editor = (TaxonEditor) part.getObject();
 //        editor.setDisabled();
         editor.init(input);
 //        editor.setEnabled();
         editor.setFocus();
-        if (factsVisible){
-            showFacts(modelService, partService);
-            factsVisible = false;
-        }
-
-        if (mediaVisible){
-            showMedia(modelService, partService);
-            mediaVisible = false;
-        }
+//        if (factsVisible){
+//            showFacts(modelService, partService);
+//            factsVisible = false;
+//        }
+//
+//        if (mediaVisible){
+//            showMedia(modelService, partService);
+//            mediaVisible = false;
+//        }
     }
 
     public static void showMedia(EModelService modelService, EPartService partService) {
@@ -279,9 +279,9 @@ public class EditorUtil extends AbstractUtility {
         //check if part is already opened
         boolean isDirty = false;
         for (MPart part : parts) {
-            if(part.getObject() instanceof TaxonNameEditor
-                    && ((TaxonNameEditor) part.getObject()).getTaxon()!=null
-                    && ((TaxonNameEditor) part.getObject()).getTaxon().getUuid().equals(taxonUUID)){
+            if(part.getObject() instanceof TaxonEditor
+                    && ((TaxonEditor) part.getObject()).getTaxon()!=null
+                    && ((TaxonEditor) part.getObject()).getTaxon().getUuid().equals(taxonUUID)){
                 if (part.isDirty()){
                     dirtyParts.add(part);
                 }
@@ -301,16 +301,16 @@ public class EditorUtil extends AbstractUtility {
         Collection<IE4SavablePart> dirtyParts = new HashSet<>();
         //check if part is already opened
         for (MPart part : parts) {
-            if(part.getObject() instanceof TaxonNameEditor
-                    && ((TaxonNameEditor) part.getObject()).getTaxon()!=null
-                    && ((TaxonNameEditor) part.getObject()).getTaxon().getUuid().equals(taxonUUID)){
+            if(part.getObject() instanceof TaxonEditor
+                    && ((TaxonEditor) part.getObject()).getTaxon()!=null
+                    && ((TaxonEditor) part.getObject()).getTaxon().getUuid().equals(taxonUUID)){
                 if (part.isDirty()){
                     dirtyParts.add((IE4SavablePart) part);
                 }
 
                 break;
             }else if (taxonUUID == null){
-                if (part.isDirty() && (part.getObject() instanceof TaxonNameEditor || (part.getObject() instanceof BulkEditor && ((BulkEditor)part.getObject()).getEditorInput() instanceof TaxonBulkEditorInput))){
+                if (part.isDirty() && (part.getObject() instanceof TaxonEditor || (part.getObject() instanceof BulkEditor && ((BulkEditor)part.getObject()).getEditorInput() instanceof TaxonBulkEditorInput))){
                     dirtyParts.add((IE4SavablePart) part.getObject());
                 }
             }
@@ -332,7 +332,7 @@ public class EditorUtil extends AbstractUtility {
         EPartService partService = TaxeditorEditorPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow().getService(EPartService.class);
         MPart part = partService.createPart(NAME_EDITOR_ID);
         part = partService.showPart(part, PartState.ACTIVATE);
-        TaxonNameEditor editor = (TaxonNameEditor) part.getObject();
+        TaxonEditor editor = (TaxonEditor) part.getObject();
         editor.init(input);
        }
 
@@ -479,8 +479,8 @@ public class EditorUtil extends AbstractUtility {
         Collection<MPart> parts = partService.getParts();
         for (MPart part : parts) {
             Object object = part.getObject();
-            if(object instanceof TaxonNameEditor){
-                TaxonNameEditor taxonEditor = (TaxonNameEditor)object;
+            if(object instanceof TaxonEditor){
+                TaxonEditor taxonEditor = (TaxonEditor)object;
                 TaxonNode node = taxonEditor.getEditorInput().getTaxonNode();
                 if (node.treeIndex()!= null){
                        if(node.treeIndex().startsWith(treeIndex)){
@@ -501,8 +501,8 @@ public class EditorUtil extends AbstractUtility {
         Collection<MPart> parts = partService.getParts();
         for (MPart part : parts) {
             Object object = part.getObject();
-            if(object instanceof TaxonNameEditor){
-                TaxonNameEditor taxonEditor = (TaxonNameEditor)object;
+            if(object instanceof TaxonEditor){
+                TaxonEditor taxonEditor = (TaxonEditor)object;
                 TaxonNode node = taxonEditor.getEditorInput().getTaxonNode();
                 if (node.treeIndex()!= null){
                     if(node.treeIndex().startsWith(treeIndex)){
@@ -548,7 +548,7 @@ public class EditorUtil extends AbstractUtility {
         }
     }
 
-    public static void updateEditor(TaxonNode taxonNode, TaxonNameEditor editor){
+    public static void updateEditor(TaxonNode taxonNode, TaxonEditor editor){
         String treeIndex = taxonNode.treeIndex();
         TaxonNode node = editor.getEditorInput().getTaxonNode();
         if(node.treeIndex().equals(treeIndex)){
index 38c3e0956c62eacebf0bed6869af6e816f08ef59..1fec648dd5b215adbd7c793d928361aa8f418fec 100644 (file)
@@ -18,7 +18,7 @@ public interface IDropTargetable extends IPostOperationEnabled {
 
        public Composite getControl();
 
-       public TaxonNameEditor getEditor();
+       public TaxonEditor getEditor();
 
        public void dragEntered();
 
similarity index 98%
rename from eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/TaxonNameEditor.java
rename to eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/TaxonEditor.java
index 76472111ef720c3f5bb05d2912dcc879bd69cf01..e5c09dec05867d4a1b3961329d88d082f3274f25 100644 (file)
@@ -101,7 +101,7 @@ import eu.etaxonomy.taxeditor.workbench.part.IE4SavablePart;
  * @author pplitzner
  * @date Aug 24, 2017
  */
-public class TaxonNameEditor
+public class TaxonEditor
         implements IDirtyMarkable, IPartContentHasDetails,
             IPartContentHasSupplementalData, IPartContentHasMedia, IPartContentHasFactualData, IPartChangeListener,
             ISelectionListener, ISecuredEditor, IE4SavablePart, ITaxonEditor, IDropTargetable {
@@ -154,7 +154,7 @@ public class TaxonNameEditor
     private IEventBroker eventBroker;
 
     @Inject
-    public TaxonNameEditor() {
+    public TaxonEditor() {
         undoContext = new UndoContext();
     }
 
@@ -180,7 +180,7 @@ public class TaxonNameEditor
             public boolean setInput(Object input) {
                 if (input instanceof AbstractGroupedContainerE4) {
                     TaxonBase<?> newSelection = ((AbstractGroupedContainerE4<?>) input).getData();
-                    if (selection != newSelection || TaxonNameEditor.this.isDirty()) {
+                    if (selection != newSelection || TaxonEditor.this.isDirty()) {
                         selection = newSelection;
                         selService.setSelection(new StructuredSelection(selection));
 
@@ -361,7 +361,7 @@ public class TaxonNameEditor
 
         monitor.beginTask(Messages.TaxonNameEditor_SAVING_NAMES, getGroupedContainers().size());
         monitor.worked(1);
-
+        this.getDirtyNames().forEach(container -> container.refresh());
         // check for empty names
         if (checkForEmptyNames()) {
             MessageDialog.openWarning(AbstractUtility.getShell(), Messages.MultiPageTaxonEditor_NO_NAME_SPECIFIED,
@@ -389,6 +389,7 @@ public class TaxonNameEditor
         input.merge();
 
         dirty.setDirty(false);
+        
         EventUtility.postEvent(WorkbenchEventConstants.REFRESH_NAVIGATOR, new TaxonNodeDto(input.getTaxonNode().getParent()));
         EventUtility.postEvent(WorkbenchEventConstants.SAVE_TAXON, true);
         // Stop the progress monitor.
@@ -659,6 +660,7 @@ public class TaxonNameEditor
             AbstractGroupedContainerE4<?> container = getContainer((TaxonBase<?>) element);
             if (container != null) {
                 container.refresh();
+                container.setDirty(true);
             }
         }
 
@@ -666,6 +668,7 @@ public class TaxonNameEditor
             AbstractGroupedContainerE4 container = getContainer(((TaxonRelationship) element).getFromTaxon());
             if (container != null) {
                 container.refresh();
+                container.setDirty(true);
             }
         }
     }
@@ -708,7 +711,7 @@ public class TaxonNameEditor
     }
 
     @Override
-    public TaxonNameEditor getEditor() {
+    public TaxonEditor getEditor() {
         return this;
     }
 
@@ -784,4 +787,6 @@ public class TaxonNameEditor
     public TaxonNode getTaxonNode() {
         return input.getTaxonNode();
     }
+
+       
 }
\ No newline at end of file
index 859cc18c163c97b361f161f3c85b8f3a622a7415..063ba464f31ff701f6870ca19d96e50bed6a5aa5 100644 (file)
@@ -26,7 +26,7 @@ import org.eclipse.ui.forms.widgets.TableWrapLayout;
 
 import eu.etaxonomy.taxeditor.editor.CdmDataTransfer;
 import eu.etaxonomy.taxeditor.editor.name.e4.IDropTargetable;
-import eu.etaxonomy.taxeditor.editor.name.e4.TaxonNameEditor;
+import eu.etaxonomy.taxeditor.editor.name.e4.TaxonEditor;
 import eu.etaxonomy.taxeditor.editor.name.e4.dnd.NameEditorDropTargetEffect;
 import eu.etaxonomy.taxeditor.editor.name.e4.dnd.NameEditorDropTargetListener;
 import eu.etaxonomy.taxeditor.model.AbstractUtility;
@@ -44,12 +44,12 @@ public abstract class AbstractGroup implements IDropTargetable{
 
        private final List<AbstractGroupedContainerE4> groupedContainers = new ArrayList<>();
 
-       protected TaxonNameEditor editor;
+       protected TaxonEditor editor;
 
        private DropTarget target;
        private DropTargetListener dropListener;
 
-       public AbstractGroup(TaxonNameEditor editor){
+       public AbstractGroup(TaxonEditor editor){
                this.editor = editor;
                this.context = editor.getContext();
        }
@@ -125,7 +125,7 @@ public abstract class AbstractGroup implements IDropTargetable{
        }
 
        @Override
-    public TaxonNameEditor getEditor() {
+    public TaxonEditor getEditor() {
                return editor;
        }
 
index 816a74cb36dc9095e1ec234257818db35f81f205..a810232b0660b9a993fb9294e48bdd319391b72d 100755 (executable)
@@ -19,6 +19,7 @@ import org.eclipse.e4.ui.di.UISynchronize;
 import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.text.IDocument;
 import org.eclipse.jface.text.Position;
+import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.window.DefaultToolTip;
 import org.eclipse.swt.custom.StyledText;
 import org.eclipse.swt.dnd.DND;
@@ -58,10 +59,12 @@ import eu.etaxonomy.taxeditor.editor.name.container.EditorAnnotation.EditorAnnot
 import eu.etaxonomy.taxeditor.editor.name.container.IContainerConstants;
 import eu.etaxonomy.taxeditor.editor.name.container.LineBreakListener;
 import eu.etaxonomy.taxeditor.editor.name.container.LineWrapSupport;
-import eu.etaxonomy.taxeditor.editor.name.e4.TaxonNameEditor;
+import eu.etaxonomy.taxeditor.editor.name.e4.TaxonEditor;
 import eu.etaxonomy.taxeditor.editor.name.e4.dnd.NameEditorDragListenerE4;
 import eu.etaxonomy.taxeditor.editor.name.e4.dnd.NameEditorDragSourceEffect;
 import eu.etaxonomy.taxeditor.editor.name.operation.CreateSynonymInNewGroupOperation;
+import eu.etaxonomy.taxeditor.event.EventUtility;
+import eu.etaxonomy.taxeditor.event.WorkbenchEventConstants;
 import eu.etaxonomy.taxeditor.model.AbstractUtility;
 import eu.etaxonomy.taxeditor.model.IElementHasDetails;
 import eu.etaxonomy.taxeditor.model.NameHelper;
@@ -100,7 +103,7 @@ abstract public class AbstractGroupedContainerE4<T extends TaxonBase> implements
        private FocusListener nameCompositeFocusListener;
        private ModifyListener nameCompositeModifyListener;
 
-       protected NameViewerE4 nameViewer;
+       protected NameViewer nameViewer;
 
        private AbstractGroup group;
 
@@ -150,12 +153,14 @@ abstract public class AbstractGroupedContainerE4<T extends TaxonBase> implements
                nameCompositeModifyListener = (ModifyEvent e)->{
                                // mark the composite dirty
                                setDirty(true);
+                               
                                // parse the text
                                String text = nameViewer.getTextWidget().getText();
 
                                TaxonName name = (TaxonName)parseHandler.parse(text);
                                getTaxonBase().setName(name);
                                getTaxonBase().setTitleCache((getTaxonBase().generateTitle()));
+                               EventUtility.postAsyncEvent(WorkbenchEventConstants.REFRESH_DETAILS, true);
 
                                // show errors resulting from parsing
                                calculateAnnotations();
@@ -469,7 +474,7 @@ abstract public class AbstractGroupedContainerE4<T extends TaxonBase> implements
 
        }
 
-       protected TaxonNameEditor getEditor() {
+       protected TaxonEditor getEditor() {
                return getGroup().getEditor();
        }
 
@@ -482,7 +487,7 @@ abstract public class AbstractGroupedContainerE4<T extends TaxonBase> implements
        }
 
        protected void createTextViewer() {
-               nameViewer = new NameViewerE4(control);
+               nameViewer = new NameViewer(control);
 
                focusListener = new FocusAdapter() {
                        @Override
@@ -619,7 +624,7 @@ abstract public class AbstractGroupedContainerE4<T extends TaxonBase> implements
                getNameViewer().getTextWidget().setFont(font);
        }
 
-       public NameViewerE4 getNameViewer() {
+       public NameViewer getNameViewer() {
                if (nameViewer == null) {
                        throw new RuntimeException(
                                        "The Name Viewer is corrupt for Name Container: " //$NON-NLS-1$
@@ -782,7 +787,7 @@ abstract public class AbstractGroupedContainerE4<T extends TaxonBase> implements
                        // Set indent to viewer ruler's width
                        if (getNameViewer().getRulerControl() != null) {
                                // TODO right justify
-                               layoutData.indent = NameViewerE4.RULER_WIDTH;
+                               layoutData.indent = NameViewer.RULER_WIDTH;
                        }
                        nonEditableInfoLabel.setLayoutData(layoutData);
 
index e8411140de588a8d319aa77439c369d2299efa83..c22fc3dfacc465800c671326fef1b278f4d12705 100644 (file)
@@ -16,7 +16,7 @@ import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
 import eu.etaxonomy.cdm.model.name.HomotypicalGroup;
 import eu.etaxonomy.cdm.model.taxon.Synonym;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
-import eu.etaxonomy.taxeditor.editor.name.e4.TaxonNameEditor;
+import eu.etaxonomy.taxeditor.editor.name.e4.TaxonEditor;
 
 /**
  *
@@ -28,7 +28,7 @@ public abstract class AbstractHomotypicalGroupContainer extends AbstractGroup {
 
        private HomotypicalGroup group;
 
-       public AbstractHomotypicalGroupContainer(TaxonNameEditor editor, HomotypicalGroup group) {
+       public AbstractHomotypicalGroupContainer(TaxonEditor editor, HomotypicalGroup group) {
                super(editor);
                this.group = group;
 
index a00233bed91d9ebb74d5b51c87f4ba2da03bf7a8..8a893ee72dbbcdd94fec92d1ea5f78a7e16c4a63 100644 (file)
@@ -16,7 +16,7 @@ import org.eclipse.swt.graphics.Color;
 
 import eu.etaxonomy.cdm.model.name.HomotypicalGroup;
 import eu.etaxonomy.cdm.model.taxon.Synonym;
-import eu.etaxonomy.taxeditor.editor.name.e4.TaxonNameEditor;
+import eu.etaxonomy.taxeditor.editor.name.e4.TaxonEditor;
 import eu.etaxonomy.taxeditor.model.AbstractUtility;
 import eu.etaxonomy.taxeditor.preference.Resources;
 
@@ -30,7 +30,7 @@ public class AcceptedGroup extends AbstractHomotypicalGroupContainer {
 
        private AcceptedNameContainerE4 acceptedContainer;
 
-       public AcceptedGroup(TaxonNameEditor editor, HomotypicalGroup group) {
+       public AcceptedGroup(TaxonEditor editor, HomotypicalGroup group) {
                super(editor, group);
        }
 
index 8101a19c394ee13073a825ac3c9a2e0d1dbfbe24..3647c015cc32ca9780d7d614550e683789e24932 100755 (executable)
@@ -20,7 +20,7 @@ import eu.etaxonomy.cdm.model.taxon.Taxon;
 import eu.etaxonomy.cdm.model.taxon.TaxonRelationship;
 import eu.etaxonomy.cdm.strategy.cache.TaggedCacheHelper;
 import eu.etaxonomy.cdm.strategy.cache.TaggedText;
-import eu.etaxonomy.taxeditor.editor.name.e4.TaxonNameEditor;
+import eu.etaxonomy.taxeditor.editor.name.e4.TaxonEditor;
 import eu.etaxonomy.taxeditor.editor.name.e4.container.MisappliedGroup.ConceptType;
 import eu.etaxonomy.taxeditor.model.AbstractUtility;
 import eu.etaxonomy.taxeditor.model.NameHelper;
@@ -47,7 +47,7 @@ public class ConceptContainer extends AbstractGroupedContainerE4<Taxon> {
        protected void initializeComposite() {
                setIsDraggable(true);
                setFont(getViewerFont());
-               TaxonNameEditor editor = getEditor();
+               TaxonEditor editor = getEditor();
                Taxon taxon = editor.getTaxon();
                for (TaxonRelationship rel: taxon.getTaxonRelations(getMisappliedName())){
                        if (rel.getType().isAnyMisappliedName() && this.conceptType.equals(ConceptType.Misapplication)){
index c94ca95ea642c87cf2b7e4461ea2e056ff36aef1..835d3ef4431701b77c36620d347b8f87ffae32cc 100644 (file)
@@ -9,7 +9,7 @@ import java.util.List;
 import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
 import eu.etaxonomy.cdm.model.name.HomotypicalGroup;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
-import eu.etaxonomy.taxeditor.editor.name.e4.TaxonNameEditor;
+import eu.etaxonomy.taxeditor.editor.name.e4.TaxonEditor;
 
 /**
  *
@@ -20,7 +20,7 @@ import eu.etaxonomy.taxeditor.editor.name.e4.TaxonNameEditor;
 public class ContainerFactory {
 
        public static void createOrUpdateAcceptedTaxonsHomotypicGroup(
-               TaxonNameEditor taxonNameEditor) {
+               TaxonEditor taxonNameEditor) {
 
                if(taxonNameEditor.getAcceptedGroup() == null){
                        taxonNameEditor.setAcceptedGroup(new AcceptedGroup(taxonNameEditor, taxonNameEditor.getTaxon().getHomotypicGroup()));
@@ -32,7 +32,7 @@ public class ContainerFactory {
        }
 
        public static void createOrUpdateHeterotypicSynonymyGroups(
-                       TaxonNameEditor taxonNameEditor) {
+                       TaxonEditor taxonNameEditor) {
                List<HomotypicalSynonymGroup> retainedGroups = new ArrayList<>();
 
                List<HomotypicalSynonymGroup> heterotypicSynonymGroups = taxonNameEditor.getHeterotypicSynonymGroups();
@@ -58,7 +58,7 @@ public class ContainerFactory {
 
 
        public static HomotypicalSynonymGroup createOrUpdateHeterotypicSynonymyGroup(
-               TaxonNameEditor taxonNameEditor, HomotypicalGroup homotypicalGroup){
+               TaxonEditor taxonNameEditor, HomotypicalGroup homotypicalGroup){
            HomotypicalSynonymGroup group = null;
                if(taxonNameEditor.getHomotypicalGroupContainer(homotypicalGroup) == null){
                        group = new HomotypicalSynonymGroup(taxonNameEditor, homotypicalGroup);
@@ -76,7 +76,7 @@ public class ContainerFactory {
        }
 
        public static void createOrUpdateMisapplicationsGroup(
-               TaxonNameEditor taxonNameEditor) {
+               TaxonEditor taxonNameEditor) {
                MisappliedGroup group = taxonNameEditor.getMisappliedGroup();
                Taxon taxon = HibernateProxyHelper.deproxy(taxonNameEditor.getTaxon(), Taxon.class);
 
@@ -93,7 +93,7 @@ public class ContainerFactory {
 
        }
 
-       public static void setMenuToAllContainers(TaxonNameEditor taxonNameEditor){
+       public static void setMenuToAllContainers(TaxonEditor taxonNameEditor){
            if (taxonNameEditor == null) {
             return;
         }
index 6f09b49379792f4aae58b0e544e5d08b4d95defb..9c01862a2816204659991526156b8cc9f3c338d8 100644 (file)
@@ -14,7 +14,7 @@ import org.eclipse.swt.graphics.Image;
 import eu.etaxonomy.cdm.model.name.HomotypicalGroup;
 import eu.etaxonomy.cdm.model.taxon.Synonym;
 import eu.etaxonomy.taxeditor.editor.name.container.IContainerConstants;
-import eu.etaxonomy.taxeditor.editor.name.e4.TaxonNameEditor;
+import eu.etaxonomy.taxeditor.editor.name.e4.TaxonEditor;
 
 /**
  *
@@ -24,7 +24,7 @@ import eu.etaxonomy.taxeditor.editor.name.e4.TaxonNameEditor;
  */
 public class HomotypicalSynonymGroup extends AbstractHomotypicalGroupContainer {
 
-       public HomotypicalSynonymGroup(TaxonNameEditor editor, HomotypicalGroup group) {
+       public HomotypicalSynonymGroup(TaxonEditor editor, HomotypicalGroup group) {
                super(editor, group);
        }
 
index f746f36a90b5f497243d705ee9dd4ab8c70de117..3c1db32d2d6629218a5c1e6118da067051fd95a3 100644 (file)
@@ -13,7 +13,7 @@ import java.util.HashSet;
 import java.util.Set;
 
 import eu.etaxonomy.cdm.model.taxon.Taxon;
-import eu.etaxonomy.taxeditor.editor.name.e4.TaxonNameEditor;
+import eu.etaxonomy.taxeditor.editor.name.e4.TaxonEditor;
 
 /**
  * @author pplitzner
@@ -27,7 +27,7 @@ public class MisappliedGroup extends AbstractGroup{
     }
 
 
-       public MisappliedGroup(TaxonNameEditor editor) {
+       public MisappliedGroup(TaxonEditor editor) {
                super(editor);
 
                createContent();
similarity index 98%
rename from eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/container/NameViewerE4.java
rename to eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/container/NameViewer.java
index 6e156188cd7b7fbd84dba80702cbca840e1c9647..6acb5d132bfc0f88f7da07f85f5c730f54b64f1a 100644 (file)
@@ -58,14 +58,14 @@ import eu.etaxonomy.taxeditor.preference.Resources;
  * @since Aug 25, 2017
  *
  */
-public class NameViewerE4 extends SourceViewer {
+public class NameViewer extends SourceViewer {
 
        public static final int RULER_WIDTH = 16;
 
        private final IVerticalRuler ruler;
        private final AnnotationModel annotationModel;
 
-       public NameViewerE4(Composite parent) {
+       public NameViewer(Composite parent) {
                super(parent, new RulerWithIcon(RULER_WIDTH), SWT.WRAP | SWT.MULTI | SWT.RESIZE);
 
                this.ruler = getVerticalRuler();
index 12bdd0c16a76195443ebd44b42bfcb1c6f53c9c5..a04b2f992e7013af92c5fef41921ad97fc71dd83 100644 (file)
@@ -37,7 +37,7 @@ public class SynonymContainerE4 extends AbstractGroupedContainerE4<Synonym> {
        /**
         * <p>Constructor for SynonymContainer.</p>
         *
-        * @param editor a {@link eu.etaxonomy.taxeditor.editor.name.TaxonNameEditor} object.
+        * @param editor a {@link eu.etaxonomy.taxeditor.editor.name.TaxonEditor} object.
         * @param group a {@link eu.etaxonomy.taxeditor.editor.name.container.AbstractGroup} object.
         * @param synonym a {@link eu.etaxonomy.cdm.model.taxon.Synonym} object.
         */
index 10b664bd84b0f8bfdb0228e91c51ee68837d941b..d941bcaa91968159f790c7e0dec3c9c6898d6856 100644 (file)
@@ -21,7 +21,7 @@ import eu.etaxonomy.cdm.model.taxon.TaxonBase;
 import eu.etaxonomy.cdm.model.taxon.TaxonRelationshipType;
 import eu.etaxonomy.taxeditor.editor.l10n.Messages;
 import eu.etaxonomy.taxeditor.editor.name.e4.IDropTargetable;
-import eu.etaxonomy.taxeditor.editor.name.e4.TaxonNameEditor;
+import eu.etaxonomy.taxeditor.editor.name.e4.TaxonEditor;
 import eu.etaxonomy.taxeditor.editor.name.e4.container.AbstractHomotypicalGroupContainer;
 import eu.etaxonomy.taxeditor.editor.name.e4.container.MisappliedGroup;
 import eu.etaxonomy.taxeditor.editor.name.e4.operation.MoveSynonymToAnotherAcceptedTaxonOperationE4;
@@ -111,7 +111,7 @@ public class NameEditorDropTargetListener extends DropTargetAdapter {
                                         }catch (Exception e){
                                                 return null;
                                         }
-                                        return new MoveSynonymToAnotherAcceptedTaxonOperationE4(Messages.NameEditorDropTargetListener_CHANGE_ACC_TAXON, getEditor().getUndoContext(), synonym.getUuid(), ((TaxonNameEditor) target).getTaxon(), newSecUuid, (TaxonNameEditor) target);
+                                        return new MoveSynonymToAnotherAcceptedTaxonOperationE4(Messages.NameEditorDropTargetListener_CHANGE_ACC_TAXON, getEditor().getUndoContext(), synonym.getUuid(), ((TaxonEditor) target).getTaxon(), newSecUuid, (TaxonEditor) target);
 
                 }
 
@@ -120,10 +120,10 @@ public class NameEditorDropTargetListener extends DropTargetAdapter {
                                return new ChangeSynonymToMisapplicationOperation(Messages.NameEditorDropTargetListener_CHANGE_SYNONYM_TO_MISAPP, getEditor().getUndoContext(),
                                                getEditor().getTaxon(), synonym, target);
                        }
-                       else if(target instanceof TaxonNameEditor){
-                               if (((TaxonNameEditor) target).getTaxon().equals(synonym.getAcceptedTaxon())){
+                       else if(target instanceof TaxonEditor){
+                               if (((TaxonEditor) target).getTaxon().equals(synonym.getAcceptedTaxon())){
                                        return new ChangeHomotypicGroupOperation(Messages.NameEditorDropTargetListener_CHANGE_HOMOTYPICAL_GROUP, getEditor().getUndoContext(),
-                                               ((TaxonNameEditor) target).getTaxon(), synonym, null, target);
+                                               ((TaxonEditor) target).getTaxon(), synonym, null, target);
                                } else{
                                        UUID newSecUuid = null;
                                        try{
@@ -131,7 +131,7 @@ public class NameEditorDropTargetListener extends DropTargetAdapter {
                                        }catch (Exception e){
                                            return null;
                                        }
-                                       return new MoveSynonymToAnotherAcceptedTaxonOperationE4(Messages.NameEditorDropTargetListener_CHANGE_ACC_TAXON, getEditor().getUndoContext(), synonym.getUuid(), ((TaxonNameEditor) target).getTaxon(), newSecUuid, (TaxonNameEditor) target);
+                                       return new MoveSynonymToAnotherAcceptedTaxonOperationE4(Messages.NameEditorDropTargetListener_CHANGE_ACC_TAXON, getEditor().getUndoContext(), synonym.getUuid(), ((TaxonEditor) target).getTaxon(), newSecUuid, (TaxonEditor) target);
 
                                }
                        }
@@ -206,7 +206,7 @@ public class NameEditorDropTargetListener extends DropTargetAdapter {
                return null;
        }
 
-       private TaxonNameEditor getEditor() {
-               return (TaxonNameEditor) EventUtility.getTaxonEditor();
+       private TaxonEditor getEditor() {
+               return (TaxonEditor) EventUtility.getTaxonEditor();
        }
 }
index 0b3b84734065f4cda6948cefc67836698f1994ff..fde48c75891d19fc35d37d4a7eb06a334abd1d38 100644 (file)
@@ -39,7 +39,7 @@ import eu.etaxonomy.cdm.persistence.dto.TaxonNodeDto;
 import eu.etaxonomy.taxeditor.editor.EditorUtil;
 import eu.etaxonomy.taxeditor.editor.e4.TaxonEditorInput;
 import eu.etaxonomy.taxeditor.editor.l10n.Messages;
-import eu.etaxonomy.taxeditor.editor.name.e4.TaxonNameEditor;
+import eu.etaxonomy.taxeditor.editor.name.e4.TaxonEditor;
 import eu.etaxonomy.taxeditor.editor.name.handler.NameEditorMenuPropertyTester;
 import eu.etaxonomy.taxeditor.editor.name.operation.ChangeSynonymToAcceptedTaxonOperation;
 import eu.etaxonomy.taxeditor.event.EventUtility;
@@ -59,7 +59,7 @@ public class ChangeSynonymToAcceptedTaxonHandler implements IPostOperationEnable
 
     private static final Logger logger = LogManager.getLogger(ChangeSynonymToAcceptedTaxonHandler.class);
 
-       private TaxonNameEditor editor;
+       private TaxonEditor editor;
     private EPartService partService;
     private MApplication application;
     private EModelService modelService;
@@ -74,7 +74,7 @@ public class ChangeSynonymToAcceptedTaxonHandler implements IPostOperationEnable
         this.application = application;
         this.partService = partService;
 
-        editor = (TaxonNameEditor) activePart.getObject();
+        editor = (TaxonEditor) activePart.getObject();
 
         TaxonEditorInput input = editor.getEditorInput();
 
index 0a25f0a1a5d41dec9984b7b7eb215cc2810a9c11..7e4b4dbcd629f44d094507f8e8f8ba707072d333 100644 (file)
@@ -24,7 +24,7 @@ import eu.etaxonomy.cdm.model.taxon.Synonym;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
 import eu.etaxonomy.cdm.model.taxon.TaxonRelationshipType;
 import eu.etaxonomy.taxeditor.editor.EditorUtil;
-import eu.etaxonomy.taxeditor.editor.name.e4.TaxonNameEditor;
+import eu.etaxonomy.taxeditor.editor.name.e4.TaxonEditor;
 import eu.etaxonomy.taxeditor.editor.name.handler.NameEditorMenuPropertyTester;
 import eu.etaxonomy.taxeditor.editor.name.operation.ChangeConceptRelationshipTypeOperation;
 import eu.etaxonomy.taxeditor.editor.name.operation.ChangeSynonymToMisapplicationOperation;
@@ -39,7 +39,7 @@ import eu.etaxonomy.taxeditor.operation.AbstractPostTaxonOperation;
  */
 public class ChangeToMisapplicationHandler {
 
-    private TaxonNameEditor editor;
+    private TaxonEditor editor;
 
     @Execute
     public void execute(@Named(IServiceConstants.ACTIVE_PART)MPart activePart,
@@ -48,7 +48,7 @@ public class ChangeToMisapplicationHandler {
             MHandledMenuItem menuItem,
             UISynchronize sync) {
 
-        editor = (TaxonNameEditor) activePart.getObject();
+        editor = (TaxonEditor) activePart.getObject();
 
         if (!EditorUtil.forceUserSaveE4Editor(editor, shell)){
             return ;
index 940a42afbb2e228e2c7e7997c89a27454381dfcb..f0b42b871ce5f3e4195b635f616782261b1e51ed 100755 (executable)
@@ -24,7 +24,7 @@ import eu.etaxonomy.cdm.model.taxon.Synonym;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
 import eu.etaxonomy.cdm.model.taxon.TaxonRelationshipType;
 import eu.etaxonomy.taxeditor.editor.EditorUtil;
-import eu.etaxonomy.taxeditor.editor.name.e4.TaxonNameEditor;
+import eu.etaxonomy.taxeditor.editor.name.e4.TaxonEditor;
 import eu.etaxonomy.taxeditor.editor.name.handler.NameEditorMenuPropertyTester;
 import eu.etaxonomy.taxeditor.editor.name.operation.ChangeConceptRelationshipTypeOperation;
 import eu.etaxonomy.taxeditor.editor.name.operation.ChangeSynonymToConceptOperation;
@@ -39,7 +39,7 @@ import eu.etaxonomy.taxeditor.operation.AbstractPostOperation;
  */
 public class ChangeToProParteSynonymHandler {
 
-    private TaxonNameEditor editor;
+    private TaxonEditor editor;
 
     @Execute
     public void execute(@Named(IServiceConstants.ACTIVE_PART)MPart activePart,
@@ -48,7 +48,7 @@ public class ChangeToProParteSynonymHandler {
             MHandledMenuItem menuItem,
             UISynchronize sync) {
 
-        editor = (TaxonNameEditor) activePart.getObject();
+        editor = (TaxonEditor) activePart.getObject();
 
                if (!EditorUtil.forceUserSaveE4Editor(editor, shell)){
             return ;
index d85707b31f0e3f8574c42655e79c4968184a9285..ce1f033dc3e107406118337897f988a45f7ef1d2 100644 (file)
@@ -20,7 +20,7 @@ import org.eclipse.e4.ui.services.IServiceConstants;
 import org.eclipse.jface.viewers.IStructuredSelection;
 
 import eu.etaxonomy.cdm.model.taxon.Taxon;
-import eu.etaxonomy.taxeditor.editor.name.e4.TaxonNameEditor;
+import eu.etaxonomy.taxeditor.editor.name.e4.TaxonEditor;
 import eu.etaxonomy.taxeditor.editor.name.handler.NameEditorMenuPropertyTester;
 import eu.etaxonomy.taxeditor.editor.name.operation.ChangeConceptToSynonymOperation;
 import eu.etaxonomy.taxeditor.model.AbstractUtility;
@@ -40,7 +40,7 @@ public class ChangeToSynonymHandler {
             MHandledMenuItem menuItem,
             UISynchronize sync) {
 
-        TaxonNameEditor editor = (TaxonNameEditor) activePart.getObject();
+        TaxonEditor editor = (TaxonEditor) activePart.getObject();
 
 
                Taxon concept  = (Taxon) selection.getFirstElement();
index 674e5581379efea4b22d1ac42c985eafe71a1a89..a72d7ff3ea2e78ab8d8ebc0f94c79b39ea415d78 100644 (file)
@@ -20,7 +20,7 @@ import org.eclipse.e4.ui.services.IServiceConstants;
 import org.eclipse.jface.viewers.IStructuredSelection;
 
 import eu.etaxonomy.cdm.model.name.TaxonName;
-import eu.etaxonomy.taxeditor.editor.name.e4.TaxonNameEditor;
+import eu.etaxonomy.taxeditor.editor.name.e4.TaxonEditor;
 import eu.etaxonomy.taxeditor.editor.name.operation.CreateSynonymInNewGroupOperation;
 import eu.etaxonomy.taxeditor.model.AbstractUtility;
 import eu.etaxonomy.taxeditor.operation.AbstractPostOperation;
@@ -40,7 +40,7 @@ public class CreateHeterotypicSynonymHandler {
             MHandledMenuItem menuItem,
             UISynchronize sync) {
 
-        TaxonNameEditor editor = (TaxonNameEditor) activePart.getObject();
+        TaxonEditor editor = (TaxonEditor) activePart.getObject();
 
                TaxonName newSynonymName = ParseHandler.createEmptyName();
 
index 62e647c0f12b4e86ee5f92e0650f0a002aeb0a1b..4654a48ec45e029dca562da591e35cd83c8bbc62 100644 (file)
@@ -22,7 +22,7 @@ import org.eclipse.jface.viewers.IStructuredSelection;
 import eu.etaxonomy.cdm.model.name.HomotypicalGroup;
 import eu.etaxonomy.cdm.model.name.TaxonName;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
-import eu.etaxonomy.taxeditor.editor.name.e4.TaxonNameEditor;
+import eu.etaxonomy.taxeditor.editor.name.e4.TaxonEditor;
 import eu.etaxonomy.taxeditor.editor.name.handler.NameEditorMenuPropertyTester;
 import eu.etaxonomy.taxeditor.editor.name.operation.CreateSynonymInExistingHomotypicalGroupOperation;
 import eu.etaxonomy.taxeditor.model.AbstractUtility;
@@ -43,7 +43,7 @@ public class CreateHomotypicSynonymHandler {
             MHandledMenuItem menuItem,
             UISynchronize sync) {
 
-        TaxonNameEditor editor = (TaxonNameEditor) activePart.getObject();
+        TaxonEditor editor = (TaxonEditor) activePart.getObject();
                Taxon taxon = editor.getTaxon();
                HomotypicalGroup group = taxon.getHomotypicGroup();
                TaxonName newSynonymName = ParseHandler.createEmptyName();
index c6c2cbe2c7c07ebe0d9c5e252f80870da00a36f5..ffb7b3703a706856fbda91557808418c09bd98f6 100644 (file)
@@ -22,7 +22,7 @@ import org.eclipse.jface.viewers.IStructuredSelection;
 import eu.etaxonomy.cdm.model.name.TaxonName;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
 import eu.etaxonomy.cdm.model.taxon.TaxonRelationshipType;
-import eu.etaxonomy.taxeditor.editor.name.e4.TaxonNameEditor;
+import eu.etaxonomy.taxeditor.editor.name.e4.TaxonEditor;
 import eu.etaxonomy.taxeditor.editor.view.concept.operation.CreateConceptRelationOperation;
 import eu.etaxonomy.taxeditor.model.AbstractUtility;
 import eu.etaxonomy.taxeditor.operation.AbstractPostOperation;
@@ -41,7 +41,7 @@ public class CreateMisapplicationHandler {
             MHandledMenuItem menuItem,
             UISynchronize sync) {
 
-        TaxonNameEditor editor = (TaxonNameEditor) activePart.getObject();
+        TaxonEditor editor = (TaxonEditor) activePart.getObject();
 
                TaxonName conceptName = ParseHandler.createEmptyName();
                Taxon concept = Taxon.NewInstance(conceptName, null);
index b3d62d18b87f755ac5db93b6cc8ce1a1dcfa37a6..989110610a1f53f179e3275931c46418247afcef 100755 (executable)
@@ -20,7 +20,7 @@ import org.eclipse.jface.viewers.IStructuredSelection;
 import eu.etaxonomy.cdm.model.name.TaxonName;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
 import eu.etaxonomy.cdm.model.taxon.TaxonRelationshipType;
-import eu.etaxonomy.taxeditor.editor.name.e4.TaxonNameEditor;
+import eu.etaxonomy.taxeditor.editor.name.e4.TaxonEditor;
 import eu.etaxonomy.taxeditor.editor.view.concept.operation.CreateConceptRelationOperation;
 import eu.etaxonomy.taxeditor.model.AbstractUtility;
 import eu.etaxonomy.taxeditor.operation.AbstractPostOperation;
@@ -39,7 +39,7 @@ public class CreateProParteSynonymHandler {
                 MHandledMenuItem menuItem,
                 UISynchronize sync) {
 
-            TaxonNameEditor editor = (TaxonNameEditor) activePart.getObject();
+            TaxonEditor editor = (TaxonEditor) activePart.getObject();
 
             TaxonName conceptName = ParseHandler.createEmptyName();
             Taxon concept = Taxon.NewInstance(conceptName, null);
index b1a778da2b5027f5a184b85ec2bda5544b4954ac..842c07cc553d5b9a04e2754a23b2ab7924ed37d5 100644 (file)
@@ -22,7 +22,7 @@ import org.eclipse.jface.viewers.IStructuredSelection;
 import eu.etaxonomy.cdm.model.name.HomotypicalGroup;
 import eu.etaxonomy.cdm.model.name.TaxonName;
 import eu.etaxonomy.cdm.model.taxon.Synonym;
-import eu.etaxonomy.taxeditor.editor.name.e4.TaxonNameEditor;
+import eu.etaxonomy.taxeditor.editor.name.e4.TaxonEditor;
 import eu.etaxonomy.taxeditor.editor.name.handler.NameEditorMenuPropertyTester;
 import eu.etaxonomy.taxeditor.editor.name.operation.CreateSynonymInExistingHomotypicalGroupOperation;
 import eu.etaxonomy.taxeditor.model.AbstractUtility;
@@ -41,7 +41,7 @@ public class CreateSynonymInHomotypicalGroupHandler {
             MHandledMenuItem menuItem,
             UISynchronize sync) {
 
-        TaxonNameEditor editor = (TaxonNameEditor) activePart.getObject();
+        TaxonEditor editor = (TaxonEditor) activePart.getObject();
 
                Object selectedObject = selection.getFirstElement();
 
index f2280c5df84738a12c002a3e97c8bea98bf86a82..e53e5884c65be2c6ce6a6f99d68302f74cd6c8b6 100644 (file)
@@ -20,7 +20,7 @@ import org.eclipse.e4.ui.services.IServiceConstants;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.swt.widgets.Shell;
 
-import eu.etaxonomy.taxeditor.editor.name.e4.TaxonNameEditor;
+import eu.etaxonomy.taxeditor.editor.name.e4.TaxonEditor;
 import eu.etaxonomy.taxeditor.editor.name.e4.container.AbstractGroupedContainerE4;
 
 /**
@@ -39,7 +39,7 @@ public class DeleteAllEmptyNamesHandler extends DeleteTaxonBaseHandler {
             MHandledMenuItem menuItem,
             UISynchronize sync) {
 
-        editor = (TaxonNameEditor) activePart.getObject();
+        editor = (TaxonEditor) activePart.getObject();
 
                for(AbstractGroupedContainerE4 containerWithEmptyName : editor.getEmptyContainers()){
                    editor.removeGroup(containerWithEmptyName.getGroup());
@@ -55,7 +55,7 @@ public class DeleteAllEmptyNamesHandler extends DeleteTaxonBaseHandler {
             @Named(IServiceConstants.ACTIVE_SELECTION)IStructuredSelection selection,
             MHandledMenuItem menuItem){
 
-        editor = (TaxonNameEditor) activePart.getObject();
+        editor = (TaxonEditor) activePart.getObject();
 
         boolean canExecute = false;
         canExecute = editor.checkForEmptyNames();
index 3de1dfb32a0033ec2158d12398b3967d4ba78cef..cf906d76474ec30e75e04f438425b977fdcbadae 100644 (file)
@@ -31,7 +31,7 @@ import eu.etaxonomy.cdm.model.taxon.TaxonBase;
 import eu.etaxonomy.cdm.model.taxon.TaxonRelationshipType;
 import eu.etaxonomy.taxeditor.editor.internal.TaxeditorEditorPlugin;
 import eu.etaxonomy.taxeditor.editor.l10n.Messages;
-import eu.etaxonomy.taxeditor.editor.name.e4.TaxonNameEditor;
+import eu.etaxonomy.taxeditor.editor.name.e4.TaxonEditor;
 import eu.etaxonomy.taxeditor.editor.name.handler.NameEditorMenuPropertyTester;
 import eu.etaxonomy.taxeditor.model.DeleteResultMessagingUtils;
 import eu.etaxonomy.taxeditor.operation.AbstractPostOperation;
@@ -47,7 +47,7 @@ import eu.etaxonomy.taxeditor.ui.dialog.configurator.deleteConfigurator.DeleteCo
  */
 public class DeleteTaxonBaseHandler implements IPostOperationEnabled {
 
-    protected TaxonNameEditor editor;
+    protected TaxonEditor editor;
 
        @Execute
        public void execute(@Named(IServiceConstants.ACTIVE_PART)MPart activePart,
@@ -56,13 +56,13 @@ public class DeleteTaxonBaseHandler implements IPostOperationEnabled {
                MHandledMenuItem menuItem,
             UISynchronize sync) {
 
-           editor = (TaxonNameEditor) activePart.getObject();
+           editor = (TaxonEditor) activePart.getObject();
 
            doExecute(menuItem.getLocalizedLabel(), shell, editor, selection.getFirstElement(), sync);
 
        }
 
-       protected void doExecute(String commandName, Shell shell, TaxonNameEditor editor, Object selectedElement,
+       protected void doExecute(String commandName, Shell shell, TaxonEditor editor, Object selectedElement,
             UISynchronize sync) {
                AbstractPostOperation operation = null;
 
index 4e83b486a20d5204fe4cf1966def396427b948b6..9f6048ed899b85e488a82d03521e49176df7f848 100644 (file)
@@ -28,7 +28,7 @@ import eu.etaxonomy.cdm.model.taxon.TaxonNode;
 import eu.etaxonomy.taxeditor.editor.EditorUtil;
 import eu.etaxonomy.taxeditor.editor.e4.TaxonEditorInput;
 import eu.etaxonomy.taxeditor.editor.l10n.Messages;
-import eu.etaxonomy.taxeditor.editor.name.e4.TaxonNameEditor;
+import eu.etaxonomy.taxeditor.editor.name.e4.TaxonEditor;
 import eu.etaxonomy.taxeditor.editor.name.e4.operation.MoveSynonymToAnotherAcceptedTaxonOperationE4;
 import eu.etaxonomy.taxeditor.editor.name.handler.NameEditorMenuPropertyTester;
 import eu.etaxonomy.taxeditor.model.AbstractUtility;
@@ -42,7 +42,7 @@ public class MoveSynonymToAnotherAcceptedTaxonHandler implements IPostOperationE
 
     private static final Logger logger = LogManager.getLogger(MoveSynonymToAnotherAcceptedTaxonHandler.class);
 
-       private TaxonNameEditor editor;
+       private TaxonEditor editor;
 
     private TaxonNode newParentNode;
 
@@ -66,7 +66,7 @@ public class MoveSynonymToAnotherAcceptedTaxonHandler implements IPostOperationE
            this.activePart = activePart;
            this.partService = partService;
 
-        editor = (TaxonNameEditor) activePart.getObject();
+        editor = (TaxonEditor) activePart.getObject();
 
         TaxonEditorInput input = editor.getEditorInput();
 
index 2e498566a952769b865f92a7aaf3cb152040d658..a39f2ae8e601fa5bc3ad22f2b89e1904276cdfd3 100644 (file)
@@ -20,7 +20,7 @@ import org.eclipse.e4.ui.services.IServiceConstants;
 import org.eclipse.jface.viewers.IStructuredSelection;
 
 import eu.etaxonomy.cdm.model.taxon.TaxonBase;
-import eu.etaxonomy.taxeditor.editor.name.e4.TaxonNameEditor;
+import eu.etaxonomy.taxeditor.editor.name.e4.TaxonEditor;
 import eu.etaxonomy.taxeditor.editor.name.handler.NameEditorMenuPropertyTester;
 import eu.etaxonomy.taxeditor.editor.name.operation.ChangeHomotypicalGroupBasionymOperation;
 import eu.etaxonomy.taxeditor.model.AbstractUtility;
@@ -40,7 +40,7 @@ public class SetBasionymHandler {
             MHandledMenuItem menuItem,
             UISynchronize sync) {
 
-        TaxonNameEditor editor = (TaxonNameEditor) activePart.getObject();
+        TaxonEditor editor = (TaxonEditor) activePart.getObject();
 
                TaxonBase selectedTaxonBase = (TaxonBase) selection.getFirstElement();
 
index 7c18c6100bbe617c0ed45771e139f903937f3d15..3d690747417e24f6f7c89c1c39158bc7cebd7da7 100644 (file)
@@ -35,7 +35,7 @@ import eu.etaxonomy.cdm.model.taxon.TaxonNode;
 import eu.etaxonomy.cdm.persistence.dto.TaxonNodeDto;
 import eu.etaxonomy.taxeditor.editor.EditorUtil;
 import eu.etaxonomy.taxeditor.editor.l10n.Messages;
-import eu.etaxonomy.taxeditor.editor.name.e4.TaxonNameEditor;
+import eu.etaxonomy.taxeditor.editor.name.e4.TaxonEditor;
 import eu.etaxonomy.taxeditor.editor.name.handler.NameEditorMenuPropertyTester;
 import eu.etaxonomy.taxeditor.editor.name.operation.SwapSynonymAndAcceptedOperation;
 import eu.etaxonomy.taxeditor.event.EventUtility;
@@ -52,7 +52,7 @@ import eu.etaxonomy.taxeditor.ui.dialog.selection.ReferenceSelectionDialog;
  */
 public class SwapSynonymAndAcceptedHandler implements IPostOperationEnabled {
 
-    protected TaxonNameEditor editor;
+    protected TaxonEditor editor;
     protected Taxon taxon;
     protected EPartService partService;
     protected MPart activePart;
@@ -72,7 +72,7 @@ public class SwapSynonymAndAcceptedHandler implements IPostOperationEnabled {
         this.application = application;
         this.partService = partService;
 
-        editor = (TaxonNameEditor) activePart.getObject();
+        editor = (TaxonEditor) activePart.getObject();
 
         Synonym synonym = (Synonym) selection.getFirstElement();
 
index acac34158d96fb3572e10eb051851811ff6bacf2..cddc7c952b9fd99302612ae45612996894d761c3 100755 (executable)
@@ -18,7 +18,7 @@ import eu.etaxonomy.cdm.model.taxon.Synonym;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
 import eu.etaxonomy.cdm.model.taxon.TaxonBase;
 import eu.etaxonomy.cdm.persistence.dto.UuidAndTitleCache;
-import eu.etaxonomy.taxeditor.editor.name.e4.TaxonNameEditor;
+import eu.etaxonomy.taxeditor.editor.name.e4.TaxonEditor;
 import eu.etaxonomy.taxeditor.event.EventUtility;
 import eu.etaxonomy.taxeditor.store.CdmStore;
 
@@ -168,12 +168,12 @@ public class NameEditorMenuPropertyTester extends PropertyTester {
         * @return
         */
        public static boolean hasEmptyNames(Object receiver) {
-               TaxonNameEditor editor = (TaxonNameEditor) EventUtility.getTaxonEditor();
+               TaxonEditor editor = (TaxonEditor) EventUtility.getTaxonEditor();
                return editor == null ? false : editor.checkForEmptyNames();
        }
 
        public static boolean isRelatedConcept(Object selectedElement) {
-               if(selectedElement instanceof Taxon && ((Taxon) selectedElement).isRelatedConcept() && !((TaxonNameEditor) EventUtility.getTaxonEditor()).getTaxon().equals(selectedElement)){
+               if(selectedElement instanceof Taxon && ((Taxon) selectedElement).isRelatedConcept() && !((TaxonEditor) EventUtility.getTaxonEditor()).getTaxon().equals(selectedElement)){
                        return true;
                }
                return false;
@@ -184,14 +184,14 @@ public class NameEditorMenuPropertyTester extends PropertyTester {
        }
 
        public static boolean isMisapplication(Object selectedElement) {
-               if(selectedElement instanceof Taxon && ((Taxon) selectedElement).isMisapplication() && !((TaxonNameEditor) EventUtility.getTaxonEditor()).getTaxon().equals(selectedElement)){
+               if(selectedElement instanceof Taxon && ((Taxon) selectedElement).isMisapplication() && !((TaxonEditor) EventUtility.getTaxonEditor()).getTaxon().equals(selectedElement)){
                        return true;
                }
                return false;
        }
 
        public static boolean isProparteSynonym(Object selectedElement) {
-        if(selectedElement instanceof Taxon && ((Taxon) selectedElement).isProparteSynonym() && !((TaxonNameEditor) EventUtility.getTaxonEditor()).getTaxon().equals(selectedElement)){
+        if(selectedElement instanceof Taxon && ((Taxon) selectedElement).isProparteSynonym() && !((TaxonEditor) EventUtility.getTaxonEditor()).getTaxon().equals(selectedElement)){
             return true;
         }
         return false;
@@ -200,7 +200,7 @@ public class NameEditorMenuPropertyTester extends PropertyTester {
            if (selectedElement instanceof Synonym){
                return true;
            }
-        if(((Taxon) selectedElement).isProparteSynonym() && !((TaxonNameEditor) EventUtility.getTaxonEditor()).getTaxon().equals(selectedElement)){
+        if(((Taxon) selectedElement).isProparteSynonym() && !((TaxonEditor) EventUtility.getTaxonEditor()).getTaxon().equals(selectedElement)){
             return false;
         }
         return true;
@@ -214,7 +214,7 @@ public class NameEditorMenuPropertyTester extends PropertyTester {
     }
 
        public static boolean isAccepted(Object selectedElement) {
-           TaxonNameEditor editor = (TaxonNameEditor) EventUtility.getTaxonEditor();
+           TaxonEditor editor = (TaxonEditor) EventUtility.getTaxonEditor();
            Taxon accepted = editor.getTaxon();
                return (selectedElement instanceof Taxon  && accepted.equals(selectedElement)) ? true : false;
        }
index 084aac30ead73d1b43bca8da6e8f3793e7a79019..f8b9021c16b07218ab65f983890bdb046cd5eb7f 100755 (executable)
@@ -16,7 +16,7 @@ import eu.etaxonomy.cdm.model.common.CdmBase;
 import eu.etaxonomy.cdm.model.name.TaxonName;
 import eu.etaxonomy.cdm.model.taxon.Synonym;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
-import eu.etaxonomy.taxeditor.editor.name.e4.TaxonNameEditor;
+import eu.etaxonomy.taxeditor.editor.name.e4.TaxonEditor;
 import eu.etaxonomy.taxeditor.model.AbstractUtility;
 import eu.etaxonomy.taxeditor.operation.AbstractPostTaxonOperation;
 import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
@@ -38,10 +38,10 @@ public abstract class CreateNewTaxonBaseOperation extends AbstractPostTaxonOpera
     }
 
     protected void addToSaveList(CdmBase newCdmBase) {
-        TaxonNameEditor editor = null;
+        TaxonEditor editor = null;
         Object activePart = AbstractUtility.getActivePart();
-        if (activePart instanceof TaxonNameEditor){
-           editor = (TaxonNameEditor) activePart;
+        if (activePart instanceof TaxonEditor){
+           editor = (TaxonEditor) activePart;
            if (newCdmBase instanceof Synonym){
                editor.getEditorInput().addToSaveNewSynonym((Synonym)newCdmBase);
            }else if (newCdmBase instanceof Taxon ){
index 708e4de47bbdd87c5857d671df0657ff4e0dee40..1e66139a59ec13530a157098fa3d4fe8255ab8a2 100644 (file)
@@ -27,7 +27,7 @@ import eu.etaxonomy.cdm.api.service.ITermService;
 import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
 import eu.etaxonomy.cdm.model.taxon.TaxonRelationshipType;
-import eu.etaxonomy.taxeditor.editor.name.e4.TaxonNameEditor;
+import eu.etaxonomy.taxeditor.editor.name.e4.TaxonEditor;
 import eu.etaxonomy.taxeditor.editor.view.concept.e4.ConceptViewPartE4;
 import eu.etaxonomy.taxeditor.editor.view.concept.operation.CreateConceptRelationOperation;
 import eu.etaxonomy.taxeditor.model.AbstractUtility;
@@ -55,13 +55,13 @@ public class CreateConceptRelationHandlerE4 {
         UUID uuid = (UUID) menuItem.getTransientData().get(commandId+".taxonRelationshipType.uuid");
         TaxonRelationshipType taxonRelationshipType = HibernateProxyHelper.deproxy(CdmStore.getService(ITermService.class).load(uuid), TaxonRelationshipType.class);
 
-        TaxonNameEditor editor = null;
+        TaxonEditor editor = null;
 
         ConceptViewPartE4 conceptView = (ConceptViewPartE4) activePart.getObject();
 
         Object e4WrappedPart = WorkbenchUtility.getE4WrappedPart(conceptView.getSelectionProvidingPart());
-        if(e4WrappedPart instanceof TaxonNameEditor){
-            editor = (TaxonNameEditor) e4WrappedPart;
+        if(e4WrappedPart instanceof TaxonEditor){
+            editor = (TaxonEditor) e4WrappedPart;
 
             IUndoContext undoContext = null;
 
@@ -99,7 +99,7 @@ public class CreateConceptRelationHandlerE4 {
         ConceptViewPartE4 conceptView = (ConceptViewPartE4) activePart.getObject();
 
         Object e4WrappedPart = WorkbenchUtility.getE4WrappedPart(conceptView.getSelectionProvidingPart());
-        canExecute = e4WrappedPart instanceof TaxonNameEditor;
+        canExecute = e4WrappedPart instanceof TaxonEditor;
         menuItem.setVisible(canExecute);
         return canExecute;
     }
index 8f5f741697cbaf25039416e4ad17130b1fd3277b..c48e33d6871bba0728bd3444374ae29804f0c798 100644 (file)
@@ -26,7 +26,7 @@ import org.eclipse.e4.ui.services.IServiceConstants;
 import org.eclipse.jface.viewers.IStructuredSelection;
 
 import eu.etaxonomy.cdm.model.taxon.TaxonRelationship;
-import eu.etaxonomy.taxeditor.editor.name.e4.TaxonNameEditor;
+import eu.etaxonomy.taxeditor.editor.name.e4.TaxonEditor;
 import eu.etaxonomy.taxeditor.editor.view.concept.e4.ConceptViewPartE4;
 import eu.etaxonomy.taxeditor.editor.view.concept.operation.DeleteConceptRelationOperation;
 import eu.etaxonomy.taxeditor.model.AbstractUtility;
@@ -47,13 +47,13 @@ public class DeleteConceptRelationHandlerE4 {
             MMenuItem menuItem,
             UISynchronize sync) {
 
-        TaxonNameEditor editor = null;
+        TaxonEditor editor = null;
 
         ConceptViewPartE4 conceptView = (ConceptViewPartE4) activePart.getObject();
 
         Object e4WrappedPart = WorkbenchUtility.getE4WrappedPart(conceptView.getSelectionProvidingPart());
-        if(e4WrappedPart instanceof TaxonNameEditor){
-            editor = (TaxonNameEditor) e4WrappedPart;
+        if(e4WrappedPart instanceof TaxonEditor){
+            editor = (TaxonEditor) e4WrappedPart;
 
             Set<TaxonRelationship> relations = new HashSet<TaxonRelationship>();
 
index c7d31aced42201bde95f996138f79e12251c2ed3..6bf35170d4d2979cb62540c0cfd55febb1655f82 100644 (file)
@@ -28,7 +28,7 @@ import eu.etaxonomy.cdm.model.taxon.TaxonRelationship;
 import eu.etaxonomy.taxeditor.bulkeditor.e4.BulkEditor;
 import eu.etaxonomy.taxeditor.editor.EditorUtil;
 import eu.etaxonomy.taxeditor.editor.l10n.Messages;
-import eu.etaxonomy.taxeditor.editor.name.e4.TaxonNameEditor;
+import eu.etaxonomy.taxeditor.editor.name.e4.TaxonEditor;
 import eu.etaxonomy.taxeditor.editor.view.concept.e4.ConceptViewPartE4;
 import eu.etaxonomy.taxeditor.model.MessagingUtils;
 import eu.etaxonomy.taxeditor.workbench.WorkbenchUtility;
@@ -46,15 +46,15 @@ public class OpenRelatedConceptHandlerE4  {
             @Optional@Named(IServiceConstants.ACTIVE_SELECTION) IStructuredSelection selection,
             EModelService modelService, EPartService partService, MApplication application) {
 
-        TaxonNameEditor editor = null;
+        TaxonEditor editor = null;
         BulkEditor bulkEditor = null;
         TaxonRelationship taxonRelationship = (TaxonRelationship) selection.getFirstElement();
 
         ConceptViewPartE4 conceptView = (ConceptViewPartE4) activePart.getObject();
 
         Object e4WrappedPart = WorkbenchUtility.getE4WrappedPart(conceptView.getSelectionProvidingPart());
-        if(e4WrappedPart instanceof TaxonNameEditor){
-            editor = (TaxonNameEditor) e4WrappedPart;
+        if(e4WrappedPart instanceof TaxonEditor){
+            editor = (TaxonEditor) e4WrappedPart;
         }
         else if(e4WrappedPart instanceof BulkEditor){
             bulkEditor = (BulkEditor) e4WrappedPart;
index 636b58f4cb54e35f102de4240e37db408b1b281f..10b009de6a5ebcfd9c1cb8f9035976d7ce39619e 100644 (file)
@@ -20,7 +20,7 @@ import org.eclipse.zest.layouts.algorithms.TreeLayoutAlgorithm;
 import eu.etaxonomy.taxeditor.bulkeditor.e4.BulkEditor;
 import eu.etaxonomy.taxeditor.editor.e4.TaxonEditorInput;
 import eu.etaxonomy.taxeditor.editor.l10n.Messages;
-import eu.etaxonomy.taxeditor.editor.name.e4.TaxonNameEditor;
+import eu.etaxonomy.taxeditor.editor.name.e4.TaxonEditor;
 import eu.etaxonomy.taxeditor.editor.view.concept.graph.ConceptGraphContentProvider;
 import eu.etaxonomy.taxeditor.editor.view.concept.graph.ConceptGraphLabelProvider;
 import eu.etaxonomy.taxeditor.editor.view.descriptive.e4.FactualDataPartE4;
@@ -70,11 +70,11 @@ public class ConceptGraphViewE4 extends AbstractCdmEditorPartE4 {
                }
 
 
-               if(partObject instanceof TaxonNameEditor){
+               if(partObject instanceof TaxonEditor){
                    if (viewer.getControl() != null && !viewer.getControl().isDisposed()) {
                 viewer.getControl().setEnabled(true);
             }
-                   TaxonEditorInput input = ((TaxonNameEditor) partObject).getEditorInput();
+                   TaxonEditorInput input = ((TaxonEditor) partObject).getEditorInput();
                    showViewer(new StructuredSelection(input), activePart, viewer);
                }
 
index 1ea4b8c51a3090460a734ac4d72adc7dd575de63..bbf82f070d72c6a26c51f9989596bc80b5ab58b4 100644 (file)
@@ -74,7 +74,7 @@ import eu.etaxonomy.cdm.model.taxon.TaxonNode;
 import eu.etaxonomy.cdm.persistence.dto.TaxonNodeDto;
 import eu.etaxonomy.taxeditor.editor.EditorUtil;
 import eu.etaxonomy.taxeditor.editor.l10n.Messages;
-import eu.etaxonomy.taxeditor.editor.name.e4.TaxonNameEditor;
+import eu.etaxonomy.taxeditor.editor.name.e4.TaxonEditor;
 import eu.etaxonomy.taxeditor.editor.view.derivate.searchFilter.DerivateSearchCompositeController;
 import eu.etaxonomy.taxeditor.event.WorkbenchEventConstants;
 import eu.etaxonomy.taxeditor.model.AbstractUtility;
@@ -558,8 +558,8 @@ public class DerivateView implements IPartContentHasFactualData,
         }
         if(listenToSelectionChange){
             selectedTaxon = null;
-            if(activePart.getObject() instanceof TaxonNameEditor){
-                selectedTaxon = ((TaxonNameEditor) activePart.getObject()).getTaxon();
+            if(activePart.getObject() instanceof TaxonEditor){
+                selectedTaxon = ((TaxonEditor) activePart.getObject()).getTaxon();
             }
             else if(selection != null){
                 Object selectedElement = selection.getFirstElement();
index f61fe8440015b45b2e959847a7695833456fe389..1e8c5a4a6cc2b9cec87fe14d402d035ca310a370 100644 (file)
@@ -23,7 +23,7 @@ import eu.etaxonomy.cdm.model.description.TaxonDescription;
 import eu.etaxonomy.cdm.model.description.TaxonNameDescription;
 import eu.etaxonomy.taxeditor.editor.EditorUtil;
 import eu.etaxonomy.taxeditor.editor.l10n.Messages;
-import eu.etaxonomy.taxeditor.editor.name.e4.TaxonNameEditor;
+import eu.etaxonomy.taxeditor.editor.name.e4.TaxonEditor;
 import eu.etaxonomy.taxeditor.editor.view.descriptive.e4.FactualDataPartE4;
 import eu.etaxonomy.taxeditor.editor.view.descriptive.operation.MoveDescriptionElementsOperation;
 import eu.etaxonomy.taxeditor.model.MessagingUtils;
@@ -92,13 +92,13 @@ public class DescriptionElementDropAdapter extends EditViewerDropAdapter {
                                        descriptionElements.add(descriptionElement);
                                }
                        }
-                       TaxonNameEditor editor = null;
+                       TaxonEditor editor = null;
                        Object activePart = EditorUtil.getActivePart();
                        if (activePart instanceof FactualDataPartE4){
                            MPart selectionProvidingPart =((FactualDataPartE4)activePart).getSelectionProvidingPart();
                            Object obj = selectionProvidingPart.getObject();
-                           if (obj instanceof TaxonNameEditor){
-                               editor = (TaxonNameEditor) obj;
+                           if (obj instanceof TaxonEditor){
+                               editor = (TaxonEditor) obj;
                            }
                        }
                        AbstractPostTaxonOperation operation = new MoveDescriptionElementsOperation(Messages.DescriptionElementDropAdapter_MOVE_DESC, EditorUtil.getUndoContext(), target, description, descriptionElements, isCopy, null, sync, false);
index 0e415699c162dc3006fb1148971aa519fc55587f..1c74e36b65975b49bc3f557d6482920512c20891 100644 (file)
@@ -45,7 +45,7 @@ import eu.etaxonomy.cdm.model.taxon.TaxonBase;
 import eu.etaxonomy.taxeditor.bulkeditor.e4.BulkEditor;
 import eu.etaxonomy.taxeditor.editor.ITaxonEditor;
 import eu.etaxonomy.taxeditor.editor.l10n.Messages;
-import eu.etaxonomy.taxeditor.editor.name.e4.TaxonNameEditor;
+import eu.etaxonomy.taxeditor.editor.name.e4.TaxonEditor;
 import eu.etaxonomy.taxeditor.editor.view.concept.e4.ConceptViewPartE4;
 import eu.etaxonomy.taxeditor.editor.view.descriptive.DescriptionElementDragListener;
 import eu.etaxonomy.taxeditor.editor.view.descriptive.DescriptionElementDropAdapter;
@@ -150,8 +150,8 @@ public class FactualDataPartE4 extends AbstractCdmEditorPartE4
             }
 
             Object firstElement = structuredSelection.getFirstElement();
-            if (partObject instanceof TaxonNameEditor){
-                if (firstElement != ((TaxonNameEditor)partObject).getTaxon()){
+            if (partObject instanceof TaxonEditor){
+                if (firstElement != ((TaxonEditor)partObject).getTaxon()){
                     showEmptyPage();
                     return;
                 }
index 0496d2eae9c5ff5dcae807d50c1c7c52368dd4e1..1bdfb0b3c5779db76babff40801a64936e6478d4 100644 (file)
@@ -41,7 +41,7 @@ import eu.etaxonomy.cdm.model.description.TaxonNameDescription;
 import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase;
 import eu.etaxonomy.taxeditor.bulkeditor.e4.BulkEditor;
 import eu.etaxonomy.taxeditor.editor.EditorUtil;
-import eu.etaxonomy.taxeditor.editor.name.e4.TaxonNameEditor;
+import eu.etaxonomy.taxeditor.editor.name.e4.TaxonEditor;
 import eu.etaxonomy.taxeditor.editor.view.derivate.DerivateView;
 import eu.etaxonomy.taxeditor.editor.view.descriptive.e4.FactualDataPartE4;
 import eu.etaxonomy.taxeditor.editor.view.descriptive.operation.DeleteDescriptionElementOperation;
@@ -143,10 +143,10 @@ public class DeleteHandlerE4 {
                 }
 
 
-                if (factualDataPart.getSelectionProvidingPart().getObject() instanceof TaxonNameEditor){
-                    ((TaxonNameEditor)factualDataPart.getSelectionProvidingPart().getObject()).getEditorInput().addOperation(operation);
-                    ((TaxonNameEditor)factualDataPart.getSelectionProvidingPart().getObject()).setDirty();
-                    ((TaxonNameEditor)factualDataPart.getSelectionProvidingPart().getObject()).redraw();
+                if (factualDataPart.getSelectionProvidingPart().getObject() instanceof TaxonEditor){
+                    ((TaxonEditor)factualDataPart.getSelectionProvidingPart().getObject()).getEditorInput().addOperation(operation);
+                    ((TaxonEditor)factualDataPart.getSelectionProvidingPart().getObject()).setDirty();
+                    ((TaxonEditor)factualDataPart.getSelectionProvidingPart().getObject()).redraw();
                 }
                 if (factualDataPart.getSelectionProvidingPart().getObject() instanceof DerivateView){
                     ((DerivateView)factualDataPart.getSelectionProvidingPart().getObject()).addOperation(operation);
index f147b208ccf41b77ac06822b55cf6c6c66e7d8c2..bf016d1e2058d5e9e1ea01019c10fae146009dc1 100644 (file)
@@ -11,7 +11,7 @@ import eu.etaxonomy.cdm.model.description.DescriptionElementBase;
 import eu.etaxonomy.cdm.model.description.IndividualsAssociation;
 import eu.etaxonomy.cdm.model.media.Media;
 import eu.etaxonomy.taxeditor.bulkeditor.e4.BulkEditor;
-import eu.etaxonomy.taxeditor.editor.name.e4.TaxonNameEditor;
+import eu.etaxonomy.taxeditor.editor.name.e4.TaxonEditor;
 import eu.etaxonomy.taxeditor.editor.view.derivate.DerivateView;
 import eu.etaxonomy.taxeditor.model.AbstractUtility;
 import eu.etaxonomy.taxeditor.model.FeatureNodeContainer;
@@ -155,7 +155,7 @@ public class DescriptionsMenuPropertyTesterE4 extends PropertyTester {
        }
 
        private boolean isTaxonEditor() {
-           if(AbstractUtility.getActiveEditor() instanceof TaxonNameEditor){
+           if(AbstractUtility.getActiveEditor() instanceof TaxonEditor){
                return true;
            }
            return false;
index 6ba29e4aec41e6782093044834f576d7297e476b..2ad9514c57371cc02a4eb440269a84f8316855dd 100644 (file)
@@ -48,7 +48,7 @@ import eu.etaxonomy.cdm.model.taxon.Taxon;
 import eu.etaxonomy.cdm.model.taxon.TaxonNode;
 import eu.etaxonomy.taxeditor.editor.EditorUtil;
 import eu.etaxonomy.taxeditor.editor.l10n.Messages;
-import eu.etaxonomy.taxeditor.editor.name.e4.TaxonNameEditor;
+import eu.etaxonomy.taxeditor.editor.name.e4.TaxonEditor;
 import eu.etaxonomy.taxeditor.editor.view.descriptive.e4.FactualDataPartE4;
 import eu.etaxonomy.taxeditor.editor.view.descriptive.operation.MoveDescriptionElementsOperation;
 import eu.etaxonomy.taxeditor.model.FeatureNodeContainer;
@@ -68,7 +68,7 @@ import eu.etaxonomy.taxeditor.workbench.part.IE4SavablePart;
 public class MoveDescriptionElementsHandlerE4 implements IPostOperationEnabled{
     private UUID newAcceptedTaxonNodeUuid;
     private UUID oldAcceptedTaxonNodeUuid;
-    private TaxonNameEditor editor;
+    private TaxonEditor editor;
     private MApplication application;
     private EModelService modelService;
     private EPartService partService;
@@ -86,8 +86,8 @@ public class MoveDescriptionElementsHandlerE4 implements IPostOperationEnabled{
         IStructuredSelection viewselection = (IStructuredSelection) factualDataPart.getViewer().getSelection();
 
         Object e4WrappedPart = WorkbenchUtility.getE4WrappedPart(factualDataPart.getSelectionProvidingPart());
-        if(e4WrappedPart instanceof TaxonNameEditor){
-            editor = (TaxonNameEditor) e4WrappedPart;
+        if(e4WrappedPart instanceof TaxonEditor){
+            editor = (TaxonEditor) e4WrappedPart;
         }
         Taxon actualTaxon= null;
 
@@ -228,10 +228,10 @@ public class MoveDescriptionElementsHandlerE4 implements IPostOperationEnabled{
         FactualDataPartE4 factualDataPart = (FactualDataPartE4) activePart.getObject();
         boolean isComputedDisabled = PreferencesUtil.isComputedDesciptionHandlingDisabled();
         Object e4WrappedPart = WorkbenchUtility.getE4WrappedPart(factualDataPart.getSelectionProvidingPart());
-        if(e4WrappedPart instanceof TaxonNameEditor){
+        if(e4WrappedPart instanceof TaxonEditor){
             ISelection selection = factualDataPart.getViewer().getSelection();
             if(selection instanceof IStructuredSelection){
-                boolean selectionProviding = factualDataPart.getSelectionProvidingPart().getObject() instanceof TaxonNameEditor;
+                boolean selectionProviding = factualDataPart.getSelectionProvidingPart().getObject() instanceof TaxonEditor;
                 Object firstElement = ((IStructuredSelection) selection).getFirstElement();
 
                 canExecute = ((firstElement instanceof FeatureNodeContainer && !(((FeatureNodeContainer)firstElement).getContainerTree().getDescription() instanceof TaxonNameDescription))
index 0f11f8ed0bb2df0491ffe3bbff91f840d477de80..31d73be0eea9ef544d0f8148246e259295144ff0 100755 (executable)
@@ -48,7 +48,7 @@ import eu.etaxonomy.cdm.model.taxon.Taxon;
 import eu.etaxonomy.cdm.model.taxon.TaxonNode;
 import eu.etaxonomy.taxeditor.editor.EditorUtil;
 import eu.etaxonomy.taxeditor.editor.l10n.Messages;
-import eu.etaxonomy.taxeditor.editor.name.e4.TaxonNameEditor;
+import eu.etaxonomy.taxeditor.editor.name.e4.TaxonEditor;
 import eu.etaxonomy.taxeditor.editor.view.descriptive.e4.FactualDataPartE4;
 import eu.etaxonomy.taxeditor.editor.view.descriptive.operation.MoveDescriptionElementsOperation;
 import eu.etaxonomy.taxeditor.model.FeatureNodeContainer;
@@ -68,7 +68,7 @@ import eu.etaxonomy.taxeditor.workbench.part.IE4SavablePart;
 public class MoveDescriptionElementsSetNameInSourceHandlerE5 implements IPostOperationEnabled{
     private UUID newAcceptedTaxonNodeUuid;
     private UUID oldAcceptedTaxonNodeUuid;
-    private TaxonNameEditor editor;
+    private TaxonEditor editor;
     private MApplication application;
     private EModelService modelService;
     private EPartService partService;
@@ -86,8 +86,8 @@ public class MoveDescriptionElementsSetNameInSourceHandlerE5 implements IPostOpe
         IStructuredSelection viewselection = (IStructuredSelection) factualDataPart.getViewer().getSelection();
 
         Object e4WrappedPart = WorkbenchUtility.getE4WrappedPart(factualDataPart.getSelectionProvidingPart());
-        if(e4WrappedPart instanceof TaxonNameEditor){
-            editor = (TaxonNameEditor) e4WrappedPart;
+        if(e4WrappedPart instanceof TaxonEditor){
+            editor = (TaxonEditor) e4WrappedPart;
         }
         Taxon actualTaxon= null;
 
@@ -228,10 +228,10 @@ public class MoveDescriptionElementsSetNameInSourceHandlerE5 implements IPostOpe
         FactualDataPartE4 factualDataPart = (FactualDataPartE4) activePart.getObject();
         boolean isComputedDisabled = PreferencesUtil.isComputedDesciptionHandlingDisabled();
         Object e4WrappedPart = WorkbenchUtility.getE4WrappedPart(factualDataPart.getSelectionProvidingPart());
-        if(e4WrappedPart instanceof TaxonNameEditor){
+        if(e4WrappedPart instanceof TaxonEditor){
             ISelection selection = factualDataPart.getViewer().getSelection();
             if(selection instanceof IStructuredSelection){
-                boolean selectionProviding = factualDataPart.getSelectionProvidingPart().getObject() instanceof TaxonNameEditor;
+                boolean selectionProviding = factualDataPart.getSelectionProvidingPart().getObject() instanceof TaxonEditor;
                 Object firstElement = ((IStructuredSelection) selection).getFirstElement();
                 canExecute = ((firstElement instanceof FeatureNodeContainer && !(((FeatureNodeContainer)firstElement).getContainerTree().getDescription() instanceof TaxonNameDescription))
                                     || (firstElement instanceof DescriptionElementBase && !(((DescriptionElementBase)firstElement).getInDescription() instanceof TaxonNameDescription)))
index 5fde9b4b207e8b6f21ac287b6d4d0f5651090d2d..04c789fd6cd12f4b0ba4f128e50411a933154346 100644 (file)
@@ -37,7 +37,7 @@ import eu.etaxonomy.cdm.model.taxon.Classification;
 import eu.etaxonomy.cdm.model.taxon.TaxonNode;
 import eu.etaxonomy.taxeditor.editor.EditorUtil;
 import eu.etaxonomy.taxeditor.editor.l10n.Messages;
-import eu.etaxonomy.taxeditor.editor.name.e4.TaxonNameEditor;
+import eu.etaxonomy.taxeditor.editor.name.e4.TaxonEditor;
 import eu.etaxonomy.taxeditor.editor.view.descriptive.e4.FactualDataPartE4;
 import eu.etaxonomy.taxeditor.editor.view.descriptive.operation.MoveDescriptionToOtherTaxonOperation;
 import eu.etaxonomy.taxeditor.model.FeatureNodeContainer;
@@ -59,7 +59,7 @@ public class MoveDescriptionToOtherTaxonHandlerE4 implements IPostOperationEnabl
     private UUID oldAcceptedTaxonNodeUuid;
     private UUID newAcceptedTaxonUuid;
     private UUID oldAcceptedTaxonUuid;
-    private TaxonNameEditor editor;
+    private TaxonEditor editor;
     private MApplication application;
     private EModelService modelService;
     private EPartService partService;
@@ -76,8 +76,8 @@ public class MoveDescriptionToOtherTaxonHandlerE4 implements IPostOperationEnabl
 
         FactualDataPartE4 factualDataPart = (FactualDataPartE4) activePart.getObject();
         Object e4WrappedPart = WorkbenchUtility.getE4WrappedPart(factualDataPart.getSelectionProvidingPart());
-        if(e4WrappedPart instanceof TaxonNameEditor){
-            editor = (TaxonNameEditor) e4WrappedPart;
+        if(e4WrappedPart instanceof TaxonEditor){
+            editor = (TaxonEditor) e4WrappedPart;
 
         }
 
@@ -177,7 +177,7 @@ public class MoveDescriptionToOtherTaxonHandlerE4 implements IPostOperationEnabl
         FactualDataPartE4 factualDataPart = (FactualDataPartE4) activePart.getObject();
 
         Object e4WrappedPart = WorkbenchUtility.getE4WrappedPart(factualDataPart.getSelectionProvidingPart());
-        if(e4WrappedPart instanceof TaxonNameEditor){
+        if(e4WrappedPart instanceof TaxonEditor){
             ISelection selection = factualDataPart.getViewer().getSelection();
             if(selection instanceof IStructuredSelection){
                 Object firstElement = ((IStructuredSelection) selection).getFirstElement();
index 6c339dfb5893ac674629af6bdaeb68a96b36c748..425646b1c6d37b97263e100068f3de25edb0e1a1 100755 (executable)
@@ -37,7 +37,7 @@ import eu.etaxonomy.cdm.model.taxon.Classification;
 import eu.etaxonomy.cdm.model.taxon.TaxonNode;
 import eu.etaxonomy.taxeditor.editor.EditorUtil;
 import eu.etaxonomy.taxeditor.editor.l10n.Messages;
-import eu.etaxonomy.taxeditor.editor.name.e4.TaxonNameEditor;
+import eu.etaxonomy.taxeditor.editor.name.e4.TaxonEditor;
 import eu.etaxonomy.taxeditor.editor.view.descriptive.e4.FactualDataPartE4;
 import eu.etaxonomy.taxeditor.editor.view.descriptive.operation.MoveDescriptionToOtherTaxonOperation;
 import eu.etaxonomy.taxeditor.model.FeatureNodeContainer;
@@ -59,7 +59,7 @@ public class MoveDescriptionToOtherTaxonSetNameInSourceHandlerE5 implements IPos
     private UUID oldAcceptedTaxonNodeUuid;
     private UUID newAcceptedTaxonUuid;
     private UUID oldAcceptedTaxonUuid;
-    private TaxonNameEditor editor;
+    private TaxonEditor editor;
     private MApplication application;
     private EModelService modelService;
     private EPartService partService;
@@ -76,8 +76,8 @@ public class MoveDescriptionToOtherTaxonSetNameInSourceHandlerE5 implements IPos
 
         FactualDataPartE4 factualDataPart = (FactualDataPartE4) activePart.getObject();
         Object e4WrappedPart = WorkbenchUtility.getE4WrappedPart(factualDataPart.getSelectionProvidingPart());
-        if(e4WrappedPart instanceof TaxonNameEditor){
-            editor = (TaxonNameEditor) e4WrappedPart;
+        if(e4WrappedPart instanceof TaxonEditor){
+            editor = (TaxonEditor) e4WrappedPart;
 
         }
 
@@ -179,7 +179,7 @@ public class MoveDescriptionToOtherTaxonSetNameInSourceHandlerE5 implements IPos
         FactualDataPartE4 factualDataPart = (FactualDataPartE4) activePart.getObject();
 
         Object e4WrappedPart = WorkbenchUtility.getE4WrappedPart(factualDataPart.getSelectionProvidingPart());
-        if(e4WrappedPart instanceof TaxonNameEditor){
+        if(e4WrappedPart instanceof TaxonEditor){
             ISelection selection = factualDataPart.getViewer().getSelection();
             if(selection instanceof IStructuredSelection){
                 Object firstElement = ((IStructuredSelection) selection).getFirstElement();
index 185e2b724c6a6033ae2823a7b11ee8a506a9f205..70a9e50e301559fdb0c882b98c1739e059998ad3 100644 (file)
@@ -27,7 +27,7 @@ import eu.etaxonomy.cdm.model.name.TaxonName;
 import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase;
 import eu.etaxonomy.taxeditor.bulkeditor.e4.BulkEditor;
 import eu.etaxonomy.taxeditor.editor.l10n.Messages;
-import eu.etaxonomy.taxeditor.editor.name.e4.TaxonNameEditor;
+import eu.etaxonomy.taxeditor.editor.name.e4.TaxonEditor;
 import eu.etaxonomy.taxeditor.editor.view.concept.e4.ConceptViewPartE4;
 import eu.etaxonomy.taxeditor.editor.view.descriptive.e4.FactualDataPartE4;
 import eu.etaxonomy.taxeditor.editor.view.media.MediaContentProvider;
@@ -100,8 +100,8 @@ public class MediaViewPartE4 extends AbstractCdmEditorPartE4
                }
 
                Object firstElement = structuredSelection.getFirstElement();
-               if (partObject instanceof TaxonNameEditor){
-                   if (firstElement != ((TaxonNameEditor)partObject).getTaxon()){
+               if (partObject instanceof TaxonEditor){
+                   if (firstElement != ((TaxonEditor)partObject).getTaxon()){
                        showEmptyPage();
                        return;
                    }
index 60c4aa344ddaf1822b24a27eafd447f3211a5317..3f91e8406b6b9cbc0cf9c4401ab62a776f57e1e4 100644 (file)
@@ -26,7 +26,7 @@ import eu.etaxonomy.cdm.model.media.Media;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
 import eu.etaxonomy.taxeditor.editor.EditorUtil;
 import eu.etaxonomy.taxeditor.editor.e4.TaxonEditorInput;
-import eu.etaxonomy.taxeditor.editor.name.e4.TaxonNameEditor;
+import eu.etaxonomy.taxeditor.editor.name.e4.TaxonEditor;
 import eu.etaxonomy.taxeditor.editor.view.media.e4.MediaViewPartE4;
 import eu.etaxonomy.taxeditor.editor.view.media.operation.MoveMediaInListOperation;
 import eu.etaxonomy.taxeditor.model.AbstractUtility;
@@ -46,10 +46,10 @@ public abstract class AbstractMoveImageHandler {
 
         MediaViewPartE4 mediaView = (MediaViewPartE4) activePart.getObject();
 
-        TaxonNameEditor editor = null;
+        TaxonEditor editor = null;
         Object e4WrappedPart = WorkbenchUtility.getE4WrappedPart(mediaView.getSelectionProvidingPart());
-        if (e4WrappedPart instanceof TaxonNameEditor) {
-            editor = (TaxonNameEditor) e4WrappedPart;
+        if (e4WrappedPart instanceof TaxonEditor) {
+            editor = (TaxonEditor) e4WrappedPart;
             TaxonEditorInput input = editor.getEditorInput();
             Taxon taxon =input.getTaxon();
 
index 131b0820d5f37cd9e773bddd1dbd95d98d829bbb..a54f4fa35eaa31c7c39f6c6fbf613566515148b0 100644 (file)
@@ -40,7 +40,7 @@ import eu.etaxonomy.cdm.model.description.TaxonNameDescription;
 import eu.etaxonomy.cdm.model.media.Media;
 import eu.etaxonomy.taxeditor.editor.EditorUtil;
 import eu.etaxonomy.taxeditor.editor.l10n.Messages;
-import eu.etaxonomy.taxeditor.editor.name.e4.TaxonNameEditor;
+import eu.etaxonomy.taxeditor.editor.name.e4.TaxonEditor;
 import eu.etaxonomy.taxeditor.editor.view.descriptive.operation.DeleteSpecimenDescriptionOperation;
 import eu.etaxonomy.taxeditor.editor.view.descriptive.operation.DeleteTaxonDescriptionOperation;
 import eu.etaxonomy.taxeditor.editor.view.media.e4.MediaViewPartE4;
@@ -84,7 +84,7 @@ public class DeleteMediaHandler  {
                           DescriptionElementBase element = elements.iterator().next();
                           Set<Media> toDelete = new HashSet<>();
                           element.removeMedia((Media)object);
-                          ((TaxonNameEditor)mediaView.getSelectionProvidingPart().getObject()).redraw();
+                          ((TaxonEditor)mediaView.getSelectionProvidingPart().getObject()).redraw();
                           return;
 
                     }
@@ -133,11 +133,11 @@ public class DeleteMediaHandler  {
                 if(object instanceof TaxonDescription){
 
                     DeleteTaxonDescriptionOperation deleteTaxonDescriptionOperation = new DeleteTaxonDescriptionOperation(menuItem.getLocalizedLabel(), EditorUtil.getUndoContext(), (TaxonDescription)object, mediaView, null);
-                    if (mediaView.getSelectionProvidingPart().getObject() instanceof TaxonNameEditor){
-                        ((TaxonNameEditor)mediaView.getSelectionProvidingPart().getObject()).getTaxon().removeDescription((TaxonDescription)description);
-                        ((TaxonNameEditor)mediaView.getSelectionProvidingPart().getObject()).getEditorInput().addOperation(deleteTaxonDescriptionOperation);
-                        ((TaxonNameEditor)mediaView.getSelectionProvidingPart().getObject()).setDirty();
-                        ((TaxonNameEditor)mediaView.getSelectionProvidingPart().getObject()).redraw();
+                    if (mediaView.getSelectionProvidingPart().getObject() instanceof TaxonEditor){
+                        ((TaxonEditor)mediaView.getSelectionProvidingPart().getObject()).getTaxon().removeDescription((TaxonDescription)description);
+                        ((TaxonEditor)mediaView.getSelectionProvidingPart().getObject()).getEditorInput().addOperation(deleteTaxonDescriptionOperation);
+                        ((TaxonEditor)mediaView.getSelectionProvidingPart().getObject()).setDirty();
+                        ((TaxonEditor)mediaView.getSelectionProvidingPart().getObject()).redraw();
 
                      }else{
                          AbstractUtility.executeOperation(deleteTaxonDescriptionOperation, sync);
@@ -145,10 +145,10 @@ public class DeleteMediaHandler  {
                 }
                 else if(object instanceof SpecimenDescription){
                     DeleteSpecimenDescriptionOperation deleteTaxonDescriptionOperation = new DeleteSpecimenDescriptionOperation(menuItem.getLocalizedLabel(), EditorUtil.getUndoContext(), (SpecimenDescription)object, mediaView, null);
-                    if (mediaView.getSelectionProvidingPart().getObject() instanceof TaxonNameEditor){
-                        ((TaxonNameEditor)mediaView.getSelectionProvidingPart().getObject()).getEditorInput().addOperation(deleteTaxonDescriptionOperation);
-                        ((TaxonNameEditor)mediaView.getSelectionProvidingPart().getObject()).setDirty();
-                        ((TaxonNameEditor)mediaView.getSelectionProvidingPart().getObject()).redraw();
+                    if (mediaView.getSelectionProvidingPart().getObject() instanceof TaxonEditor){
+                        ((TaxonEditor)mediaView.getSelectionProvidingPart().getObject()).getEditorInput().addOperation(deleteTaxonDescriptionOperation);
+                        ((TaxonEditor)mediaView.getSelectionProvidingPart().getObject()).setDirty();
+                        ((TaxonEditor)mediaView.getSelectionProvidingPart().getObject()).redraw();
                      }else{
                          AbstractUtility.executeOperation(deleteTaxonDescriptionOperation, sync);
                      }
@@ -160,9 +160,9 @@ public class DeleteMediaHandler  {
     public void createMediaDeleteOperation(String menuLabel, UISynchronize sync, MediaViewPartE4 mediaView,
             List<Media> media, DescriptionBase<?> description, MediaDeletionConfigurator config) {
         AbstractPostOperation<?> operation = new DeleteMediaOperation(menuLabel, EditorUtil.getUndoContext(), description, media, config, mediaView);
-        if (mediaView.getSelectionProvidingPart().getObject() instanceof TaxonNameEditor){
+        if (mediaView.getSelectionProvidingPart().getObject() instanceof TaxonEditor){
             if (!config.isOnlyRemoveFromGallery()){
-                ((TaxonNameEditor)mediaView.getSelectionProvidingPart().getObject()).getEditorInput().addOperation(operation);
+                ((TaxonEditor)mediaView.getSelectionProvidingPart().getObject()).getEditorInput().addOperation(operation);
             }
 
             if (description.isImageGallery()){
@@ -179,8 +179,8 @@ public class DeleteMediaHandler  {
                 }
             }
 
-          ((TaxonNameEditor)mediaView.getSelectionProvidingPart().getObject()).setDirty();
-          ((TaxonNameEditor)mediaView.getSelectionProvidingPart().getObject()).redraw();
+          ((TaxonEditor)mediaView.getSelectionProvidingPart().getObject()).setDirty();
+          ((TaxonEditor)mediaView.getSelectionProvidingPart().getObject()).redraw();
         }else{
             AbstractUtility.executeOperation(operation, sync);
         }
index 09b46ab36ab67fa6f3f979677f66510162ba090d..4587fb99b1a569c1b65cf3c5928043880cd528bb 100644 (file)
@@ -37,7 +37,7 @@ import eu.etaxonomy.cdm.persistence.dto.TaxonNodeDto;
 import eu.etaxonomy.cdm.persistence.dto.UuidAndTitleCache;
 import eu.etaxonomy.taxeditor.editor.EditorUtil;
 import eu.etaxonomy.taxeditor.editor.e4.TaxonEditorInput;
-import eu.etaxonomy.taxeditor.editor.name.e4.TaxonNameEditor;
+import eu.etaxonomy.taxeditor.editor.name.e4.TaxonEditor;
 import eu.etaxonomy.taxeditor.model.AbstractUtility;
 import eu.etaxonomy.taxeditor.model.MessagingUtils;
 import eu.etaxonomy.taxeditor.navigation.internal.TaxeditorNavigationPlugin;
@@ -149,8 +149,8 @@ public class NavigationUtil extends AbstractUtility{
 
            Collection<MPart> dirtyParts = partService.getDirtyParts();
            for (MPart part : dirtyParts) {
-            if(part.getObject() instanceof TaxonNameEditor){
-                TaxonEditorInput input = ((TaxonNameEditor) part.getObject()).getEditorInput();
+            if(part.getObject() instanceof TaxonEditor){
+                TaxonEditorInput input = ((TaxonEditor) part.getObject()).getEditorInput();
                 if(input.getTaxonNode().getUuid().equals(taxonNode.getUuid())){
                     return true;
                 }
@@ -169,8 +169,8 @@ public class NavigationUtil extends AbstractUtility{
 
         Collection<MPart> dirtyParts = partService.getDirtyParts();
         for (MPart part : dirtyParts) {
-            if(part.getObject() instanceof TaxonNameEditor){
-                TaxonEditorInput input = ((TaxonNameEditor) part.getObject()).getEditorInput();
+            if(part.getObject() instanceof TaxonEditor){
+                TaxonEditorInput input = ((TaxonEditor) part.getObject()).getEditorInput();
                 if(input.getTaxonNode().equals(taxonNode)){
                     return true;
                 }
index 5f2a6ac381abb47c9096ba8bfd7ca233ef1ff1ad..f04cd56369d46d008cf9c0936b76f9fd29bea7cc 100644 (file)
@@ -67,7 +67,7 @@ import eu.etaxonomy.cdm.model.taxon.Classification;
 import eu.etaxonomy.cdm.model.taxon.TaxonNode;
 import eu.etaxonomy.cdm.persistence.dto.TaxonNodeDto;
 import eu.etaxonomy.taxeditor.editor.ITaxonEditor;
-import eu.etaxonomy.taxeditor.editor.name.e4.TaxonNameEditor;
+import eu.etaxonomy.taxeditor.editor.name.e4.TaxonEditor;
 import eu.etaxonomy.taxeditor.event.EventUtility;
 import eu.etaxonomy.taxeditor.event.WorkbenchEventConstants;
 import eu.etaxonomy.taxeditor.model.AbstractUtility;
@@ -265,8 +265,8 @@ public class TaxonNavigatorE4 implements
                viewer.refresh();
                TaxonNodeDto taxonNode = null;
                if(editor.getTaxon()!=null && editor.getTaxon().getTaxonNodes()!=null){
-                   if (editor instanceof TaxonNameEditor){
-                       taxonNode = new TaxonNodeDto( ((TaxonNameEditor)editor).getEditorInput().getTaxonNode());
+                   if (editor instanceof TaxonEditor){
+                       taxonNode = new TaxonNodeDto( ((TaxonEditor)editor).getEditorInput().getTaxonNode());
                    }else{
                        if (editor.getTaxon().getTaxonNodes() != null && !editor.getTaxon().getTaxonNodes().isEmpty()){
                            taxonNode = new TaxonNodeDto(editor.getTaxon().getTaxonNodes().iterator().next());
index b6dd618bd4c3043b33ff8a653afa81fc55d86cee..8c69a871bb0cfc9efa1d3b4ebd8a73e88e9f859c 100644 (file)
@@ -30,7 +30,7 @@ import eu.etaxonomy.cdm.model.taxon.Taxon;
 import eu.etaxonomy.cdm.model.taxon.TaxonBase;\r
 import eu.etaxonomy.cdm.model.taxon.TaxonNode;\r
 import eu.etaxonomy.taxeditor.editor.EditorUtil;\r
-import eu.etaxonomy.taxeditor.editor.name.e4.TaxonNameEditor;\r
+import eu.etaxonomy.taxeditor.editor.name.e4.TaxonEditor;\r
 import eu.etaxonomy.taxeditor.model.MessagingUtils;\r
 import eu.etaxonomy.taxeditor.navigation.l10n.Messages;\r
 import eu.etaxonomy.taxeditor.operation.CdmUpdateOperation;\r
@@ -178,11 +178,11 @@ public class ChangeAcceptedTaxonToSynonymOperation extends CdmUpdateOperation {
                                        if (part.getContributionURI().endsWith("TaxonNameEditorE4")){\r
 \r
                                        }\r
-                                       if (object instanceof TaxonNameEditor ){\r
-                                               Set<TaxonNode> nodes = ((TaxonNameEditor)object).getTaxon().getTaxonNodes();\r
+                                       if (object instanceof TaxonEditor ){\r
+                                               Set<TaxonNode> nodes = ((TaxonEditor)object).getTaxon().getTaxonNodes();\r
                                                for (TaxonNode node: nodes){\r
                                                        if (node.getUuid().equals(newAcceptedTaxonNodeUuid)){\r
-                                                               EditorUtil.updateEditor(node, (TaxonNameEditor)object);\r
+                                                               EditorUtil.updateEditor(node, (TaxonEditor)object);\r
                                                        }\r
 \r
                                                }\r