svn commit: r598245 [2/2] - in /portals/pluto/branches/1.1-286-trunk-merge/pluto-testsuite/src/main: java/org/apache/pluto/testsuite/ java/org/apache/pluto/testsuite/test/ java/org/apache/pluto/testsuite/validator/ webapp/WEB-INF/classes/

[cd...@apache.org]

Modified: portals/pluto/branches/1.1-286-trunk-merge/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/validator/PreferencesValidatorImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/1.1-286-trunk-merge/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/validator/PreferencesValidatorImpl.java?rev=598245&r1=598244&r2=598245&view=diff
==============================================================================
--- portals/pluto/branches/1.1-286-trunk-merge/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/validator/PreferencesValidatorImpl.java (original)
+++ portals/pluto/branches/1.1-286-trunk-merge/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/validator/PreferencesValidatorImpl.java Mon Nov 26 04:19:16 2007
@@ -1,9 +1,9 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
  *
  *      http://www.apache.org/licenses/LICENSE-2.0
@@ -40,7 +40,8 @@
     public static final String CHECK_VALIDATOR_COUNT = "checkValidatorCount";
 
     /** Count of instances created. */
-    private static final Map INSTANCE_COUNTER = new HashMap();
+    private static final Map<String, Integer> INSTANCE_COUNTER = 
+    	new HashMap<String, Integer>();
 
     /** Count of invocation number of method <code>validate()</code>. */
     private int validateInvoked = 0;
@@ -80,8 +81,9 @@
         //   anymore.  When enabled, all preferences fail in testsuite.
         //
         final String[] DEFAULT_VALUES = new String[] { "no values" };
-    	Collection failedNames = new ArrayList();
-        for (Enumeration en = preferences.getNames(); en.hasMoreElements(); ) {
+    	Collection<String> failedNames = new ArrayList<String>();
+        for (Enumeration<String> en = preferences.getNames(); 
+        		en.hasMoreElements(); ) {
             String name = (String) en.nextElement();
             String[] values = preferences.getValues(name, DEFAULT_VALUES);
             if (values != null) { // null values are allowed