editor now updatable via updateSite

[taxeditor.git] / taxeditor-editor / src / main / java / eu / etaxonomy / taxeditor / propertysheet / name / TaxonBasePropertySource.java

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/name/TaxonBasePropertySource.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/name/TaxonBasePropertySource.java
index eb1b332dfdb2e5c71f29d13fd47810594227b6a6..43e9ea805e93c531d12cae12caf0cdd55b2e90d9 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/name/TaxonBasePropertySource.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/name/TaxonBasePropertySource.java
@@ -43,7 +43,7 @@ public class TaxonBasePropertySource implements IPropertySource {
        private static final Logger logger = Logger\r
                        .getLogger(TaxonBasePropertySource.class);\r
        \r
-       private TaxonBase taxonBase;\r
+       private TaxonBase<?> taxonBase;\r
 \r
     // Property unique keys\r
        public static final String P_ID_TAXONNAME = "P_ID_TAXONNAME";\r
@@ -55,7 +55,7 @@ public class TaxonBasePropertySource implements IPropertySource {
        public static final String P_TAXONSEC = "Secundum";\r
        public String P_TYPES = "Name Types";   \r
        \r
-       public TaxonBasePropertySource(TaxonBase taxon, String nameTitle) {\r
+       public TaxonBasePropertySource(TaxonBase<?> taxon, String nameTitle) {\r
                this.taxonBase = taxon;\r
                \r
                this.P_TAXONNAME = nameTitle;\r
@@ -122,7 +122,7 @@ public class TaxonBasePropertySource implements IPropertySource {
                                logger.warn("no taxon");\r
                                return null;\r
                        }\r
-                       TaxonNameBase name = taxonBase.getName();\r
+                       TaxonNameBase<?, ?> name = taxonBase.getName();\r
                        \r
                        // Create taxon name as necessary\r
                        if (name == null) {\r
@@ -137,7 +137,7 @@ public class TaxonBasePropertySource implements IPropertySource {
                                return new ZoologicalNamePropertySource((ZoologicalName) name);\r
                        }\r
                        if (name instanceof NonViralName) {\r
-                               return new NonViralNamePropertySource((NonViralName) name);\r
+                               return new NonViralNamePropertySource((NonViralName<?>) name);\r
                        }\r
                        \r
                }               \r
@@ -148,7 +148,7 @@ public class TaxonBasePropertySource implements IPropertySource {
                        if (taxonBase == null) {\r
                                return null;\r
                        }\r
-                       ReferenceBase sec = taxonBase.getSec();\r
+                       ReferenceBase<?> sec = taxonBase.getSec();\r
                        \r
                        // Create property source for submenu\r
                        ReferencePropertySource secPropertySource = new ReferencePropertySource(sec);\r
@@ -157,7 +157,7 @@ public class TaxonBasePropertySource implements IPropertySource {
                        secPropertySource.addPropertyChangeListener(new PropertyChangeListener() {\r
                                public void propertyChange(PropertyChangeEvent evt) {\r
                                        if (evt.getNewValue() instanceof ReferenceBase) {       \r
-                                               taxonBase.setSec((ReferenceBase) evt.getNewValue());\r
+                                               taxonBase.setSec((ReferenceBase<?>) evt.getNewValue());\r
                                        }\r
                                }\r
                        });\r
@@ -167,8 +167,8 @@ public class TaxonBasePropertySource implements IPropertySource {
                if (id.equals(P_ID_TYPES)) {\r
                        if (taxonBase.getName() != null) {\r
                                // TODO return NameTypeDesignations\r
-                               TaxonNameBase name = taxonBase.getName();\r
-                               Set typeDesignations = null;\r
+                               TaxonNameBase<?, ?> name = taxonBase.getName();\r
+                               Set<?> typeDesignations = null;\r
                                if (NameUtil.isNameSupraSpecific(name)) {\r
                                        typeDesignations = name.getNameTypeDesignations();\r
                                } else {\r
@@ -199,7 +199,7 @@ public class TaxonBasePropertySource implements IPropertySource {
        public void setPropertyValue(Object id, Object value) {\r
         if (id.equals(P_ID_TAXONSEC)) {\r
                if (value instanceof ReferenceBase) {\r
-                       taxonBase.setSec((ReferenceBase) value);\r
+                       taxonBase.setSec((ReferenceBase<?>) value);\r
                }\r
         }\r
        }\r
@@ -207,7 +207,7 @@ public class TaxonBasePropertySource implements IPropertySource {
        /**\r
         * @return the taxonBase\r
         */\r
-       public TaxonBase getTaxonBase() {\r
+       public TaxonBase<?> getTaxonBase() {\r
                return taxonBase;\r
        }\r
 }\r