You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by re...@apache.org on 2011/07/04 11:53:54 UTC
svn commit: r1142601 - in /cocoon/cocoon3/trunk:
cocoon-controller/src/main/java/org/apache/cocoon/controller/
cocoon-optional/src/main/java/org/apache/cocoon/generation/
cocoon-optional/src/main/java/org/apache/cocoon/optional/servlet/components/sax/s...
Author: reinhard
Date: Mon Jul 4 09:53:53 2011
New Revision: 1142601
URL: http://svn.apache.org/viewvc?rev=1142601&view=rev
Log:
override on interface implementations isn't supported by jdk1.5; javadocs; formatting
Modified:
cocoon/cocoon3/trunk/cocoon-controller/src/main/java/org/apache/cocoon/controller/SpringControllerComponent.java
cocoon/cocoon3/trunk/cocoon-optional/src/main/java/org/apache/cocoon/generation/DirectoryGenerator.java
cocoon/cocoon3/trunk/cocoon-optional/src/main/java/org/apache/cocoon/optional/servlet/components/sax/serializers/EncodingHTMLSerializer.java
cocoon/cocoon3/trunk/cocoon-optional/src/main/java/org/apache/cocoon/optional/servlet/components/sax/serializers/EncodingXHTMLSerializer.java
cocoon/cocoon3/trunk/cocoon-optional/src/main/java/org/apache/cocoon/optional/servlet/components/sax/serializers/EncodingXMLSerializer.java
cocoon/cocoon3/trunk/cocoon-optional/src/main/java/org/apache/cocoon/optional/servlet/components/sax/serializers/util/ConfigurationUtils.java
cocoon/cocoon3/trunk/cocoon-optional/src/test/java/org/apache/cocoon/optional/pipeline/components/sax/jaxb/Equipment.java
cocoon/cocoon3/trunk/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/NonCachingPipeline.java
cocoon/cocoon3/trunk/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/caching/CompleteCacheValue.java
cocoon/cocoon3/trunk/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/component/Consumer.java
cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/component/SchemaErrorHandler.java
Modified: cocoon/cocoon3/trunk/cocoon-controller/src/main/java/org/apache/cocoon/controller/SpringControllerComponent.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-controller/src/main/java/org/apache/cocoon/controller/SpringControllerComponent.java?rev=1142601&r1=1142600&r2=1142601&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-controller/src/main/java/org/apache/cocoon/controller/SpringControllerComponent.java (original)
+++ cocoon/cocoon3/trunk/cocoon-controller/src/main/java/org/apache/cocoon/controller/SpringControllerComponent.java Mon Jul 4 09:53:53 2011
@@ -31,7 +31,7 @@ import org.springframework.context.Appli
import org.springframework.context.ApplicationContextAware;
public class SpringControllerComponent extends AbstractPipelineComponent implements Starter, Finisher,
- ApplicationContextAware, CachingPipelineComponent {
+ApplicationContextAware, CachingPipelineComponent {
private ApplicationContext applicationContext;
private String beanName;
@@ -107,7 +107,7 @@ public class SpringControllerComponent e
public void setup(Map<String, Object> parameters) {
this.parameters = parameters;
- this.controller = (Controller) this.applicationContext.getBean(
+ this.controller = this.applicationContext.getBean(
Controller.class.getName() + "/" + this.beanName, Controller.class);
this.controller.setup(this.selector, this.parameters, this.configuration);
}
Modified: cocoon/cocoon3/trunk/cocoon-optional/src/main/java/org/apache/cocoon/generation/DirectoryGenerator.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-optional/src/main/java/org/apache/cocoon/generation/DirectoryGenerator.java?rev=1142601&r1=1142600&r2=1142601&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-optional/src/main/java/org/apache/cocoon/generation/DirectoryGenerator.java (original)
+++ cocoon/cocoon3/trunk/cocoon-optional/src/main/java/org/apache/cocoon/generation/DirectoryGenerator.java Mon Jul 4 09:53:53 2011
@@ -16,6 +16,17 @@
*/
package org.apache.cocoon.generation;
+import java.io.File;
+import java.net.URL;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.Stack;
+
import org.apache.cocoon.pipeline.ProcessingException;
import org.apache.cocoon.pipeline.SetupException;
import org.apache.cocoon.pipeline.caching.CacheKey;
@@ -28,21 +39,11 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.regexp.RE;
import org.apache.regexp.RESyntaxException;
-import java.io.File;
-import java.net.URL;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Comparator;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import java.util.Stack;
import org.xml.sax.SAXException;
import org.xml.sax.helpers.AttributesImpl;
public class DirectoryGenerator extends AbstractSAXGenerator
- implements CachingPipelineComponent {
+implements CachingPipelineComponent {
private static final Log LOG = LogFactory.getLog(DirectoryGenerator.class);
@@ -194,59 +195,53 @@ public class DirectoryGenerator extends
}
/**
- * Gets the source validity, using a deferred validity object. The validity
- * is initially empty since the files that define it are not known before
- * generation has occured. So the returned object is kept by the generator
- * and filled with each of the files that are traversed.
+ * Gets the source validity, using a deferred validity object. The validity is initially empty since the files that
+ * define it are not known before generation has occured. So the returned object is kept by the generator and filled
+ * with each of the files that are traversed.
*
* @see DirectoryGenerator.DirValidity
*
- * public SourceValidity getValidity() { if (this.validity == null) {
- * this.validity = new DirValidity(this.refreshDelay); } return
- * this.validity; }/
+ * public SourceValidity getValidity() { if (this.validity == null) { this.validity = new
+ * DirValidity(this.refreshDelay); } return this.validity; }/
*
* /** Generate XML data.
*
- * @throws SAXException
- * if an error occurs while outputting the document
- * @throws ProcessingException
- * if the requsted URI isn't a directory on the local filesystem
+ * @throws SAXException if an error occurs while outputting the document
+ * @throws ProcessingException if the requsted URI isn't a directory on the local filesystem
*/
public void execute() throws ProcessingException {
try {
// This relies on systemId being of the form "file://..."
- if (!directorySource.isDirectory()) {
- throw new ProcessingException(directorySource
+ if (!this.directorySource.isDirectory()) {
+ throw new ProcessingException(this.directorySource
+ " is not a directory.");
}
this.getSAXConsumer().startDocument();
this.getSAXConsumer().startPrefixMapping(PREFIX, URI);
- final Stack<File> ancestors = getAncestors(directorySource);
- addAncestorPath(directorySource, ancestors);
+ final Stack<File> ancestors = this.getAncestors(this.directorySource);
+ this.addAncestorPath(this.directorySource, ancestors);
this.getSAXConsumer().endPrefixMapping(PREFIX);
this.getSAXConsumer().endDocument();
} catch (Exception ioe) {
throw new ProcessingException("Could not read directory "
- + directorySource, ioe);
+ + this.directorySource, ioe);
}
}
/**
- * Creates a stack containing the ancestors of File up to specified
- * directory.
+ * Creates a stack containing the ancestors of File up to specified directory.
*
- * @param path
- * the File whose ancestors shall be retrieved
+ * @param path the File whose ancestors shall be retrieved
* @return a Stack containing the ancestors.
*/
protected Stack<File> getAncestors(final File path) {
File parent = path;
Stack<File> ancestors = new Stack<File>();
- while ((parent != null) && !isRoot(parent)) {
+ while ((parent != null) && !this.isRoot(parent)) {
parent = parent.getParentFile();
if (parent != null) {
ancestors.push(parent);
@@ -270,44 +265,39 @@ public class DirectoryGenerator extends
* @throws SAXException
*/
protected void addAncestorPath(final File path, final Stack<File> ancestors)
- throws SAXException {
+ throws SAXException {
if (ancestors.empty()) {
this.isRequestedDirectory = true;
- addPath(path, depth);
+ this.addPath(path, this.depth);
} else {
- startNode(DIR_NODE_NAME, (File) ancestors.pop());
- addAncestorPath(path, ancestors);
- endNode(DIR_NODE_NAME);
+ this.startNode(DIR_NODE_NAME, ancestors.pop());
+ this.addAncestorPath(path, ancestors);
+ this.endNode(DIR_NODE_NAME);
}
}
/**
- * Adds a single node to the generated document. If the path is a directory,
- * and depth is greater than zero, then recursive calls are made to add
- * nodes for the directory's children.
+ * Adds a single node to the generated document. If the path is a directory, and depth is greater than zero, then
+ * recursive calls are made to add nodes for the directory's children.
*
- * @param path
- * the file/directory to process
- * @param depth
- * how deep to scan the directory
- * @throws SAXException
- * if an error occurs while constructing nodes
+ * @param path the file/directory to process
+ * @param depth how deep to scan the directory
+ * @throws SAXException if an error occurs while constructing nodes
*/
protected void addPath(final File path, final int depth)
- throws SAXException {
+ throws SAXException {
if (path.isDirectory()) {
- startNode(DIR_NODE_NAME, path);
+ this.startNode(DIR_NODE_NAME, path);
if (depth > 0) {
final File[] contents = path.listFiles();
- if ("name".equals(sort)) {
+ if ("name".equals(this.sort)) {
Arrays.sort(contents, new Comparator<Object>() {
- @Override
public int compare(final Object o1, final Object o2) {
- if (reverse) {
+ if (DirectoryGenerator.this.reverse) {
return ((File) o2).getName().compareTo(
((File) o1).getName());
}
@@ -315,45 +305,42 @@ public class DirectoryGenerator extends
((File) o2).getName());
}
});
- } else if ("size".equals(sort)) {
+ } else if ("size".equals(this.sort)) {
Arrays.sort(contents, new Comparator<Object>() {
- @Override
public int compare(final Object o1, final Object o2) {
- if (reverse) {
+ if (DirectoryGenerator.this.reverse) {
return Long.valueOf(((File) o2).length()).
- compareTo(
+ compareTo(
Long.valueOf(((File) o1).length()));
}
return Long.valueOf(((File) o1).length()).
- compareTo(
+ compareTo(
Long.valueOf(((File) o2).length()));
}
});
- } else if ("lastmodified".equals(sort)) {
+ } else if ("lastmodified".equals(this.sort)) {
Arrays.sort(contents, new Comparator<Object>() {
- @Override
public int compare(final Object o1, final Object o2) {
- if (reverse) {
+ if (DirectoryGenerator.this.reverse) {
return Long.valueOf(((File) o2).lastModified()).
- compareTo(Long.valueOf(
+ compareTo(Long.valueOf(
((File) o1).lastModified()));
}
return Long.valueOf(((File) o1).lastModified()).
- compareTo(Long.valueOf(
+ compareTo(Long.valueOf(
((File) o2).lastModified()));
}
});
- } else if ("directory".equals(sort)) {
+ } else if ("directory".equals(this.sort)) {
Arrays.sort(contents, new Comparator<Object>() {
- @Override
public int compare(final Object o1, final Object o2) {
final File f1 = (File) o1;
final File f2 = (File) o2;
- if (reverse) {
+ if (DirectoryGenerator.this.reverse) {
if (f2.isDirectory() && f1.isFile()) {
return -1;
}
@@ -374,16 +361,16 @@ public class DirectoryGenerator extends
}
for (int i = 0; i < contents.length; i++) {
- if (isIncluded(contents[i]) && !isExcluded(contents[i])) {
- addPath(contents[i], depth - 1);
+ if (this.isIncluded(contents[i]) && !this.isExcluded(contents[i])) {
+ this.addPath(contents[i], depth - 1);
}
}
}
- endNode(DIR_NODE_NAME);
+ this.endNode(DIR_NODE_NAME);
} else {
- if (isIncluded(path) && !isExcluded(path)) {
- startNode(FILE_NODE_NAME, path);
- endNode(FILE_NODE_NAME);
+ if (this.isIncluded(path) && !this.isExcluded(path)) {
+ this.startNode(FILE_NODE_NAME, path);
+ this.endNode(FILE_NODE_NAME);
}
}
}
@@ -399,12 +386,12 @@ public class DirectoryGenerator extends
* if an error occurs while creating the node
*/
protected void startNode(final String nodeName, final File path)
- throws SAXException {
+ throws SAXException {
this.validity.add(path);
- setNodeAttributes(path);
+ this.setNodeAttributes(path);
this.getSAXConsumer().startElement(URI, nodeName,
- PREFIX + ':' + nodeName, attributes);
+ PREFIX + ':' + nodeName, this.attributes);
}
/**
@@ -418,24 +405,24 @@ public class DirectoryGenerator extends
* if an error occurs while setting the attributes
*/
protected void setNodeAttributes(final File path)
- throws SAXException {
+ throws SAXException {
final long lastModified = path.lastModified();
- attributes.clear();
- attributes.addAttribute("", FILENAME_ATTR_NAME, FILENAME_ATTR_NAME,
+ this.attributes.clear();
+ this.attributes.addAttribute("", FILENAME_ATTR_NAME, FILENAME_ATTR_NAME,
CDATA, path.getName());
- attributes.addAttribute("", LASTMOD_ATTR_NAME, LASTMOD_ATTR_NAME,
+ this.attributes.addAttribute("", LASTMOD_ATTR_NAME, LASTMOD_ATTR_NAME,
CDATA, Long.toString(path.lastModified()));
- attributes.addAttribute("", DATE_ATTR_NAME, DATE_ATTR_NAME, CDATA,
- dateFormatter.format(new Date(lastModified)));
- attributes.addAttribute("", SIZE_ATTR_NAME, SIZE_ATTR_NAME, CDATA,
+ this.attributes.addAttribute("", DATE_ATTR_NAME, DATE_ATTR_NAME, CDATA,
+ this.dateFormatter.format(new Date(lastModified)));
+ this.attributes.addAttribute("", SIZE_ATTR_NAME, SIZE_ATTR_NAME, CDATA,
Long.toString(path.length()));
if (this.isRequestedDirectory) {
- attributes.addAttribute("", "sort", "sort", CDATA, this.sort);
- attributes.addAttribute("", "reverse", "reverse", CDATA,
+ this.attributes.addAttribute("", "sort", "sort", CDATA, this.sort);
+ this.attributes.addAttribute("", "reverse", "reverse", CDATA,
String.valueOf(this.reverse));
- attributes.addAttribute("", "requested", "requested", CDATA,
- "true");
+ this.attributes.addAttribute("", "requested", "requested", CDATA,
+ "true");
this.isRequestedDirectory = false;
}
}
@@ -443,10 +430,8 @@ public class DirectoryGenerator extends
/**
* Ends the named node.
*
- * @param nodeName
- * the name of the new node
- * @throws SAXException
- * if an error occurs while closing the node
+ * @param nodeName the name of the new node
+ * @throws SAXException if an error occurs while closing the node
*/
protected void endNode(final String nodeName) throws SAXException {
this.getSAXConsumer().endElement(
@@ -456,10 +441,8 @@ public class DirectoryGenerator extends
/**
* Determines if a given File is the defined root.
*
- * @param path
- * the File to check
- * @return true if the File is the root or the root pattern is not set,
- * false otherwise.
+ * @param path the File to check
+ * @return true if the File is the root or the root pattern is not set, false otherwise.
*/
protected boolean isRoot(final File path) {
return this.rootRE == null || this.rootRE.match(path.getName());
@@ -468,10 +451,8 @@ public class DirectoryGenerator extends
/**
* Determines if a given File shall be visible.
*
- * @param path
- * the File to check
- * @return true if the File shall be visible or the include Pattern is
- * <code>null</code>, false otherwise.
+ * @param path the File to check
+ * @return true if the File shall be visible or the include Pattern is <code>null</code>, false otherwise.
*/
protected boolean isIncluded(final File path) {
return this.includeRE == null || this.includeRE.match(path.getName());
@@ -480,10 +461,9 @@ public class DirectoryGenerator extends
/**
* Determines if a given File shall be excluded from viewing.
*
- * @param path
- * the File to check
- * @return false if the given File shall not be excluded or the exclude
- * Pattern is <code>null</code>, true otherwise.
+ * @param path the File to check
+ * @return false if the given File shall not be excluded or the exclude Pattern is <code>null</code>, true
+ * otherwise.
*/
protected boolean isExcluded(final File path) {
return this.excludeRE != null && this.excludeRE.match(path.getName());
@@ -498,9 +478,9 @@ public class DirectoryGenerator extends
final CompoundCacheKey key = new CompoundCacheKey();
TimestampCacheKey timestampCacheKey = new TimestampCacheKey(
this.directorySource.toURI().toURL(),
- directorySource.lastModified());
+ this.directorySource.lastModified());
key.addCacheKey(timestampCacheKey);
- for (File file : validity) {
+ for (File file : this.validity) {
timestampCacheKey = new TimestampCacheKey(
file.toURI().toURL(), file.lastModified());
key.addCacheKey(timestampCacheKey);
Modified: cocoon/cocoon3/trunk/cocoon-optional/src/main/java/org/apache/cocoon/optional/servlet/components/sax/serializers/EncodingHTMLSerializer.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-optional/src/main/java/org/apache/cocoon/optional/servlet/components/sax/serializers/EncodingHTMLSerializer.java?rev=1142601&r1=1142600&r2=1142601&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-optional/src/main/java/org/apache/cocoon/optional/servlet/components/sax/serializers/EncodingHTMLSerializer.java (original)
+++ cocoon/cocoon3/trunk/cocoon-optional/src/main/java/org/apache/cocoon/optional/servlet/components/sax/serializers/EncodingHTMLSerializer.java Mon Jul 4 09:53:53 2011
@@ -65,7 +65,7 @@ import org.apache.cocoon.servlet.util.Ht
* @version $Id$
*/
public class EncodingHTMLSerializer extends org.apache.cocoon.components.serializers.util.HTMLSerializer implements
- SAXPipelineComponent, Finisher, SAXConsumer, CachingPipelineComponent {
+SAXPipelineComponent, Finisher, SAXConsumer, CachingPipelineComponent {
private String encoding;
private int indent = 0;
@@ -80,6 +80,7 @@ public class EncodingHTMLSerializer exte
}
public void finish() {
+ // nothing to do
}
public String getContentType() {
Modified: cocoon/cocoon3/trunk/cocoon-optional/src/main/java/org/apache/cocoon/optional/servlet/components/sax/serializers/EncodingXHTMLSerializer.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-optional/src/main/java/org/apache/cocoon/optional/servlet/components/sax/serializers/EncodingXHTMLSerializer.java?rev=1142601&r1=1142600&r2=1142601&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-optional/src/main/java/org/apache/cocoon/optional/servlet/components/sax/serializers/EncodingXHTMLSerializer.java (original)
+++ cocoon/cocoon3/trunk/cocoon-optional/src/main/java/org/apache/cocoon/optional/servlet/components/sax/serializers/EncodingXHTMLSerializer.java Mon Jul 4 09:53:53 2011
@@ -39,9 +39,9 @@ import org.apache.cocoon.servlet.util.Ht
*
* <p>
* For configuration options of this serializer, please look at the
- * {@link org.apache.cocoon.components.serializers.util.EncodingSerializer}, in addition to those,
- * this serializer also support the specification of a default doctype. This default will be used if
- * no document type is received in the SAX events, and can be configured in the following way:
+ * {@link org.apache.cocoon.components.serializers.util.EncodingSerializer}, in addition to those, this serializer also
+ * support the specification of a default doctype. This default will be used if no document type is received in the SAX
+ * events, and can be configured in the following way:
* </p>
*
* <pre>
@@ -63,11 +63,11 @@ import org.apache.cocoon.servlet.util.Ht
* <dd>The XHTML 1.0 Frameset document type.</dd>
* </dl>
*
- *
+ *
* @version $Id$
*/
public class EncodingXHTMLSerializer extends org.apache.cocoon.components.serializers.util.XHTMLSerializer implements
- SAXPipelineComponent, Finisher, SAXConsumer, CachingPipelineComponent {
+SAXPipelineComponent, Finisher, SAXConsumer, CachingPipelineComponent {
private String encoding;
private int indent = 0;
@@ -84,6 +84,7 @@ public class EncodingXHTMLSerializer ext
}
public void finish() {
+ // nothing to do
}
public String getContentType() {
Modified: cocoon/cocoon3/trunk/cocoon-optional/src/main/java/org/apache/cocoon/optional/servlet/components/sax/serializers/EncodingXMLSerializer.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-optional/src/main/java/org/apache/cocoon/optional/servlet/components/sax/serializers/EncodingXMLSerializer.java?rev=1142601&r1=1142600&r2=1142601&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-optional/src/main/java/org/apache/cocoon/optional/servlet/components/sax/serializers/EncodingXMLSerializer.java (original)
+++ cocoon/cocoon3/trunk/cocoon-optional/src/main/java/org/apache/cocoon/optional/servlet/components/sax/serializers/EncodingXMLSerializer.java Mon Jul 4 09:53:53 2011
@@ -40,7 +40,7 @@ import org.apache.cocoon.servlet.util.Ht
* @version $Id$
*/
public class EncodingXMLSerializer extends org.apache.cocoon.components.serializers.util.XMLSerializer implements
- SAXPipelineComponent, Finisher, SAXConsumer, CachingPipelineComponent {
+SAXPipelineComponent, Finisher, SAXConsumer, CachingPipelineComponent {
private String encoding;
private int indent = 0;
@@ -53,6 +53,7 @@ public class EncodingXMLSerializer exten
}
public void finish() {
+ // nothing to do
}
public String getContentType() {
Modified: cocoon/cocoon3/trunk/cocoon-optional/src/main/java/org/apache/cocoon/optional/servlet/components/sax/serializers/util/ConfigurationUtils.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-optional/src/main/java/org/apache/cocoon/optional/servlet/components/sax/serializers/util/ConfigurationUtils.java?rev=1142601&r1=1142600&r2=1142601&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-optional/src/main/java/org/apache/cocoon/optional/servlet/components/sax/serializers/util/ConfigurationUtils.java (original)
+++ cocoon/cocoon3/trunk/cocoon-optional/src/main/java/org/apache/cocoon/optional/servlet/components/sax/serializers/util/ConfigurationUtils.java Mon Jul 4 09:53:53 2011
@@ -21,15 +21,16 @@ import java.util.Map;
public class ConfigurationUtils {
private ConfigurationUtils() {
+ // no instantiation
}
public static String getEncoding(Map<String, ? extends Object> configuration) {
String encoding = (String) configuration.get("encoding");
-
+
if (encoding == null || "".equals(encoding)) {
encoding = "UTF-8";
}
-
+
return encoding;
}
Modified: cocoon/cocoon3/trunk/cocoon-optional/src/test/java/org/apache/cocoon/optional/pipeline/components/sax/jaxb/Equipment.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-optional/src/test/java/org/apache/cocoon/optional/pipeline/components/sax/jaxb/Equipment.java?rev=1142601&r1=1142600&r2=1142601&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-optional/src/test/java/org/apache/cocoon/optional/pipeline/components/sax/jaxb/Equipment.java (original)
+++ cocoon/cocoon3/trunk/cocoon-optional/src/test/java/org/apache/cocoon/optional/pipeline/components/sax/jaxb/Equipment.java Mon Jul 4 09:53:53 2011
@@ -23,5 +23,4 @@ import javax.xml.bind.annotation.XmlRoot
@XmlRootElement(name = "equipment")
@XmlAccessorType(XmlAccessType.FIELD)
public class Equipment {
-
}
Modified: cocoon/cocoon3/trunk/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/NonCachingPipeline.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/NonCachingPipeline.java?rev=1142601&r1=1142600&r2=1142601&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/NonCachingPipeline.java (original)
+++ cocoon/cocoon3/trunk/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/NonCachingPipeline.java Mon Jul 4 09:53:53 2011
@@ -24,5 +24,5 @@ import org.apache.cocoon.pipeline.compon
* This {@link Pipeline} doesn't support caching at all. Whenever it is used, it will produce a fresh result.
*/
public class NonCachingPipeline<T extends PipelineComponent> extends AbstractPipeline<T> {
-
+ // The AbstractPipeline is a non-caching pipeline.
}
Modified: cocoon/cocoon3/trunk/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/caching/CompleteCacheValue.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/caching/CompleteCacheValue.java?rev=1142601&r1=1142600&r2=1142601&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/caching/CompleteCacheValue.java (original)
+++ cocoon/cocoon3/trunk/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/caching/CompleteCacheValue.java Mon Jul 4 09:53:53 2011
@@ -46,7 +46,6 @@ public class CompleteCacheValue extends
*
* @see org.apache.cocoon.pipeline.caching.CacheValue#getValue()
*/
- @Override
public Object getValue() {
return this.content.clone();
}
@@ -56,7 +55,6 @@ public class CompleteCacheValue extends
*
* @see org.apache.cocoon.pipeline.caching.CacheValue#setValue()
*/
- @Override
public void setValue(final Object value) {
if (value instanceof String) {
this.content = ((String) value).getBytes();
@@ -72,7 +70,7 @@ public class CompleteCacheValue extends
objectOut.close();
} catch (IOException e) {
LOG.error("Some thing goes wrong during calculating "
- + "setting value of: " + getCacheKey(), e);
+ + "setting value of: " + this.getCacheKey(), e);
return;
}
this.content = byteOut.toByteArray();
@@ -101,7 +99,6 @@ public class CompleteCacheValue extends
* @see org.apache.cocoon.pipeline.caching.CacheValue
* #writeTo(java.io.OutputStream)
*/
- @Override
public void writeTo(final OutputStream outputStream) throws IOException {
outputStream.write(this.content);
}
Modified: cocoon/cocoon3/trunk/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/component/Consumer.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/component/Consumer.java?rev=1142601&r1=1142600&r2=1142601&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/component/Consumer.java (original)
+++ cocoon/cocoon3/trunk/cocoon-pipeline/src/main/java/org/apache/cocoon/pipeline/component/Consumer.java Mon Jul 4 09:53:53 2011
@@ -19,5 +19,5 @@
package org.apache.cocoon.pipeline.component;
public interface Consumer extends PipelineComponent {
-
+ // marker interface
}
Modified: cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/component/SchemaErrorHandler.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/component/SchemaErrorHandler.java?rev=1142601&r1=1142600&r2=1142601&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/component/SchemaErrorHandler.java (original)
+++ cocoon/cocoon3/trunk/cocoon-sax/src/main/java/org/apache/cocoon/sax/component/SchemaErrorHandler.java Mon Jul 4 09:53:53 2011
@@ -34,19 +34,16 @@ public final class SchemaErrorHandler im
this.schemaUri = schemaUri;
}
- @Override
public void error(final SAXParseException ex) throws SAXException {
throw new SchemaValidationException("Validation with schema "
+ this.schemaUri + " failed with error", ex);
}
- @Override
public void fatalError(final SAXParseException ex) throws SAXException {
throw new SchemaValidationException("Validation with schema "
+ this.schemaUri + " failed with fatal error", ex);
}
- @Override
public void warning(final SAXParseException ex) throws SAXException {
if (this.logger.isWarnEnabled()) {
this.logger.warn(ex.getMessage() + " at " + this.schemaUri);