rename TaxonNameEditor and other classes and remove E$
authorKatja Luther <k.luther@bgbm.org>
Mon, 21 Nov 2022 12:59:59 +0000 (13:59 +0100)
committerKatja Luther <k.luther@bgbm.org>
Mon, 21 Nov 2022 12:59:59 +0000 (13:59 +0100)
59 files changed:
eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/TaxonBulkEditorInput.java [moved from eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/TaxonEditorInput.java with 100% similarity]
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/e4/TaxonEditorInput.java [moved from eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/e4/TaxonEditorInputE4.java with 94% similarity]
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/IDropTargetable.java [moved from eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/IDropTargetableE4.java with 79% similarity]
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/TaxonNameEditor.java [moved from eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/TaxonNameEditorE4.java with 93% similarity]
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/container/AbstractGroup.java [moved from eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/container/AbstractGroupE4.java with 90% similarity]
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 [moved from eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/container/AbstractHomotypicalGroupContainerE4.java with 89% similarity]
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/container/AcceptedGroup.java [moved from eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/container/AcceptedGroupE4.java with 91% similarity]
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/container/AcceptedNameContainerE4.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/container/ConceptContainer.java [moved from eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/container/ConceptContainerE4.java with 93% similarity]
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/container/ContainerFactory.java [moved from eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/container/ContainerFactoryE4.java with 64% similarity]
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/container/HomotypicalSynonymGroup.java [moved from eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/container/HomotypicalSynonymGroupE4.java with 85% similarity]
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/container/MisappliedGroup.java [moved from eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/container/MisappliedGroupE4.java with 79% 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/NameEditorDragListenerE4.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/dnd/NameEditorDropTargetEffect.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/dnd/NameEditorDropTargetListener.java [moved from eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/dnd/NameEditorDropTargetListenerE4.java with 80% similarity]
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/handler/ChangeSynonymToAcceptedTaxonHandler.java [moved from eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/handler/ChangeSynonymToAcceptedTaxonHandlerE4.java with 95% similarity]
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/handler/ChangeToMisapplicationHandler.java [moved from eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/handler/ChangeToMisapplicationHandlerE4.java with 93% similarity]
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/handler/ChangeToProParteSynonymHandler.java [moved from eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/handler/ChangeToProParteSynonymHandlerE5.java with 93% similarity]
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/handler/ChangeToSynonymHandler.java [moved from eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/handler/ChangeToSynonymHandlerE4.java with 92% similarity]
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/handler/CreateHeterotypicSynonymHandler.java [moved from eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/handler/CreateHeterotypicSynonymHandlerE4.java with 91% similarity]
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/handler/CreateHomotypicSynonymHandler.java [moved from eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/handler/CreateHomotypicSynonymHandlerE4.java with 92% similarity]
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/handler/CreateMisapplicationHandler.java [moved from eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/handler/CreateMisapplicationHandlerE4.java with 92% similarity]
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/handler/CreateProParteSynonymHandler.java [moved from eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/handler/CreateProParteSynonymHandlerE4.java with 92% similarity]
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/handler/CreateSynonymInHomotypicalGroupHandler.java [moved from eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/handler/CreateSynonymInHomotypicalGroupHandlerE4.java with 92% similarity]
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/handler/DeleteAllEmptyNamesHandler.java [moved from eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/handler/DeleteAllEmptyNamesHandlerE4.java with 87% similarity]
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/handler/DeleteTaxonBaseHandler.java [moved from eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/handler/DeleteTaxonBaseHandlerE4.java with 96% similarity]
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/handler/MoveSynonymToAnotherAcceptedTaxonHandler.java [moved from eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/handler/MoveSynonymToAnotherAcceptedTaxonHandlerE4.java with 93% similarity]
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/handler/SetBasionymHandler.java [moved from eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/handler/SetBasionymHandlerE4.java with 92% similarity]
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/handler/SwapSynonymAndAcceptedHandler.java [moved from eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/handler/SwapSynonymAndAcceptedHandlerE4.java with 97% similarity]
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/handler/SwapSynonymAndAcceptedSetNameInSourceHandlerE5.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/ConceptGraphContentProvider.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/MediaContentProvider.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
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/e4/AbstractCdmEditorPartE4.java

index 8b2fae3f8b764cb8b115fcd75a94e1057321276d..8128c14f942502e7ff817120949ace51c62f62d3 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.TaxonNameEditorE4" 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.TaxonNameEditorE4">
+    <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">
       <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"/>
-      <handlers xmi:id="_DCv88IvPEee7R4eqeQiXZg" elementId="eu.etaxonomy.taxeditor.editor.name.e4.handler.CreateHeterotypicSynonymHandlerE4" contributionURI="bundleclass://eu.etaxonomy.taxeditor.editor/eu.etaxonomy.taxeditor.editor.name.e4.handler.CreateHeterotypicSynonymHandlerE4" command="_ult4EIvOEee7R4eqeQiXZg"/>
-      <handlers xmi:id="_OqNIQIvPEee7R4eqeQiXZg" elementId="eu.etaxonomy.taxeditor.editor.name.e4.handler.CreateHomotypicSynonymHandlerE4" contributionURI="bundleclass://eu.etaxonomy.taxeditor.editor/eu.etaxonomy.taxeditor.editor.name.e4.handler.CreateHomotypicSynonymHandlerE4" command="_KpUFsIvPEee7R4eqeQiXZg"/>
-      <handlers xmi:id="_XFc2QIvPEee7R4eqeQiXZg" elementId="eu.etaxonomy.taxeditor.editor.name.e4.handler.CreateSynonymInHomotypicalGroupHandlerE4" contributionURI="bundleclass://eu.etaxonomy.taxeditor.editor/eu.etaxonomy.taxeditor.editor.name.e4.handler.CreateSynonymInHomotypicalGroupHandlerE4" command="_VPLRIIvPEee7R4eqeQiXZg"/>
-      <handlers xmi:id="_ffY8sIvPEee7R4eqeQiXZg" elementId="eu.etaxonomy.taxeditor.editor.name.e4.handler.CreateMisapplicationHandlerE4" contributionURI="bundleclass://eu.etaxonomy.taxeditor.editor/eu.etaxonomy.taxeditor.editor.name.e4.handler.CreateMisapplicationHandlerE4" command="_c0byUIvPEee7R4eqeQiXZg"/>
-      <handlers xmi:id="_qKP84IvPEee7R4eqeQiXZg" elementId="eu.etaxonomy.taxeditor.editor.name.e4.handler.ChangeSynonymToAcceptedTaxonHandlerE4" contributionURI="bundleclass://eu.etaxonomy.taxeditor.editor/eu.etaxonomy.taxeditor.editor.name.e4.handler.ChangeSynonymToAcceptedTaxonHandlerE4" command="_oBnccIvPEee7R4eqeQiXZg"/>
-      <handlers xmi:id="_14GrIIvPEee7R4eqeQiXZg" elementId="eu.etaxonomy.taxeditor.editor.name.e4.handler.ChangeToSynonymHandlerE4" contributionURI="bundleclass://eu.etaxonomy.taxeditor.editor/eu.etaxonomy.taxeditor.editor.name.e4.handler.ChangeToSynonymHandlerE4" command="_yh49QIvPEee7R4eqeQiXZg"/>
-      <handlers xmi:id="_8Lzd0IvPEee7R4eqeQiXZg" elementId="eu.etaxonomy.taxeditor.editor.name.e4.handler.ChangeToMisapplicationHandlerE4" contributionURI="bundleclass://eu.etaxonomy.taxeditor.editor/eu.etaxonomy.taxeditor.editor.name.e4.handler.ChangeToMisapplicationHandlerE4" command="_56AaUIvPEee7R4eqeQiXZg"/>
-      <handlers xmi:id="_GTxMUIvQEee7R4eqeQiXZg" elementId="eu.etaxonomy.taxeditor.editor.name.e4.handler.DeleteTaxonBaseHandlerE4" contributionURI="bundleclass://eu.etaxonomy.taxeditor.editor/eu.etaxonomy.taxeditor.editor.name.e4.handler.DeleteTaxonBaseHandlerE4" command="_CoVcYIvQEee7R4eqeQiXZg"/>
-      <handlers xmi:id="_OZLNMIvQEee7R4eqeQiXZg" elementId="eu.etaxonomy.taxeditor.editor.name.e4.handler.DeleteAllEmptyNamesHandlerE4" contributionURI="bundleclass://eu.etaxonomy.taxeditor.editor/eu.etaxonomy.taxeditor.editor.name.e4.handler.DeleteAllEmptyNamesHandlerE4" command="_L4vQwIvQEee7R4eqeQiXZg"/>
-      <handlers xmi:id="_WWqoMIvQEee7R4eqeQiXZg" elementId="eu.etaxonomy.taxeditor.editor.name.e4.handler.SwapSynonymAndAcceptedHandlerE4" contributionURI="bundleclass://eu.etaxonomy.taxeditor.editor/eu.etaxonomy.taxeditor.editor.name.e4.handler.SwapSynonymAndAcceptedHandlerE4" command="_UFDx8IvQEee7R4eqeQiXZg"/>
-      <handlers xmi:id="_edkd4IvQEee7R4eqeQiXZg" elementId="eu.etaxonomy.taxeditor.editor.name.e4.handler.SetBasionymHandlerE4" contributionURI="bundleclass://eu.etaxonomy.taxeditor.editor/eu.etaxonomy.taxeditor.editor.name.e4.handler.SetBasionymHandlerE4" command="_b2nCsIvQEee7R4eqeQiXZg"/>
-      <handlers xmi:id="_lv9GYIvQEee7R4eqeQiXZg" elementId="eu.etaxonomy.taxeditor.editor.name.e4.handler.MoveSynonymToAnotherAcceptedTaxonHandlerE4" contributionURI="bundleclass://eu.etaxonomy.taxeditor.editor/eu.etaxonomy.taxeditor.editor.name.e4.handler.MoveSynonymToAnotherAcceptedTaxonHandlerE4" command="_jNvBQIvQEee7R4eqeQiXZg"/>
-      <handlers xmi:id="_g8QScFgWEeiQk_eTMvMviQ" elementId="eu.etaxonomy.taxeditor.editor.name.e4.handler.CreateProParteSynonymHandlerE4" contributionURI="bundleclass://eu.etaxonomy.taxeditor.editor/eu.etaxonomy.taxeditor.editor.name.e4.handler.CreateProParteSynonymHandlerE4" command="_HSKdYFgXEeiQk_eTMvMviQ"/>
-      <handlers xmi:id="_442rEFj-EeiQk_eTMvMviQ" elementId="eu.etaxonomy.taxeditor.editor.name.e4.handler.ChangeToProParteSynonymHandlerE4" contributionURI="bundleclass://eu.etaxonomy.taxeditor.editor/eu.etaxonomy.taxeditor.editor.name.e4.handler.ChangeToProParteSynonymHandlerE5" command="_BgX6gFj_EeiQk_eTMvMviQ"/>
+      <handlers xmi:id="_DCv88IvPEee7R4eqeQiXZg" elementId="eu.etaxonomy.taxeditor.editor.name.e4.handler.CreateHeterotypicSynonymHandlerE4" contributionURI="bundleclass://eu.etaxonomy.taxeditor.editor/eu.etaxonomy.taxeditor.editor.name.e4.handler.CreateHeterotypicSynonymHandler" command="_ult4EIvOEee7R4eqeQiXZg"/>
+      <handlers xmi:id="_OqNIQIvPEee7R4eqeQiXZg" elementId="eu.etaxonomy.taxeditor.editor.name.e4.handler.CreateHomotypicSynonymHandlerE4" contributionURI="bundleclass://eu.etaxonomy.taxeditor.editor/eu.etaxonomy.taxeditor.editor.name.e4.handler.CreateHomotypicSynonymHandler" command="_KpUFsIvPEee7R4eqeQiXZg"/>
+      <handlers xmi:id="_XFc2QIvPEee7R4eqeQiXZg" elementId="eu.etaxonomy.taxeditor.editor.name.e4.handler.CreateSynonymInHomotypicalGroupHandlerE4" contributionURI="bundleclass://eu.etaxonomy.taxeditor.editor/eu.etaxonomy.taxeditor.editor.name.e4.handler.CreateSynonymInHomotypicalGroupHandler" command="_VPLRIIvPEee7R4eqeQiXZg"/>
+      <handlers xmi:id="_ffY8sIvPEee7R4eqeQiXZg" elementId="eu.etaxonomy.taxeditor.editor.name.e4.handler.CreateMisapplicationHandlerE4" contributionURI="bundleclass://eu.etaxonomy.taxeditor.editor/eu.etaxonomy.taxeditor.editor.name.e4.handler.CreateMisapplicationHandler" command="_c0byUIvPEee7R4eqeQiXZg"/>
+      <handlers xmi:id="_qKP84IvPEee7R4eqeQiXZg" elementId="eu.etaxonomy.taxeditor.editor.name.e4.handler.ChangeSynonymToAcceptedTaxonHandlerE4" contributionURI="bundleclass://eu.etaxonomy.taxeditor.editor/eu.etaxonomy.taxeditor.editor.name.e4.handler.ChangeSynonymToAcceptedTaxonHandler" command="_oBnccIvPEee7R4eqeQiXZg"/>
+      <handlers xmi:id="_14GrIIvPEee7R4eqeQiXZg" elementId="eu.etaxonomy.taxeditor.editor.name.e4.handler.ChangeToSynonymHandlerE4" contributionURI="bundleclass://eu.etaxonomy.taxeditor.editor/eu.etaxonomy.taxeditor.editor.name.e4.handler.ChangeToSynonymHandler" command="_yh49QIvPEee7R4eqeQiXZg"/>
+      <handlers xmi:id="_8Lzd0IvPEee7R4eqeQiXZg" elementId="eu.etaxonomy.taxeditor.editor.name.e4.handler.ChangeToMisapplicationHandlerE4" contributionURI="bundleclass://eu.etaxonomy.taxeditor.editor/eu.etaxonomy.taxeditor.editor.name.e4.handler.ChangeToMisapplicationHandler" command="_56AaUIvPEee7R4eqeQiXZg"/>
+      <handlers xmi:id="_GTxMUIvQEee7R4eqeQiXZg" elementId="eu.etaxonomy.taxeditor.editor.name.e4.handler.DeleteTaxonBaseHandlerE4" contributionURI="bundleclass://eu.etaxonomy.taxeditor.editor/eu.etaxonomy.taxeditor.editor.name.e4.handler.DeleteTaxonBaseHandler" command="_CoVcYIvQEee7R4eqeQiXZg"/>
+      <handlers xmi:id="_OZLNMIvQEee7R4eqeQiXZg" elementId="eu.etaxonomy.taxeditor.editor.name.e4.handler.DeleteAllEmptyNamesHandlerE4" contributionURI="bundleclass://eu.etaxonomy.taxeditor.editor/eu.etaxonomy.taxeditor.editor.name.e4.handler.DeleteAllEmptyNamesHandler" command="_L4vQwIvQEee7R4eqeQiXZg"/>
+      <handlers xmi:id="_WWqoMIvQEee7R4eqeQiXZg" elementId="eu.etaxonomy.taxeditor.editor.name.e4.handler.SwapSynonymAndAcceptedHandlerE4" contributionURI="bundleclass://eu.etaxonomy.taxeditor.editor/eu.etaxonomy.taxeditor.editor.name.e4.handler.SwapSynonymAndAcceptedHandler" command="_UFDx8IvQEee7R4eqeQiXZg"/>
+      <handlers xmi:id="_edkd4IvQEee7R4eqeQiXZg" elementId="eu.etaxonomy.taxeditor.editor.name.e4.handler.SetBasionymHandlerE4" contributionURI="bundleclass://eu.etaxonomy.taxeditor.editor/eu.etaxonomy.taxeditor.editor.name.e4.handler.SetBasionymHandler" command="_b2nCsIvQEee7R4eqeQiXZg"/>
+      <handlers xmi:id="_lv9GYIvQEee7R4eqeQiXZg" elementId="eu.etaxonomy.taxeditor.editor.name.e4.handler.MoveSynonymToAnotherAcceptedTaxonHandlerE4" contributionURI="bundleclass://eu.etaxonomy.taxeditor.editor/eu.etaxonomy.taxeditor.editor.name.e4.handler.MoveSynonymToAnotherAcceptedTaxonHandler" command="_jNvBQIvQEee7R4eqeQiXZg"/>
+      <handlers xmi:id="_g8QScFgWEeiQk_eTMvMviQ" elementId="eu.etaxonomy.taxeditor.editor.name.e4.handler.CreateProParteSynonymHandlerE4" contributionURI="bundleclass://eu.etaxonomy.taxeditor.editor/eu.etaxonomy.taxeditor.editor.name.e4.handler.CreateProParteSynonymHandler" command="_HSKdYFgXEeiQk_eTMvMviQ"/>
+      <handlers xmi:id="_442rEFj-EeiQk_eTMvMviQ" elementId="eu.etaxonomy.taxeditor.editor.name.e4.handler.ChangeToProParteSynonymHandlerE4" contributionURI="bundleclass://eu.etaxonomy.taxeditor.editor/eu.etaxonomy.taxeditor.editor.name.e4.handler.ChangeToProParteSynonymHandler" command="_BgX6gFj_EeiQk_eTMvMviQ"/>
       <handlers xmi:id="_MYvcYL9MEemCian_vXpNsA" elementId="eu.etaxonomy.taxeditor.editor.name.e4.handler.SwapSynonymAndAcceptedHandlerE4SetNameInSource" contributionURI="bundleclass://eu.etaxonomy.taxeditor.editor/eu.etaxonomy.taxeditor.editor.name.e4.handler.SwapSynonymAndAcceptedSetNameInSourceHandlerE5" command="_tuB4AL9KEemCian_vXpNsA"/>
       <menus xsi:type="menu:PopupMenu" xmi:id="_tLceQYl4Eeeox7omhvOBWg" elementId="eu.etaxonomy.taxeditor.editor.popupmenu.nameeditor">
         <children xsi:type="menu:Menu" xmi:id="_R6buoIl5Eeeox7omhvOBWg" elementId="eu.etaxonomy.taxeditor.editor.nameEditor.menu.new" label="%menu.label">
index 5152ba84515beaffaa46837abbb93e127b775943..2c4ff9184fc30e49b71b1dc8df31dcd4dac6537c 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.TaxonNameEditorE4";
+       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_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 092027973ebbdf7dac390d55ec02d920c7fcf690..555be3bd4f3ec0628f01ae9a9c8f774d1e6c15b2 100644 (file)
@@ -42,15 +42,15 @@ import eu.etaxonomy.cdm.model.taxon.TaxonNode;
 import eu.etaxonomy.cdm.persistence.dto.TaxonNodeDto;
 import eu.etaxonomy.cdm.persistence.dto.UuidAndTitleCache;
 import eu.etaxonomy.taxeditor.bulkeditor.e4.BulkEditor;
-import eu.etaxonomy.taxeditor.bulkeditor.input.TaxonEditorInput;
+import eu.etaxonomy.taxeditor.bulkeditor.input.TaxonBulkEditorInput;
 import eu.etaxonomy.taxeditor.editor.descriptiveDataSet.DescriptiveDataSetEditor;
 import eu.etaxonomy.taxeditor.editor.descriptiveDataSet.matrix.CharacterMatrixPart;
-import eu.etaxonomy.taxeditor.editor.e4.TaxonEditorInputE4;
+import eu.etaxonomy.taxeditor.editor.e4.TaxonEditorInput;
 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.TaxonNameEditorE4;
+import eu.etaxonomy.taxeditor.editor.name.e4.TaxonNameEditor;
 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;
@@ -69,7 +69,7 @@ import eu.etaxonomy.taxeditor.workbench.part.IE4SavablePart;
  */
 public class EditorUtil extends AbstractUtility {
 
-    private static final String NAME_EDITOR_ID = "eu.etaxonomy.taxeditor.editor.name.e4.TaxonNameEditorE4";
+    private static final String NAME_EDITOR_ID = "eu.etaxonomy.taxeditor.editor.name.e4.TaxonNameEditor";
 
     private static boolean factsVisible = true;
 
@@ -182,12 +182,12 @@ public class EditorUtil extends AbstractUtility {
     }
 
        public static void openTaxonNodeE4(UUID taxonNodeUuid, EModelService modelService, EPartService partService, MApplication application) {
-           TaxonEditorInputE4 input = TaxonEditorInputE4.NewInstance(taxonNodeUuid);
+           TaxonEditorInput input = TaxonEditorInput.NewInstance(taxonNodeUuid);
            openNameEditor_internal(input, modelService, partService, application);
        }
 
        public static void openTaxonBaseE4(UUID taxonBaseUuid, EModelService modelService, EPartService partService, MApplication application) {
-           TaxonEditorInputE4 input = TaxonEditorInputE4.NewInstanceFromTaxonBase(taxonBaseUuid);
+           TaxonEditorInput input = TaxonEditorInput.NewInstanceFromTaxonBase(taxonBaseUuid);
            openNameEditor_internal(input, modelService, partService, application);
        }
 
@@ -200,7 +200,7 @@ public class EditorUtil extends AbstractUtility {
 //        openNameEditor_internal(input, modelService, partService, null);
 //    }
 
-    private static void openNameEditor_internal(TaxonEditorInputE4 input, EModelService modelService, EPartService partService, MApplication application) {
+    private static void openNameEditor_internal(TaxonEditorInput input, EModelService modelService, EPartService partService, MApplication application) {
         TaxonBase<?> taxonBase = input.getTaxon();
         TaxonNode node = input.getTaxonNode();
         if(taxonBase==null){
@@ -216,11 +216,11 @@ public class EditorUtil extends AbstractUtility {
 //        }
         if (taxonBase.isOrphaned()) {
             if(taxonBase.isInstanceOf(Synonym.class)){
-                MessagingUtils.warningDialog(Messages.EditorUtil_ORPHAN_ACCEPTED_TAXON, TaxonEditorInputE4.class, Messages.EditorUtil_ORPHAN_ACCEPTED_TAXON_MESSAGE);
+                MessagingUtils.warningDialog(Messages.EditorUtil_ORPHAN_ACCEPTED_TAXON, TaxonEditorInput.class, Messages.EditorUtil_ORPHAN_ACCEPTED_TAXON_MESSAGE);
                 return;
             }
             else{
-                MessagingUtils.warningDialog(Messages.EditorUtil_ORPHAN_TAXON, TaxonEditorInputE4.class, Messages.EditorUtil_ORPHAN_TAXON_MESSAGE);
+                MessagingUtils.warningDialog(Messages.EditorUtil_ORPHAN_TAXON, TaxonEditorInput.class, Messages.EditorUtil_ORPHAN_TAXON_MESSAGE);
                 return;
             }
         }
@@ -229,25 +229,25 @@ public class EditorUtil extends AbstractUtility {
         //check if part is already opened
         MPart alreadyOpenInOtherClassification = null;
         for (MPart part : parts) {
-               if(part.getObject() instanceof TaxonNameEditorE4
-                    && ((TaxonNameEditorE4) part.getObject()).getTaxon()!=null
-                    && ((TaxonNameEditorE4) part.getObject()).getTaxon().getUuid().equals(input.getTaxon().getUuid())){
+               if(part.getObject() instanceof TaxonNameEditor
+                    && ((TaxonNameEditor) part.getObject()).getTaxon()!=null
+                    && ((TaxonNameEditor) part.getObject()).getTaxon().getUuid().equals(input.getTaxon().getUuid())){
 
                    UUID inputNode = input.getTaxonNode().getUuid();
-                   UUID editorNode = ((TaxonNameEditorE4) part.getObject()).getTaxonNode().getUuid();
+                   UUID editorNode = ((TaxonNameEditor) part.getObject()).getTaxonNode().getUuid();
                    if (!inputNode.equals(editorNode)){
                        alreadyOpenInOtherClassification = part;
                    }else{
-                       ((TaxonNameEditorE4) part.getObject()).init(input);
+                       ((TaxonNameEditor) part.getObject()).init(input);
                        partService.activate(part, true);
                        return;
                    }
             }
         }
         if (alreadyOpenInOtherClassification != null){
-            boolean doSave = forceUserSaveE4Editor(((TaxonNameEditorE4) alreadyOpenInOtherClassification.getObject()), getShell());
+            boolean doSave = forceUserSaveE4Editor(((TaxonNameEditor) alreadyOpenInOtherClassification.getObject()), getShell());
             if (doSave){
-                input = TaxonEditorInputE4.NewInstance(input.getTaxonNode().getUuid());
+                input = TaxonEditorInput.NewInstance(input.getTaxonNode().getUuid());
                 partService.hidePart(alreadyOpenInOtherClassification);
             }else {
                 return;
@@ -256,7 +256,7 @@ public class EditorUtil extends AbstractUtility {
 
         MPart part = showPart(NAME_EDITOR_ID, modelService, partService, application);
 
-        TaxonNameEditorE4 editor = (TaxonNameEditorE4) part.getObject();
+        TaxonNameEditor editor = (TaxonNameEditor) part.getObject();
 //        editor.setDisabled();
         editor.init(input);
 //        editor.setEnabled();
@@ -288,9 +288,9 @@ public class EditorUtil extends AbstractUtility {
         //check if part is already opened
         boolean isDirty = false;
         for (MPart part : parts) {
-            if(part.getObject() instanceof TaxonNameEditorE4
-                    && ((TaxonNameEditorE4) part.getObject()).getTaxon()!=null
-                    && ((TaxonNameEditorE4) part.getObject()).getTaxon().getUuid().equals(taxonUUID)){
+            if(part.getObject() instanceof TaxonNameEditor
+                    && ((TaxonNameEditor) part.getObject()).getTaxon()!=null
+                    && ((TaxonNameEditor) part.getObject()).getTaxon().getUuid().equals(taxonUUID)){
                 if (part.isDirty()){
                     dirtyParts.add(part);
                 }
@@ -310,16 +310,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 TaxonNameEditorE4
-                    && ((TaxonNameEditorE4) part.getObject()).getTaxon()!=null
-                    && ((TaxonNameEditorE4) part.getObject()).getTaxon().getUuid().equals(taxonUUID)){
+            if(part.getObject() instanceof TaxonNameEditor
+                    && ((TaxonNameEditor) part.getObject()).getTaxon()!=null
+                    && ((TaxonNameEditor) part.getObject()).getTaxon().getUuid().equals(taxonUUID)){
                 if (part.isDirty()){
                     dirtyParts.add((IE4SavablePart) part);
                 }
 
                 break;
             }else if (taxonUUID == null){
-                if (part.isDirty() && (part.getObject() instanceof TaxonNameEditorE4 || (part.getObject() instanceof BulkEditor && ((BulkEditor)part.getObject()).getEditorInput() instanceof TaxonEditorInput))){
+                if (part.isDirty() && (part.getObject() instanceof TaxonNameEditor || (part.getObject() instanceof BulkEditor && ((BulkEditor)part.getObject()).getEditorInput() instanceof TaxonBulkEditorInput))){
                     dirtyParts.add((IE4SavablePart) part.getObject());
                 }
             }
@@ -336,12 +336,12 @@ public class EditorUtil extends AbstractUtility {
         *            a {@link java.util.UUID} object.
         */
        public static void openEmptyE4(UUID parentNodeUuid) {
-               TaxonEditorInputE4 input = TaxonEditorInputE4
+               TaxonEditorInput input = TaxonEditorInput
                                .NewEmptyInstance(parentNodeUuid);
         EPartService partService = TaxeditorEditorPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow().getService(EPartService.class);
         MPart part = partService.createPart(NAME_EDITOR_ID);
         part = partService.showPart(part, PartState.ACTIVATE);
-        TaxonNameEditorE4 editor = (TaxonNameEditorE4) part.getObject();
+        TaxonNameEditor editor = (TaxonNameEditor) part.getObject();
         editor.init(input);
        }
 
@@ -488,8 +488,8 @@ public class EditorUtil extends AbstractUtility {
         Collection<MPart> parts = partService.getParts();
         for (MPart part : parts) {
             Object object = part.getObject();
-            if(object instanceof TaxonNameEditorE4){
-                TaxonNameEditorE4 taxonEditor = (TaxonNameEditorE4)object;
+            if(object instanceof TaxonNameEditor){
+                TaxonNameEditor taxonEditor = (TaxonNameEditor)object;
                 TaxonNode node = taxonEditor.getEditorInput().getTaxonNode();
                 if (node.treeIndex()!= null){
                        if(node.treeIndex().startsWith(treeIndex)){
@@ -510,8 +510,8 @@ public class EditorUtil extends AbstractUtility {
         Collection<MPart> parts = partService.getParts();
         for (MPart part : parts) {
             Object object = part.getObject();
-            if(object instanceof TaxonNameEditorE4){
-                TaxonNameEditorE4 taxonEditor = (TaxonNameEditorE4)object;
+            if(object instanceof TaxonNameEditor){
+                TaxonNameEditor taxonEditor = (TaxonNameEditor)object;
                 TaxonNode node = taxonEditor.getEditorInput().getTaxonNode();
                 if (node.treeIndex()!= null){
                     if(node.treeIndex().startsWith(treeIndex)){
@@ -557,11 +557,11 @@ public class EditorUtil extends AbstractUtility {
         }
     }
 
-    public static void updateEditor(TaxonNode taxonNode, TaxonNameEditorE4 editor){
+    public static void updateEditor(TaxonNode taxonNode, TaxonNameEditor editor){
         String treeIndex = taxonNode.treeIndex();
         TaxonNode node = editor.getEditorInput().getTaxonNode();
         if(node.treeIndex().equals(treeIndex)){
-               TaxonEditorInputE4 input = TaxonEditorInputE4.NewInstance(node.getUuid());
+               TaxonEditorInput input = TaxonEditorInput.NewInstance(node.getUuid());
                editor.init(input);
         }
     }
similarity index 94%
rename from eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/e4/TaxonEditorInputE4.java
rename to eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/e4/TaxonEditorInput.java
index b54daa0afa23954c012b4ca9cb4a4fc329fd5b3b..c8f36efb5579677c9abbd12f796f2a89e9ad9865 100644 (file)
@@ -62,7 +62,7 @@ import eu.etaxonomy.taxeditor.store.internal.TaxeditorStorePlugin;
  * @author pplitzner
  * @date Aug 24, 2017
  */
-public class TaxonEditorInputE4  extends CdmEntitySessionInput<TaxonNode>{
+public class TaxonEditorInput  extends CdmEntitySessionInput<TaxonNode>{
 
     private static final String INCORRECT_STATE = Messages.TaxonEditorInput_INCORRECT_STATE;
 
@@ -92,7 +92,7 @@ public class TaxonEditorInputE4  extends CdmEntitySessionInput<TaxonNode>{
         PARENT_TAXON_NODE
     }
 
-    private TaxonEditorInputE4(UUID uuid, CdmType type) {
+    private TaxonEditorInput(UUID uuid, CdmType type) {
         super(true);
        switch(type) {
         case PARENT_TAXON_NODE:
@@ -116,7 +116,7 @@ public class TaxonEditorInputE4  extends CdmEntitySessionInput<TaxonNode>{
         TaxonNode taxonNode = CdmStore.getService(ITaxonNodeService.class).load(taxonNodeUuid, getTaxonNodePropertyPaths());
 //     TaxonNode taxonNode = getCdmEntitySession().remoteLoad(CdmStore.getService(ITaxonNodeService.class), taxonNodeUuid, getTaxonNodePropertyPaths());
         if(taxonNode == null){
-            MessagingUtils.warningDialog(Messages.TaxonEditorInput_NOT_IMPLEMENTED, TaxonEditorInputE4.class, Messages.TaxonEditorInput_NOT_IMPLEMENTED_MESSAGE);
+            MessagingUtils.warningDialog(Messages.TaxonEditorInput_NOT_IMPLEMENTED, TaxonEditorInput.class, Messages.TaxonEditorInput_NOT_IMPLEMENTED_MESSAGE);
         }
         init(taxonNode);
         setInitiallySelectedTaxonBase(getTaxon());
@@ -194,7 +194,7 @@ public class TaxonEditorInputE4  extends CdmEntitySessionInput<TaxonNode>{
             }
         } else if (taxonNodes.size() == 0) {
             // this is an undesired state
-            MessagingUtils.warningDialog(INCORRECT_STATE,TaxonEditorInputE4.class,Messages.TaxonEditorInput_TAXON_NOT_IN_CLASSIFICATION);
+            MessagingUtils.warningDialog(INCORRECT_STATE,TaxonEditorInput.class,Messages.TaxonEditorInput_TAXON_NOT_IN_CLASSIFICATION);
         }
     }
 
@@ -211,7 +211,7 @@ public class TaxonEditorInputE4  extends CdmEntitySessionInput<TaxonNode>{
             setInputForMultipleNodes(taxonNodes);
         }else if(taxa.size() == 0){
             // this is an undesired state
-            MessagingUtils.warningDialog(INCORRECT_STATE, TaxonEditorInputE4.class, Messages.TaxonEditorInput_NO_ACCEPTED_TAXON_PRESENT);
+            MessagingUtils.warningDialog(INCORRECT_STATE, TaxonEditorInput.class, Messages.TaxonEditorInput_NO_ACCEPTED_TAXON_PRESENT);
         }
     }
 
@@ -225,7 +225,7 @@ public class TaxonEditorInputE4  extends CdmEntitySessionInput<TaxonNode>{
             }else if (nodes.size()==1){
                 taxonNode = nodes.iterator().next();
             }else{
-                MessagingUtils.warningDialog(INCORRECT_STATE,TaxonEditorInputE4.class,Messages.TaxonEditorInput_TAXON_NOT_IN_CLASSIFICATION);
+                MessagingUtils.warningDialog(INCORRECT_STATE,TaxonEditorInput.class,Messages.TaxonEditorInput_TAXON_NOT_IN_CLASSIFICATION);
             }
             init(taxonNode);
         }else if(taxa.size() > 1){
@@ -244,21 +244,21 @@ public class TaxonEditorInputE4  extends CdmEntitySessionInput<TaxonNode>{
             }
         } else if (taxa.size() == 0) {
             // this is an undesired state
-            MessagingUtils.warningDialog(INCORRECT_STATE,TaxonEditorInputE4.class,Messages.TaxonEditorInput_TAXON_NOT_IN_CLASSIFICATION);
+            MessagingUtils.warningDialog(INCORRECT_STATE,TaxonEditorInput.class,Messages.TaxonEditorInput_TAXON_NOT_IN_CLASSIFICATION);
         }
     }
 
-    public static TaxonEditorInputE4 NewInstance(UUID taxonNodeUuid) {
-        return new TaxonEditorInputE4(taxonNodeUuid, CdmType.TAXON_NODE);
+    public static TaxonEditorInput NewInstance(UUID taxonNodeUuid) {
+        return new TaxonEditorInput(taxonNodeUuid, CdmType.TAXON_NODE);
     }
 
-    public static TaxonEditorInputE4 NewInstanceFromTaxonBase(UUID taxonBaseUuid){
-        return new TaxonEditorInputE4(taxonBaseUuid, CdmType.TAXON_BASE);
+    public static TaxonEditorInput NewInstanceFromTaxonBase(UUID taxonBaseUuid){
+        return new TaxonEditorInput(taxonBaseUuid, CdmType.TAXON_BASE);
     }
 
 
-    public static TaxonEditorInputE4 NewEmptyInstance(UUID parentNodeUuid){
-        return new TaxonEditorInputE4(parentNodeUuid, CdmType.PARENT_TAXON_NODE);
+    public static TaxonEditorInput NewEmptyInstance(UUID parentNodeUuid){
+        return new TaxonEditorInput(parentNodeUuid, CdmType.PARENT_TAXON_NODE);
     }
 
     public Object getAdapter(Class adapter) {
@@ -282,11 +282,11 @@ public class TaxonEditorInputE4  extends CdmEntitySessionInput<TaxonNode>{
      */
     @Override
     public boolean equals(Object obj) {
-        if (TaxonEditorInputE4.class.equals(obj.getClass())
+        if (TaxonEditorInput.class.equals(obj.getClass())
                 && getTaxon() != null
-                && getTaxon().equals(((TaxonEditorInputE4) obj).getTaxon())) {
-            if (((TaxonEditorInputE4) obj).getInitiallySelectedTaxonBase() != null){
-                setInitiallySelectedTaxonBase(((TaxonEditorInputE4) obj).getInitiallySelectedTaxonBase());
+                && getTaxon().equals(((TaxonEditorInput) obj).getTaxon())) {
+            if (((TaxonEditorInput) obj).getInitiallySelectedTaxonBase() != null){
+                setInitiallySelectedTaxonBase(((TaxonEditorInput) obj).getInitiallySelectedTaxonBase());
             }
             return true;
         }
similarity index 79%
rename from eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/IDropTargetableE4.java
rename to eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/IDropTargetable.java
index f0eb85f17c06db353099ba2b8d84da8b4ac199c3..38c3e0956c62eacebf0bed6869af6e816f08ef59 100644 (file)
@@ -14,11 +14,11 @@ import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
  * @date Aug 24, 2017
  *
  */
-public interface IDropTargetableE4 extends IPostOperationEnabled {
+public interface IDropTargetable extends IPostOperationEnabled {
 
        public Composite getControl();
 
-       public TaxonNameEditorE4 getEditor();
+       public TaxonNameEditor getEditor();
 
        public void dragEntered();
 
similarity index 93%
rename from eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/TaxonNameEditorE4.java
rename to eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/TaxonNameEditor.java
index a47617b366c40c32c6972a3a4821a2c235fd6c4a..f6199892be480ded85ef0f1001982fdebfcaf144 100644 (file)
@@ -68,18 +68,18 @@ import eu.etaxonomy.taxeditor.editor.CdmDataTransfer;
 import eu.etaxonomy.taxeditor.editor.EditorUtil;
 import eu.etaxonomy.taxeditor.editor.ISecuredEditor;
 import eu.etaxonomy.taxeditor.editor.ITaxonEditor;
-import eu.etaxonomy.taxeditor.editor.e4.TaxonEditorInputE4;
+import eu.etaxonomy.taxeditor.editor.e4.TaxonEditorInput;
 import eu.etaxonomy.taxeditor.editor.internal.TaxeditorEditorPlugin;
 import eu.etaxonomy.taxeditor.editor.l10n.Messages;
-import eu.etaxonomy.taxeditor.editor.name.e4.container.AbstractGroupE4;
+import eu.etaxonomy.taxeditor.editor.name.e4.container.AbstractGroup;
 import eu.etaxonomy.taxeditor.editor.name.e4.container.AbstractGroupedContainerE4;
-import eu.etaxonomy.taxeditor.editor.name.e4.container.AcceptedGroupE4;
+import eu.etaxonomy.taxeditor.editor.name.e4.container.AcceptedGroup;
 import eu.etaxonomy.taxeditor.editor.name.e4.container.AcceptedNameContainerE4;
-import eu.etaxonomy.taxeditor.editor.name.e4.container.ConceptContainerE4;
-import eu.etaxonomy.taxeditor.editor.name.e4.container.ContainerFactoryE4;
-import eu.etaxonomy.taxeditor.editor.name.e4.container.HomotypicalSynonymGroupE4;
-import eu.etaxonomy.taxeditor.editor.name.e4.container.MisappliedGroupE4;
-import eu.etaxonomy.taxeditor.editor.name.e4.dnd.NameEditorDropTargetListenerE4;
+import eu.etaxonomy.taxeditor.editor.name.e4.container.ConceptContainer;
+import eu.etaxonomy.taxeditor.editor.name.e4.container.ContainerFactory;
+import eu.etaxonomy.taxeditor.editor.name.e4.container.HomotypicalSynonymGroup;
+import eu.etaxonomy.taxeditor.editor.name.e4.container.MisappliedGroup;
+import eu.etaxonomy.taxeditor.editor.name.e4.dnd.NameEditorDropTargetListener;
 import eu.etaxonomy.taxeditor.event.EventUtility;
 import eu.etaxonomy.taxeditor.event.WorkbenchEventConstants;
 import eu.etaxonomy.taxeditor.model.AbstractUtility;
@@ -101,10 +101,10 @@ import eu.etaxonomy.taxeditor.workbench.part.IE4SavablePart;
  * @author pplitzner
  * @date Aug 24, 2017
  */
-public class TaxonNameEditorE4
+public class TaxonNameEditor
         implements IDirtyMarkable, IPartContentHasDetails,
             IPartContentHasSupplementalData, IPartContentHasMedia, IPartContentHasFactualData, IPartChangeListener,
-            ISelectionListener, ISecuredEditor, IE4SavablePart, ITaxonEditor, IDropTargetableE4 {
+            ISelectionListener, ISecuredEditor, IE4SavablePart, ITaxonEditor, IDropTargetable{
 
     private Taxon taxon;
 
@@ -118,9 +118,9 @@ public class TaxonNameEditorE4
     private EPartService partService;
     private TaxonBase<?> selection;
 
-    private AcceptedGroupE4 acceptedGroup;
-    private List<HomotypicalSynonymGroupE4> heterotypicSynonymGroups = new ArrayList<>();
-    private MisappliedGroupE4 misappliedGroup;
+    private AcceptedGroup acceptedGroup;
+    private List<HomotypicalSynonymGroup> heterotypicSynonymGroups = new ArrayList<>();
+    private MisappliedGroup misappliedGroup;
 
     private DropTarget target;
 
@@ -146,7 +146,7 @@ public class TaxonNameEditorE4
 
     private MPart thisPart;
 
-    private TaxonEditorInputE4 input;
+    private TaxonEditorInput input;
 
     private UndoContext undoContext;
 
@@ -154,7 +154,7 @@ public class TaxonNameEditorE4
     private IEventBroker eventBroker;
 
     @Inject
-    public TaxonNameEditorE4() {
+    public TaxonNameEditor() {
         undoContext = new UndoContext();
     }
 
@@ -180,7 +180,7 @@ public class TaxonNameEditorE4
             public boolean setInput(Object input) {
                 if (input instanceof AbstractGroupedContainerE4) {
                     TaxonBase<?> newSelection = ((AbstractGroupedContainerE4<?>) input).getData();
-                    if (selection != newSelection || TaxonNameEditorE4.this.isDirty()) {
+                    if (selection != newSelection || TaxonNameEditor.this.isDirty()) {
                         selection = newSelection;
                         selService.setSelection(new StructuredSelection(selection));
 
@@ -215,15 +215,15 @@ public class TaxonNameEditorE4
     public void createOrUpdateNameComposites(boolean accepted, boolean heterotypicGroups, boolean misappliedNames) {
 
         if (accepted) {
-            ContainerFactoryE4.createOrUpdateAcceptedTaxonsHomotypicGroup(this);
+            ContainerFactory.createOrUpdateAcceptedTaxonsHomotypicGroup(this);
         }
         if (heterotypicGroups) {
-            ContainerFactoryE4.createOrUpdateHeterotypicSynonymyGroups(this);
+            ContainerFactory.createOrUpdateHeterotypicSynonymyGroups(this);
         }
         if (misappliedNames) {
-            ContainerFactoryE4.createOrUpdateMisapplicationsGroup(this);
+            ContainerFactory.createOrUpdateMisapplicationsGroup(this);
         }
-        ContainerFactoryE4.setMenuToAllContainers(this);
+        ContainerFactory.setMenuToAllContainers(this);
 
         // Redraw composite
         parent.pack();
@@ -374,7 +374,7 @@ public class TaxonNameEditorE4
             container.persistName();
             // because of missing cascading the concepts need to be saved
             // separately
-            if (container instanceof ConceptContainerE4) {
+            if (container instanceof ConceptContainer) {
                 input.addToSaveConcept((Taxon) container.getData());
             }
             // In case the progress monitor was canceled throw an exception.
@@ -395,7 +395,7 @@ public class TaxonNameEditorE4
         monitor.done();
     }
 
-    public void init(TaxonEditorInputE4 input) {
+    public void init(TaxonEditorInput input) {
         if (this.input != null) {
             this.input.dispose();
             // this.acceptedGroup = null;
@@ -438,7 +438,7 @@ public class TaxonNameEditorE4
         if (target == null) {
             target = new DropTarget(parent, operations);
             target.setTransfer(types);
-            target.addDropListener(new NameEditorDropTargetListenerE4(this));
+            target.addDropListener(new NameEditorDropTargetListener(this));
         }
     }
 
@@ -446,8 +446,8 @@ public class TaxonNameEditorE4
         return getAcceptedGroup().getAcceptedNameContainer();
     }
 
-    public HomotypicalSynonymGroupE4 getHomotypicalGroupContainer(HomotypicalGroup homotypicalGroup) {
-        for (HomotypicalSynonymGroupE4 group : getHeterotypicSynonymGroups()) {
+    public HomotypicalSynonymGroup getHomotypicalGroupContainer(HomotypicalGroup homotypicalGroup) {
+        for (HomotypicalSynonymGroup group : getHeterotypicSynonymGroups()) {
             if (group.getGroup().equals(homotypicalGroup)) {
                 return group;
             }
@@ -478,7 +478,7 @@ public class TaxonNameEditorE4
     public List<AbstractGroupedContainerE4> getGroupedContainers() {
         List<AbstractGroupedContainerE4> groupedComposites = new ArrayList<>();
 
-        for (AbstractGroupE4 group : getAllGroups()) {
+        for (AbstractGroup group : getAllGroups()) {
             if (group != null) {
                 groupedComposites.addAll(group.getGroupedContainers());
             }
@@ -487,8 +487,8 @@ public class TaxonNameEditorE4
         return groupedComposites;
     }
 
-    public List<AbstractGroupE4> getAllGroups() {
-        List<AbstractGroupE4> allGroups = new ArrayList<>();
+    public List<AbstractGroup> getAllGroups() {
+        List<AbstractGroup> allGroups = new ArrayList<>();
 
         allGroups.add(getAcceptedGroup());
 
@@ -547,7 +547,7 @@ public class TaxonNameEditorE4
         getControl().setBackground(AbstractUtility.getColor(Resources.COLOR_COMPOSITE_BACKGROUND));
     }
 
-    public void setMisapplicationsGroup(MisappliedGroupE4 misappliedGroup) {
+    public void setMisapplicationsGroup(MisappliedGroup misappliedGroup) {
         this.misappliedGroup = misappliedGroup;
     }
 
@@ -555,23 +555,23 @@ public class TaxonNameEditorE4
         return managedForm.getToolkit();
     }
 
-    public List<HomotypicalSynonymGroupE4> getHeterotypicSynonymGroups() {
+    public List<HomotypicalSynonymGroup> getHeterotypicSynonymGroups() {
         return heterotypicSynonymGroups;
     }
 
-    public void addHeterotypicSynonymGroup(HomotypicalSynonymGroupE4 group) {
+    public void addHeterotypicSynonymGroup(HomotypicalSynonymGroup group) {
         heterotypicSynonymGroups.add(group);
     }
 
-    public AcceptedGroupE4 getAcceptedGroup() {
+    public AcceptedGroup getAcceptedGroup() {
         return acceptedGroup;
     }
 
-    public void setAcceptedGroup(AcceptedGroupE4 acceptedGroup) {
+    public void setAcceptedGroup(AcceptedGroup acceptedGroup) {
         this.acceptedGroup = acceptedGroup;
     }
 
-    public MisappliedGroupE4 getMisappliedGroup() {
+    public MisappliedGroup getMisappliedGroup() {
         return misappliedGroup;
     }
 
@@ -593,7 +593,7 @@ public class TaxonNameEditorE4
         }
     }
 
-    public void removeGroup(AbstractGroupE4 group) {
+    public void removeGroup(AbstractGroup group) {
         if (group != null) {
             group.dispose();
 
@@ -703,12 +703,12 @@ public class TaxonNameEditorE4
         return true;
     }
 
-    public TaxonEditorInputE4 getEditorInput() {
+    public TaxonEditorInput getEditorInput() {
         return input;
     }
 
     @Override
-    public TaxonNameEditorE4 getEditor() {
+    public TaxonNameEditor getEditor() {
         return this;
     }
 
@@ -747,7 +747,7 @@ public class TaxonNameEditorE4
     @Optional
     private void updateView(@UIEventTopic(WorkbenchEventConstants.REFRESH_NAME_EDITOR) UUID cdmbaseUuid) {
         if (this.taxon.getUuid().equals(cdmbaseUuid)) {
-            TaxonEditorInputE4 input = TaxonEditorInputE4.NewInstanceFromTaxonBase(cdmbaseUuid);
+            TaxonEditorInput input = TaxonEditorInput.NewInstanceFromTaxonBase(cdmbaseUuid);
             init(input);
         }
     }
similarity index 90%
rename from eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/container/AbstractGroupE4.java
rename to eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/container/AbstractGroup.java
index cf85b45c64da2d22f93c38b9006051d86fb687b4..859cc18c163c97b361f161f3c85b8f3a622a7415 100644 (file)
@@ -25,10 +25,10 @@ import org.eclipse.ui.forms.widgets.TableWrapData;
 import org.eclipse.ui.forms.widgets.TableWrapLayout;
 
 import eu.etaxonomy.taxeditor.editor.CdmDataTransfer;
-import eu.etaxonomy.taxeditor.editor.name.e4.IDropTargetableE4;
-import eu.etaxonomy.taxeditor.editor.name.e4.TaxonNameEditorE4;
+import eu.etaxonomy.taxeditor.editor.name.e4.IDropTargetable;
+import eu.etaxonomy.taxeditor.editor.name.e4.TaxonNameEditor;
 import eu.etaxonomy.taxeditor.editor.name.e4.dnd.NameEditorDropTargetEffect;
-import eu.etaxonomy.taxeditor.editor.name.e4.dnd.NameEditorDropTargetListenerE4;
+import eu.etaxonomy.taxeditor.editor.name.e4.dnd.NameEditorDropTargetListener;
 import eu.etaxonomy.taxeditor.model.AbstractUtility;
 import eu.etaxonomy.taxeditor.preference.Resources;
 
@@ -36,7 +36,7 @@ import eu.etaxonomy.taxeditor.preference.Resources;
  * @author pplitzner
  * @date Aug 24, 2017
  */
-public abstract class AbstractGroupE4 implements IDropTargetableE4{
+public abstract class AbstractGroup implements IDropTargetable{
 
        private Composite control;
 
@@ -44,12 +44,12 @@ public abstract class AbstractGroupE4 implements IDropTargetableE4{
 
        private final List<AbstractGroupedContainerE4> groupedContainers = new ArrayList<>();
 
-       protected TaxonNameEditorE4 editor;
+       protected TaxonNameEditor editor;
 
        private DropTarget target;
        private DropTargetListener dropListener;
 
-       public AbstractGroupE4(TaxonNameEditorE4 editor){
+       public AbstractGroup(TaxonNameEditor editor){
                this.editor = editor;
                this.context = editor.getContext();
        }
@@ -91,7 +91,7 @@ public abstract class AbstractGroupE4 implements IDropTargetableE4{
                groupedContainer.dispose();
                groupedContainers.remove(groupedContainer);
 
-               if(!(this instanceof AcceptedGroupE4) && groupedContainers.isEmpty()){
+               if(!(this instanceof AcceptedGroup) && groupedContainers.isEmpty()){
                        getEditor().removeGroup(this);
                }
        }
@@ -107,7 +107,7 @@ public abstract class AbstractGroupE4 implements IDropTargetableE4{
                        int operations = DND.DROP_MOVE;
                        target = new DropTarget(control, operations);
                        target.setTransfer(types);
-                       dropListener = new NameEditorDropTargetListenerE4(this);
+                       dropListener = new NameEditorDropTargetListener(this);
                        target.addDropListener(dropListener);
 
                        target.setDropTargetEffect(new NameEditorDropTargetEffect(control));
@@ -125,7 +125,7 @@ public abstract class AbstractGroupE4 implements IDropTargetableE4{
        }
 
        @Override
-    public TaxonNameEditorE4 getEditor() {
+    public TaxonNameEditor getEditor() {
                return editor;
        }
 
index 6caf3332d8ce93b576a8efc85f7537c70d7c5ca8..816a74cb36dc9095e1ec234257818db35f81f205 100755 (executable)
@@ -58,7 +58,7 @@ 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.TaxonNameEditorE4;
+import eu.etaxonomy.taxeditor.editor.name.e4.TaxonNameEditor;
 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;
@@ -102,7 +102,7 @@ abstract public class AbstractGroupedContainerE4<T extends TaxonBase> implements
 
        protected NameViewerE4 nameViewer;
 
-       private AbstractGroupE4 group;
+       private AbstractGroup group;
 
        private Label nonEditableInfoLabel;
        private DefaultToolTip nonEditableInfoHover;
@@ -119,7 +119,7 @@ abstract public class AbstractGroupedContainerE4<T extends TaxonBase> implements
        private Color backgroundColor;
        private boolean isDirty;
 
-       public AbstractGroupedContainerE4(AbstractGroupE4 group, T taxonBase) {
+       public AbstractGroupedContainerE4(AbstractGroup group, T taxonBase) {
                setData(taxonBase);
                this.group = group;
                parseHandler = ParseHandler.NewInstance(taxonBase.getName());
@@ -440,7 +440,7 @@ abstract public class AbstractGroupedContainerE4<T extends TaxonBase> implements
                }
        }
 
-       public AbstractGroupE4 getGroup() {
+       public AbstractGroup getGroup() {
                if (group == null) {
                        throw new IllegalStateException("Group shall not be null."); //$NON-NLS-1$
                }
@@ -469,7 +469,7 @@ abstract public class AbstractGroupedContainerE4<T extends TaxonBase> implements
 
        }
 
-       protected TaxonNameEditorE4 getEditor() {
+       protected TaxonNameEditor getEditor() {
                return getGroup().getEditor();
        }
 
@@ -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.TaxonNameEditorE4;
+import eu.etaxonomy.taxeditor.editor.name.e4.TaxonNameEditor;
 
 /**
  *
@@ -24,11 +24,11 @@ import eu.etaxonomy.taxeditor.editor.name.e4.TaxonNameEditorE4;
  * @date Aug 24, 2017
  *
  */
-public abstract class AbstractHomotypicalGroupContainerE4 extends AbstractGroupE4 {
+public abstract class AbstractHomotypicalGroupContainer extends AbstractGroup {
 
        private HomotypicalGroup group;
 
-       public AbstractHomotypicalGroupContainerE4(TaxonNameEditorE4 editor, HomotypicalGroup group) {
+       public AbstractHomotypicalGroupContainer(TaxonNameEditor editor, HomotypicalGroup group) {
                super(editor);
                this.group = group;
 
similarity index 91%
rename from eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/container/AcceptedGroupE4.java
rename to eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/container/AcceptedGroup.java
index b62fdb12ed6b864df7776e0e555bc314f2bb6006..a00233bed91d9ebb74d5b51c87f4ba2da03bf7a8 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.TaxonNameEditorE4;
+import eu.etaxonomy.taxeditor.editor.name.e4.TaxonNameEditor;
 import eu.etaxonomy.taxeditor.model.AbstractUtility;
 import eu.etaxonomy.taxeditor.preference.Resources;
 
@@ -26,11 +26,11 @@ import eu.etaxonomy.taxeditor.preference.Resources;
  * @date Aug 24, 2017
  *
  */
-public class AcceptedGroupE4 extends AbstractHomotypicalGroupContainerE4 {
+public class AcceptedGroup extends AbstractHomotypicalGroupContainer {
 
        private AcceptedNameContainerE4 acceptedContainer;
 
-       public AcceptedGroupE4(TaxonNameEditorE4 editor, HomotypicalGroup group) {
+       public AcceptedGroup(TaxonNameEditor editor, HomotypicalGroup group) {
                super(editor, group);
        }
 
index dbf44bac644c0313e4861a276073abf1f80e4d37..381e16d8e0dbc42435000ac7becd72be29f5205c 100644 (file)
@@ -20,7 +20,7 @@ import eu.etaxonomy.taxeditor.preference.Resources;
  */
 public class AcceptedNameContainerE4 extends AbstractGroupedContainerE4<Taxon> {
 
-       public AcceptedNameContainerE4(AcceptedGroupE4 group, Taxon taxon) {
+       public AcceptedNameContainerE4(AcceptedGroup group, Taxon taxon) {
                super(group, taxon);
        }
 
similarity index 93%
rename from eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/container/ConceptContainerE4.java
rename to eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/container/ConceptContainer.java
index c1817fc61ddafdcd7eab7ffa5dfdac3371ac1f27..8101a19c394ee13073a825ac3c9a2e0d1dbfbe24 100755 (executable)
@@ -20,8 +20,8 @@ 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.TaxonNameEditorE4;
-import eu.etaxonomy.taxeditor.editor.name.e4.container.MisappliedGroupE4.ConceptType;
+import eu.etaxonomy.taxeditor.editor.name.e4.TaxonNameEditor;
+import eu.etaxonomy.taxeditor.editor.name.e4.container.MisappliedGroup.ConceptType;
 import eu.etaxonomy.taxeditor.model.AbstractUtility;
 import eu.etaxonomy.taxeditor.model.NameHelper;
 import eu.etaxonomy.taxeditor.preference.Resources;
@@ -31,13 +31,13 @@ import eu.etaxonomy.taxeditor.store.CdmStore;
  * @author pplitzner
  * @date Aug 24, 2017
  */
-public class ConceptContainerE4 extends AbstractGroupedContainerE4<Taxon> {
+public class ConceptContainer extends AbstractGroupedContainerE4<Taxon> {
 
     private TaxonRelationship relationship;
     private TaxonRelationshipFormatter misappliedFormatter;
     private ConceptType conceptType;
 
-       public ConceptContainerE4(AbstractGroupE4 group, Taxon misappliedName,  ConceptType conceptType) {
+       public ConceptContainer(AbstractGroup group, Taxon misappliedName,  ConceptType conceptType) {
                super(group, misappliedName);
                this.conceptType = conceptType;
                misappliedFormatter = TaxonRelationshipFormatter.INSTANCE();
@@ -47,7 +47,7 @@ public class ConceptContainerE4 extends AbstractGroupedContainerE4<Taxon> {
        protected void initializeComposite() {
                setIsDraggable(true);
                setFont(getViewerFont());
-               TaxonNameEditorE4 editor = getEditor();
+               TaxonNameEditor editor = getEditor();
                Taxon taxon = editor.getTaxon();
                for (TaxonRelationship rel: taxon.getTaxonRelations(getMisappliedName())){
                        if (rel.getType().isAnyMisappliedName() && this.conceptType.equals(ConceptType.Misapplication)){
@@ -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.TaxonNameEditorE4;
+import eu.etaxonomy.taxeditor.editor.name.e4.TaxonNameEditor;
 
 /**
  *
@@ -17,13 +17,13 @@ import eu.etaxonomy.taxeditor.editor.name.e4.TaxonNameEditorE4;
  * @date Aug 24, 2017
  *
  */
-public class ContainerFactoryE4 {
+public class ContainerFactory {
 
        public static void createOrUpdateAcceptedTaxonsHomotypicGroup(
-               TaxonNameEditorE4 taxonNameEditor) {
+               TaxonNameEditor taxonNameEditor) {
 
                if(taxonNameEditor.getAcceptedGroup() == null){
-                       taxonNameEditor.setAcceptedGroup(new AcceptedGroupE4(taxonNameEditor, taxonNameEditor.getTaxon().getHomotypicGroup()));
+                       taxonNameEditor.setAcceptedGroup(new AcceptedGroup(taxonNameEditor, taxonNameEditor.getTaxon().getHomotypicGroup()));
                }
                else{
                        taxonNameEditor.getAcceptedGroup().redraw(taxonNameEditor.getTaxon().getHomotypicGroup());
@@ -32,36 +32,36 @@ public class ContainerFactoryE4 {
        }
 
        public static void createOrUpdateHeterotypicSynonymyGroups(
-                       TaxonNameEditorE4 taxonNameEditor) {
-               List<HomotypicalSynonymGroupE4> retainedGroups = new ArrayList<>();
+                       TaxonNameEditor taxonNameEditor) {
+               List<HomotypicalSynonymGroup> retainedGroups = new ArrayList<>();
 
-               List<HomotypicalSynonymGroupE4> heterotypicSynonymGroups = taxonNameEditor.getHeterotypicSynonymGroups();
+               List<HomotypicalSynonymGroup> heterotypicSynonymGroups = taxonNameEditor.getHeterotypicSynonymGroups();
 
                if (heterotypicSynonymGroups != null) {
 
-                       for(HomotypicalSynonymGroupE4 group : heterotypicSynonymGroups){
+                       for(HomotypicalSynonymGroup group : heterotypicSynonymGroups){
                                retainedGroups.add(group);
                        }
                }
 
                for(HomotypicalGroup homotypicalGroup : taxonNameEditor.getTaxon().getHeterotypicSynonymyGroups()){
                    homotypicalGroup = HibernateProxyHelper.deproxy(homotypicalGroup, HomotypicalGroup.class);
-                   HomotypicalSynonymGroupE4 group = createOrUpdateHeterotypicSynonymyGroup(taxonNameEditor, homotypicalGroup);
+                   HomotypicalSynonymGroup group = createOrUpdateHeterotypicSynonymyGroup(taxonNameEditor, homotypicalGroup);
 
                        retainedGroups.remove(group);
                }
 
-               for(HomotypicalSynonymGroupE4 retainedGroup : retainedGroups){
+               for(HomotypicalSynonymGroup retainedGroup : retainedGroups){
                        taxonNameEditor.removeGroup(retainedGroup);
                }
        }
 
 
-       public static HomotypicalSynonymGroupE4 createOrUpdateHeterotypicSynonymyGroup(
-               TaxonNameEditorE4 taxonNameEditor, HomotypicalGroup homotypicalGroup){
-           HomotypicalSynonymGroupE4 group = null;
+       public static HomotypicalSynonymGroup createOrUpdateHeterotypicSynonymyGroup(
+               TaxonNameEditor taxonNameEditor, HomotypicalGroup homotypicalGroup){
+           HomotypicalSynonymGroup group = null;
                if(taxonNameEditor.getHomotypicalGroupContainer(homotypicalGroup) == null){
-                       group = new HomotypicalSynonymGroupE4(taxonNameEditor, homotypicalGroup);
+                       group = new HomotypicalSynonymGroup(taxonNameEditor, homotypicalGroup);
                        taxonNameEditor.addHeterotypicSynonymGroup(group);
                        if(taxonNameEditor.getMisappliedGroup() != null){
                                group.getControl().moveAbove(taxonNameEditor.getMisappliedGroup().getControl());
@@ -76,8 +76,8 @@ public class ContainerFactoryE4 {
        }
 
        public static void createOrUpdateMisapplicationsGroup(
-               TaxonNameEditorE4 taxonNameEditor) {
-               MisappliedGroupE4 group = taxonNameEditor.getMisappliedGroup();
+               TaxonNameEditor taxonNameEditor) {
+               MisappliedGroup group = taxonNameEditor.getMisappliedGroup();
                Taxon taxon = HibernateProxyHelper.deproxy(taxonNameEditor.getTaxon(), Taxon.class);
 
                if(taxon.getMisappliedNames(true).isEmpty() && taxon.getProParteAndPartialSynonyms().isEmpty()){
@@ -85,7 +85,7 @@ public class ContainerFactoryE4 {
                        taxonNameEditor.setMisapplicationsGroup(null);
                }else{
                        if(group == null){
-                               taxonNameEditor.setMisapplicationsGroup(new MisappliedGroupE4(taxonNameEditor));
+                               taxonNameEditor.setMisapplicationsGroup(new MisappliedGroup(taxonNameEditor));
                        }else{
                                group.redraw();
                        }
@@ -93,7 +93,7 @@ public class ContainerFactoryE4 {
 
        }
 
-       public static void setMenuToAllContainers(TaxonNameEditorE4 taxonNameEditor){
+       public static void setMenuToAllContainers(TaxonNameEditor taxonNameEditor){
            if (taxonNameEditor == null) {
             return;
         }
@@ -103,7 +103,7 @@ public class ContainerFactoryE4 {
            if (taxonNameEditor.getTaxon() != null){
            for(HomotypicalGroup homotypicalGroup : taxonNameEditor.getTaxon().getHeterotypicSynonymyGroups()){
                 homotypicalGroup = HibernateProxyHelper.deproxy(homotypicalGroup, HomotypicalGroup.class);
-                HomotypicalSynonymGroupE4 group = taxonNameEditor.getHomotypicalGroupContainer(homotypicalGroup);
+                HomotypicalSynonymGroup group = taxonNameEditor.getHomotypicalGroupContainer(homotypicalGroup);
                 if (group != null){
                     group.setMenuToGroup();
                 }
@@ -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.TaxonNameEditorE4;
+import eu.etaxonomy.taxeditor.editor.name.e4.TaxonNameEditor;
 
 /**
  *
@@ -22,9 +22,9 @@ import eu.etaxonomy.taxeditor.editor.name.e4.TaxonNameEditorE4;
  * @date Aug 24, 2017
  *
  */
-public class HomotypicalSynonymGroupE4 extends AbstractHomotypicalGroupContainerE4 {
+public class HomotypicalSynonymGroup extends AbstractHomotypicalGroupContainer {
 
-       public HomotypicalSynonymGroupE4(TaxonNameEditorE4 editor, HomotypicalGroup group) {
+       public HomotypicalSynonymGroup(TaxonNameEditor editor, HomotypicalGroup group) {
                super(editor, group);
        }
 
@@ -13,13 +13,13 @@ import java.util.HashSet;
 import java.util.Set;
 
 import eu.etaxonomy.cdm.model.taxon.Taxon;
-import eu.etaxonomy.taxeditor.editor.name.e4.TaxonNameEditorE4;
+import eu.etaxonomy.taxeditor.editor.name.e4.TaxonNameEditor;
 
 /**
  * @author pplitzner
  * @date Aug 24, 2017
  */
-public class MisappliedGroupE4 extends AbstractGroupE4{
+public class MisappliedGroup extends AbstractGroup{
 
     protected enum ConceptType {
         Misapplication,
@@ -27,7 +27,7 @@ public class MisappliedGroupE4 extends AbstractGroupE4{
     }
 
 
-       public MisappliedGroupE4(TaxonNameEditorE4 editor) {
+       public MisappliedGroup(TaxonNameEditor editor) {
                super(editor);
 
                createContent();
@@ -37,7 +37,7 @@ public class MisappliedGroupE4 extends AbstractGroupE4{
        protected void createContainers() {
 
                for(Taxon proParteSynonym : getEditor().getTaxon().getAllProParteSynonyms()){
-            ConceptContainerE4 container = new ConceptContainerE4(this, proParteSynonym, ConceptType.Synonym);
+            ConceptContainer container = new ConceptContainer(this, proParteSynonym, ConceptType.Synonym);
             this.add(container);
             container.createContent();
         }
@@ -45,7 +45,7 @@ public class MisappliedGroupE4 extends AbstractGroupE4{
 
                for(Taxon misapplication : getEditor().getTaxon().getAllMisappliedNames()){
 
-            ConceptContainerE4 container = new ConceptContainerE4(this, misapplication, ConceptType.Misapplication);
+            ConceptContainer container = new ConceptContainer(this, misapplication, ConceptType.Misapplication);
             this.add(container);
             container.createContent();
         }
index fd7d07bcecd9eca19f2abf6ec0719f5e559b7e7d..12bdd0c16a76195443ebd44b42bfcb1c6f53c9c5 100644 (file)
@@ -41,11 +41,11 @@ public class SynonymContainerE4 extends AbstractGroupedContainerE4<Synonym> {
         * @param group a {@link eu.etaxonomy.taxeditor.editor.name.container.AbstractGroup} object.
         * @param synonym a {@link eu.etaxonomy.cdm.model.taxon.Synonym} object.
         */
-       public SynonymContainerE4(AbstractHomotypicalGroupContainerE4 group, Synonym synonym) {
+       public SynonymContainerE4(AbstractHomotypicalGroupContainer group, Synonym synonym) {
                super(group, synonym);
        }
 
-       public SynonymContainerE4(AbstractHomotypicalGroupContainerE4 group, Synonym synonym, int indent, Image icon){
+       public SynonymContainerE4(AbstractHomotypicalGroupContainer group, Synonym synonym, int indent, Image icon){
                super(group, synonym);
                this.indent = indent;
                this.icon = icon;
index 4c5195317b4cb27129ca57dc9fc48bef4641d19f..d243ca8f0969ff0166fdf9018efac5d15ec2ec2c 100644 (file)
@@ -11,7 +11,7 @@ import org.eclipse.ui.forms.ManagedForm;
 import eu.etaxonomy.cdm.model.common.ICdmBase;
 import eu.etaxonomy.taxeditor.editor.CdmDataTransfer;
 import eu.etaxonomy.taxeditor.editor.name.e4.container.AbstractGroupedContainerE4;
-import eu.etaxonomy.taxeditor.editor.name.e4.container.ConceptContainerE4;
+import eu.etaxonomy.taxeditor.editor.name.e4.container.ConceptContainer;
 
 /**
  * @author pplitzner
@@ -48,6 +48,6 @@ public class NameEditorDragListenerE4 extends DragSourceAdapter {
 
        @Override
        public void dragStart(DragSourceEvent event) {
-               event.doit = (container.getData() != null) && !(container instanceof ConceptContainerE4);
+               event.doit = (container.getData() != null) && !(container instanceof ConceptContainer);
        }
 }
index 693cde5f90a0b742442c63663a018a6a2e23a5bb..e92012a6edb9f78a61833d207351c1f4c736ad6f 100644 (file)
@@ -8,7 +8,7 @@ import org.eclipse.swt.dnd.DropTargetEvent;
 import org.eclipse.swt.widgets.Control;
 
 import eu.etaxonomy.taxeditor.editor.EditorUtil;
-import eu.etaxonomy.taxeditor.editor.name.e4.IDropTargetableE4;
+import eu.etaxonomy.taxeditor.editor.name.e4.IDropTargetable;
 import eu.etaxonomy.taxeditor.preference.Resources;
 
 /**
@@ -22,8 +22,8 @@ public class NameEditorDropTargetEffect extends DropTargetEffect {
 
        @Override
     public void dragEnter(DropTargetEvent dropTargetEvent) {
-               if(dropTargetEvent.widget instanceof IDropTargetableE4){
-                       ((IDropTargetableE4) dropTargetEvent.widget).dragEntered();
+               if(dropTargetEvent.widget instanceof IDropTargetable){
+                       ((IDropTargetable) dropTargetEvent.widget).dragEntered();
                }
        }
 
@@ -20,10 +20,10 @@ import eu.etaxonomy.cdm.model.taxon.Taxon;
 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.IDropTargetableE4;
-import eu.etaxonomy.taxeditor.editor.name.e4.TaxonNameEditorE4;
-import eu.etaxonomy.taxeditor.editor.name.e4.container.AbstractHomotypicalGroupContainerE4;
-import eu.etaxonomy.taxeditor.editor.name.e4.container.MisappliedGroupE4;
+import eu.etaxonomy.taxeditor.editor.name.e4.IDropTargetable;
+import eu.etaxonomy.taxeditor.editor.name.e4.TaxonNameEditor;
+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;
 import eu.etaxonomy.taxeditor.editor.name.operation.ChangeConceptRelationshipTypeOperation;
 import eu.etaxonomy.taxeditor.editor.name.operation.ChangeConceptToSynonymOperation;
@@ -40,11 +40,11 @@ import eu.etaxonomy.taxeditor.ui.dialog.selection.ReferenceSelectionDialog;
  * @author pplitzner
  * @date Aug 24, 2017
  */
-public class NameEditorDropTargetListenerE4 extends DropTargetAdapter {
+public class NameEditorDropTargetListener extends DropTargetAdapter {
 
-       private IDropTargetableE4 target;
+       private IDropTargetable target;
 
-       public NameEditorDropTargetListenerE4(IDropTargetableE4 target){
+       public NameEditorDropTargetListener(IDropTargetable target){
                this.target = target;
        }
 
@@ -71,7 +71,7 @@ public class NameEditorDropTargetListenerE4 extends DropTargetAdapter {
                        return;
                }
 
-               if (target instanceof MisappliedGroupE4){
+               if (target instanceof MisappliedGroup){
                   dropTargetEvent.detail = DND.DROP_NONE;
               return;
                }
@@ -94,13 +94,13 @@ public class NameEditorDropTargetListenerE4 extends DropTargetAdapter {
                if(taxonBase instanceof Synonym){
                        Synonym synonym = (Synonym) taxonBase;
 
-                       if(target instanceof AbstractHomotypicalGroupContainerE4){
-                               HomotypicalGroup homotypicalGroup = ((AbstractHomotypicalGroupContainerE4) target).getGroup();
-                               if (((AbstractHomotypicalGroupContainerE4) target).getEditor().getTaxon().equals(synonym.getAcceptedTaxon())){
+                       if(target instanceof AbstractHomotypicalGroupContainer){
+                               HomotypicalGroup homotypicalGroup = ((AbstractHomotypicalGroupContainer) target).getGroup();
+                               if (((AbstractHomotypicalGroupContainer) target).getEditor().getTaxon().equals(synonym.getAcceptedTaxon())){
                                    //the actual accepted taxon is the same as the taxon of the target editor
                                    try{
                                        return new ChangeHomotypicGroupOperation(Messages.NameEditorDropTargetListener_CHANGE_HOMOTYPICAL_GROUP, getEditor().getUndoContext(),
-                                                                           ((AbstractHomotypicalGroupContainerE4) target).getEditor().getTaxon(), synonym, homotypicalGroup, target);
+                                                                           ((AbstractHomotypicalGroupContainer) target).getEditor().getTaxon(), synonym, homotypicalGroup, target);
                                    }catch (NullPointerException e){
                                        return null;
                                    }
@@ -111,19 +111,19 @@ public class NameEditorDropTargetListenerE4 extends DropTargetAdapter {
                                         }catch (Exception e){
                                                 return null;
                                         }
-                                        return new MoveSynonymToAnotherAcceptedTaxonOperationE4(Messages.NameEditorDropTargetListener_CHANGE_ACC_TAXON, getEditor().getUndoContext(), synonym.getUuid(), ((TaxonNameEditorE4) target).getTaxon(), newSecUuid, (TaxonNameEditorE4) target);
+                                        return new MoveSynonymToAnotherAcceptedTaxonOperationE4(Messages.NameEditorDropTargetListener_CHANGE_ACC_TAXON, getEditor().getUndoContext(), synonym.getUuid(), ((TaxonNameEditor) target).getTaxon(), newSecUuid, (TaxonNameEditor) target);
 
                 }
 
                        }
-                       else if(target instanceof MisappliedGroupE4){
+                       else if(target instanceof MisappliedGroup){
                                return new ChangeSynonymToMisapplicationOperation(Messages.NameEditorDropTargetListener_CHANGE_SYNONYM_TO_MISAPP, getEditor().getUndoContext(),
                                                getEditor().getTaxon(), synonym, target);
                        }
-                       else if(target instanceof TaxonNameEditorE4){
-                               if (((TaxonNameEditorE4) target).getTaxon().equals(synonym.getAcceptedTaxon())){
+                       else if(target instanceof TaxonNameEditor){
+                               if (((TaxonNameEditor) target).getTaxon().equals(synonym.getAcceptedTaxon())){
                                        return new ChangeHomotypicGroupOperation(Messages.NameEditorDropTargetListener_CHANGE_HOMOTYPICAL_GROUP, getEditor().getUndoContext(),
-                                               ((TaxonNameEditorE4) target).getTaxon(), synonym, null, target);
+                                               ((TaxonNameEditor) target).getTaxon(), synonym, null, target);
                                } else{
                                        UUID newSecUuid = null;
                                        try{
@@ -131,7 +131,7 @@ public class NameEditorDropTargetListenerE4 extends DropTargetAdapter {
                                        }catch (Exception e){
                                            return null;
                                        }
-                                       return new MoveSynonymToAnotherAcceptedTaxonOperationE4(Messages.NameEditorDropTargetListener_CHANGE_ACC_TAXON, getEditor().getUndoContext(), synonym.getUuid(), ((TaxonNameEditorE4) target).getTaxon(), newSecUuid, (TaxonNameEditorE4) target);
+                                       return new MoveSynonymToAnotherAcceptedTaxonOperationE4(Messages.NameEditorDropTargetListener_CHANGE_ACC_TAXON, getEditor().getUndoContext(), synonym.getUuid(), ((TaxonNameEditor) target).getTaxon(), newSecUuid, (TaxonNameEditor) target);
 
                                }
                        }
@@ -139,13 +139,13 @@ public class NameEditorDropTargetListenerE4 extends DropTargetAdapter {
                }else if(taxonBase instanceof Taxon){
                        Taxon concept = (Taxon) taxonBase;
 
-                       if(target instanceof AbstractHomotypicalGroupContainerE4){
-                               HomotypicalGroup homotypicalGroup = ((AbstractHomotypicalGroupContainerE4) target).getGroup();
+                       if(target instanceof AbstractHomotypicalGroupContainer){
+                               HomotypicalGroup homotypicalGroup = ((AbstractHomotypicalGroupContainer) target).getGroup();
 
                                return new ChangeConceptToSynonymOperation(Messages.NameEditorDropTargetListener_CHANGE_SYNONYM, getEditor().getUndoContext(),
                                                getEditor().getTaxon(), concept, homotypicalGroup, target);
                        }
-                       else if(target instanceof MisappliedGroupE4){
+                       else if(target instanceof MisappliedGroup){
                                return new ChangeConceptRelationshipTypeOperation(Messages.NameEditorDropTargetListener_CHANGE, getEditor().getUndoContext(),
                                                getEditor().getTaxon(), concept, TaxonRelationshipType.MISAPPLIED_NAME_FOR(), target);
                        }
@@ -159,7 +159,7 @@ public class NameEditorDropTargetListenerE4 extends DropTargetAdapter {
         Reference synSecRef = synonym.getSec();
         UUID newSecUuid = null;
         SecReferenceHandlingEnum secHandling = PreferencesUtil.getSecReferenceHandlingPreference();
-        Reference parentSecRef = ((AbstractHomotypicalGroupContainerE4) target).getEditor().getTaxon() != null? ((AbstractHomotypicalGroupContainerE4) target).getEditor().getTaxon().getSec():null;
+        Reference parentSecRef = ((AbstractHomotypicalGroupContainer) target).getEditor().getTaxon() != null? ((AbstractHomotypicalGroupContainer) target).getEditor().getTaxon().getSec():null;
         if ((synSecRef != parentSecRef && secHandling.equals(SecReferenceHandlingEnum.KeepOrWarn) )|| secHandling.equals(SecReferenceHandlingEnum.KeepOrSelect)){
 
             if ((parentSecRef != synSecRef && secHandling.equals(SecReferenceHandlingEnum.KeepOrWarn) )|| secHandling.equals(SecReferenceHandlingEnum.KeepOrSelect)){
@@ -188,8 +188,8 @@ public class NameEditorDropTargetListenerE4 extends DropTargetAdapter {
        }
 
        private HomotypicalGroup getHomotypicalGroup() {
-               if(target instanceof AbstractHomotypicalGroupContainerE4){
-                       return ((AbstractHomotypicalGroupContainerE4) target).getGroup();
+               if(target instanceof AbstractHomotypicalGroupContainer){
+                       return ((AbstractHomotypicalGroupContainer) target).getGroup();
                }
                return null;
        }
@@ -206,7 +206,7 @@ public class NameEditorDropTargetListenerE4 extends DropTargetAdapter {
                return null;
        }
 
-       private TaxonNameEditorE4 getEditor() {
-               return (TaxonNameEditorE4) EventUtility.getTaxonEditor();
+       private TaxonNameEditor getEditor() {
+               return (TaxonNameEditor) EventUtility.getTaxonEditor();
        }
 }
@@ -37,9 +37,9 @@ import eu.etaxonomy.cdm.model.taxon.Taxon;
 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.e4.TaxonEditorInputE4;
+import eu.etaxonomy.taxeditor.editor.e4.TaxonEditorInput;
 import eu.etaxonomy.taxeditor.editor.l10n.Messages;
-import eu.etaxonomy.taxeditor.editor.name.e4.TaxonNameEditorE4;
+import eu.etaxonomy.taxeditor.editor.name.e4.TaxonNameEditor;
 import eu.etaxonomy.taxeditor.editor.name.handler.NameEditorMenuPropertyTester;
 import eu.etaxonomy.taxeditor.editor.name.operation.ChangeSynonymToAcceptedTaxonOperation;
 import eu.etaxonomy.taxeditor.event.EventUtility;
@@ -55,11 +55,11 @@ import eu.etaxonomy.taxeditor.ui.dialog.selection.TaxonNodeSelectionDialog;
  * @author pplitzner
  * @since Aug 28, 2017
  */
-public class ChangeSynonymToAcceptedTaxonHandlerE4 implements IPostOperationEnabled {
+public class ChangeSynonymToAcceptedTaxonHandler implements IPostOperationEnabled {
 
-    private static final Logger logger = LogManager.getLogger(ChangeSynonymToAcceptedTaxonHandlerE4.class);
+    private static final Logger logger = LogManager.getLogger(ChangeSynonymToAcceptedTaxonHandler.class);
 
-       private TaxonNameEditorE4 editor;
+       private TaxonNameEditor editor;
     private EPartService partService;
     private MApplication application;
     private EModelService modelService;
@@ -74,9 +74,9 @@ public class ChangeSynonymToAcceptedTaxonHandlerE4 implements IPostOperationEnab
         this.application = application;
         this.partService = partService;
 
-        editor = (TaxonNameEditorE4) activePart.getObject();
+        editor = (TaxonNameEditor) activePart.getObject();
 
-        TaxonEditorInputE4 input = editor.getEditorInput();
+        TaxonEditorInput input = editor.getEditorInput();
 
                // Get synonym from selection
                if (!(selection.getFirstElement() instanceof Synonym)) {
@@ -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.TaxonNameEditorE4;
+import eu.etaxonomy.taxeditor.editor.name.e4.TaxonNameEditor;
 import eu.etaxonomy.taxeditor.editor.name.handler.NameEditorMenuPropertyTester;
 import eu.etaxonomy.taxeditor.editor.name.operation.ChangeConceptRelationshipTypeOperation;
 import eu.etaxonomy.taxeditor.editor.name.operation.ChangeSynonymToMisapplicationOperation;
@@ -37,9 +37,9 @@ import eu.etaxonomy.taxeditor.operation.AbstractPostTaxonOperation;
  * @since Aug 28, 2017
  *
  */
-public class ChangeToMisapplicationHandlerE4 {
+public class ChangeToMisapplicationHandler {
 
-    private TaxonNameEditorE4 editor;
+    private TaxonNameEditor editor;
 
     @Execute
     public void execute(@Named(IServiceConstants.ACTIVE_PART)MPart activePart,
@@ -48,7 +48,7 @@ public class ChangeToMisapplicationHandlerE4 {
             MHandledMenuItem menuItem,
             UISynchronize sync) {
 
-        editor = (TaxonNameEditorE4) activePart.getObject();
+        editor = (TaxonNameEditor) activePart.getObject();
 
         if (!EditorUtil.forceUserSaveE4Editor(editor, shell)){
             return ;
@@ -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.TaxonNameEditorE4;
+import eu.etaxonomy.taxeditor.editor.name.e4.TaxonNameEditor;
 import eu.etaxonomy.taxeditor.editor.name.handler.NameEditorMenuPropertyTester;
 import eu.etaxonomy.taxeditor.editor.name.operation.ChangeConceptRelationshipTypeOperation;
 import eu.etaxonomy.taxeditor.editor.name.operation.ChangeSynonymToConceptOperation;
@@ -37,9 +37,9 @@ import eu.etaxonomy.taxeditor.operation.AbstractPostOperation;
  * @since Aug 28, 2017
  *
  */
-public class ChangeToProParteSynonymHandlerE5 {
+public class ChangeToProParteSynonymHandler {
 
-    private TaxonNameEditorE4 editor;
+    private TaxonNameEditor editor;
 
     @Execute
     public void execute(@Named(IServiceConstants.ACTIVE_PART)MPart activePart,
@@ -48,7 +48,7 @@ public class ChangeToProParteSynonymHandlerE5 {
             MHandledMenuItem menuItem,
             UISynchronize sync) {
 
-        editor = (TaxonNameEditorE4) activePart.getObject();
+        editor = (TaxonNameEditor) activePart.getObject();
 
                if (!EditorUtil.forceUserSaveE4Editor(editor, shell)){
             return ;
@@ -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.TaxonNameEditorE4;
+import eu.etaxonomy.taxeditor.editor.name.e4.TaxonNameEditor;
 import eu.etaxonomy.taxeditor.editor.name.handler.NameEditorMenuPropertyTester;
 import eu.etaxonomy.taxeditor.editor.name.operation.ChangeConceptToSynonymOperation;
 import eu.etaxonomy.taxeditor.model.AbstractUtility;
@@ -32,7 +32,7 @@ import eu.etaxonomy.taxeditor.operation.AbstractPostOperation;
  * @since Aug 28, 2017
  *
  */
-public class ChangeToSynonymHandlerE4 {
+public class ChangeToSynonymHandler {
 
     @Execute
     public void execute(@Named(IServiceConstants.ACTIVE_PART)MPart activePart,
@@ -40,7 +40,7 @@ public class ChangeToSynonymHandlerE4 {
             MHandledMenuItem menuItem,
             UISynchronize sync) {
 
-        TaxonNameEditorE4 editor = (TaxonNameEditorE4) activePart.getObject();
+        TaxonNameEditor editor = (TaxonNameEditor) activePart.getObject();
 
 
                Taxon concept  = (Taxon) selection.getFirstElement();
@@ -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.TaxonNameEditorE4;
+import eu.etaxonomy.taxeditor.editor.name.e4.TaxonNameEditor;
 import eu.etaxonomy.taxeditor.editor.name.operation.CreateSynonymInNewGroupOperation;
 import eu.etaxonomy.taxeditor.model.AbstractUtility;
 import eu.etaxonomy.taxeditor.operation.AbstractPostOperation;
@@ -32,7 +32,7 @@ import eu.etaxonomy.taxeditor.parser.ParseHandler;
  * @since Aug 28, 2017
  *
  */
-public class CreateHeterotypicSynonymHandlerE4 {
+public class CreateHeterotypicSynonymHandler {
 
 
     @Execute
@@ -40,7 +40,7 @@ public class CreateHeterotypicSynonymHandlerE4 {
             MHandledMenuItem menuItem,
             UISynchronize sync) {
 
-        TaxonNameEditorE4 editor = (TaxonNameEditorE4) activePart.getObject();
+        TaxonNameEditor editor = (TaxonNameEditor) activePart.getObject();
 
                TaxonName newSynonymName = ParseHandler.createEmptyName();
 
@@ -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.TaxonNameEditorE4;
+import eu.etaxonomy.taxeditor.editor.name.e4.TaxonNameEditor;
 import eu.etaxonomy.taxeditor.editor.name.handler.NameEditorMenuPropertyTester;
 import eu.etaxonomy.taxeditor.editor.name.operation.CreateSynonymInExistingHomotypicalGroupOperation;
 import eu.etaxonomy.taxeditor.model.AbstractUtility;
@@ -35,7 +35,7 @@ import eu.etaxonomy.taxeditor.parser.ParseHandler;
  * @since Aug 28, 2017
  *
  */
-public class CreateHomotypicSynonymHandlerE4 {
+public class CreateHomotypicSynonymHandler {
 
 
     @Execute
@@ -43,7 +43,7 @@ public class CreateHomotypicSynonymHandlerE4 {
             MHandledMenuItem menuItem,
             UISynchronize sync) {
 
-        TaxonNameEditorE4 editor = (TaxonNameEditorE4) activePart.getObject();
+        TaxonNameEditor editor = (TaxonNameEditor) activePart.getObject();
                Taxon taxon = editor.getTaxon();
                HomotypicalGroup group = taxon.getHomotypicGroup();
                TaxonName newSynonymName = ParseHandler.createEmptyName();
@@ -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.TaxonNameEditorE4;
+import eu.etaxonomy.taxeditor.editor.name.e4.TaxonNameEditor;
 import eu.etaxonomy.taxeditor.editor.view.concept.operation.CreateConceptRelationOperation;
 import eu.etaxonomy.taxeditor.model.AbstractUtility;
 import eu.etaxonomy.taxeditor.operation.AbstractPostOperation;
@@ -34,14 +34,14 @@ import eu.etaxonomy.taxeditor.parser.ParseHandler;
  * @since Aug 28, 2017
  *
  */
-public class CreateMisapplicationHandlerE4 {
+public class CreateMisapplicationHandler {
 
     @Execute
     public void execute(@Named(IServiceConstants.ACTIVE_PART)MPart activePart,
             MHandledMenuItem menuItem,
             UISynchronize sync) {
 
-        TaxonNameEditorE4 editor = (TaxonNameEditorE4) activePart.getObject();
+        TaxonNameEditor editor = (TaxonNameEditor) activePart.getObject();
 
                TaxonName conceptName = ParseHandler.createEmptyName();
                Taxon concept = Taxon.NewInstance(conceptName, null);
@@ -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.TaxonNameEditorE4;
+import eu.etaxonomy.taxeditor.editor.name.e4.TaxonNameEditor;
 import eu.etaxonomy.taxeditor.editor.view.concept.operation.CreateConceptRelationOperation;
 import eu.etaxonomy.taxeditor.model.AbstractUtility;
 import eu.etaxonomy.taxeditor.operation.AbstractPostOperation;
@@ -31,7 +31,7 @@ import eu.etaxonomy.taxeditor.parser.ParseHandler;
  * @since 15.05.2018
  *
  */
-public class CreateProParteSynonymHandlerE4 {
+public class CreateProParteSynonymHandler {
 
 
         @Execute
@@ -39,7 +39,7 @@ public class CreateProParteSynonymHandlerE4 {
                 MHandledMenuItem menuItem,
                 UISynchronize sync) {
 
-            TaxonNameEditorE4 editor = (TaxonNameEditorE4) activePart.getObject();
+            TaxonNameEditor editor = (TaxonNameEditor) activePart.getObject();
 
             TaxonName conceptName = ParseHandler.createEmptyName();
             Taxon concept = Taxon.NewInstance(conceptName, null);
@@ -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.TaxonNameEditorE4;
+import eu.etaxonomy.taxeditor.editor.name.e4.TaxonNameEditor;
 import eu.etaxonomy.taxeditor.editor.name.handler.NameEditorMenuPropertyTester;
 import eu.etaxonomy.taxeditor.editor.name.operation.CreateSynonymInExistingHomotypicalGroupOperation;
 import eu.etaxonomy.taxeditor.model.AbstractUtility;
@@ -33,7 +33,7 @@ import eu.etaxonomy.taxeditor.parser.ParseHandler;
  * @author pplitzner
  * @since Aug 28, 2017
  */
-public class CreateSynonymInHomotypicalGroupHandlerE4 {
+public class CreateSynonymInHomotypicalGroupHandler {
 
     @Execute
     public void execute(@Named(IServiceConstants.ACTIVE_PART)MPart activePart,
@@ -41,7 +41,7 @@ public class CreateSynonymInHomotypicalGroupHandlerE4 {
             MHandledMenuItem menuItem,
             UISynchronize sync) {
 
-        TaxonNameEditorE4 editor = (TaxonNameEditorE4) activePart.getObject();
+        TaxonNameEditor editor = (TaxonNameEditor) activePart.getObject();
 
                Object selectedObject = selection.getFirstElement();
 
@@ -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.TaxonNameEditorE4;
+import eu.etaxonomy.taxeditor.editor.name.e4.TaxonNameEditor;
 import eu.etaxonomy.taxeditor.editor.name.e4.container.AbstractGroupedContainerE4;
 
 /**
@@ -29,7 +29,7 @@ import eu.etaxonomy.taxeditor.editor.name.e4.container.AbstractGroupedContainerE
  * @since Aug 28, 2017
  *
  */
-public class DeleteAllEmptyNamesHandlerE4 extends DeleteTaxonBaseHandlerE4 {
+public class DeleteAllEmptyNamesHandler extends DeleteTaxonBaseHandler {
 
     @Override
     @Execute
@@ -39,7 +39,7 @@ public class DeleteAllEmptyNamesHandlerE4 extends DeleteTaxonBaseHandlerE4 {
             MHandledMenuItem menuItem,
             UISynchronize sync) {
 
-        editor = (TaxonNameEditorE4) activePart.getObject();
+        editor = (TaxonNameEditor) activePart.getObject();
 
                for(AbstractGroupedContainerE4 containerWithEmptyName : editor.getEmptyContainers()){
                    editor.removeGroup(containerWithEmptyName.getGroup());
@@ -55,7 +55,7 @@ public class DeleteAllEmptyNamesHandlerE4 extends DeleteTaxonBaseHandlerE4 {
             @Named(IServiceConstants.ACTIVE_SELECTION)IStructuredSelection selection,
             MHandledMenuItem menuItem){
 
-        editor = (TaxonNameEditorE4) activePart.getObject();
+        editor = (TaxonNameEditor) activePart.getObject();
 
         boolean canExecute = false;
         canExecute = editor.checkForEmptyNames();
@@ -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.TaxonNameEditorE4;
+import eu.etaxonomy.taxeditor.editor.name.e4.TaxonNameEditor;
 import eu.etaxonomy.taxeditor.editor.name.handler.NameEditorMenuPropertyTester;
 import eu.etaxonomy.taxeditor.model.DeleteResultMessagingUtils;
 import eu.etaxonomy.taxeditor.operation.AbstractPostOperation;
@@ -45,9 +45,9 @@ import eu.etaxonomy.taxeditor.ui.dialog.configurator.deleteConfigurator.DeleteCo
  * @since Aug 28, 2017
  *
  */
-public class DeleteTaxonBaseHandlerE4 implements IPostOperationEnabled {
+public class DeleteTaxonBaseHandler implements IPostOperationEnabled {
 
-    protected TaxonNameEditorE4 editor;
+    protected TaxonNameEditor editor;
 
        @Execute
        public void execute(@Named(IServiceConstants.ACTIVE_PART)MPart activePart,
@@ -56,13 +56,13 @@ public class DeleteTaxonBaseHandlerE4 implements IPostOperationEnabled {
                MHandledMenuItem menuItem,
             UISynchronize sync) {
 
-           editor = (TaxonNameEditorE4) activePart.getObject();
+           editor = (TaxonNameEditor) activePart.getObject();
 
            doExecute(menuItem.getLocalizedLabel(), shell, editor, selection.getFirstElement(), sync);
 
        }
 
-       protected void doExecute(String commandName, Shell shell, TaxonNameEditorE4 editor, Object selectedElement,
+       protected void doExecute(String commandName, Shell shell, TaxonNameEditor editor, Object selectedElement,
             UISynchronize sync) {
                AbstractPostOperation operation = null;
 
@@ -26,9 +26,9 @@ import eu.etaxonomy.cdm.model.reference.Reference;
 import eu.etaxonomy.cdm.model.taxon.Synonym;
 import eu.etaxonomy.cdm.model.taxon.TaxonNode;
 import eu.etaxonomy.taxeditor.editor.EditorUtil;
-import eu.etaxonomy.taxeditor.editor.e4.TaxonEditorInputE4;
+import eu.etaxonomy.taxeditor.editor.e4.TaxonEditorInput;
 import eu.etaxonomy.taxeditor.editor.l10n.Messages;
-import eu.etaxonomy.taxeditor.editor.name.e4.TaxonNameEditorE4;
+import eu.etaxonomy.taxeditor.editor.name.e4.TaxonNameEditor;
 import eu.etaxonomy.taxeditor.editor.name.e4.operation.MoveSynonymToAnotherAcceptedTaxonOperationE4;
 import eu.etaxonomy.taxeditor.editor.name.handler.NameEditorMenuPropertyTester;
 import eu.etaxonomy.taxeditor.model.AbstractUtility;
@@ -38,11 +38,11 @@ import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
 import eu.etaxonomy.taxeditor.ui.dialog.selection.ReferenceSelectionDialog;
 import eu.etaxonomy.taxeditor.ui.dialog.selection.TaxonNodeSelectionDialog;
 
-public class MoveSynonymToAnotherAcceptedTaxonHandlerE4 implements IPostOperationEnabled{
+public class MoveSynonymToAnotherAcceptedTaxonHandler implements IPostOperationEnabled{
 
-    private static final Logger logger = LogManager.getLogger(MoveSynonymToAnotherAcceptedTaxonHandlerE4.class);
+    private static final Logger logger = LogManager.getLogger(MoveSynonymToAnotherAcceptedTaxonHandler.class);
 
-       private TaxonNameEditorE4 editor;
+       private TaxonNameEditor editor;
 
     private TaxonNode newParentNode;
 
@@ -66,9 +66,9 @@ public class MoveSynonymToAnotherAcceptedTaxonHandlerE4 implements IPostOperatio
            this.activePart = activePart;
            this.partService = partService;
 
-        editor = (TaxonNameEditorE4) activePart.getObject();
+        editor = (TaxonNameEditor) activePart.getObject();
 
-        TaxonEditorInputE4 input = editor.getEditorInput();
+        TaxonEditorInput input = editor.getEditorInput();
 
                if (!EditorUtil.forceUserSaveE4Editor(editor, shell)) {
                        return ;
@@ -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.TaxonNameEditorE4;
+import eu.etaxonomy.taxeditor.editor.name.e4.TaxonNameEditor;
 import eu.etaxonomy.taxeditor.editor.name.handler.NameEditorMenuPropertyTester;
 import eu.etaxonomy.taxeditor.editor.name.operation.ChangeHomotypicalGroupBasionymOperation;
 import eu.etaxonomy.taxeditor.model.AbstractUtility;
@@ -32,7 +32,7 @@ import eu.etaxonomy.taxeditor.operation.AbstractPostOperation;
  * @since Aug 28, 2017
  *
  */
-public class SetBasionymHandlerE4 {
+public class SetBasionymHandler {
 
     @Execute
     public void execute(@Named(IServiceConstants.ACTIVE_PART)MPart activePart,
@@ -40,7 +40,7 @@ public class SetBasionymHandlerE4 {
             MHandledMenuItem menuItem,
             UISynchronize sync) {
 
-        TaxonNameEditorE4 editor = (TaxonNameEditorE4) activePart.getObject();
+        TaxonNameEditor editor = (TaxonNameEditor) activePart.getObject();
 
                TaxonBase selectedTaxonBase = (TaxonBase) selection.getFirstElement();
 
@@ -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.TaxonNameEditorE4;
+import eu.etaxonomy.taxeditor.editor.name.e4.TaxonNameEditor;
 import eu.etaxonomy.taxeditor.editor.name.handler.NameEditorMenuPropertyTester;
 import eu.etaxonomy.taxeditor.editor.name.operation.SwapSynonymAndAcceptedOperation;
 import eu.etaxonomy.taxeditor.event.EventUtility;
@@ -50,9 +50,9 @@ import eu.etaxonomy.taxeditor.ui.dialog.selection.ReferenceSelectionDialog;
  * @author pplitzner
  * @since Aug 28, 2017
  */
-public class SwapSynonymAndAcceptedHandlerE4 implements IPostOperationEnabled {
+public class SwapSynonymAndAcceptedHandler implements IPostOperationEnabled {
 
-    protected TaxonNameEditorE4 editor;
+    protected TaxonNameEditor editor;
     protected Taxon taxon;
     protected EPartService partService;
     protected MPart activePart;
@@ -72,7 +72,7 @@ public class SwapSynonymAndAcceptedHandlerE4 implements IPostOperationEnabled {
         this.application = application;
         this.partService = partService;
 
-        editor = (TaxonNameEditorE4) activePart.getObject();
+        editor = (TaxonNameEditor) activePart.getObject();
 
         Synonym synonym = (Synonym) selection.getFirstElement();
 
index 64636eec9602e07537156b39f0cf02d00d679901..4577878ebdb7dd92ca2fed5f06725ee0d8771a8c 100755 (executable)
@@ -30,7 +30,7 @@ import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
  * @since Aug 28, 2017
  *
  */
-public class SwapSynonymAndAcceptedSetNameInSourceHandlerE5 extends SwapSynonymAndAcceptedHandlerE4 implements IPostOperationEnabled {
+public class SwapSynonymAndAcceptedSetNameInSourceHandlerE5 extends SwapSynonymAndAcceptedHandler implements IPostOperationEnabled {
 
 
 
@@ -52,7 +52,7 @@ public class SwapSynonymAndAcceptedSetNameInSourceHandlerE5 extends SwapSynonymA
 //        this.application = application;
 //        this.partService = partService;
 //
-//        editor = (TaxonNameEditorE4) activePart.getObject();
+//        editor = (TaxonNameEditor) activePart.getObject();
 //
 //        Synonym synonym = (Synonym) selection.getFirstElement();
 //
index 74d6307f1abf75015847762e522301cd84f63539..acac34158d96fb3572e10eb051851811ff6bacf2 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.TaxonNameEditorE4;
+import eu.etaxonomy.taxeditor.editor.name.e4.TaxonNameEditor;
 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) {
-               TaxonNameEditorE4 editor = (TaxonNameEditorE4) EventUtility.getTaxonEditor();
+               TaxonNameEditor editor = (TaxonNameEditor) EventUtility.getTaxonEditor();
                return editor == null ? false : editor.checkForEmptyNames();
        }
 
        public static boolean isRelatedConcept(Object selectedElement) {
-               if(selectedElement instanceof Taxon && ((Taxon) selectedElement).isRelatedConcept() && !((TaxonNameEditorE4) EventUtility.getTaxonEditor()).getTaxon().equals(selectedElement)){
+               if(selectedElement instanceof Taxon && ((Taxon) selectedElement).isRelatedConcept() && !((TaxonNameEditor) 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() && !((TaxonNameEditorE4) EventUtility.getTaxonEditor()).getTaxon().equals(selectedElement)){
+               if(selectedElement instanceof Taxon && ((Taxon) selectedElement).isMisapplication() && !((TaxonNameEditor) EventUtility.getTaxonEditor()).getTaxon().equals(selectedElement)){
                        return true;
                }
                return false;
        }
 
        public static boolean isProparteSynonym(Object selectedElement) {
-        if(selectedElement instanceof Taxon && ((Taxon) selectedElement).isProparteSynonym() && !((TaxonNameEditorE4) EventUtility.getTaxonEditor()).getTaxon().equals(selectedElement)){
+        if(selectedElement instanceof Taxon && ((Taxon) selectedElement).isProparteSynonym() && !((TaxonNameEditor) 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() && !((TaxonNameEditorE4) EventUtility.getTaxonEditor()).getTaxon().equals(selectedElement)){
+        if(((Taxon) selectedElement).isProparteSynonym() && !((TaxonNameEditor) EventUtility.getTaxonEditor()).getTaxon().equals(selectedElement)){
             return false;
         }
         return true;
@@ -214,7 +214,7 @@ public class NameEditorMenuPropertyTester extends PropertyTester {
     }
 
        public static boolean isAccepted(Object selectedElement) {
-           TaxonNameEditorE4 editor = (TaxonNameEditorE4) EventUtility.getTaxonEditor();
+           TaxonNameEditor editor = (TaxonNameEditor) EventUtility.getTaxonEditor();
            Taxon accepted = editor.getTaxon();
                return (selectedElement instanceof Taxon  && accepted.equals(selectedElement)) ? true : false;
        }
index daa6b89dc70c1e6a5e5656a27d946597a0599b53..084aac30ead73d1b43bca8da6e8f3793e7a79019 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.TaxonNameEditorE4;
+import eu.etaxonomy.taxeditor.editor.name.e4.TaxonNameEditor;
 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) {
-        TaxonNameEditorE4 editor = null;
+        TaxonNameEditor editor = null;
         Object activePart = AbstractUtility.getActivePart();
-        if (activePart instanceof TaxonNameEditorE4){
-           editor = (TaxonNameEditorE4) activePart;
+        if (activePart instanceof TaxonNameEditor){
+           editor = (TaxonNameEditor) activePart;
            if (newCdmBase instanceof Synonym){
                editor.getEditorInput().addToSaveNewSynonym((Synonym)newCdmBase);
            }else if (newCdmBase instanceof Taxon ){
index 5f65bb44f14fc76057b4ddd76168b8fceb2b19b7..708e4de47bbdd87c5857d671df0657ff4e0dee40 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.TaxonNameEditorE4;
+import eu.etaxonomy.taxeditor.editor.name.e4.TaxonNameEditor;
 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);
 
-        TaxonNameEditorE4 editor = null;
+        TaxonNameEditor editor = null;
 
         ConceptViewPartE4 conceptView = (ConceptViewPartE4) activePart.getObject();
 
         Object e4WrappedPart = WorkbenchUtility.getE4WrappedPart(conceptView.getSelectionProvidingPart());
-        if(e4WrappedPart instanceof TaxonNameEditorE4){
-            editor = (TaxonNameEditorE4) e4WrappedPart;
+        if(e4WrappedPart instanceof TaxonNameEditor){
+            editor = (TaxonNameEditor) 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 TaxonNameEditorE4;
+        canExecute = e4WrappedPart instanceof TaxonNameEditor;
         menuItem.setVisible(canExecute);
         return canExecute;
     }
index a2112c8e3982761a5d8faaf6d6fe413f1a423bbe..8f5f741697cbaf25039416e4ad17130b1fd3277b 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.TaxonNameEditorE4;
+import eu.etaxonomy.taxeditor.editor.name.e4.TaxonNameEditor;
 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) {
 
-        TaxonNameEditorE4 editor = null;
+        TaxonNameEditor editor = null;
 
         ConceptViewPartE4 conceptView = (ConceptViewPartE4) activePart.getObject();
 
         Object e4WrappedPart = WorkbenchUtility.getE4WrappedPart(conceptView.getSelectionProvidingPart());
-        if(e4WrappedPart instanceof TaxonNameEditorE4){
-            editor = (TaxonNameEditorE4) e4WrappedPart;
+        if(e4WrappedPart instanceof TaxonNameEditor){
+            editor = (TaxonNameEditor) e4WrappedPart;
 
             Set<TaxonRelationship> relations = new HashSet<TaxonRelationship>();
 
index 478c2d62082a2ece941f9a29d3a158cf90f67c96..c7d31aced42201bde95f996138f79e12251c2ed3 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.TaxonNameEditorE4;
+import eu.etaxonomy.taxeditor.editor.name.e4.TaxonNameEditor;
 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) {
 
-        TaxonNameEditorE4 editor = null;
+        TaxonNameEditor editor = null;
         BulkEditor bulkEditor = null;
         TaxonRelationship taxonRelationship = (TaxonRelationship) selection.getFirstElement();
 
         ConceptViewPartE4 conceptView = (ConceptViewPartE4) activePart.getObject();
 
         Object e4WrappedPart = WorkbenchUtility.getE4WrappedPart(conceptView.getSelectionProvidingPart());
-        if(e4WrappedPart instanceof TaxonNameEditorE4){
-            editor = (TaxonNameEditorE4) e4WrappedPart;
+        if(e4WrappedPart instanceof TaxonNameEditor){
+            editor = (TaxonNameEditor) e4WrappedPart;
         }
         else if(e4WrappedPart instanceof BulkEditor){
             bulkEditor = (BulkEditor) e4WrappedPart;
index 041cecf5d8f7b9e029fed159323542bce56940fc..465237487da7d88f3b2f9b257f35fdad19c9a9f7 100644 (file)
@@ -12,7 +12,7 @@ import org.eclipse.zest.core.viewers.IGraphContentProvider;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
 import eu.etaxonomy.cdm.model.taxon.TaxonRelationship;
 import eu.etaxonomy.cdm.model.taxon.TaxonRelationshipType;
-import eu.etaxonomy.taxeditor.editor.e4.TaxonEditorInputE4;
+import eu.etaxonomy.taxeditor.editor.e4.TaxonEditorInput;
 
 /**
  * @author andreas
@@ -59,8 +59,8 @@ public class ConceptGraphContentProvider implements IGraphContentProvider {
         */
        @Override
        public Object[] getElements(Object inputElement) {
-               if(inputElement instanceof TaxonEditorInputE4){
-                       Taxon taxon = ((TaxonEditorInputE4) inputElement).getTaxon();
+               if(inputElement instanceof TaxonEditorInput){
+                       Taxon taxon = ((TaxonEditorInput) inputElement).getTaxon();
 
                        Map<String, TaxonRelationship> filteredTaxonRelations = new HashMap<String, TaxonRelationship>();
                        getTaxonRelationshipsRecursive(filteredTaxonRelations, taxon);
index 91ec0ca06b6f3d240718e7d460363614a0cc6638..636b58f4cb54e35f102de4240e37db408b1b281f 100644 (file)
@@ -18,9 +18,9 @@ import org.eclipse.zest.layouts.LayoutStyles;
 import org.eclipse.zest.layouts.algorithms.TreeLayoutAlgorithm;
 
 import eu.etaxonomy.taxeditor.bulkeditor.e4.BulkEditor;
-import eu.etaxonomy.taxeditor.editor.e4.TaxonEditorInputE4;
+import eu.etaxonomy.taxeditor.editor.e4.TaxonEditorInput;
 import eu.etaxonomy.taxeditor.editor.l10n.Messages;
-import eu.etaxonomy.taxeditor.editor.name.e4.TaxonNameEditorE4;
+import eu.etaxonomy.taxeditor.editor.name.e4.TaxonNameEditor;
 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 TaxonNameEditorE4){
+               if(partObject instanceof TaxonNameEditor){
                    if (viewer.getControl() != null && !viewer.getControl().isDisposed()) {
                 viewer.getControl().setEnabled(true);
             }
-                   TaxonEditorInputE4 input = ((TaxonNameEditorE4) partObject).getEditorInput();
+                   TaxonEditorInput input = ((TaxonNameEditor) partObject).getEditorInput();
                    showViewer(new StructuredSelection(input), activePart, viewer);
                }
 
index a053e03ac957b7dbd64c0cae031b1d8a89471ae1..1ea4b8c51a3090460a734ac4d72adc7dd575de63 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.TaxonNameEditorE4;
+import eu.etaxonomy.taxeditor.editor.name.e4.TaxonNameEditor;
 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 TaxonNameEditorE4){
-                selectedTaxon = ((TaxonNameEditorE4) activePart.getObject()).getTaxon();
+            if(activePart.getObject() instanceof TaxonNameEditor){
+                selectedTaxon = ((TaxonNameEditor) activePart.getObject()).getTaxon();
             }
             else if(selection != null){
                 Object selectedElement = selection.getFirstElement();
index cf1ee03e7d4a75575ac66ec6ad4b390d94a62ec8..f61fe8440015b45b2e959847a7695833456fe389 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.TaxonNameEditorE4;
+import eu.etaxonomy.taxeditor.editor.name.e4.TaxonNameEditor;
 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);
                                }
                        }
-                       TaxonNameEditorE4 editor = null;
+                       TaxonNameEditor editor = null;
                        Object activePart = EditorUtil.getActivePart();
                        if (activePart instanceof FactualDataPartE4){
                            MPart selectionProvidingPart =((FactualDataPartE4)activePart).getSelectionProvidingPart();
                            Object obj = selectionProvidingPart.getObject();
-                           if (obj instanceof TaxonNameEditorE4){
-                               editor = (TaxonNameEditorE4) obj;
+                           if (obj instanceof TaxonNameEditor){
+                               editor = (TaxonNameEditor) obj;
                            }
                        }
                        AbstractPostTaxonOperation operation = new MoveDescriptionElementsOperation(Messages.DescriptionElementDropAdapter_MOVE_DESC, EditorUtil.getUndoContext(), target, description, descriptionElements, isCopy, null, sync, false);
index e1af073be80b5b769f260557b1c70d598f104519..0e415699c162dc3006fb1148971aa519fc55587f 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.TaxonNameEditorE4;
+import eu.etaxonomy.taxeditor.editor.name.e4.TaxonNameEditor;
 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 TaxonNameEditorE4){
-                if (firstElement != ((TaxonNameEditorE4)partObject).getTaxon()){
+            if (partObject instanceof TaxonNameEditor){
+                if (firstElement != ((TaxonNameEditor)partObject).getTaxon()){
                     showEmptyPage();
                     return;
                 }
index 7d1fcc70c66b621b45d09094b021f83884a45768..0496d2eae9c5ff5dcae807d50c1c7c52368dd4e1 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.TaxonNameEditorE4;
+import eu.etaxonomy.taxeditor.editor.name.e4.TaxonNameEditor;
 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 TaxonNameEditorE4){
-                    ((TaxonNameEditorE4)factualDataPart.getSelectionProvidingPart().getObject()).getEditorInput().addOperation(operation);
-                    ((TaxonNameEditorE4)factualDataPart.getSelectionProvidingPart().getObject()).setDirty();
-                    ((TaxonNameEditorE4)factualDataPart.getSelectionProvidingPart().getObject()).redraw();
+                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 DerivateView){
                     ((DerivateView)factualDataPart.getSelectionProvidingPart().getObject()).addOperation(operation);
index 9cedc4174d2eea3302ac430a75ebdde233d8750c..f147b208ccf41b77ac06822b55cf6c6c66e7d8c2 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.TaxonNameEditorE4;
+import eu.etaxonomy.taxeditor.editor.name.e4.TaxonNameEditor;
 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 TaxonNameEditorE4){
+           if(AbstractUtility.getActiveEditor() instanceof TaxonNameEditor){
                return true;
            }
            return false;
index 7c0efa28bb77b9ab16b5304aafccaf7921a10aa5..6ba29e4aec41e6782093044834f576d7297e476b 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.TaxonNameEditorE4;
+import eu.etaxonomy.taxeditor.editor.name.e4.TaxonNameEditor;
 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 TaxonNameEditorE4 editor;
+    private TaxonNameEditor 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 TaxonNameEditorE4){
-            editor = (TaxonNameEditorE4) e4WrappedPart;
+        if(e4WrappedPart instanceof TaxonNameEditor){
+            editor = (TaxonNameEditor) 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 TaxonNameEditorE4){
+        if(e4WrappedPart instanceof TaxonNameEditor){
             ISelection selection = factualDataPart.getViewer().getSelection();
             if(selection instanceof IStructuredSelection){
-                boolean selectionProviding = factualDataPart.getSelectionProvidingPart().getObject() instanceof TaxonNameEditorE4;
+                boolean selectionProviding = factualDataPart.getSelectionProvidingPart().getObject() instanceof TaxonNameEditor;
                 Object firstElement = ((IStructuredSelection) selection).getFirstElement();
 
                 canExecute = ((firstElement instanceof FeatureNodeContainer && !(((FeatureNodeContainer)firstElement).getContainerTree().getDescription() instanceof TaxonNameDescription))
index e05b54e1bd02851c49567c1dfa66a30705e032aa..0f11f8ed0bb2df0491ffe3bbff91f840d477de80 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.TaxonNameEditorE4;
+import eu.etaxonomy.taxeditor.editor.name.e4.TaxonNameEditor;
 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 TaxonNameEditorE4 editor;
+    private TaxonNameEditor 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 TaxonNameEditorE4){
-            editor = (TaxonNameEditorE4) e4WrappedPart;
+        if(e4WrappedPart instanceof TaxonNameEditor){
+            editor = (TaxonNameEditor) 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 TaxonNameEditorE4){
+        if(e4WrappedPart instanceof TaxonNameEditor){
             ISelection selection = factualDataPart.getViewer().getSelection();
             if(selection instanceof IStructuredSelection){
-                boolean selectionProviding = factualDataPart.getSelectionProvidingPart().getObject() instanceof TaxonNameEditorE4;
+                boolean selectionProviding = factualDataPart.getSelectionProvidingPart().getObject() instanceof TaxonNameEditor;
                 Object firstElement = ((IStructuredSelection) selection).getFirstElement();
                 canExecute = ((firstElement instanceof FeatureNodeContainer && !(((FeatureNodeContainer)firstElement).getContainerTree().getDescription() instanceof TaxonNameDescription))
                                     || (firstElement instanceof DescriptionElementBase && !(((DescriptionElementBase)firstElement).getInDescription() instanceof TaxonNameDescription)))
index 360d2b61ed8b4bcfe043c9df65cdeb29f0f392ce..5fde9b4b207e8b6f21ac287b6d4d0f5651090d2d 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.TaxonNameEditorE4;
+import eu.etaxonomy.taxeditor.editor.name.e4.TaxonNameEditor;
 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 TaxonNameEditorE4 editor;
+    private TaxonNameEditor 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 TaxonNameEditorE4){
-            editor = (TaxonNameEditorE4) e4WrappedPart;
+        if(e4WrappedPart instanceof TaxonNameEditor){
+            editor = (TaxonNameEditor) e4WrappedPart;
 
         }
 
@@ -177,7 +177,7 @@ public class MoveDescriptionToOtherTaxonHandlerE4 implements IPostOperationEnabl
         FactualDataPartE4 factualDataPart = (FactualDataPartE4) activePart.getObject();
 
         Object e4WrappedPart = WorkbenchUtility.getE4WrappedPart(factualDataPart.getSelectionProvidingPart());
-        if(e4WrappedPart instanceof TaxonNameEditorE4){
+        if(e4WrappedPart instanceof TaxonNameEditor){
             ISelection selection = factualDataPart.getViewer().getSelection();
             if(selection instanceof IStructuredSelection){
                 Object firstElement = ((IStructuredSelection) selection).getFirstElement();
index 58887cc1c4419fb8f839546abceb56067472181c..6c339dfb5893ac674629af6bdaeb68a96b36c748 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.TaxonNameEditorE4;
+import eu.etaxonomy.taxeditor.editor.name.e4.TaxonNameEditor;
 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 TaxonNameEditorE4 editor;
+    private TaxonNameEditor 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 TaxonNameEditorE4){
-            editor = (TaxonNameEditorE4) e4WrappedPart;
+        if(e4WrappedPart instanceof TaxonNameEditor){
+            editor = (TaxonNameEditor) e4WrappedPart;
 
         }
 
@@ -179,7 +179,7 @@ public class MoveDescriptionToOtherTaxonSetNameInSourceHandlerE5 implements IPos
         FactualDataPartE4 factualDataPart = (FactualDataPartE4) activePart.getObject();
 
         Object e4WrappedPart = WorkbenchUtility.getE4WrappedPart(factualDataPart.getSelectionProvidingPart());
-        if(e4WrappedPart instanceof TaxonNameEditorE4){
+        if(e4WrappedPart instanceof TaxonNameEditor){
             ISelection selection = factualDataPart.getViewer().getSelection();
             if(selection instanceof IStructuredSelection){
                 Object firstElement = ((IStructuredSelection) selection).getFirstElement();
index f3875df2b12bce7bb3295d18aea0e8caff94e364..f33427e2e8dad4639647ea4ea70bc1d102ca3343 100644 (file)
@@ -22,7 +22,7 @@ import eu.etaxonomy.cdm.model.description.DescriptionElementBase;
 import eu.etaxonomy.cdm.model.media.Media;
 import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
-import eu.etaxonomy.taxeditor.editor.e4.TaxonEditorInputE4;
+import eu.etaxonomy.taxeditor.editor.e4.TaxonEditorInput;
 import eu.etaxonomy.taxeditor.model.MessagingUtils;
 
 /**
@@ -38,11 +38,11 @@ public class MediaContentProvider implements ITreeContentProvider{
        @Override
     public Object[] getChildren(Object parentElement) {
 
-               if (parentElement instanceof TaxonEditorInputE4 || parentElement instanceof Taxon) {
+               if (parentElement instanceof TaxonEditorInput || parentElement instanceof Taxon) {
 
                        Taxon taxon = null;
-                       if (parentElement instanceof TaxonEditorInputE4){
-                               taxon = ((TaxonEditorInputE4) parentElement).getTaxon();
+                       if (parentElement instanceof TaxonEditorInput){
+                               taxon = ((TaxonEditorInput) parentElement).getTaxon();
                        } else{
                                taxon = HibernateProxyHelper.deproxy(parentElement, Taxon.class);
                        }
index 7592b1764e82495303a1f0d12e609fbb8987d510..185e2b724c6a6033ae2823a7b11ee8a506a9f205 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.TaxonNameEditorE4;
+import eu.etaxonomy.taxeditor.editor.name.e4.TaxonNameEditor;
 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 TaxonNameEditorE4){
-                   if (firstElement != ((TaxonNameEditorE4)partObject).getTaxon()){
+               if (partObject instanceof TaxonNameEditor){
+                   if (firstElement != ((TaxonNameEditor)partObject).getTaxon()){
                        showEmptyPage();
                        return;
                    }
index f3e2793f8c768fed87cdae969ac24a10df356ecf..60c4aa344ddaf1822b24a27eafd447f3211a5317 100644 (file)
@@ -25,8 +25,8 @@ import eu.etaxonomy.cdm.model.description.DescriptionBase;
 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.TaxonEditorInputE4;
-import eu.etaxonomy.taxeditor.editor.name.e4.TaxonNameEditorE4;
+import eu.etaxonomy.taxeditor.editor.e4.TaxonEditorInput;
+import eu.etaxonomy.taxeditor.editor.name.e4.TaxonNameEditor;
 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,11 +46,11 @@ public abstract class AbstractMoveImageHandler {
 
         MediaViewPartE4 mediaView = (MediaViewPartE4) activePart.getObject();
 
-        TaxonNameEditorE4 editor = null;
+        TaxonNameEditor editor = null;
         Object e4WrappedPart = WorkbenchUtility.getE4WrappedPart(mediaView.getSelectionProvidingPart());
-        if (e4WrappedPart instanceof TaxonNameEditorE4) {
-            editor = (TaxonNameEditorE4) e4WrappedPart;
-            TaxonEditorInputE4 input = editor.getEditorInput();
+        if (e4WrappedPart instanceof TaxonNameEditor) {
+            editor = (TaxonNameEditor) e4WrappedPart;
+            TaxonEditorInput input = editor.getEditorInput();
             Taxon taxon =input.getTaxon();
 
             TreeSelection selection = (TreeSelection) mediaView.getViewer().getSelection();
index 938439dba9f0fd30803b1c4575ade344319eacf0..131b0820d5f37cd9e773bddd1dbd95d98d829bbb 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.TaxonNameEditorE4;
+import eu.etaxonomy.taxeditor.editor.name.e4.TaxonNameEditor;
 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);
-                          ((TaxonNameEditorE4)mediaView.getSelectionProvidingPart().getObject()).redraw();
+                          ((TaxonNameEditor)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 TaxonNameEditorE4){
-                        ((TaxonNameEditorE4)mediaView.getSelectionProvidingPart().getObject()).getTaxon().removeDescription((TaxonDescription)description);
-                        ((TaxonNameEditorE4)mediaView.getSelectionProvidingPart().getObject()).getEditorInput().addOperation(deleteTaxonDescriptionOperation);
-                        ((TaxonNameEditorE4)mediaView.getSelectionProvidingPart().getObject()).setDirty();
-                        ((TaxonNameEditorE4)mediaView.getSelectionProvidingPart().getObject()).redraw();
+                    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();
 
                      }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 TaxonNameEditorE4){
-                        ((TaxonNameEditorE4)mediaView.getSelectionProvidingPart().getObject()).getEditorInput().addOperation(deleteTaxonDescriptionOperation);
-                        ((TaxonNameEditorE4)mediaView.getSelectionProvidingPart().getObject()).setDirty();
-                        ((TaxonNameEditorE4)mediaView.getSelectionProvidingPart().getObject()).redraw();
+                    if (mediaView.getSelectionProvidingPart().getObject() instanceof TaxonNameEditor){
+                        ((TaxonNameEditor)mediaView.getSelectionProvidingPart().getObject()).getEditorInput().addOperation(deleteTaxonDescriptionOperation);
+                        ((TaxonNameEditor)mediaView.getSelectionProvidingPart().getObject()).setDirty();
+                        ((TaxonNameEditor)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 TaxonNameEditorE4){
+        if (mediaView.getSelectionProvidingPart().getObject() instanceof TaxonNameEditor){
             if (!config.isOnlyRemoveFromGallery()){
-                ((TaxonNameEditorE4)mediaView.getSelectionProvidingPart().getObject()).getEditorInput().addOperation(operation);
+                ((TaxonNameEditor)mediaView.getSelectionProvidingPart().getObject()).getEditorInput().addOperation(operation);
             }
 
             if (description.isImageGallery()){
@@ -179,8 +179,8 @@ public class DeleteMediaHandler  {
                 }
             }
 
-          ((TaxonNameEditorE4)mediaView.getSelectionProvidingPart().getObject()).setDirty();
-          ((TaxonNameEditorE4)mediaView.getSelectionProvidingPart().getObject()).redraw();
+          ((TaxonNameEditor)mediaView.getSelectionProvidingPart().getObject()).setDirty();
+          ((TaxonNameEditor)mediaView.getSelectionProvidingPart().getObject()).redraw();
         }else{
             AbstractUtility.executeOperation(operation, sync);
         }
index 52c0c4723ae052b43aae014d9879cbbb8bd65369..09b46ab36ab67fa6f3f979677f66510162ba090d 100644 (file)
@@ -36,8 +36,8 @@ import eu.etaxonomy.cdm.model.taxon.TaxonNode;
 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.TaxonEditorInputE4;
-import eu.etaxonomy.taxeditor.editor.name.e4.TaxonNameEditorE4;
+import eu.etaxonomy.taxeditor.editor.e4.TaxonEditorInput;
+import eu.etaxonomy.taxeditor.editor.name.e4.TaxonNameEditor;
 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 TaxonNameEditorE4){
-                TaxonEditorInputE4 input = ((TaxonNameEditorE4) part.getObject()).getEditorInput();
+            if(part.getObject() instanceof TaxonNameEditor){
+                TaxonEditorInput input = ((TaxonNameEditor) 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 TaxonNameEditorE4){
-                TaxonEditorInputE4 input = ((TaxonNameEditorE4) part.getObject()).getEditorInput();
+            if(part.getObject() instanceof TaxonNameEditor){
+                TaxonEditorInput input = ((TaxonNameEditor) part.getObject()).getEditorInput();
                 if(input.getTaxonNode().equals(taxonNode)){
                     return true;
                 }
index e633b849a8bb1404809a9cfacb2bd55b6f0c1551..5f2a6ac381abb47c9096ba8bfd7ca233ef1ff1ad 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.TaxonNameEditorE4;
+import eu.etaxonomy.taxeditor.editor.name.e4.TaxonNameEditor;
 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 TaxonNameEditorE4){
-                       taxonNode = new TaxonNodeDto( ((TaxonNameEditorE4)editor).getEditorInput().getTaxonNode());
+                   if (editor instanceof TaxonNameEditor){
+                       taxonNode = new TaxonNodeDto( ((TaxonNameEditor)editor).getEditorInput().getTaxonNode());
                    }else{
                        if (editor.getTaxon().getTaxonNodes() != null && !editor.getTaxon().getTaxonNodes().isEmpty()){
                            taxonNode = new TaxonNodeDto(editor.getTaxon().getTaxonNodes().iterator().next());
index 79cdd3a73952df500f63961cdb13cf4f9f854022..b6dd618bd4c3043b33ff8a653afa81fc55d86cee 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.TaxonNameEditorE4;\r
+import eu.etaxonomy.taxeditor.editor.name.e4.TaxonNameEditor;\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 TaxonNameEditorE4 ){\r
-                                               Set<TaxonNode> nodes = ((TaxonNameEditorE4)object).getTaxon().getTaxonNodes();\r
+                                       if (object instanceof TaxonNameEditor ){\r
+                                               Set<TaxonNode> nodes = ((TaxonNameEditor)object).getTaxon().getTaxonNodes();\r
                                                for (TaxonNode node: nodes){\r
                                                        if (node.getUuid().equals(newAcceptedTaxonNodeUuid)){\r
-                                                               EditorUtil.updateEditor(node, (TaxonNameEditorE4)object);\r
+                                                               EditorUtil.updateEditor(node, (TaxonNameEditor)object);\r
                                                        }\r
 \r
                                                }\r
index a68d818fea60d7bb387df55767ca01485c871a66..123f819a7a6f33e7187e1703eb522e4db45c7f1a 100644 (file)
@@ -203,6 +203,9 @@ public abstract class AbstractCdmEditorPartE4
             if (part instanceof IBulkEditor){
                ((IBulkEditor)part).setSelection(createSelection(object));
             }
+//            if (part instanceof ITaxonEditor){
+//             ((ITaxonEditor)part).setDetailsChanged();
+//            }
         }
     }