About to add serious annotation functionality - backup first.

[taxeditor.git] / eclipseprojects / eu.etaxonomy.taxeditor / src / eu / etaxonomy / taxeditor / actions / ui / DeleteMisappliedNameCompositeAction.java

diff --git a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/actions/ui/DeleteMisappliedNameCompositeAction.java b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/actions/ui/DeleteMisappliedNameCompositeAction.java
index 47aef2e489693e354322953974f7d5dbb064926a..a416690814b66a3b69f7b28d87cf046a18956c3e 100644 (file)
--- a/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/actions/ui/DeleteMisappliedNameCompositeAction.java
+++ b/eclipseprojects/eu.etaxonomy.taxeditor/src/eu/etaxonomy/taxeditor/actions/ui/DeleteMisappliedNameCompositeAction.java
@@ -27,10 +27,9 @@ import org.eclipse.jface.util.PropertyChangeEvent;
 import eu.etaxonomy.cdm.model.taxon.Taxon;\r
 import eu.etaxonomy.taxeditor.ITaxEditorConstants;\r
 import eu.etaxonomy.taxeditor.TaxEditorPlugin;\r
-import eu.etaxonomy.taxeditor.UiUtil;\r
 import eu.etaxonomy.taxeditor.actions.cdm.DeleteMisappliedNameFromTaxonAction;\r
-import eu.etaxonomy.taxeditor.view.nameviewersupport.NameComposite;\r
-import eu.etaxonomy.taxeditor.view.nameviewersupport.TaxonCompositeFactory;\r
+import eu.etaxonomy.taxeditor.controller.GlobalController;\r
+import eu.etaxonomy.taxeditor.editor.name.NameComposite;\r
 \r
 /**\r
  * @author p.ciardelli\r
@@ -49,7 +48,6 @@ public class DeleteMisappliedNameCompositeAction extends Action {
 \r
        private Taxon taxon;\r
        private NameComposite composite;\r
-       private TaxonCompositeFactory taxonCompositeFactory;\r
        private IUndoableOperation operation;\r
 \r
        private DeleteMisappliedNameCompositeAction() {\r
@@ -57,8 +55,7 @@ public class DeleteMisappliedNameCompositeAction extends Action {
                setImageDescriptor(image);\r
        }\r
 \r
-       public DeleteMisappliedNameCompositeAction(NameComposite composite,\r
-                       TaxonCompositeFactory taxonCompositeFactory) {\r
+       public DeleteMisappliedNameCompositeAction(NameComposite composite,     Taxon taxon) {\r
                this();\r
 \r
                if (composite.getData() instanceof Taxon) {\r
@@ -68,16 +65,15 @@ public class DeleteMisappliedNameCompositeAction extends Action {
                                        "This action requires a composite with a Taxon in its data field.");\r
                }\r
 \r
-               this.taxon = taxonCompositeFactory.getTaxon();\r
+               this.taxon = taxon;\r
                this.composite = composite;\r
-               this.taxonCompositeFactory = taxonCompositeFactory;\r
 \r
                operation = new DeleteSynonymOperation();\r
        }\r
 \r
        public void run() {\r
-               IOperationHistory operationHistory = UiUtil.getOperationHistory();\r
-               IUndoContext undoContext = UiUtil.getWorkbenchUndoContext();\r
+               IOperationHistory operationHistory = GlobalController.getOperationHistory();\r
+               IUndoContext undoContext = GlobalController.getWorkbenchUndoContext();\r
                operation.addContext(undoContext);\r
                try {\r
                        operationHistory.execute(operation, null, null);\r
@@ -99,7 +95,6 @@ public class DeleteMisappliedNameCompositeAction extends Action {
                        // Delete synonym from taxon\r
                        Action action = new DeleteMisappliedNameFromTaxonAction(misappliedName, taxon);\r
                        action.addPropertyChangeListener(new IPropertyChangeListener() {\r
-                               @Override\r
                                public void propertyChange(PropertyChangeEvent event) {\r
                                        if (event.getProperty().equals(\r
                                                        ITaxEditorConstants.MISAPPLIED_NAME)) {\r