descriptions = ((FeatureNodeContainer) object).getDescriptionElementsForEntireBranch();
-
+
for(DescriptionElementBase description : descriptions){
- operations.add(new DeleteDescriptionElementOperation(label, undoContext, description, postOperationEnabled));
+ operations.add(new DeleteDescriptionElementOperation(label, undoContext, description, postOperationEnabled));
}
}
// Media
else if(object instanceof Media){
TreeSelection treeSelection = (TreeSelection) selection;
-
+
TreePath[] path = treeSelection.getPathsFor(object);
-
- TaxonDescription imageGallery = (TaxonDescription) path[0].getFirstSegment();
-
+
+ DescriptionBase> imageGallery = (DescriptionBase>) path[0].getFirstSegment();
+
operations.add(new DeleteMediaOperation(label, undoContext, imageGallery, (Media) object, postOperationEnabled));
}
else{
MessagingUtils.error(getClass(), "Selection is not valid for this delete handler", null);
- }
+ }
}
-
+
// execute all cumulated operations
- for(AbstractPostOperation operation : operations){
- EditorUtil.executeOperation(operation);
+ for(AbstractPostOperation> operation : operations){
+ AbstractUtility.executeOperation(operation);
}
-
+
} catch (NotDefinedException e) {
MessagingUtils.warn(getClass(), "Command name not set.");
}
-
-
+
+
return null;
}
}
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 63172152f..b14889f28 100644
--- 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
@@ -1,9 +1,9 @@
// $Id$
/**
* Copyright (C) 2007 EDIT
-* European Distributed Institute of Taxonomy
+* 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.
*/
@@ -29,12 +29,11 @@ import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
* @created 31.03.2009
* @version 1.0
*/
-@Deprecated // I don't think this is really used anymore
public class DeleteMediaOperation extends AbstractPostTaxonOperation {
-
- private Media media;
- private DescriptionBase> description;
+ private final Media media;
+
+ private final DescriptionBase> description;
/**
* Constructor for DeleteMediaOperation.
@@ -48,7 +47,7 @@ public class DeleteMediaOperation extends AbstractPostTaxonOperation {
public DeleteMediaOperation(String label, IUndoContext undoContext,
DescriptionBase> description, Media media, IPostOperationEnabled postOperationEnabled) {
super(label, undoContext, postOperationEnabled);
-
+
this.media = media;
this.description = description;
}
@@ -85,9 +84,9 @@ public class DeleteMediaOperation extends AbstractPostTaxonOperation {
@Override
public IStatus undo(IProgressMonitor monitor, IAdaptable info)
throws ExecutionException {
-
+
ImagesUtility.addMediaToGallery(description, media);
-
+
return postExecute(null);
}