NumberWithLabelElement : added getDouble method

CdmFormFactory : updated create methods for creating elements for DefinedTerm and DerivedUnit objects
DateDetailSection : FIXME:3.3MC tag
EnumComboElement : added SpecimenOrObservationType and OriginalSourceType to the data holders list and the default label method
EntitySelectionElement : updated label text

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/combo/EnumComboElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/combo/EnumComboElement.java
index addb64ae527100013ec29a88c48570907063b58f..3371a6ae531dbfcd310698b2fd49384153095cda 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/combo/EnumComboElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/combo/EnumComboElement.java
@@ -23,7 +23,10 @@ import org.eclipse.swt.widgets.Combo;
 import org.eclipse.swt.widgets.Label;
 
 import eu.etaxonomy.cdm.model.common.IDefinedTerm;
 import org.eclipse.swt.widgets.Label;
 
 import eu.etaxonomy.cdm.model.common.IDefinedTerm;

+import eu.etaxonomy.cdm.model.common.IEnumTerm;
+import eu.etaxonomy.cdm.model.common.OriginalSourceType;

 import eu.etaxonomy.cdm.model.name.NomenclaturalCode;
 import eu.etaxonomy.cdm.model.name.NomenclaturalCode;

+import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationType;

 import eu.etaxonomy.cdm.model.reference.ReferenceType;
 import eu.etaxonomy.taxeditor.preference.Resources;
 import eu.etaxonomy.taxeditor.store.StoreUtil;
 import eu.etaxonomy.cdm.model.reference.ReferenceType;
 import eu.etaxonomy.taxeditor.preference.Resources;
 import eu.etaxonomy.taxeditor.store.StoreUtil;


@@ -44,7 +47,7 @@ import eu.etaxonomy.taxeditor.ui.element.LayoutConstants;
  * @created Mar 16, 2010
  * @version 1.0
  */
  * @created Mar 16, 2010
  * @version 1.0
  */

-public class EnumComboElement<T extends IDefinedTerm> extends
+public class EnumComboElement<T extends IEnumTerm> extends

                AbstractCdmFormElement implements SelectionListener,
                IEnableableFormElement, ISelectable {
 
                AbstractCdmFormElement implements SelectionListener,
                IEnableableFormElement, ISelectable {
 


@@ -84,7 +87,44 @@ public class EnumComboElement<T extends IDefinedTerm> extends
                                return ReferenceType.class;
                        }
                        
                                return ReferenceType.class;
                        }
                        

+               },
+               new CdmEnumDataHolder<SpecimenOrObservationType>(){
+
+                       @Override
+                       public String getName() {
+                               return "Specimen / Observation Type";
+                       }
+
+                       @Override
+                       public Collection<SpecimenOrObservationType> getElements() {
+                               return Arrays.asList(SpecimenOrObservationType.values());
+                       }
+
+                       @Override
+                       public Class<SpecimenOrObservationType> getClazz() {
+                               return SpecimenOrObservationType.class;
+                       }
+                       
+               },
+               new CdmEnumDataHolder<OriginalSourceType>(){
+
+                       @Override
+                       public String getName() {
+                               return "Original Source Type";
+                       }
+
+                       @Override
+                       public Collection<OriginalSourceType> getElements() {
+                               return Arrays.asList(OriginalSourceType.values());
+                       }
+
+                       @Override
+                       public Class<OriginalSourceType> getClazz() {
+                               return OriginalSourceType.class;
+                       }
+                       

                }
                }

+               

        };
        
        private static final int DEFAULT_VISIBLE_ITEMS = 10;
        };
        
        private static final int DEFAULT_VISIBLE_ITEMS = 10;


@@ -135,8 +175,12 @@ public class EnumComboElement<T extends IDefinedTerm> extends
        private String getDefaultLabelString() {
                if(enumType.equals(ReferenceType.class)){
                        return "Reference Type";
        private String getDefaultLabelString() {
                if(enumType.equals(ReferenceType.class)){
                        return "Reference Type";

-               }else if (enumType.equals(NomenclaturalCode.class)){
+               } else if (enumType.equals(NomenclaturalCode.class)){

                        return "Nomenclatural Code";
                        return "Nomenclatural Code";

+               } else if(enumType.equals(OriginalSourceType.class)) {
+                       return "Orig. Source Type";
+               } else if(enumType.equals(SpecimenOrObservationType.class)) {
+                       return "Spec./Obs. Type";

                }
                return "No Label";
        }
                }
                return "No Label";
        }

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/CdmFormFactory.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/CdmFormFactory.java
index 604d2c2c7b0ef6f79c5d2f3fdc95f721f6a52dca..8632612ec4065f146e3140b754650143e7f651fe 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/CdmFormFactory.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/CdmFormFactory.java
@@ -54,10 +54,12 @@ import eu.etaxonomy.cdm.model.common.GrantedAuthorityImpl;
 import eu.etaxonomy.cdm.model.common.Group;
 import eu.etaxonomy.cdm.model.common.ICdmBase;
 import eu.etaxonomy.cdm.model.common.IDefinedTerm;
 import eu.etaxonomy.cdm.model.common.Group;
 import eu.etaxonomy.cdm.model.common.ICdmBase;
 import eu.etaxonomy.cdm.model.common.IDefinedTerm;

