fix #7009 Replace part descriptor IDs in open handler with constants

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/group/authority/e4/handler/EditCdmAuthoritiesHandlerE4.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/group/authority/e4/handler/EditCdmAuthoritiesHandlerE4.java
index 5be0470db588ff97debc5f4edf68393ecd605d34..e81722127acaa541e2c4e9f1aaa6d8fcff7e5ec9 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/group/authority/e4/handler/EditCdmAuthoritiesHandlerE4.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/group/authority/e4/handler/EditCdmAuthoritiesHandlerE4.java
@@ -44,40 +44,8 @@ public class EditCdmAuthoritiesHandlerE4 {
         try {
             EditorUtil.openRightsEditor(CdmAuthorityEditorInput.NewInstance(((Group) selection).getUuid()), modelService, partService, application);
         } catch (Exception e) {
-            // TODO Auto-generated catch block
             e.printStackTrace();
         }
-//        Job job = new Job(OPENING_CDM_AUTHORITIES) {
-//            @Override
-//            protected IStatus run(IProgressMonitor monitor) {
-//                monitor.beginTask(OPENING_CDM_AUTHORITIES, 1);//selection.size());
-//
-//                if (selection instanceof Group) {
-//                    Display.getDefault().asyncExec(new Runnable() {
-//                        @Override
-//                        public void run() {
-//                            try {
-////                                MPart part = partService.createPart("eu.etaxonomy.taxeditor.editor.group.authority.e4.CdmAuthorityEditorE4");
-////                                part = partService.showPart(part, PartState.ACTIVATE);
-////                                CdmAuthorityEditorE4 editor = (CdmAuthorityEditorE4) part.getObject();
-////                                editor.init(CdmAuthorityEditorInput.NewInstance(((Group) selection).getUuid()));
-//
-//                            } catch (Exception e) {
-//                                MessagingUtils.warningDialog(
-//                                        Messages.EditCdmAuthoritiesHandler_COULD_NOT_OPEN_AUTHORITIES,
-//                                        EditorUtil.class, e.getMessage());
-//                            }
-//                        }
-//
-//                    });
-//                    monitor.worked(1);
-//                }
-//                monitor.done();
-//                return Status.OK_STATUS;
-//            }
-//        };
-//        job.setPriority(Job.SHORT);
-//        job.schedule();
     }
 
     @CanExecute

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/key/polytomous/e4/handler/OpenPolytomousGraphEditorHandler.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/key/polytomous/e4/handler/OpenPolytomousGraphEditorHandler.java
index c202fc4d3a519ddb9fcbb328cb83925b7613de53..10956758ec6ba194e220d22f28e1ec11c66f1532 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/key/polytomous/e4/handler/OpenPolytomousGraphEditorHandler.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/key/polytomous/e4/handler/OpenPolytomousGraphEditorHandler.java
@@ -9,6 +9,7 @@ import org.eclipse.e4.ui.services.IServiceConstants;
 import org.eclipse.e4.ui.workbench.modeling.EPartService;
 import org.eclipse.e4.ui.workbench.modeling.EPartService.PartState;
 
+import eu.etaxonomy.taxeditor.editor.AppModelId;
 import eu.etaxonomy.taxeditor.editor.key.polytomous.e4.PolytomousKeyGraphEditorE4;
 import eu.etaxonomy.taxeditor.editor.key.polytomous.e4.PolytomousKeyListEditorE4;
 
