fix generics

diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/OccurrenceEditorInput.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/OccurrenceEditorInput.java
index e535191f12737cb4bb3a5be7a98fb0834d333e46..9464f338766aed782347c24c19b697e83362c7d7 100644 (file)
--- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/OccurrenceEditorInput.java
+++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/OccurrenceEditorInput.java
@@ -31,7 +31,6 @@ import eu.etaxonomy.taxeditor.store.CdmStore;
  *
  * @author n.hoffmann
  * @created Jun 16, 2010
- * @version 1.0
  */
 public class OccurrenceEditorInput extends AbstractBulkEditorInput<SpecimenOrObservationBase> {
 
@@ -57,9 +56,6 @@ public class OccurrenceEditorInput extends AbstractBulkEditorInput<SpecimenOrObs
                return instance;
        }
 
-       /* (non-Javadoc)
-        * @see eu.etaxonomy.taxeditor.bulkeditor.input.AbstractBulkEditorInput#listEntities(eu.etaxonomy.cdm.api.service.config.IIdentifiableEntityServiceConfigurator)
-        */
        /** {@inheritDoc} */
        @Override
        protected List<SpecimenOrObservationBase> listEntities(
@@ -67,9 +63,6 @@ public class OccurrenceEditorInput extends AbstractBulkEditorInput<SpecimenOrObs
                return CdmStore.getSearchManager().findOccurrences(configurator);
        }
 
-       /* (non-Javadoc)
-        * @see eu.etaxonomy.taxeditor.bulkeditor.input.AbstractBulkEditorInput#loadEntity(java.util.UUID)
-        */
        /** {@inheritDoc}
        @Override
        protected SpecimenOrObservationBase loadEntity(UUID entityUuid) {
@@ -77,9 +70,6 @@ public class OccurrenceEditorInput extends AbstractBulkEditorInput<SpecimenOrObs
                return CdmStore.getService(IOccurrenceService.class).load(entityUuid, propertyPaths);
        }*/
 
-       /* (non-Javadoc)
-        * @see org.eclipse.ui.IEditorInput#getName()
-        */
        /**
         * <p>getName</p>
         *
@@ -90,9 +80,6 @@ public class OccurrenceEditorInput extends AbstractBulkEditorInput<SpecimenOrObs
                return BulkEditorInputType.OCCURRENCE.label;
        }
 
-       /* (non-Javadoc)
-        * @see org.eclipse.ui.IEditorInput#getToolTipText()
-        */
        /**
         * <p>getToolTipText</p>
         *
@@ -103,9 +90,6 @@ public class OccurrenceEditorInput extends AbstractBulkEditorInput<SpecimenOrObs
                return getName();
        }
 
-       /* (non-Javadoc)
-        * @see eu.etaxonomy.taxeditor.bulkeditor.input.AbstractBulkEditorInput#getTypeText(java.lang.Object)
-        */
        @Override
        public String getTypeText(Object entity) {
         if(HibernateProxyHelper.isInstanceOf(entity, SpecimenOrObservationBase.class)){
@@ -123,9 +107,6 @@ public class OccurrenceEditorInput extends AbstractBulkEditorInput<SpecimenOrObs
                return ID;
        }
 
-       /* (non-Javadoc)
-        * @see eu.etaxonomy.taxeditor.annotatedlineeditor.IEntityPersistenceService#delete(java.lang.Object)
-        */
        /** {@inheritDoc}
         * @throws ReferencedObjectUndeletableException */
        @Override
@@ -133,28 +114,18 @@ public class OccurrenceEditorInput extends AbstractBulkEditorInput<SpecimenOrObs
                return CdmStore.getService(IOccurrenceService.class).delete(entity) != null;
        }
 
-       /* (non-Javadoc)
-        * @see eu.etaxonomy.taxeditor.annotatedlineeditor.IEntityPersistenceService#save(java.lang.Object)
-        */
        /** {@inheritDoc} */
        @Override
