editor now updatable via updateSite

[taxeditor.git] / taxeditor-editor / src / main / java / eu / etaxonomy / taxeditor / propertysheet / type / wizard / ChooseNameTypeWizardPage.java

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/type/wizard/ChooseNameTypeWizardPage.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/type/wizard/ChooseNameTypeWizardPage.java
index 73810bd4ffab7b724e86cd6cfa456f012da45566..9cd3db9f20c22d3ce3201a34c14b8ac19200edad 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/type/wizard/ChooseNameTypeWizardPage.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/type/wizard/ChooseNameTypeWizardPage.java
@@ -9,8 +9,6 @@
 \r
 package eu.etaxonomy.taxeditor.propertysheet.type.wizard;\r
 \r
-import java.util.Set;\r
-\r
 import org.apache.log4j.Logger;\r
 import org.eclipse.core.databinding.observable.list.WritableList;\r
 import org.eclipse.core.runtime.Assert;\r
@@ -45,9 +43,9 @@ public class ChooseNameTypeWizardPage extends WizardPage {
        private static Logger logger = Logger\r
                        .getLogger(ChooseNameTypeWizardPage.class);\r
 \r
-       private TaxonNameBase name;     \r
+       private TaxonNameBase<?, ?> name;       \r
        private NameTypeDesignation typeDesignation;\r
-       private TaxonNameBase savedName;\r
+       private TaxonNameBase<?, ?> savedName;\r
        \r
        private Text txtName;\r
        private Button btnClearName;\r
@@ -65,8 +63,8 @@ public class ChooseNameTypeWizardPage extends WizardPage {
         * @param name\r
         * @param typeDesignationsList \r
         */\r
-       public ChooseNameTypeWizardPage(TypeDesignationBase typeDesignation,\r
-                       TaxonNameBase name, WritableList typeDesignationsList) {\r
+       public ChooseNameTypeWizardPage(TypeDesignationBase<?> typeDesignation,\r
+                       TaxonNameBase<?, ?> name, WritableList typeDesignationsList) {\r
                super("");\r
                \r
                Assert.isTrue(typeDesignation == null || typeDesignation instanceof NameTypeDesignation);\r
@@ -77,6 +75,7 @@ public class ChooseNameTypeWizardPage extends WizardPage {
                \r
                setTitle("Create or edit type designation");\r
                setDescription("Create or edit type designation for '" + name.getTitleCache() + "\".");\r
+               logger.trace(this.getClass().getSimpleName() + " created.");\r
        }\r
        \r
        \r
@@ -218,7 +217,7 @@ public class ChooseNameTypeWizardPage extends WizardPage {
         Object value = ((NameSearchDialog) dialog).open();\r
         \r
                if (value instanceof TaxonNameBase) {\r
-                       setSavedName((TaxonNameBase) value);\r
+                       setSavedName((TaxonNameBase<?, ?>) value);\r
                        updatePage();\r
                }\r
        }\r
@@ -226,7 +225,7 @@ public class ChooseNameTypeWizardPage extends WizardPage {
        /**\r
         * @param value\r
         */\r
-       private void setSavedName(TaxonNameBase savedName) {\r
+       private void setSavedName(TaxonNameBase<?, ?> savedName) {\r
                \r
                this.savedName = savedName;\r
                \r
@@ -267,7 +266,7 @@ public class ChooseNameTypeWizardPage extends WizardPage {
         \r
         if (complete) {\r
                \r
-               TaxonNameBase typeName = null;\r
+               TaxonNameBase<?, ?> typeName = null;\r
                if (savedName != null) {\r
                        typeName = savedName;\r
                } else {\r
@@ -277,7 +276,7 @@ public class ChooseNameTypeWizardPage extends WizardPage {
                        }\r
                }\r
                \r
-               ReferenceBase citation = referenceComposite.getReference();\r
+               ReferenceBase<?> citation = referenceComposite.getReference();\r
                String citationMicroReference = referenceComposite.getMicroReference();\r
                                \r
                if (typeDesignation == null) {\r
@@ -301,7 +300,12 @@ public class ChooseNameTypeWizardPage extends WizardPage {
        public class TemporaryNameTypeDesignation extends\r
                        NameTypeDesignation {\r
                                \r
-               public TemporaryNameTypeDesignation(TaxonNameBase typeName, ReferenceBase citation, String citationMicroReference,\r
+               /**\r
+                * \r
+                */\r
+               private static final long serialVersionUID = 7309597024482795166L;\r
+\r
+               public TemporaryNameTypeDesignation(TaxonNameBase<?, ?> typeName, ReferenceBase<?> citation, String citationMicroReference,\r
                                String originalNameString, boolean isRejectedType, boolean isConservedType, boolean isLectoType, boolean isNotDesignated) {\r
                        super(typeName, citation, citationMicroReference, originalNameString, \r
                                        isRejectedType, isConservedType,  isLectoType, isNotDesignated);\r