cleanup

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/media/MediaContentProvider.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/media/MediaContentProvider.java
index e183caeaa4a1b600a8c4a7dbdfa3a412e5da4f6c..3b0e3c21069994a858f9f52b0f6dbe463304e6ef 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/media/MediaContentProvider.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/media/MediaContentProvider.java
@@ -9,7 +9,6 @@
 
 package eu.etaxonomy.taxeditor.editor.view.media;
 
-import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
@@ -18,16 +17,11 @@ import org.eclipse.core.runtime.Assert;
 import org.eclipse.jface.viewers.ITreeContentProvider;
 import org.eclipse.jface.viewers.Viewer;
 
-import eu.etaxonomy.cdm.api.facade.DerivedUnitFacade;
-import eu.etaxonomy.cdm.api.facade.DerivedUnitFacadeNotSupportedException;
 import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
 import eu.etaxonomy.cdm.model.description.DescriptionBase;
 import eu.etaxonomy.cdm.model.description.DescriptionElementBase;
-import eu.etaxonomy.cdm.model.description.SpecimenDescription;
 import eu.etaxonomy.cdm.model.media.Media;
-import eu.etaxonomy.cdm.model.occurrence.DerivedUnit;
-import eu.etaxonomy.cdm.model.occurrence.FieldUnit;
-import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationType;
+import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
 import eu.etaxonomy.taxeditor.editor.e4.TaxonEditorInputE4;
 import eu.etaxonomy.taxeditor.model.MessagingUtils;
@@ -76,28 +70,9 @@ public class MediaContentProvider implements ITreeContentProvider{
 
                        }
                }
-               else if (parentElement instanceof DerivedUnit){
-                       try {
-                               DerivedUnitFacade facade = DerivedUnitFacade.NewInstance((DerivedUnit) parentElement);
-
-                               SpecimenDescription derivedUnitImageGallery = facade.getDerivedUnitImageGallery(false);
-
-                               if(derivedUnitImageGallery != null){
-                                       return Collections.singleton(derivedUnitImageGallery).toArray();
-                               }
-
-                       } catch (DerivedUnitFacadeNotSupportedException e) {
-                               MessagingUtils.error(this.getClass(), "DerivedUnitFacadeNotSupportedException when trying to instantiate DerivedUnitFacade", e); //$NON-NLS-1$
-                       }
-               }
-               else if (parentElement instanceof FieldUnit){
-                       DerivedUnitFacade facade = DerivedUnitFacade.NewInstance(SpecimenOrObservationType.FieldUnit, (FieldUnit) parentElement);
-
-                       SpecimenDescription fieldObjectImageGallery = facade.getFieldObjectImageGallery(false);
-
-                       if(fieldObjectImageGallery != null){
-                           return Collections.singleton(fieldObjectImageGallery).toArray();
-                       }
+               else if (parentElement instanceof SpecimenOrObservationBase){
+                   SpecimenOrObservationBase<?> sob = (SpecimenOrObservationBase<?>)parentElement;
+                       return sob.getSpecimenDescriptionImageGallery().toArray();
                }
                return NO_CHILDREN;
        }
@@ -127,7 +102,7 @@ public class MediaContentProvider implements ITreeContentProvider{
        @Override
     public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {}
 
-       private List<Media> getImages(DescriptionBase description){
+       private List<Media> getImages(DescriptionBase<?> description){
                Assert.isTrue(description.isImageGallery(), "Description should have the imageGallery flag set."); //$NON-NLS-1$
 
                Set<DescriptionElementBase> elements = description.getElements();
@@ -143,10 +118,4 @@ public class MediaContentProvider implements ITreeContentProvider{
                }
                return null;
        }
-
-       private SpecimenDescription createDerivedUnitFacadeImageGallery(DerivedUnitFacade facade){
-               SpecimenDescription description = SpecimenDescription.NewInstance();
-               description.setImageGallery(true);
-               return description;
-       }
 }

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/AbstractCdmDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/AbstractCdmDetailElement.java
index ca12af7193df99d24c321706d1f7ab5598b8ff54..1a8a5078f3d592c2da008df372216c729e4205a4 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/AbstractCdmDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/AbstractCdmDetailElement.java
@@ -16,8 +16,6 @@ import java.util.Observer;
 
 import org.eclipse.jface.util.PropertyChangeEvent;
 import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.DisposeEvent;
-import org.eclipse.swt.events.DisposeListener;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
 
@@ -68,13 +66,8 @@ public abstract class AbstractCdmDetailElement<T>
                formFactory.addPropertyChangeListener(this);
                CdmStore.getLoginManager().addObserver(this);
 
-               getLayoutComposite().getParent().addDisposeListener(new DisposeListener() {
-
-            @Override
-            public void widgetDisposed(DisposeEvent e) {
-                CdmStore.getLoginManager().deleteObserver(AbstractCdmDetailElement.this);
-            }
-        });
+               getLayoutComposite().getParent().addDisposeListener(
+                       e -> CdmStore.getLoginManager().deleteObserver(AbstractCdmDetailElement.this));
        }
 
        /**

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 e675098c63104793ea85b71571e28b72010a7caa..239d8511be0cfcff4277028f56a9ceb05927fe5d 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
@@ -40,7 +40,9 @@ import eu.etaxonomy.taxeditor.ui.selection.EntitySelectionElement;
  * @author pplitzner
  * @date 16.12.2013
  */
