OccurrenceCreator: updated createNewEntity method to return wizard created object...

Other classes : implemented savesEntity method to return a flag indicating whether the creator class also saves the entity

diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/entitycreator/AgentCreator.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/entitycreator/AgentCreator.java
index 3281cc226ac32a6d5f57c68dc932176117f794cf..015b24a287550061d5c71dc282a414b3c2d7ca47 100644 (file)
--- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/entitycreator/AgentCreator.java
+++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/entitycreator/AgentCreator.java
@@ -76,4 +76,10 @@ public class AgentCreator implements IEntityCreator<AgentBase> {
                result.put(Person.class, "Author");
                return result;
        }
+
+       @Override
+       public boolean savesEntity() {
+               // TODO Auto-generated method stub
+               return false;
+       }
 }

diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/entitycreator/GroupCreator.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/entitycreator/GroupCreator.java
index e5f2deb9a17a7b577707f132412dd15d56b98005..86dbde2e5d6a73e404ef0cb026f8200ddf258f5e 100644 (file)
--- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/entitycreator/GroupCreator.java
+++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/entitycreator/GroupCreator.java
@@ -49,4 +49,10 @@ public class GroupCreator implements IEntityCreator<Group> {
                return result;
        }
 
+       @Override
+       public boolean savesEntity() {
+               // TODO Auto-generated method stub
+               return false;
+       }
+
 }

diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/entitycreator/NameCreator.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/entitycreator/NameCreator.java
index 12fe3a4e3ae52e6c3e42100870410ae1a58512d3..776b223ea4a1d2359240f4f3d0e5be28686a3ad6 100644 (file)
--- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/entitycreator/NameCreator.java
+++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/entitycreator/NameCreator.java
@@ -62,4 +62,10 @@ public class NameCreator implements IEntityCreator<TaxonNameBase> {
                }
                return result;
        }
+
+       @Override
+       public boolean savesEntity() {
+               // TODO Auto-generated method stub
+               return false;
+       }
 }

diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/entitycreator/OccurrenceCreator.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/entitycreator/OccurrenceCreator.java
index 9e86e42081ca8ff2db1abd642caa6b180f541ff0..db3d60f776b4b2015942532c7880ad0f99f78f6d 100644 (file)
--- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/entitycreator/OccurrenceCreator.java
+++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/entitycreator/OccurrenceCreator.java
@@ -10,16 +10,21 @@
 
 package eu.etaxonomy.taxeditor.bulkeditor.input.entitycreator;
 
+import java.util.Comparator;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.TreeMap;
 
 import org.apache.log4j.Logger;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.jface.wizard.WizardDialog;
 
-import eu.etaxonomy.cdm.model.molecular.DnaSample;
 import eu.etaxonomy.cdm.model.occurrence.DerivedUnit;
-import eu.etaxonomy.cdm.model.occurrence.FieldUnit;
 import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase;
+import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationType;
 import eu.etaxonomy.taxeditor.annotatedlineeditor.IEntityCreator;
