svn commit: r1541953 - in /tomcat/trunk/java/org/apache/tomcat/util/descriptor/tld: TagXml.java TaglibXml.java ValidatorXml.java

[markt]

Author: markt
Date: Thu Nov 14 16:25:18 2013
New Revision: 1541953

URL: http://svn.apache.org/r1541953
Log:
Avoid the need for a bunch of null checks.

Modified:
    tomcat/trunk/java/org/apache/tomcat/util/descriptor/tld/TagXml.java
    tomcat/trunk/java/org/apache/tomcat/util/descriptor/tld/TaglibXml.java
    tomcat/trunk/java/org/apache/tomcat/util/descriptor/tld/ValidatorXml.java

Modified: tomcat/trunk/java/org/apache/tomcat/util/descriptor/tld/TagXml.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/descriptor/tld/TagXml.java?rev=1541953&r1=1541952&r2=1541953&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/descriptor/tld/TagXml.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/descriptor/tld/TagXml.java Thu Nov 
14 16:25:18 2013
@@ -39,8 +39,8 @@ public class TagXml {
     private String largeIcon;
     private String info;
     private boolean dynamicAttributes;
-    private List<TagAttributeInfo> attributes;
-    private List<TagVariableInfo> variables;
+    private final List<TagAttributeInfo> attributes = new ArrayList<>();
+    private final List<TagVariableInfo> variables = new ArrayList<>();
 
     public String getName() {
         return name;
@@ -115,16 +115,10 @@ public class TagXml {
     }
 
     public List<TagAttributeInfo> getAttributes() {
-        if (attributes == null) {
-            attributes = new ArrayList<>();
-        }
         return attributes;
     }
 
     public List<TagVariableInfo> getVariables() {
-        if (variables == null) {
-            variables = new ArrayList<>();
-        }
         return variables;
     }
 }

Modified: tomcat/trunk/java/org/apache/tomcat/util/descriptor/tld/TaglibXml.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/descriptor/tld/TaglibXml.java?rev=1541953&r1=1541952&r2=1541953&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/descriptor/tld/TaglibXml.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/descriptor/tld/TaglibXml.java Thu 
Nov 14 16:25:18 2013
@@ -37,10 +37,10 @@ public class TaglibXml {
     private String uri;
     private String info;
     private ValidatorXml validator;
-    private List<TagXml> tags;
-    private List<TagFileXml> tagFiles;
-    private List<String> listeners;
-    private List<FunctionInfo> functions;
+    private final List<TagXml> tags = new ArrayList<>();
+    private final List<TagFileXml> tagFiles = new ArrayList<>();
+    private final List<String> listeners = new ArrayList<>();
+    private final List<FunctionInfo> functions = new ArrayList<>();
 
     public String getTlibVersion() {
         return tlibVersion;
@@ -91,9 +91,6 @@ public class TaglibXml {
     }
 
     public void addTag(TagXml tag) {
-        if (tags == null) {
-            tags = new ArrayList<>();
-        }
         tags.add(tag);
     }
 
@@ -102,9 +99,6 @@ public class TaglibXml {
     }
 
     public void addTagFile(TagFileXml tag) {
-        if (tagFiles == null) {
-            tagFiles = new ArrayList<>();
-        }
         tagFiles.add(tag);
     }
 
@@ -113,9 +107,6 @@ public class TaglibXml {
     }
 
     public void addListener(String listener) {
-        if (listeners == null) {
-            listeners = new ArrayList<>();
-        }
         listeners.add(listener);
     }
 
@@ -124,9 +115,6 @@ public class TaglibXml {
     }
 
     public void addFunction(String name, String klass, String signature) {
-        if (functions == null) {
-            functions = new ArrayList<>();
-        }
         functions.add(new FunctionInfo(name, klass, signature));
     }
 

Modified: 
tomcat/trunk/java/org/apache/tomcat/util/descriptor/tld/ValidatorXml.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/descriptor/tld/ValidatorXml.java?rev=1541953&r1=1541952&r2=1541953&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/descriptor/tld/ValidatorXml.java 
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/descriptor/tld/ValidatorXml.java 
Thu Nov 14 16:25:18 2013
@@ -24,7 +24,7 @@ import java.util.Map;
  */
 public class ValidatorXml {
     private String validatorClass;
-    private Map<String, String> initParams;
+    private final Map<String, String> initParams = new HashMap<>();
 
     public String getValidatorClass() {
         return validatorClass;
@@ -35,9 +35,6 @@ public class ValidatorXml {
     }
 
     public void addInitParam(String name, String value) {
-        if (initParams == null) {
-            initParams = new HashMap<>();
-        }
         initParams.put(name, value);
     }
 



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org