Author: antonio
Date: Wed Oct 6 14:54:58 2004
New Revision: 53915
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/proxy/java/org/apache/cocoon/generation/WebServiceProxyGenerator.java
cocoon/branches/BRANCH_2_1_X/src/blocks/repository/java/org/apache/cocoon/generation/TraversableGenerator.java
cocoon/branches/BRANCH_2_1_X/src/blocks/serializers/java/org/apache/cocoon/components/serializers/encoding/CharsetFactory.java
cocoon/branches/BRANCH_2_1_X/src/blocks/slide/java/org/apache/cocoon/slide/util/AdminHelper.java
cocoon/branches/BRANCH_2_1_X/src/blocks/web3/java/org/apache/cocoon/components/web3/impl/Web3DataSourceSelectorImpl.java
cocoon/branches/BRANCH_2_1_X/src/blocks/webdav/java/org/apache/cocoon/transformation/DASLTransformer.java
Log:
Change enum identifier to enumeration (allow compile in Java 1.5)
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/proxy/java/org/apache/cocoon/generation/WebServiceProxyGenerator.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/proxy/java/org/apache/cocoon/generation/WebServiceProxyGenerator.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/proxy/java/org/apache/cocoon/generation/WebServiceProxyGenerator.java
Wed Oct 6 14:54:58 2004
@@ -71,7 +71,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Ivelin Ivanov</a>, June 30, 2002
* @author <a href="mailto:[EMAIL PROTECTED]">Tony Collen</a>, December 2, 2002
- * @version CVS $Id: WebServiceProxyGenerator.java,v 1.7 2004/03/05 13:02:20
bdelacretaz Exp $
+ * @version CVS $Id$
*/
public class WebServiceProxyGenerator extends ServiceableGenerator {
@@ -172,9 +172,9 @@
Request request = ObjectModelHelper.getRequest(objectModel);
ArrayList paramList = new ArrayList();
- Enumeration enum = request.getParameterNames();
- while (enum.hasMoreElements()) {
- String pname = (String)enum.nextElement();
+ Enumeration enumeration = request.getParameterNames();
+ while (enumeration.hasMoreElements()) {
+ String pname = (String)enumeration.nextElement();
String[] paramsForName = request.getParameterValues(pname);
for (int i = 0; i < paramsForName.length; i++) {
NameValuePair pair = new NameValuePair(pname,
paramsForName[i]);
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/repository/java/org/apache/cocoon/generation/TraversableGenerator.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/repository/java/org/apache/cocoon/generation/TraversableGenerator.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/repository/java/org/apache/cocoon/generation/TraversableGenerator.java
Wed Oct 6 14:54:58 2004
@@ -101,7 +101,7 @@
* (SMB GmbH) for Virbus AG
* @author <a href="[EMAIL PROTECTED]">Daniele Madama</a>
* @author <a href="[EMAIL PROTECTED]">Gianugo Rabellino</a>
- * @version CVS $Id: TraversableGenerator.java,v 1.14 2004/04/19 19:36:43 ugo
Exp $
+ * @version CVS $Id$
*/
public class TraversableGenerator extends ServiceableGenerator implements
CacheableProcessingComponent {
@@ -326,9 +326,9 @@
this.resolver.release(src);
}
if (ancestors != null) {
- Enumeration enum = ancestors.elements();
- while (enum.hasMoreElements()) {
- resolver.release((Source) enum.nextElement());
+ Enumeration enumeration = ancestors.elements();
+ while (enumeration.hasMoreElements()) {
+ resolver.release((Source) enumeration.nextElement());
}
}
}
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/serializers/java/org/apache/cocoon/components/serializers/encoding/CharsetFactory.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/serializers/java/org/apache/cocoon/components/serializers/encoding/CharsetFactory.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/serializers/java/org/apache/cocoon/components/serializers/encoding/CharsetFactory.java
Wed Oct 6 14:54:58 2004
@@ -32,7 +32,7 @@
*
*
* @author <a href="mailto:[EMAIL PROTECTED]">Pier Fumagalli</a>, February 2003
- * @version CVS $Id: CharsetFactory.java,v 1.3 2004/04/30 22:57:22 joerg Exp $
+ * @version CVS $Id$
*/
public final class CharsetFactory {
@@ -122,9 +122,9 @@
mtch = mtch.substring(2, mtch.lastIndexOf('/') + 1) + "cs_";
ZipFile zip = new ZipFile(file);
- Enumeration enum = zip.entries();
- while (enum.hasMoreElements()) {
- ZipEntry entry = (ZipEntry)enum.nextElement();
+ Enumeration enumeration = zip.entries();
+ while (enumeration.hasMoreElements()) {
+ ZipEntry entry = (ZipEntry)enumeration.nextElement();
String name = entry.getName();
if ((! name.startsWith(mtch)) ||
(! name.endsWith(".class"))) continue;
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/slide/java/org/apache/cocoon/slide/util/AdminHelper.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/slide/java/org/apache/cocoon/slide/util/AdminHelper.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/slide/java/org/apache/cocoon/slide/util/AdminHelper.java
Wed Oct 6 14:54:58 2004
@@ -434,9 +434,9 @@
Content content = nat.getContentHelper();
ObjectNode object = structure.retrieve(slideToken,path);
- Enumeration enum = structure.getChildren(slideToken,object);
- while (enum.hasMoreElements()) {
- String uri = ((ObjectNode) enum.nextElement()).getUri();
+ Enumeration enumeration = structure.getChildren(slideToken,object);
+ while (enumeration.hasMoreElements()) {
+ String uri = ((ObjectNode) enumeration.nextElement()).getUri();
NodeRevisionDescriptors revisions = content.retrieve(slideToken,
uri);
NodeRevisionDescriptor revision = content.retrieve(slideToken,
revisions);
NodeProperty property =
revision.getProperty("group-member-set","DAV:");
@@ -483,9 +483,9 @@
Structure structure = nat.getStructureHelper();
ObjectNode object = structure.retrieve(slideToken,path);
- Enumeration enum = structure.getChildren(slideToken,object);
- while (enum.hasMoreElements()) {
- result.add(((ObjectNode) enum.nextElement()).getUri());
+ Enumeration enumeration = structure.getChildren(slideToken,object);
+ while (enumeration.hasMoreElements()) {
+ result.add(((ObjectNode) enumeration.nextElement()).getUri());
}
return result;
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/web3/java/org/apache/cocoon/components/web3/impl/Web3DataSourceSelectorImpl.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/web3/java/org/apache/cocoon/components/web3/impl/Web3DataSourceSelectorImpl.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/web3/java/org/apache/cocoon/components/web3/impl/Web3DataSourceSelectorImpl.java
Wed Oct 6 14:54:58 2004
@@ -41,7 +41,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Michael Gerzabek</a>
* @since 2.1
- * @version CVS $Id: Web3DataSourceSelectorImpl.java,v 1.7 2004/03/05 13:02:25
bdelacretaz Exp $
+ * @version CVS $Id$
*/
public class Web3DataSourceSelectorImpl
extends AbstractLogEnabled
@@ -141,10 +141,10 @@
Web3DataSourceSelectorImpl.lock.acquire();
String sid = null;
Web3DataSource pool;
- for (Enumeration enum = Web3DataSourceSelectorImpl.pools.keys();
- enum.hasMoreElements();
+ for (Enumeration enumeration =
Web3DataSourceSelectorImpl.pools.keys();
+ enumeration.hasMoreElements();
) {
- sid = (String) enum.nextElement();
+ sid = (String) enumeration.nextElement();
pool =
(Web3DataSource) Web3DataSourceSelectorImpl.pools.get(sid);
pool.dispose();
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/webdav/java/org/apache/cocoon/transformation/DASLTransformer.java
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/webdav/java/org/apache/cocoon/transformation/DASLTransformer.java
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/webdav/java/org/apache/cocoon/transformation/DASLTransformer.java
Wed Oct 6 14:54:58 2004
@@ -219,14 +219,14 @@
throw new SAXException("The server don't support the SEARCH
method");
}
searchMethod.execute(state, conn);
- Enumeration enum = searchMethod.getAllResponseURLs();
+ Enumeration enumeration = searchMethod.getAllResponseURLs();
this.contentHandler.startElement(
DASL_QUERY_NS,
RESULT_ROOT_TAG,
PREFIX + ":" + RESULT_ROOT_TAG,
new AttributesImpl());
- while (enum.hasMoreElements()) {
- String path = (String) enum.nextElement();
+ while (enumeration.hasMoreElements()) {
+ String path = (String) enumeration.nextElement();
Enumeration properties =
searchMethod.getResponseProperties(path);
AttributesImpl attr = new AttributesImpl();
attr.addAttribute(DASL_QUERY_NS, PATH_NODE_NAME, PREFIX + ":"
+ PATH_NODE_NAME, "CDATA",path);