+import eu.etaxonomy.cdm.model.common.IEnumTerm;

 import eu.etaxonomy.cdm.model.common.IdentifiableSource;
 import eu.etaxonomy.cdm.model.common.Language;
 import eu.etaxonomy.cdm.model.common.LanguageString;
 import eu.etaxonomy.cdm.model.common.Marker;
 import eu.etaxonomy.cdm.model.common.IdentifiableSource;
 import eu.etaxonomy.cdm.model.common.Language;
 import eu.etaxonomy.cdm.model.common.LanguageString;
 import eu.etaxonomy.cdm.model.common.Marker;

+import eu.etaxonomy.cdm.model.common.TermType;

 import eu.etaxonomy.cdm.model.common.TimePeriod;
 import eu.etaxonomy.cdm.model.common.User;
 import eu.etaxonomy.cdm.model.common.VersionableEntity;
 import eu.etaxonomy.cdm.model.common.TimePeriod;
 import eu.etaxonomy.cdm.model.common.User;
 import eu.etaxonomy.cdm.model.common.VersionableEntity;


@@ -811,7 +813,7 @@ public class CdmFormFactory extends FormToolkit {
         * @return a {@link eu.etaxonomy.taxeditor.ui.term.AbstractEnumComboElement}
         *         object.
         */
         * @return a {@link eu.etaxonomy.taxeditor.ui.term.AbstractEnumComboElement}
         *         object.
         */

-       public <T extends IDefinedTerm> EnumComboElement<T> createEnumComboElement(
+       public <T extends IEnumTerm> EnumComboElement<T> createEnumComboElement(

                        Class<T> enumComboType, ICdmFormElement parentElement,
                        int style) {
                EnumComboElement<T> element = new EnumComboElement<T>(this, parentElement, enumComboType, style);
                        Class<T> enumComboType, ICdmFormElement parentElement,
                        int style) {
                EnumComboElement<T> element = new EnumComboElement<T>(this, parentElement, enumComboType, style);


@@ -2021,12 +2023,27 @@ public class CdmFormFactory extends FormToolkit {
                        element = new IdentifiableSourceElement(this, parentElement,
                                        (IdentifiableSource) entity, removeListener, style);
                } else if (entity instanceof DefinedTerm) {
                        element = new IdentifiableSourceElement(this, parentElement,
                                        (IdentifiableSource) entity, removeListener, style);
                } else if (entity instanceof DefinedTerm) {

-                       //FIXME:3.3MC
-                       element = new ScopeElement(this, parentElement, (DefinedTerm) entity,
-                                       removeListener, style);
-               } else if (entity instanceof DefinedTerm) {
-                       element = new ModifierElement(this, parentElement,
-                                       (DefinedTerm) entity, removeListener, style);
+                       switch(((DefinedTerm)entity).getTermType()) {
+                               case Scope:
+                                       element = new ScopeElement(this, 
+                                                       parentElement, 
+                                                       (DefinedTerm) entity,
+                                                       removeListener, 
+                                                       style);
+                                       break;
+                               case Modifier:
+                                       element = new ModifierElement(this, 
+                                                       parentElement,
+                                                       (DefinedTerm) entity, 
+                                                       removeListener, 
+                                                       style);
+                                       break;
+                               default:
+                                       //FIXME : Actually we should through an exception here
+                                       element = null;
+                                       break;
+                       
+                       }

                } else if (entity instanceof Reference) {
                        element = new DescriptionSourceElement(this, parentElement,
                                        (Reference) entity, removeListener, style);
                } else if (entity instanceof Reference) {
                        element = new DescriptionSourceElement(this, parentElement,
                                        (Reference) entity, removeListener, style);


@@ -2047,19 +2064,30 @@ public class CdmFormFactory extends FormToolkit {
                                        parentElement, (StatisticalMeasurementValue) entity,
                                        removeListener, style);
                } else if (entity instanceof DerivedUnit) {
                                        parentElement, (StatisticalMeasurementValue) entity,
                                        removeListener, style);
                } else if (entity instanceof DerivedUnit) {

-                       //FIXME:3.3MC
-                       element = new DerivedUnitElement(this, parentElement,
-                                       (DerivedUnit) entity, removeListener, style);
+                       switch(((DerivedUnit)entity).getRecordBasis()) {
+                               case LivingSpecimen:
+                               case PreservedSpecimen:
+                               case OtherSpecimen:
+                                       element = new SpecimenCollectionDetailElement(this, 
+                                                               parentElement,
+                                                               (DerivedUnit) entity, 
+                                                               removeListener, 
+                                                               style);
+                                       break;
+                               default:
+                                       element = new DerivedUnitElement(this, 
+                                                               parentElement,
+                                                               (DerivedUnit) entity, 
+                                                               removeListener, 
+                                                               style);
+                       }                       
+

                } else if (entity instanceof NamedArea) {
                        element = new NamedAreaDetailElement(this, parentElement,
                                        (NamedArea) entity, removeListener, style);
                } else if (entity instanceof DeterminationEvent) {
                        element = new DeterminationEventDetailElement(this, parentElement,
                                        (DeterminationEvent) entity, removeListener, style);                    
                } else if (entity instanceof NamedArea) {
                        element = new NamedAreaDetailElement(this, parentElement,
                                        (NamedArea) entity, removeListener, style);
                } else if (entity instanceof DeterminationEvent) {
                        element = new DeterminationEventDetailElement(this, parentElement,
                                        (DeterminationEvent) entity, removeListener, style);                    

-               } else if (entity instanceof DerivedUnit) {
-                       //FIXME:3.3MC
-                       element = new SpecimenCollectionDetailElement(this, parentElement,
-                                       (DerivedUnit) entity, removeListener, style);

                } else if (entity instanceof User) {
                        element = new MemberDetailElement(this, parentElement,
                                        (User) entity, removeListener, style);
                } else if (entity instanceof User) {
                        element = new MemberDetailElement(this, parentElement,
                                        (User) entity, removeListener, style);

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/DateDetailSection.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/DateDetailSection.java
index c54e04d0327bcee02c5d29920230bf9e69747e2c..0cd545ac0dec494aa6189198dab8fc2c80591ae3 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/DateDetailSection.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/DateDetailSection.java
@@ -146,7 +146,9 @@ public class DateDetailSection extends AbstractFormSection<TimePeriod> {
                } else if (eventSource == text_parseText) {
                        cursorPosition = ((Text) text_parseText.getMainControl())
                                        .getCaretPosition();
                } else if (eventSource == text_parseText) {
                        cursorPosition = ((Text) text_parseText.getMainControl())
                                        .getCaretPosition();

-                       setEntityInternally(TimePeriod.parseString(text_parseText.getText()));
+                       //FIXME:3.3MC----
+                       //setEntityInternally(TimePeriod.parseString(text_parseText.getText()));
+                       //FIXME:3.3MC----

                } else if (eventSource == text_freeText) {
                        getEntity().setFreeText(text_freeText.getText());
                }
                } else if (eventSource == text_freeText) {
                        getEntity().setFreeText(text_freeText.getText());
                }

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/NumberWithLabelElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/NumberWithLabelElement.java
index 3b58a586b90f7ada47f4ce445c73d64109437bb4..755ecd3b10e39a60363c0b39f5f95b8d6bae6b77 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/NumberWithLabelElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/NumberWithLabelElement.java
@@ -82,9 +82,9 @@ public class NumberWithLabelElement extends TextWithLabelElement {
         *
         * @return a {@link java.lang.Float} object.
         */
         *
         * @return a {@link java.lang.Float} object.
         */

-       public Float getDouble(){
+       public Double getDouble(){

                String text = super.getText();
                String text = super.getText();

-               return new Float(text);
+               return new Double(text);

        }
        
        private String getStringRepresentation(Object number){
        }
        
        private String getStringRepresentation(Object number){

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/EntitySelectionElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/EntitySelectionElement.java
index 48679257e4cc203edb5179a63d10415ec15b5aab..ac75ba86b7a4caa422922aae28183125c2fb982c 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/EntitySelectionElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/EntitySelectionElement.java
@@ -145,7 +145,7 @@ public class EntitySelectionElement<T extends ICdmBase> extends
 
        private void createControls(Composite parent, int style) {
 
 
        private void createControls(Composite parent, int style) {
 

-               label = formFactory.createLabel(getLayoutComposite(), labelString,
+               label = formFactory.createLabel(getLayoutComposite(), labelString + " : ",

                                SWT.NULL);
 
                addControl(label);
                                SWT.NULL);
 
                addControl(label);


@@ -442,7 +442,7 @@ public class EntitySelectionElement<T extends ICdmBase> extends
        @Override
        public String getLabel() {
                if (label != null) {
        @Override
        public String getLabel() {
                if (label != null) {

-                       return label.getText();
+                       return label.getText() + " : ";

                }
                return null;
        }
                }
                return null;
        }