cleanup and deproxy

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/media/handler/DeleteMediaHandler.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/media/handler/DeleteMediaHandler.java
index 0043016654970ab9d24da623db01e769cc33dcbd..ce2ed524a0b298a048fa5a5b2536f9922d810f28 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/media/handler/DeleteMediaHandler.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/media/handler/DeleteMediaHandler.java
@@ -67,7 +67,7 @@ public class DeleteMediaHandler extends AbstractHandler {
                                }
                                ImageFile image = (ImageFile) paths[0].getLastSegment();
 
-                               AbstractPostOperation operation = null;
+                               AbstractPostOperation<?> operation = null;
                                // TODO use undo context specific to editor
                 MediaDeletionConfigurator config = new MediaDeletionConfigurator();
 

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 2336e69b4feeea26e447b9ae045cf3badca12734..ddea851f8e271b3630a31aa73c5c69abc32d6584 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
@@ -27,7 +27,6 @@ import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
  *
  * @author p.ciardelli
  * @created 31.03.2009
- * @version 1.0
  */
 public class CreateImageOperation extends AbstractPostTaxonOperation {
 
@@ -67,9 +66,6 @@ public class CreateImageOperation extends AbstractPostTaxonOperation {
                this.description = description;
        }
 
-       /* (non-Javadoc)
-        * @see org.eclipse.core.commands.operations.AbstractOperation#execute(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)
-        */
        /** {@inheritDoc} */
        @Override
        public IStatus execute(IProgressMonitor monitor, IAdaptable info)
@@ -86,9 +82,6 @@ public class CreateImageOperation extends AbstractPostTaxonOperation {
                return postExecute(imageFile);
        }
 
-       /* (non-Javadoc)
-        * @see org.eclipse.core.commands.operations.AbstractOperation#redo(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)
-        */
        /** {@inheritDoc} */
        @Override
        public IStatus redo(IProgressMonitor monitor, IAdaptable info)
@@ -99,9 +92,6 @@ public class CreateImageOperation extends AbstractPostTaxonOperation {
                return postExecute(imageFile);
        }
 
-       /* (non-Javadoc)
-        * @see org.eclipse.core.commands.operations.AbstractOperation#undo(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)
-        */
        /** {@inheritDoc} */
        @Override
        public IStatus undo(IProgressMonitor monitor, IAdaptable info)

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 b79de0f78c9d3a66f6ae3dc8114bb38a7cf96125..afc550f0fbe9de907ee4629a7dbc31cd24dd1349 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
@@ -27,23 +27,20 @@ import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
  * @author p.ciardelli
  * @author n.hoffmann
  * @created 05.02.2009
- * @version 1.0
  */
 public class RemoveImageFromDescriptionElementOperation extends AbstractPostTaxonOperation {
 
-       private DescriptionBase element;
+       private DescriptionBase<?> element;
        private Media media;
 
        /**
         * <p>Constructor for RemoveImageFromDescriptionElementOperation.</p>
         *
-        * @param undoContext a {@link org.eclipse.core.commands.operations.IUndoContext} object.
-        * @param taxon a {@link eu.etaxonomy.cdm.model.taxon.Taxon} object.
-        * @param element a {@link eu.etaxonomy.cdm.model.description.DescriptionElementBase} object.
-        * @param postOperationEnabled a {@link eu.etaxonomy.taxeditor.operation.IPostOperationEnabled} object.
-        * @param label a {@link java.lang.String} object.
-        * @param config
-        * @param image a {@link eu.etaxonomy.cdm.model.media.ImageFile} object.
+        * @param undoContext a {@link org.eclipse.core.commands.operations.IUndoContext} object
+        * @param media
+        * @param element a {@link eu.etaxonomy.cdm.model.description.DescriptionElementBase} object
+        * @param postOperationEnabled a {@link eu.etaxonomy.taxeditor.operation.IPostOperationEnabled} object
+        * @param label a {@link java.lang.String} object
         */
        public RemoveImageFromDescriptionElementOperation(String label,
                        IUndoContext undoContext, Media media,
@@ -54,9 +51,6 @@ public class RemoveImageFromDescriptionElementOperation extends AbstractPostTaxo
                this.element = element;
        }
 
-       /* (non-Javadoc)
-        * @see org.eclipse.core.commands.operations.AbstractOperation#execute(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)
-        */
        /** {@inheritDoc} */
        @Override
        public IStatus execute(IProgressMonitor monitor, IAdaptable info)
@@ -69,9 +63,6 @@ public class RemoveImageFromDescriptionElementOperation extends AbstractPostTaxo
                return postExecute(element);
        }
 
-       /* (non-Javadoc)
-        * @see org.eclipse.core.commands.operations.AbstractOperation#redo(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)
-        */
        /** {@inheritDoc} */
        @Override
        public IStatus redo(IProgressMonitor monitor, IAdaptable info)
@@ -79,9 +70,6 @@ public class RemoveImageFromDescriptionElementOperation extends AbstractPostTaxo
                return execute(monitor, info);
        }
 
