editor now updatable via updateSite

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

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/type/wizard/ListTypeWizardPage.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/type/wizard/ListTypeWizardPage.java
index c4d5ed2221c9cd0194c03da079c8085e12677333..e31910e3e938daf0356a4d2c327f648ba6055123 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/type/wizard/ListTypeWizardPage.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/type/wizard/ListTypeWizardPage.java
@@ -9,7 +9,6 @@
 \r
 package eu.etaxonomy.taxeditor.propertysheet.type.wizard;\r
 \r
-import org.apache.log4j.Logger;\r
 import org.eclipse.core.databinding.beans.BeansObservables;\r
 import org.eclipse.core.databinding.observable.list.WritableList;\r
 import org.eclipse.core.databinding.observable.map.IObservableMap;\r
@@ -31,7 +30,6 @@ import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Button;\r
 import org.eclipse.swt.widgets.Composite;\r
 import org.eclipse.swt.widgets.Table;\r
-import org.eclipse.swt.widgets.TableItem;\r
 \r
 import eu.etaxonomy.cdm.model.name.NameTypeDesignation;\r
 import eu.etaxonomy.cdm.model.name.SpecimenTypeDesignation;\r
@@ -46,13 +44,13 @@ import eu.etaxonomy.taxeditor.store.model.NameUtil;
  * @version 1.0\r
  */\r
 public class ListTypeWizardPage extends WizardPage {\r
-       private static Logger logger = Logger.getLogger(ListTypeWizardPage.class);\r
-       private TaxonNameBase name;\r
+       \r
+       private TaxonNameBase<?, ?> name;\r
 \r
        /**\r
         * @param name\r
         */\r
-       public ListTypeWizardPage(TaxonNameBase name, WritableList typeDesignationsList) {\r
+       public ListTypeWizardPage(TaxonNameBase<?, ?> name, WritableList typeDesignationsList) {\r
                super("");\r
                this.name = name;\r
                \r
@@ -69,7 +67,7 @@ public class ListTypeWizardPage extends WizardPage {
        private Button btnRemove;\r
        private Button btnEdit;\r
 \r
-       private TypeDesignationBase typeDesignation;\r
+       private TypeDesignationBase<?> typeDesignation;\r
        private TableViewer tableViewer;\r
 \r
 \r
@@ -123,9 +121,8 @@ public class ListTypeWizardPage extends WizardPage {
                typeDesignationsTable.addSelectionListener(new SelectionAdapter() {\r
                        public void widgetSelected(SelectionEvent e) { \r
                                setEnableTypeDesignationButtons(true);\r
-                               TableItem[] selectedItem = typeDesignationsTable.getSelection();\r
                                if (e.item.getData() instanceof TypeDesignationBase) {\r
-                                       setSelectedTypeDesignation((TypeDesignationBase) e.item.getData());\r
+                                       setSelectedTypeDesignation((TypeDesignationBase<?>) e.item.getData());\r
                                }\r
                        }\r
                });\r
@@ -143,14 +140,14 @@ public class ListTypeWizardPage extends WizardPage {
                                providerMaps) {\r
                        public String getColumnText(Object element, int columnIndex) {\r
                                if (element instanceof TypeDesignationBase) {\r
-                                       return getTypeDesignationString((TypeDesignationBase) element);\r
+                                       return getTypeDesignationString((TypeDesignationBase<?>) element);\r
                                }\r
                                return "";\r
                        }\r
 \r
                        public Image getColumnImage(Object element, int columnIndex) {\r
                                if (element instanceof TypeDesignationBase) {\r
-                                       return getTypeDesignationImage((TypeDesignationBase) element);\r
+                                       return getTypeDesignationImage((TypeDesignationBase<?>) element);\r
                                }\r
                                return null;\r
                        }\r
@@ -161,7 +158,7 @@ public class ListTypeWizardPage extends WizardPage {
                        public void doubleClick(DoubleClickEvent event) {\r
                                if (((StructuredSelection) event.getSelection())\r
                                                .getFirstElement() instanceof TypeDesignationBase) {\r
-                                       TypeDesignationBase typeDesignation = (TypeDesignationBase) \r
+                                       TypeDesignationBase<?> typeDesignation = (TypeDesignationBase<?>) \r
                                                        ((StructuredSelection) event.getSelection()).getFirstElement();\r
                                        createTypeDesignationWizard(typeDesignation);\r
                                }\r
@@ -169,15 +166,15 @@ public class ListTypeWizardPage extends WizardPage {
                });\r
        }\r
 \r
-       private void setSelectedTypeDesignation(TypeDesignationBase typeDesignation) {\r
+       private void setSelectedTypeDesignation(TypeDesignationBase<?> typeDesignation) {\r
                this.typeDesignation = typeDesignation;\r
        }\r
 \r
-       private TypeDesignationBase getSelectedTypeDesignation() {\r
+       private TypeDesignationBase<?> getSelectedTypeDesignation() {\r
                return typeDesignation;\r
        }\r
        \r
-       private void createTypeDesignationWizard(TypeDesignationBase typeDesignation) {\r
+       private void createTypeDesignationWizard(TypeDesignationBase<?> typeDesignation) {\r
                Wizard wizard = new TypeDesignationWizard(typeDesignation, name, typeDesignationsList);\r
                \r
                WizardDialog dialog = new WizardDialog(EditorUtil.getShell(), wizard);\r
@@ -191,11 +188,11 @@ public class ListTypeWizardPage extends WizardPage {
                btnEdit.setEnabled(enabled);\r
        }\r
 \r
-       private Image getTypeDesignationImage(TypeDesignationBase typeDesignation) {\r
+       private Image getTypeDesignationImage(TypeDesignationBase<?> typeDesignation) {\r
                return null;\r
        }\r
 \r
-       private String getTypeDesignationString(TypeDesignationBase typeDesignation) {\r
+       private String getTypeDesignationString(TypeDesignationBase<?> typeDesignation) {\r
                String str = "";\r
                if (typeDesignation instanceof SpecimenTypeDesignation) {\r
                        if (((SpecimenTypeDesignation) typeDesignation).getTypeSpecimen() != null) {\r