+import eu.etaxonomy.taxeditor.bulkeditor.BulkEditorUtil;
+import eu.etaxonomy.taxeditor.newWizard.NewDerivedUnitBaseWizard;
 
 /**
  * <p>
@@ -38,33 +43,25 @@ public class OccurrenceCreator implements
        /** {@inheritDoc} */
        @Override
        public SpecimenOrObservationBase createEntity(String text) {
+
                return createEntity(DerivedUnit.class, text);
        }
 
        /** {@inheritDoc} */
        @Override
        public SpecimenOrObservationBase createEntity(Object key, String text) {
+               
                SpecimenOrObservationBase specimenOrObservation = null;
-               //FIXME:3.3MC
-               if (FieldUnit.class.equals((key))) {
-                       specimenOrObservation = FieldUnit.NewInstance();
-               } else if (DerivedUnit.class.equals((key))) {
-                       specimenOrObservation = DerivedUnit.NewInstance();
-               } else if (DerivedUnit.class.equals((key))) {
-                       specimenOrObservation = DerivedUnit.NewInstance();
-               } else if (DerivedUnit.class.equals((key))) {
-                       specimenOrObservation = DerivedUnit.NewInstance();
-               } else if (DerivedUnit.class.equals((key))) {
-                       specimenOrObservation = DerivedUnit.NewInstance();
-               } else if (DnaSample.class.equals((key))) {
-                       specimenOrObservation = DnaSample.NewInstance();
-               } else if (DerivedUnit.class.equals((key))) {
-                       specimenOrObservation = DerivedUnit.NewInstance();
-               }
+               NewDerivedUnitBaseWizard wizard = new NewDerivedUnitBaseWizard((SpecimenOrObservationType)key);
+               wizard.init(null, null);
+               if(wizard.getEntity() != null) {
+                       WizardDialog dialog = new WizardDialog(BulkEditorUtil.getShell(), wizard);
+                       int status = dialog.open();
 
-               if (specimenOrObservation != null) {
-                       specimenOrObservation.setTitleCache(text, true);
-               }
+                       if (status == IStatus.OK) {
+                               specimenOrObservation = wizard.getEntity();                                                             
+                       }
+               } 
                return specimenOrObservation;
        }
 
@@ -77,22 +74,27 @@ public class OccurrenceCreator implements
         */
        @Override
        public Map<Object, String> getKeyLabelPairs() {
-               Map<Object, String> result = new HashMap<Object, String>();
-
-               //FIXME:3.3MC
-               result.put(DerivedUnit.class, "Specimen");
-               result.put(DerivedUnit.class, "Observation");
-               result.put(DerivedUnit.class, "Living Being");
-               result.put(DerivedUnit.class, "Fossil");
-               result.put(DerivedUnit.class, "Derived Unit");
-
-               // Omitted at the moment see #2266
-               // result.put(DnaSample.class, "Dna Sample");
+               Comparator<Object> comparator = new Comparator<Object>() {
+                         public int compare(Object o1, Object o2) {
+                           String key1 = ((SpecimenOrObservationType)o1).getKey();
+                           String key2 = ((SpecimenOrObservationType)o2).getKey();
+                           return key1.compareTo(key2);
+                         }
+                       };
+               Map<Object, String> result = new TreeMap<Object, String>(comparator);
 
-               // Omitted see #2266
-               // result.put(FieldObservation.class, "Field Observation");
-               // result.put(Observation.class, "Observation");
+               for(SpecimenOrObservationType sooType : SpecimenOrObservationType.values()) {                           
+                       result.put(sooType, sooType.getMessage());                              
+               }
 
                return result;
        }
+
+       @Override
+       public boolean savesEntity() {
+               // TODO Auto-generated method stub
+               return true;
+       }
+       
+
 }

diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/entitycreator/ReferenceCreator.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/entitycreator/ReferenceCreator.java
index cee07a26469407b4bb0c9ea7760a3e2808baeeaf..92d94ee4ad882a651d6865e834d96bf1db54cd16 100644 (file)
--- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/entitycreator/ReferenceCreator.java
+++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/entitycreator/ReferenceCreator.java
@@ -115,4 +115,10 @@ public class ReferenceCreator implements IEntityCreator<Reference> {
                }
                return result;
        }
+
+       @Override
+       public boolean savesEntity() {
+               // TODO Auto-generated method stub
+               return false;
+       }
 }

diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/entitycreator/UserCreator.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/entitycreator/UserCreator.java
index 2d8750ab3d184eefd2847389ddeb2f3c597af435..d092ce03a6be1020437b9f9765c7f09f948ca03d 100644 (file)
--- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/entitycreator/UserCreator.java
+++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/entitycreator/UserCreator.java
@@ -61,4 +61,10 @@ public class UserCreator  implements IEntityCreator<User>{
                return result;
        }
 
+       @Override
+       public boolean savesEntity() {
+               // TODO Auto-generated method stub
+               return false;
+       }
+
 }