fix #10110 move barcode to general page

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 34725b351eefe81b20ce0653b42b23e3e06e71f6..4803f7648d00eec0281629ada69a39cbd4b8357a 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
@@ -44,8 +44,6 @@ public class DerivedUnitBaseDetailElement extends
 
        private TextWithLabelElement text_derivedUnitDefinitions;
 
-       private TextWithLabelElement text_barcode;
-
        private TextWithLabelElement text_catalogNumber;
 
        private EntitySelectionElement<TaxonName> selection_storedUnder;
@@ -95,7 +93,6 @@ public class DerivedUnitBaseDetailElement extends
                // "Specimen Definition",
                // facade.getDerivedUnitDefinition(CdmStore.getDefaultLanguage()),
                // style);
-        text_barcode = formFactory.createTextWithLabelElement(formElement, "Barcode", entity.getBarcode(), style);
         text_catalogNumber = formFactory.createTextWithLabelElement(formElement, "Catalog Number", entity.getCatalogNumber(), style);
 
 
@@ -152,8 +149,6 @@ public class DerivedUnitBaseDetailElement extends
        super.handleEvent(eventSource);
         if (eventSource == text_derivedUnitDefinitions) {
             getEntity().addDerivedUnitDefinition(text_derivedUnitDefinitions.getText(), CdmStore.getDefaultLanguage());
-        } else if (eventSource == text_barcode) {
-            getEntity().setBarcode(text_barcode.getText());
         } else if (eventSource == text_catalogNumber) {
             getEntity().setCatalogNumber(text_catalogNumber.getText());
         } else if (eventSource == combo_preservationMethod) {

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 633eb375f6b9a30b376f8968a2328e79130605bd..f62d0f4a236ba08bcbf13729b5014e45de7aa333 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
@@ -59,6 +59,7 @@ public class DerivedUnitGeneralDetailElement extends
        private TextWithLabelElement text_collectingNumber;
        private EntitySelectionElement<Collection> selection_collection;
        private TextWithLabelElement text_accessionNumber;
+    private TextWithLabelElement text_barcode;
        private GatheringEventUnitElement element_elevation;
        private UriWithLabelElement uriPreferredStableUri;
        private CheckboxElement checkIsPublish;
@@ -168,6 +169,8 @@ public class DerivedUnitGeneralDetailElement extends
                        getEntity().setCollection(selection_collection.getSelection());
                } else if (eventSource == text_accessionNumber) {
                        getEntity().setAccessionNumber(text_accessionNumber.getText());
+        } else if (eventSource == text_barcode) {
+            getEntity().setBarcode(text_barcode.getText());
                } else if (eventSource == combo_specorobstype) {
                        getEntity().setType(combo_specorobstype.getSelection());
                } else if (eventSource == uriPreferredStableUri) {

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 53404f31d093fbf8ea6ccb10d427c33bae7184e1..10231bbadb5496833643f2b6a387574d975b8da5 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
@@ -33,8 +33,6 @@ public class PreservedSpecimenDetailElement extends
 
        private TextWithLabelElement text_derivedUnitDefinitions;
 
-       private TextWithLabelElement text_barcode;
-
        private TextWithLabelElement text_catalogNumber;
 
        private EntitySelectionElement<TaxonName> selection_storedUnder;
@@ -70,7 +68,6 @@ public class PreservedSpecimenDetailElement extends
                // "Specimen Definition",
                // facade.getDerivedUnitDefinition(CdmStore.getDefaultLanguage()),
                // style);
-        text_barcode = formFactory.createTextWithLabelElement(formElement, "Barcode", entity.getBarcode(), style);
         text_catalogNumber = formFactory.createTextWithLabelElement(formElement, "Catalog Number", entity.getCatalogNumber(), style);
 
 
@@ -90,8 +87,6 @@ public class PreservedSpecimenDetailElement extends
     public void handleEvent(Object eventSource) {
         if (eventSource == text_derivedUnitDefinitions) {
             getEntity().putDefinition(CdmStore.getDefaultLanguage(), text_derivedUnitDefinitions.getText());
-        } else if (eventSource == text_barcode) {
-            getEntity().setBarcode(text_barcode.getText());
         } else if (eventSource == text_catalogNumber) {
             getEntity().setCatalogNumber(text_catalogNumber.getText());
         } else if (eventSource == combo_preservationMethod) {

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 04c039e1f83dba7875f8680e090fd6810a1784ea..198a66c2815f3d608016b88cbb331a5d6f75cd61 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
@@ -26,6 +26,7 @@ public class PreservedSpecimenGeneralDetailElement extends AbstractCdmDetailElem
     private ToggleableTextElement toggleableText_titleCache;
     private EntitySelectionElement<Collection> selection_collection;
     private TextWithLabelElement text_accessionNumber;
+    private TextWithLabelElement text_barcode;
 
     public PreservedSpecimenGeneralDetailElement(CdmFormFactory formFactory,
             ICdmFormElement formElement) {
@@ -46,6 +47,7 @@ public class PreservedSpecimenGeneralDetailElement extends AbstractCdmDetailElem
         text_accessionNumber = formFactory.createTextWithLabelElement(
                 formElement, "Accession Number", entity.getAccessionNumber(),
                 style);
+        text_barcode = formFactory.createTextWithLabelElement(formElement, "Barcode", entity.getBarcode(), style);
     }
 
     @Override
@@ -57,6 +59,8 @@ public class PreservedSpecimenGeneralDetailElement extends AbstractCdmDetailElem
             getEntity().setCollection(selection_collection.getSelection());
         } else if (eventSource == text_accessionNumber) {
             getEntity().setAccessionNumber(text_accessionNumber.getText());
+        } else if (eventSource == text_barcode) {
+            getEntity().setBarcode(text_barcode.getText());
         }
 
         if (eventSource != toggleableText_titleCache) {