Author: antonio
Date: Wed Oct 6 14:37:44 2004
New Revision: 53913
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/acting/BookmarkAction.java
cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/coplets/basket/BasketTransformer.java
cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/impl/DefaultLinkService.java
cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/LanguageImpl.java
cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/reading/ProxyReader.java
cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/transformation/CopletTransformer.java
cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/transformation/ProxyTransformer.java
cocoon/branches/BRANCH_2_1_X/src/blocks/scratchpad/java/org/apache/cocoon/generation/JellyGenerator.java
cocoon/branches/BRANCH_2_1_X/src/blocks/scratchpad/java/org/apache/cocoon/generation/RequestParameterGenerator.java
cocoon/branches/BRANCH_2_1_X/src/deprecated/java/org/apache/cocoon/components/store/FilesystemStore.java
Log:
Change enum identifier to enumeration (allow compile in Java 1.5)
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/acting/BookmarkAction.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/acting/BookmarkAction.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/acting/BookmarkAction.java
Wed Oct 6 14:37:44 2004
@@ -62,7 +62,7 @@
* </bookmarks>
*
* @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a>
- * @version CVS $Id: BookmarkAction.java,v 1.5 2004/03/05 13:02:08 bdelacretaz
Exp $
+ * @version CVS $Id$
*/
public class BookmarkAction
extends ServiceableAction
@@ -190,9 +190,9 @@
}
}
}
- Enumeration enum = request.getParameterNames();
- while (enum.hasMoreElements()) {
- String name = (String)enum.nextElement();
+ Enumeration enumeration = request.getParameterNames();
+ while (enumeration.hasMoreElements()) {
+ String name = (String)enumeration.nextElement();
String value = request.getParameter(name);
Mapping m = (Mapping) this.eventMap.get(name);
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/coplets/basket/BasketTransformer.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/coplets/basket/BasketTransformer.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/coplets/basket/BasketTransformer.java
Wed Oct 6 14:37:44 2004
@@ -136,9 +136,9 @@
if ( parameters != null && parameters.length() > 0 ) {
// create hidden input fields
RequestParameters pars = new RequestParameters(parameters);
- Enumeration enum = pars.getParameterNames();
- while ( enum.hasMoreElements() ) {
- String pName = (String)enum.nextElement();
+ Enumeration enumeration = pars.getParameterNames();
+ while ( enumeration.hasMoreElements() ) {
+ String pName = (String)enumeration.nextElement();
String pValue = pars.getParameter(pName);
AttributesImpl hiddenAttrs = new AttributesImpl();
hiddenAttrs.addCDATAAttribute("type", "hidden");
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/impl/DefaultLinkService.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/impl/DefaultLinkService.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/impl/DefaultLinkService.java
Wed Oct 6 14:37:44 2004
@@ -263,9 +263,9 @@
info.linkBase.delete(pos, info.linkBase.length() + 1);
info.hasParameters = false;
- Enumeration enum = params.getParameterNames();
- while ( enum.hasMoreElements() ) {
- final String paramName = (String)enum.nextElement();
+ Enumeration enumeration = params.getParameterNames();
+ while ( enumeration.hasMoreElements() ) {
+ final String paramName = (String)enumeration.nextElement();
if ( !paramName.equals(name) ) {
String[] values = params.getParameterValues(paramName);
for( int i = 0; i < values.length; i++ ) {
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/LanguageImpl.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/LanguageImpl.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/LanguageImpl.java
Wed Oct 6 14:37:44 2004
@@ -34,7 +34,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a>
*
- * @version CVS $Id: LanguageImpl.java,v 1.3 2004/03/05 13:02:15 bdelacretaz
Exp $
+ * @version CVS $Id$
*/
public class LanguageImpl implements Language, java.io.Serializable {
// ResourceBundle creation part
@@ -91,8 +91,8 @@
private void importData(ResourceBundle bundle) {
if (bundle != null) {
- for (Enumeration enum = bundle.getKeys();
enum.hasMoreElements();) {
- String key = (String)enum.nextElement();
+ for (Enumeration enumeration = bundle.getKeys();
enumeration.hasMoreElements();) {
+ String key = (String)enumeration.nextElement();
Object value = bundle.getObject(key);
data.put(key, value);
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/reading/ProxyReader.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/reading/ProxyReader.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/reading/ProxyReader.java
Wed Oct 6 14:37:44 2004
@@ -156,13 +156,13 @@
String cookie =
(String) copletInstanceData.getAttribute(ProxyTransformer.COOKIE);
- Enumeration enum = request.getParameterNames();
+ Enumeration enumeration = request.getParameterNames();
boolean firstattribute = true;
StringBuffer query = new StringBuffer();
- while (enum.hasMoreElements()) {
- String paramName = (String) enum.nextElement();
+ while (enumeration.hasMoreElements()) {
+ String paramName = (String) enumeration.nextElement();
if (!paramName.startsWith("cocoon-portal-")) {
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/transformation/CopletTransformer.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/transformation/CopletTransformer.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/transformation/CopletTransformer.java
Wed Oct 6 14:37:44 2004
@@ -53,7 +53,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Carsten Ziegeler</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Björn Lütkemeier</a>
- * @version CVS $Id: CopletTransformer.java,v 1.19 2004/04/01 10:25:41
cziegeler Exp $
+ * @version CVS $Id$
*/
public class CopletTransformer
extends AbstractCopletTransformer {
@@ -267,9 +267,9 @@
if ( addParametersAsHiddenFields ) {
// create hidden input fields
RequestParameters pars = new RequestParameters(parameters);
- Enumeration enum = pars.getParameterNames();
- while ( enum.hasMoreElements() ) {
- String pName = (String)enum.nextElement();
+ Enumeration enumeration = pars.getParameterNames();
+ while ( enumeration.hasMoreElements() ) {
+ String pName = (String)enumeration.nextElement();
String pValue = pars.getParameter(pName);
AttributesImpl hiddenAttrs = new AttributesImpl();
hiddenAttrs.addCDATAAttribute("type", "hidden");
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/transformation/ProxyTransformer.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/transformation/ProxyTransformer.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/transformation/ProxyTransformer.java
Wed Oct 6 14:37:44 2004
@@ -242,12 +242,12 @@
StringBuffer query = new StringBuffer();
boolean firstparameter = true;
- Enumeration enum = request.getParameterNames();
+ Enumeration enumeration = request.getParameterNames();
boolean post = ("POST".equals(request.getMethod()));
- while (enum.hasMoreElements()) {
- String paramName = (String) enum.nextElement();
+ while (enumeration.hasMoreElements()) {
+ String paramName = (String) enumeration.nextElement();
if (!paramName.startsWith("cocoon-portal-")) {
String[] paramValues =
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/scratchpad/java/org/apache/cocoon/generation/JellyGenerator.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/scratchpad/java/org/apache/cocoon/generation/JellyGenerator.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/scratchpad/java/org/apache/cocoon/generation/JellyGenerator.java
Wed Oct 6 14:37:44 2004
@@ -136,9 +136,9 @@
protected void updateContext() throws ProcessingException {
try {
Request request = ObjectModelHelper.getRequest( this.objectModel );
- Enumeration enum = request.getParameterNames();
- while (enum.hasMoreElements()) {
- String var = (String) enum.nextElement();
+ Enumeration enumeration = request.getParameterNames();
+ while (enumeration.hasMoreElements()) {
+ String var = (String) enumeration.nextElement();
String val = request.getParameter(var);
this.jellyContext.setVariable( var, val );
}
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/scratchpad/java/org/apache/cocoon/generation/RequestParameterGenerator.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/scratchpad/java/org/apache/cocoon/generation/RequestParameterGenerator.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/scratchpad/java/org/apache/cocoon/generation/RequestParameterGenerator.java
Wed Oct 6 14:37:44 2004
@@ -236,8 +236,8 @@
StringBuffer buff = new StringBuffer();
Set sort1 = new TreeSet();
Set sort2 = new TreeSet();
- Enumeration enum = request.getParameterNames();
- while (enum.hasMoreElements()) sort1.add(enum.nextElement());
+ Enumeration enumeration = request.getParameterNames();
+ while (enumeration.hasMoreElements())
sort1.add(enumeration.nextElement());
/* Declare how many parameters we have */
if (sort1.size() > Character.MAX_VALUE) {
Modified:
cocoon/branches/BRANCH_2_1_X/src/deprecated/java/org/apache/cocoon/components/store/FilesystemStore.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/deprecated/java/org/apache/cocoon/components/store/FilesystemStore.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/deprecated/java/org/apache/cocoon/components/store/FilesystemStore.java
Wed Oct 6 14:37:44 2004
@@ -41,7 +41,7 @@
*
* @author ?
* @author <a href="mailto:[EMAIL PROTECTED]">Vadim Gritsenko</a>
- * @version CVS $Id: FilesystemStore.java,v 1.3 2004/03/05 13:02:41
bdelacretaz Exp $
+ * @version CVS $Id$
*/
public final class FilesystemStore extends AbstractLogEnabled
implements Store, Contextualizable, Parameterizable, ThreadSafe {
@@ -233,9 +233,9 @@
* Returns the list of stored files as an Enumeration of Files
*/
public synchronized Enumeration keys() {
- final FSEnumeration enum = new FSEnumeration();
- this.addKeys(enum, this.directoryFile);
- return enum;
+ final FSEnumeration fsEnum = new FSEnumeration();
+ this.addKeys(fsEnum, this.directoryFile);
+ return fsEnum;
}
/**
@@ -246,14 +246,14 @@
return countKeys(this.directoryFile);
}
- protected void addKeys(FSEnumeration enum, File directory) {
+ protected void addKeys(FSEnumeration fsEnum, File directory) {
final int subStringBegin =
this.directoryFile.getAbsolutePath().length() + 1;
final File[] files = directory.listFiles();
for (int i=0; i<files.length; i++) {
if (files[i].isDirectory()) {
- this.addKeys(enum, files[i]);
+ this.addKeys(fsEnum, files[i]);
} else {
-
enum.add(this.decode(files[i].getAbsolutePath().substring(subStringBegin)));
+
fsEnum.add(this.decode(files[i].getAbsolutePath().substring(subStringBegin)));
}
}
}
