- temporarily commented compile errors

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/AmplificationCloningDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/AmplificationCloningDetailElement.java
index 941e5dbf490f8560b900f385fddf291fe772f603..da80ca6040a678da7b0c68e43a7ea5662bd8f17b 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/AmplificationCloningDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/AmplificationCloningDetailElement.java
@@ -11,9 +11,7 @@ package eu.etaxonomy.taxeditor.ui.section.occurrence.dna;
 
 import eu.etaxonomy.cdm.model.agent.AgentBase;
 import eu.etaxonomy.cdm.model.common.DefinedTerm;
-import eu.etaxonomy.cdm.model.common.TermType;
 import eu.etaxonomy.cdm.model.molecular.Amplification;
-import eu.etaxonomy.cdm.model.molecular.Cloning;
 import eu.etaxonomy.taxeditor.ui.combo.TermComboElement;
 import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
 import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement;
@@ -51,11 +49,11 @@ public class AmplificationCloningDetailElement  extends AbstractCdmDetailElement
      */
     @Override
     protected void createControls(ICdmFormElement formElement, Amplification entity, int style) {
-        Cloning cloning = entity.getCloning();
-        textCloningStrain = formFactory.createTextWithLabelElement(formElement, "Cloning Strain", cloning==null?"":cloning.getStrain(), style);
-        date = formFactory.createTimePeriodElement(formElement, "Cloning Date", cloning==null?null:cloning.getTimeperiod(), style);
-        selectionCloningStaff = formFactory.createSelectionElement(AgentBase.class, getConversationHolder(), formElement, "Cloning Staff", cloning==null?null:cloning.getActor(), EntitySelectionElement.ALL, style);
-        comboCloningMaterialOrMethod = formFactory.createDefinedTermComboElement(TermType.MaterialOrMethod, formElement, "Cloning Mat. & Meth.", cloning==null?null:cloning.getDefinedMaterialOrMethod(), style);
+//        Cloning cloning = entity.getCloning();
+//        textCloningStrain = formFactory.createTextWithLabelElement(formElement, "Cloning Strain", cloning==null?"":cloning.getStrain(), style);
+//        date = formFactory.createTimePeriodElement(formElement, "Cloning Date", cloning==null?null:cloning.getTimeperiod(), style);
+//        selectionCloningStaff = formFactory.createSelectionElement(AgentBase.class, getConversationHolder(), formElement, "Cloning Staff", cloning==null?null:cloning.getActor(), EntitySelectionElement.ALL, style);
+//        comboCloningMaterialOrMethod = formFactory.createDefinedTermComboElement(TermType.MaterialOrMethod, formElement, "Cloning Mat. & Meth.", cloning==null?null:cloning.getDefinedMaterialOrMethod(), style);
     }
 
     /*
@@ -67,25 +65,25 @@ public class AmplificationCloningDetailElement  extends AbstractCdmDetailElement
      */
     @Override
     public void handleEvent(Object eventSource) {
-        if(eventSource==textCloningStrain || eventSource==date|| eventSource==selectionCloningStaff || eventSource==comboCloningMaterialOrMethod){
-            Cloning cloning = getEntity().getCloning();
-            if(cloning==null){
-                cloning = Cloning.NewInstance();
-                getEntity().setCloning(cloning);
-            }
-            if(eventSource==textCloningStrain){
-                cloning.setStrain(textCloningStrain.getText());
-            }
-            else if(eventSource==date){
-                cloning.setTimeperiod(date.getTimePeriod());
-            }
-            else if(eventSource==selectionCloningStaff){
-                cloning.setActor(selectionCloningStaff.getSelection());
-            }
-            else if(eventSource==comboCloningMaterialOrMethod){
-                cloning.setDefinedMaterialOrMethod(comboCloningMaterialOrMethod.getSelection());
-            }
-        }
+//        if(eventSource==textCloningStrain || eventSource==date|| eventSource==selectionCloningStaff || eventSource==comboCloningMaterialOrMethod){
+//            Cloning cloning = getEntity().getCloning();
+//            if(cloning==null){
+//                cloning = Cloning.NewInstance();
+//                getEntity().setCloning(cloning);
+//            }
+//            if(eventSource==textCloningStrain){
+//                cloning.setStrain(textCloningStrain.getText());
+//            }
+//            else if(eventSource==date){
+//                cloning.setTimeperiod(date.getTimePeriod());
+//            }
+//            else if(eventSource==selectionCloningStaff){
+//                cloning.setActor(selectionCloningStaff.getSelection());
+//            }
+//            else if(eventSource==comboCloningMaterialOrMethod){
+//                cloning.setDefinedMaterialOrMethod(comboCloningMaterialOrMethod.getSelection());
+//            }
+//        }
     }
 
 }

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/AmplificationGelPhotoCollectionDetailSection.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/AmplificationGelPhotoCollectionDetailSection.java
index ee60c70c9e212c0dc3d9630ead4da10e5e9e2887..e982e7ff2edb5aa93376ab3e1b02b0ade4b53cbb 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/AmplificationGelPhotoCollectionDetailSection.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/AmplificationGelPhotoCollectionDetailSection.java
@@ -45,9 +45,9 @@ public class AmplificationGelPhotoCollectionDetailSection extends AbstractEntity
      */
     @Override
     public Collection<Media> getCollection(Amplification entity) {
-        if(entity.getGelPhoto()!=null){
-            return Collections.singleton(entity.getGelPhoto());
-        }
+//        if(entity.getGelPhoto()!=null){
+//            return Collections.singleton(entity.getGelPhoto());
+//        }
         return Collections.EMPTY_LIST;
     }
 
