- extracted super class from AbstractPostOperation (same name)

 - created sub class AbstractPost Taxon/Describable Operation

diff --git a/.gitattributes b/.gitattributes
index 42150bec00898d0115c0b216e2d76cebb22eeb64..1b676b7ded8d5a882829fca9815fe4d89459e1cb 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -1192,7 +1192,9 @@ eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewT
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewUserWizard.java -text
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/PolytomousKeyWizardPage.java -text
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/operation/AbstractPersistentPostOperation.java -text
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewUserWizard.java -text
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/PolytomousKeyWizardPage.java -text
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/operation/AbstractPersistentPostOperation.java -text

+eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/operation/AbstractPostDescribableOperation.java -text

 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/operation/AbstractPostOperation.java -text
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/operation/AbstractPostOperation.java -text

+eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/operation/AbstractPostTaxonOperation.java -text

 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/operation/IPostOperationEnabled.java -text
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/parser/MatchStrategyConfigurator.java -text
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/parser/ParseHandler.java -text
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/operation/IPostOperationEnabled.java -text
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/parser/MatchStrategyConfigurator.java -text
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/parser/ParseHandler.java -text

diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/derivedunit/operation/AddDerivedUnitFacadeMediaOperation.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/derivedunit/operation/AddDerivedUnitFacadeMediaOperation.java
index 5b5e8e2137b773c8da3819ddd6369c70f2b50fde..e673e513c7c43f65d2087e5c87af2b5a292a396d 100644 (file)
--- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/derivedunit/operation/AddDerivedUnitFacadeMediaOperation.java
+++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/derivedunit/operation/AddDerivedUnitFacadeMediaOperation.java
@@ -22,7 +22,7 @@ import eu.etaxonomy.cdm.model.description.DescriptionBase;
 import eu.etaxonomy.cdm.model.description.SpecimenDescription;
 import eu.etaxonomy.cdm.model.occurrence.DerivedUnit;
 import eu.etaxonomy.taxeditor.bulkeditor.BulkEditorUtil;
 import eu.etaxonomy.cdm.model.description.SpecimenDescription;
 import eu.etaxonomy.cdm.model.occurrence.DerivedUnit;
 import eu.etaxonomy.taxeditor.bulkeditor.BulkEditorUtil;

-import eu.etaxonomy.taxeditor.operation.AbstractPostOperation;
+import eu.etaxonomy.taxeditor.operation.AbstractPostTaxonOperation;

 import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
 
 /**
 import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
 
 /**


@@ -31,7 +31,7 @@ import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
  * @version 1.0
  */
 public class AddDerivedUnitFacadeMediaOperation extends
  * @version 1.0
  */
 public class AddDerivedUnitFacadeMediaOperation extends

