ref #9594 use MediaSpecimen as base unit for MediaSpecimenGeneralDetailElement

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 239d8511be0cfcff4277028f56a9ceb05927fe5d..465a2130a6e6e74a35455aae10b3b1c338923441 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
@@ -8,7 +8,6 @@
  */
 package eu.etaxonomy.taxeditor.ui.section.occurrence.media;
 
-import eu.etaxonomy.cdm.api.facade.DerivedUnitFacade;
 import eu.etaxonomy.cdm.api.service.IVocabularyService;
 import eu.etaxonomy.cdm.model.agent.AgentBase;
 import eu.etaxonomy.cdm.model.common.IdentifiableSource;
@@ -64,26 +63,21 @@ public class MediaSpecimenGeneralDetailElement
     }
 
     @Override
-    protected void createControls(ICdmFormElement formElement, DerivedUnitFacade entity, int style) {
-        MediaSpecimen specimen = null;
-        if (entity.innerDerivedUnit() instanceof MediaSpecimen){
-             specimen = (MediaSpecimen)entity.innerDerivedUnit();
-        }
-        Media media = null;
-        if (specimen != null){
-            media = specimen.getMediaSpecimen();
-        }
+    protected void createControls(ICdmFormElement formElement, MediaSpecimen entity, int style) {
+
+        Media media = entity == null ? null: entity.getMediaSpecimen();
+
         if(media==null){
             formFactory.createLabel(formElement, "No media attached to this MediaSpecimen!");
         }
         else{
-            comboKindOfUnit = formFactory.createDefinedTermComboElement(mediaSpecimenVocabulary, formElement, "Kind of Media", specimen.getKindOfUnit(), style);
+            comboKindOfUnit = formFactory.createDefinedTermComboElement(mediaSpecimenVocabulary, formElement, "Kind of Media", entity.getKindOfUnit(), style);
             textTitleLanguageString = formFactory.createLanguageStringWithLabelElement(formElement, "Motif", media.getTitle(), style);
             LabelElement label1 = formFactory.createLabel(formElement, "");
 
             selectionArtist = formFactory.createSelectionElement(AgentBase.class, //getConversationHolder(),
                     formElement, "Prepared by", media.getArtist(), EntitySelectionElement.ALL, style);
-            TimePeriod mediaCreated = specimen.getMediaSpecimen().getMediaCreated();
+            TimePeriod mediaCreated = entity.getMediaSpecimen().getMediaCreated();
 
             date = formFactory.createTimePeriodElement(formElement, "Preparation Date", mediaCreated, style);
             textMethodLanguageString = formFactory.createLanguageStringWithLabelElement(formElement, "Method", media.getDescription(Language.getDefaultLanguage()), style);
@@ -120,13 +114,13 @@ public class MediaSpecimenGeneralDetailElement
 
     @Override
     public void handleEvent(Object eventSource) {
-        Media media = ((MediaSpecimen)getEntity().innerDerivedUnit()).getMediaSpecimen();
+        Media media = getEntity().getMediaSpecimen();
         if(media==null){
             media = Media.NewInstance();
-            ((MediaSpecimen)getEntity().innerDerivedUnit()).setMediaSpecimen(media);
+            getEntity().setMediaSpecimen(media);
         }
         if(eventSource==comboKindOfUnit){
-            ((MediaSpecimen)getEntity().innerDerivedUnit()).setKindOfUnit(comboKindOfUnit.getSelection());
+            getEntity().setKindOfUnit(comboKindOfUnit.getSelection());
         }
         else if(eventSource==textTitleLanguageString){
             media.putTitle(textTitleLanguageString.getLanguageString());
@@ -178,7 +172,7 @@ public class MediaSpecimenGeneralDetailElement
             }
         }
         else if(eventSource==checkIsPublish){
-            ((MediaSpecimen)getEntity().innerDerivedUnit()).setPublish(checkIsPublish.getSelection());
+            getEntity().setPublish(checkIsPublish.getSelection());
         }
     }
 

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 20de103f665e1bb0f4007bf722effa14bffc7a13..c9038d29ddeb8de9e74cc152a53163b439ca8500 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
@@ -14,7 +14,7 @@ import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Control;
 
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
-import eu.etaxonomy.cdm.api.facade.DerivedUnitFacade;
+import eu.etaxonomy.cdm.model.occurrence.MediaSpecimen;
 import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
 import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement;
 import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement;
@@ -26,7 +26,7 @@ import eu.etaxonomy.taxeditor.ui.section.media.MediaViewSwitch;
  * @author pplitzner
  * @date 12.12.2013
  */
-public class MediaSpecimenGeneralDetailSection extends AbstractCdmDetailSection<DerivedUnitFacade> {
+public class MediaSpecimenGeneralDetailSection extends AbstractCdmDetailSection<MediaSpecimen> {
 
     private ITogglableMediaElement togglableMediaElement;
 
@@ -47,7 +47,7 @@ public class MediaSpecimenGeneralDetailSection extends AbstractCdmDetailSection<
     }
 
     @Override
-    protected AbstractCdmDetailElement<DerivedUnitFacade> createCdmDetailElement(AbstractCdmDetailSection<DerivedUnitFacade> parentElement, int style) {
+    protected AbstractCdmDetailElement<MediaSpecimen> createCdmDetailElement(AbstractCdmDetailSection<MediaSpecimen> parentElement, int style) {
         MediaSpecimenGeneralDetailElement mediaSpecimenGeneralDetailElement = formFactory.createMediaSpecimenGeneralDetailElement(parentElement);
         togglableMediaElement = mediaSpecimenGeneralDetailElement;
         return mediaSpecimenGeneralDetailElement;