- added elements for Sequence/Amplification/SingleRead DetailsView

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/AmplificationGeneralDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/AmplificationGeneralDetailElement.java
index ee8737c284287b5c0fcc3912a585efef0fb7589e..bdeb20db9effc5ab59bb5912fb05ca57913b6309 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/AmplificationGeneralDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/AmplificationGeneralDetailElement.java
@@ -9,10 +9,18 @@
 */
 package eu.etaxonomy.taxeditor.ui.section.occurrence;
 
+import eu.etaxonomy.cdm.model.agent.AgentBase;
+import eu.etaxonomy.cdm.model.common.DefinedTerm;
 import eu.etaxonomy.cdm.model.molecular.Amplification;
+import eu.etaxonomy.cdm.model.reference.Reference;
 import eu.etaxonomy.taxeditor.ui.campanula.compatibility.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.combo.TermComboElement;
 import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.element.NumberWithLabelElement;
+import eu.etaxonomy.taxeditor.ui.element.TextWithLabelElement;
+import eu.etaxonomy.taxeditor.ui.element.TimePeriodElement;
 import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement;
+import eu.etaxonomy.taxeditor.ui.selection.EntitySelectionElement;
 
 /**
  * @author pplitzner
@@ -21,6 +29,36 @@ import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement;
  */
 public class AmplificationGeneralDetailElement extends AbstractCdmDetailElement<Amplification> {
 
+    private TermComboElement<DefinedTerm> comboMarker;
+    private TimePeriodElement dateAmplification;
+    private EntitySelectionElement<AgentBase> selectionAmplificationStaff;
+    private TextWithLabelElement textAmplificationSuccess;
+    private TextWithLabelElement textAmplificationSuccessDetails;
+    private TermComboElement<DefinedTerm> comboAmplificationMaterialOrMethod;
+
+    private NumberWithLabelElement numberGelVoltage;
+    private NumberWithLabelElement numberGelConcentration;
+    private NumberWithLabelElement numberGelRunningTime;
+    private TextWithLabelElement textLadderUsed;
+    private TextWithLabelElement textGelPhoto;
+
+    private TermComboElement<DefinedTerm> comboPurificationMaterialOrMethod;
+    //first Primer
+    private TextWithLabelElement textPrimer1Direction;
+    private TextWithLabelElement textPrimer1Name;
+    private TextWithLabelElement textPrimer1Sequence;
+    private EntitySelectionElement<Reference> selectionPrimer1Reference;
+    //second Primer
+    private TextWithLabelElement textPrimer2Direction;
+    private TextWithLabelElement textPrimer2Name;
+    private TextWithLabelElement textPrimer2Sequence;
+    private EntitySelectionElement<Reference> selectionPrimer2Reference;
+    //cloning
+    private TextWithLabelElement textCloningStrain;
+    private TimePeriodElement dateCloning;
+    private EntitySelectionElement<AgentBase> selectionCloningStaff;
+    private TermComboElement<DefinedTerm> comboCloningMaterialOrMethod;
+
 
     /**
      * @param formFactory
@@ -39,6 +77,27 @@ public class AmplificationGeneralDetailElement extends AbstractCdmDetailElement<
      */
     @Override
     protected void createControls(ICdmFormElement formElement, Amplification entity, int style) {
+        comboMarker = formFactory.createTermComboElement(DefinedTerm.class, formElement, "Marker", entity.getDnaMarker(), style);
+        dateAmplification = formFactory.createTimePeriodElement(formElement, "Amplification Date", entity.getTimeperiod(), style);
+        selectionAmplificationStaff = formFactory.createSelectionElement(AgentBase.class, getConversationHolder(), formElement, "Amplification staff", entity.getActor(), EntitySelectionElement.ALL, style);
+        textAmplificationSuccess = formFactory.createTextWithLabelElement(formElement, "Amplification Success", entity.getSuccessful().toString(), style);
+        textAmplificationSuccessDetails = formFactory.createTextWithLabelElement(formElement, "Ampl. Success Details", entity.getSuccessText(), style);
+//        comboAmplificationMaterialOrMethod = formFactory.createTermComboElement(DefinedTerm.class, formElement, "Ampl. Mat. & Meth.", entity.get, style)
+        numberGelVoltage = formFactory.createNumberTextWithLabelElement(formElement, "Gel Voltage (V)", entity.getElectrophoresisVoltage(), style);
+        numberGelConcentration = formFactory.createNumberTextWithLabelElement(formElement, "Gel Concentration", entity.getGelConcentration(), style);
+        numberGelRunningTime = formFactory.createNumberTextWithLabelElement(formElement, "Gel Ruinning Time (Min)", entity.getGelRunningTime(), style);
+        textLadderUsed = formFactory.createTextWithLabelElement(formElement, "Ladder Used", entity.getLadderUsed(), style);
+
+        comboPurificationMaterialOrMethod = formFactory.createTermComboElement(DefinedTerm.class, formElement, "Purification Mat. & Meth.", entity.getPurification().getDefinedMaterialOrMethod(), style);
+
+        //first primer
+
+        //second primer
+
+        textCloningStrain = formFactory.createTextWithLabelElement(formElement, "Cloning Strain", entity.getCloning().getStrain(), style);
+        dateCloning = formFactory.createTimePeriodElement(formElement, "Cloning Date", entity.getCloning().getTimeperiod(), style);
+        selectionCloningStaff = formFactory.createSelectionElement(AgentBase.class, getConversationHolder(), formElement, "Cloning Staff", entity.getCloning().getActor(), EntitySelectionElement.ALL, style);
+        comboCloningMaterialOrMethod = formFactory.createTermComboElement(DefinedTerm.class, formElement, "Cloning Mat. & Meth.", entity.getCloning().getDefinedMaterialOrMethod(), style);
     }
 
     /*

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/SequenceGeneralDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/SequenceGeneralDetailElement.java
index 2a4839e84aa49b6a6722b0507b3797bbe4a02148..9d5d7106704b01aacd1b2fcd82ba9fb36bfade45 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/SequenceGeneralDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/SequenceGeneralDetailElement.java
@@ -9,9 +9,11 @@
 */
 package eu.etaxonomy.taxeditor.ui.section.occurrence;
 
+import eu.etaxonomy.cdm.model.common.DefinedTerm;
 import eu.etaxonomy.cdm.model.molecular.Sequence;
 import eu.etaxonomy.cdm.model.reference.Reference;
 import eu.etaxonomy.taxeditor.ui.campanula.compatibility.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.combo.TermComboElement;
 import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
 import eu.etaxonomy.taxeditor.ui.element.TextWithLabelElement;
 import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement;
@@ -24,7 +26,7 @@ import eu.etaxonomy.taxeditor.ui.selection.EntitySelectionElement;
  */
 public class SequenceGeneralDetailElement extends AbstractCdmDetailElement<Sequence> {
 
-    private TextWithLabelElement textMarker;
+    private TermComboElement<DefinedTerm> comboMarker;
     private TextWithLabelElement textContigFile;
     private TextWithLabelElement textConsensusSequence;
     private TextWithLabelElement textConsensusSequenceLength;
@@ -52,8 +54,8 @@ public class SequenceGeneralDetailElement extends AbstractCdmDetailElement<Seque
      */
     @Override
     protected void createControls(ICdmFormElement formElement, Sequence entity, int style) {
-        textMarker = formFactory.createTextWithLabelElement(formElement, "DNA Marker",
-                entity.getDnaMarker()!=null?entity.getDnaMarker().getDescription():"",
+        comboMarker = formFactory.createTermComboElement(DefinedTerm.class, formElement, "DNA Marker",
+                entity.getDnaMarker(),
                         style);
         textContigFile = formFactory.createTextWithLabelElement(formElement, "Contig File", "XXX", style);
         textConsensusSequence = formFactory.createTextWithLabelElement(formElement, "Consensus Sequence 5'->3'", entity.getConsensusSequence().getString(), style);

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/SingleReadGeneralDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/SingleReadGeneralDetailElement.java
index a80278267052b90258c150e81652e3c585594183..8117b0b0e5a845fddc59e0c719c4e299123efd3b 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/SingleReadGeneralDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/SingleReadGeneralDetailElement.java
@@ -1,18 +1,25 @@
 // $Id$
 /**
-* Copyright (C) 2014 EDIT
-* European Distributed Institute of Taxonomy
-* http://www.e-taxonomy.eu
-*
-* The contents of this file are subject to the Mozilla Public License Version 1.1
-* See LICENSE.TXT at the top of this package for the full license terms.
-*/
+ * Copyright (C) 2014 EDIT
+ * European Distributed Institute of Taxonomy
+ * http://www.e-taxonomy.eu
+ *
+ * The contents of this file are subject to the Mozilla Public License Version 1.1
+ * See LICENSE.TXT at the top of this package for the full license terms.
+ */
 package eu.etaxonomy.taxeditor.ui.section.occurrence;
 
+import eu.etaxonomy.cdm.model.agent.AgentBase;
+import eu.etaxonomy.cdm.model.common.DefinedTerm;
 import eu.etaxonomy.cdm.model.molecular.SingleRead;
+import eu.etaxonomy.cdm.model.reference.Reference;
 import eu.etaxonomy.taxeditor.ui.campanula.compatibility.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.combo.TermComboElement;
 import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.element.TextWithLabelElement;
+import eu.etaxonomy.taxeditor.ui.element.TimePeriodElement;
 import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement;
+import eu.etaxonomy.taxeditor.ui.selection.EntitySelectionElement;
 
 /**
  * @author pplitzner
@@ -21,34 +28,64 @@ import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement;
  */
 public class SingleReadGeneralDetailElement extends AbstractCdmDetailElement<SingleRead> {
 
-        /**
-         * @param formFactory
-         * @param formElement
-         */
-        public SingleReadGeneralDetailElement(CdmFormFactory formFactory, ICdmFormElement formElement) {
-            super(formFactory, formElement);
-        }
-
-        /*
-         * (non-Javadoc)
-         *
-         * @see
-         * eu.etaxonomy.taxeditor.section.AbstractCdmDetailElement#createControls
-         * (eu.etaxonomy.taxeditor.forms.ICdmFormElement, java.lang.Object, int)
-         */
-        @Override
-        protected void createControls(ICdmFormElement formElement, SingleRead entity, int style) {
-        }
-
-        /*
-         * (non-Javadoc)
-         *
-         * @see
-         * eu.etaxonomy.taxeditor.section.AbstractCdmDetailElement#handleEvent(java
-         * .lang.Object)
-         */
-        @Override
-        public void handleEvent(Object eventSource) {
-        }
+
+    private TimePeriodElement dateElement;
+    private EntitySelectionElement<AgentBase> selectionSequencingStaff;
+    private TermComboElement<DefinedTerm> comboMaterialOrMethod;
+    private TextWithLabelElement textChromatogram;
+    private TextWithLabelElement textReadLength;
+    private TextWithLabelElement textEditedSequence;
+    private TextWithLabelElement textPrimerName;
+    private TextWithLabelElement textPrimerSequence;
+    private EntitySelectionElement<Reference> selectionReference;
+
+    /**
+     * @param formFactory
+     * @param formElement
+     */
+    public SingleReadGeneralDetailElement(CdmFormFactory formFactory, ICdmFormElement formElement) {
+        super(formFactory, formElement);
+    }
+
+    /*
+     * (non-Javadoc)
+     *
+     * @see
+     * eu.etaxonomy.taxeditor.section.AbstractCdmDetailElement#createControls
+     * (eu.etaxonomy.taxeditor.forms.ICdmFormElement, java.lang.Object, int)
+     */
+    @Override
+    protected void createControls(ICdmFormElement formElement, SingleRead entity, int style) {
+
+        dateElement = formFactory.createTimePeriodElement(formElement, "Sequencing Date", entity.getDateSequenced(), style);
+        selectionSequencingStaff = formFactory
+                .createSelectionElement(AgentBase.class,
+                        getConversationHolder(), formElement, "Sequencing Staff",
+                        null,
+                        EntitySelectionElement.ALL, style);
+//        comboMaterialOrMethod = formFactory.createTermComboElement(DefinedTerm.class, formElement, "Mat. & Meth.", entity.getMaterialOrMethod().getDefinedMaterialOrMethod(), style);
+        textChromatogram = formFactory.createTextWithLabelElement(formElement, "Read Chromatogram", "XXX", style);
+//        textReadLength = formFactory.createTextWithLabelElement(formElement, "Read Length", entity.getSequence().getLength().toString(), style);
+//        textEditedSequence = formFactory.createTextWithLabelElement(formElement, "Edited Sequence 5'->3'", entity.getSequenceString(), style);
+//        textPrimerName = formFactory.createTextWithLabelElement(formElement, "Primer Name", entity.getPrimer().getLabel(), style);
+//        textPrimerSequence = formFactory.createTextWithLabelElement(formElement, "Primer seq. 5'->3'", entity.getPrimer().getSequence().getSequenceString(), style);
+
+        selectionReference = formFactory
+                .createSelectionElement(Reference.class,
+                        getConversationHolder(), formElement, "Reference",
+                        null,
+                        EntitySelectionElement.ALL, style);
+    }
+
+    /*
+     * (non-Javadoc)
+     *
+     * @see
+     * eu.etaxonomy.taxeditor.section.AbstractCdmDetailElement#handleEvent(java
+     * .lang.Object)
+     */
+    @Override
+    public void handleEvent(Object eventSource) {
+    }
 
 }