rename field observation in NewFieldObservationWizard.java and rename the class ...

diff --git a/.gitattributes b/.gitattributes
index 9d27063d9dbc3a54535210391f1b3e6a64bcd197..c2559f8baab52e0f1273abf0e25cc586086a2964 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -1235,7 +1235,7 @@ eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/sele
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/DerivedUnitSelectionDialog.java -text
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/FeatureSelectionDialog.java -text
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/FeatureTreeSelectionDialog.java -text
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/DerivedUnitSelectionDialog.java -text
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/FeatureSelectionDialog.java -text
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/FeatureTreeSelectionDialog.java -text

-eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/FieldObservationSelectionDialog.java -text
+eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/FieldUnitSelectionDialog.java -text

 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/GrantedAuthoritySelectionDialog.java -text
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/GroupSelectionDialog.java -text
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/InstitutionSelectionDialog.java -text
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/GrantedAuthoritySelectionDialog.java -text
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/GroupSelectionDialog.java -text
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/InstitutionSelectionDialog.java -text

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/FieldObservationSelectionDialog.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/FieldUnitSelectionDialog.java
similarity index 88%
rename from eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/FieldObservationSelectionDialog.java
rename to eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/FieldUnitSelectionDialog.java
index 43a6c05ae399401f535c73c2b90c94d959ad078f..faba5a4e2435c86cb57684f9b0d4c38d4057a4b1 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/FieldObservationSelectionDialog.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/FieldUnitSelectionDialog.java
@@ -31,7 +31,7 @@ import eu.etaxonomy.taxeditor.store.StoreUtil;
  * @created Jun 17, 2010
  * @version 1.0
  */
  * @created Jun 17, 2010
  * @version 1.0
  */

-public class FieldObservationSelectionDialog extends
+public class FieldUnitSelectionDialog extends

                AbstractFilteredCdmResourceSelectionDialog<FieldUnit> {
 
        /**
                AbstractFilteredCdmResourceSelectionDialog<FieldUnit> {
 
        /**


@@ -43,8 +43,8 @@ public class FieldObservationSelectionDialog extends
         * @return a {@link eu.etaxonomy.cdm.model.occurrence.FieldUnit} object.
         */
        public static FieldUnit select(Shell shell, ConversationHolder conversation, FieldUnit observation){
         * @return a {@link eu.etaxonomy.cdm.model.occurrence.FieldUnit} object.
         */
        public static FieldUnit select(Shell shell, ConversationHolder conversation, FieldUnit observation){

-               FieldObservationSelectionDialog dialog = new FieldObservationSelectionDialog(shell, conversation,
-                               "Choose Derived Unit", false, FieldObservationSelectionDialog.class.getCanonicalName(), observation);
+               FieldUnitSelectionDialog dialog = new FieldUnitSelectionDialog(shell, conversation,
+                               "Choose Derived Unit", false, FieldUnitSelectionDialog.class.getCanonicalName(), observation);

                return getSelectionFromDialog(dialog);
        }
 
                return getSelectionFromDialog(dialog);
        }
 


@@ -58,7 +58,7 @@ public class FieldObservationSelectionDialog extends
         * @param settings a {@link java.lang.String} object.
         * @param cdmObject a {@link eu.etaxonomy.cdm.model.occurrence.FieldObservation} object.
         */
         * @param settings a {@link java.lang.String} object.
         * @param cdmObject a {@link eu.etaxonomy.cdm.model.occurrence.FieldObservation} object.
         */

-       protected FieldObservationSelectionDialog(Shell shell, ConversationHolder conversation,
+       protected FieldUnitSelectionDialog(Shell shell, ConversationHolder conversation,

                        String title, boolean multi, String settings,
                        FieldUnit cdmObject) {
                super(shell, conversation, title, multi, settings, cdmObject);
                        String title, boolean multi, String settings,
                        FieldUnit cdmObject) {
                super(shell, conversation, title, multi, settings, cdmObject);


@@ -77,7 +77,7 @@ public class FieldObservationSelectionDialog extends
                if(specimenObservationBase instanceof FieldUnit){
                        return (FieldUnit) specimenObservationBase;
                }
                if(specimenObservationBase instanceof FieldUnit){
                        return (FieldUnit) specimenObservationBase;
                }

-               StoreUtil.error(this.getClass(), "Selected object is not a field observation", null);
+               StoreUtil.error(this.getClass(), "Selected object is not a field unit", null);

                return null;
        }
 
                return null;
        }
 


@@ -99,6 +99,6 @@ public class FieldObservationSelectionDialog extends
        /** {@inheritDoc} */
        @Override
        protected String getNewWizardLinkText() {
        /** {@inheritDoc} */
        @Override
        protected String getNewWizardLinkText() {

-               return String.format("Create a new <a>%1s</a>", "Field Observation ");
+               return String.format("Create a new <a>%1s</a>", "Field Unit ");

        }
 }
        }
 }

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/SelectionDialogFactory.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/SelectionDialogFactory.java
index fed776ba3c3ae27491d48029ee64b678d8f55b9b..be551aa447b2601f4b9d610147bbfcf1b13f1fdd 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/SelectionDialogFactory.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/SelectionDialogFactory.java
@@ -91,7 +91,7 @@ public class SelectionDialogFactory {
                        return (T) DerivedUnitSelectionDialog.select(shell, conversation, (DerivedUnit) curentSelection);
                }
                if(clazz.equals(FieldUnit.class)){
                        return (T) DerivedUnitSelectionDialog.select(shell, conversation, (DerivedUnit) curentSelection);
                }
                if(clazz.equals(FieldUnit.class)){

-                       return (T) FieldObservationSelectionDialog.select(shell, conversation, (FieldUnit) curentSelection);
+                       return (T) FieldUnitSelectionDialog.select(shell, conversation, (FieldUnit) curentSelection);

                }
                if(clazz.equals(NamedArea.class)){
                        return (T) NamedAreaSelectionDialog.select(shell, conversation, (NamedArea) curentSelection);
                }
                if(clazz.equals(NamedArea.class)){
                        return (T) NamedAreaSelectionDialog.select(shell, conversation, (NamedArea) curentSelection);