-               AbstractPostOperation {
+               AbstractPostTaxonOperation {

 
        public static final int DERIVED_UNIT_MEDIA = 0;
        public static final int FIELD_OBJECT_MEDIA = 1;
 
        public static final int DERIVED_UNIT_MEDIA = 0;
        public static final int FIELD_OBJECT_MEDIA = 1;

diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/operation/SetMarkerFlagOperation.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/operation/SetMarkerFlagOperation.java
index 0c0673a7e98b62285ba56736c2e1a1e02917ee7c..3ed83e2da1e964b152c299d6e79c82018578fb56 100644 (file)
--- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/operation/SetMarkerFlagOperation.java
+++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/operation/SetMarkerFlagOperation.java
@@ -21,7 +21,7 @@ import org.eclipse.core.runtime.IStatus;
 import eu.etaxonomy.cdm.model.common.IAnnotatableEntity;
 import eu.etaxonomy.cdm.model.common.Marker;
 import eu.etaxonomy.cdm.model.common.MarkerType;
 import eu.etaxonomy.cdm.model.common.IAnnotatableEntity;
 import eu.etaxonomy.cdm.model.common.Marker;
 import eu.etaxonomy.cdm.model.common.MarkerType;

-import eu.etaxonomy.taxeditor.operation.AbstractPostOperation;
+import eu.etaxonomy.taxeditor.operation.AbstractPostTaxonOperation;

 import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
 
 /**
 import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
 
 /**


@@ -29,7 +29,7 @@ import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
  * @created Dec 13, 2010
  * @version 1.0
  */
  * @created Dec 13, 2010
  * @version 1.0
  */

-public class SetMarkerFlagOperation extends AbstractPostOperation {
+public class SetMarkerFlagOperation extends AbstractPostTaxonOperation {

 
        private Set<IAnnotatableEntity> annotatableEntities;
        private MarkerType markerType;
 
        private Set<IAnnotatableEntity> annotatableEntities;
        private MarkerType markerType;

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/key/polytomous/operation/CreateNodeOperation.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/key/polytomous/operation/CreateNodeOperation.java
index cc58872f8a5e7977498f5b7846b32b2387ffa6a6..f45ce48b021ba42043a23a5448c5e02835b9c33a 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/key/polytomous/operation/CreateNodeOperation.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/key/polytomous/operation/CreateNodeOperation.java
@@ -10,14 +10,14 @@ import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
 
 import eu.etaxonomy.cdm.model.description.PolytomousKeyNode;
 import org.eclipse.core.runtime.IStatus;
 
 import eu.etaxonomy.cdm.model.description.PolytomousKeyNode;

-import eu.etaxonomy.taxeditor.operation.AbstractPostOperation;
+import eu.etaxonomy.taxeditor.operation.AbstractPostTaxonOperation;

 import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
 
 /**
  * @author n.hoffmann
  *
  */
 import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
 
 /**
  * @author n.hoffmann
  *
  */

-public class CreateNodeOperation extends AbstractPostOperation {
+public class CreateNodeOperation extends AbstractPostTaxonOperation {

 
        PolytomousKeyNode parentNode;
        private PolytomousKeyNode childNode;
 
        PolytomousKeyNode parentNode;
        private PolytomousKeyNode childNode;

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/key/polytomous/operation/DeleteNodeOperation.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/key/polytomous/operation/DeleteNodeOperation.java
index 25bef92d7760429f17f85696e4c2ddcd2e1cf151..a5a0122d1f65b14de1dd562b6286ef98e2cb792d 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/key/polytomous/operation/DeleteNodeOperation.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/key/polytomous/operation/DeleteNodeOperation.java
@@ -13,7 +13,7 @@ import eu.etaxonomy.cdm.api.application.CdmApplicationController;
 import eu.etaxonomy.cdm.api.service.IPolytomousKeyNodeService;
 import eu.etaxonomy.cdm.api.service.ITaxonService;
 import eu.etaxonomy.cdm.model.description.PolytomousKeyNode;
 import eu.etaxonomy.cdm.api.service.IPolytomousKeyNodeService;
 import eu.etaxonomy.cdm.api.service.ITaxonService;
 import eu.etaxonomy.cdm.model.description.PolytomousKeyNode;

-import eu.etaxonomy.taxeditor.operation.AbstractPostOperation;
+import eu.etaxonomy.taxeditor.operation.AbstractPostTaxonOperation;

 import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
 import eu.etaxonomy.taxeditor.store.CdmStore;
 
 import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
 import eu.etaxonomy.taxeditor.store.CdmStore;
 


@@ -21,7 +21,7 @@ import eu.etaxonomy.taxeditor.store.CdmStore;
  * @author n.hoffmann
  * 
  */
  * @author n.hoffmann
  * 
  */

-public class DeleteNodeOperation extends AbstractPostOperation {
+public class DeleteNodeOperation extends AbstractPostTaxonOperation {

 
        private final PolytomousKeyNode parent;
        private final PolytomousKeyNode node;
 
        private final PolytomousKeyNode parent;
        private final PolytomousKeyNode node;

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/key/polytomous/operation/RefreshNodeNumberingOperation.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/key/polytomous/operation/RefreshNodeNumberingOperation.java
index c147600879abd08047b0af64a2885d2f0356a5ec..d3d84db585f6555bb164a613e571dbfa132bb5d0 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/key/polytomous/operation/RefreshNodeNumberingOperation.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/key/polytomous/operation/RefreshNodeNumberingOperation.java
@@ -7,7 +7,7 @@ import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
 
 import eu.etaxonomy.cdm.model.description.PolytomousKeyNode;
 import org.eclipse.core.runtime.IStatus;
 
 import eu.etaxonomy.cdm.model.description.PolytomousKeyNode;

-import eu.etaxonomy.taxeditor.operation.AbstractPostOperation;
+import eu.etaxonomy.taxeditor.operation.AbstractPostTaxonOperation;

 import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
 
 /**
 import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
 
 /**


@@ -17,7 +17,7 @@ import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
  * @author c.mathew
  *
  */
  * @author c.mathew
  *
  */

-public class RefreshNodeNumberingOperation extends AbstractPostOperation {
+public class RefreshNodeNumberingOperation extends AbstractPostTaxonOperation {

 
        PolytomousKeyNode node;
        private PolytomousKeyNode childNode;
 
        PolytomousKeyNode node;
        private PolytomousKeyNode childNode;

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/ChangeConceptRelationshipTypeOperation.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/ChangeConceptRelationshipTypeOperation.java
index 58fe43b73ee8c1b3f68e76dac03545c50c8f1c7d..ef6b021c66ef9d4353e260b4e775a697a98c298a 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/ChangeConceptRelationshipTypeOperation.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/ChangeConceptRelationshipTypeOperation.java
@@ -20,7 +20,7 @@ import org.eclipse.core.runtime.IStatus;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
 import eu.etaxonomy.cdm.model.taxon.TaxonRelationship;
 import eu.etaxonomy.cdm.model.taxon.TaxonRelationshipType;
 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.operation.AbstractPostOperation;
+import eu.etaxonomy.taxeditor.operation.AbstractPostTaxonOperation;

 import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
 import eu.etaxonomy.taxeditor.store.StoreUtil;
 
 import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
 import eu.etaxonomy.taxeditor.store.StoreUtil;
 


@@ -31,7 +31,7 @@ import eu.etaxonomy.taxeditor.store.StoreUtil;
  * @created 03.02.2009
  * @version 1.0
  */
  * @created 03.02.2009
  * @version 1.0
  */

-public class ChangeConceptRelationshipTypeOperation extends AbstractPostOperation {
+public class ChangeConceptRelationshipTypeOperation extends AbstractPostTaxonOperation {

        
        private Taxon relatedTaxon;
        
        
        private Taxon relatedTaxon;
        

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/ChangeConceptToSynonymOperation.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/ChangeConceptToSynonymOperation.java
index 97a5d667be1ed277965a6b2474b1f9bad998a70e..9f5221ddc9c1d79951abcaa95778d88f8a5bcaf3 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/ChangeConceptToSynonymOperation.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/ChangeConceptToSynonymOperation.java
@@ -23,7 +23,7 @@ import eu.etaxonomy.cdm.model.taxon.SynonymRelationship;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
 import eu.etaxonomy.cdm.model.taxon.TaxonRelationship;
 import eu.etaxonomy.cdm.model.taxon.TaxonRelationshipType;
 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.operation.AbstractPostOperation;
+import eu.etaxonomy.taxeditor.operation.AbstractPostTaxonOperation;

 import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
 import eu.etaxonomy.taxeditor.store.StoreUtil;
 
 import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
 import eu.etaxonomy.taxeditor.store.StoreUtil;
 


@@ -36,7 +36,7 @@ import eu.etaxonomy.taxeditor.store.StoreUtil;
  * @version 1.0
  */
 public class ChangeConceptToSynonymOperation extends
  * @version 1.0
  */
 public class ChangeConceptToSynonymOperation extends

-               AbstractPostOperation {
+               AbstractPostTaxonOperation {

        
        private Taxon concept;
 
        
        private Taxon concept;
 

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/ChangeHomotypicGroupOperation.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/ChangeHomotypicGroupOperation.java
index 708dd3e2403e8803dd9265a7536b2ea2cfde85d6..8ee04835c97bc6ac7c04564cc95cc24732b6bfd3 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/ChangeHomotypicGroupOperation.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/ChangeHomotypicGroupOperation.java
@@ -20,7 +20,7 @@ import eu.etaxonomy.cdm.model.name.TaxonNameBase;
 import eu.etaxonomy.cdm.model.taxon.Synonym;
 import eu.etaxonomy.cdm.model.taxon.SynonymRelationshipType;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
 import eu.etaxonomy.cdm.model.taxon.Synonym;
 import eu.etaxonomy.cdm.model.taxon.SynonymRelationshipType;
 import eu.etaxonomy.cdm.model.taxon.Taxon;

-import eu.etaxonomy.taxeditor.operation.AbstractPostOperation;
+import eu.etaxonomy.taxeditor.operation.AbstractPostTaxonOperation;

 import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
 
 /**
 import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
 
 /**


@@ -30,7 +30,7 @@ import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
  * @created 19.01.2009
  * @version 1.0
  */
  * @created 19.01.2009
  * @version 1.0
  */

-public class ChangeHomotypicGroupOperation extends AbstractPostOperation {
+public class ChangeHomotypicGroupOperation extends AbstractPostTaxonOperation {

 
        /**
         * The synonym to be moved.
 
        /**
         * The synonym to be moved.

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/ChangeHomotypicalGroupBasionymOperation.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/ChangeHomotypicalGroupBasionymOperation.java
index cb919655dfda25cc3e1182bf9edb4748d834d744..3e5c3f37896d6932d0384ab88cde5443e0bd0a58 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/ChangeHomotypicalGroupBasionymOperation.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/ChangeHomotypicalGroupBasionymOperation.java
@@ -18,7 +18,7 @@ import org.eclipse.core.runtime.IStatus;
 import eu.etaxonomy.cdm.model.name.TaxonNameBase;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
 import eu.etaxonomy.cdm.model.taxon.TaxonBase;
 import eu.etaxonomy.cdm.model.name.TaxonNameBase;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
 import eu.etaxonomy.cdm.model.taxon.TaxonBase;

-import eu.etaxonomy.taxeditor.operation.AbstractPostOperation;
+import eu.etaxonomy.taxeditor.operation.AbstractPostTaxonOperation;

 import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
 
 /**
 import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
 
 /**


@@ -29,7 +29,7 @@ import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
  * @version 1.0
  */
 public class ChangeHomotypicalGroupBasionymOperation extends
  * @version 1.0
  */
 public class ChangeHomotypicalGroupBasionymOperation extends

-               AbstractPostOperation {
+               AbstractPostTaxonOperation {

        private TaxonBase taxonBase;
 
        /**
        private TaxonBase taxonBase;
 
        /**

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/ChangeSynonymToConceptOperation.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/ChangeSynonymToConceptOperation.java
index 9ec8fa36de8d795e639dcf8b022d2a5d3900578a..95ae23f9df159bf9082dc9afa127f16b1b90331a 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/ChangeSynonymToConceptOperation.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/ChangeSynonymToConceptOperation.java
@@ -19,7 +19,7 @@ import eu.etaxonomy.cdm.api.service.ITaxonService;
 import eu.etaxonomy.cdm.model.taxon.Synonym;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
 import eu.etaxonomy.cdm.model.taxon.TaxonRelationshipType;
 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.operation.AbstractPostOperation;
+import eu.etaxonomy.taxeditor.operation.AbstractPostTaxonOperation;

 import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
 import eu.etaxonomy.taxeditor.store.CdmStore;
 
 import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
 import eu.etaxonomy.taxeditor.store.CdmStore;
 


@@ -31,7 +31,7 @@ import eu.etaxonomy.taxeditor.store.CdmStore;
  * @created 21.01.2009
  * @version 1.0
  */
  * @created 21.01.2009
  * @version 1.0
  */

-public class ChangeSynonymToConceptOperation extends AbstractPostOperation {
+public class ChangeSynonymToConceptOperation extends AbstractPostTaxonOperation {

        private Synonym synonym;
        private TaxonRelationshipType taxonRelationshipType;
        
        private Synonym synonym;
        private TaxonRelationshipType taxonRelationshipType;
        

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/ChangeSynonymToHomotypicalGroupBasionymOperation.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/ChangeSynonymToHomotypicalGroupBasionymOperation.java
index ffa2f4abe8f4d99353824ea8f3580cead615ddff..bcd9033c8456a1fd0314ac93eea9b955ba6b30da 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/ChangeSynonymToHomotypicalGroupBasionymOperation.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/ChangeSynonymToHomotypicalGroupBasionymOperation.java
@@ -17,7 +17,7 @@ import org.eclipse.core.runtime.IStatus;
 
 import eu.etaxonomy.cdm.model.taxon.Synonym;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
 
 import eu.etaxonomy.cdm.model.taxon.Synonym;
 import eu.etaxonomy.cdm.model.taxon.Taxon;

-import eu.etaxonomy.taxeditor.operation.AbstractPostOperation;
+import eu.etaxonomy.taxeditor.operation.AbstractPostTaxonOperation;

 
 /**
  * <p>ChangeSynonymToHomotypicalGroupBasionymOperation class.</p>
 
 /**
  * <p>ChangeSynonymToHomotypicalGroupBasionymOperation class.</p>


@@ -27,7 +27,7 @@ import eu.etaxonomy.taxeditor.operation.AbstractPostOperation;
  * @version 1.0
  * @deprecated there will be an operation to set the basionym only that automatically unsets the former basionym
  */
  * @version 1.0
  * @deprecated there will be an operation to set the basionym only that automatically unsets the former basionym
  */

-public class ChangeSynonymToHomotypicalGroupBasionymOperation extends AbstractPostOperation {
+public class ChangeSynonymToHomotypicalGroupBasionymOperation extends AbstractPostTaxonOperation {

        
        private Synonym synonym;
 
        
        private Synonym synonym;
 

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/ChangeSynonymToMisapplicationOperation.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/ChangeSynonymToMisapplicationOperation.java
index f3b9ff566c629521e26c29fc0b17798ff90c4d92..86490aa856dc67e66c7c17df5952609968ec30d4 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/ChangeSynonymToMisapplicationOperation.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/ChangeSynonymToMisapplicationOperation.java
@@ -23,7 +23,7 @@ import eu.etaxonomy.cdm.model.taxon.Synonym;
 import eu.etaxonomy.cdm.model.taxon.SynonymRelationshipType;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
 import eu.etaxonomy.cdm.model.taxon.TaxonRelationshipType;
 import eu.etaxonomy.cdm.model.taxon.SynonymRelationshipType;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
 import eu.etaxonomy.cdm.model.taxon.TaxonRelationshipType;

-import eu.etaxonomy.taxeditor.operation.AbstractPostOperation;
+import eu.etaxonomy.taxeditor.operation.AbstractPostTaxonOperation;

 import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
 import eu.etaxonomy.taxeditor.store.CdmStore;
 
 import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
 import eu.etaxonomy.taxeditor.store.CdmStore;
 


@@ -35,7 +35,7 @@ import eu.etaxonomy.taxeditor.store.CdmStore;
  * @created 14.01.2009
  * @version 1.0
  */
  * @created 14.01.2009
  * @version 1.0
  */

-public class ChangeSynonymToMisapplicationOperation extends AbstractPostOperation {
+public class ChangeSynonymToMisapplicationOperation extends AbstractPostTaxonOperation {

 
        private Synonym synonym;
        private Taxon misapplication;
 
        private Synonym synonym;
        private Taxon misapplication;

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/CreateNameRelationOperation.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/CreateNameRelationOperation.java
index 836d82a0c43e9ce5bdfca01da47af09b34f367aa..f313dd59a850356ef57c53c7dedb4ea429544e51 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/CreateNameRelationOperation.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/CreateNameRelationOperation.java
@@ -19,7 +19,7 @@ import org.eclipse.core.runtime.IStatus;
 import eu.etaxonomy.cdm.model.name.NameRelationshipType;
 import eu.etaxonomy.cdm.model.name.TaxonNameBase;
 import eu.etaxonomy.cdm.model.taxon.TaxonBase;
 import eu.etaxonomy.cdm.model.name.NameRelationshipType;
 import eu.etaxonomy.cdm.model.name.TaxonNameBase;
 import eu.etaxonomy.cdm.model.taxon.TaxonBase;

-import eu.etaxonomy.taxeditor.operation.AbstractPostOperation;
+import eu.etaxonomy.taxeditor.operation.AbstractPostTaxonOperation;

 import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
 
 /**
 import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
 
 /**


@@ -29,7 +29,7 @@ import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
  * @created Mar 30, 2010
  * @version 1.0
  */
  * @created Mar 30, 2010
  * @version 1.0
  */

-public class CreateNameRelationOperation extends AbstractPostOperation {
+public class CreateNameRelationOperation extends AbstractPostTaxonOperation {

 
        private TaxonBase taxonBase;
        private TaxonNameBase relatedName;
 
        private TaxonBase taxonBase;
        private TaxonNameBase relatedName;

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/CreateSynonymInExistingHomotypicalGroupOperation.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/CreateSynonymInExistingHomotypicalGroupOperation.java
index 31a191851ab4516d27625807b4ff3fd82b4e5b59..83b6f2ce3592add5498dfcb0e31aa80dd062e025 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/CreateSynonymInExistingHomotypicalGroupOperation.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/CreateSynonymInExistingHomotypicalGroupOperation.java
@@ -19,7 +19,7 @@ import eu.etaxonomy.cdm.model.name.HomotypicalGroup;
 import eu.etaxonomy.cdm.model.name.TaxonNameBase;
 import eu.etaxonomy.cdm.model.taxon.SynonymRelationship;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
 import eu.etaxonomy.cdm.model.name.TaxonNameBase;
 import eu.etaxonomy.cdm.model.taxon.SynonymRelationship;
 import eu.etaxonomy.cdm.model.taxon.Taxon;

-import eu.etaxonomy.taxeditor.operation.AbstractPostOperation;
+import eu.etaxonomy.taxeditor.operation.AbstractPostTaxonOperation;

 import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
 
 /**
 import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
 
 /**


@@ -30,7 +30,7 @@ import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
  * @version 1.0
  */
 public class CreateSynonymInExistingHomotypicalGroupOperation extends
  * @version 1.0
  */
 public class CreateSynonymInExistingHomotypicalGroupOperation extends

-               AbstractPostOperation {
+               AbstractPostTaxonOperation {

 
        private HomotypicalGroup group;
        private TaxonNameBase newSynonymName;
 
        private HomotypicalGroup group;
        private TaxonNameBase newSynonymName;

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/CreateSynonymInNewGroupOperation.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/CreateSynonymInNewGroupOperation.java
index 8accbbeac5a2b3e8f3701bf07eb2a5782c753cfb..aaadbb1a8885bcce282e4ef633a086121141ca55 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/CreateSynonymInNewGroupOperation.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/CreateSynonymInNewGroupOperation.java
@@ -19,7 +19,7 @@ import eu.etaxonomy.cdm.model.name.HomotypicalGroup;
 import eu.etaxonomy.cdm.model.name.TaxonNameBase;
 import eu.etaxonomy.cdm.model.taxon.SynonymRelationship;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
 import eu.etaxonomy.cdm.model.name.TaxonNameBase;
 import eu.etaxonomy.cdm.model.taxon.SynonymRelationship;
 import eu.etaxonomy.cdm.model.taxon.Taxon;

-import eu.etaxonomy.taxeditor.operation.AbstractPostOperation;
+import eu.etaxonomy.taxeditor.operation.AbstractPostTaxonOperation;

 import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
 
 /**
 import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
 
 /**


@@ -34,7 +34,7 @@ import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
  * @created 16.01.2009
  * @version 1.0
  */
  * @created 16.01.2009
  * @version 1.0
  */

-public class CreateSynonymInNewGroupOperation extends AbstractPostOperation {
+public class CreateSynonymInNewGroupOperation extends AbstractPostTaxonOperation {

        
        // TODO replace this with TaxonNameBase
        private TaxonNameBase newSynonymName;
        
        // TODO replace this with TaxonNameBase
        private TaxonNameBase newSynonymName;

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/DeleteMisapplicationOperation.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/DeleteMisapplicationOperation.java
index 99aaf79c56b03f6cc75589ea823c931019b7d4a6..1874fa2eb2e5a245782835de547770e14a65d0d1 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/DeleteMisapplicationOperation.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/DeleteMisapplicationOperation.java
@@ -19,7 +19,7 @@ import eu.etaxonomy.cdm.model.reference.Reference;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
 import eu.etaxonomy.cdm.model.taxon.TaxonRelationship;
 import eu.etaxonomy.cdm.model.taxon.TaxonRelationshipType;
 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.operation.AbstractPostOperation;
+import eu.etaxonomy.taxeditor.operation.AbstractPostTaxonOperation;

 import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
 
 /**
 import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
 
 /**


@@ -29,7 +29,7 @@ import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
  * @created 16.01.2009
  * @version 1.0
  */
  * @created 16.01.2009
  * @version 1.0
  */

-public class DeleteMisapplicationOperation extends AbstractPostOperation {
+public class DeleteMisapplicationOperation extends AbstractPostTaxonOperation {

        
        private Taxon misapplication;
 
        
        private Taxon misapplication;
 

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/DeleteNameRelationOperation.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/DeleteNameRelationOperation.java
index c4d4632ffd5f5dc3a7a32438adf83fb5480c0bcf..d471f669eed4dbc9d5c3ac13caa25da756911e3c 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/DeleteNameRelationOperation.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/DeleteNameRelationOperation.java
@@ -18,7 +18,7 @@ import org.eclipse.core.runtime.IStatus;
 
 import eu.etaxonomy.cdm.model.name.NameRelationship;
 import eu.etaxonomy.cdm.model.name.TaxonNameBase;
 
 import eu.etaxonomy.cdm.model.name.NameRelationship;
 import eu.etaxonomy.cdm.model.name.TaxonNameBase;

-import eu.etaxonomy.taxeditor.operation.AbstractPostOperation;
+import eu.etaxonomy.taxeditor.operation.AbstractPostTaxonOperation;

 import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
 
 /**
 import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
 
 /**


@@ -28,7 +28,7 @@ import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
  * @created Mar 30, 2010
  * @version 1.0
  */
  * @created Mar 30, 2010
  * @version 1.0
  */

-public class DeleteNameRelationOperation extends AbstractPostOperation {
+public class DeleteNameRelationOperation extends AbstractPostTaxonOperation {

 
        private NameRelationship nameRelationship;
 
 
        private NameRelationship nameRelationship;
 

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/DeleteSynonymOperation.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/DeleteSynonymOperation.java
index 76e1b34f844e661a9c7cd5cfe02a3557055d6ace..4ba88a6d38580b64ee62ce232517e9b54607ed60 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/DeleteSynonymOperation.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/DeleteSynonymOperation.java
@@ -22,7 +22,7 @@ import eu.etaxonomy.cdm.api.service.ITaxonService;
 import eu.etaxonomy.cdm.model.taxon.Synonym;
 import eu.etaxonomy.cdm.model.taxon.SynonymRelationshipType;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
 import eu.etaxonomy.cdm.model.taxon.Synonym;
 import eu.etaxonomy.cdm.model.taxon.SynonymRelationshipType;
 import eu.etaxonomy.cdm.model.taxon.Taxon;

-import eu.etaxonomy.taxeditor.operation.AbstractPostOperation;
+import eu.etaxonomy.taxeditor.operation.AbstractPostTaxonOperation;

 import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
 import eu.etaxonomy.taxeditor.store.CdmStore;
 
 import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
 import eu.etaxonomy.taxeditor.store.CdmStore;
 


@@ -33,7 +33,7 @@ import eu.etaxonomy.taxeditor.store.CdmStore;
  * @created 14.01.2009
  * @version 1.0
  */
  * @created 14.01.2009
  * @version 1.0
  */

-public class DeleteSynonymOperation extends AbstractPostOperation {
+public class DeleteSynonymOperation extends AbstractPostTaxonOperation {

        
        private Synonym synonym;
        private Set<SynonymRelationshipType> synonymTypes;
        
        private Synonym synonym;
        private Set<SynonymRelationshipType> synonymTypes;

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/DeleteTaxonOperation.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/DeleteTaxonOperation.java
index b1a365900c94e0b47157a72dc218af4ec425625d..dbc7f7a043ea3000afcfc21e7d31ce3178cccbfb 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/DeleteTaxonOperation.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/DeleteTaxonOperation.java
@@ -29,7 +29,7 @@ import eu.etaxonomy.cdm.model.taxon.Synonym;
 import eu.etaxonomy.cdm.model.taxon.Taxon;\r
 import eu.etaxonomy.cdm.model.taxon.TaxonNode;\r
 import eu.etaxonomy.taxeditor.editor.TaxonEditorInput;\r
 import eu.etaxonomy.cdm.model.taxon.Taxon;\r
 import eu.etaxonomy.cdm.model.taxon.TaxonNode;\r
 import eu.etaxonomy.taxeditor.editor.TaxonEditorInput;\r

-import eu.etaxonomy.taxeditor.operation.AbstractPostOperation;\r
+import eu.etaxonomy.taxeditor.operation.AbstractPostTaxonOperation;\r

 import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;\r
 import eu.etaxonomy.taxeditor.store.CdmStore;\r
 \r
 import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;\r
 import eu.etaxonomy.taxeditor.store.CdmStore;\r
 \r

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/RemoveHomotypicalGroupBasionymOperation.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/RemoveHomotypicalGroupBasionymOperation.java
index c23b34f64f9a83f193a65b35342ba279fb1ec615..73ab96aa441c33565fb220e35bf3039bf560434a 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/RemoveHomotypicalGroupBasionymOperation.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/RemoveHomotypicalGroupBasionymOperation.java
@@ -18,7 +18,7 @@ import org.eclipse.core.runtime.IStatus;
 import eu.etaxonomy.cdm.model.name.TaxonNameBase;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
 import eu.etaxonomy.cdm.model.taxon.TaxonBase;
 import eu.etaxonomy.cdm.model.name.TaxonNameBase;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
 import eu.etaxonomy.cdm.model.taxon.TaxonBase;

-import eu.etaxonomy.taxeditor.operation.AbstractPostOperation;
+import eu.etaxonomy.taxeditor.operation.AbstractPostTaxonOperation;

 import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
 
 /**
 import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
 
 /**


@@ -29,7 +29,7 @@ import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
  * @version 1.0
  */
 public class RemoveHomotypicalGroupBasionymOperation extends
  * @version 1.0
  */
 public class RemoveHomotypicalGroupBasionymOperation extends

-               AbstractPostOperation {
+               AbstractPostTaxonOperation {

 
        private TaxonBase taxonBase;
 
 
        private TaxonBase taxonBase;
 

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/SwapSynonymAndAcceptedOperation.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/SwapSynonymAndAcceptedOperation.java
index 0758a17b23e00c66a70d9cf04cba6bcde4d4e9d6..8cbb446d97c122934fe474f7e1faf242ead8364e 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/SwapSynonymAndAcceptedOperation.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/SwapSynonymAndAcceptedOperation.java
@@ -23,7 +23,7 @@ import eu.etaxonomy.cdm.model.taxon.Synonym;
 import eu.etaxonomy.cdm.model.taxon.SynonymRelationshipType;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
 import eu.etaxonomy.taxeditor.editor.EditorUtil;
 import eu.etaxonomy.cdm.model.taxon.SynonymRelationshipType;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
 import eu.etaxonomy.taxeditor.editor.EditorUtil;

-import eu.etaxonomy.taxeditor.operation.AbstractPostOperation;
+import eu.etaxonomy.taxeditor.operation.AbstractPostTaxonOperation;

 import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
 import eu.etaxonomy.taxeditor.store.CdmStore;
 import eu.etaxonomy.taxeditor.store.StoreUtil;
 import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
 import eu.etaxonomy.taxeditor.store.CdmStore;
 import eu.etaxonomy.taxeditor.store.StoreUtil;


@@ -35,7 +35,7 @@ import eu.etaxonomy.taxeditor.store.StoreUtil;
  * @created 23.04.2009
  * @version 1.0
  */
  * @created 23.04.2009
  * @version 1.0
  */

-public class SwapSynonymAndAcceptedOperation extends AbstractPostOperation {
+public class SwapSynonymAndAcceptedOperation extends AbstractPostTaxonOperation {

        
        private Synonym synonym;
        // TODO store the old relationship for undo reasons
        
        private Synonym synonym;
        // TODO store the old relationship for undo reasons

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/concept/operation/CreateConceptRelationOperation.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/concept/operation/CreateConceptRelationOperation.java
index 29079f925e0276991adfbcecf36f166e6f77ced5..a92057d3683698047b2a6219b3599507197b4ff6 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/concept/operation/CreateConceptRelationOperation.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/concept/operation/CreateConceptRelationOperation.java
@@ -18,7 +18,7 @@ import org.eclipse.core.runtime.IStatus;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
 import eu.etaxonomy.cdm.model.taxon.TaxonRelationshipType;
 import eu.etaxonomy.taxeditor.model.TaxonRelationshipTypeInverseContainer;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
 import eu.etaxonomy.cdm.model.taxon.TaxonRelationshipType;
 import eu.etaxonomy.taxeditor.model.TaxonRelationshipTypeInverseContainer;

-import eu.etaxonomy.taxeditor.operation.AbstractPostOperation;
+import eu.etaxonomy.taxeditor.operation.AbstractPostTaxonOperation;

 import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
 
 /**
 import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
 
 /**


@@ -29,7 +29,7 @@ import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
  * @created 26.01.2009
  * @version 1.0
  */
  * @created 26.01.2009
  * @version 1.0
  */

-public class CreateConceptRelationOperation extends AbstractPostOperation {
+public class CreateConceptRelationOperation extends AbstractPostTaxonOperation {

        
        private Taxon concept;
        private TaxonRelationshipTypeInverseContainer taxonRelationshipTypeInverseContainer;
        
        private Taxon concept;
        private TaxonRelationshipTypeInverseContainer taxonRelationshipTypeInverseContainer;

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/concept/operation/DeleteConceptRelationOperation.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/concept/operation/DeleteConceptRelationOperation.java
index 4c5c4240f3d65ef834c9c1d977dac85844194303..4e6a243dd24d0b5200ffafde121e87e5a8a28456 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/concept/operation/DeleteConceptRelationOperation.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/concept/operation/DeleteConceptRelationOperation.java
@@ -19,7 +19,7 @@ import org.eclipse.core.runtime.IStatus;
 
 import eu.etaxonomy.cdm.model.taxon.Taxon;
 import eu.etaxonomy.cdm.model.taxon.TaxonRelationship;
 
 import eu.etaxonomy.cdm.model.taxon.Taxon;
 import eu.etaxonomy.cdm.model.taxon.TaxonRelationship;

-import eu.etaxonomy.taxeditor.operation.AbstractPostOperation;
+import eu.etaxonomy.taxeditor.operation.AbstractPostTaxonOperation;

 import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
 
 /**
 import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
 
 /**


@@ -30,7 +30,7 @@ import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
  * @created 29.01.2009
  * @version 1.0
  */
  * @created 29.01.2009
  * @version 1.0
  */

-public class DeleteConceptRelationOperation extends AbstractPostOperation {
+public class DeleteConceptRelationOperation extends AbstractPostTaxonOperation {

        
        private Set<TaxonRelationship> taxonRelationships;      
 
        
        private Set<TaxonRelationship> taxonRelationships;      
 

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/handler/CreateDescriptionHandler.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/handler/CreateDescriptionHandler.java
index 4191fca4f22ccec45730fd3757bc33ddd532ac1d..411b39b5cb3078cda05634289e6fb1ac93808024 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/handler/CreateDescriptionHandler.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/handler/CreateDescriptionHandler.java
@@ -69,7 +69,7 @@ public class CreateDescriptionHandler extends AbstractHandler {
                // specimen description
                else{
                    //FIXME: no undo and redo supported. Should also use postOperation
                // specimen description
                else{
                    //FIXME: no undo and redo supported. Should also use postOperation

-                   ISelection selection = editor.getSite().getSelectionProvider().getSelection();
+                   ISelection selection = HandlerUtil.getCurrentSelection(event);

                    if(selection instanceof IStructuredSelection){
                        Object selectedElement = ((IStructuredSelection) selection).getFirstElement();
                        if(selectedElement instanceof SpecimenOrObservationBase<?>){
                    if(selection instanceof IStructuredSelection){
                        Object selectedElement = ((IStructuredSelection) selection).getFirstElement();
                        if(selectedElement instanceof SpecimenOrObservationBase<?>){

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/handler/DeleteHandler.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/handler/DeleteHandler.java
index 04fbab44f75cd005592cd878bc4129cc8f91d778..ce6aaef14301ada49c906c784b737f39f4150dc7 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/handler/DeleteHandler.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/handler/DeleteHandler.java
@@ -32,6 +32,7 @@ import eu.etaxonomy.taxeditor.editor.view.descriptive.operation.DeleteDescriptio
 import eu.etaxonomy.taxeditor.editor.view.descriptive.operation.DeleteTaxonDescriptionOperation;
 import eu.etaxonomy.taxeditor.editor.view.media.operation.DeleteMediaOperation;
 import eu.etaxonomy.taxeditor.model.FeatureNodeContainer;
 import eu.etaxonomy.taxeditor.editor.view.descriptive.operation.DeleteTaxonDescriptionOperation;
 import eu.etaxonomy.taxeditor.editor.view.media.operation.DeleteMediaOperation;
 import eu.etaxonomy.taxeditor.model.FeatureNodeContainer;

+import eu.etaxonomy.taxeditor.operation.AbstractPostTaxonOperation;

 import eu.etaxonomy.taxeditor.operation.AbstractPostOperation;
 import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
 
 import eu.etaxonomy.taxeditor.operation.AbstractPostOperation;
 import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
 


@@ -59,7 +60,7 @@ public class DeleteHandler extends AbstractHandler {
                
                        IUndoContext undoContext = EditorUtil.getUndoContext();
                        
                
                        IUndoContext undoContext = EditorUtil.getUndoContext();
                        

-                       List<AbstractPostOperation> operations = new ArrayList<AbstractPostOperation>();
+                       List<AbstractPostTaxonOperation> operations = new ArrayList<AbstractPostTaxonOperation>();

                        
                        for(Object object : selection.toArray()){
                                
                        
                        for(Object object : selection.toArray()){
                                

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/operation/CreateDescriptionElementOperation.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/operation/CreateDescriptionElementOperation.java
index d4906e65f225b1c57e8e97066bfe6808e4495418..76c4d76a9e53728179dc90d007c9c5769e29b9cd 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/operation/CreateDescriptionElementOperation.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/operation/CreateDescriptionElementOperation.java
@@ -26,7 +26,7 @@ import eu.etaxonomy.cdm.model.description.QuantitativeData;
 import eu.etaxonomy.cdm.model.description.TaxonInteraction;
 import eu.etaxonomy.cdm.model.description.TextData;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
 import eu.etaxonomy.cdm.model.description.TaxonInteraction;
 import eu.etaxonomy.cdm.model.description.TextData;
 import eu.etaxonomy.cdm.model.taxon.Taxon;

-import eu.etaxonomy.taxeditor.operation.AbstractPostOperation;
+import eu.etaxonomy.taxeditor.operation.AbstractPostTaxonOperation;

 import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
 
 /**
 import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
 
 /**


@@ -37,7 +37,7 @@ import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
  * @created 05.02.2009
  * @version 1.0
  */
  * @created 05.02.2009
  * @version 1.0
  */

-public class CreateDescriptionElementOperation extends AbstractPostOperation {
+public class CreateDescriptionElementOperation extends AbstractPostTaxonOperation {

 
        /** Constant <code>ID="eu.etaxonomy.taxeditor.editor.descripti"{trunked}</code> */
        public static final String ID = "eu.etaxonomy.taxeditor.editor.description.createDescriptionElement";
 
        /** Constant <code>ID="eu.etaxonomy.taxeditor.editor.descripti"{trunked}</code> */
        public static final String ID = "eu.etaxonomy.taxeditor.editor.description.createDescriptionElement";

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/operation/CreateTaxonDescriptionOperation.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/operation/CreateTaxonDescriptionOperation.java
index 949c648dac6f020233e16260d86c3d1c17fc044d..8065668b95bc2201efef9a5977974d7c2f1a993c 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/operation/CreateTaxonDescriptionOperation.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/operation/CreateTaxonDescriptionOperation.java
@@ -1,8 +1,8 @@
 /**
 * Copyright (C) 2007 EDIT
 /**
 * Copyright (C) 2007 EDIT

-* European Distributed Institute of Taxonomy 
+* European Distributed Institute of Taxonomy

 * http://www.e-taxonomy.eu
 * http://www.e-taxonomy.eu

-* 
+*

 * The contents of this file are subject to the Mozilla Public License Version 1.1
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
 * The contents of this file are subject to the Mozilla Public License Version 1.1
 * See LICENSE.TXT at the top of this package for the full license terms.
 */


@@ -20,7 +20,7 @@ import eu.etaxonomy.cdm.model.description.TaxonDescription;
 import eu.etaxonomy.cdm.model.description.TextData;
 import eu.etaxonomy.cdm.model.media.Media;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
 import eu.etaxonomy.cdm.model.description.TextData;
 import eu.etaxonomy.cdm.model.media.Media;
 import eu.etaxonomy.cdm.model.taxon.Taxon;

-import eu.etaxonomy.taxeditor.operation.AbstractPostOperation;
+import eu.etaxonomy.taxeditor.operation.AbstractPostDescribableOperation;

 import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
 
 /**
 import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
 
 /**


@@ -31,8 +31,8 @@ import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
  * @created 05.02.2009
  * @version 1.0
  */
  * @created 05.02.2009
  * @version 1.0
  */

-public class CreateTaxonDescriptionOperation extends AbstractPostOperation {
-       
+public class CreateTaxonDescriptionOperation extends AbstractPostDescribableOperation{
+

        private TaxonDescription description;
        private boolean isImageGallery;
 
        private TaxonDescription description;
        private boolean isImageGallery;
 


@@ -61,10 +61,10 @@ public class CreateTaxonDescriptionOperation extends AbstractPostOperation {
        public CreateTaxonDescriptionOperation(String label, IUndoContext undoContext,
                        Taxon taxon, IPostOperationEnabled postOperationEnabled, boolean isImageGallery) {
                super(label, undoContext, taxon, postOperationEnabled);
        public CreateTaxonDescriptionOperation(String label, IUndoContext undoContext,
                        Taxon taxon, IPostOperationEnabled postOperationEnabled, boolean isImageGallery) {
                super(label, undoContext, taxon, postOperationEnabled);

-               
+

                this.isImageGallery  = isImageGallery;
        }
                this.isImageGallery  = isImageGallery;
        }

-       
+

        /* (non-Javadoc)
         * @see org.eclipse.core.commands.operations.AbstractOperation#execute(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)
         */
        /* (non-Javadoc)
         * @see org.eclipse.core.commands.operations.AbstractOperation#execute(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)
         */


@@ -72,7 +72,7 @@ public class CreateTaxonDescriptionOperation extends AbstractPostOperation {
        @Override
        public IStatus execute(IProgressMonitor monitor, IAdaptable info)
                        throws ExecutionException {
        @Override
        public IStatus execute(IProgressMonitor monitor, IAdaptable info)
                        throws ExecutionException {

-               
+

                description = TaxonDescription.NewInstance(taxon);
                monitor.worked(20);
 
                description = TaxonDescription.NewInstance(taxon);
                monitor.worked(20);
 


@@ -95,9 +95,9 @@ public class CreateTaxonDescriptionOperation extends AbstractPostOperation {
        @Override
        public IStatus redo(IProgressMonitor monitor, IAdaptable info)
                        throws ExecutionException {
        @Override
        public IStatus redo(IProgressMonitor monitor, IAdaptable info)
                        throws ExecutionException {

-               
-               taxon.addDescription(description);
-               
+
+               describable.addDescription(description);
+

                return postExecute(description);
        }
 
                return postExecute(description);
        }
 


@@ -109,8 +109,8 @@ public class CreateTaxonDescriptionOperation extends AbstractPostOperation {
        public IStatus undo(IProgressMonitor monitor, IAdaptable info)
                        throws ExecutionException {
 
        public IStatus undo(IProgressMonitor monitor, IAdaptable info)
                        throws ExecutionException {
 

-               taxon.removeDescription(description);
-               
+               describable.removeDescription(description);
+

                return postExecute(null);
        }
 }
                return postExecute(null);
        }
 }

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/operation/DeleteDescriptionElementOperation.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/operation/DeleteDescriptionElementOperation.java
index aad1362d5cac90b53bc190b52da28e483a4e2272..195e3d715e9d6064452f9811bdbbc2a9d258e28c 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/operation/DeleteDescriptionElementOperation.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/operation/DeleteDescriptionElementOperation.java
@@ -17,7 +17,7 @@ import org.eclipse.core.runtime.IStatus;
 
 import eu.etaxonomy.cdm.model.description.DescriptionBase;
 import eu.etaxonomy.cdm.model.description.DescriptionElementBase;
 
 import eu.etaxonomy.cdm.model.description.DescriptionBase;
 import eu.etaxonomy.cdm.model.description.DescriptionElementBase;

-import eu.etaxonomy.taxeditor.operation.AbstractPostOperation;
+import eu.etaxonomy.taxeditor.operation.AbstractPostTaxonOperation;

 import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
 import eu.etaxonomy.taxeditor.store.StoreUtil;
 
 import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
 import eu.etaxonomy.taxeditor.store.StoreUtil;
 


@@ -28,7 +28,7 @@ import eu.etaxonomy.taxeditor.store.StoreUtil;
  * @created 05.02.2009
  * @version 1.0
  */
  * @created 05.02.2009
  * @version 1.0
  */

-public class DeleteDescriptionElementOperation extends AbstractPostOperation {
+public class DeleteDescriptionElementOperation extends AbstractPostTaxonOperation {

        
        private DescriptionElementBase element;
        private DescriptionBase description = null;
        
        private DescriptionElementBase element;
        private DescriptionBase description = null;

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/operation/DeleteTaxonDescriptionOperation.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/operation/DeleteTaxonDescriptionOperation.java
index c331f4fd252d8d5df0a48c3b5c1b04b598a230e1..fa8c8762ac494f211f3764ba5e7e2642d8042b7b 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/operation/DeleteTaxonDescriptionOperation.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/operation/DeleteTaxonDescriptionOperation.java
@@ -16,7 +16,7 @@ import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
 
 import eu.etaxonomy.cdm.model.description.TaxonDescription;
 import org.eclipse.core.runtime.IStatus;
 
 import eu.etaxonomy.cdm.model.description.TaxonDescription;

-import eu.etaxonomy.taxeditor.operation.AbstractPostOperation;
+import eu.etaxonomy.taxeditor.operation.AbstractPostTaxonOperation;

 import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
 
 /**
 import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
 
 /**


@@ -27,7 +27,7 @@ import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
  * @created 05.02.2009
  * @version 1.0
  */
  * @created 05.02.2009
  * @version 1.0
  */

-public class DeleteTaxonDescriptionOperation extends AbstractPostOperation {
+public class DeleteTaxonDescriptionOperation extends AbstractPostTaxonOperation {

        
        private TaxonDescription description;
 
        
        private TaxonDescription description;
 

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/operation/MoveDescriptionElementsOperation.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/operation/MoveDescriptionElementsOperation.java
index 51ba2b2919ce804d47b1a7f19c6187643c99df59..5b4b0053ed727bfea012bd536bf289b3378dd06e 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/operation/MoveDescriptionElementsOperation.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/operation/MoveDescriptionElementsOperation.java
@@ -21,7 +21,7 @@ import org.eclipse.core.runtime.IStatus;
 import eu.etaxonomy.cdm.api.service.IDescriptionService;
 import eu.etaxonomy.cdm.model.description.DescriptionBase;
 import eu.etaxonomy.cdm.model.description.DescriptionElementBase;
 import eu.etaxonomy.cdm.api.service.IDescriptionService;
 import eu.etaxonomy.cdm.model.description.DescriptionBase;
 import eu.etaxonomy.cdm.model.description.DescriptionElementBase;

-import eu.etaxonomy.taxeditor.operation.AbstractPostOperation;
+import eu.etaxonomy.taxeditor.operation.AbstractPostTaxonOperation;

 import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
 import eu.etaxonomy.taxeditor.store.CdmStore;
 
 import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
 import eu.etaxonomy.taxeditor.store.CdmStore;
 


@@ -30,7 +30,7 @@ import eu.etaxonomy.taxeditor.store.CdmStore;
  * @created Feb 8, 2011
  * @version 1.0
  */
  * @created Feb 8, 2011
  * @version 1.0
  */

-public class MoveDescriptionElementsOperation extends AbstractPostOperation {
+public class MoveDescriptionElementsOperation extends AbstractPostTaxonOperation {

 
        private Collection<DescriptionElementBase> descriptionElements;
        private DescriptionBase targetDescription;
 
        private Collection<DescriptionElementBase> descriptionElements;
        private DescriptionBase targetDescription;

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/media/operation/AddMediaToImageGalleryOperation.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/media/operation/AddMediaToImageGalleryOperation.java
index 7fa478f016af14846d09ecf63721045fdf7d8037..eb8f66380b6cf03b8e4b0fc53d5b5268b0d77013 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/media/operation/AddMediaToImageGalleryOperation.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/media/operation/AddMediaToImageGalleryOperation.java
@@ -18,7 +18,7 @@ import org.eclipse.core.runtime.IStatus;
 import eu.etaxonomy.cdm.api.utility.ImagesUtility;
 import eu.etaxonomy.cdm.model.description.DescriptionBase;
 import eu.etaxonomy.cdm.model.media.Media;
 import eu.etaxonomy.cdm.api.utility.ImagesUtility;
 import eu.etaxonomy.cdm.model.description.DescriptionBase;
 import eu.etaxonomy.cdm.model.media.Media;

-import eu.etaxonomy.taxeditor.operation.AbstractPostOperation;
+import eu.etaxonomy.taxeditor.operation.AbstractPostTaxonOperation;

 import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
 /**
  * <p>AddMediaToImageGalleryOperation class.</p>
 import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
 /**
  * <p>AddMediaToImageGalleryOperation class.</p>


@@ -28,7 +28,7 @@ import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
  * @created 05.02.2009
  * @version 1.0
  */
  * @created 05.02.2009
  * @version 1.0
  */

-public class AddMediaToImageGalleryOperation extends AbstractPostOperation {
+public class AddMediaToImageGalleryOperation extends AbstractPostTaxonOperation {

        
        private DescriptionBase description;
        private Media media;
        
        private DescriptionBase description;
        private Media media;

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/media/operation/CreateImageOperation.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/media/operation/CreateImageOperation.java
index e9a15814b4602e368040639ed5b732f36c52d936..e505d1389a1b8cd254415e4fdd5172df4187ec3d 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/media/operation/CreateImageOperation.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/media/operation/CreateImageOperation.java
@@ -20,7 +20,7 @@ import eu.etaxonomy.cdm.api.utility.ImagesUtility;
 import eu.etaxonomy.cdm.model.description.DescriptionBase;
 import eu.etaxonomy.cdm.model.media.ImageFile;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
 import eu.etaxonomy.cdm.model.description.DescriptionBase;
 import eu.etaxonomy.cdm.model.media.ImageFile;
 import eu.etaxonomy.cdm.model.taxon.Taxon;

-import eu.etaxonomy.taxeditor.operation.AbstractPostOperation;
+import eu.etaxonomy.taxeditor.operation.AbstractPostTaxonOperation;

 import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
 
 /**
 import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
 
 /**


@@ -30,7 +30,7 @@ import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
  * @created 31.03.2009
  * @version 1.0
  */
  * @created 31.03.2009
  * @version 1.0
  */

-public class CreateImageOperation extends AbstractPostOperation {
+public class CreateImageOperation extends AbstractPostTaxonOperation {

        
        private ImageFile imageFile;
 
        
        private ImageFile imageFile;
 

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/media/operation/DeleteMediaOperation.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/media/operation/DeleteMediaOperation.java
index 6e67c52c70612c9b6a00812e1a4243881edf0665..63172152fec8b8be561b289b4fc5d6cbfa74e0da 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/media/operation/DeleteMediaOperation.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/media/operation/DeleteMediaOperation.java
@@ -19,7 +19,7 @@ import org.eclipse.core.runtime.IStatus;
 import eu.etaxonomy.cdm.api.utility.ImagesUtility;
 import eu.etaxonomy.cdm.model.description.DescriptionBase;
 import eu.etaxonomy.cdm.model.media.Media;
 import eu.etaxonomy.cdm.api.utility.ImagesUtility;
 import eu.etaxonomy.cdm.model.description.DescriptionBase;
 import eu.etaxonomy.cdm.model.media.Media;

-import eu.etaxonomy.taxeditor.operation.AbstractPostOperation;
+import eu.etaxonomy.taxeditor.operation.AbstractPostTaxonOperation;

 import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
 
 /**
 import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
 
 /**


@@ -30,7 +30,7 @@ import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
  * @version 1.0
  */
 @Deprecated // I don't think this is really used anymore
  * @version 1.0
  */
 @Deprecated // I don't think this is really used anymore

-public class DeleteMediaOperation extends AbstractPostOperation {
+public class DeleteMediaOperation extends AbstractPostTaxonOperation {

        
        private Media media;
 
        
        private Media media;
 

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/media/operation/MoveMediaInListOperation.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/media/operation/MoveMediaInListOperation.java
index 8d98f3b5e5a80887e1f7588dfec386d6ebdfb1a7..667598736fd8097a10c6c1feb740d5e59d546541 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/media/operation/MoveMediaInListOperation.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/media/operation/MoveMediaInListOperation.java
@@ -23,7 +23,7 @@ import eu.etaxonomy.cdm.model.description.DescriptionBase;
 import eu.etaxonomy.cdm.model.description.DescriptionElementBase;
 import eu.etaxonomy.cdm.model.media.Media;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
 import eu.etaxonomy.cdm.model.description.DescriptionElementBase;
 import eu.etaxonomy.cdm.model.media.Media;
 import eu.etaxonomy.cdm.model.taxon.Taxon;

-import eu.etaxonomy.taxeditor.operation.AbstractPostOperation;
+import eu.etaxonomy.taxeditor.operation.AbstractPostTaxonOperation;

 import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
 import eu.etaxonomy.taxeditor.store.StoreUtil;
 
 import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
 import eu.etaxonomy.taxeditor.store.StoreUtil;
 


@@ -34,7 +34,7 @@ import eu.etaxonomy.taxeditor.store.StoreUtil;
  * @created 05.02.2009
  * @version 1.0
  */
  * @created 05.02.2009
  * @version 1.0
  */

-public class MoveMediaInListOperation extends AbstractPostOperation {
+public class MoveMediaInListOperation extends AbstractPostTaxonOperation {

        
        /** Constant <code>UP=1</code> */
        public static final int UP = 1;
        
        /** Constant <code>UP=1</code> */
        public static final int UP = 1;

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/media/operation/RemoveImageFromDescriptionElementOperation.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/media/operation/RemoveImageFromDescriptionElementOperation.java
index 40b6d36bf11fd17c814c5eaa29d022cc5d3ce6dc..bef1115e9fc0151d14358211da1c3984192980d5 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/media/operation/RemoveImageFromDescriptionElementOperation.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/media/operation/RemoveImageFromDescriptionElementOperation.java
@@ -19,7 +19,7 @@ import eu.etaxonomy.cdm.api.utility.ImagesUtility;
 import eu.etaxonomy.cdm.model.description.DescriptionElementBase;
 import eu.etaxonomy.cdm.model.media.ImageFile;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
 import eu.etaxonomy.cdm.model.description.DescriptionElementBase;
 import eu.etaxonomy.cdm.model.media.ImageFile;
 import eu.etaxonomy.cdm.model.taxon.Taxon;

-import eu.etaxonomy.taxeditor.operation.AbstractPostOperation;
+import eu.etaxonomy.taxeditor.operation.AbstractPostTaxonOperation;

 import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
 
 /**
 import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
 
 /**


@@ -30,7 +30,7 @@ import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
  * @created 05.02.2009
  * @version 1.0
  */
  * @created 05.02.2009
  * @version 1.0
  */

-public class RemoveImageFromDescriptionElementOperation extends AbstractPostOperation {
+public class RemoveImageFromDescriptionElementOperation extends AbstractPostTaxonOperation {

        
        private DescriptionElementBase element;
        private ImageFile image;
        
        private DescriptionElementBase element;
        private ImageFile image;

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/uses/operation/CreateUseRecordOperation.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/uses/operation/CreateUseRecordOperation.java
index 28b7b201156482214e34eba1ba6e649449e773a8..d33a439b7876c73e908a1636133a2688b9fecc84 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/uses/operation/CreateUseRecordOperation.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/uses/operation/CreateUseRecordOperation.java
@@ -21,7 +21,7 @@ import eu.etaxonomy.cdm.model.description.Feature;
 import eu.etaxonomy.cdm.model.description.TaxonDescription;
 import eu.etaxonomy.cdm.model.description.TextData;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
 import eu.etaxonomy.cdm.model.description.TaxonDescription;
 import eu.etaxonomy.cdm.model.description.TextData;
 import eu.etaxonomy.cdm.model.taxon.Taxon;

-import eu.etaxonomy.taxeditor.operation.AbstractPostOperation;
+import eu.etaxonomy.taxeditor.operation.AbstractPostTaxonOperation;

 import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
 
 
 import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
 
 


@@ -31,7 +31,7 @@ import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
  * @created mar 13, 2012
  * @version 1.0
  */
  * @created mar 13, 2012
  * @version 1.0
  */

-public class CreateUseRecordOperation extends AbstractPostOperation {
+public class CreateUseRecordOperation extends AbstractPostTaxonOperation {

 
        /** Constant <code>ID="eu.etaxonomy.taxeditor.editor.view.use."{trunked}</code> */
        public static final String ID = "eu.etaxonomy.taxeditor.editor.use.createUseRecord";
 
        /** Constant <code>ID="eu.etaxonomy.taxeditor.editor.view.use."{trunked}</code> */
        public static final String ID = "eu.etaxonomy.taxeditor.editor.use.createUseRecord";

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/uses/operation/CreateUseSummaryOperation.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/uses/operation/CreateUseSummaryOperation.java
index 80c85db61ccca467cd2e22f646eca1d2a4550610..b478f00ba0efeb35a254f69298a2251366daa1dc 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/uses/operation/CreateUseSummaryOperation.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/uses/operation/CreateUseSummaryOperation.java
@@ -20,7 +20,7 @@ import eu.etaxonomy.cdm.model.description.Feature;
 import eu.etaxonomy.cdm.model.description.TaxonDescription;\r
 import eu.etaxonomy.cdm.model.description.TextData;\r
 import eu.etaxonomy.cdm.model.taxon.Taxon;\r
 import eu.etaxonomy.cdm.model.description.TaxonDescription;\r
 import eu.etaxonomy.cdm.model.description.TextData;\r
 import eu.etaxonomy.cdm.model.taxon.Taxon;\r

-import eu.etaxonomy.taxeditor.operation.AbstractPostOperation;\r
+import eu.etaxonomy.taxeditor.operation.AbstractPostTaxonOperation;\r

 import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;\r
 \r
 \r
 import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;\r
 \r
 \r


@@ -30,7 +30,7 @@ import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
  * @created mar 13, 2012\r
  * @version 1.0\r
  */\r
  * @created mar 13, 2012\r
  * @version 1.0\r
  */\r

-public class CreateUseSummaryOperation extends AbstractPostOperation {\r
+public class CreateUseSummaryOperation extends AbstractPostTaxonOperation {\r

 \r
        public static final String ID = "eu.etaxonomy.taxeditor.editor.use.createUseRecord";\r
 \r
 \r
        public static final String ID = "eu.etaxonomy.taxeditor.editor.use.createUseRecord";\r
 \r

diff --git a/eu.etaxonomy.taxeditor.editor/src/test/java/eu/etaxonomy/taxeditor/editor/name/operation/ChangeConceptToSynonymOperationTest.java b/eu.etaxonomy.taxeditor.editor/src/test/java/eu/etaxonomy/taxeditor/editor/name/operation/ChangeConceptToSynonymOperationTest.java
index 13b8f075196c4a6ab8e3ad718178abcd2b793c42..34e62b6a9a0e74beea0ab4764c73bd2765c3ddd0 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/test/java/eu/etaxonomy/taxeditor/editor/name/operation/ChangeConceptToSynonymOperationTest.java
+++ b/eu.etaxonomy.taxeditor.editor/src/test/java/eu/etaxonomy/taxeditor/editor/name/operation/ChangeConceptToSynonymOperationTest.java
@@ -102,7 +102,7 @@ public class ChangeConceptToSynonymOperationTest extends AbstractTaxeditorOperat
        }
 
        /**
        }
 
        /**

-        * Test method for {@link eu.etaxonomy.taxeditor.operation.AbstractPostOperation#postExecute(ICdmBase)}.
+        * Test method for {@link eu.etaxonomy.taxeditor.operation.AbstractPostTaxonOperation#postExecute(ICdmBase)}.

         */
        @Test
        public void testPostExecute() {
         */
        @Test
        public void testPostExecute() {

diff --git a/eu.etaxonomy.taxeditor.editor/src/test/java/eu/etaxonomy/taxeditor/editor/name/operation/ChangeHomotypicGroupOperationTest.java b/eu.etaxonomy.taxeditor.editor/src/test/java/eu/etaxonomy/taxeditor/editor/name/operation/ChangeHomotypicGroupOperationTest.java
index 06511cd508cfebcd1c3492fb019a9b9757ef97ca..60ea9941e06ac82cfa7d9f0d86cacc00a2ce91f0 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/test/java/eu/etaxonomy/taxeditor/editor/name/operation/ChangeHomotypicGroupOperationTest.java
+++ b/eu.etaxonomy.taxeditor.editor/src/test/java/eu/etaxonomy/taxeditor/editor/name/operation/ChangeHomotypicGroupOperationTest.java
@@ -101,7 +101,7 @@ public class ChangeHomotypicGroupOperationTest extends AbstractTaxeditorOperatio
        }
 
        /**
        }
 
        /**

-        * Test method for {@link eu.etaxonomy.taxeditor.operation.AbstractPostOperation#postExecute(ICdmBase)}.
+        * Test method for {@link eu.etaxonomy.taxeditor.operation.AbstractPostTaxonOperation#postExecute(ICdmBase)}.

         */
        @Test
        public void testPostExecute() {
         */
        @Test
        public void testPostExecute() {

diff --git a/eu.etaxonomy.taxeditor.editor/src/test/java/eu/etaxonomy/taxeditor/editor/name/operation/ChangeHomotypicalGroupBasionymOperationTest.java b/eu.etaxonomy.taxeditor.editor/src/test/java/eu/etaxonomy/taxeditor/editor/name/operation/ChangeHomotypicalGroupBasionymOperationTest.java
index 5a799ca7c9341173df598125154f9403d2fe6f72..8868c27dbba870a2f9846b613c4f5217fa34fb6a 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/test/java/eu/etaxonomy/taxeditor/editor/name/operation/ChangeHomotypicalGroupBasionymOperationTest.java
+++ b/eu.etaxonomy.taxeditor.editor/src/test/java/eu/etaxonomy/taxeditor/editor/name/operation/ChangeHomotypicalGroupBasionymOperationTest.java
@@ -84,7 +84,7 @@ public class ChangeHomotypicalGroupBasionymOperationTest extends AbstractTaxedit
        }
 
        /**
        }
 
        /**

-        * Test method for {@link eu.etaxonomy.taxeditor.operation.AbstractPostOperation#postExecute(ICdmBase)}.
+        * Test method for {@link eu.etaxonomy.taxeditor.operation.AbstractPostTaxonOperation#postExecute(ICdmBase)}.

         */
        @Test
        public void testPostExecute() {
         */
        @Test
        public void testPostExecute() {

diff --git a/eu.etaxonomy.taxeditor.editor/src/test/java/eu/etaxonomy/taxeditor/editor/name/operation/ChangeSynonymToConceptOperationTest.java b/eu.etaxonomy.taxeditor.editor/src/test/java/eu/etaxonomy/taxeditor/editor/name/operation/ChangeSynonymToConceptOperationTest.java
index 62ca21fe9c64aa9146b8a115bf9b7b4974e4003b..096c61ad4f7eb8f1669547d738f601acbe0f4155 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/test/java/eu/etaxonomy/taxeditor/editor/name/operation/ChangeSynonymToConceptOperationTest.java
+++ b/eu.etaxonomy.taxeditor.editor/src/test/java/eu/etaxonomy/taxeditor/editor/name/operation/ChangeSynonymToConceptOperationTest.java
@@ -98,7 +98,7 @@ public class ChangeSynonymToConceptOperationTest extends AbstractTaxeditorOperat
        }
 
        /**
        }
 
        /**

-        * Test method for {@link eu.etaxonomy.taxeditor.operation.AbstractPostOperation#postExecute(ICdmBase)}.
+        * Test method for {@link eu.etaxonomy.taxeditor.operation.AbstractPostTaxonOperation#postExecute(ICdmBase)}.

         */
        @Test
        public void testPostExecute() {
         */
        @Test
        public void testPostExecute() {

diff --git a/eu.etaxonomy.taxeditor.editor/src/test/java/eu/etaxonomy/taxeditor/editor/name/operation/ChangeSynonymToMisapplicationOperationTest.java b/eu.etaxonomy.taxeditor.editor/src/test/java/eu/etaxonomy/taxeditor/editor/name/operation/ChangeSynonymToMisapplicationOperationTest.java
index b5ea54a75bd81be4162347d60f40928a1d60c956..95739883f387720408a705bc3dc5c151302e3091 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/test/java/eu/etaxonomy/taxeditor/editor/name/operation/ChangeSynonymToMisapplicationOperationTest.java
+++ b/eu.etaxonomy.taxeditor.editor/src/test/java/eu/etaxonomy/taxeditor/editor/name/operation/ChangeSynonymToMisapplicationOperationTest.java
@@ -96,7 +96,7 @@ public class ChangeSynonymToMisapplicationOperationTest extends AbstractTaxedito
        }
 
        /**
        }
 
        /**

-        * Test method for {@link eu.etaxonomy.taxeditor.operation.AbstractPostOperation#postExecute(ICdmBase)}.
+        * Test method for {@link eu.etaxonomy.taxeditor.operation.AbstractPostTaxonOperation#postExecute(ICdmBase)}.

         */
        @Test
        public void testPostExecute() {
         */
        @Test
        public void testPostExecute() {

diff --git a/eu.etaxonomy.taxeditor.editor/src/test/java/eu/etaxonomy/taxeditor/editor/name/operation/CreateConceptRelationOperationTest.java b/eu.etaxonomy.taxeditor.editor/src/test/java/eu/etaxonomy/taxeditor/editor/name/operation/CreateConceptRelationOperationTest.java
index 5a6d9b455f40d58ddb3d707eb5409a8a1d88e8cb..044cb26d6279c12add9202390f340dadaaa63756 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/test/java/eu/etaxonomy/taxeditor/editor/name/operation/CreateConceptRelationOperationTest.java
+++ b/eu.etaxonomy.taxeditor.editor/src/test/java/eu/etaxonomy/taxeditor/editor/name/operation/CreateConceptRelationOperationTest.java
@@ -85,7 +85,7 @@ public class CreateConceptRelationOperationTest extends AbstractTaxeditorOperati
        }
 
        /**
        }
 
        /**

-        * Test method for {@link eu.etaxonomy.taxeditor.operation.AbstractPostOperation#postExecute(ICdmBase)}.
+        * Test method for {@link eu.etaxonomy.taxeditor.operation.AbstractPostTaxonOperation#postExecute(ICdmBase)}.

         */
        @Test
        public void testPostExecute() {
         */
        @Test
        public void testPostExecute() {

diff --git a/eu.etaxonomy.taxeditor.editor/src/test/java/eu/etaxonomy/taxeditor/editor/name/operation/DeleteConceptRelationOperationTest.java b/eu.etaxonomy.taxeditor.editor/src/test/java/eu/etaxonomy/taxeditor/editor/name/operation/DeleteConceptRelationOperationTest.java
index 458dfd121f51ef62a0b5d307844512c14d7154e8..794cd7779be97aa58845cce2db46686341ea77c7 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/test/java/eu/etaxonomy/taxeditor/editor/name/operation/DeleteConceptRelationOperationTest.java
+++ b/eu.etaxonomy.taxeditor.editor/src/test/java/eu/etaxonomy/taxeditor/editor/name/operation/DeleteConceptRelationOperationTest.java
@@ -85,7 +85,7 @@ public class DeleteConceptRelationOperationTest extends AbstractTaxeditorOperati
        }
 
        /**
        }
 
        /**

-        * Test method for {@link eu.etaxonomy.taxeditor.operation.AbstractPostOperation#postExecute(ICdmBase)}.
+        * Test method for {@link eu.etaxonomy.taxeditor.operation.AbstractPostTaxonOperation#postExecute(ICdmBase)}.

         */
        @Test
        public void testPostExecute() {
         */
        @Test
        public void testPostExecute() {

diff --git a/eu.etaxonomy.taxeditor.editor/src/test/java/eu/etaxonomy/taxeditor/editor/name/operation/DeleteMisapplicationOperationTest.java b/eu.etaxonomy.taxeditor.editor/src/test/java/eu/etaxonomy/taxeditor/editor/name/operation/DeleteMisapplicationOperationTest.java
index f52990bd3c7553766f2433d0ebf7d61a5bb882a9..22ee71d4d15729ffe1ce3c7733bb4271118038f4 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/test/java/eu/etaxonomy/taxeditor/editor/name/operation/DeleteMisapplicationOperationTest.java
+++ b/eu.etaxonomy.taxeditor.editor/src/test/java/eu/etaxonomy/taxeditor/editor/name/operation/DeleteMisapplicationOperationTest.java
@@ -82,7 +82,7 @@ public class DeleteMisapplicationOperationTest extends AbstractTaxeditorOperatio
        }
 
        /**
        }
 
        /**

-        * Test method for {@link eu.etaxonomy.taxeditor.operation.AbstractPostOperation#postExecute(ICdmBase)}.
+        * Test method for {@link eu.etaxonomy.taxeditor.operation.AbstractPostTaxonOperation#postExecute(ICdmBase)}.

         */
        @Test
        public void testPostExecute() {
         */
        @Test
        public void testPostExecute() {

diff --git a/eu.etaxonomy.taxeditor.editor/src/test/java/eu/etaxonomy/taxeditor/editor/name/operation/SwapSynonymAndAcceptedOperationTest.java b/eu.etaxonomy.taxeditor.editor/src/test/java/eu/etaxonomy/taxeditor/editor/name/operation/SwapSynonymAndAcceptedOperationTest.java
index 37065b5d6f3d18f4f03e85ee7e2f88142703b0db..38e6e88611c9231c87dd096779b6df617cc2023d 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/test/java/eu/etaxonomy/taxeditor/editor/name/operation/SwapSynonymAndAcceptedOperationTest.java
+++ b/eu.etaxonomy.taxeditor.editor/src/test/java/eu/etaxonomy/taxeditor/editor/name/operation/SwapSynonymAndAcceptedOperationTest.java
@@ -183,7 +183,7 @@ public class SwapSynonymAndAcceptedOperationTest extends AbstractTaxeditorOperat
        }
 
        /**
        }
 
        /**

-        * Test method for {@link eu.etaxonomy.taxeditor.operation.AbstractPostOperation#postExecute(ICdmBase)}.
+        * Test method for {@link eu.etaxonomy.taxeditor.operation.AbstractPostTaxonOperation#postExecute(ICdmBase)}.

         */
        @Test
        public void testPostExecute() {
         */
        @Test
        public void testPostExecute() {

diff --git a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/key/polytomous/operation/RefreshNodesOperation.java b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/key/polytomous/operation/RefreshNodesOperation.java
index 2ffd39de396949b59709744588f46a98096d5a4e..5bb8f28ebe4ac4f223c7bd3714d1f7515a0c03d0 100644 (file)
--- a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/key/polytomous/operation/RefreshNodesOperation.java
+++ b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/key/polytomous/operation/RefreshNodesOperation.java
@@ -14,7 +14,7 @@ import eu.etaxonomy.cdm.api.service.IPolytomousKeyService;
 import eu.etaxonomy.cdm.api.service.ITermService;
 import eu.etaxonomy.cdm.model.description.PolytomousKey;
 import eu.etaxonomy.cdm.model.description.PolytomousKeyNode;
 import eu.etaxonomy.cdm.api.service.ITermService;
 import eu.etaxonomy.cdm.model.description.PolytomousKey;
 import eu.etaxonomy.cdm.model.description.PolytomousKeyNode;

-import eu.etaxonomy.taxeditor.operation.AbstractPostOperation;
+import eu.etaxonomy.taxeditor.operation.AbstractPostTaxonOperation;

 import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
 import eu.etaxonomy.taxeditor.store.CdmStore;
 
 import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
 import eu.etaxonomy.taxeditor.store.CdmStore;
 


@@ -27,7 +27,7 @@ import eu.etaxonomy.taxeditor.store.CdmStore;
  * @version 1.0
  *
  */
  * @version 1.0
  *
  */

-public class RefreshNodesOperation extends AbstractPostOperation {
+public class RefreshNodesOperation extends AbstractPostTaxonOperation {

 
        PolytomousKey key;      
        
 
        PolytomousKey key;      
        

diff --git a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/operation/CopyOperation.java b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/operation/CopyOperation.java
index c6b3c56bc076c36698c7f498027d5008c5ad9938..93f871e2f720cc263c88973195bb0a3aaedc5074 100644 (file)
--- a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/operation/CopyOperation.java
+++ b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/operation/CopyOperation.java
@@ -19,7 +19,7 @@ import org.eclipse.swt.dnd.TextTransfer;
 import org.eclipse.swt.dnd.Transfer;\r
 \r
 import eu.etaxonomy.cdm.model.taxon.TaxonNode;\r
 import org.eclipse.swt.dnd.Transfer;\r
 \r
 import eu.etaxonomy.cdm.model.taxon.TaxonNode;\r

-import eu.etaxonomy.taxeditor.operation.AbstractPostOperation;\r
+import eu.etaxonomy.taxeditor.operation.AbstractPostTaxonOperation;\r

 import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;\r
 \r
 \r
 import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;\r
 \r
 \r


@@ -28,7 +28,7 @@ import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
  * @date 23 Jan 2012\r
  *\r
  */\r
  * @date 23 Jan 2012\r
  *\r
  */\r

-public class CopyOperation extends AbstractPostOperation {\r
+public class CopyOperation extends AbstractPostTaxonOperation {\r

 \r
        /**\r
         * @param label\r
 \r
        /**\r
         * @param label\r

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/operation/CreateDefinedTermOperation.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/operation/CreateDefinedTermOperation.java
index 7677096e1ec1dc2fa291fc8bd4a85ca4704f39e2..c1e838a9ca056d89e81d845881838fa00e743fc4 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/operation/CreateDefinedTermOperation.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/operation/CreateDefinedTermOperation.java
@@ -20,7 +20,7 @@ import eu.etaxonomy.cdm.model.common.DefinedTermBase;
 import eu.etaxonomy.cdm.model.common.TermBase;\r
 import eu.etaxonomy.cdm.model.common.TermVocabulary;\r
 import eu.etaxonomy.taxeditor.editor.definedterm.input.TermEditorInput;\r
 import eu.etaxonomy.cdm.model.common.TermBase;\r
 import eu.etaxonomy.cdm.model.common.TermVocabulary;\r
 import eu.etaxonomy.taxeditor.editor.definedterm.input.TermEditorInput;\r

-import eu.etaxonomy.taxeditor.operation.AbstractPostOperation;\r
+import eu.etaxonomy.taxeditor.operation.AbstractPostTaxonOperation;\r

 import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;\r
 import eu.etaxonomy.taxeditor.store.StoreUtil;\r
 \r
 import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;\r
 import eu.etaxonomy.taxeditor.store.StoreUtil;\r
 \r


@@ -29,7 +29,7 @@ import eu.etaxonomy.taxeditor.store.StoreUtil;
  * @date 21 Dec 2011\r
  *\r
  */\r
  * @date 21 Dec 2011\r
  *\r
  */\r

-public class CreateDefinedTermOperation extends AbstractPostOperation {\r
+public class CreateDefinedTermOperation extends AbstractPostTaxonOperation {\r

 \r
        \r
 \r
 \r
        \r
 \r

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/operation/CreateTermVocabularyOperation.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/operation/CreateTermVocabularyOperation.java
index 7d365453c4194097d5efaa317a12f49dbe206964..74a8b7cf821cf881ef6b316d8a0cf89cef583461 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/operation/CreateTermVocabularyOperation.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/operation/CreateTermVocabularyOperation.java
@@ -18,7 +18,7 @@ import org.eclipse.core.runtime.IStatus;
 import eu.etaxonomy.cdm.api.service.IVocabularyService;\r
 import eu.etaxonomy.cdm.model.common.TermVocabulary;\r
 import eu.etaxonomy.taxeditor.editor.definedterm.input.TermEditorInput;\r
 import eu.etaxonomy.cdm.api.service.IVocabularyService;\r
 import eu.etaxonomy.cdm.model.common.TermVocabulary;\r
 import eu.etaxonomy.taxeditor.editor.definedterm.input.TermEditorInput;\r

-import eu.etaxonomy.taxeditor.operation.AbstractPostOperation;\r
+import eu.etaxonomy.taxeditor.operation.AbstractPostTaxonOperation;\r

 import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;\r
 import eu.etaxonomy.taxeditor.store.CdmStore;\r
 \r
 import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;\r
 import eu.etaxonomy.taxeditor.store.CdmStore;\r
 \r


@@ -27,7 +27,7 @@ import eu.etaxonomy.taxeditor.store.CdmStore;
  * @date 21 Dec 2011\r
  *\r
  */\r
  * @date 21 Dec 2011\r
  *\r
  */\r

-public class CreateTermVocabularyOperation extends AbstractPostOperation {\r
+public class CreateTermVocabularyOperation extends AbstractPostTaxonOperation {\r

 \r
        private TermEditorInput definedEditorInput;\r
        \r
 \r
        private TermEditorInput definedEditorInput;\r
        \r

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/operation/DeleteTermBaseOperation.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/operation/DeleteTermBaseOperation.java
index eed7baa7d58fd9b55b811b9742adcf0bb7d68da2..52ebe22c73c80663fde7d781aea3692740164b6d 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/operation/DeleteTermBaseOperation.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/operation/DeleteTermBaseOperation.java
@@ -25,7 +25,7 @@ import eu.etaxonomy.cdm.model.common.TermBase;
 import eu.etaxonomy.cdm.model.common.TermVocabulary;\r
 import eu.etaxonomy.taxeditor.editor.definedterm.DefinedTermEditor;\r
 import eu.etaxonomy.taxeditor.editor.definedterm.input.TermEditorInput;\r
 import eu.etaxonomy.cdm.model.common.TermVocabulary;\r
 import eu.etaxonomy.taxeditor.editor.definedterm.DefinedTermEditor;\r
 import eu.etaxonomy.taxeditor.editor.definedterm.input.TermEditorInput;\r

-import eu.etaxonomy.taxeditor.operation.AbstractPostOperation;\r
+import eu.etaxonomy.taxeditor.operation.AbstractPostTaxonOperation;\r

 import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;\r
 import eu.etaxonomy.taxeditor.store.CdmStore;\r
 import eu.etaxonomy.taxeditor.store.StoreUtil;\r
 import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;\r
 import eu.etaxonomy.taxeditor.store.CdmStore;\r
 import eu.etaxonomy.taxeditor.store.StoreUtil;\r


@@ -35,7 +35,7 @@ import eu.etaxonomy.taxeditor.store.StoreUtil;
  * @date 22 Dec 2011\r
  *\r
  */\r
  * @date 22 Dec 2011\r
  *\r
  */\r

-public class DeleteTermBaseOperation extends AbstractPostOperation {\r
+public class DeleteTermBaseOperation extends AbstractPostTaxonOperation {\r

 \r
        private TermEditorInput definedEditorInput;\r
        private TermBase termBase;\r
 \r
        private TermEditorInput definedEditorInput;\r
        private TermBase termBase;\r

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/operation/MoveDefinedTermOperation.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/operation/MoveDefinedTermOperation.java
index b14c4cdcf74a45c5c4e66768fc3092b5d2d6e0f1..e85d87700eb1ce16804d9b9af78caecfb552f285 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/operation/MoveDefinedTermOperation.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/operation/MoveDefinedTermOperation.java
@@ -21,7 +21,7 @@ import org.eclipse.core.runtime.Status;
 import eu.etaxonomy.cdm.model.common.DefinedTermBase;\r
 import eu.etaxonomy.cdm.model.common.TermBase;\r
 import eu.etaxonomy.cdm.model.common.TermVocabulary;\r
 import eu.etaxonomy.cdm.model.common.DefinedTermBase;\r
 import eu.etaxonomy.cdm.model.common.TermBase;\r
 import eu.etaxonomy.cdm.model.common.TermVocabulary;\r

-import eu.etaxonomy.taxeditor.operation.AbstractPostOperation;\r
+import eu.etaxonomy.taxeditor.operation.AbstractPostTaxonOperation;\r

 import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;\r
 import eu.etaxonomy.taxeditor.store.StoreUtil;\r
 \r
 import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;\r
 import eu.etaxonomy.taxeditor.store.StoreUtil;\r
 \r


@@ -30,7 +30,7 @@ import eu.etaxonomy.taxeditor.store.StoreUtil;
  * @date 10 Jan 2012\r
  *\r
  */\r
  * @date 10 Jan 2012\r
  *\r
  */\r

-public class MoveDefinedTermOperation extends AbstractPostOperation {\r
+public class MoveDefinedTermOperation extends AbstractPostTaxonOperation {\r

        \r
        private Collection<DefinedTermBase> sourceTerms;// the actual DefinedTermBase(s) we are moving\r
        private TermBase targetTermOrVocabulary;// the target VOCABULARY or DefinedTerm we are moving these to\r
        \r
        private Collection<DefinedTermBase> sourceTerms;// the actual DefinedTermBase(s) we are moving\r
        private TermBase targetTermOrVocabulary;// the target VOCABULARY or DefinedTerm we are moving these to\r

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/AbstractUtility.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/AbstractUtility.java
index 2ea0a5d6a4d58e0b1567eb178de9fd9ea02283f2..520ff64238507314b2760aa0c23bb192108ae479 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/AbstractUtility.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/AbstractUtility.java
@@ -452,7 +452,7 @@ public abstract class AbstractUtility {
         *
         * @param operation
         *            a
         *
         * @param operation
         *            a

-        *            {@link eu.etaxonomy.taxeditor.operation.AbstractPostOperation}
+        *            {@link eu.etaxonomy.taxeditor.operation.AbstractPostTaxonOperation}

         *            object.
         * @return a {@link org.eclipse.core.runtime.IStatus} object.
         */
         *            object.
         * @return a {@link org.eclipse.core.runtime.IStatus} object.
         */

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/operation/AbstractPersistentPostOperation.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/operation/AbstractPersistentPostOperation.java
index 37ff63f70e73337197149ab7ac44dceef4a6e5df..e42030d986305da803da9b07c1ffa30f1af89181 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/operation/AbstractPersistentPostOperation.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/operation/AbstractPersistentPostOperation.java
@@ -30,7 +30,7 @@ import eu.etaxonomy.cdm.model.taxon.TaxonNode;
  * @created 08.05.2009
  * @version 1.0
  */
  * @created 08.05.2009
  * @version 1.0
  */

-public abstract class AbstractPersistentPostOperation extends AbstractPostOperation {
+public abstract class AbstractPersistentPostOperation extends AbstractPostTaxonOperation {

        private IConversationEnabled conversationEnabled;
 
        protected ITaxonTreeNode parentNode;
        private IConversationEnabled conversationEnabled;
 
        protected ITaxonTreeNode parentNode;

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/operation/AbstractPostDescribableOperation.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/operation/AbstractPostDescribableOperation.java
new file mode 100644 (file)
index 0000000..dad0784
--- /dev/null
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/operation/AbstractPostDescribableOperation.java
@@ -0,0 +1,30 @@
+// $Id$
+/**
+* Copyright (C) 2013 EDIT
+* European Distributed Institute of Taxonomy
+* http://www.e-taxonomy.eu
+*
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+package eu.etaxonomy.taxeditor.operation;
+
+import eu.etaxonomy.cdm.model.description.IDescribable;
+
+/**
+ * @author pplitzner
+ * @date 03.12.2013
+ *
+ */
+public abstract class AbstractPostDescribableOperation extends AbstractPostOperation {
+
+    protected IDescribable describable;
+
+    /**
+     * @param label
+     */
+    public AbstractPostDescribableOperation(String label) {
+        super(label);
+    }
+
+}

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/operation/AbstractPostOperation.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/operation/AbstractPostOperation.java
index e1559c3be6d430f4fbc157625d52871e39c918c9..9506bd4b4046af111523e119e1f0725f50d660e1 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/operation/AbstractPostOperation.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/operation/AbstractPostOperation.java
@@ -1,156 +1,61 @@
+// $Id$

 /**
 /**

-* Copyright (C) 2007 EDIT
-* European Distributed Institute of Taxonomy 
-* http://www.e-taxonomy.eu
-* 
-* The contents of this file are subject to the Mozilla Public License Version 1.1
-* See LICENSE.TXT at the top of this package for the full license terms.
-*/
-
+ * Copyright (C) 2013 EDIT
+ * European Distributed Institute of Taxonomy
+ * http://www.e-taxonomy.eu
+ *
+ * The contents of this file are subject to the Mozilla Public License Version 1.1
+ * See LICENSE.TXT at the top of this package for the full license terms.
+ */

 package eu.etaxonomy.taxeditor.operation;
 
 package eu.etaxonomy.taxeditor.operation;
 

-import java.util.UUID;
-

 import org.eclipse.core.commands.operations.AbstractOperation;
 import org.eclipse.core.commands.operations.AbstractOperation;

-import org.eclipse.core.commands.operations.IUndoContext;

 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
 
 import eu.etaxonomy.cdm.model.common.CdmBase;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
 
 import eu.etaxonomy.cdm.model.common.CdmBase;

-import eu.etaxonomy.cdm.model.taxon.ITaxonTreeNode;
-import eu.etaxonomy.cdm.model.taxon.Taxon;
-import eu.etaxonomy.cdm.model.taxon.TaxonNode;

 
 /**
 
 /**

- * <p>Abstract AbstractPostOperation class.</p>
+ * @author pplitzner
+ * @date 03.12.2013

  *
  *

- * @author p.ciardelli
- * @author n.hoffmann
- * @created 14.01.2009
- * @version 1.0

  */
 public abstract class AbstractPostOperation extends AbstractOperation {
  */
 public abstract class AbstractPostOperation extends AbstractOperation {

-       
-       /**
-        * 
-        */
-       protected IPostOperationEnabled postOperationEnabled;
-       
-       /** 
-        * A reference to the taxon the concrete operation is working on 
-        */
-       protected Taxon taxon;
-
-       /**
-        * A reference to the taxons TaxonNode
-        */
-       protected ITaxonTreeNode taxonNode;
-
-       protected UUID parentNodeUuid;
-
-       /**
-        * <p>Constructor for AbstractPostOperation.</p>
-        *
-        * @param label a {@link java.lang.String} object.
-        * @param undoContext a {@link org.eclipse.core.commands.operations.IUndoContext} object.
-        */
-       protected AbstractPostOperation(String label, IUndoContext undoContext) {
-               super(label);
-               addContext(undoContext);
-       }
-       
-       /**
-        * <p>Constructor for AbstractPostOperation.</p>
-        *
-        * @param label a {@link java.lang.String} object.
-        * @param undoContext a {@link org.eclipse.core.commands.operations.IUndoContext} object.
-        * @param taxon a {@link eu.etaxonomy.cdm.model.taxon.Taxon} object.
-        */
-       public AbstractPostOperation(String label, IUndoContext undoContext,
-                       Taxon taxon) {
-               this(label, undoContext);
-               
-               this.taxon = taxon;
-       }
-       
-       /**
-        * <p>Constructor for AbstractPostOperation.</p>
-        *
-        * @param label a {@link java.lang.String} object.
-        * @param undoContext a {@link org.eclipse.core.commands.operations.IUndoContext} object.
-        * @param taxon a {@link eu.etaxonomy.cdm.model.taxon.Taxon} object.
-        * @param postOperationEnabled a {@link eu.etaxonomy.taxeditor.operation.IPostOperationEnabled} object.
-        */
-       public AbstractPostOperation(String label, IUndoContext undoContext,
-                       Taxon taxon, IPostOperationEnabled postOperationEnabled) {
-               this(label, undoContext, taxon);
-               this.postOperationEnabled = postOperationEnabled;
-       }
-       
-       /**
-        * <p>Constructor for AbstractPostOperation.</p>
-        *
-        * @param label a {@link java.lang.String} object.
-        * @param undoContext a {@link org.eclipse.core.commands.operations.IUndoContext} object.
-        * @param taxonNode a {@link eu.etaxonomy.cdm.model.taxon.TaxonNode} object.
-        * @param postOperationEnabled a {@link eu.etaxonomy.taxeditor.operation.IPostOperationEnabled} object.
-        */
-       public AbstractPostOperation(String label, IUndoContext undoContext, TaxonNode taxonNode, IPostOperationEnabled postOperationEnabled){
-               this(label, undoContext, taxonNode.getTaxon(), postOperationEnabled);
-               this.taxonNode = taxonNode;
-       }
-       
-       /**
-        * <p>Constructor for AbstractPostOperation.</p>
-        *
-        * @param label a {@link java.lang.String} object.
-        * @param undoContext a {@link org.eclipse.core.commands.operations.IUndoContext} object.
-        * @param parentNodeUuid a {@link java.util.UUID} object.
-        * @param postOperationEnabled a {@link eu.etaxonomy.taxeditor.operation.IPostOperationEnabled} object.
-        */
-       public AbstractPostOperation(String label, IUndoContext undoContext, UUID parentNodeUuid, IPostOperationEnabled postOperationEnabled){
-               this(label, undoContext);
-               
-               this.parentNodeUuid = parentNodeUuid;
-               this.postOperationEnabled = postOperationEnabled;
-       }
-       
-       /**
-        * <p>Constructor for AbstractPostOperation.</p>
-        *
-        * @param label a {@link java.lang.String} object.
-        * @param undoContext a {@link org.eclipse.core.commands.operations.IUndoContext} object.
-        * @param postOperationEnabled a {@link eu.etaxonomy.taxeditor.operation.IPostOperationEnabled} object.
-        */
-       public AbstractPostOperation(String label, IUndoContext undoContext,
-                       IPostOperationEnabled postOperationEnabled) {
-               this(label, undoContext);
-               this.postOperationEnabled = postOperationEnabled;
-       }

 
 

-       /**
-        * This method will try to call the post operation on a possibly registered
-        * IPostOperationEnabled implementor. Objects that were affected by the operation
-        * may be passed to the registered IPostOperationEnabled implementor.
-        *
-        * @param objectAffectedByOperation the affected object. Should be <code>null</code> if not needed
-        * @return a {@link org.eclipse.core.runtime.IStatus} object.
-        */
-       protected IStatus postExecute(CdmBase objectAffectedByOperation) {      
-               if(postOperationEnabled != null){
-                       return postOperationEnabled.postOperation(objectAffectedByOperation) ? Status.OK_STATUS : Status.CANCEL_STATUS;
-               }
-               return Status.OK_STATUS;
-       }
-       
-       /**
-        * <p>Getter for the field <code>postOperationEnabled</code>.</p>
-        *
-        * @return a {@link eu.etaxonomy.taxeditor.operation.IPostOperationEnabled} object.
-        */
-       public IPostOperationEnabled getPostOperationEnabled() {
-               return postOperationEnabled;
-       }
-       
-       
-}
+    /**
+     * 
+     */
+    protected IPostOperationEnabled postOperationEnabled;
+
+    /**
+     * @param label
+     */
+    public AbstractPostOperation(String label) {
+        super(label);
+    }
+
+    /**
+     * This method will try to call the post operation on a possibly registered
+     * IPostOperationEnabled implementor. Objects that were affected by the operation
+     * may be passed to the registered IPostOperationEnabled implementor.
+     *
+     * @param objectAffectedByOperation the affected object. Should be <code>null</code> if not needed
+     * @return a {@link org.eclipse.core.runtime.IStatus} object.
+     */
+    protected IStatus postExecute(CdmBase objectAffectedByOperation) { 
+       if(postOperationEnabled != null){
+               return postOperationEnabled.postOperation(objectAffectedByOperation) ? Status.OK_STATUS : Status.CANCEL_STATUS;
+       }
+       return Status.OK_STATUS;
+    }
+
+    /**
+     * <p>Getter for the field <code>postOperationEnabled</code>.</p>
+     *
+     * @return a {@link eu.etaxonomy.taxeditor.operation.IPostOperationEnabled} object.
+     */
+    public IPostOperationEnabled getPostOperationEnabled() {
+       return postOperationEnabled;
+    }
+
+}
\ No newline at end of file

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/operation/AbstractPostTaxonOperation.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/operation/AbstractPostTaxonOperation.java
new file mode 100644 (file)
index 0000000..6c75b79
--- /dev/null
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/operation/AbstractPostTaxonOperation.java
@@ -0,0 +1,123 @@
+/**
+* Copyright (C) 2007 EDIT
+* European Distributed Institute of Taxonomy 
+* http://www.e-taxonomy.eu
+* 
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+
+package eu.etaxonomy.taxeditor.operation;
+
+import java.util.UUID;
+
+import org.eclipse.core.commands.operations.IUndoContext;
+
+import eu.etaxonomy.cdm.model.taxon.ITaxonTreeNode;
+import eu.etaxonomy.cdm.model.taxon.Taxon;
+import eu.etaxonomy.cdm.model.taxon.TaxonNode;
+
+/**
+ * <p>Abstract AbstractPostOperation class.</p>
+ *
+ * @author p.ciardelli
+ * @author n.hoffmann
+ * @created 14.01.2009
+ * @version 1.0
+ */
+public abstract class AbstractPostTaxonOperation extends AbstractPostOperation {
+       
+       /** 
+        * A reference to the taxon the concrete operation is working on 
+        */
+       protected Taxon taxon;
+
+       /**
+        * A reference to the taxons TaxonNode
+        */
+       protected ITaxonTreeNode taxonNode;
+
+       protected UUID parentNodeUuid;
+
+       /**
+        * <p>Constructor for AbstractPostOperation.</p>
+        *
+        * @param label a {@link java.lang.String} object.
+        * @param undoContext a {@link org.eclipse.core.commands.operations.IUndoContext} object.
+        */
+       protected AbstractPostTaxonOperation(String label, IUndoContext undoContext) {
+               super(label);
+               addContext(undoContext);
+       }
+       
+       /**
+        * <p>Constructor for AbstractPostOperation.</p>
+        *
+        * @param label a {@link java.lang.String} object.
+        * @param undoContext a {@link org.eclipse.core.commands.operations.IUndoContext} object.
+        * @param taxon a {@link eu.etaxonomy.cdm.model.taxon.Taxon} object.
+        */
+       public AbstractPostTaxonOperation(String label, IUndoContext undoContext,
+                       Taxon taxon) {
+               this(label, undoContext);
+               
+               this.taxon = taxon;
+       }
+       
+       /**
+        * <p>Constructor for AbstractPostOperation.</p>
+        *
+        * @param label a {@link java.lang.String} object.
+        * @param undoContext a {@link org.eclipse.core.commands.operations.IUndoContext} object.
+        * @param taxon a {@link eu.etaxonomy.cdm.model.taxon.Taxon} object.
+        * @param postOperationEnabled a {@link eu.etaxonomy.taxeditor.operation.IPostOperationEnabled} object.
+        */
+       public AbstractPostTaxonOperation(String label, IUndoContext undoContext,
+                       Taxon taxon, IPostOperationEnabled postOperationEnabled) {
+               this(label, undoContext, taxon);
+               this.postOperationEnabled = postOperationEnabled;
+       }
+       
+       /**
+        * <p>Constructor for AbstractPostOperation.</p>
+        *
+        * @param label a {@link java.lang.String} object.
+        * @param undoContext a {@link org.eclipse.core.commands.operations.IUndoContext} object.
+        * @param taxonNode a {@link eu.etaxonomy.cdm.model.taxon.TaxonNode} object.
+        * @param postOperationEnabled a {@link eu.etaxonomy.taxeditor.operation.IPostOperationEnabled} object.
+        */
+       public AbstractPostTaxonOperation(String label, IUndoContext undoContext, TaxonNode taxonNode, IPostOperationEnabled postOperationEnabled){
+               this(label, undoContext, taxonNode.getTaxon(), postOperationEnabled);
+               this.taxonNode = taxonNode;
+       }
+       
+       /**
+        * <p>Constructor for AbstractPostOperation.</p>
+        *
+        * @param label a {@link java.lang.String} object.
+        * @param undoContext a {@link org.eclipse.core.commands.operations.IUndoContext} object.
+        * @param parentNodeUuid a {@link java.util.UUID} object.
+        * @param postOperationEnabled a {@link eu.etaxonomy.taxeditor.operation.IPostOperationEnabled} object.
+        */
+       public AbstractPostTaxonOperation(String label, IUndoContext undoContext, UUID parentNodeUuid, IPostOperationEnabled postOperationEnabled){
+               this(label, undoContext);
+               
+               this.parentNodeUuid = parentNodeUuid;
+               this.postOperationEnabled = postOperationEnabled;
+       }
+       
+       /**
+        * <p>Constructor for AbstractPostOperation.</p>
+        *
+        * @param label a {@link java.lang.String} object.
+        * @param undoContext a {@link org.eclipse.core.commands.operations.IUndoContext} object.
+        * @param postOperationEnabled a {@link eu.etaxonomy.taxeditor.operation.IPostOperationEnabled} object.
+        */
+       public AbstractPostTaxonOperation(String label, IUndoContext undoContext,
+                       IPostOperationEnabled postOperationEnabled) {
+               this(label, undoContext);
+               this.postOperationEnabled = postOperationEnabled;
+       }
+       
+       
+}

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/operation/ChangeDescriptionElementType.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/operation/ChangeDescriptionElementType.java
index e1110fb323656aab2ce2085ab0d4799d0afb81ed..df7a426c6627e591f788ffd0c439138354f5ffa5 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/operation/ChangeDescriptionElementType.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/operation/ChangeDescriptionElementType.java
@@ -25,7 +25,7 @@ import eu.etaxonomy.cdm.model.description.IndividualsAssociation;
 import eu.etaxonomy.cdm.model.description.QuantitativeData;
 import eu.etaxonomy.cdm.model.description.TaxonInteraction;
 import eu.etaxonomy.cdm.model.description.TextData;
 import eu.etaxonomy.cdm.model.description.QuantitativeData;
 import eu.etaxonomy.cdm.model.description.TaxonInteraction;
 import eu.etaxonomy.cdm.model.description.TextData;

-import eu.etaxonomy.taxeditor.operation.AbstractPostOperation;
+import eu.etaxonomy.taxeditor.operation.AbstractPostTaxonOperation;

 import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
 
 /**
 import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
 
 /**


@@ -35,7 +35,7 @@ import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
  * @date 25.05.2010
  * @version $Id: $
  */
  * @date 25.05.2010
  * @version $Id: $
  */

-public class ChangeDescriptionElementType extends AbstractPostOperation {
+public class ChangeDescriptionElementType extends AbstractPostTaxonOperation {

 
        private DescriptionElementBase sourceElement;
        private DescriptionElementBase destinationElement;
 
        private DescriptionElementBase sourceElement;
        private DescriptionElementBase destinationElement;