UseRecordDetailElement : FIXME tag for 'Uses' code

SpecimenTypeDesignationElement : updated construction of DervivedUnit using default SpecimenOrObservationType
ScopeRestrictionSection : updated construction of DefinedTerm using default TermType
AbstractOriginalSourceElement : added combo list for OriginalSourceTypes
IdentifiableSourceElement : added interaction update code for the new OriginalSourceType combo list
SourceSection : changed construction of IdentifiableSource from a dialog to a default type

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/key/ScopeRestrictionSection.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/key/ScopeRestrictionSection.java
index 5a39287c54544222d7e2f9d333b33018429dbd2d..a0c12f1ae9c5bf29bbd9361cb2698429dbead165 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/key/ScopeRestrictionSection.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/key/ScopeRestrictionSection.java
@@ -31,7 +31,7 @@ public class ScopeRestrictionSection extends AbstractEntityCollectionSection<Pol
 
        @Override
        public DefinedTerm createNewElement() {         
-               return DefinedTerm.NewInstance(TermType.Scope);
+               return DefinedTerm.NewInstance(TermType.Scope,"","Untitled","");
                        
        }
 

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/SpecimenTypeDesignationElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/SpecimenTypeDesignationElement.java
index ce1889a04e039816b333e3591777ec6623cafcf8..1376e0ba682c4975ccb47f5a8c814f0e56540aae 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/SpecimenTypeDesignationElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/SpecimenTypeDesignationElement.java
@@ -16,6 +16,7 @@ import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
 import eu.etaxonomy.cdm.model.name.SpecimenTypeDesignation;
 import eu.etaxonomy.cdm.model.name.SpecimenTypeDesignationStatus;
 import eu.etaxonomy.cdm.model.occurrence.DerivedUnit;
+import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationType;
 import eu.etaxonomy.taxeditor.ui.combo.TermComboElement;
 import eu.etaxonomy.taxeditor.ui.element.AbstractFormSection;
 import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
