ref #6925 Fix part initialisation for open handlers

diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/e4/handler/OpenBulkEditorHandlerE4.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/e4/handler/OpenBulkEditorHandlerE4.java
index 6dd674246576cf840cbacf3f8f5e0690f82302df..41d4c019f83f353be2fa9f4581818dfc2a9fff11 100644 (file)
--- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/e4/handler/OpenBulkEditorHandlerE4.java
+++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/e4/handler/OpenBulkEditorHandlerE4.java
@@ -33,7 +33,7 @@ public class OpenBulkEditorHandlerE4 {
                BulkEditorInputType inputType = BulkEditorInputType.getById(inputTypeId);
 
                MPart part = partService.createPart(AppModelId.PARTDESCRIPTOR_BULKEDITOR_EDITOR);
-        partService.showPart(part, PartState.ACTIVATE);
+        part = partService.showPart(part, PartState.ACTIVATE);
         BulkEditorE4 bulkEditor = (BulkEditorE4) part.getObject();
         bulkEditor.init(AbstractBulkEditorInput.NewInstance(inputType));
        }

diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/handler/defaultHandler/OpenBulkEditorForIdentifiableEntityE4.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/handler/defaultHandler/OpenBulkEditorForIdentifiableEntityE4.java
index d67d323702f318c06f524ab014ac262022fc63cd..739ef7a6d0edd618f930bd99d9f52e4eaa54c01e 100644 (file)
--- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/handler/defaultHandler/OpenBulkEditorForIdentifiableEntityE4.java
+++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/handler/defaultHandler/OpenBulkEditorForIdentifiableEntityE4.java
@@ -30,7 +30,7 @@ public class OpenBulkEditorForIdentifiableEntityE4 extends DefaultOpenHandlerBas
     @Override
     protected void open(IdentifiableEntity entity, Shell shell, EPartService partService) {
         MPart part = partService.createPart(AppModelId.PARTDESCRIPTOR_BULKEDITOR_EDITOR);
-        partService.showPart(part, PartState.ACTIVATE);
+        part = partService.showPart(part, PartState.ACTIVATE);
         BulkEditorE4 bulkEditor = (BulkEditorE4) part.getObject();
         bulkEditor.init(AbstractBulkEditorInput.NewInstance(entity));
     }

diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/handler/defaultHandler/OpenBulkEditorForTaxonNodeHandler.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/handler/defaultHandler/OpenBulkEditorForTaxonNodeHandler.java
index 325d9739e09ab7bd1228ece746605827c73df36e..ea32da8080fb1a84dea8093daa9d7b0ae30e0147 100644 (file)
--- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/handler/defaultHandler/OpenBulkEditorForTaxonNodeHandler.java
+++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/handler/defaultHandler/OpenBulkEditorForTaxonNodeHandler.java
@@ -25,7 +25,7 @@ public class OpenBulkEditorForTaxonNodeHandler extends DefaultOpenHandlerBaseE4<
     @Override
     protected void open(TaxonNode entity, Shell shell, EPartService partService) {
         MPart part = partService.createPart(AppModelId.PARTDESCRIPTOR_BULKEDITOR_EDITOR);
-        partService.showPart(part, PartState.ACTIVATE);
+        part = partService.showPart(part, PartState.ACTIVATE);
         BulkEditorE4 bulkEditor = (BulkEditorE4) part.getObject();
         bulkEditor.init(AbstractBulkEditorInput.NewInstance(entity.getTaxon()));
     }

