cziegeler 2003/09/24 14:26:51
Modified: src/java/org/apache/cocoon/components/sax
XMLByteStreamInterpreter.java
src/java/org/apache/cocoon/acting AbstractMultiAction.java
AbstractValidatorAction.java
src/blocks/apples/java/org/apache/cocoon/components/flow/apples/samples
BindingWoodyApple.java
src/java/org/apache/cocoon/xml/xlink ExtendedXLinkPipe.java
Log:
Removing unused imports and casts
Revision Changes Path
1.4 +5 -5
cocoon-2.1/src/java/org/apache/cocoon/components/sax/XMLByteStreamInterpreter.java
Index: XMLByteStreamInterpreter.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/sax/XMLByteStreamInterpreter.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XMLByteStreamInterpreter.java 9 Jul 2003 17:59:43 -0000 1.3
+++ XMLByteStreamInterpreter.java 24 Sep 2003 21:26:51 -0000 1.4
@@ -273,7 +273,7 @@
this.readBytes(bytearr);
while (count < len) {
- c = (int) bytearr[count] & 0xff;
+ c = bytearr[count] & 0xff;
switch (c >> 4) {
case 0: case 1: case 2: case 3: case 4: case 5: case 6: case
7:
// 0xxxxxxx
@@ -283,14 +283,14 @@
case 12: case 13:
// 110x xxxx 10xx xxxx
count += 2;
- char2 = (int) bytearr[count-1];
+ char2 = bytearr[count-1];
str[i++] = (char) (((c & 0x1F) << 6) | (char2 & 0x3F));
break;
case 14:
// 1110 xxxx 10xx xxxx 10xx xxxx
count += 3;
- char2 = (int) bytearr[count-2];
- char3 = (int) bytearr[count-1];
+ char2 = bytearr[count-2];
+ char3 = bytearr[count-1];
str[i++] = ((char)(((c & 0x0F) << 12) | ((char2 & 0x3F)
<< 6) | ((char3 & 0x3F) << 0)));
break;
default:
1.6 +2 -2
cocoon-2.1/src/java/org/apache/cocoon/acting/AbstractMultiAction.java
Index: AbstractMultiAction.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/acting/AbstractMultiAction.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- AbstractMultiAction.java 18 Jul 2003 21:07:02 -0000 1.5
+++ AbstractMultiAction.java 24 Sep 2003 21:26:51 -0000 1.6
@@ -140,7 +140,7 @@
try {
return ((Map) method.invoke(this, new
Object[]{redirector, resolver, objectModel, source, parameters}));
} catch (InvocationTargetException ite) {
- if ((ite.getTargetException()!=null) && (ite instanceof
Exception)) {
+ if ((ite.getTargetException() != null) &&
(ite.getTargetException() instanceof Exception)) {
throw (Exception)ite.getTargetException();
} else {
throw ite;
1.5 +2 -2
cocoon-2.1/src/java/org/apache/cocoon/acting/AbstractValidatorAction.java
Index: AbstractValidatorAction.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/acting/AbstractValidatorAction.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- AbstractValidatorAction.java 16 Aug 2003 02:27:35 -0000 1.4
+++ AbstractValidatorAction.java 24 Sep 2003 21:26:51 -0000 1.5
@@ -529,7 +529,7 @@
if (getLogger().isDebugEnabled())
getLogger().debug("and it does not match");
return new ValidatorActionHelper(value,
ValidatorActionResult.NOMATCH);
- };
+ }
} catch (RESyntaxException rese) {
if (getLogger().isDebugEnabled())
getLogger().error("String parameter " + name + "
regex error ", rese);
1.3 +2 -2
cocoon-2.1/src/blocks/apples/java/org/apache/cocoon/components/flow/apples/samples/BindingWoodyApple.java
Index: BindingWoodyApple.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/apples/java/org/apache/cocoon/components/flow/apples/samples/BindingWoodyApple.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- BindingWoodyApple.java 4 Aug 2003 09:16:16 -0000 1.2
+++ BindingWoodyApple.java 24 Sep 2003 21:26:51 -0000 1.3
@@ -123,7 +123,7 @@
this.state.processRequest(req, res);
}
- private void processInitialization(AppleRequest req, AppleResponse res)
throws ProcessingException {
+ protected void processInitialization(AppleRequest req, AppleResponse
res) throws ProcessingException {
String formURI = req.getSitemapParameter("form-src");
String bindURI = req.getSitemapParameter("binding-src");
@@ -186,7 +186,7 @@
}
}
- private void processValidation(AppleRequest req, AppleResponse res)
throws ProcessingException {
+ protected void processValidation(AppleRequest req, AppleResponse res)
throws ProcessingException {
Source documentTarget = null;
SourceResolver resolver = null;
1.4 +2 -2
cocoon-2.1/src/java/org/apache/cocoon/xml/xlink/ExtendedXLinkPipe.java
Index: ExtendedXLinkPipe.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/xml/xlink/ExtendedXLinkPipe.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ExtendedXLinkPipe.java 17 May 2003 15:32:48 -0000 1.3
+++ ExtendedXLinkPipe.java 24 Sep 2003 21:26:51 -0000 1.4
@@ -77,7 +77,7 @@
*/
public abstract class ExtendedXLinkPipe extends XLinkPipe {
- private static Set arrayToSet(Object[] array) {
+ protected static Set arrayToSet(Object[] array) {
final Set set = new HashSet(array.length);
for (int i = 0; i<array.length; i++)
