- renamed interface IDerivedUnitFacadeEditor to IDerivedUnitFacadePart

 - show field unit data in NewDerivedUnitBaseWizard

diff --git a/.gitattributes b/.gitattributes
index a2d3cead3be7502f93eb38c702bacb0fdcf73fe8..6d6bec283ad097789a85df1487eacf0c68a5ab6c 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -1268,7 +1268,7 @@ eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/FeatureN
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/ICdmEditorHandle.java -text
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/IContextListener.java -text
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/IDataChangeBehavior.java -text
-eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/IDerivedUnitFacadeEditor.java -text
+eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/IDerivedUnitFacadePart.java -text
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/IDirtyMarkable.java -text
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/IElementHasDetails.java -text
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/IPartChangeListener.java -text

diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/BulkEditor.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/BulkEditor.java
index ae35111c6cc7b0a1fad4d98315c625fb72592da9..c05e3483c3c164e4b3de53ff0a795e3ac1030c69 100644 (file)
--- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/BulkEditor.java
+++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/BulkEditor.java
@@ -45,7 +45,7 @@ import eu.etaxonomy.taxeditor.annotatedlineeditor.LineAnnotation;
 import eu.etaxonomy.taxeditor.annotatedlineeditor.LineAnnotationModel;
 import eu.etaxonomy.taxeditor.bulkeditor.input.AbstractBulkEditorInput;
 import eu.etaxonomy.taxeditor.bulkeditor.referencingobjects.ReferencingObjectsView;
-import eu.etaxonomy.taxeditor.model.IDerivedUnitFacadeEditor;
+import eu.etaxonomy.taxeditor.model.IDerivedUnitFacadePart;
 import eu.etaxonomy.taxeditor.model.IDirtyMarkable;
 import eu.etaxonomy.taxeditor.model.IPartContentHasDetails;
 import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
@@ -61,7 +61,7 @@ import eu.etaxonomy.taxeditor.store.CdmStore;
  * @version 1.0
  */
 public class BulkEditor extends AnnotatedLineEditor implements IPartContentHasDetails,
