You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by ra...@apache.org on 2008/12/23 21:41:52 UTC

svn commit: r729101 - /commons/proper/digester/trunk/src/java/org/apache/commons/digester/SetNestedPropertiesRule.java

Author: rahul
Date: Tue Dec 23 12:41:52 2008
New Revision: 729101

URL: http://svn.apache.org/viewvc?rev=729101&view=rev
Log:
More generics.

Modified:
    commons/proper/digester/trunk/src/java/org/apache/commons/digester/SetNestedPropertiesRule.java

Modified: commons/proper/digester/trunk/src/java/org/apache/commons/digester/SetNestedPropertiesRule.java
URL: http://svn.apache.org/viewvc/commons/proper/digester/trunk/src/java/org/apache/commons/digester/SetNestedPropertiesRule.java?rev=729101&r1=729100&r2=729101&view=diff
==============================================================================
--- commons/proper/digester/trunk/src/java/org/apache/commons/digester/SetNestedPropertiesRule.java (original)
+++ commons/proper/digester/trunk/src/java/org/apache/commons/digester/SetNestedPropertiesRule.java Tue Dec 23 12:41:52 2008
@@ -106,7 +106,7 @@
     private boolean trimData = true;
     private boolean allowUnknownChildElements = false;
     
-    private HashMap elementNames = new HashMap();
+    private HashMap<String, String> elementNames = new HashMap<String, String>();
 
     // ----------------------------------------------------------- Constructors
 
@@ -297,7 +297,7 @@
         private String matchPrefix = null;
         private Rules decoratedRules = null;
         
-        private ArrayList rules = new ArrayList(1);
+        private ArrayList<Rule> rules = new ArrayList<Rule>(1);
         private AnyChildRule rule;
         
         public AnyChildRules(AnyChildRule rule) {
@@ -312,12 +312,12 @@
         public void add(String pattern, Rule rule) {}
         public void clear() {}
         
-        public List match(String matchPath) { 
+        public List<Rule> match(String matchPath) { 
             return match(null,matchPath); 
         }
         
-        public List match(String namespaceURI, String matchPath) {
-            List match = decoratedRules.match(namespaceURI, matchPath);
+        public List<Rule> match(String namespaceURI, String matchPath) {
+            List<Rule> match = decoratedRules.match(namespaceURI, matchPath);
             
             if ((matchPath.startsWith(matchPrefix)) &&
                 (matchPath.indexOf('/', matchPrefix.length()) == -1)) {
@@ -341,7 +341,7 @@
                     //
                     // It might not be safe to modify the returned list,
                     // so clone it first.
-                    LinkedList newMatch = new LinkedList(match);
+                    LinkedList<Rule> newMatch = new LinkedList<Rule>(match);
                     newMatch.addLast(rule);
                     return newMatch;
                 }
@@ -351,7 +351,7 @@
             }
         }
         
-        public List rules() {
+        public List<Rule> rules() {
             // This is not actually expected to be called during normal
             // processing.
             //