@@ -100,8 +101,8 @@ public class SpecimenTypeDesignationElement extends
                else if (eventSource == text_specimenTypeText) {
                        // TODO this is a simple workaround to enter type specimen as text
                        // strings
-                       if (getEntity().getTypeSpecimen() == null) {
-                               DerivedUnit typeSpecimen = DerivedUnit.NewInstance();
+                       if (getEntity().getTypeSpecimen() == null) {                            
+                               DerivedUnit typeSpecimen = DerivedUnit.NewInstance(SpecimenOrObservationType.PreservedSpecimen);                                                                        
                                getEntity().setTypeSpecimen(typeSpecimen);
                        }
                        getEntity().getTypeSpecimen().setTitleCache(

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/AbstractOriginalSourceElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/AbstractOriginalSourceElement.java
index e004ba3f3ba908682ffb4d47da0599c8f97d9c8f..97d86685e6a348251f03466948ac1f2ffb0b2119 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/AbstractOriginalSourceElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/AbstractOriginalSourceElement.java
@@ -13,6 +13,9 @@ package eu.etaxonomy.taxeditor.ui.section.supplemental;
 import org.eclipse.swt.events.SelectionListener;
 
 import eu.etaxonomy.cdm.model.common.OriginalSourceBase;
+import eu.etaxonomy.cdm.model.common.OriginalSourceType;
+import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationType;
+import eu.etaxonomy.taxeditor.ui.combo.EnumComboElement;
 import eu.etaxonomy.taxeditor.ui.element.AbstractFormSection;
 import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
 import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement;
@@ -26,6 +29,7 @@ import eu.etaxonomy.taxeditor.ui.element.TextWithLabelElement;
  * @version 1.0
  */
 public abstract class AbstractOriginalSourceElement<T extends OriginalSourceBase> extends AbstractReferencedEntityElement<T> {
+       protected EnumComboElement<OriginalSourceType> combo_origsourcetype;
        protected TextWithLabelElement text_idInSource;
        protected TextWithLabelElement text_idNamespace;
 
@@ -56,6 +60,9 @@ public abstract class AbstractOriginalSourceElement<T extends OriginalSourceBase
        /** {@inheritDoc} */
        @Override
        public void createControls(ICdmFormElement formElement, int style) {
+               combo_origsourcetype = formFactory
+                               .createEnumComboElement(OriginalSourceType.class,
+                                               formElement, style);            
                text_idInSource = formFactory.createTextWithLabelElement(formElement, "Id In Source", null, style);
                text_idNamespace = formFactory.createTextWithLabelElement(formElement, "ID Namespace", null, style);
                super.createControls(formElement, style);

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/IdentifiableSourceElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/IdentifiableSourceElement.java
index f21ad121d5e8f125f47d6d7d8d18c55b11eacc51..4c381f8f6478d4b3034218ecb22b1a713dd7f96a 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/IdentifiableSourceElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/IdentifiableSourceElement.java
@@ -6,6 +6,7 @@ package eu.etaxonomy.taxeditor.ui.section.supplemental;
 import org.eclipse.swt.events.SelectionListener;
 
 import eu.etaxonomy.cdm.model.common.IdentifiableSource;
+import eu.etaxonomy.cdm.model.common.OriginalSourceType;
 import eu.etaxonomy.taxeditor.ui.element.AbstractFormSection;
 import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
 import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement;
@@ -55,6 +56,7 @@ public class IdentifiableSourceElement extends AbstractOriginalSourceElement<Ide
 
                selection_reference.setEntity(entity.getCitation());
                text_referenceDetail.setText(entity.getCitationMicroReference());
+               combo_origsourcetype.setSelection(entity.getType());
                if(hasOriginalNameString()) text_originaleNameString.setText(entity.getOriginalNameString());
        }       
        
@@ -75,6 +77,8 @@ public class IdentifiableSourceElement extends AbstractOriginalSourceElement<Ide
                }
                else if(eventSource == text_originaleNameString){
                        getEntity().setOriginalNameString(text_originaleNameString.getText());
+               } else if(eventSource == combo_origsourcetype){
+                       getEntity().setType(combo_origsourcetype.getSelection());
                }
        }
 }

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/SourceSection.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/SourceSection.java
index 95634a10b0972adf9214d1e65e134bf69e45b69a..346cee5d4f0f3965418e7839edade9641c3e34ac 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/SourceSection.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/SourceSection.java
@@ -41,13 +41,7 @@ public class SourceSection extends AbstractEntityCollectionSection<IIdentifiable
        /** {@inheritDoc} */
        @Override
        public IdentifiableSource createNewElement() {
-               OriginalSourceType ost = OriginalSourceTypeSelectionDialog.select(getShell(), getConversationHolder()); 
-               if(ost != null) {
-                       return IdentifiableSource.NewInstance(ost);
-               } else {
-                       return null;
-               }
-
+               return IdentifiableSource.NewInstance(OriginalSourceType.PrimaryTaxonomicSource);
        }
 
        /** {@inheritDoc} */

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/userecords/UseRecordDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/userecords/UseRecordDetailElement.java
index dd90d161447c34f63b010c1b40f0f7f390aab6b7..015af402f763c684af16b1742b20fa4a700b7054 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/userecords/UseRecordDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/userecords/UseRecordDetailElement.java
@@ -493,7 +493,12 @@ public class UseRecordDetailElement extends
                                        }\r
                                }\r
                                List<DefinedTerm> emptyListToResetComboBox = new ArrayList<DefinedTerm>();\r
-                               DefinedTerm emptyMod = DefinedTerm.NewInstance();\r
+                               //FIXME:3.3MC----\r
+                               //DefinedTerm emptyMod = DefinedTerm.NewInstance();\r
+                               DefinedTerm emptyMod = null;\r
+                               //FIXME:3.3MC----\r
+                               \r
+                               \r
                                emptyListToResetComboBox.add(emptyMod);\r
                                combo_EthnicGroup.setTerms(emptyListToResetComboBox);\r
                                combo_EthnicGroup.setEnabled(false);\r