You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by an...@apache.org on 2004/11/07 23:30:17 UTC
svn commit: rev 56873 - in cocoon/branches/BRANCH_2_1_X/src/blocks: portal-fw/java/org/apache/cocoon/webapps/portal/components woody/java/org/apache/cocoon/woody/event
Author: antonio
Date: Sun Nov 7 14:30:17 2004
New Revision: 56873
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/portal-fw/java/org/apache/cocoon/webapps/portal/components/PortalManagerImpl.java
cocoon/branches/BRANCH_2_1_X/src/blocks/woody/java/org/apache/cocoon/woody/event/ProcessingPhase.java
Log:
Don't use enum as variable name (it breaks java 1.5).
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal-fw/java/org/apache/cocoon/webapps/portal/components/PortalManagerImpl.java
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/portal-fw/java/org/apache/cocoon/webapps/portal/components/PortalManagerImpl.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal-fw/java/org/apache/cocoon/webapps/portal/components/PortalManagerImpl.java Sun Nov 7 14:30:17 2004
@@ -78,7 +78,7 @@
* This is the basis portal component
*
* @author <a href="mailto:cziegeler@s-und-n.de">Carsten Ziegeler</a>
- * @version CVS $Id: PortalManagerImpl.java,v 1.6 2004/03/19 14:16:54 cziegeler Exp $
+ * @version CVS $Id$
*/
public final class PortalManagerImpl
extends AbstractLogEnabled
@@ -3912,13 +3912,13 @@
DocumentFragment profile = (DocumentFragment)theProfile.get(PortalConstants.PROFILE_PROFILE);
Node[] miscNodes = (Node[])theProfile.get(PortalConstants.PROFILE_MISC_POINTER);
Element columns = (Element)miscNodes[PortalConstants.PROFILE_MISC_COLUMNS_NODE];
- Enumeration enum = request.getParameterNames();
+ Enumeration enumeration = request.getParameterNames();
String current;
boolean saveProfile = false;
// first iteration: all changing commands
- while (enum.hasMoreElements()) {
- current = (String)enum.nextElement();
+ while (enumeration.hasMoreElements()) {
+ current = (String)enumeration.nextElement();
if (current.startsWith(PortalManagerImpl.REQ_PARAMETER_CONF)) {
int pos1, pos2;
pos1 = current.indexOf('.');
@@ -3946,10 +3946,10 @@
// second: all new
boolean calculate = false;
- enum = request.getParameterNames();
- while (enum.hasMoreElements()) {
+ enumeration = request.getParameterNames();
+ while (enumeration.hasMoreElements()) {
- current = (String)enum.nextElement();
+ current = (String)enumeration.nextElement();
if (current.startsWith(PortalManagerImpl.REQ_PARAMETER_CONF)) {
int pos1, pos2;
pos1 = current.indexOf('.');
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/woody/java/org/apache/cocoon/woody/event/ProcessingPhase.java
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/woody/java/org/apache/cocoon/woody/event/ProcessingPhase.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/woody/java/org/apache/cocoon/woody/event/ProcessingPhase.java Sun Nov 7 14:30:17 2004
@@ -19,13 +19,13 @@
import java.util.List;
import java.util.Map;
-import org.apache.commons.lang.enum.ValuedEnum;
+import org.apache.commons.lang.enums.ValuedEnum;
/**
* Type-safe enumeration of the various form processing phases.
*
* @author <a href="http://www.apache.org/~sylvain/">Sylvain Wallez</a>
- * @version CVS $Id: ProcessingPhase.java,v 1.5 2004/03/09 13:54:13 reinhard Exp $
+ * @version CVS $Id$
*/
public class ProcessingPhase extends ValuedEnum {