portals-pluto-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ddew...@apache.org
Subject svn commit: r126193 - in portals/pluto/trunk: container/src/java/org/apache/pluto/core/impl portal/src/java/org/apache/pluto/portalImpl/om/common/impl testsuite/src/java/org/apache/pluto/portalImpl/portlet/test
Date Sun, 23 Jan 2005 04:32:50 GMT
Author: ddewolf
Date: Sat Jan 22 20:32:49 2005
New Revision: 126193

URL: http://svn.apache.org/viewcvs?view=rev&rev=126193
Log:
Resolving Issue PLUTO-98.  THANKS Manuel Beyeler
 -- Removing JDK1.5 keyword enum from all code as an identifier
Modified:
   portals/pluto/trunk/container/src/java/org/apache/pluto/core/impl/PortletPreferencesImpl.java
   portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/om/common/impl/LanguageImpl.java
   portals/pluto/trunk/testsuite/src/java/org/apache/pluto/portalImpl/portlet/test/ContextInitParameterTest.java
   portals/pluto/trunk/testsuite/src/java/org/apache/pluto/portalImpl/portlet/test/MiscTest.java
   portals/pluto/trunk/testsuite/src/java/org/apache/pluto/portalImpl/portlet/test/ResourceBundleTest.java
   portals/pluto/trunk/testsuite/src/java/org/apache/pluto/portalImpl/portlet/test/SimpleAttributeTest.java
   portals/pluto/trunk/testsuite/src/java/org/apache/pluto/portalImpl/portlet/test/SimpleParameterTest.java
   portals/pluto/trunk/testsuite/src/java/org/apache/pluto/portalImpl/portlet/test/SimplePreferenceTest.java

