cziegeler 2003/09/24 15:00:34
Modified:
src/blocks/scratchpad/java/org/apache/cocoon/components/flow/javascript/fom
JavaScriptAspectWeaver.java
AO_FOM_JavaScriptInterpreter.java
AO_FOM_Cocoon.java
src/blocks/scratchpad/java/org/apache/cocoon/components/jxdom
DocumentAdapter.java
src/blocks/profiler/java/org/apache/cocoon/components/profiler
ProfilerData.java
src/blocks/scratchpad/java/org/apache/cocoon/ant
CocoonTask.java
Log:
Removing unused imports and casts
Revision Changes Path
1.8 +12 -12
cocoon-2.1/src/blocks/scratchpad/java/org/apache/cocoon/components/flow/javascript/fom/JavaScriptAspectWeaver.java
Index: JavaScriptAspectWeaver.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/scratchpad/java/org/apache/cocoon/components/flow/javascript/fom/JavaScriptAspectWeaver.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- JavaScriptAspectWeaver.java 17 Sep 2003 01:09:45 -0000 1.7
+++ JavaScriptAspectWeaver.java 24 Sep 2003 22:00:34 -0000 1.8
@@ -394,14 +394,14 @@
// check for comments
if( thisChar == '/' && nextChar == '*' ) {
JSToken t = new JSToken( JSToken.COMMENT );
- curToken = t.append('/').append('*');;
+ curToken = t.append('/').append('*');
parsingState = IN_COMMENT;
i++;
continue;
}
else if( thisChar == '/' && nextChar == '/' ) {
JSToken t = new JSToken( JSToken.LINE_COMMENT );
- curToken = t.append( thisChar ).append( nextChar );;
+ curToken = t.append( thisChar ).append( nextChar );
parsingState = IN_LINECOMMENT;
i++;
continue;
@@ -429,7 +429,7 @@
}
else if( thisChar == '\"' ) {
JSToken t = new JSToken( JSToken.CODE_LITERAL );
- curToken = t.append( thisChar );;
+ curToken = t.append( thisChar );
parsingState = IN_DOUBLE_QUOTES;
continue;
}
@@ -483,7 +483,7 @@
}
else if( thisChar == ']' ) {
JSToken t = new JSToken( JSToken.BRACKET1_RIGHT );
- curToken = t.append( thisChar );;
+ curToken = t.append( thisChar );
parsingState = AT_START;
continue;
}
@@ -604,7 +604,7 @@
/**
* Add the code fragement of the passed interceptions at the right
places
*/
- private void addInterceptions( ArrayList interceptionsList ) {
+ protected void addInterceptions( ArrayList interceptionsList ) {
ListIterator li = this.listIterator();
boolean inAround = false;
@@ -822,7 +822,7 @@
* to make intercepting easier events are added (start function,
* stop function, stop execution, continue execution)
*/
- private void addInterceptionEvents( List stopExecutionFunctions ) {
+ protected void addInterceptionEvents( List stopExecutionFunctions ) {
this.stopExecutionFunctions = stopExecutionFunctions;
@@ -903,7 +903,7 @@
* Get a list of sources as string (the src attribute of the
* cocoon.apply( src) function) of all scripts to apply
*/
- private List getScriptsApplied() {
+ protected List getScriptsApplied() {
ArrayList scriptsApplied = new ArrayList();
boolean foundCocoon = false;
boolean foundApply = false;
@@ -943,7 +943,7 @@
/**
* comment out all occurencies of cocoon.apply( "..." );
*/
- private void commentScriptsApplied() {
+ protected void commentScriptsApplied() {
int diff = -1;
for( int i = 0; i < this.cocoonPositions.size(); i++ ) {
int pos = ((Integer) this.cocoonPositions.get(i)).intValue();
@@ -969,7 +969,7 @@
* Replace all occurencies of return (except those which
* are in separte code blocks)
*/
- private void replaceReturnStatements() {
+ protected void replaceReturnStatements() {
ListIterator li = this.listIterator();
int countOpenBrackets = 0;
boolean inFunction = false;
@@ -1053,7 +1053,7 @@
* <li>around(): { ... }</li>
* </ul>
*/
- private InterceptionList readInterceptionTokens() {
+ protected InterceptionList readInterceptionTokens() {
InterceptionList interceptors = new InterceptionList();
List functionPositions = this.getFunctionPositions();
// loop over all intercepting functions
@@ -1141,7 +1141,7 @@
* return the tokens as Reader
*/
public Reader getScriptAsReader() {
- return (Reader) new CharArrayReader( getScriptAsCharArray() );
+ return new CharArrayReader( getScriptAsCharArray() );
}
public char[] getScriptAsCharArray() {
1.6 +2 -2
cocoon-2.1/src/blocks/scratchpad/java/org/apache/cocoon/components/flow/javascript/fom/AO_FOM_JavaScriptInterpreter.java
Index: AO_FOM_JavaScriptInterpreter.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/scratchpad/java/org/apache/cocoon/components/flow/javascript/fom/AO_FOM_JavaScriptInterpreter.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- AO_FOM_JavaScriptInterpreter.java 12 Sep 2003 18:41:36 -0000 1.5
+++ AO_FOM_JavaScriptInterpreter.java 24 Sep 2003 22:00:34 -0000 1.6
@@ -551,7 +551,7 @@
}
}
// (RPO) added/changed by interception layer
- private Script compileScript( Context cx, Scriptable scope,
+ protected Script compileScript( Context cx, Scriptable scope,
Source src, JavaScriptAspectWeaver
aspectWeaver)
throws Exception {
Script compiledScript = null;
1.3 +3 -3
cocoon-2.1/src/blocks/scratchpad/java/org/apache/cocoon/components/flow/javascript/fom/AO_FOM_Cocoon.java
Index: AO_FOM_Cocoon.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/scratchpad/java/org/apache/cocoon/components/flow/javascript/fom/AO_FOM_Cocoon.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AO_FOM_Cocoon.java 12 Sep 2003 18:16:37 -0000 1.2
+++ AO_FOM_Cocoon.java 24 Sep 2003 22:00:34 -0000 1.3
@@ -850,7 +850,7 @@
}
// unwrap Wrapper's and convert undefined to null
- private static Object unwrap(Object obj) {
+ protected static Object unwrap(Object obj) {
if (obj instanceof Wrapper) {
obj = ((Wrapper)obj).unwrap();
} else if (obj == Undefined.instance) {
@@ -976,7 +976,7 @@
contMgr = (ContinuationsManager)
componentManager.lookup(ContinuationsManager.ROLE);
wk = contMgr.createWebContinuation(unwrap(k),
- (WebContinuation)(parent == null
? null : parent.getWebContinuation()),
+ (parent == null ? null :
parent.getWebContinuation()),
timeToLive,
null);
FOM_WebContinuation result = new FOM_WebContinuation(wk);
1.3 +8 -8
cocoon-2.1/src/blocks/scratchpad/java/org/apache/cocoon/components/jxdom/DocumentAdapter.java
Index: DocumentAdapter.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/scratchpad/java/org/apache/cocoon/components/jxdom/DocumentAdapter.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DocumentAdapter.java 5 Sep 2003 07:04:34 -0000 1.2
+++ DocumentAdapter.java 24 Sep 2003 22:00:34 -0000 1.3
@@ -67,10 +67,10 @@
GET_SELF = JXPathContext.compile(".");
private static final CompiledExpression
GET_ATTRS = JXPathContext.compile("@*");
- private static final CompiledExpression
+ protected static final CompiledExpression
GET_CHILD_NODES = JXPathContext.compile("*");
- private static NamedNodeMap EMPTY_NODE_MAP = new NamedNodeMap() {
+ protected static NamedNodeMap EMPTY_NODE_MAP = new NamedNodeMap() {
public Node getNamedItem(String name) {
return null;
}
@@ -107,7 +107,7 @@
}
};
- private static final NodeList EMPTY_NODE_LIST = new NodeList() {
+ protected static final NodeList EMPTY_NODE_LIST = new NodeList() {
public int getLength() {
return 0;
}
@@ -119,11 +119,11 @@
private static final JXPathContextFactory jxpathContextFactory =
JXPathContextFactory.newInstance();
- private static void notSupported() throws DOMException {
+ protected static void notSupported() throws DOMException {
throw new UnsupportedOperationException("Not Supported");
}
- private static JXPathContext newContext(Object obj) {
+ protected static JXPathContext newContext(Object obj) {
return jxpathContextFactory.newContext(null, obj);
}
@@ -495,7 +495,7 @@
public Node getFirstChild() {
getChildNodes();
if (childNodes.getLength() > 0) {
- return (Node)childNodes.item(0);
+ return childNodes.item(0);
}
return null;
}
@@ -503,7 +503,7 @@
public Node getLastChild() {
getChildNodes();
if (childNodes.getLength() > 0) {
- return (Node)childNodes.item(childNodes.getLength()-1);
+ return childNodes.item(childNodes.getLength()-1);
}
return null;
}
@@ -577,7 +577,7 @@
public Element getOwnerElement() {
return ElementAdapter.this;
}
- };
+ }
public NamedNodeMap getAttributes() {
1.3 +2 -2
cocoon-2.1/src/blocks/profiler/java/org/apache/cocoon/components/profiler/ProfilerData.java
Index: ProfilerData.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/profiler/java/org/apache/cocoon/components/profiler/ProfilerData.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ProfilerData.java 20 Mar 2003 15:04:14 -0000 1.2
+++ ProfilerData.java 24 Sep 2003 22:00:34 -0000 1.3
@@ -75,7 +75,7 @@
public long time;
public Object fragment;
- private Entry(String role, String source) {
+ protected Entry(String role, String source) {
this.role = role;
this.source = source;
}
1.4 +3 -5
cocoon-2.1/src/blocks/scratchpad/java/org/apache/cocoon/ant/CocoonTask.java
Index: CocoonTask.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/scratchpad/java/org/apache/cocoon/ant/CocoonTask.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- CocoonTask.java 9 Sep 2003 19:21:45 -0000 1.3
+++ CocoonTask.java 24 Sep 2003 22:00:34 -0000 1.4
@@ -158,7 +158,7 @@
this.logkitXconf = null;
this.destDir = null;
- File workDirParent = new File((String)
System.getProperty("java.io.tmpdir", "."));
+ File workDirParent = new File(System.getProperty("java.io.tmpdir",
"."));
this.workDir = new File(workDirParent, "work");
this.contextDir = null;
@@ -255,7 +255,7 @@
final String delimiter = DEFAULT_DELIM;
StringTokenizer st = new StringTokenizer(targets, delimiter);
while (st.hasMoreTokens()) {
- String target = (String) st.nextToken();
+ String target = st.nextToken();
this.targets.add(target);
}
}
@@ -578,7 +578,6 @@
private LogKitLoggerManager logKitLoggerManager;
private Logger logger;
private DefaultContext ctx;
- private ClassLoader classLoader;
/**
@@ -608,7 +607,6 @@
public void contextualize(Context context) throws ContextException {
this.ctx = new DefaultContext(context);
- classLoader = (ClassLoader)
this.ctx.get(Constants.CONTEXT_CLASS_LOADER);
File contextDir = (File) this.ctx.get("context-root");
File workDir = (File) this.ctx.get(Constants.CONTEXT_WORK_DIR);