-public class MediaSpecimenGeneralDetailElement extends AbstractCdmDetailElement<DerivedUnitFacade> implements ITogglableMediaElement{
+public class MediaSpecimenGeneralDetailElement
+        extends AbstractCdmDetailElement<MediaSpecimen>
+        implements ITogglableMediaElement{
 
     private final TermVocabulary<?> mediaSpecimenVocabulary = CdmStore.getService(IVocabularyService.class).find(VocabularyEnum.MediaSpecimenKindOfUnit.getUuid());
 

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/media/MediaSpecimenGeneralDetailSection.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/media/MediaSpecimenGeneralDetailSection.java
index 4aa00678fcd2293f216715b8cc57e3625c7d0a75..20de103f665e1bb0f4007bf722effa14bffc7a13 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/media/MediaSpecimenGeneralDetailSection.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/media/MediaSpecimenGeneralDetailSection.java
@@ -25,7 +25,6 @@ import eu.etaxonomy.taxeditor.ui.section.media.MediaViewSwitch;
 /**
  * @author pplitzner
  * @date 12.12.2013
- *
  */
 public class MediaSpecimenGeneralDetailSection extends AbstractCdmDetailSection<DerivedUnitFacade> {
 
@@ -60,6 +59,4 @@ public class MediaSpecimenGeneralDetailSection extends AbstractCdmDetailSection<
         toolBarManager.add(MediaViewSwitch.createSwitch(togglableMediaElement));
         return toolBarManager.createControl(this);
     }
-
-
-}
+}
\ No newline at end of file

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/e4/details/DetailsViewerE4.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/e4/details/DetailsViewerE4.java
index 2e1af647536d7157e195ce6e7f51990c7dce295f..1fdc73e46f252670738895d4e1df3b0229e22897 100755 (executable)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/e4/details/DetailsViewerE4.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/e4/details/DetailsViewerE4.java
@@ -323,33 +323,34 @@ public class DetailsViewerE4 extends AbstractCdmDataViewerE4 {
             }
         }
         else if (input instanceof DerivedUnitFacade) {
-            if(((DerivedUnitFacade) input).getType()==SpecimenOrObservationType.FieldUnit){
-                if(((DerivedUnitFacade) input).innerFieldUnit()==null){
+            DerivedUnitFacade facade = (DerivedUnitFacade) input;
+            if(facade.getType() == SpecimenOrObservationType.FieldUnit){
+                if(facade.innerFieldUnit() == null){
                     MessagingUtils.error(DetailsViewerE4.class, "FieldUnit of facade is null", null); //$NON-NLS-1$
                 }
                 else{
                     createFieldUnitSection(rootElement);
                 }
             }
-            else if(((DerivedUnitFacade) input).getType()==SpecimenOrObservationType.PreservedSpecimen){
-                if(((DerivedUnitFacade) input).innerDerivedUnit()==null){
+            else if(facade.getType() == SpecimenOrObservationType.PreservedSpecimen){
+                if(facade.innerDerivedUnit() == null){
                     MessagingUtils.error(DetailsViewerE4.class, "DerivedUnit of facade is null", null); //$NON-NLS-1$
                 }
                 else{
                     createDerivedUnitBaseElementSection(rootElement);
                 }
             }
-            else if(((DerivedUnitFacade) input).getType()==SpecimenOrObservationType.TissueSample){
+            else if(facade.getType() == SpecimenOrObservationType.TissueSample){
                 //TissueSample should only be created by using it's own class
                 //in future using only one class with different SpecimenOrObservationTypes is desired
                 createTissueSampleSection(rootElement);
             }
-            else if(((DerivedUnitFacade) input).getType()==SpecimenOrObservationType.DnaSample){
+            else if(facade.getType()==SpecimenOrObservationType.DnaSample){
 
-                if(((DerivedUnitFacade) input).innerDerivedUnit().getRecordBasis()==SpecimenOrObservationType.TissueSample){
+                if(facade.innerDerivedUnit().getRecordBasis()==SpecimenOrObservationType.TissueSample){
                     createTissueSampleSection(rootElement);
                 }
-                else if(((DerivedUnitFacade) input).innerDerivedUnit().getRecordBasis()==SpecimenOrObservationType.DnaSample){
+                else if(facade.innerDerivedUnit().getRecordBasis()==SpecimenOrObservationType.DnaSample){
                     createDnaSampleSection(rootElement);
                 }
             }else if (((DerivedUnitFacade) input).innerDerivedUnit() instanceof MediaSpecimen){
@@ -380,7 +381,7 @@ public class DetailsViewerE4 extends AbstractCdmDataViewerE4 {
             createFeatureDistributionSection(rootElement);
 
         } else if (input instanceof TermNode) {
-            TermType type= ((TermNode) input).getTermType();
+            TermType type= ((TermNode<?>) input).getTermType();
             if(type.equals(TermType.Character) ){
                 createCharacterNodeSection(rootElement);
             }