cleanup

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DerivedUnitBaseDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DerivedUnitBaseDetailElement.java
index 7e7133ab32b7f06eda3f5f717c1258bf2d6c15b0..34725b351eefe81b20ce0653b42b23e3e06e71f6 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DerivedUnitBaseDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DerivedUnitBaseDetailElement.java
@@ -54,14 +54,12 @@ public class DerivedUnitBaseDetailElement extends
 
        private TermComboElement<DefinedTerm> combo_preservationMethod;
 
-       private SpecimenCollectionDetailSection section_duplicates;
-
        private SourceCollectionDetailSection section_source;
 
     private OriginalLabelDataElement textOriginalLabel;
 
     private DerivedUnitMediaSection mediaDetailElement;
-    
+
 
 
        /**
@@ -89,7 +87,6 @@ public class DerivedUnitBaseDetailElement extends
         this.showOnlyDerivedUnitData = showOnlyDerivedUnitData;
     }
 
-    /** {@inheritDoc} */
        @Override
     protected void createControls(ICdmFormElement formElement, DerivedUnitFacade entity, int style) {
                // Disable for now
@@ -133,8 +130,8 @@ public class DerivedUnitBaseDetailElement extends
 
 
                super.createControls(formElement, entity, style);
-               
-               
+
+
                section_source = formFactory.createSourceCollectionDetailSection(getConversationHolder(), formElement, StoreUtil.getSectionStyle(SourceCollectionDetailSection.class, entity.getClass().getCanonicalName()));
                section_source.setLayoutData(LayoutConstants.FILL_HORIZONTALLY(2, 1));
                section_source.setEntity(entity);

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DerivedUnitGeneralDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DerivedUnitGeneralDetailElement.java
index 08bf5fc6adca2259126b4db8b026fe316e4377e9..633eb375f6b9a30b376f8968a2328e79130605bd 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DerivedUnitGeneralDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/DerivedUnitGeneralDetailElement.java
@@ -6,24 +6,18 @@
  * 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.api.facade.DerivedUnitFacade;
-import eu.etaxonomy.cdm.model.agent.AgentBase;
 import eu.etaxonomy.cdm.model.agent.Person;
 import eu.etaxonomy.cdm.model.agent.Team;
 import eu.etaxonomy.cdm.model.common.LanguageString;
 import eu.etaxonomy.cdm.model.location.NamedArea;
 import eu.etaxonomy.cdm.model.occurrence.Collection;
-import eu.etaxonomy.cdm.model.occurrence.OccurrenceStatus;
 import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationType;
-import eu.etaxonomy.cdm.model.term.DefinedTerm;
-import eu.etaxonomy.cdm.model.term.DefinedTermBase;
 import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
 import eu.etaxonomy.taxeditor.store.StoreUtil;
 import eu.etaxonomy.taxeditor.ui.combo.EnumComboElement;
-import eu.etaxonomy.taxeditor.ui.combo.term.TermComboElement;
 import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
 import eu.etaxonomy.taxeditor.ui.element.CheckboxElement;
 import eu.etaxonomy.taxeditor.ui.element.GatheringEventUnitElement;
@@ -44,7 +38,6 @@ import eu.etaxonomy.taxeditor.ui.selection.EntitySelectionElement;
 /**
  * @author n.hoffmann
  * @created Dec 16, 2010
- * @version 1.0
  */
 public class DerivedUnitGeneralDetailElement extends
                AbstractCdmDetailElement<DerivedUnitFacade> {
@@ -88,7 +81,7 @@ public class DerivedUnitGeneralDetailElement extends
                    combo_specorobstype = formFactory.createEnumComboElement(SpecimenOrObservationType.class, formElement, style);
                    combo_specorobstype.setSelection(entity.getType());
                    combo_specorobstype.setEnabled(showSpecimenType);
-                   selection_country = formFactory.createSelectionElement(NamedArea.class, //getConversationHolder(),
+                   selection_country = formFactory.createSelectionElement(NamedArea.class,
                            formElement, "Country",
                            entity.getCountry(), EntitySelectionElement.DELETABLE, style);
 
@@ -131,11 +124,13 @@ public class DerivedUnitGeneralDetailElement extends
                text_accessionNumber = formFactory.createTextWithLabelElement(
                                formElement, "Accession Number", entity.getAccessionNumber(),
                                style);
+               text_barcode = formFactory.createTextWithLabelElement(formElement, "Barcode", entity.getBarcode(), style);
+
                uriPreferredStableUri = formFactory.createUriWithLabelElement(formElement, "Pref. Stable URI", entity.getPreferredStableUri(), style);
                section_status = formFactory.createStatusCollectionDetailSection(getConversationHolder(), formElement, StoreUtil.getSectionStyle(SourceCollectionDetailSection.class, entity.getClass().getCanonicalName()));
                section_status.setLayoutData(LayoutConstants.FILL_HORIZONTALLY(2, 1));
                section_status.setEntity(entity);
-               
+
                checkIsPublish = formFactory.createCheckbox(formElement, "Publish", entity.innerDerivedUnit().isPublish(), style);
 
        }

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/derivedUnit/PreservedSpecimenDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/derivedUnit/PreservedSpecimenDetailElement.java
index 90314a1289210224507d3d83c2a94377a3a35399..53404f31d093fbf8ea6ccb10d427c33bae7184e1 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/derivedUnit/PreservedSpecimenDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/derivedUnit/PreservedSpecimenDetailElement.java
@@ -6,7 +6,6 @@
  * 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.derivedUnit;
 
 import eu.etaxonomy.cdm.model.name.TaxonName;
@@ -23,17 +22,11 @@ import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement;
 import eu.etaxonomy.taxeditor.ui.element.LayoutConstants;
 import eu.etaxonomy.taxeditor.ui.element.TextWithLabelElement;
 import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement;
-import eu.etaxonomy.taxeditor.ui.section.occurrence.SpecimenCollectionDetailSection;
 import eu.etaxonomy.taxeditor.ui.selection.EntitySelectionElement;
 
 /**
- * <p>
- * DerivedUnitBaseDetailElement class.
- * </p>
- *
  * @author n.hoffmann
  * @created Jun 24, 2010
- * @version 1.0
  */
 public class PreservedSpecimenDetailElement extends
                AbstractCdmDetailElement<DerivedUnit> {
@@ -50,8 +43,6 @@ public class PreservedSpecimenDetailElement extends
 
        private TermComboElement<DefinedTerm> combo_preservationMethod;
 
-       private SpecimenCollectionDetailSection section_duplicates;
-
        private PreservedSpecimenSourceCollectionDetailSection section_source;
 
        /**
@@ -71,7 +62,6 @@ public class PreservedSpecimenDetailElement extends
                super(formFactory, formElement);
        }
 
-       /** {@inheritDoc} */
        @Override
     protected void createControls(ICdmFormElement formElement, DerivedUnit entity, int style) {
                // Disable for now
@@ -96,7 +86,6 @@ public class PreservedSpecimenDetailElement extends
                section_source.setEntity(entity);
        }
 
-    /** {@inheritDoc} */
     @Override
     public void handleEvent(Object eventSource) {
         if (eventSource == text_derivedUnitDefinitions) {

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/derivedUnit/PreservedSpecimenGeneralDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/derivedUnit/PreservedSpecimenGeneralDetailElement.java
index b4a51ecf7bec40e414d3f3f695d70be18ad2bdae..04c039e1f83dba7875f8680e090fd6810a1784ea 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/derivedUnit/PreservedSpecimenGeneralDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/derivedUnit/PreservedSpecimenGeneralDetailElement.java
@@ -20,7 +20,6 @@ import eu.etaxonomy.taxeditor.ui.selection.EntitySelectionElement;
 /**
  * @author pplitzner
  * @date 17.12.2013
- *
  */
 public class PreservedSpecimenGeneralDetailElement extends AbstractCdmDetailElement<DerivedUnit> {
 
@@ -28,23 +27,11 @@ public class PreservedSpecimenGeneralDetailElement extends AbstractCdmDetailElem
     private EntitySelectionElement<Collection> selection_collection;
     private TextWithLabelElement text_accessionNumber;
 
-
-    /**
-     * @param formFactory
-     * @param formElement
-     */
     public PreservedSpecimenGeneralDetailElement(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,
             DerivedUnit entity, int style) {
@@ -52,7 +39,7 @@ public class PreservedSpecimenGeneralDetailElement extends AbstractCdmDetailElem
                 formElement, "Title Cache", entity.getTitleCache(),
                 entity.isProtectedTitleCache(), style);
         selection_collection = formFactory
-                .createSelectionElement(Collection.class,//getConversationHolder(),
+                .createSelectionElement(Collection.class,
                         formElement, "Collection",
                         entity.getCollection(),
                         EntitySelectionElement.ALL, style);
@@ -61,13 +48,6 @@ public class PreservedSpecimenGeneralDetailElement extends AbstractCdmDetailElem
                 style);
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see
-     * eu.etaxonomy.taxeditor.section.AbstractCdmDetailElement#handleEvent(java
-     * .lang.Object)
-     */
     @Override
     public void handleEvent(Object eventSource) {
         if (eventSource == toggleableText_titleCache) {
@@ -78,9 +58,9 @@ public class PreservedSpecimenGeneralDetailElement extends AbstractCdmDetailElem
         } else if (eventSource == text_accessionNumber) {
             getEntity().setAccessionNumber(text_accessionNumber.getText());
         }
+
         if (eventSource != toggleableText_titleCache) {
             toggleableText_titleCache.setText(getEntity().getTitleCache());
         }
     }
-
 }