You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by gr...@apache.org on 2005/02/12 18:43:17 UTC
svn commit: r153519 - in
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya:
ac/ldap/LDAPUser.java cms/cocoon/acting/UploadAction.java
lucene/html/HTMLParser.java lucene/index/IndexIterator.java
Author: gregor
Date: Sat Feb 12 09:43:15 2005
New Revision: 153519
URL: http://svn.apache.org/viewcvs?view=rev&rev=153519
Log:
Changed enum variables to improve compatibility with JDK 1.5
Modified:
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/ac/ldap/LDAPUser.java
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/cocoon/acting/UploadAction.java
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/lucene/html/HTMLParser.java
lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/lucene/index/IndexIterator.java
Modified: lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/ac/ldap/LDAPUser.java
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/ac/ldap/LDAPUser.java?view=diff&r1=153518&r2=153519
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/ac/ldap/LDAPUser.java (original)
+++ lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/ac/ldap/LDAPUser.java Sat Feb 12 09:43:15 2005
@@ -182,7 +182,7 @@
if (attributes != null) {
Attribute userNames = attributes.get(usrNameAttr);
if (userNames != null) {
- for (NamingEnumeration enum = userNames.getAll(); enum.hasMore(); enum.next()) {
+ for (NamingEnumeration nenum = userNames.getAll(); nenum.hasMore(); nenum.next()) {
name.append((String)userNames.get());
}
}
Modified: lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/cocoon/acting/UploadAction.java
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/cocoon/acting/UploadAction.java?view=diff&r1=153518&r2=153519
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/cocoon/acting/UploadAction.java (original)
+++ lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/cms/cocoon/acting/UploadAction.java Sat Feb 12 09:43:15 2005
@@ -194,8 +194,8 @@
* @param request The request.
*/
protected void logRequestParameters(Request request) {
- for (Enumeration enum = request.getParameterNames(); enum.hasMoreElements();) {
- String param = (String) enum.nextElement();
+ for (Enumeration myenum = request.getParameterNames(); myenum.hasMoreElements();) {
+ String param = (String) myenum.nextElement();
getLogger().debug(
param + ": " + request.getParameter(param) + " [" + request.get(param) + "]");
}
Modified: lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/lucene/html/HTMLParser.java
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/lucene/html/HTMLParser.java?view=diff&r1=153518&r2=153519
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/lucene/html/HTMLParser.java (original)
+++ lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/lucene/html/HTMLParser.java Sat Feb 12 09:43:15 2005
@@ -15,7 +15,7 @@
*
*/
-/* $Id: HTMLParser.java,v 1.14 2004/03/01 16:18:15 gregor Exp $ */
+/* $Id$ */
package org.apache.lenya.lucene.html;
@@ -908,8 +908,8 @@
boolean exists = false;
- for (java.util.Enumeration enum = jj_expentries.elements(); enum.hasMoreElements();) {
- int[] oldentry = (int[]) (enum.nextElement());
+ for (java.util.Enumeration elenum = jj_expentries.elements(); elenum.hasMoreElements();) {
+ int[] oldentry = (int[]) (elenum.nextElement());
if (oldentry.length == jj_expentry.length) {
exists = true;
Modified: lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/lucene/index/IndexIterator.java
URL: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/lucene/index/IndexIterator.java?view=diff&r1=153518&r2=153519
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/lucene/index/IndexIterator.java (original)
+++ lenya/branches/BRANCH_1_2_X/src/java/org/apache/lenya/lucene/index/IndexIterator.java Sat Feb 12 09:43:15 2005
@@ -15,7 +15,7 @@
*
*/
-/* $Id: IndexIterator.java,v 1.14 2004/07/31 05:32:02 michi Exp $ */
+/* $Id$ */
package org.apache.lenya.lucene.index;
@@ -190,15 +190,15 @@
* Returns an term enumerator beginning with the first term that represents a UID field.
*/
protected TermEnum enumerateUIDs(IndexReader reader) {
- TermEnum enum = null;
+ TermEnum tEnum = null;
try {
- enum = reader.terms(new Term("uid", ""));
+ tEnum = reader.terms(new Term("uid", ""));
} catch (IOException e) {
log.error("Term enumeration failed: ", e);
}
- return enum;
+ return tEnum;
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org