fix potential NPE in NameDescriptionFilter
authorAndreas Müller <a.mueller@bgbm.org>
Mon, 16 Sep 2019 10:25:05 +0000 (12:25 +0200)
committerAndreas Müller <a.mueller@bgbm.org>
Mon, 16 Sep 2019 10:25:05 +0000 (12:25 +0200)
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/NameDescriptionFilter.java

index fc3a1452456eab9cb70ddbf6b64e493916ac384a..6f79c5f0ddc2c67c6edace5755d3f35737ee1e0b 100755 (executable)
@@ -35,9 +35,9 @@ public class NameDescriptionFilter extends ViewerFilter {
             }
         }
         if (element instanceof DescriptionBase){
-            for (Object desc:((DescriptionBase) element).getElements()){
-                if (desc instanceof DescriptionElementBase){
-                    if (!((DescriptionElementBase)desc).getFeature().equals(Feature.PROTOLOGUE())){
+            for (Object descEl:((DescriptionBase) element).getElements()){
+                if (descEl instanceof DescriptionElementBase){
+                    if (! Feature.PROTOLOGUE().equals((DescriptionElementBase)descEl).getFeature()){
                         return true;
                     }
                 }
@@ -47,7 +47,7 @@ public class NameDescriptionFilter extends ViewerFilter {
             }
         }
         if (element instanceof DescriptionElementBase){
-            if (!((DescriptionElementBase)element).getFeature().equals(Feature.PROTOLOGUE())){
+            if (! Feature.PROTOLOGUE().equals((DescriptionElementBase)element).getFeature().equals()){
                 return true;
             }
         }