@@ -16,7 +17,7 @@ public class OpenPolytomousGraphEditorHandler {
 
        @Execute
        public void execute(@Named(IServiceConstants.ACTIVE_PART)MPart activePart, EPartService partService) {
-               MPart part = partService.createPart("eu.etaxonomy.taxeditor.editor.key.polytomous.e4.PolytomousKeyGraphEditorE4");
+               MPart part = partService.createPart(AppModelId.PARTDESCRIPTOR_EU_ETAXONOMY_TAXEDITOR_EDITOR_KEY_POLYTOMOUS_E4_POLYTOMOUSKEYGRAPHEDITORE4);
                part = partService.showPart(part, PartState.ACTIVATE);
                PolytomousKeyGraphEditorE4 graphEditor = (PolytomousKeyGraphEditorE4) part.getObject();
                PolytomousKeyListEditorE4 listEditor = (PolytomousKeyListEditorE4) activePart.getObject();

diff --git a/eu.etaxonomy.taxeditor.molecular/src/main/java/eu/etaxonomy/taxeditor/molecular/AppModelId.java b/eu.etaxonomy.taxeditor.molecular/src/main/java/eu/etaxonomy/taxeditor/molecular/AppModelId.java
new file mode 100644 (file)
index 0000000..15fc124
--- /dev/null
+++ b/eu.etaxonomy.taxeditor.molecular/src/main/java/eu/etaxonomy/taxeditor/molecular/AppModelId.java
@@ -0,0 +1,54 @@
+package eu.etaxonomy.taxeditor.molecular;
+
+public class AppModelId {
+       public static final String COMMAND_EU_ETAXONOMY_TAXEDITOR_MOLECULAR_ALIGNMENTEDITOR_CREATECONSENSUS = "eu.etaxonomy.taxeditor.molecular.AlignmentEditor.createConsensus";
+       public static final String COMMAND_EU_ETAXONOMY_TAXEDITOR_MOLECULAR_ALIGNMENTEDITOR_CUTPHEROGRAMLEFT = "eu.etaxonomy.taxeditor.molecular.AlignmentEditor.cutPherogramLeft";
+       public static final String COMMAND_EU_ETAXONOMY_TAXEDITOR_MOLECULAR_ALIGNMENTEDITOR_CUTPHEROGRAMRIGHT = "eu.etaxonomy.taxeditor.molecular.AlignmentEditor.cutPherogramRight";
+       public static final String COMMAND_EU_ETAXONOMY_TAXEDITOR_MOLECULAR_ALIGNMENTEDITOR_LOADPHEROGRAM = "eu.etaxonomy.taxeditor.molecular.AlignmentEditor.loadPherogram";
+       public static final String COMMAND_EU_ETAXONOMY_TAXEDITOR_MOLECULAR_ALIGNMENTEDITOR_REVERSECOMPLEMENTROWS = "eu.etaxonomy.taxeditor.molecular.AlignmentEditor.reverseComplementRows";
+       public static final String COMMAND_EU_ETAXONOMY_TAXEDITOR_MOLECULAR_ALIGNMENTEDITOR_TOGGLEINSERTOVERWRITE = "eu.etaxonomy.taxeditor.molecular.AlignmentEditor.toggleInsertOverwrite";
+       public static final String COMMAND_EU_ETAXONOMY_TAXEDITOR_MOLECULAR_ALIGNMENTEDITOR_TOGGLELEFTRIGHTINSERTION = "eu.etaxonomy.taxeditor.molecular.AlignmentEditor.toggleLeftRightInsertion";
+       public static final String COMMAND_EU_ETAXONOMY_TAXEDITOR_MOLECULAR_ALIGNMENTEDITOR_UPDATECONSENSUS = "eu.etaxonomy.taxeditor.molecular.AlignmentEditor.updateConsensus";
+       public static final String COMMAND_EU_ETAXONOMY_TAXEDITOR_MOLECULAR_EDITSEQUENCE = "eu.etaxonomy.taxeditor.molecular.editSequence";
+       public static final String COMMAND_EU_ETAXONOMY_TAXEDITOR_MOLECULAR_EXPORTSEQUENCETOFILE = "eu.etaxonomy.taxeditor.molecular.exportSequenceToFile";
+       public static final String COMMAND_EU_ETAXONOMY_TAXEDITOR_MOLECULAR_PHEROGRAMCOMPONENT_CHANGEQUALITYOUTPUT = "eu.etaxonomy.taxeditor.molecular.pherogramComponent.changeQualityOutput";
+       public static final String COMMAND_EU_ETAXONOMY_TAXEDITOR_MOLECULAR_PHEROGRAMCOMPONENT_TOGGLESHOWBASECALLLINES = "eu.etaxonomy.taxeditor.molecular.pherogramComponent.toggleShowBaseCallLines";
+       public static final String COMMAND_EU_ETAXONOMY_TAXEDITOR_MOLECULAR_PHEROGRAMCOMPONENT_TOGGLESHOWPROBABILITIES = "eu.etaxonomy.taxeditor.molecular.pherogramComponent.toggleShowProbabilities";
+       public static final String COMMAND_EU_ETAXONOMY_TAXEDITOR_MOLECULAR_SHOWPHEROGRAM = "eu.etaxonomy.taxeditor.molecular.showPherogram";
+       public static final String COMMAND_ORG_ECLIPSE_UI_EDIT_COPY = "org.eclipse.ui.edit.copy";
+       public static final String COMMAND_ORG_ECLIPSE_UI_EDIT_CUT = "org.eclipse.ui.edit.cut";
+       public static final String COMMAND_ORG_ECLIPSE_UI_EDIT_PASTE = "org.eclipse.ui.edit.paste";
+       public static final String HANDLEDMENUITEM_EU_ETAXONOMY_TAXEDITOR_MOLECULAR_HANDLEDMENUITEM_COMMANDLABELEDIT_SEQUENCE = "eu.etaxonomy.taxeditor.molecular.handledmenuitem.commandlabeledit_sequence";
+       public static final String HANDLEDMENUITEM_EU_ETAXONOMY_TAXEDITOR_MOLECULAR_HANDLEDMENUITEM_COMMANDLABELEXPORT_SEQUENCE_TO_FILE = "eu.etaxonomy.taxeditor.molecular.handledmenuitem.commandlabelexport_sequence_to_file";
+       public static final String HANDLEDMENUITEM_EU_ETAXONOMY_TAXEDITOR_MOLECULAR_HANDLEDMENUITEM_COMMANDNAMESHOW_PHEROGRAM = "eu.etaxonomy.taxeditor.molecular.handledmenuitem.commandnameshow_pherogram";
+       public static final String HANDLEDMENUITEM_EU_ETAXONOMY_TAXEDITOR_MOLECULAR_HANDLEDMENUITEM_MAINMENU_ALIGNMENTEDITOR_CREATECONSENSUS = "eu.etaxonomy.taxeditor.molecular.handledmenuitem.mainmenu.alignmenteditor.createconsensus";
+       public static final String HANDLEDMENUITEM_EU_ETAXONOMY_TAXEDITOR_MOLECULAR_HANDLEDMENUITEM_MAINMENU_ALIGNMENTEDITOR_CUTLEFT = "eu.etaxonomy.taxeditor.molecular.handledmenuitem.mainmenu.alignmenteditor.cutleft";
+       public static final String HANDLEDMENUITEM_EU_ETAXONOMY_TAXEDITOR_MOLECULAR_HANDLEDMENUITEM_MAINMENU_ALIGNMENTEDITOR_CUTRIGHT = "eu.etaxonomy.taxeditor.molecular.handledmenuitem.mainmenu.alignmenteditor.cutright";
+       public static final String HANDLEDMENUITEM_EU_ETAXONOMY_TAXEDITOR_MOLECULAR_HANDLEDMENUITEM_MAINMENU_ALIGNMENTEDITOR_LOADPHEROGRAM = "eu.etaxonomy.taxeditor.molecular.handledmenuitem.mainmenu.alignmenteditor.loadpherogram";
+       public static final String HANDLEDMENUITEM_EU_ETAXONOMY_TAXEDITOR_MOLECULAR_HANDLEDMENUITEM_MAINMENU_ALIGNMENTEDITOR_REVERSECOMPLEMENT = "eu.etaxonomy.taxeditor.molecular.handledmenuitem.mainmenu.alignmenteditor.reversecomplement";
+       public static final String HANDLEDMENUITEM_EU_ETAXONOMY_TAXEDITOR_MOLECULAR_HANDLEDMENUITEM_MAINMENU_ALIGNMENTEDITOR_UPDATECONSENSUS = "eu.etaxonomy.taxeditor.molecular.handledmenuitem.mainmenu.alignmenteditor.updateconsensus";
+       public static final String HANDLEDMENUITEM_EU_ETAXONOMY_TAXEDITOR_MOLECULAR_HANDLEDMENUITEM_MAINMENU_PHEROGRAMEDITOR_CHANGEQUALITY = "eu.etaxonomy.taxeditor.molecular.handledmenuitem.mainmenu.pherogrameditor.changeQuality";
+       public static final String HANDLEDMENUITEM_EU_ETAXONOMY_TAXEDITOR_MOLECULAR_HANDLEDMENUITEM_MAINMENU_PHEROGRAMEDITOR_TOGGLEBASECALLLINES = "eu.etaxonomy.taxeditor.molecular.handledmenuitem.mainmenu.pherogrameditor.toggleBaseCallLines";
+       public static final String HANDLEDMENUITEM_EU_ETAXONOMY_TAXEDITOR_MOLECULAR_HANDLEDMENUITEM_MAINMENU_PHEROGRAMEDITOR_TOGGLEPROBABILITIES = "eu.etaxonomy.taxeditor.molecular.handledmenuitem.mainmenu.pherogrameditor.toggleProbabilities";
+       public static final String HANDLER_EU_ETAXONOMY_TAXEDITOR_MOLECULAR_EDITOR_E4_HANDLER_ALIGNMENTEDITORCOPYHANDLERE4 = "eu.etaxonomy.taxeditor.molecular.editor.e4.handler.AlignmentEditorCopyHandlerE4";
+       public static final String HANDLER_EU_ETAXONOMY_TAXEDITOR_MOLECULAR_EDITOR_E4_HANDLER_ALIGNMENTEDITORCUTHANDLERE4 = "eu.etaxonomy.taxeditor.molecular.editor.e4.handler.AlignmentEditorCutHandlerE4";
+       public static final String HANDLER_EU_ETAXONOMY_TAXEDITOR_MOLECULAR_EDITOR_E4_HANDLER_ALIGNMENTEDITORPASTEHANDLERE4 = "eu.etaxonomy.taxeditor.molecular.editor.e4.handler.AlignmentEditorPasteHandlerE4";
+       public static final String HANDLER_EU_ETAXONOMY_TAXEDITOR_MOLECULAR_EDITOR_E4_HANDLER_CHANGEPHEROGRAMQUALITYOUTPUTTYPEE4 = "eu.etaxonomy.taxeditor.molecular.editor.e4.handler.ChangePherogramQualityOutputTypeE4";
+       public static final String HANDLER_EU_ETAXONOMY_TAXEDITOR_MOLECULAR_EDITOR_E4_HANDLER_CREATECONSENSUSSEQUENCEHANDLERE4 = "eu.etaxonomy.taxeditor.molecular.editor.e4.handler.CreateConsensusSequenceHandlerE4";
+       public static final String HANDLER_EU_ETAXONOMY_TAXEDITOR_MOLECULAR_EDITOR_E4_HANDLER_CUTPHEROGRAMLEFTHANDLERE4 = "eu.etaxonomy.taxeditor.molecular.editor.e4.handler.CutPherogramLeftHandlerE4";
+       public static final String HANDLER_EU_ETAXONOMY_TAXEDITOR_MOLECULAR_EDITOR_E4_HANDLER_CUTPHEROGRAMRIGHTHANDLERE4 = "eu.etaxonomy.taxeditor.molecular.editor.e4.handler.CutPherogramRightHandlerE4";
+       public static final String HANDLER_EU_ETAXONOMY_TAXEDITOR_MOLECULAR_EDITOR_E4_HANDLER_EDITSEQUENCEHANDLERE4 = "eu.etaxonomy.taxeditor.molecular.editor.e4.handler.EditSequenceHandlerE4";
+       public static final String HANDLER_EU_ETAXONOMY_TAXEDITOR_MOLECULAR_EDITOR_E4_HANDLER_EXPORTSEQUENCETOFILEHANDLERE4 = "eu.etaxonomy.taxeditor.molecular.editor.e4.handler.ExportSequenceToFileHandlerE4";
+       public static final String HANDLER_EU_ETAXONOMY_TAXEDITOR_MOLECULAR_EDITOR_E4_HANDLER_LOADPHEROGRAMHANDLERE4 = "eu.etaxonomy.taxeditor.molecular.editor.e4.handler.LoadPherogramHandlerE4";
+       public static final String HANDLER_EU_ETAXONOMY_TAXEDITOR_MOLECULAR_EDITOR_E4_HANDLER_REVERSECOMPLEMENTHANDLERE4 = "eu.etaxonomy.taxeditor.molecular.editor.e4.handler.ReverseComplementHandlerE4";
+       public static final String HANDLER_EU_ETAXONOMY_TAXEDITOR_MOLECULAR_EDITOR_E4_HANDLER_SHOWPHEROGRAMHANDLERE4 = "eu.etaxonomy.taxeditor.molecular.editor.e4.handler.ShowPherogramHandlerE4";
+       public static final String HANDLER_EU_ETAXONOMY_TAXEDITOR_MOLECULAR_EDITOR_E4_HANDLER_TOGGLEINSERTOVERWRITEHANDLERE4 = "eu.etaxonomy.taxeditor.molecular.editor.e4.handler.ToggleInsertOverwriteHandlerE4";
+       public static final String HANDLER_EU_ETAXONOMY_TAXEDITOR_MOLECULAR_EDITOR_E4_HANDLER_TOGGLELEFTRIGHTINSERTIONHANDLERE4 = "eu.etaxonomy.taxeditor.molecular.editor.e4.handler.ToggleLeftRightInsertionHandlerE4";
+       public static final String HANDLER_EU_ETAXONOMY_TAXEDITOR_MOLECULAR_EDITOR_E4_HANDLER_TOGGLESHOWPHEROGRAMBASECALLLINESHANDLERE4 = "eu.etaxonomy.taxeditor.molecular.editor.e4.handler.ToggleShowPherogramBaseCallLinesHandlerE4";
+       public static final String HANDLER_EU_ETAXONOMY_TAXEDITOR_MOLECULAR_EDITOR_E4_HANDLER_TOGGLESHOWPHEROGRAMPROBABILITIESHANDLERE4 = "eu.etaxonomy.taxeditor.molecular.editor.e4.handler.ToggleShowPherogramProbabilitiesHandlerE4";
+       public static final String HANDLER_EU_ETAXONOMY_TAXEDITOR_MOLECULAR_EDITOR_E4_HANDLER_UPDATECONSENSUSSEQUENCEHANDLERE4 = "eu.etaxonomy.taxeditor.molecular.editor.e4.handler.UpdateConsensusSequenceHandlerE4";
+       public static final String MENU_EU_ETAXONOMY_TAXEDITOR_MOLECULAR_MENU_EDITORALIGNMENT_EDITOR = "eu.etaxonomy.taxeditor.molecular.menu.editoralignment_editor";
+       public static final String MENU_EU_ETAXONOMY_TAXEDITOR_MOLECULAR_MENU_VIEWPHEROGRAM_VIEW = "eu.etaxonomy.taxeditor.molecular.menu.viewpherogram_view";
+       public static final String PARTDESCRIPTOR_EU_ETAXONOMY_TAXEDITOR_MOLECULAR_EDITOR_E4_ALIGNMENTEDITORE4 = "eu.etaxonomy.taxeditor.molecular.editor.e4.AlignmentEditorE4";
+       public static final String PARTDESCRIPTOR_EU_ETAXONOMY_TAXEDITOR_MOLECULAR_EDITOR_E4_PHEROGRAMPARTE4 = "eu.etaxonomy.taxeditor.molecular.editor.e4.PherogramPartE4";
+}
\ No newline at end of file

diff --git a/eu.etaxonomy.taxeditor.molecular/src/main/java/eu/etaxonomy/taxeditor/molecular/editor/e4/handler/EditSequenceHandlerE4.java b/eu.etaxonomy.taxeditor.molecular/src/main/java/eu/etaxonomy/taxeditor/molecular/editor/e4/handler/EditSequenceHandlerE4.java
index cfd2591e0dfebdc6607c73445c34d2833c327dda..e3ca8165a447eb87963fc28323cd532b25f53213 100644 (file)
--- a/eu.etaxonomy.taxeditor.molecular/src/main/java/eu/etaxonomy/taxeditor/molecular/editor/e4/handler/EditSequenceHandlerE4.java
+++ b/eu.etaxonomy.taxeditor.molecular/src/main/java/eu/etaxonomy/taxeditor/molecular/editor/e4/handler/EditSequenceHandlerE4.java
@@ -15,6 +15,7 @@ import org.eclipse.jface.viewers.TreeNode;
 import org.eclipse.ui.PartInitException;
 
 import eu.etaxonomy.cdm.model.molecular.Sequence;
+import eu.etaxonomy.taxeditor.molecular.AppModelId;
 import eu.etaxonomy.taxeditor.molecular.editor.AlignmentEditorInput;
 import eu.etaxonomy.taxeditor.molecular.editor.e4.AlignmentEditorE4;
 import eu.etaxonomy.taxeditor.molecular.l10n.Messages;
@@ -37,7 +38,7 @@ public class EditSequenceHandlerE4 {
         if(treeNodeOfSelection != null && treeNodeOfSelection.getValue() instanceof Sequence){
             AlignmentEditorInput input = new AlignmentEditorInput(((Sequence)treeNodeOfSelection.getValue()).getUuid());  //TODO Should there always be a new instance created here? What if the specified CDM node is already opened in an AlignmentEditor? => Possible create Singleton that keeps instances by sequence objects in a map.
             try {
-                MPart part = partService.createPart("eu.etaxonomy.taxeditor.molecular.editor.e4.AlignmentEditorE4");
+                MPart part = partService.createPart(AppModelId.PARTDESCRIPTOR_EU_ETAXONOMY_TAXEDITOR_MOLECULAR_EDITOR_E4_ALIGNMENTEDITORE4);
                 part = partService.showPart(part, PartState.ACTIVATE);
                 AlignmentEditorE4 alignmentEditor = (AlignmentEditorE4) part.getObject();
                 alignmentEditor.init(input);

diff --git a/eu.etaxonomy.taxeditor.molecular/src/main/java/eu/etaxonomy/taxeditor/molecular/editor/e4/handler/ShowPherogramHandlerE4.java b/eu.etaxonomy.taxeditor.molecular/src/main/java/eu/etaxonomy/taxeditor/molecular/editor/e4/handler/ShowPherogramHandlerE4.java
index c74d91d553ecc29de6e476698c95e054bf7d9cdb..9ce073f7a6d9b4e25295769e6c022f6dcea44fec 100644 (file)
--- a/eu.etaxonomy.taxeditor.molecular/src/main/java/eu/etaxonomy/taxeditor/molecular/editor/e4/handler/ShowPherogramHandlerE4.java
+++ b/eu.etaxonomy.taxeditor.molecular/src/main/java/eu/etaxonomy/taxeditor/molecular/editor/e4/handler/ShowPherogramHandlerE4.java
@@ -51,7 +51,7 @@ public class ShowPherogramHandlerE4 {
                                Messages.ShowPherogramHandler_NO_PHEROGRAM_MESSAGE);
                            }
                            else {
-                               MPart part = partService.createPart("eu.etaxonomy.taxeditor.molecular.editor.e4.PherogramPartE4");
+                               MPart part = partService.createPart(eu.etaxonomy.taxeditor.molecular.AppModelId.PARTDESCRIPTOR_EU_ETAXONOMY_TAXEDITOR_MOLECULAR_EDITOR_E4_PHEROGRAMPARTE4);
                                part = partService.showPart(part, PartState.ACTIVATE);
                                PherogramPartE4 pherogramPart = (PherogramPartE4) part.getObject();
                                pherogramPart.init(new PherogramComponentModel(AlignmentEditor.readPherogram(uri)));

diff --git a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/key/polytomous/e4/handler/RemotingEditPolytomousKeyNodesHandlerE4.java b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/key/polytomous/e4/handler/RemotingEditPolytomousKeyNodesHandlerE4.java
index a48e1708d5dce2e9a222d289dc055a2cf939dd34..d6e27dbfd30d1738b3579297196ec382fbcdac29 100644 (file)
--- a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/key/polytomous/e4/handler/RemotingEditPolytomousKeyNodesHandlerE4.java
+++ b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/key/polytomous/e4/handler/RemotingEditPolytomousKeyNodesHandlerE4.java
@@ -31,6 +31,7 @@ import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.swt.widgets.Display;
 
 import eu.etaxonomy.cdm.model.description.PolytomousKey;
+import eu.etaxonomy.taxeditor.editor.AppModelId;
 import eu.etaxonomy.taxeditor.editor.key.polytomous.PolytomousKeyEditorInput;
 import eu.etaxonomy.taxeditor.editor.key.polytomous.e4.PolytomousKeyListEditorE4;
 import eu.etaxonomy.taxeditor.model.MessagingUtils;
@@ -84,7 +85,7 @@ public class RemotingEditPolytomousKeyNodesHandlerE4 {
                                             }
                                         }
                                         if(part==null){
-                                            part = partService.createPart("eu.etaxonomy.taxeditor.editor.key.polytomous.e4.PolytomousKeyListEditorE4");
+                                            part = partService.createPart(AppModelId.PARTDESCRIPTOR_EU_ETAXONOMY_TAXEDITOR_EDITOR_KEY_POLYTOMOUS_E4_POLYTOMOUSKEYLISTEDITORE4);
                                             MPartStack editorAreaPartStack = WorkbenchUtility.getEditorAreaPartStack(application, modelService);
                                             if(editorAreaPartStack!=null){
                                                 editorAreaPartStack.getChildren().add(part);

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/e4/handler/OpenDefinedTermEditorHandlerE4.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/e4/handler/OpenDefinedTermEditorHandlerE4.java
index ccb9a47b37deada73abf33ea35dcd7b2f75beb2a..2579b827c57fbf0e8544e8d6bf252fd0580d0bee 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/e4/handler/OpenDefinedTermEditorHandlerE4.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/e4/handler/OpenDefinedTermEditorHandlerE4.java
@@ -40,7 +40,7 @@ public class OpenDefinedTermEditorHandlerE4 {
         UUID termTypeUuid = (UUID) menuItem.getTransientData().get(commandId+".termTypeUuid");
 
                TermEditorInput termEditorInput = new TermEditorInput(TermType.getByUuid(termTypeUuid));
-               MPart part = partService.createPart("eu.etaxonomy.taxeditor.editor.definedTerm");
+               MPart part = partService.createPart(eu.etaxonomy.taxeditor.store.AppModelId.PARTDESCRIPTOR_EU_ETAXONOMY_TAXEDITOR_EDITOR_DEFINEDTERM);
                MPartStack editorAreaPartStack = WorkbenchUtility.getEditorAreaPartStack(application, modelService);
                if(editorAreaPartStack!=null){
                    editorAreaPartStack.getChildren().add(part);

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/handler/defaultHandler/OpenReferencingObjectsViewHandler.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/handler/defaultHandler/OpenReferencingObjectsViewHandler.java
index c4980bf45a5eb15700c7adcf1ec960771068688a..7c88b71977bf7c9480e8e52da65fbfceb0a39074 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/handler/defaultHandler/OpenReferencingObjectsViewHandler.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/handler/defaultHandler/OpenReferencingObjectsViewHandler.java
@@ -10,11 +10,13 @@ import org.eclipse.e4.ui.services.IServiceConstants;
 import org.eclipse.e4.ui.workbench.modeling.EPartService;
 import org.eclipse.e4.ui.workbench.modeling.EPartService.PartState;
 
+import eu.etaxonomy.taxeditor.bulkeditor.AppModelId;
+
 public class OpenReferencingObjectsViewHandler {
 
     @Execute
-    public void execute(EPartService partService, @Named(IServiceConstants.ACTIVE_PART)MPart activePart) {
-        MPart part = partService.createPart("eu.etaxonomy.taxeditor.bulkeditor.referencingobjects.e4.ReferencingObjectsViewE4");
+    public void execute(EPartService partService) {
+        MPart part = partService.createPart(AppModelId.PARTDESCRIPTOR_EU_ETAXONOMY_TAXEDITOR_BULKEDITOR_REFERENCINGOBJECTS_E4_REFERENCINGOBJECTSVIEWE4);
         part = partService.showPart(part, PartState.ACTIVATE);
     }
 
@@ -23,7 +25,7 @@ public class OpenReferencingObjectsViewHandler {
             @Named(IServiceConstants.ACTIVE_PART)MPart activePart,
             MHandledMenuItem menuItem) {
         boolean canExecute = false;
-        MPart part = partService.findPart("eu.etaxonomy.taxeditor.bulkeditor.referencingobjects.e4.ReferencingObjectsViewE4");
+        MPart part = partService.findPart(AppModelId.PARTDESCRIPTOR_EU_ETAXONOMY_TAXEDITOR_BULKEDITOR_REFERENCINGOBJECTS_E4_REFERENCINGOBJECTSVIEWE4);
         canExecute = !part.equals(activePart);
         menuItem.setVisible(canExecute);
         return canExecute;

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/dataimport/e4/SpecimenSearchWizardE4.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/dataimport/e4/SpecimenSearchWizardE4.java
index 85869dea34c5664cda7ec2b56a7c36b48f75f268..4a8067101fe353b076e20390bfc0ac0fe5d0c04c 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/dataimport/e4/SpecimenSearchWizardE4.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/dataimport/e4/SpecimenSearchWizardE4.java
@@ -35,6 +35,7 @@ import eu.etaxonomy.cdm.io.specimen.abcd206.in.Abcd206ImportConfigurator;
 import eu.etaxonomy.cdm.io.specimen.abcd206.in.AbcdParseUtility;
 import eu.etaxonomy.cdm.io.specimen.abcd206.in.SpecimenImportReport;
 import eu.etaxonomy.cdm.io.specimen.abcd206.in.UnitAssociationWrapper;
+import eu.etaxonomy.taxeditor.store.AppModelId;
 import eu.etaxonomy.taxeditor.store.CdmStore;
 import eu.etaxonomy.taxeditor.view.dataimport.QueryType;
 
@@ -100,7 +101,7 @@ public class SpecimenSearchWizardE4 extends Wizard {
                     String content = AbcdParseUtility.parseFirstTextContent(nodeList);
                 }
 
-                MPart part = partService.createPart("eu.etaxonomy.taxeditor.view.dataimport.e4.SpecimenImportViewE4");
+                MPart part = partService.createPart(AppModelId.PARTDESCRIPTOR_EU_ETAXONOMY_TAXEDITOR_VIEW_DATAIMPORT_E4_SPECIMENIMPORTVIEWE4);
                 part = partService.showPart(part, PartState.ACTIVATE);
                 SpecimenImportViewE4 specimenImportView = (SpecimenImportViewE4) part.getObject();
                 specimenImportView.setEndpoint(providerSelectionPage.getEndPoint());
@@ -109,7 +110,7 @@ public class SpecimenSearchWizardE4 extends Wizard {
                 dataImportView = specimenImportView;
 
             } else{
-                MPart part = partService.createPart("eu.etaxonomy.taxeditor.view.dataimport.e4.GbifResponseImportViewE4");
+                MPart part = partService.createPart(AppModelId.PARTDESCRIPTOR_EU_ETAXONOMY_TAXEDITOR_VIEW_DATAIMPORT_E4_GBIFRESPONSEIMPORTVIEWE4);
                 part = partService.showPart(part, PartState.ACTIVATE);
                 GbifResponseImportViewE4 gbifImportView = (GbifResponseImportViewE4) part.getObject();
                 gbifImportView.setQuery(query);