Fixes #2269

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 62ed1b0a1ba61e0b814fd6bc1f2992007a0729d6..d98507df8967f2e00e8f212c83f525d1e726fa15 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
@@ -53,6 +53,8 @@ public class DerivedUnitBaseDetailElement extends AbstractCdmDetailElement<Deriv
        
        private SourceCollectionDetailSection section_source;
 
+       private TextWithLabelElement text_collectorsNumber;
+
        
        /**
         * <p>Constructor for DerivedUnitBaseDetailElement.</p>
@@ -73,6 +75,8 @@ public class DerivedUnitBaseDetailElement extends AbstractCdmDetailElement<Deriv
 //             text_derivedUnitDefinitions = formFactory.createTextWithLabelElement(formElement, "Specimen Definition", facade.getDerivedUnitDefinition(CdmStore.getDefaultLanguage()), style);
                text_accessionNumber = formFactory.createTextWithLabelElement(formElement, "Accession Number", entity.getAccessionNumber(), style);
                text_catalogNumber = formFactory.createTextWithLabelElement(formElement, "Catalog Number", entity.getCatalogNumber(), style);
+               text_collectorsNumber = formFactory.createTextWithLabelElement(formElement, "Collectors Number", entity.getCollectorsNumber(), style);
+               
                try {
                        combo_preservationMethod = (PreservationMethodComboElement) formFactory.createTermComboElement(TermComboType.PRESERVATION_METHOD, formElement, "Preservation Method", entity.getPreservationMethod(), style);
                } catch (MethodNotSupportedByDerivedUnitTypeException e) {
@@ -114,6 +118,9 @@ public class DerivedUnitBaseDetailElement extends AbstractCdmDetailElement<Deriv
                else if(eventSource == text_catalogNumber){
                        getEntity().setCatalogNumber(text_catalogNumber.getText());
                }
+               else if(eventSource == text_collectorsNumber){
+                       getEntity().setCollectorsNumber(text_collectorsNumber.getText());
+               }
                else if(eventSource == combo_preservationMethod){
                        try {
                                getEntity().setPreservationMethod(combo_preservationMethod.getSelection());

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/FieldObservationDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/FieldObservationDetailElement.java
index 5563028f1d59914651e9c8dc8894d1504b010bae..ab8cd328e2426f83239abf01626e725d088ac8df 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/FieldObservationDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/FieldObservationDetailElement.java
@@ -13,10 +13,10 @@ package eu.etaxonomy.taxeditor.ui.section.occurrence;
 import eu.etaxonomy.cdm.api.facade.DerivedUnitFacade;
 import eu.etaxonomy.taxeditor.store.CdmStore;
 import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.TermComboType;
 import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
 import eu.etaxonomy.taxeditor.ui.forms.NumberWithLabelElement;
 import eu.etaxonomy.taxeditor.ui.forms.TextWithLabelElement;
-import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.TermComboType;
 import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement;
 import eu.etaxonomy.taxeditor.ui.term.SexComboElement;
 import eu.etaxonomy.taxeditor.ui.term.StageComboElement;
@@ -36,8 +36,6 @@ public class FieldObservationDetailElement extends AbstractCdmDetailElement<Deri
 
        private TextWithLabelElement text_fieldObjectDefinition;
 
-       private TextWithLabelElement text_fieldNumber;
-
        private TextWithLabelElement text_fieldNotes;
 
        private NumberWithLabelElement number_individualCount;
@@ -65,7 +63,6 @@ public class FieldObservationDetailElement extends AbstractCdmDetailElement<Deri
                text_plantDescription = formFactory.createTextWithLabelElement(formElement, "Plant Description", entity.getPlantDescription(CdmStore.getDefaultLanguage()), style);
                // Disable for now
 //             text_fieldObjectDefinition = formFactory.createTextWithLabelElement(formElement, "Field Object Definition", entity.getFieldObjectDefinition(CdmStore.getDefaultLanguage()), style);
-               text_fieldNumber = formFactory.createTextWithLabelElement(formElement, "Field Number", entity.getFieldNumber(), style);
                text_fieldNotes = formFactory.createTextWithLabelElement(formElement, "Field Notes", entity.getFieldNotes(), style);
                
                number_individualCount = formFactory.createIntegerTextWithLabelElement(formElement, "Individual Count", entity.getIndividualCount(), style);
@@ -85,9 +82,6 @@ public class FieldObservationDetailElement extends AbstractCdmDetailElement<Deri
                else if(eventSource == text_fieldObjectDefinition){
                        getEntity().addFieldObjectDefinition(text_fieldObjectDefinition.getText(), CdmStore.getDefaultLanguage());
                }
-               else if(eventSource == text_fieldNumber){
-                       getEntity().setFieldNumber(text_fieldNumber.getText());
-               }
                else if(eventSource == text_fieldNotes){
                        getEntity().setFieldNotes(text_fieldNotes.getText());
                }

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/GeneralDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/GeneralDetailElement.java
index 72cabcc8cf82cc18b50ee3e1ff0ff7b7f111bb9c..21ff46b505e70939f75b42aed70d1997624efd1c 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/GeneralDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/GeneralDetailElement.java
@@ -40,7 +40,7 @@ public class GeneralDetailElement extends AbstractCdmDetailElement<DerivedUnitFa
        private NumberWithLabelElement number_elevation;
        private TimePeriodElement element_date;
        private AgentSelectionElement selection_collector;
-       private TextWithLabelElement text_collectionNumber;
+       private TextWithLabelElement text_fieldNumber;
        private CollectionSelectionElement selection_collection;
        private TextWithLabelElement text_barcode;
        
@@ -67,7 +67,7 @@ public class GeneralDetailElement extends AbstractCdmDetailElement<DerivedUnitFa
                number_elevation = formFactory.createIntegerTextWithLabelElement(formElement, "Absolute Elevation (m)", entity.getAbsoluteElevation(), style);
                element_date = formFactory.createTimePeriodElement(formElement, "Date", entity.getGatheringPeriod(), style);
                selection_collector = (AgentSelectionElement) formFactory.createSelectionElement(SelectionType.AGENT, getConversationHolder(), formElement, "Collector", entity.getCollector(), style);
-               text_collectionNumber = formFactory.createTextWithLabelElement(formElement, "Collectors Number", entity.getCollectorsNumber(), style);
+               text_fieldNumber = formFactory.createTextWithLabelElement(formElement, "Field Number", entity.getFieldNumber(), style);
                selection_collection = (CollectionSelectionElement) formFactory.createSelectionElement(SelectionType.COLLECTION, getConversationHolder(), formElement, "Collection", entity.getCollection(), style);    
                text_barcode = formFactory.createTextWithLabelElement(formElement, "Barcode", entity.getBarcode(), style);
        }
@@ -98,8 +98,8 @@ public class GeneralDetailElement extends AbstractCdmDetailElement<DerivedUnitFa
                else if(eventSource == selection_collector){
                        getEntity().setCollector(selection_collector.getSelection());
                }
-               else if(eventSource == text_collectionNumber){
-                       getEntity().setCollectorsNumber(text_collectionNumber.getText());
+               else if(eventSource == text_fieldNumber){
+                       getEntity().setFieldNumber(text_fieldNumber.getText());
                }
                else if(eventSource == selection_collection){
                        getEntity().setCollection(selection_collection.getSelection());