merge of NameEditorPropertyTester and fix NPE in ConceptContainer for new Taxonrelati...

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/container/ConceptContainerE4.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/container/ConceptContainerE4.java
index 37cd4f0c06c4ea4b00a7614fb57e60bbe5e36992..ba98786234c05b699cb0ed15143969d58864cd3d 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/container/ConceptContainerE4.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/container/ConceptContainerE4.java
@@ -86,10 +86,11 @@ public class ConceptContainerE4 extends AbstractGroupedContainerE4<Taxon> {
                List<Language> languages = new ArrayList<>();
                languages.add(CdmStore.getDefaultLanguage());
                List<TaggedText> taggedText = misappliedFormatter.getTaggedText(relationship, true, languages, true);
-
-               String title = TaggedCacheHelper.createString(taggedText);
-               title = title.replace("&", "&&");
-               setNonEditableInfo(title, false);
+               if (taggedText != null){
+               String title = TaggedCacheHelper.createString(taggedText);
+               title = title.replace("&", "&&");
+               setNonEditableInfo(title, false);
+               }
        }
 
        public Taxon getMisappliedName() {

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/handler/NameEditorMenuPropertyTester.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/handler/NameEditorMenuPropertyTester.java
index 1ea2190fa8a5c515152344d26e9d9bc204ccd7ea..83fa3bab13308afafb31fa0178ff5e0e9a95e5ae 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/handler/NameEditorMenuPropertyTester.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/handler/NameEditorMenuPropertyTester.java
@@ -44,7 +44,8 @@ public class NameEditorMenuPropertyTester extends PropertyTester {
        private static final String ACCEPTED_AND_NO_HOMOTYPIC_SYNONYMS = "isAcceptedAndHasNoHomotypicSynonyms"; //$NON-NLS-1$
        private static final String NOT_HOMOTYPIC_SYNONYM_OF_ACCEPTED = "isNotHomotypicSynonymOfAcceptedTaxon"; //$NON-NLS-1$
        private static final String SYNONYM_WITH_HOMOTYPIC_SYNONYMS = "isSynonymInHomotypicalGroupWithMoreSynonyms"; //$NON-NLS-1$
-       private static final String IS_ORPHANED = "isOrphaned"; //$NON-NLS-1$
+       private static final String IS_ORPHANED = "isOrphaned";
+       private static final String IS_NOT_INVALID_DESIGNATION = "isNotInvalidDesignation";//$NON-NLS-1$
 
        /**
         * <p>Constructor for NameEditorMenuPropertyTester.</p>
@@ -195,10 +196,10 @@ public class NameEditorMenuPropertyTester extends PropertyTester {
            if (selectedElement instanceof Synonym){
                return true;
            }
-        if(!((Taxon) selectedElement).isProparteSynonym() ){
-            return true;
+        if(((Taxon) selectedElement).isProparteSynonym() ){
+            return false;
         }
-        return false;
+        return true;
     }
 
        public static boolean isSynonym(Object selectedElement) {
@@ -209,7 +210,9 @@ public class NameEditorMenuPropertyTester extends PropertyTester {
     }
 
        public static boolean isAccepted(Object selectedElement) {
+
                return (selectedElement instanceof Taxon  && ! ((Taxon) selectedElement).isMisapplication() && ! ((Taxon) selectedElement).isProparteSynonym()) ? true : false;
+
        }
 
        public static boolean isOrphaned(Object selectedElement) {
@@ -227,9 +230,11 @@ public class NameEditorMenuPropertyTester extends PropertyTester {
      * @return
      */
     public static boolean isProParteSynonym(Object selectedElement) {
-        if(selectedElement instanceof Taxon && ((Taxon) selectedElement).isMisapplication()){
+        if(selectedElement instanceof Taxon && ((Taxon) selectedElement).isProparteSynonym()){
             return true;
         }
         return false;
     }
+
+
 }