@@ -56,9 +56,9 @@ public class AmplificationGelPhotoCollectionDetailSection extends AbstractEntity
      */
     @Override
     public Media createNewElement() {
-        if(getEntity().getGelPhoto()==null){
-            return Media.NewInstance();
-        }
+//        if(getEntity().getGelPhoto()==null){
+//            return Media.NewInstance();
+//        }
         return null;
     }
 
@@ -67,9 +67,9 @@ public class AmplificationGelPhotoCollectionDetailSection extends AbstractEntity
      */
     @Override
     public void addElement(Media element) {
-        if(getEntity().getGelPhoto()==null){
-            getEntity().setGelPhoto(element);
-        }
+//        if(getEntity().getGelPhoto()==null){
+//            getEntity().setGelPhoto(element);
+//        }
 
     }
 
@@ -78,7 +78,7 @@ public class AmplificationGelPhotoCollectionDetailSection extends AbstractEntity
      */
     @Override
     public void removeElement(Media element) {
-        getEntity().setGelPhoto(null);
+//        getEntity().setGelPhoto(null);
     }
 
     /* (non-Javadoc)

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/SingleReadGeneralDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/SingleReadGeneralDetailElement.java
index 4c85ed548547f5e3230df15a836e59c37d687133..0c2f933e8d92afc021cb6d57d81ee9bbaf237b97 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/SingleReadGeneralDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/SingleReadGeneralDetailElement.java
@@ -47,7 +47,7 @@ public class SingleReadGeneralDetailElement extends AbstractCdmDetailElement<Sin
     @Override
     protected void createControls(ICdmFormElement formElement, SingleRead entity, int style) {
         selectionPrimer = formFactory.createSelectionElement(Primer.class, getConversationHolder(), formElement, "Primer", entity.getPrimer(), EntitySelectionElement.ALL, style);
-        selectionAmplification = formFactory.createSelectionElement(Amplification.class, getConversationHolder(), formElement, "Amplification", entity.getAmplification(), EntitySelectionElement.ALL, style);
+//        selectionAmplification = formFactory.createSelectionElement(Amplification.class, getConversationHolder(), formElement, "Amplification", entity.getAmplification(), EntitySelectionElement.ALL, style);
 
         AnnotationSection annotationSection = formFactory.createAnnotationSection(getConversationHolder(), formElement, style);
         annotationSection.setLayoutData(LayoutConstants.FILL_HORIZONTALLY(2, 1));
@@ -67,7 +67,7 @@ public class SingleReadGeneralDetailElement extends AbstractCdmDetailElement<Sin
             getEntity().setPrimer(selectionPrimer.getSelection());
         }
         else if(eventSource==selectionAmplification){
-            selectionAmplification.getSelection().addSingleRead(getEntity());
+//            selectionAmplification.getSelection().addSingleRead(getEntity());
         }
     }
 }

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/derivateSearch/DerivateLabelProvider.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/derivateSearch/DerivateLabelProvider.java
index 5719782bebcd1f37a35bc2b0cddbdb10738ab8ec..5867eff5238b6daca436394bd777c3db962bf9b8 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/derivateSearch/DerivateLabelProvider.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/derivateSearch/DerivateLabelProvider.java
@@ -269,9 +269,9 @@ public class DerivateLabelProvider extends ColumnLabelProvider {
                 if(sequence!=null && sequence.getDnaMarker()!=null){
                     label += sequence.getDnaMarker()+separator;
                 }
-                if(singleRead.getAmplification()!=null && singleRead.getAmplification().getDescription()!=null){
-                    label += singleRead.getAmplification().getDescription()+separator;
-                }
+//                if(singleRead.getAmplification()!=null && singleRead.getAmplification().getDescription()!=null){
+//                    label += singleRead.getAmplification().getDescription()+separator;
+//                }
             }
         }
         //SOOB