-    public SpecimenOrObservationBase<IIdentifiableEntityCacheStrategy> save(SpecimenOrObservationBase entity) {
+    public SpecimenOrObservationBase<?> save(SpecimenOrObservationBase entity) {
            return CdmStore.getService(IOccurrenceService.class).merge(entity, true).getMergedEntity();
           
        }
 
-
-       /* (non-Javadoc)
-        * @see eu.etaxonomy.taxeditor.bulkeditor.input.AbstractBulkEditorInput#createEntityCreator()
-        */
        @Override
        protected IEntityCreator<SpecimenOrObservationBase> createEntityCreator() {
                return new OccurrenceCreator();
        }
 
-       /* (non-Javadoc)
-        * @see eu.etaxonomy.taxeditor.bulkeditor.input.AbstractBulkEditorInput#getSortProviders()
-        */
        @Override
        public List<IBulkEditorSortProvider<SpecimenOrObservationBase>> getSortProviders() {
                List<IBulkEditorSortProvider<SpecimenOrObservationBase>> sortProviders = super.getSortProviders();
@@ -164,9 +135,6 @@ public class OccurrenceEditorInput extends AbstractBulkEditorInput<SpecimenOrObs
                return sortProviders;
        }
 
-    /* (non-Javadoc)
-     * @see eu.etaxonomy.taxeditor.editor.CdmEntitySessionInput#merge()
-     */
     @Override
     public void merge() {
 
@@ -177,5 +145,4 @@ public class OccurrenceEditorInput extends AbstractBulkEditorInput<SpecimenOrObs
                List<String> propertyPaths = Arrays.asList(new String[]{});
                return CdmStore.getService(IOccurrenceService.class).load(entityUuid, propertyPaths);
        }
-
 }

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/operation/CreateSpecimenDescriptionOperation.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/operation/CreateSpecimenDescriptionOperation.java
index e66c7b8487ad60ce95468654c7d4724250f3460a..da9593af25ac2c7a14ab048c0d85f963bef410a7 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/operation/CreateSpecimenDescriptionOperation.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/operation/CreateSpecimenDescriptionOperation.java
@@ -9,10 +9,12 @@
 package eu.etaxonomy.taxeditor.editor.view.descriptive.operation;
 
 import org.eclipse.core.commands.operations.IUndoContext;
+import org.eclipse.swt.internal.ole.win32.ISpecifyPropertyPages;
 
 import eu.etaxonomy.cdm.model.description.DescriptionBase;
 import eu.etaxonomy.cdm.model.description.SpecimenDescription;
 import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase;
+import eu.etaxonomy.cdm.strategy.cache.common.IIdentifiableEntityCacheStrategy;
 import eu.etaxonomy.taxeditor.operation.AbstractDescriptionPostOperation;
 import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
 
@@ -21,7 +23,7 @@ import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
  * @date 04.12.2013
  *
  */
-public class CreateSpecimenDescriptionOperation extends AbstractDescriptionPostOperation<SpecimenOrObservationBase, DescriptionBase<?>> {
+public class CreateSpecimenDescriptionOperation extends AbstractDescriptionPostOperation<SpecimenOrObservationBase, DescriptionBase> {
 
     /**
      * @param label

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/uses/operation/CreateTaxonUseOperation.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/uses/operation/CreateTaxonUseOperation.java
index b32d73f224fd0d42c4c576b01598caa172ecbee7..2fd4499540533e2bab0e1f547271486ea35add04 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/uses/operation/CreateTaxonUseOperation.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/uses/operation/CreateTaxonUseOperation.java
@@ -26,7 +26,6 @@ import eu.etaxonomy.taxeditor.store.UseObjectStore;
  * CreateTaxonUseOperation Class\r
  * @author a.theys\r
  * @created mar 13, 2012\r
- * @version 1.0\r
  */\r
 public class CreateTaxonUseOperation extends CreateTaxonDescriptionOperation {\r
        private TaxonDescription description;\r

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/operation/AbstractDescriptionPostOperation.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/operation/AbstractDescriptionPostOperation.java
index 5405fd65781718b9c99d0aa8075b215e1f9042b4..e156a433ede679f44d11b1d302649dfbf23ddce6 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/operation/AbstractDescriptionPostOperation.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/operation/AbstractDescriptionPostOperation.java
@@ -48,9 +48,6 @@ public abstract class AbstractDescriptionPostOperation<T extends IDescribable, D
         this.isImageGallery = isImageGallery;
     }
 
-    /* (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)