-       /* (non-Javadoc)
-        * @see org.eclipse.core.commands.operations.AbstractOperation#undo(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)
-        */
        /** {@inheritDoc} */
        @Override
        public IStatus undo(IProgressMonitor monitor, IAdaptable info)

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/media/ImageFileElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/media/ImageFileElement.java
index f768b74df31307fc701a12f1de8f7d05cddc3a4d..b081fdc01baa04bd0fd5b1d9c6bf8e10fefdf800 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/media/ImageFileElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/media/ImageFileElement.java
@@ -29,7 +29,6 @@ import eu.etaxonomy.taxeditor.ui.element.NumberWithLabelElement;
 /**
  * @author n.hoffmann
  * @created Mar 26, 2010
- * @version 1.0
  */
 public class ImageFileElement extends MediaRepresentationPartElement<ImageFile> {
 

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/media/MediaDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/media/MediaDetailElement.java
index 06ff8b061ab74c659e39d1f15d29b12c85b9de13..bd6a26c40648075f808adc1daea574d890a651dd 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/media/MediaDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/media/MediaDetailElement.java
@@ -18,6 +18,7 @@ import org.eclipse.swt.widgets.Label;
 
 import eu.etaxonomy.cdm.common.UriUtils;
 import eu.etaxonomy.cdm.common.media.ImageInfo;
+import eu.etaxonomy.cdm.model.common.CdmBase;
 import eu.etaxonomy.cdm.model.media.ImageFile;
 import eu.etaxonomy.cdm.model.media.Media;
 import eu.etaxonomy.cdm.model.media.MediaRepresentation;
@@ -100,9 +101,10 @@ public class MediaDetailElement extends AbstractCdmDetailElement<Media>{
             UriUtils.getInputStream(uri);// will fail with a FileNotFoundException if not
             imageInfo = ImageInfo.NewInstance(uri, 10000);//will fail when it is no image file
             singleMediaRepresentationPart.setSize((int) imageInfo.getLength());
-            if(singleMediaRepresentationPart instanceof ImageFile){
-                ((ImageFile) singleMediaRepresentationPart).setHeight(imageInfo.getHeight());
-                ((ImageFile) singleMediaRepresentationPart).setWidth(imageInfo.getWidth());
+            if(singleMediaRepresentationPart.isInstanceOf(ImageFile.class)){
+               ImageFile image = CdmBase.deproxy(singleMediaRepresentationPart, ImageFile.class);
+                image.setHeight(imageInfo.getHeight());
+                image.setWidth(imageInfo.getWidth());
             }
             singleMediaRepresentationPart.getMediaRepresentation().setMimeType(imageInfo.getMimeType());
             singleMediaRepresentationPart.getMediaRepresentation().setSuffix(imageInfo.getSuffix());