You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by un...@apache.org on 2003/12/14 16:22:54 UTC
cvs commit: cocoon-2.1/src/blocks/repository/java/org/apache/cocoon/generation TraversableSourceDescriptionGenerator.java
unico 2003/12/14 07:22:54
Modified: src/blocks/slide/java/org/apache/cocoon/generation
SourceDescriptionGenerator.java
src/blocks/repository/java/org/apache/cocoon/components/source
LockableSource.java
src/blocks/repository/java/org/apache/cocoon/generation
TraversableSourceDescriptionGenerator.java
Log:
remove ancient Enumeration object in favor of array to match with other Source extension conventions
Revision Changes Path
1.8 +5 -5 cocoon-2.1/src/blocks/slide/java/org/apache/cocoon/generation/SourceDescriptionGenerator.java
Index: SourceDescriptionGenerator.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/slide/java/org/apache/cocoon/generation/SourceDescriptionGenerator.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- SourceDescriptionGenerator.java 23 Oct 2003 17:13:33 -0000 1.7
+++ SourceDescriptionGenerator.java 14 Dec 2003 15:22:54 -0000 1.8
@@ -618,16 +618,16 @@
*/
public void pushSourceLocks(LockableSource source)
throws SAXException, SourceException {
- Enumeration locks = source.getSourceLocks();
+ SourceLock[] locks = source.getSourceLocks();
SourceLock lock;
- if (locks.hasMoreElements()) {
+ if (locks != null && locks.length > 0) {
this.contentHandler.startElement(SOURCE_NS, LOCKS_NODE_NAME,
LOCKS_NODE_QNAME,
new AttributesImpl());
- while (locks.hasMoreElements()) {
- lock = (SourceLock) locks.nextElement();
+ for (int i = 0; locks.length > 0; i++) {
+ lock = (SourceLock) locks[i];
AttributesImpl attributes = new AttributesImpl();
1.2 +3 -5 cocoon-2.1/src/blocks/repository/java/org/apache/cocoon/components/source/LockableSource.java
Index: LockableSource.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/repository/java/org/apache/cocoon/components/source/LockableSource.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- LockableSource.java 22 Oct 2003 18:53:06 -0000 1.1
+++ LockableSource.java 14 Dec 2003 15:22:54 -0000 1.2
@@ -54,8 +54,6 @@
import org.apache.cocoon.components.source.helpers.SourceLock;
-import java.util.Enumeration;
-
/**
* A source, which could be locked
*
@@ -74,10 +72,10 @@
public void addSourceLocks(SourceLock sourcelock) throws SourceException;
/**
- * Returns a enumeration of the existing locks
+ * Returns a list of locks on the source.
*
* @return Enumeration of SourceLock
*/
- public Enumeration getSourceLocks() throws SourceException;
+ public SourceLock[] getSourceLocks() throws SourceException;
}
1.5 +4 -5 cocoon-2.1/src/blocks/repository/java/org/apache/cocoon/generation/TraversableSourceDescriptionGenerator.java
Index: TraversableSourceDescriptionGenerator.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/repository/java/org/apache/cocoon/generation/TraversableSourceDescriptionGenerator.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TraversableSourceDescriptionGenerator.java 21 Nov 2003 11:43:44 -0000 1.4
+++ TraversableSourceDescriptionGenerator.java 14 Dec 2003 15:22:54 -0000 1.5
@@ -51,7 +51,6 @@
package org.apache.cocoon.generation;
import java.io.IOException;
-import java.util.Enumeration;
import java.util.Map;
import org.apache.avalon.framework.parameters.Parameters;
@@ -335,16 +334,16 @@
*/
public void pushSourceLocks(LockableSource source)
throws SAXException, SourceException {
- Enumeration locks = source.getSourceLocks();
+ SourceLock[] locks = source.getSourceLocks();
SourceLock lock;
- if (locks != null && locks.hasMoreElements()) {
+ if (locks != null && locks.length > 0) {
this.contentHandler.startElement(URI, LOCKS_NODE_NAME,
LOCKS_NODE_QNAME,
new AttributesImpl());
- while (locks.hasMoreElements()) {
- lock = (SourceLock) locks.nextElement();
+ for (int i = 0; locks.length > 0; i++) {
+ lock = (SourceLock) locks[i];
AttributesImpl attributes = new AttributesImpl();