ref #8222 Fix potential NPE + cleanup

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/e4/TaxonEditorInputE4.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/e4/TaxonEditorInputE4.java
index cb64399c7b6ce320a7164236a5c3abdd745469f3..81f6435ee4f6c8609d41916ac5d00c36893ab525 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/e4/TaxonEditorInputE4.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/e4/TaxonEditorInputE4.java
@@ -24,6 +24,7 @@ import org.eclipse.core.commands.ExecutionException;
 import org.eclipse.core.commands.operations.IOperationHistory;
 import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.commands.operations.IOperationHistory;
 import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.core.runtime.IStatus;

+import org.eclipse.core.runtime.NullProgressMonitor;

 import org.eclipse.core.runtime.Status;
 import org.eclipse.e4.ui.di.UISynchronize;
 import org.eclipse.ui.ide.undo.WorkspaceUndoUtil;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.e4.ui.di.UISynchronize;
 import org.eclipse.ui.ide.undo.WorkspaceUndoUtil;


@@ -341,14 +342,6 @@ public class TaxonEditorInputE4  extends CdmEntitySessionInput implements IConve
         return initiallySelectedTaxonBase;
     }
 
         return initiallySelectedTaxonBase;
     }
 

-    public Set<AbstractPostOperation> getOperations() {
-        return operations;
-    }
-
-    public void setOperations(Set<AbstractPostOperation> operations) {
-        this.operations = operations;
-    }
-

     public void addOperation(AbstractPostOperation operation) {
         this.operations.add(operation);
     }
     public void addOperation(AbstractPostOperation operation) {
         this.operations.add(operation);
     }


@@ -382,7 +375,7 @@ public class TaxonEditorInputE4  extends CdmEntitySessionInput implements IConve
             String operationlabel = entry.getLabel();
             try {
                 entry.addContext(IOperationHistory.GLOBAL_UNDO_CONTEXT);
             String operationlabel = entry.getLabel();
             try {
                 entry.addContext(IOperationHistory.GLOBAL_UNDO_CONTEXT);

-                status = entry.execute(null, uiInfoAdapter);
+                status = entry.execute(new NullProgressMonitor(), uiInfoAdapter);

             } catch (ExecutionException e) {
 
                 MessagingUtils.operationDialog(AbstractUtility.class, e, TaxeditorStorePlugin.PLUGIN_ID, operationlabel, null);
             } catch (ExecutionException e) {
 
                 MessagingUtils.operationDialog(AbstractUtility.class, e, TaxeditorStorePlugin.PLUGIN_ID, operationlabel, null);