diff --git a/eu.etaxonomy.taxeditor.editor/fragment.e4xmi b/eu.etaxonomy.taxeditor.editor/fragment.e4xmi
index ebd5941eed3164c6e5b07a29c0b0660c5746b460..67d09b3952be1c7863d7055fbbd08474a7983d57 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/fragment.e4xmi
+++ b/eu.etaxonomy.taxeditor.editor/fragment.e4xmi
@@ -271,7 +271,7 @@
     <elements xsi:type="commands:Handler" xmi:id="_S27gAJMlEeeR4YRjNqCKeA" elementId="eu.etaxonomy.taxeditor.editor.handler.defaultHandler.DefaultOpenTaxonEditorForTaxonBaseHandler" contributionURI="bundleclass://eu.etaxonomy.taxeditor.editor/eu.etaxonomy.taxeditor.editor.handler.defaultHandler.DefaultOpenTaxonEditorForTaxonBaseHandler" command="_XJT7MJMlEeeR4YRjNqCKeA"/>
     <elements xsi:type="commands:Handler" xmi:id="_EYtGcJMmEeeR4YRjNqCKeA" elementId="eu.etaxonomy.taxeditor.editor.handler.defaultHandler.DefaultOpenTaxonEditorForTaxonNodeHandler" contributionURI="bundleclass://eu.etaxonomy.taxeditor.editor/eu.etaxonomy.taxeditor.editor.handler.defaultHandler.DefaultOpenTaxonEditorForTaxonNodeHandler" command="_9S0o4JMlEeeR4YRjNqCKeA"/>
     <elements xsi:type="commands:Handler" xmi:id="_ihC9kJMnEeeR4YRjNqCKeA" elementId="eu.etaxonomy.taxeditor.editor.view.derivate.handler.OpenDerivativeEditorForSpecimenOrOBservationBase" contributionURI="bundleclass://eu.etaxonomy.taxeditor.editor/eu.etaxonomy.taxeditor.editor.view.derivate.handler.OpenDerivativeEditorForSpecimenOrOBservationBase" command="_j2cfsJMmEeeR4YRjNqCKeA"/>
-    <elements xsi:type="commands:Handler" xmi:id="_9MRA4KNrEeee0INlRJv_6Q" elementId="eu.etaxonomy.taxeditor.editor.handler.OpenChecklistEditorHandler" contributionURI="bundleclass://eu.etaxonomy.taxeditor.editor/eu.etaxonomy.taxeditor.editor.handler.OpenChecklistEditorHandler" command="_Qi76oKNsEeee0INlRJv_6Q"/>
+    <elements xsi:type="commands:Handler" xmi:id="_9MRA4KNrEeee0INlRJv_6Q" elementId="eu.etaxonomy.taxeditor.editor.view.checklist.e4.handler.OpenChecklistEditorHandlerE4" contributionURI="bundleclass://eu.etaxonomy.taxeditor.editor/eu.etaxonomy.taxeditor.editor.view.checklist.e4.handler.OpenChecklistEditorHandlerE4" command="_Qi76oKNsEeee0INlRJv_6Q"/>
   </fragments>
   <fragments xsi:type="fragment:StringModelFragment" xmi:id="_OyvD8KNOEee5fYT78qEx0A" featurename="children" parentElementId="bulkeditor.menus.openmenu" positionInList="last">
     <elements xsi:type="menu:HandledMenuItem" xmi:id="_SZZBkKNOEee5fYT78qEx0A" elementId="eu.etaxonomy.taxeditor.editor.handledmenuitem.specimen_editor" label="%command.label.DERIVATIVE_EDITOR" command="_WPjpoDSnEeek0dKsFNy--Q">

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/EditorUtil.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/EditorUtil.java
index b31f1d60c7cece76c9ad99142e04d0fc7d69514b..440fbcb6bdff9dddc016802d3f57d3de5bfc53dd 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/EditorUtil.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/EditorUtil.java
@@ -130,7 +130,7 @@ public class EditorUtil extends AbstractUtility {
         TaxonEditorInputE4 input = TaxonEditorInputE4.NewInstance(taxonNodeUuid);
         EPartService partService = TaxeditorEditorPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow().getService(EPartService.class);
         MPart part = partService.createPart("eu.etaxonomy.taxeditor.editor.name.e4.TaxonNameEditorE4");
-        partService.showPart(part, PartState.ACTIVATE);
+        part = partService.showPart(part, PartState.ACTIVATE);
         TaxonNameEditorE4 editor = (TaxonNameEditorE4) part.getObject();
         editor.init(input);
        }