-        IDirtyMarkable, IDerivedUnitFacadeEditor {
+        IDirtyMarkable, IDerivedUnitFacadePart {
 
        /** Constant <code>ID="bulkeditor.editor"</code> */
        public static final String ID = "bulkeditor.editor";

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/IDerivedUnitFacadeEditor.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/IDerivedUnitFacadePart.java
similarity index 94%
rename from eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/IDerivedUnitFacadeEditor.java
rename to eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/IDerivedUnitFacadePart.java
index 3825c56be42a5318f028e16bbe0ce0af8807c1ed..a773b8ba5c2bac9a3666714c33cc7934ba0d1f15 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/IDerivedUnitFacadeEditor.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/IDerivedUnitFacadePart.java
@@ -21,6 +21,6 @@ import eu.etaxonomy.cdm.model.occurrence.FieldUnit;
  * @date Dec 3, 2014
  *
  */
-public interface IDerivedUnitFacadeEditor {
+public interface IDerivedUnitFacadePart {
 
 }

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewDerivedUnitBaseWizard.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewDerivedUnitBaseWizard.java
index c7c6cf5639c9f0b4a45a7f1928c5683f4a48eb58..e9967a006000d04c56ac0cb3ee379710d48b2d7d 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewDerivedUnitBaseWizard.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewDerivedUnitBaseWizard.java
@@ -18,6 +18,7 @@ import eu.etaxonomy.cdm.model.occurrence.FieldUnit;
 import eu.etaxonomy.cdm.model.occurrence.MediaSpecimen;
 import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase;
 import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationType;
+import eu.etaxonomy.taxeditor.model.IDerivedUnitFacadePart;
 import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
 import eu.etaxonomy.taxeditor.store.CdmStore;
 import eu.etaxonomy.taxeditor.ui.section.occurrence.DerivedUnitBaseWizardPage;
@@ -33,7 +34,7 @@ import eu.etaxonomy.taxeditor.ui.section.occurrence.GatheringEventWizardPage;
  * @created Jun 16, 2010
  * @version 1.0
  */
-public class NewDerivedUnitBaseWizard extends AbstractNewEntityWizard<SpecimenOrObservationBase> {
+public class NewDerivedUnitBaseWizard extends AbstractNewEntityWizard<SpecimenOrObservationBase> implements IDerivedUnitFacadePart{
        private SpecimenOrObservationType specOrObsType = null;
 
        public NewDerivedUnitBaseWizard() {

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 c388bee71d579f04efeba6bb5491a767299052f2..acd4690a3b9b01856249247e6bf24790eaae012c 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
@@ -11,10 +11,23 @@
 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.common.LanguageString;
+import eu.etaxonomy.cdm.model.location.NamedArea;
 import eu.etaxonomy.cdm.model.occurrence.Collection;
+import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationType;
+import eu.etaxonomy.taxeditor.model.AbstractUtility;
+import eu.etaxonomy.taxeditor.model.IDerivedUnitFacadePart;
+import eu.etaxonomy.taxeditor.ui.combo.EnumComboElement;
 import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.element.GatheringEventUnitElement;
 import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.element.LanguageStringWithLabelElement;
+import eu.etaxonomy.taxeditor.ui.element.MinMaxTextSection;
+import eu.etaxonomy.taxeditor.ui.element.NumberWithLabelElement;
+import eu.etaxonomy.taxeditor.ui.element.PointElement;
 import eu.etaxonomy.taxeditor.ui.element.TextWithLabelElement;
+import eu.etaxonomy.taxeditor.ui.element.TimePeriodElement;
 import eu.etaxonomy.taxeditor.ui.element.ToggleableTextElement;
 import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement;
 import eu.etaxonomy.taxeditor.ui.selection.EntitySelectionElement;
@@ -28,8 +41,17 @@ public class DerivedUnitGeneralDetailElement extends
                AbstractCdmDetailElement<DerivedUnitFacade> {
 
        private ToggleableTextElement toggleableText_titleCache;
+       private EnumComboElement<SpecimenOrObservationType> combo_specorobstype;
+       private EntitySelectionElement<NamedArea> selection_country;
+       private LanguageStringWithLabelElement languageText_locality;
+       private PointElement element_point;
+       private NumberWithLabelElement number_elevation;
+       private TimePeriodElement element_date;
+       private EntitySelectionElement<AgentBase> selection_collector;
+       private TextWithLabelElement text_collectingNumber;
        private EntitySelectionElement<Collection> selection_collection;
        private TextWithLabelElement text_accessionNumber;
+       private GatheringEventUnitElement element_elevation;
 
 
 
@@ -55,7 +77,33 @@ public class DerivedUnitGeneralDetailElement extends
                toggleableText_titleCache = formFactory.createToggleableTextField(
                                formElement, "Title Cache", entity.getTitleCache(),
                                entity.isProtectedTitleCache(), style);
-               toggleableText_titleCache.setEnabled(false);
+               if((AbstractUtility.getActivePart() instanceof IDerivedUnitFacadePart)){
+                   combo_specorobstype = formFactory.createEnumComboElement(SpecimenOrObservationType.class, formElement, style);
+                   combo_specorobstype.setSelection(entity.getType());
+                   selection_country = formFactory.createSelectionElement(NamedArea.class, getConversationHolder(),
+                           formElement, "Country",
+                           entity.getCountry(), EntitySelectionElement.NOTHING, style);
+                   languageText_locality = formFactory
+                           .createLanguageStringWithLabelElement(formElement, "Locality",
+                                   entity.getLocality(), style);
+                   element_point = formFactory.createPointElement(formElement,
+                           entity.getExactLocation(), style);
+                   element_elevation = formFactory.createGatheringEventUnitElement(
+                           formElement, "Elevation : ", entity, MinMaxTextSection.UnitType.ELEVATION,  style);
+
+                   element_date = formFactory.createTimePeriodElement(formElement, "Date",
+                           entity.getGatheringPeriod(), style);
+                   selection_collector = formFactory
+                           .createSelectionElement(AgentBase.class,
+                                   getConversationHolder(), formElement, "Collector",
+                                   entity.getCollector(), EntitySelectionElement.ALL,
+                                   style);
+                   text_collectingNumber = formFactory.createTextWithLabelElement(formElement,
+                           "Collecting number", entity.getFieldNumber(), style);
+               }
+               else{
+                   toggleableText_titleCache.setEnabled(false);
+               }
                selection_collection = formFactory
                                .createSelectionElement(Collection.class,
                                                getConversationHolder(), formElement, "Collection",
@@ -76,18 +124,36 @@ public class DerivedUnitGeneralDetailElement extends
         */
        @Override
        public void handleEvent(Object eventSource) {
-           if (eventSource == toggleableText_titleCache) {
-               getEntity().setTitleCache(toggleableText_titleCache.getText(),
-                       toggleableText_titleCache.getState());
-           }
-           else if (eventSource == selection_collection) {
-               getEntity().setCollection(selection_collection.getSelection());
-           } else if (eventSource == text_accessionNumber) {
-               getEntity().setAccessionNumber(text_accessionNumber.getText());
-           }
-           if (eventSource != toggleableText_titleCache) {
-               toggleableText_titleCache.setText(getEntity().getTitleCache());
-           }
+               if (eventSource == toggleableText_titleCache) {
+                       getEntity().setTitleCache(toggleableText_titleCache.getText(),
+                                       toggleableText_titleCache.getState());
+               } else if (eventSource == selection_country) {
+                       getEntity().setCountry(selection_country.getSelection());
+               } else if (eventSource == languageText_locality) {
+                       LanguageString locality = languageText_locality.getLanguageString();
+                       getEntity().setLocality(locality);
+               } else if (eventSource == element_point) {
+                       getEntity().setExactLocation(element_point.getPoint());
+               } else if (eventSource == number_elevation) {
+                       getEntity().setAbsoluteElevation(number_elevation.getInteger());
+               } else if (eventSource == element_date) {
+                       getEntity().setGatheringPeriod(element_date.getTimePeriod());
+               } else if (eventSource == selection_collector) {
+                       getEntity().setCollector(selection_collector.getSelection());
+               } else if (eventSource == text_collectingNumber) {
+                       getEntity().setFieldNumber(text_collectingNumber.getText());
+               }
+                 else if (eventSource == selection_collection) {
+                       getEntity().setCollection(selection_collection.getSelection());
+               } else if (eventSource == text_accessionNumber) {
+                       getEntity().setAccessionNumber(text_accessionNumber.getText());
+               } else if (eventSource == combo_specorobstype) {
+                       getEntity().setType(combo_specorobstype.getSelection());
+               }
+
+               if (eventSource != toggleableText_titleCache) {
+                       toggleableText_titleCache.setText(getEntity().getTitleCache());
+               }
        }
 
 }

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/detail/DetailsViewer.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/detail/DetailsViewer.java
index 229cae1ce15764f50e2dd1708bcfe2291661b37f..5d81dbf00f16e61dd0aa8968041200135370fc76 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/detail/DetailsViewer.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/detail/DetailsViewer.java
@@ -54,7 +54,7 @@ import eu.etaxonomy.cdm.model.taxon.TaxonRelationship;
 import eu.etaxonomy.taxeditor.editor.UsageTermCollection;
 import eu.etaxonomy.taxeditor.model.AbstractUtility;
 import eu.etaxonomy.taxeditor.model.FeatureNodeContainer;
-import eu.etaxonomy.taxeditor.model.IDerivedUnitFacadeEditor;
+import eu.etaxonomy.taxeditor.model.IDerivedUnitFacadePart;
 import eu.etaxonomy.taxeditor.model.PolytomousKeyRelationship;
 import eu.etaxonomy.taxeditor.preference.IPreferenceKeys;
 import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
@@ -672,7 +672,7 @@ public class DetailsViewer extends AbstractCdmDataViewer {
         addPart(originalLabelDataSection);
 
         //for editors working with facades
-        if(AbstractUtility.getActiveEditor() instanceof IDerivedUnitFacadeEditor){
+        if(AbstractUtility.getActivePart() instanceof IDerivedUnitFacadePart){
             formFactory.createHorizontalSeparator(parent, SWT.BORDER);
             GatheringEventDetailSection gatheringEventDetailSection = formFactory.createGatheringEventDetailSection(getConversationHolder(), parent, this, ExpandableComposite.TWISTIE);
             addPart(gatheringEventDetailSection);