editor now updatable via updateSite

[taxeditor.git] / taxeditor-editor / src / main / java / eu / etaxonomy / taxeditor / propertysheet / namerelations / wizard / ChooseRelationWizardPage.java

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/namerelations/wizard/ChooseRelationWizardPage.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/namerelations/wizard/ChooseRelationWizardPage.java
index 77dd4575f1359321103527970d9ac43472cefaf6..0005597f3e461f7e86f71b2473c4d674ae7569af 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/namerelations/wizard/ChooseRelationWizardPage.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/namerelations/wizard/ChooseRelationWizardPage.java
@@ -14,7 +14,6 @@ import java.beans.PropertyChangeListener;
 import java.util.ArrayList;\r
 import java.util.List;\r
 \r
-import org.apache.log4j.Logger;\r
 import org.eclipse.core.databinding.observable.list.WritableList;\r
 import org.eclipse.jface.wizard.WizardPage;\r
 import org.eclipse.swt.SWT;\r
@@ -49,8 +48,6 @@ import eu.etaxonomy.taxeditor.store.model.NameUtil;
  * @version 1.0\r
  */\r
 public class ChooseRelationWizardPage extends WizardPage {\r
-       private static final Logger logger = Logger\r
-                       .getLogger(ChooseRelationWizardPage.class);\r
 \r
        private List<NameRelationshipType> relationTypes;\r
 \r
@@ -81,10 +78,10 @@ public class ChooseRelationWizardPage extends WizardPage {
 \r
        private boolean nameSelected;\r
 \r
-       private TaxonNameBase baseName;\r
-       private TaxonNameBase relatedName; \r
-       private TaxonNameBase fromName;\r
-       private TaxonNameBase toName;\r
+       private TaxonNameBase<?, ?> baseName;\r
+       private TaxonNameBase<?, ?> relatedName; \r
+       private TaxonNameBase<?, ?> fromName;\r
+       private TaxonNameBase<?, ?> toName;\r
 \r
        private NameRelationshipType type;\r
 \r
@@ -94,7 +91,7 @@ public class ChooseRelationWizardPage extends WizardPage {
 \r
        private WritableList nameRelationsList;\r
 \r
-       public ChooseRelationWizardPage(TaxonNameBase name, WritableList nameRelationsList) {\r
+       public ChooseRelationWizardPage(TaxonNameBase<?, ?> name, WritableList nameRelationsList) {\r
                super("");\r
                \r
                this.baseName = name;\r
@@ -273,12 +270,10 @@ public class ChooseRelationWizardPage extends WizardPage {
        \r
        public class TemporaryNameRelationship extends NameRelationship {\r
 \r
-               private TaxonNameBase tempToName;\r
-               private TaxonNameBase tempFromName;\r
-               private NameRelationshipType tempType;\r
-               private ReferenceBase tempCitation;\r
-               private String tempCitationMicroReference;\r
-               private String tempRuleConsidered;\r
+               /**\r
+                * \r
+                */\r
+               private static final long serialVersionUID = 1231912353305134080L;\r
 \r
                /**\r
                 * @param toName\r
@@ -288,31 +283,11 @@ public class ChooseRelationWizardPage extends WizardPage {
                 * @param citationMicroReference\r
                 * @param ruleConsidered\r
                 */\r
-               protected TemporaryNameRelationship(TaxonNameBase toName,\r
-                               TaxonNameBase fromName, NameRelationshipType type,\r
-                               ReferenceBase citation, String citationMicroReference,\r
+               protected TemporaryNameRelationship(TaxonNameBase<?, ?> toName,\r
+                               TaxonNameBase<?, ?> fromName, NameRelationshipType type,\r
+                               ReferenceBase<?> citation, String citationMicroReference,\r
                                String ruleConsidered) {\r
                        super(toName, fromName, type, citation, citationMicroReference, ruleConsidered);\r
-//                     super(null, null, null, null, null, null);\r
-//                     \r
-//                     this.tempToName = toName;\r
-//                     this.tempFromName = fromName;\r
-//                     this.tempType = type;\r
-//                     this.tempCitation = citation;\r
-//                     this.tempCitationMicroReference = citationMicroReference;\r
-//                     this.tempRuleConsidered = ruleConsidered;\r
                }\r
-               \r
-//             public TaxonNameBase getToName(){\r
-//                     return tempToName;\r
-//             }\r
-//             \r
-//             public TaxonNameBase getFromName(){\r
-//                     return tempFromName;\r
-//             }\r
-//             \r
-//             public String getRuleConsidered(){\r
-//                     return tempRuleConsidered;\r
-//             }\r
        }\r
 }
\ No newline at end of file