Remove generics from Reference in TaxEditor #5830

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 0c03146a44868cc2023c304988504454f0a7925f..caee71329e442155242346cad09b97ff8013e4fc 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
@@ -31,13 +31,12 @@ import eu.etaxonomy.taxeditor.store.CdmStore;
  *
  * @author p.ciardelli
  * @created 16.01.2009
- * @version 1.0
  */
 public class DeleteMisapplicationOperation extends AbstractPostTaxonOperation {
 
        private final Taxon misapplication;
 
-       private Reference<?> citation;
+       private Reference citation;
 
        private String microcitation;
 
@@ -93,9 +92,6 @@ public class DeleteMisapplicationOperation extends AbstractPostTaxonOperation {
                return postExecute(null);
        }
 
-       /* (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)
@@ -103,9 +99,6 @@ public class DeleteMisapplicationOperation extends AbstractPostTaxonOperation {
                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/occurrence/dna/SequenceReferenceCollectionDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/SequenceReferenceCollectionDetailElement.java
index 0b6e10994d7067703c0577ffe08a6a1d32b54553..5561170f29ed5f48a3ee2da7545936275fe7d7e7 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/SequenceReferenceCollectionDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/SequenceReferenceCollectionDetailElement.java
@@ -26,13 +26,13 @@ import eu.etaxonomy.taxeditor.ui.selection.EntitySelectionElement;
  * @date 07.01.2014
  *
  */
-public class SequenceReferenceCollectionDetailElement extends AbstractEntityCollectionElement<Reference<?>>{
+public class SequenceReferenceCollectionDetailElement extends AbstractEntityCollectionElement<Reference>{
 
     protected EntitySelectionElement<Reference> selection_reference;
     protected TextWithLabelElement text_referenceDetail;
 
     public SequenceReferenceCollectionDetailElement(CdmFormFactory formFactory,
-            AbstractFormSection<?> section, Reference<?> entity,
+            AbstractFormSection<?> section, Reference entity,
             SelectionListener removeListener, int style) {
         super(formFactory, section, entity, removeListener, null, style);
     }
@@ -49,7 +49,7 @@ public class SequenceReferenceCollectionDetailElement extends AbstractEntityColl
     }
 
     @Override
-    public void setEntity(Reference<?> entity) {
+    public void setEntity(Reference entity) {
         this.entity = entity;
         selection_reference.setEntity(entity);
         text_referenceDetail.setText(entity.getReferenceAbstract());
@@ -61,7 +61,7 @@ public class SequenceReferenceCollectionDetailElement extends AbstractEntityColl
             if(getParentElement() instanceof SequenceReferenceCollectionDetailSection){
                 Sequence sequence = ((SequenceReferenceCollectionDetailSection) getParentElement()).getEntity();
                 sequence.removeCitation(entity);
-                Reference<?> newCitation = selection_reference.getSelection();
+                Reference newCitation = selection_reference.getSelection();
                 sequence.addCitation(newCitation);
                 entity = newCitation;
 

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/media/MediaSpecimenGeneralDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/media/MediaSpecimenGeneralDetailElement.java
index 840631c75643c6a50e5558efa115d0a5dd977484..9d7e3449eac0dbc423344c2cd245f1da35888bde 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/media/MediaSpecimenGeneralDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/media/MediaSpecimenGeneralDetailElement.java
@@ -80,7 +80,7 @@ public class MediaSpecimenGeneralDetailElement extends AbstractCdmDetailElement<
             text_accessionNumber = formFactory.createTextWithLabelElement(formElement, "Accession Number", entity.getAccessionNumber(), style);
 
             //the first PrimaryMediaSource is used for storing the reference
-            Reference<?> publishedIn = null;
+            Reference publishedIn = null;
             for(IdentifiableSource source:media.getSources()){
                 if(source.getType()==OriginalSourceType.PrimaryMediaSource){
                     publishedIn = source.getCitation();