Fixed #1031 - Authorship year in zoological names not handled correctly.

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/name/NameCacheHandler.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/name/NameCacheHandler.java
index ccc01691502d00767080f351334616333b289fdb..5ebe61ba7c9080f94990cb966d0b4e73206d96fa 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/name/NameCacheHandler.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/name/NameCacheHandler.java
@@ -30,6 +30,13 @@ public class NameCacheHandler {
                if (!name.isProtectedFullTitleCache()) {\r
                        name.setFullTitleCache(name.generateFullTitle(), false);\r
                }\r
                if (!name.isProtectedFullTitleCache()) {\r
                        name.setFullTitleCache(name.generateFullTitle(), false);\r
                }\r

+               \r
+               if (name instanceof NonViralName) {\r
+                       NonViralName nvName = (NonViralName) name;\r
+                       if (!nvName.isProtectedAuthorshipCache()) {\r
+                               nvName.setAuthorshipCache(nvName.generateAuthorship());\r
+                       }\r
+               }\r

         }\r
                name.setParsingProblem(0);      \r
        }\r
         }\r
                name.setParsingProblem(0);      \r
        }\r


@@ -39,6 +46,7 @@ public class NameCacheHandler {
                name.setProtectedFullTitleCache(protect);\r
                if (name instanceof NonViralName) {\r
                        ((NonViralName) name).setProtectedNameCache(protect);\r
                name.setProtectedFullTitleCache(protect);\r
                if (name instanceof NonViralName) {\r
                        ((NonViralName) name).setProtectedNameCache(protect);\r

+                       ((NonViralName) name).setProtectedAuthorshipCache(protect);\r

                }\r
        }\r
 }\r
                }\r
        }\r
 }\r

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/name/NonViralNamePropertySource.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/name/NonViralNamePropertySource.java
index 4d1c97d1b0203ac756acbc08c9cc21229a17f9fe..909152c0470982d769047978f1b92cfefbe60427 100644 (file)
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/name/NonViralNamePropertySource.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/propertysheet/name/NonViralNamePropertySource.java
@@ -357,19 +357,7 @@ public class NonViralNamePropertySource implements ICdmBasePropertySource {
                if (name.getRank() == null) {\r
                        return CdmUtils.Nz(name.getTitleCache());\r
                } else {\r
                if (name.getRank() == null) {\r
                        return CdmUtils.Nz(name.getTitleCache());\r
                } else {\r

-                       \r
-                       // Create property source for submenu\r
-                       ScientificNamePropertySource nameFieldsPropertySource = new ScientificNamePropertySource(name);\r
-                       \r
-                       // Add listener to notify name of all changes to nom. reference\r
-                       nameFieldsPropertySource.addPropertyChangeListener(new PropertyChangeListener() {\r
-                               public void propertyChange(PropertyChangeEvent evt) {\r
-//                                     if (evt.getNewValue() instanceof INomenclaturalReference) {\r
-//                                             name.setNomenclaturalReference((INomenclaturalReference) evt.getNewValue());\r
-//                                     }\r
-                               }\r
-                       });\r
-                       return nameFieldsPropertySource;\r
+                       return new ScientificNamePropertySource(name);\r

                }\r
         }\r
                 \r
                }\r
         }\r
                 \r


@@ -385,8 +373,6 @@ public class NonViralNamePropertySource implements ICdmBasePropertySource {
         \r
                // Nomenclatural status        \r
         if (id.equals(P_ID_NOMSTATUS)) {\r
         \r
                // Nomenclatural status        \r
         if (id.equals(P_ID_NOMSTATUS)) {\r

-//                     return new NomStatusPropertySource(name.getStatus());\r
-//             if (this.name.getRank() == null) return 0;\r

                Set<NomenclaturalStatus> nomStatusSet = this.name.getStatus();\r
                \r
                if (nomStatusSet == null || nomStatusSet.size() == 0) {\r
                Set<NomenclaturalStatus> nomStatusSet = this.name.getStatus();\r
                \r
                if (nomStatusSet == null || nomStatusSet.size() == 0) {\r