cziegeler 2003/09/24 14:41:12
Modified: src/java/org/apache/cocoon/servlet/multipart
TokenStream.java
src/java/org/apache/cocoon/util NetUtils.java
ImageUtils.java
src/java/org/apache/cocoon/components/treeprocessor/sitemap
SitemapLanguage.java AggregateNode.java
PipelineNode.java
src/java/org/apache/cocoon/components/language/markup/xsp
XSPFormValidatorHelper.java XSPModuleHelper.java
src/java/org/apache/cocoon/reading ImageReader.java
src/java/org/apache/cocoon/xml NamespacesTable.java
src/java/org/apache/cocoon/components/pipeline/impl
AbstractCachingProcessingPipeline.java
src/java/org/apache/cocoon/components/modules/input
IteratorHelper.java AbstractMetaModule.java
src/java/org/apache/cocoon/transformation
CIncludeTransformer.java I18nTransformer.java
XIncludeTransformer.java
WriteDOMSessionTransformer.java
SimpleFormTransformer.java AugmentTransformer.java
src/java/org/apache/cocoon/transformation/helpers
IncludeCacheManagerSession.java
DefaultIncludeCacheManager.java
src/java/org/apache/cocoon/components/persistence
RequestDataStoreImpl.java
src/java/org/apache/cocoon/components/pipeline
AbstractProcessingPipeline.java
src/java/org/apache/cocoon/components/language/generator
GeneratorSelector.java
src/java/org/apache/cocoon/generation StreamGenerator.java
src/java/org/apache/cocoon/components/xpointer/parser
XPointerFrameworkParser.java
XPointerFrameworkParserTokenManager.java
src/java/org/apache/cocoon/xml/dom DOMUtil.java
src/java/org/apache/cocoon/environment/wrapper
RequestParameters.java
Log:
Removing unused imports and casts
Revision Changes Path
1.2 +2 -2
cocoon-2.1/src/java/org/apache/cocoon/servlet/multipart/TokenStream.java
Index: TokenStream.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/servlet/multipart/TokenStream.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TokenStream.java 4 Apr 2003 13:19:05 -0000 1.1
+++ TokenStream.java 24 Sep 2003 21:41:11 -0000 1.2
@@ -288,7 +288,7 @@
if (read == 0) {
return -1;
} else {
- return (int) buf[0];
+ return buf[0];
}
}
}
1.5 +4 -4 cocoon-2.1/src/java/org/apache/cocoon/util/NetUtils.java
Index: NetUtils.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/util/NetUtils.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- NetUtils.java 18 Sep 2003 12:11:50 -0000 1.4
+++ NetUtils.java 24 Sep 2003 21:41:11 -0000 1.5
@@ -205,7 +205,7 @@
}
for (int i = 0; i < path.length(); i++) {
- int c = (int) path.charAt(i);
+ int c = path.charAt(i);
if (safeCharacters.get(c)) {
rewrittenPath.append((char)c);
} else {
@@ -222,8 +222,8 @@
// Converting each byte in the buffer
byte toEncode = ba[j];
rewrittenPath.append('%');
- int low = (int) (toEncode & 0x0f);
- int high = (int) ((toEncode & 0xf0) >> 4);
+ int low = (toEncode & 0x0f);
+ int high = ((toEncode & 0xf0) >> 4);
rewrittenPath.append(hexadecimal[high]);
rewrittenPath.append(hexadecimal[low]);
}
1.3 +5 -5
cocoon-2.1/src/java/org/apache/cocoon/util/ImageUtils.java
Index: ImageUtils.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/util/ImageUtils.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ImageUtils.java 16 Mar 2003 17:49:16 -0000 1.2
+++ ImageUtils.java 24 Sep 2003 21:41:11 -0000 1.3
@@ -170,10 +170,10 @@
throw new FileFormatException("Not a valid Gif file!");
}
- int w1 = ((int) buf[6] & 0xff) | (buf[6] & 0x80);
- int w2 = ((int) buf[7] & 0xff) | (buf[7] & 0x80);
- int h1 = ((int) buf[8] & 0xff) | (buf[8] & 0x80);
- int h2 = ((int) buf[9] & 0xff) | (buf[9] & 0x80);
+ int w1 = (buf[6] & 0xff) | (buf[6] & 0x80);
+ int w2 = (buf[7] & 0xff) | (buf[7] & 0x80);
+ int h1 = (buf[8] & 0xff) | (buf[8] & 0x80);
+ int h2 = (buf[9] & 0xff) | (buf[9] & 0x80);
int width = w1 + (w2 << 8);
int height = h1 + (h2 << 8);
1.7 +2 -2
cocoon-2.1/src/java/org/apache/cocoon/components/treeprocessor/sitemap/SitemapLanguage.java
Index: SitemapLanguage.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/treeprocessor/sitemap/SitemapLanguage.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- SitemapLanguage.java 17 Sep 2003 01:13:44 -0000 1.6
+++ SitemapLanguage.java 24 Sep 2003 21:41:11 -0000 1.7
@@ -377,7 +377,7 @@
// if so, inherit these pipeline-hints (these hints can be overriden
by local pipeline-hints)
try {
SitemapComponentSelector selector =
(SitemapComponentSelector)this.manager.lookup(role + "Selector");
- componentHintParams = (String) selector.getPipelineHint(hint);
+ componentHintParams = selector.getPipelineHint(hint);
}
catch (Exception ex) {
if (this.getLogger().isWarnEnabled()) {
1.2 +6 -6
cocoon-2.1/src/java/org/apache/cocoon/components/treeprocessor/sitemap/AggregateNode.java
Index: AggregateNode.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/treeprocessor/sitemap/AggregateNode.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AggregateNode.java 9 Mar 2003 00:09:21 -0000 1.1
+++ AggregateNode.java 24 Sep 2003 21:41:11 -0000 1.2
@@ -207,11 +207,11 @@
this.stripRoot = stripRoot;
}
- private VariableResolver source;
- private VariableResolver element;
- private VariableResolver nsURI;
- private VariableResolver nsPrefix;
- private VariableResolver stripRoot;
+ protected VariableResolver source;
+ protected VariableResolver element;
+ protected VariableResolver nsURI;
+ protected VariableResolver nsPrefix;
+ protected VariableResolver stripRoot;
}
}
1.10 +3 -6
cocoon-2.1/src/java/org/apache/cocoon/components/treeprocessor/sitemap/PipelineNode.java
Index: PipelineNode.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/treeprocessor/sitemap/PipelineNode.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- PipelineNode.java 8 Sep 2003 18:58:01 -0000 1.9
+++ PipelineNode.java 24 Sep 2003 21:41:11 -0000 1.10
@@ -89,8 +89,6 @@
private ErrorHandlerHelper errorHandlerHelper = new ErrorHandlerHelper();
- private ComponentManager manager;
-
protected Logger handledErrorsLogger;
private boolean internalOnly = false;
@@ -116,13 +114,12 @@
* The component manager is used to create error pipelines
*/
public void compose(ComponentManager manager) {
- this.manager = manager;
- errorHandlerHelper.compose(manager);
+ this.errorHandlerHelper.compose(manager);
}
public void enableLogging(Logger logger) {
super.enableLogging(logger);
- errorHandlerHelper.enableLogging(logger);
+ this.errorHandlerHelper.enableLogging(logger);
handledErrorsLogger = logger.getChildLogger("handled-errors");
}
1.3 +4 -4
cocoon-2.1/src/java/org/apache/cocoon/components/language/markup/xsp/XSPFormValidatorHelper.java
Index: XSPFormValidatorHelper.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/language/markup/xsp/XSPFormValidatorHelper.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XSPFormValidatorHelper.java 16 May 2003 07:04:55 -0000 1.2
+++ XSPFormValidatorHelper.java 24 Sep 2003 21:41:11 -0000 1.3
@@ -157,7 +157,7 @@
public static ValidatorActionResult getParamResult(Map objectModel,
String name) {
ValidatorActionResult result = ValidatorActionResult.NOTPRESENT;
- Map param_result = (Map) getResults(objectModel);
+ Map param_result = getResults(objectModel);
if (param_result != null) {
result = (ValidatorActionResult) param_result.get(name);
}
@@ -173,7 +173,7 @@
*/
public ValidatorActionResult getParamResult(Map objectModel) {
ValidatorActionResult result = ValidatorActionResult.NOTPRESENT;
- Map param_result = (Map) getResults(objectModel);
+ Map param_result = getResults(objectModel);
if (param_result != null) {
result = (ValidatorActionResult)
param_result.get(current_parameter);
}
@@ -504,7 +504,7 @@
} catch (Exception e) {
logger.debug("XSPFormValidatorHelper.getParameterAttributes
Exception " + e);
}
- ;
+
return "";
}
1.5 +2 -2
cocoon-2.1/src/java/org/apache/cocoon/components/language/markup/xsp/XSPModuleHelper.java
Index: XSPModuleHelper.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/language/markup/xsp/XSPModuleHelper.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XSPModuleHelper.java 17 May 2003 06:02:41 -0000 1.4
+++ XSPModuleHelper.java 24 Sep 2003 21:41:11 -0000 1.5
@@ -147,7 +147,7 @@
case OP_NAMES:
value = input.getAttributeNames(conf, objectModel);
break;
- };
+ }
} catch (Exception e) {
throw new CascadingRuntimeException("Error accessing attribute
'"+attr+"' from input module '"+name+"'. "+e.getMessage(), e);
1.3 +3 -3
cocoon-2.1/src/java/org/apache/cocoon/reading/ImageReader.java
Index: ImageReader.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/reading/ImageReader.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ImageReader.java 3 Jul 2003 09:43:25 -0000 1.2
+++ ImageReader.java 24 Sep 2003 21:41:11 -0000 1.3
@@ -196,8 +196,8 @@
JPEGImageDecoder decoder =
JPEGCodec.createJPEGDecoder(inputStream);
Raster original = decoder.decodeAsRaster();
JPEGDecodeParam decodeParam = decoder.getJPEGDecodeParam();
- double ow = (double) decodeParam.getWidth();
- double oh = (double) decodeParam.getHeight();
+ double ow = decodeParam.getWidth();
+ double oh = decodeParam.getHeight();
AffineTransformOp filter = new
AffineTransformOp(getTransform(ow, oh, width, height),
AffineTransformOp.TYPE_BILINEAR);
WritableRaster scaled =
filter.createCompatibleDestRaster(original);
filter.filter(original, scaled);
1.2 +12 -12
cocoon-2.1/src/java/org/apache/cocoon/xml/NamespacesTable.java
Index: NamespacesTable.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/xml/NamespacesTable.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- NamespacesTable.java 9 Mar 2003 00:09:46 -0000 1.1
+++ NamespacesTable.java 24 Sep 2003 21:41:11 -0000 1.2
@@ -269,20 +269,20 @@
/** The internal entry structure for this table. */
private static class Entry implements Declaration {
/** The URI hashcode. */
- private int uriHash=0;
+ protected int uriHash=0;
/** The prefix hashcode. */
- private int prefixHash=0;
+ protected int prefixHash=0;
/** The URI string. */
- private String uri="";
+ protected String uri="";
/** The prefix string. */
- private String prefix="";
+ protected String prefix="";
/** The previous declaration for the same prefix. */
- private Entry previousDeclaration=null;
+ protected Entry previousDeclaration;
/** The declaration following this one in the table. */
- private Entry nextEntry=null;
+ protected Entry nextEntry;
/** Create a new namespace declaration. */
- private static Entry create(String prefix, String uri) {
+ protected static Entry create(String prefix, String uri) {
// Create a new entry
Entry e=new Entry();
// Set the prefix string and hash code.
@@ -304,13 +304,13 @@
/** The default namespace-aware name declaration implementation */
private static class NameImpl implements Name {
/** The namespace URI. */
- private String uri=null;
+ protected String uri;
/** The namespace prefix. */
- private String prefix=null;
+ protected String prefix;
/** The namespace local name. */
- private String local=null;
+ protected String local;
/** The namespace raw name. */
- private String raw=null;
+ protected String raw;
/** Return the namespace URI. */
public String getUri() { return(this.uri); }
1.14 +4 -4
cocoon-2.1/src/java/org/apache/cocoon/components/pipeline/impl/AbstractCachingProcessingPipeline.java
Index: AbstractCachingProcessingPipeline.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/pipeline/impl/AbstractCachingProcessingPipeline.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- AbstractCachingProcessingPipeline.java 20 Aug 2003 08:34:16 -0000
1.13
+++ AbstractCachingProcessingPipeline.java 24 Sep 2003 21:41:11 -0000
1.14
@@ -373,7 +373,7 @@
}
if (key != null) {
this.toCacheKey.addKey(this.newComponentCacheKey(ComponentCacheKey.ComponentType_Serializer,
- (String)this.serializerRole,
+ this.serializerRole,
key)
);
this.cacheCompleteResponse = true;
@@ -470,7 +470,7 @@
// See if we have an explicit "expires" setting. If so,
// and if it's still fresh, we're done.
- Long responseExpires = (Long) response.getExpires();
+ Long responseExpires = response.getExpires();
if (responseExpires != null) {
if (this.getLogger().isDebugEnabled()) {
@@ -708,7 +708,7 @@
);
// now we have the key to get the cached object
- CachedResponse cachedObject =
(CachedResponse)this.cache.get( pcKey );
+ CachedResponse cachedObject = this.cache.get( pcKey );
if (cachedObject != null) {
if (this.getLogger().isDebugEnabled()) {
1.3 +2 -2
cocoon-2.1/src/java/org/apache/cocoon/components/modules/input/IteratorHelper.java
Index: IteratorHelper.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/modules/input/IteratorHelper.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- IteratorHelper.java 16 Mar 2003 17:49:12 -0000 1.2
+++ IteratorHelper.java 24 Sep 2003 21:41:11 -0000 1.3
@@ -64,5 +64,5 @@
public boolean hasNext() { return this.enum.hasMoreElements(); }
public Object next() { return this.enum.nextElement(); }
/** ignored */
- public void remove() {};
+ public void remove() {}
}
1.5 +2 -2
cocoon-2.1/src/java/org/apache/cocoon/components/modules/input/AbstractMetaModule.java
Index: AbstractMetaModule.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/modules/input/AbstractMetaModule.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- AbstractMetaModule.java 17 May 2003 06:00:26 -0000 1.4
+++ AbstractMetaModule.java 24 Sep 2003 21:41:12 -0000 1.5
@@ -390,7 +390,7 @@
case OP_NAMES:
value = input.getAttributeNames(conf, objectModel);
break;
- };
+ }
if (getLogger().isDebugEnabled())
getLogger().debug("using "+name+" as "+input+" for "+op+"
("+attr+") and "+conf+" gives "+value);
1.6 +4 -7
cocoon-2.1/src/java/org/apache/cocoon/transformation/CIncludeTransformer.java
Index: CIncludeTransformer.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/transformation/CIncludeTransformer.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- CIncludeTransformer.java 29 Jul 2003 12:32:18 -0000 1.5
+++ CIncludeTransformer.java 24 Sep 2003 21:41:12 -0000 1.6
@@ -73,13 +73,10 @@
import org.apache.excalibur.source.SourceValidity;
import org.apache.excalibur.xml.dom.DOMParser;
import org.w3c.dom.Document;
-import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
import org.xml.sax.Attributes;
-import org.xml.sax.ContentHandler;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
-import org.xml.sax.ext.LexicalHandler;
import org.xml.sax.helpers.AttributesImpl;
import java.io.IOException;
@@ -549,9 +546,9 @@
NodeList list = processor.selectNodeList(document,
select);
int length = list.getLength();
for (int i=0; i<length; i++) {
- IncludeXMLConsumer.includeNode((Node)list.item(i),
- (ContentHandler)this,
- (LexicalHandler)this);
+ IncludeXMLConsumer.includeNode(list.item(i),
+ this,
+ this);
}
} finally {
this.manager.release((Component)parser);
1.13 +9 -9
cocoon-2.1/src/java/org/apache/cocoon/transformation/I18nTransformer.java
Index: I18nTransformer.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/transformation/I18nTransformer.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- I18nTransformer.java 13 Aug 2003 17:12:25 -0000 1.12
+++ I18nTransformer.java 24 Sep 2003 21:41:12 -0000 1.13
@@ -759,11 +759,11 @@
}
// Component manager for this component
- private ComponentManager manager;
+ protected ComponentManager manager;
private SourceResolver sourceResolver;
- private Map objectModel;
+ protected Map objectModel;
// Current state of the transformer. The value is STATE_OUTSIDE by
default.
private int current_state;
@@ -816,7 +816,7 @@
private MessageFormat formatter;
// Current locale
- private Locale locale;
+ protected Locale locale;
// Date and number elements and params formatting attributes with values.
private HashMap formattingParams;
@@ -828,7 +828,7 @@
private Map catalogues = new HashMap();
// Dictionary loader factory
- private BundleFactory factory;
+ protected BundleFactory factory;
//
// i18n configuration variables
@@ -1083,7 +1083,7 @@
* REVISIT (MC): when we can get the resolver anywhere, we can pass the
* configuration object directly to XMLResourceBundle.
*/
- private void configureFactory(String location) throws Exception {
+ protected void configureFactory(String location) throws Exception {
// configure the factory to log correctly and cache catalogues
DefaultConfiguration configuration =
new DefaultConfiguration("name", "location");
@@ -1185,7 +1185,7 @@
current_state == STATE_INSIDE_OTHERWISE)
&& !translate_copy) {
- ; // Output nothing
+ // Output nothing
} else {
super.endElement(uri, name, raw);
}
@@ -1542,7 +1542,7 @@
if (formattingParams.get(I18N_VALUE_ATTRIBUTE) == null) {
formattingParams.put(I18N_VALUE_ATTRIBUTE, textValue);
} else {
- ; // ignore the text inside of date element
+ // ignore the text inside of date element
}
break;
@@ -1963,7 +1963,7 @@
to_fmt.setMaximumFractionDigits(309);
for (int i = value.length() - 1;
i >= 0 && value.charAt(i) != dec; i--, decAt++) {
- ;
+
}
if (decAt <
value.length())to_fmt.setMinimumFractionDigits(decAt);
1.10 +3 -3
cocoon-2.1/src/java/org/apache/cocoon/transformation/XIncludeTransformer.java
Index: XIncludeTransformer.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/transformation/XIncludeTransformer.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- XIncludeTransformer.java 23 Sep 2003 22:46:44 -0000 1.9
+++ XIncludeTransformer.java 24 Sep 2003 21:41:12 -0000 1.10
@@ -87,8 +87,8 @@
* @version CVS $Id$
*/
public class XIncludeTransformer extends AbstractTransformer implements
Composable {
- private SourceResolver resolver;
- protected ComponentManager manager = null;
+ protected SourceResolver resolver;
+ protected ComponentManager manager;
private XIncludePipe xIncludePipe;
public static final String XMLBASE_NAMESPACE_URI =
"http://www.w3.org/XML/1998/namespace";;
1.2 +1 -3
cocoon-2.1/src/java/org/apache/cocoon/transformation/WriteDOMSessionTransformer.java
Index: WriteDOMSessionTransformer.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/transformation/WriteDOMSessionTransformer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- WriteDOMSessionTransformer.java 9 Mar 2003 00:09:40 -0000 1.1
+++ WriteDOMSessionTransformer.java 24 Sep 2003 21:41:12 -0000 1.2
@@ -93,7 +93,6 @@
private boolean sessionAvailable = false;
private Session session;
- private Parameters parameters;
private DOMBuilder builder;
private String DOMName;
@@ -106,7 +105,6 @@
public void recycle() {
super.recycle();
this.session = null;
- this.parameters = null;
this.builder = null;
this.buildDom = false;
this.sessionAvailable = false;
1.4 +8 -8
cocoon-2.1/src/java/org/apache/cocoon/transformation/SimpleFormTransformer.java
Index: SimpleFormTransformer.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/transformation/SimpleFormTransformer.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SimpleFormTransformer.java 18 Jul 2003 20:55:01 -0000 1.3
+++ SimpleFormTransformer.java 24 Sep 2003 21:41:12 -0000 1.4
@@ -473,7 +473,7 @@
attributes.removeAttribute(attributes.getIndex("checked"));
}
}
- super.startElement(uri, name, raw, (Attributes) attributes);
+ super.startElement(uri, name, raw, attributes);
}
/**
@@ -509,7 +509,7 @@
String.valueOf(this.values[0]));
}
}
- super.startElement(uri, name, raw, (Attributes) attributes);
+ super.startElement(uri, name, raw, attributes);
}
/**
@@ -617,7 +617,7 @@
attributes.removeAttribute(attributes.getIndex("selected"));
}
- super.startElement(uri, name, raw, (Attributes) attributes);
+ super.startElement(uri, name, raw, attributes);
}
}
@@ -680,7 +680,7 @@
String when = attr.getValue("when");
String when_ge = attr.getValue("when-ge");
- if ((when != null && when.equals((String)
validatorResults.get(validation)))
+ if ((when != null &&
when.equals(validatorResults.get(validation)))
|| (when_ge != null
&& validation.ge(
(ValidatorActionResult) validatorResultLabel.get(
@@ -698,12 +698,12 @@
attributes.removeAttribute(attributes.getIndex("when"));
if (when_ge != null)
attributes.removeAttribute(attributes.getIndex("when-ge"));
- super.startElement(uri, name, raw, (Attributes)
attributes);
+ super.startElement(uri, name, raw, attributes);
} else {
this.ignoreCount++;
this.stack.push(name);
this.ignoreThis = true;
- };
+ }
}
}
}
@@ -738,7 +738,7 @@
attributes = new AttributesImpl(attr);
}
attributes.removeAttribute(attributes.getIndex(this.fixedName));
- super.startElement(uri, name, raw, (Attributes) attributes);
+ super.startElement(uri, name, raw, attributes);
}
}
1.4 +2 -2
cocoon-2.1/src/java/org/apache/cocoon/transformation/AugmentTransformer.java
Index: AugmentTransformer.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/transformation/AugmentTransformer.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AugmentTransformer.java 4 Sep 2003 14:49:03 -0000 1.3
+++ AugmentTransformer.java 24 Sep 2003 21:41:12 -0000 1.4
@@ -43,7 +43,7 @@
this.objectModel = objectModel;
this.request = ObjectModelHelper.getRequest( this.objectModel );
- String mountPoint = (String)parameters.getParameter("mount", null);
+ String mountPoint = parameters.getParameter("mount", null);
StringBuffer uribuf = new StringBuffer();
boolean isSecure = this.request.isSecure();
1.5 +2 -2
cocoon-2.1/src/java/org/apache/cocoon/transformation/helpers/IncludeCacheManagerSession.java
Index: IncludeCacheManagerSession.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/transformation/helpers/IncludeCacheManagerSession.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- IncludeCacheManagerSession.java 27 Jul 2003 11:09:17 -0000 1.4
+++ IncludeCacheManagerSession.java 24 Sep 2003 21:41:12 -0000 1.5
@@ -102,7 +102,7 @@
private SourceValidity validity;
/** Cache the source objects */
- private Map sourceList = new HashMap(10);;
+ private Map sourceList = new HashMap(10);
/**
* Constructor
1.6 +1 -3
cocoon-2.1/src/java/org/apache/cocoon/transformation/helpers/DefaultIncludeCacheManager.java
Index: DefaultIncludeCacheManager.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/transformation/helpers/DefaultIncludeCacheManager.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DefaultIncludeCacheManager.java 27 Jul 2003 11:09:17 -0000 1.5
+++ DefaultIncludeCacheManager.java 24 Sep 2003 21:41:12 -0000 1.6
@@ -453,7 +453,6 @@
private Source source;
private XMLSerializer serializer;
- private ComponentManager manager;
boolean finished;
Exception exception;
byte[] content;
@@ -463,7 +462,6 @@
ComponentManager manager) {
this.source = source;
this.serializer = serializer;
- this.manager = manager;
this.finished = false;
}
1.2 +7 -7
cocoon-2.1/src/java/org/apache/cocoon/components/persistence/RequestDataStoreImpl.java
Index: RequestDataStoreImpl.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/persistence/RequestDataStoreImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RequestDataStoreImpl.java 1 Sep 2003 14:45:07 -0000 1.1
+++ RequestDataStoreImpl.java 24 Sep 2003 21:41:12 -0000 1.2
@@ -94,7 +94,7 @@
*/
public Object getGlobalRequestData(String key) {
Object value = null;
- final Map objectModel =
(Map)ContextHelper.getObjectModel(this.context);
+ final Map objectModel = ContextHelper.getObjectModel(this.context);
Map m = (Map)objectModel.get(this.globalRequestDataKey);
if ( m != null ) {
value = m.get( key );
@@ -107,7 +107,7 @@
*/
public Object getRequestData(String key) {
Object value = null;
- final Map objectModel =
(Map)ContextHelper.getObjectModel(this.context);
+ final Map objectModel = ContextHelper.getObjectModel(this.context);
Map m = (Map)objectModel.get(this.requestDataKey +
ObjectModelHelper.getRequest(objectModel).hashCode());
if ( m != null ) {
value = m.get( key );
@@ -119,7 +119,7 @@
* @see
org.apache.cocoon.components.persistance.RequestDataStore#removeGlobalRequestData(java.lang.String)
*/
public void removeGlobalRequestData(String key) {
- final Map objectModel =
(Map)ContextHelper.getObjectModel(this.context);
+ final Map objectModel = ContextHelper.getObjectModel(this.context);
Map m = (Map)objectModel.get(this.globalRequestDataKey);
if ( m != null ) {
objectModel.remove( key );
@@ -130,7 +130,7 @@
* @see
org.apache.cocoon.components.persistance.RequestDataStore#removeRequestData(java.lang.String)
*/
public void removeRequestData(String key) {
- final Map objectModel =
(Map)ContextHelper.getObjectModel(this.context);
+ final Map objectModel = ContextHelper.getObjectModel(this.context);
Map m = (Map)objectModel.get(this.requestDataKey +
ObjectModelHelper.getRequest(objectModel).hashCode());
if ( m != null ) {
objectModel.remove( key );
@@ -141,7 +141,7 @@
* @see
org.apache.cocoon.components.persistance.RequestDataStore#setGlobalRequestData(java.lang.String,
java.lang.Object)
*/
public void setGlobalRequestData(String key, Object value) {
- final Map objectModel =
(Map)ContextHelper.getObjectModel(this.context);
+ final Map objectModel = ContextHelper.getObjectModel(this.context);
Map m = (Map)objectModel.get(this.globalRequestDataKey);
if ( m == null ) {
m = new HashMap();
@@ -154,7 +154,7 @@
* @see
org.apache.cocoon.components.persistance.RequestDataStore#setRequestData(java.lang.String,
java.lang.Object)
*/
public void setRequestData(String key, Object value) {
- final Map objectModel =
(Map)ContextHelper.getObjectModel(this.context);
+ final Map objectModel = ContextHelper.getObjectModel(this.context);
Map m = (Map)objectModel.get(this.requestDataKey +
ObjectModelHelper.getRequest(objectModel).hashCode());
if ( m == null ) {
m = new HashMap();
1.8 +2 -2
cocoon-2.1/src/java/org/apache/cocoon/components/pipeline/AbstractProcessingPipeline.java
Index: AbstractProcessingPipeline.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/pipeline/AbstractProcessingPipeline.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- AbstractProcessingPipeline.java 6 Aug 2003 10:07:30 -0000 1.7
+++ AbstractProcessingPipeline.java 24 Sep 2003 21:41:12 -0000 1.8
@@ -284,7 +284,7 @@
throw new ProcessingException("Lookup of transformer selector
failed.", ce);
}
try {
- this.transformers.add((Transformer)selector.select(role));
+ this.transformers.add(selector.select(role));
this.transformerSelectors.add(selector);
} catch (ComponentException ce) {
throw new ProcessingException("Lookup of transformer for role
'"+role+"' failed.", ce);
1.3 +2 -2
cocoon-2.1/src/java/org/apache/cocoon/components/language/generator/GeneratorSelector.java
Index: GeneratorSelector.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/language/generator/GeneratorSelector.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- GeneratorSelector.java 4 Aug 2003 03:19:22 -0000 1.2
+++ GeneratorSelector.java 24 Sep 2003 21:41:12 -0000 1.3
@@ -156,7 +156,7 @@
}
try {
- Component component = (Component) handler.get();
+ Component component = handler.get();
componentMapping.put(component, handler);
return component;
} catch (Exception ce) {
1.5 +1 -5
cocoon-2.1/src/java/org/apache/cocoon/generation/StreamGenerator.java
Index: StreamGenerator.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/generation/StreamGenerator.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- StreamGenerator.java 3 Sep 2003 15:00:56 -0000 1.4
+++ StreamGenerator.java 24 Sep 2003 21:41:12 -0000 1.5
@@ -99,9 +99,6 @@
/** The input source */
private InputSource inputSource;
- /** The system ID of the input source */
- private String systemID;
-
/**
* Recycle this component.
* All instance variables are set to <code>null</code>.
@@ -109,7 +106,6 @@
public void recycle() {
super.recycle();
this.inputSource = null;
- this.systemID = null;
}
/**
1.5 +0 -3
cocoon-2.1/src/java/org/apache/cocoon/components/xpointer/parser/XPointerFrameworkParser.java
Index: XPointerFrameworkParser.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/xpointer/parser/XPointerFrameworkParser.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XPointerFrameworkParser.java 4 Aug 2003 03:06:30 -0000 1.4
+++ XPointerFrameworkParser.java 24 Sep 2003 21:41:12 -0000 1.5
@@ -134,7 +134,6 @@
case NCName :
case WS :
case QName :
- ;
break;
default :
jj_la1[1] = jj_gen;
@@ -143,7 +142,6 @@
label_2 : while (true) {
switch ((jj_ntk == -1) ? jj_ntk() : jj_ntk) {
case WS :
- ;
break;
default :
jj_la1[2] = jj_gen;
@@ -230,7 +228,6 @@
case CIRC_RBRACE :
case DOUBLE_CIRC :
case NormalChar :
- ;
break;
default :
jj_la1[4] = jj_gen;
1.6 +2 -2
cocoon-2.1/src/java/org/apache/cocoon/components/xpointer/parser/XPointerFrameworkParserTokenManager.java
Index: XPointerFrameworkParserTokenManager.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/xpointer/parser/XPointerFrameworkParserTokenManager.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XPointerFrameworkParserTokenManager.java 4 Aug 2003 03:06:30 -0000
1.5
+++ XPointerFrameworkParserTokenManager.java 24 Sep 2003 21:41:12 -0000
1.6
@@ -314,7 +314,7 @@
}
} while (i != startsAt);
} else {
- int hiByte = (int) (curChar >> 8);
+ int hiByte = (curChar >> 8);
int i1 = hiByte >> 6;
long l1 = 1L << (hiByte & 077);
int i2 = (curChar & 0xff) >> 6;
@@ -463,7 +463,7 @@
}
} while (i != startsAt);
} else {
- int hiByte = (int) (curChar >> 8);
+ int hiByte = (curChar >> 8);
int i1 = hiByte >> 6;
long l1 = 1L << (hiByte & 077);
int i2 = (curChar & 0xff) >> 6;
1.6 +5 -5
cocoon-2.1/src/java/org/apache/cocoon/xml/dom/DOMUtil.java
Index: DOMUtil.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/xml/dom/DOMUtil.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DOMUtil.java 15 Aug 2003 15:55:02 -0000 1.5
+++ DOMUtil.java 24 Sep 2003 21:41:12 -0000 1.6
@@ -1024,7 +1024,7 @@
l = childs.getLength();
while (found == false && m < l) {
item = childs.item(m);
- if (item.getNodeType() == Document.ELEMENT_NODE
+ if (item.getNodeType() == Node.ELEMENT_NODE
&& item.getLocalName().equals(path[i]) == true) {
found = true;
contextNode = item;
@@ -1064,7 +1064,7 @@
l = childs.getLength();
while (found == false && i < l) {
item = childs.item(i);
- if (item.getNodeType() == Document.ELEMENT_NODE
+ if (item.getNodeType() == Node.ELEMENT_NODE
&& path[startIndex].equals(
item.getLocalName() != null ? item.getLocalName() :
item.getNodeName())
== true) {
@@ -1132,7 +1132,7 @@
l = childs.getLength();
while (m < l) {
item = childs.item(m);
- if (item.getNodeType() == Document.ELEMENT_NODE) {
+ if (item.getNodeType() == Node.ELEMENT_NODE) {
// Work around: org.apache.xerces.dom.ElementImpl
doesn't handle getLocalName() correct
if (path[startIndex]
.equals(
@@ -1152,7 +1152,7 @@
l = childs.getLength();
while (m < l) {
item = childs.item(m);
- if (item.getNodeType() == Document.ELEMENT_NODE) {
+ if (item.getNodeType() == Node.ELEMENT_NODE) {
// Work around: org.apache.xerces.dom.ElementImpl
doesn't handle getLocalName() correct
if (path[startIndex]
.equals(
1.3 +2 -2
cocoon-2.1/src/java/org/apache/cocoon/environment/wrapper/RequestParameters.java
Index: RequestParameters.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/environment/wrapper/RequestParameters.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- RequestParameters.java 16 Mar 2003 17:49:14 -0000 1.2
+++ RequestParameters.java 24 Sep 2003 21:41:12 -0000 1.3
@@ -109,7 +109,7 @@
if (queryString != null) {
StringTokenizer st = new StringTokenizer(queryString, "&");
while (st.hasMoreTokens()) {
- String pair = (String)st.nextToken();
+ String pair = st.nextToken();
int pos = pair.indexOf('=');
if (pos != -1) {
this.setParameter(this.parseName(pair.substring(0, pos)),
