jford 2005/01/14 13:07:56
Modified:
portals-bridges/myfaces/src/java/org/apache/portals/bridges/myfaces
PortletExternalContextImpl.java
components/security/src/test/org/apache/jetspeed/security
TestPermissionManager.java
components/registry/src/java/org/apache/jetspeed/om/impl
LanguageImpl.java
portals-bridges/perl/src/java/org/apache/portals/bridges/perl
PerlPortlet.java
portal/src/java/org/apache/jetspeed/engine/servlet
ServletRequestImpl.java
Log:
Fixing naming issue in JDK 5.0
Revision Changes Path
1.6 +3 -3
jakarta-jetspeed-2/portals-bridges/myfaces/src/java/org/apache/portals/bridges/myfaces/PortletExternalContextImpl.java
Index: PortletExternalContextImpl.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portals-bridges/myfaces/src/java/org/apache/portals/bridges/myfaces/PortletExternalContextImpl.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- PortletExternalContextImpl.java 17 Nov 2004 01:07:46 -0000 1.5
+++ PortletExternalContextImpl.java 14 Jan 2005 21:07:56 -0000 1.6
@@ -243,17 +243,17 @@
*/
public Iterator getRequestParameterNames()
{
- final Enumeration enum = this.portletRequest.getParameterNames();
+ final Enumeration names = this.portletRequest.getParameterNames();
Iterator it = new Iterator()
{
public boolean hasNext()
{
- return enum.hasMoreElements();
+ return names.hasMoreElements();
}
public Object next()
{
- return enum.nextElement();
+ return names.nextElement();
}
public void remove()
1.7 +3 -3
jakarta-jetspeed-2/components/security/src/test/org/apache/jetspeed/security/TestPermissionManager.java
Index: TestPermissionManager.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/components/security/src/test/org/apache/jetspeed/security/TestPermissionManager.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- TestPermissionManager.java 29 Oct 2004 14:12:28 -0000 1.6
+++ TestPermissionManager.java 14 Jan 2005 21:07:56 -0000 1.7
@@ -486,13 +486,13 @@
*/
private boolean validatePermissions(Permissions permissions, Permission
permission, int size)
{
- Enumeration enum = permissions.elements();
+ Enumeration permissionEnums = permissions.elements();
boolean hasPermission = false;
int count = 0;
- while (enum.hasMoreElements())
+ while (permissionEnums.hasMoreElements())
{
count++;
- Permission enumPerm = (Permission) enum.nextElement();
+ Permission enumPerm = (Permission) permissionEnums.nextElement();
if (enumPerm.equals(permission))
{
hasPermission = true;
1.9 +3 -3
jakarta-jetspeed-2/components/registry/src/java/org/apache/jetspeed/om/impl/LanguageImpl.java
Index: LanguageImpl.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/components/registry/src/java/org/apache/jetspeed/om/impl/LanguageImpl.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- LanguageImpl.java 6 Oct 2004 01:50:49 -0000 1.8
+++ LanguageImpl.java 14 Jan 2005 21:07:56 -0000 1.9
@@ -279,9 +279,9 @@
{
if (bundle != null)
{
- for (Enumeration enum = bundle.getKeys();
enum.hasMoreElements();)
+ for (Enumeration keys = bundle.getKeys();
keys.hasMoreElements();)
{
- String key = (String) enum.nextElement();
+ String key = (String) keys.nextElement();
Object value = bundle.getObject(key);
data.put(key, value);
}
1.4 +4 -4
jakarta-jetspeed-2/portals-bridges/perl/src/java/org/apache/portals/bridges/perl/PerlPortlet.java
Index: PerlPortlet.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portals-bridges/perl/src/java/org/apache/portals/bridges/perl/PerlPortlet.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- PerlPortlet.java 22 Dec 2004 23:58:45 -0000 1.3
+++ PerlPortlet.java 14 Jan 2005 21:07:56 -0000 1.4
@@ -179,11 +179,11 @@
cgi.setScriptName(perlParameter);
// Get all the parameters from the request and add them
as query arguments
- Enumeration enum = actionRequest.getParameterNames();
+ Enumeration names = actionRequest.getParameterNames();
String name, value;
- while (enum.hasMoreElements())
+ while (names.hasMoreElements())
{
- name = (String)enum.nextElement();
+ name = (String)names.nextElement();
// PERL_PARAMETER already processed just ignore
it
if
(name.compareToIgnoreCase(PerlParameters.ACTION_PARAMETER_PERL) != 0)
{
1.32 +4 -4
jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/engine/servlet/ServletRequestImpl.java
Index: ServletRequestImpl.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/engine/servlet/ServletRequestImpl.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- ServletRequestImpl.java 4 Jan 2005 16:15:14 -0000 1.31
+++ ServletRequestImpl.java 14 Jan 2005 21:07:56 -0000 1.32
@@ -256,10 +256,10 @@
{
ArrayList locales = new ArrayList();
locales.add(preferedLocale);
- Enumeration enum = super.getLocales();
- while (enum.hasMoreElements())
+ Enumeration localeEnums = super.getLocales();
+ while (localeEnums.hasMoreElements())
{
- locales.add(enum.nextElement());
+ locales.add(localeEnums.nextElement());
}
Iterator i = locales.iterator();
return new Enumerator(locales);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