@@ -153,7 +153,7 @@ public class EditorUtil extends AbstractUtility {
            TaxonEditorInputE4 input = TaxonEditorInputE4.NewInstanceFromTaxonBase(taxonBaseUuid);
            EPartService partService = TaxeditorEditorPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow().getService(EPartService.class);
            MPart part = partService.createPart("eu.etaxonomy.taxeditor.editor.name.e4.TaxonNameEditorE4");
-           partService.showPart(part, PartState.ACTIVATE);
+           part = partService.showPart(part, PartState.ACTIVATE);
            TaxonNameEditorE4 editor = (TaxonNameEditorE4) part.getObject();
            editor.init(input);
        }
@@ -190,7 +190,7 @@ public class EditorUtil extends AbstractUtility {
                                .NewEmptyInstance(parentNodeUuid);
         EPartService partService = TaxeditorEditorPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow().getService(EPartService.class);
         MPart part = partService.createPart("eu.etaxonomy.taxeditor.editor.name.e4.TaxonNameEditorE4");
-        partService.showPart(part, PartState.ACTIVATE);
+        part = partService.showPart(part, PartState.ACTIVATE);
         TaxonNameEditorE4 editor = (TaxonNameEditorE4) part.getObject();
         editor.init(input);
        }

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/OpenDerivateViewHandler.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/OpenDerivateViewHandler.java
index 355a4b00d6c5854a8bf98e66a1a2ceb38b2e1d35..380bec0088cf0645aab1ebd6f49895c4a9062875 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/OpenDerivateViewHandler.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/OpenDerivateViewHandler.java
@@ -18,7 +18,7 @@ public class OpenDerivateViewHandler extends AbstractHandler {
     public Object execute(ExecutionEvent event) throws ExecutionException {
         EPartService partService = TaxeditorStorePlugin.getDefault().getWorkbench().getActiveWorkbenchWindow().getService(EPartService.class);
         MPart part = partService.createPart(AppModelId.PARTDESCRIPTOR_EU_ETAXONOMY_TAXEDITOR_EDITOR_VIEW_DERIVATE_DERIVATEVIEW);
-        partService.showPart(part, PartState.ACTIVATE);
+        part = partService.showPart(part, PartState.ACTIVATE);
         DerivateView derivateView = (DerivateView) part.getObject();
         derivateView.init(new DerivateViewEditorInput());
         return null;

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/l10n/Messages.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/l10n/Messages.java
index 338eb51c8cbc842e62f359284ae1275f89274b2e..b0f13ef38f8f20b490d58268f75802fd4cfeedf0 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/l10n/Messages.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/l10n/Messages.java
@@ -174,7 +174,6 @@ public class Messages extends NLS {
     public static String OpenChecklistEditorHandler_CHOOSE_AREA;
     public static String OpenChecklistEditorHandler_COULD_NOT_OPEN_MESSAGE;
     public static String OpenChecklistEditorHandler_COULD_NOT_OPEN_TITLE;
-    public static String OpenChecklistEditorHandler_FAILED_TO_OPEN;
     public static String OpenChecklistEditorHandler_GOTO_PREFERENCES;
     public static String OpenChecklistEditorHandler_NO_AREAS;
     public static String OpenDerivateEditorForTaxonHandler_COULD_NOT_OPEN_EDITOR;

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/l10n/messages.properties b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/l10n/messages.properties
index d0a5d67def711e4626e30fa8a819da94051d215b..7874d9f2a9fff29f67fc88471210f32364d1f74f 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/l10n/messages.properties
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/l10n/messages.properties
@@ -63,7 +63,6 @@ DefaultOpenTaxonEditorForTaxonNodeHandler_COULD_NOT_OPEN=Could not open taxon ed
 OpenChecklistEditorHandler_CHOOSE_AREA=Please choose the areas you want to display. 
 OpenChecklistEditorHandler_COULD_NOT_OPEN_MESSAGE=Could not open Distribution Editor.
 OpenChecklistEditorHandler_COULD_NOT_OPEN_TITLE=Could not open Distribution Editor
-OpenChecklistEditorHandler_FAILED_TO_OPEN=Failed to open Editor
 OpenChecklistEditorHandler_GOTO_PREFERENCES=For this go to the preferences, choose the Checklist Editor and choose the areas in the Distribution Selection Wizard.
 OpenChecklistEditorHandler_NO_AREAS=No Areas to display
 OpenDerivateViewHandler_COULD_NOT_OPEN=Specimen editor could not be opened

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/l10n/messages_de.properties b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/l10n/messages_de.properties
index a1a5776041119f2753c5818ccc5f583e0bc76806..95aecdec01ec998f449696d5ad6b754c1ed4997e 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/l10n/messages_de.properties
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/l10n/messages_de.properties
@@ -63,7 +63,6 @@ DefaultOpenTaxonEditorForTaxonNodeHandler_COULD_NOT_OPEN=Taxon-Editor f
 OpenChecklistEditorHandler_CHOOSE_AREA=Bitte wählen Sie das Gebiet aus, das dargestellt werden soll
 OpenChecklistEditorHandler_COULD_NOT_OPEN_MESSAGE=Der Verbreitungs-Editor konnte nicht geöffnet werden
 OpenChecklistEditorHandler_COULD_NOT_OPEN_TITLE=Der Verbreitungs-Editor konnte nicht geöffnet werden
-OpenChecklistEditorHandler_FAILED_TO_OPEN=Der Editor konnte nicht geöffnet werden
 OpenChecklistEditorHandler_GOTO_PREFERENCES=Hierfür gehen Sie zu den Preferences, wählen Sie Checklist Editor und dann die Gebiete in dem Verbreitungs-Wizard.
 OpenChecklistEditorHandler_NO_AREAS=Keine Gebiete, die angezeigt werden können
 OpenDerivateViewHandler_COULD_NOT_OPEN=Specimen-Editor konnte nicht geöffnet werden.

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/checklist/ChecklistEditorInput.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/checklist/ChecklistEditorInput.java
index 69c4f0b03386cc2d7b6f4c6e7556d6ff1d2809ae..8a597bcb7df814359d58840eb27ad5c0ea35f7c1 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/checklist/ChecklistEditorInput.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/checklist/ChecklistEditorInput.java
@@ -27,7 +27,6 @@ import eu.etaxonomy.cdm.model.taxon.Classification;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
 import eu.etaxonomy.cdm.model.taxon.TaxonBase;
 import eu.etaxonomy.cdm.model.taxon.TaxonNode;
-import eu.etaxonomy.cdm.persistence.dto.MergeResult;
 import eu.etaxonomy.taxeditor.editor.CdmEntitySessionInput;
 import eu.etaxonomy.taxeditor.store.CdmStore;
 
@@ -63,9 +62,9 @@ public class ChecklistEditorInput extends CdmEntitySessionInput implements IEdit
         this.taxonNode =CdmStore.getService(ITaxonNodeService.class).load(taxonNode.getUuid(), getTaxonNodePropertyPaths());
         getChildTaxa(taxonNode);
         classification = taxonNode.getClassification();
-        
+
     }
-    
+
 
     /**
      * @param taxonNode2
@@ -93,7 +92,7 @@ public class ChecklistEditorInput extends CdmEntitySessionInput implements IEdit
         initSession();
         this.classification = CdmStore.getCurrentApplicationConfiguration().getClassificationService().load(classification.getUuid());
         getChildTaxa(classification.getRootNode());
-       
+
     }
 
 
@@ -127,13 +126,13 @@ public class ChecklistEditorInput extends CdmEntitySessionInput implements IEdit
     public List<Taxon> getTaxa() {
                return taxa;
        }
-    
+
     /* (non-Javadoc)
      * @see org.eclipse.ui.IEditorInput#getName()
      */
     @Override
     public String getName() {
-        if(taxonNode != null && taxonNode.getTaxon() !=null){
+        if(taxonNode != null && taxonNode.getTaxon()!=null){
             return taxonNode.getTaxon().getName().getTitleCache();
         }else{
             return classification.getTitleCache();
@@ -237,7 +236,7 @@ public class ChecklistEditorInput extends CdmEntitySessionInput implements IEdit
             CdmStore.getService(ITaxonService.class).merge(taxon, true);
         }
 
-    
+
     }
 
     /* (non-Javadoc)
@@ -254,7 +253,7 @@ public class ChecklistEditorInput extends CdmEntitySessionInput implements IEdit
     public ConversationHolder getConversation() {
         return conversation;
     }
-    
+
     private List<String> getTaxonNodePropertyPaths() {
         List<String> taxonNodePropertyPaths = new ArrayList<String>();
         for(String propertyPath : getTaxonBasePropertyPaths()) {
@@ -304,9 +303,9 @@ public class ChecklistEditorInput extends CdmEntitySessionInput implements IEdit
 
        public void setTaxa(List<Taxon> taxonList) {
                this.taxa = taxonList;
-               
+
        }
-    
+
 //    @Override
 //    public void dispose(){
 //     conversation.unbind();

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/checklist/e4/ChecklistEditorE4.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/checklist/e4/ChecklistEditorE4.java
index ce62431d01657c457d2c1e6d0ed3e0fb3d7004bf..bf368eb23d7d20601bbfd82dc04fef935dcebbf5 100755 (executable)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/checklist/e4/ChecklistEditorE4.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/checklist/e4/ChecklistEditorE4.java
@@ -84,7 +84,7 @@ import eu.etaxonomy.taxeditor.preference.Resources;
 import eu.etaxonomy.taxeditor.store.CdmStore;
 
 /**
- * 
+ *
  * @author k.luther
  *
  */
@@ -162,7 +162,7 @@ public class ChecklistEditorE4 implements IPartContentHasFactualData, IConversat
     private String partNameCache;
 
     //FIXME E4 migrate/delete ater full migration
-    
+
     private IWorkbenchSiteProgressService service;
 
     private ITaxonNodeService taxonNodeService;
@@ -179,10 +179,10 @@ public class ChecklistEditorE4 implements IPartContentHasFactualData, IConversat
 
     @Inject
     private MPart thisPart;
-    
+
     @Inject
     private MDirtyable dirty;
-    
+
     @Inject
     private ESelectionService selService;
 
@@ -229,7 +229,7 @@ public class ChecklistEditorE4 implements IPartContentHasFactualData, IConversat
         }
         taxonNodeService = CdmStore.getService(ITaxonNodeService.class);
         viewer = new TableViewer(parent, SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL | SWT.FULL_SELECTION);
-      
+
 //        viewer.addSelectionChangedListener(new ISelectionChangedListener() {
 //               @Override
 //               public void selectionChanged(SelectionChangedEvent event) {
@@ -238,11 +238,11 @@ public class ChecklistEditorE4 implements IPartContentHasFactualData, IConversat
 //                 // do something with it
 //               }
 //
-//                     
-//             }); 
-      
+//
+//             });
+
+
 
-        
         labelProvider = new ChecklistLabelProvider(this.viewer);
 
         terms = labelProvider.getNamedAreas();
@@ -485,7 +485,7 @@ public class ChecklistEditorE4 implements IPartContentHasFactualData, IConversat
             viewer.setInput(checklistEditorInput.getTaxa());
 //            Job checkListJob = new ChecklistJob(LOADING_TAXA, selectedTaxonNodes);
 //            checkListJob.schedule(Job.LONG);
-            
+
         }
         if (taxonNode != null) {
             selectedTaxonNodes = taxonNodeService.loadChildNodesOfTaxonNode(taxonNode, NODE_INIT_STRATEGY, true, null);
@@ -516,8 +516,9 @@ public class ChecklistEditorE4 implements IPartContentHasFactualData, IConversat
     /** {@inheritDoc} */
     @Focus
     public void setFocus() {
-       if(viewer!=null && viewer.getControl()!=null && !viewer.getControl().isDisposed())
-        viewer.getControl().setFocus();
+       if(viewer!=null && viewer.getControl()!=null && !viewer.getControl().isDisposed()) {
+            viewer.getControl().setFocus();
+        }
     }
 
     //FIXME E4 migrate
@@ -677,7 +678,7 @@ public class ChecklistEditorE4 implements IPartContentHasFactualData, IConversat
         //propagate selection
         selectionChangedListener = (event -> selService.setSelection(event));
         viewer.addSelectionChangedListener(selectionChangedListener);
-        
+
 
         loadDataInput();
     }

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/OpenChecklistEditorHandler.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/checklist/e4/handler/OpenChecklistEditorHandlerE4.java
similarity index 77%
rename from eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/OpenChecklistEditorHandler.java
rename to eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/checklist/e4/handler/OpenChecklistEditorHandlerE4.java
index 48c45110ebb31a3a03f41d2cf652854a83321b0e..4afd8136e1bd62ac215b07ec6b10edc42fb1c128 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/OpenChecklistEditorHandler.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/checklist/e4/handler/OpenChecklistEditorHandlerE4.java
@@ -1,4 +1,4 @@
-package eu.etaxonomy.taxeditor.editor.handler;
+package eu.etaxonomy.taxeditor.editor.view.checklist.e4.handler;
 
 import java.util.UUID;
 
@@ -13,22 +13,17 @@ import eu.etaxonomy.cdm.api.service.ITaxonNodeService;
 import eu.etaxonomy.cdm.model.taxon.Classification;
 import eu.etaxonomy.cdm.model.taxon.ITaxonTreeNode;
 import eu.etaxonomy.cdm.model.taxon.TaxonNode;
-
-import eu.etaxonomy.taxeditor.editor.internal.TaxeditorEditorPlugin;
 import eu.etaxonomy.taxeditor.editor.l10n.Messages;
 import eu.etaxonomy.taxeditor.editor.view.checklist.ChecklistEditorInput;
 import eu.etaxonomy.taxeditor.editor.view.checklist.e4.ChecklistEditorE4;
-
 import eu.etaxonomy.taxeditor.handler.defaultHandler.e4.DefaultOpenHandlerBaseE4;
 import eu.etaxonomy.taxeditor.model.MessagingUtils;
 import eu.etaxonomy.taxeditor.preference.IPreferenceKeys;
 import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
 import eu.etaxonomy.taxeditor.store.CdmStore;
 
+public class OpenChecklistEditorHandlerE4 extends DefaultOpenHandlerBaseE4<ITaxonTreeNode> {
 
-public class OpenChecklistEditorHandler extends DefaultOpenHandlerBaseE4<ITaxonTreeNode> {
-
-    private static final String FAILED_TO_OPEN_EDITOR = Messages.OpenChecklistEditorHandler_FAILED_TO_OPEN;
     private static final String COULD_NOT_OPEN_DISTRIBUTION_EDITOR_THE_HIERARCHY_IS_CORRUPTED = Messages.OpenChecklistEditorHandler_COULD_NOT_OPEN_MESSAGE;
     private static final String COULD_NOT_OPEN_DISTRIBUTION_EDITOR = Messages.OpenChecklistEditorHandler_COULD_NOT_OPEN_TITLE;
 
@@ -47,33 +42,31 @@ public class OpenChecklistEditorHandler extends DefaultOpenHandlerBaseE4<ITaxonT
                        if (StringUtils.isBlank(PreferencesUtil.getPreferenceStore().getString(IPreferenceKeys.DISTRIBUTION_AREA_OCCURENCE_STATUS) )){
                                MessagingUtils.informationDialog(Messages.OpenChecklistEditorHandler_NO_AREAS, Messages.OpenChecklistEditorHandler_CHOOSE_AREA
                                                + Messages.OpenChecklistEditorHandler_GOTO_PREFERENCES);
-                               
                                return;
                        }
                        if (entity instanceof Classification) {
                                ChecklistEditorInput input = new ChecklistEditorInput(((Classification) entity));
                                try {
-                                       openChecklistEditor(input);
+                                       openChecklistEditor(input, partService);
                                } catch (NullPointerException npe) {
-                                       MessagingUtils.messageDialog(FAILED_TO_OPEN_EDITOR, OpenChecklistEditorHandler.class,
+                                       MessagingUtils.messageDialog(COULD_NOT_OPEN_DISTRIBUTION_EDITOR, OpenChecklistEditorHandlerE4.class,
                                                        COULD_NOT_OPEN_DISTRIBUTION_EDITOR_THE_HIERARCHY_IS_CORRUPTED, npe);
                                }
                        } else if (entity instanceof TaxonNode) {
                                ChecklistEditorInput input = new ChecklistEditorInput((TaxonNode) entity);
                                try {
-                                       openChecklistEditor(input);
+                                       openChecklistEditor(input, partService);
                                } catch (NullPointerException npe) {
-                                       MessagingUtils.messageDialog(FAILED_TO_OPEN_EDITOR, OpenChecklistEditorHandler.class,
+                                       MessagingUtils.messageDialog(COULD_NOT_OPEN_DISTRIBUTION_EDITOR, OpenChecklistEditorHandlerE4.class,
                                                        COULD_NOT_OPEN_DISTRIBUTION_EDITOR_THE_HIERARCHY_IS_CORRUPTED, npe);
                                }
                        }
                }
        }
 
-       private void openChecklistEditor(ChecklistEditorInput input) {
-               EPartService partService = TaxeditorEditorPlugin.getDefault().getWorkbench().getService(EPartService.class);
+       private void openChecklistEditor(ChecklistEditorInput input, EPartService partService) {
                MPart part = partService.createPart("eu.etaxonomy.taxeditor.editor.view.checklist.e4.ChecklistEditorE4");
-               partService.showPart(part, PartState.ACTIVATE);
+               part = partService.showPart(part, PartState.ACTIVATE);
                ChecklistEditorE4 checklistEditor = (ChecklistEditorE4) part.getObject();
                if (checklistEditor != null){
                        checklistEditor.init(input);
@@ -82,11 +75,11 @@ public class OpenChecklistEditorHandler extends DefaultOpenHandlerBaseE4<ITaxonT
                }
        }
 
-       
-
-       @Override
-       protected boolean canExecute(ITaxonTreeNode entity) {
-               
-               return entity != null;
-       }
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    protected boolean canExecute(ITaxonTreeNode entity) {
+        return entity!=null;
+    }
 }

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 d4a985b708e80afc394c66918ec67303f5848019..e7ad0aa9348b797c560a82175cd656d94ceebb0d 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
@@ -36,9 +36,9 @@ public class OpenDefinedTermEditorHandlerE4 {
         UUID termTypeUuid = (UUID) menuItem.getTransientData().get(commandId+".termTypeUuid");
 
                TermEditorInput termEditorInput = new TermEditorInput(TermType.getByUuid(termTypeUuid));
-               MPart mPart = partService.createPart("eu.etaxonomy.taxeditor.editor.definedTerm");
-               partService.showPart(mPart, PartState.ACTIVATE);
-               DefinedTermEditorE4 termEditor = (DefinedTermEditorE4) mPart.getObject();
+               MPart part = partService.createPart("eu.etaxonomy.taxeditor.editor.definedTerm");
+               part = partService.showPart(part, PartState.ACTIVATE);
+               DefinedTermEditorE4 termEditor = (DefinedTermEditorE4) part.getObject();
                termEditor.init(termEditorInput);
        }
 

diff --git a/eu.etaxonomy.taxeditor.workbench/src/main/java/eu/etaxonomy/taxeditor/workbench/OpenPartHandler.java b/eu.etaxonomy.taxeditor.workbench/src/main/java/eu/etaxonomy/taxeditor/workbench/OpenPartHandler.java
index 26f2e7dadf39ef799ea4106332fd27a91a0e0d2c..e1c826975eae9c6c7e5b556078b80940d43a2634 100644 (file)
--- a/eu.etaxonomy.taxeditor.workbench/src/main/java/eu/etaxonomy/taxeditor/workbench/OpenPartHandler.java
+++ b/eu.etaxonomy.taxeditor.workbench/src/main/java/eu/etaxonomy/taxeditor/workbench/OpenPartHandler.java
@@ -21,7 +21,7 @@ public class OpenPartHandler {
         Map parameterMap = commandParameters.getParameterMap();
         String partId = parameterMap.get(AppModelId.COMMANDPARAMETER_EU_ETAXONOMY_TAXEDITOR_WORKBENCH_COMMANDPARAMETER_PARTNAME).toString();
         MPart part = partService.createPart(partId);
-        partService.showPart(part, PartState.ACTIVATE);
+        part = partService.showPart(part, PartState.ACTIVATE);
     }
 
     @CanExecute