Modified: portals/pluto/trunk/container/src/java/org/apache/pluto/core/impl/PortletPreferencesImpl.java
Url: http://svn.apache.org/viewcvs/portals/pluto/trunk/container/src/java/org/apache/pluto/core/impl/PortletPreferencesImpl.java?view=diff&rev=126193&p1=portals/pluto/trunk/container/src/java/org/apache/pluto/core/impl/PortletPreferencesImpl.java&r1=126192&p2=portals/pluto/trunk/container/src/java/org/apache/pluto/core/impl/PortletPreferencesImpl.java&r2=126193
==============================================================================
--- portals/pluto/trunk/container/src/java/org/apache/pluto/core/impl/PortletPreferencesImpl.java
(original)
+++ portals/pluto/trunk/container/src/java/org/apache/pluto/core/impl/PortletPreferencesImpl.java
Sat Jan 22 20:32:49 2005
@@ -256,10 +256,10 @@
     public Map getMap()
     {
         HashMap map = new HashMap();
-        Enumeration enum = this.getNames();
-        while (enum.hasMoreElements())
+        Enumeration enumerator= this.getNames();
+        while (enumerator.hasMoreElements())
         {
-            String name = (String)enum.nextElement();
+            String name = (String)enumerator.nextElement();
             map.put(name, getValues(name,null));
         }
 

Modified: portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/om/common/impl/LanguageImpl.java
Url: http://svn.apache.org/viewcvs/portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/om/common/impl/LanguageImpl.java?view=diff&rev=126193&p1=portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/om/common/impl/LanguageImpl.java&r1=126192&p2=portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/om/common/impl/LanguageImpl.java&r2=126193
==============================================================================
--- portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/om/common/impl/LanguageImpl.java
(original)
+++ portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/om/common/impl/LanguageImpl.java
Sat Jan 22 20:32:49 2005
@@ -55,8 +55,8 @@
 
         private void importData(ResourceBundle bundle) {
             if (bundle != null) {
-                for (Enumeration enum = bundle.getKeys(); enum.hasMoreElements();) {
-                    String key   = (String)enum.nextElement();
+                for (Enumeration enumerator= bundle.getKeys(); enumerator.hasMoreElements();)
{
+                    String key   = (String)enumerator.nextElement();
                     Object value = bundle.getObject(key);
                     data.put(key, value);
                 }

Modified: portals/pluto/trunk/testsuite/src/java/org/apache/pluto/portalImpl/portlet/test/ContextInitParameterTest.java
Url: http://svn.apache.org/viewcvs/portals/pluto/trunk/testsuite/src/java/org/apache/pluto/portalImpl/portlet/test/ContextInitParameterTest.java?view=diff&rev=126193&p1=portals/pluto/trunk/testsuite/src/java/org/apache/pluto/portalImpl/portlet/test/ContextInitParameterTest.java&r1=126192&p2=portals/pluto/trunk/testsuite/src/java/org/apache/pluto/portalImpl/portlet/test/ContextInitParameterTest.java&r2=126193
==============================================================================
--- portals/pluto/trunk/testsuite/src/java/org/apache/pluto/portalImpl/portlet/test/ContextInitParameterTest.java
(original)
+++ portals/pluto/trunk/testsuite/src/java/org/apache/pluto/portalImpl/portlet/test/ContextInitParameterTest.java
Sat Jan 22 20:32:49 2005
@@ -43,8 +43,8 @@
         res.setName("Get Init Parameter Enumeration Test");
         res.setDesc("Test the initialization parameter enumeration.");
 
-        Enumeration enum = ctx.getInitParameterNames();
-        if (enum.hasMoreElements()) {
+        Enumeration enumerator= ctx.getInitParameterNames();
+        if (enumerator.hasMoreElements()) {
             res.setReturnCode(TestResult.PASSED);
         }
         else {
@@ -60,9 +60,9 @@
         res.setDesc("Test to make sure that the expected init parameters exist.");
 
         boolean found = false;
-        Enumeration enum = ctx.getInitParameterNames();
-        while(enum.hasMoreElements()) {
-            String name = (String)enum.nextElement();
+        Enumeration enumerator= ctx.getInitParameterNames();
+        while(enumerator.hasMoreElements()) {
+            String name = (String)enumerator.nextElement();
             if(TEST_PARAM_NAME.equals(name)) {
                 found = true;
             }

Modified: portals/pluto/trunk/testsuite/src/java/org/apache/pluto/portalImpl/portlet/test/MiscTest.java
Url: http://svn.apache.org/viewcvs/portals/pluto/trunk/testsuite/src/java/org/apache/pluto/portalImpl/portlet/test/MiscTest.java?view=diff&rev=126193&p1=portals/pluto/trunk/testsuite/src/java/org/apache/pluto/portalImpl/portlet/test/MiscTest.java&r1=126192&p2=portals/pluto/trunk/testsuite/src/java/org/apache/pluto/portalImpl/portlet/test/MiscTest.java&r2=126193
==============================================================================
--- portals/pluto/trunk/testsuite/src/java/org/apache/pluto/portalImpl/portlet/test/MiscTest.java
(original)
+++ portals/pluto/trunk/testsuite/src/java/org/apache/pluto/portalImpl/portlet/test/MiscTest.java
Sat Jan 22 20:32:49 2005
@@ -114,9 +114,9 @@
         boolean hasEdit = false;
         boolean hasHelp = false;
 
-        Enumeration enum = req.getPortalContext().getSupportedPortletModes();
-        while(enum.hasMoreElements()) {
-            PortletMode mode = (PortletMode)enum.nextElement();
+        Enumeration enumerator= req.getPortalContext().getSupportedPortletModes();
+        while(enumerator.hasMoreElements()) {
+            PortletMode mode = (PortletMode)enumerator.nextElement();
             if(mode.equals(PortletMode.VIEW)) {
                 hasView  = true;
             }
@@ -156,9 +156,9 @@
         boolean hasMax = false;
         boolean hasNor = false;
 
-        Enumeration enum = req.getPortalContext().getSupportedWindowStates();
-        while(enum.hasMoreElements()) {
-            WindowState mode = (WindowState)enum.nextElement();
+        Enumeration enumerator= req.getPortalContext().getSupportedWindowStates();
+        while(enumerator.hasMoreElements()) {
+            WindowState mode = (WindowState)enumerator.nextElement();
             if(mode.equals(WindowState.MINIMIZED)) {
                 hasMin  = true;
             }

Modified: portals/pluto/trunk/testsuite/src/java/org/apache/pluto/portalImpl/portlet/test/ResourceBundleTest.java
Url: http://svn.apache.org/viewcvs/portals/pluto/trunk/testsuite/src/java/org/apache/pluto/portalImpl/portlet/test/ResourceBundleTest.java?view=diff&rev=126193&p1=portals/pluto/trunk/testsuite/src/java/org/apache/pluto/portalImpl/portlet/test/ResourceBundleTest.java&r1=126192&p2=portals/pluto/trunk/testsuite/src/java/org/apache/pluto/portalImpl/portlet/test/ResourceBundleTest.java&r2=126193
==============================================================================
--- portals/pluto/trunk/testsuite/src/java/org/apache/pluto/portalImpl/portlet/test/ResourceBundleTest.java
(original)
+++ portals/pluto/trunk/testsuite/src/java/org/apache/pluto/portalImpl/portlet/test/ResourceBundleTest.java
Sat Jan 22 20:32:49 2005
@@ -76,9 +76,9 @@
         keys.add("javax.portlet.keywords");
 
         ResourceBundle rb = config.getResourceBundle(req.getLocale());
-        Enumeration enum = rb.getKeys();
-        while(enum.hasMoreElements()) {
-            String key = enum.nextElement().toString();
+        Enumeration enumerator= rb.getKeys();
+        while(enumerator.hasMoreElements()) {
+            String key = enumerator.nextElement().toString();
             keys.remove(key);
         }
 

Modified: portals/pluto/trunk/testsuite/src/java/org/apache/pluto/portalImpl/portlet/test/SimpleAttributeTest.java
Url: http://svn.apache.org/viewcvs/portals/pluto/trunk/testsuite/src/java/org/apache/pluto/portalImpl/portlet/test/SimpleAttributeTest.java?view=diff&rev=126193&p1=portals/pluto/trunk/testsuite/src/java/org/apache/pluto/portalImpl/portlet/test/SimpleAttributeTest.java&r1=126192&p2=portals/pluto/trunk/testsuite/src/java/org/apache/pluto/portalImpl/portlet/test/SimpleAttributeTest.java&r2=126193
==============================================================================
--- portals/pluto/trunk/testsuite/src/java/org/apache/pluto/portalImpl/portlet/test/SimpleAttributeTest.java
(original)
+++ portals/pluto/trunk/testsuite/src/java/org/apache/pluto/portalImpl/portlet/test/SimpleAttributeTest.java
Sat Jan 22 20:32:49 2005
@@ -113,9 +113,9 @@
         }
 
         int found = 0;
-        Enumeration enum = req.getAttributeNames();
-        while(enum.hasMoreElements()) {
-            if(enum.nextElement().toString().startsWith(KEY)) {
+        Enumeration enumerator= req.getAttributeNames();
+        while(enumerator.hasMoreElements()) {
+            if(enumerator.nextElement().toString().startsWith(KEY)) {
                 found++;
             }
         }
@@ -199,9 +199,9 @@
         }
 
         int found = 0;
-        Enumeration enum = req.getAttributeNames();
-        while(enum.hasMoreElements()) {
-            if(enum.nextElement().toString().startsWith(KEY)) {
+        Enumeration enumerator= req.getAttributeNames();
+        while(enumerator.hasMoreElements()) {
+            if(enumerator.nextElement().toString().startsWith(KEY)) {
                 found++;
             }
         }
@@ -285,9 +285,9 @@
         }
 
         int found = 0;
-        Enumeration enum = req.getAttributeNames();
-        while(enum.hasMoreElements()) {
-            if(enum.nextElement().toString().startsWith(KEY)) {
+        Enumeration enumerator= req.getAttributeNames();
+        while(enumerator.hasMoreElements()) {
+            if(enumerator.nextElement().toString().startsWith(KEY)) {
                 found++;
             }
         }

Modified: portals/pluto/trunk/testsuite/src/java/org/apache/pluto/portalImpl/portlet/test/SimpleParameterTest.java
Url: http://svn.apache.org/viewcvs/portals/pluto/trunk/testsuite/src/java/org/apache/pluto/portalImpl/portlet/test/SimpleParameterTest.java?view=diff&rev=126193&p1=portals/pluto/trunk/testsuite/src/java/org/apache/pluto/portalImpl/portlet/test/SimpleParameterTest.java&r1=126192&p2=portals/pluto/trunk/testsuite/src/java/org/apache/pluto/portalImpl/portlet/test/SimpleParameterTest.java&r2=126193
==============================================================================
--- portals/pluto/trunk/testsuite/src/java/org/apache/pluto/portalImpl/portlet/test/SimpleParameterTest.java
(original)
+++ portals/pluto/trunk/testsuite/src/java/org/apache/pluto/portalImpl/portlet/test/SimpleParameterTest.java
Sat Jan 22 20:32:49 2005
@@ -80,9 +80,9 @@
 
         boolean hasExternal = false;
         boolean hasInternal = false;
-        Enumeration enum = req.getParameterNames();
-        while(enum.hasMoreElements()) {
-            String val = enum.nextElement().toString();
+        Enumeration enumerator= req.getParameterNames();
+        while(enumerator.hasMoreElements()) {
+            String val = enumerator.nextElement().toString();
             if(KEY.equals(val)) {
                 hasExternal = true;
             }

Modified: portals/pluto/trunk/testsuite/src/java/org/apache/pluto/portalImpl/portlet/test/SimplePreferenceTest.java
Url: http://svn.apache.org/viewcvs/portals/pluto/trunk/testsuite/src/java/org/apache/pluto/portalImpl/portlet/test/SimplePreferenceTest.java?view=diff&rev=126193&p1=portals/pluto/trunk/testsuite/src/java/org/apache/pluto/portalImpl/portlet/test/SimplePreferenceTest.java&r1=126192&p2=portals/pluto/trunk/testsuite/src/java/org/apache/pluto/portalImpl/portlet/test/SimplePreferenceTest.java&r2=126193
==============================================================================
--- portals/pluto/trunk/testsuite/src/java/org/apache/pluto/portalImpl/portlet/test/SimplePreferenceTest.java
(original)
+++ portals/pluto/trunk/testsuite/src/java/org/apache/pluto/portalImpl/portlet/test/SimplePreferenceTest.java
Sat Jan 22 20:32:49 2005
@@ -385,10 +385,10 @@
 
         PortletPreferences prefs = req.getPreferences();
         Map map = prefs.getMap();
-        Enumeration enum = prefs.getNames();
+        Enumeration enumerator= prefs.getNames();
         boolean hasAll = true;
-        while(enum.hasMoreElements()) {
-            if(!map.containsKey(enum.nextElement())) {
+        while(enumerator.hasMoreElements()) {
+            if(!map.containsKey(enumerator.nextElement())) {
                 hasAll = false;
                 break;
             }

Mime
View raw message