You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by jo...@apache.org on 2003/08/04 05:06:31 UTC
cvs commit: cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/components/persistance CastorSourceConverter.java
joerg 2003/08/03 20:06:31
Modified: src/blocks/jxforms/java/org/apache/cocoon/generation
JXFormsGenerator.java
src/blocks/authentication-fw/java/org/apache/cocoon/webapps/authentication/components
PipelineAuthenticator.java
src/java/org/apache/cocoon/generation
JXTemplateGenerator.java
src/scratchpad/src/org/apache/cocoon/generation
JellyGenerator.java
src/blocks/portal/java/org/apache/cocoon/portal/profile/impl
AuthenticationProfileManager.java
AbstractUserProfileManager.java
src/java/org/apache/cocoon/components/xpointer/parser
XPointerFrameworkParser.java
XPointerFrameworkParserTokenManager.java
src/test/org/apache/cocoon/generation
AbstractGeneratorTestCase.java
src/blocks/slide/java/org/apache/cocoon/components/source/impl
SlideSource.java
src/blocks/eventcache/java/org/apache/cocoon/acting
CacheEventAction.java
src/blocks/portal/java/org/apache/cocoon/components/variables
PreparedVariableResolver.java
src/scratchpad/src/org/apache/cocoon/components/jxdom
DocumentAdapter.java
src/test/org/apache/cocoon AbstractCompositeTestCase.java
src/blocks/session-fw/java/org/apache/cocoon/webapps/session/components
DefaultContextManager.java
src/blocks/portal/java/org/apache/cocoon/components/persistance
CastorSourceConverter.java
Log:
removed unused local variables and unused private member variables and methods
Revision Changes Path
1.2 +1 -22 cocoon-2.1/src/blocks/jxforms/java/org/apache/cocoon/generation/JXFormsGenerator.java
Index: JXFormsGenerator.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/jxforms/java/org/apache/cocoon/generation/JXFormsGenerator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JXFormsGenerator.java 12 Jul 2003 19:22:30 -0000 1.1
+++ JXFormsGenerator.java 4 Aug 2003 03:06:30 -0000 1.2
@@ -1345,15 +1345,7 @@
null);
}
while (iter.hasNext()) {
- Object value;
Pointer ptr = (Pointer)iter.next();
- try {
- value = ptr.getNode();
- } catch (Exception exc) {
- throw new SAXParseException(exc.getMessage(),
- ev.location,
- exc);
- }
JXPathContext localJXPathContext =
currentContext.getRelativeContext(ptr);
String path = "";
@@ -1436,15 +1428,7 @@
null);
}
while (iter.hasNext()) {
- Object value;
Pointer ptr = (Pointer)iter.next();
- try {
- value = ptr.getNode();
- } catch (Exception exc) {
- throw new SAXParseException(exc.getMessage(),
- ev.location,
- exc);
- }
JXPathContext localJXPathContext =
currentContext.getRelativeContext(ptr);
AttributesImpl attrs = new AttributesImpl();
@@ -1724,12 +1708,7 @@
(StartViolations)ev;
StartElement startElement =
startViolations.startElement;
- Attributes attrs = startElement.attributes;
- String formAttr = attrs.getValue(FORM);
- Form theForm = form;
- if (formAttr != null) {
- theForm = Form.lookup(objectModel, formAttr);
- }
+
Set violations = form.getViolationsAsSortedSet();
String mypath = null;
if (startViolations.parent instanceof StartInputControl) {
1.2 +1 -4 cocoon-2.1/src/blocks/authentication-fw/java/org/apache/cocoon/webapps/authentication/components/PipelineAuthenticator.java
Index: PipelineAuthenticator.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/authentication-fw/java/org/apache/cocoon/webapps/authentication/components/PipelineAuthenticator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PipelineAuthenticator.java 12 Jul 2003 18:39:49 -0000 1.1
+++ PipelineAuthenticator.java 4 Aug 2003 03:06:30 -0000 1.2
@@ -258,15 +258,12 @@
authContext.init(doc);
// And now load applications
- boolean loaded = true;
Iterator applications = configuration.getApplications().values().iterator();
while ( applications.hasNext() ) {
ApplicationConfiguration appHandler = (ApplicationConfiguration)applications.next();
if ( !appHandler.getLoadOnDemand() ) {
handler.getContext().loadApplicationXML( appHandler, this.resolver );
- } else {
- loaded = false;
}
}
1.3 +3 -8 cocoon-2.1/src/java/org/apache/cocoon/generation/JXTemplateGenerator.java
Index: JXTemplateGenerator.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/generation/JXTemplateGenerator.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JXTemplateGenerator.java 31 Jul 2003 14:24:20 -0000 1.2
+++ JXTemplateGenerator.java 4 Aug 2003 03:06:30 -0000 1.3
@@ -1742,7 +1742,6 @@
!(stack.peek() instanceof StartDefine)) {
syntaxErr = true;
} else {
- StartDefine startDefine = (StartDefine)stack.peek();
String name = attrs.getValue("name");
String optional = attrs.getValue("optional");
String default_ = attrs.getValue("default");
@@ -2350,7 +2349,6 @@
StartForEach startForEach = (StartForEach)ev;
final Object items = startForEach.items;
Iterator iter = null;
- boolean xpath = false;
int begin, end, step;
try {
if (items == null) {
@@ -2363,14 +2361,11 @@
Object val =
compiledExpression.getPointer(jxpathContext,
expr.raw).getNode();
- // Hack: workaround for JXPath bug
+ // FIXME: workaround for JXPath bug
if (val instanceof NativeArray) {
- iter =
- new JSIntrospector.NativeArrayIterator((NativeArray)val);
+ iter = new JSIntrospector.NativeArrayIterator((NativeArray)val);
} else {
- iter =
- compiledExpression.iteratePointers(jxpathContext);
- xpath = true;
+ iter = compiledExpression.iteratePointers(jxpathContext);
}
} else if (expr.compiledExpression instanceof org.apache.commons.jexl.Expression) {
org.apache.commons.jexl.Expression e =
1.2 +0 -2 cocoon-2.1/src/scratchpad/src/org/apache/cocoon/generation/JellyGenerator.java
Index: JellyGenerator.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/scratchpad/src/org/apache/cocoon/generation/JellyGenerator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JellyGenerator.java 13 Jun 2003 10:27:20 -0000 1.1
+++ JellyGenerator.java 4 Aug 2003 03:06:30 -0000 1.2
@@ -111,8 +111,6 @@
*/
public void generate() throws IOException, SAXException, ProcessingException {
SAXParser parser = null;
- int len = 0;
- String contentType = null;
Source scriptSource = null;
try {
1.10 +2 -6 cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/profile/impl/AuthenticationProfileManager.java
Index: AuthenticationProfileManager.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/profile/impl/AuthenticationProfileManager.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- AuthenticationProfileManager.java 11 Jul 2003 20:34:22 -0000 1.9
+++ AuthenticationProfileManager.java 4 Aug 2003 03:06:30 -0000 1.10
@@ -127,9 +127,7 @@
parameters.put("config", config);
parameters.put("handler", handler);
CopletDataManager copletDataManager = null;
- Map keyMap;
try {
-
this.lock.readLock();
// load coplet base data
@@ -222,8 +220,6 @@
Object factory,
boolean forcedLoad)
throws Exception {
- Configuration config = (Configuration) parameters.get("config");
-
DeltaApplicableReferencesAdjustable result;
Object object;
@@ -382,7 +378,7 @@
}
SourceValidity newValidity = adapter.getValidity(key, parameters);
- if (!forcedLoad && valid == SourceValidity.UNKNWON) {
+ if (!forcedLoad && valid == SourceValidity.UNKNOWN) {
if (sourceValidity.isValid(newValidity) == SourceValidity.VALID)
return objects[0];
}
1.3 +1 -2 cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/profile/impl/AbstractUserProfileManager.java
Index: AbstractUserProfileManager.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/profile/impl/AbstractUserProfileManager.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AbstractUserProfileManager.java 18 Jul 2003 14:41:45 -0000 1.2
+++ AbstractUserProfileManager.java 4 Aug 2003 03:06:30 -0000 1.3
@@ -91,7 +91,6 @@
public void logout() {
final String layoutKey = this.getDefaultLayoutKey();
PortalService service = null;
- String attribute = null;
ComponentSelector adapterSelector = null;
try {
adapterSelector = (ComponentSelector)this.manager.lookup(CopletAdapter.ROLE+"Selector");
1.4 +0 -1 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XPointerFrameworkParser.java 4 Jul 2003 17:58:30 -0000 1.3
+++ XPointerFrameworkParser.java 4 Aug 2003 03:06:30 -0000 1.4
@@ -352,7 +352,6 @@
private Token jj_scanpos, jj_lastpos;
private int jj_la;
public boolean lookingAhead = false;
- private boolean jj_semLA;
private int jj_gen;
final private int[] jj_la1 = new int[6];
static private int[] jj_la1_0;
1.5 +3 -39 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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XPointerFrameworkParserTokenManager.java 4 Jul 2003 17:58:30 -0000 1.4
+++ XPointerFrameworkParserTokenManager.java 4 Aug 2003 03:06:30 -0000 1.5
@@ -56,30 +56,11 @@
public void setDebugStream(java.io.PrintStream ds) {
debugStream = ds;
}
- private final int jjStopStringLiteralDfa_0(int pos, long active0) {
- switch (pos) {
- default :
- return -1;
- }
- }
- private final int jjStartNfa_0(int pos, long active0) {
- return jjMoveNfa_0(jjStopStringLiteralDfa_0(pos, active0), pos + 1);
- }
private final int jjStopAtPos(int pos, int kind) {
jjmatchedKind = kind;
jjmatchedPos = pos;
return pos + 1;
}
- private final int jjStartNfaWithStates_0(int pos, int kind, int state) {
- jjmatchedKind = kind;
- jjmatchedPos = pos;
- try {
- curChar = input_stream.readChar();
- } catch (java.io.IOException e) {
- return pos + 1;
- }
- return jjMoveNfa_0(state, pos + 1);
- }
private final int jjMoveStringLiteralDfa0_0() {
switch (curChar) {
case 40 :
@@ -110,10 +91,6 @@
jjCheckNAdd(jjnextStates[start]);
} while (start++ != end);
}
- private final void jjCheckNAddStates(int start) {
- jjCheckNAdd(jjnextStates[start]);
- jjCheckNAdd(jjnextStates[start + 1]);
- }
static final long[] jjbitVec0 =
{ 0x0L, 0xffffffffffffc000L, 0xfffff0007fffffffL, 0x7fffffL };
static final long[] jjbitVec2 = { 0x0L, 0x0L, 0x0L, 0xff7fffffff7fffffL };
@@ -260,12 +237,11 @@
0xfffffffe661fffffL,
0x77ffffffffffffffL };
private final int jjMoveNfa_0(int startState, int curPos) {
- int[] nextStates;
int startsAt = 0;
jjnewStateCnt = 7;
int i = 1;
jjstateSet[0] = startState;
- int j, kind = 0x7fffffff;
+ int kind = 0x7fffffff;
for (;;) {
if (++jjround == 0x7fffffff)
ReInitRounds();
@@ -407,16 +383,7 @@
private final int jjStartNfa_1(int pos, long active0) {
return jjMoveNfa_1(jjStopStringLiteralDfa_1(pos, active0), pos + 1);
}
- private final int jjStartNfaWithStates_1(int pos, int kind, int state) {
- jjmatchedKind = kind;
- jjmatchedPos = pos;
- try {
- curChar = input_stream.readChar();
- } catch (java.io.IOException e) {
- return pos + 1;
- }
- return jjMoveNfa_1(state, pos + 1);
- }
+
private final int jjMoveStringLiteralDfa0_1() {
switch (curChar) {
case 40 :
@@ -463,12 +430,11 @@
static final long[] jjbitVec41 =
{ 0x0L, 0x0L, 0xffffffffffffffffL, 0xffffffffffffffffL };
private final int jjMoveNfa_1(int startState, int curPos) {
- int[] nextStates;
int startsAt = 0;
jjnewStateCnt = 1;
int i = 1;
jjstateSet[0] = startState;
- int j, kind = 0x7fffffff;
+ int kind = 0x7fffffff;
for (;;) {
if (++jjround == 0x7fffffff)
ReInitRounds();
@@ -750,8 +716,6 @@
int jjmatchedKind;
public Token getNextToken() {
- int kind;
- Token specialToken = null;
Token matchedToken;
int curPos = 0;
1.7 +1 -2 cocoon-2.1/src/test/org/apache/cocoon/generation/AbstractGeneratorTestCase.java
Index: AbstractGeneratorTestCase.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/test/org/apache/cocoon/generation/AbstractGeneratorTestCase.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- AbstractGeneratorTestCase.java 10 Jul 2003 00:25:25 -0000 1.6
+++ AbstractGeneratorTestCase.java 4 Aug 2003 03:06:30 -0000 1.7
@@ -106,7 +106,6 @@
Generator generator = null;
SourceResolver resolver = null;
SAXParser parser = null;
- Source assertionsource = null;
Document document = null;
try {
1.7 +1 -7 cocoon-2.1/src/blocks/slide/java/org/apache/cocoon/components/source/impl/SlideSource.java
Index: SlideSource.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/slide/java/org/apache/cocoon/components/source/impl/SlideSource.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- SlideSource.java 24 Apr 2003 09:41:59 -0000 1.6
+++ SlideSource.java 4 Aug 2003 03:06:30 -0000 1.7
@@ -278,12 +278,6 @@
*/
public InputStream getInputStream() throws IOException, SourceException {
try {
- /* FIXME (SM): the variable object is never used. can we remove it?
- ObjectNode object = structure.retrieve(this.slideToken,
- this.config.getFilesPath()+
- this.path);
- */
-
return content.retrieve(slideToken, this.revisionDescriptors,
this.revisionDescriptor).streamContent();
} catch (SlideException se) {
1.2 +2 -4 cocoon-2.1/src/blocks/eventcache/java/org/apache/cocoon/acting/CacheEventAction.java
Index: CacheEventAction.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/eventcache/java/org/apache/cocoon/acting/CacheEventAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CacheEventAction.java 14 Jul 2003 02:50:45 -0000 1.1
+++ CacheEventAction.java 4 Aug 2003 03:06:30 -0000 1.2
@@ -54,12 +54,11 @@
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.thread.ThreadSafe;
+
import org.apache.cocoon.caching.Cache;
import org.apache.cocoon.caching.impl.EventAwareCacheImpl;
import org.apache.cocoon.caching.validity.NamedEvent;
-import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Redirector;
-import org.apache.cocoon.environment.Request;
import org.apache.cocoon.environment.SourceResolver;
/**
@@ -91,7 +90,6 @@
) throws Exception {
Cache cache = (Cache)this.manager.lookup(Cache.ROLE);
if (cache instanceof EventAwareCacheImpl) {
- Request request = ObjectModelHelper.getRequest(objectModel);
String eventName = par.getParameter("event");
if (getLogger().isDebugEnabled()) {
getLogger().debug("Configured for cache event named: " + eventName);
1.2 +1 -3 cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/components/variables/PreparedVariableResolver.java
Index: PreparedVariableResolver.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/components/variables/PreparedVariableResolver.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PreparedVariableResolver.java 10 Jun 2003 19:38:54 -0000 1.1
+++ PreparedVariableResolver.java 4 Aug 2003 03:06:30 -0000 1.2
@@ -187,8 +187,6 @@
public String resolve()
throws PatternException {
- List mapStack = null; // get the stack only when necessary - lazy inside the loop
- int stackSize = 0;
StringBuffer result = new StringBuffer();
1.4 +0 -4 cocoon-2.1/src/scratchpad/src/org/apache/cocoon/components/jxdom/DocumentAdapter.java
Index: DocumentAdapter.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/scratchpad/src/org/apache/cocoon/components/jxdom/DocumentAdapter.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DocumentAdapter.java 2 May 2003 19:49:24 -0000 1.3
+++ DocumentAdapter.java 4 Aug 2003 03:06:30 -0000 1.4
@@ -65,14 +65,10 @@
private static final CompiledExpression
GET_SELF = JXPathContext.compile(".");
- private static final CompiledExpression
- GET_PARENT = JXPathContext.compile("..");
private static final CompiledExpression
GET_ATTRS = JXPathContext.compile("@*");
private static final CompiledExpression
GET_CHILD_NODES = JXPathContext.compile("*");
- private static final CompiledExpression
- GET_ROOT = JXPathContext.compile("/");
private static NamedNodeMap EMPTY_NODE_MAP = new NamedNodeMap() {
public Node getNamedItem(String name) {
1.6 +1 -2 cocoon-2.1/src/test/org/apache/cocoon/AbstractCompositeTestCase.java
Index: AbstractCompositeTestCase.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/test/org/apache/cocoon/AbstractCompositeTestCase.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- AbstractCompositeTestCase.java 18 Jul 2003 20:57:02 -0000 1.5
+++ AbstractCompositeTestCase.java 4 Aug 2003 03:06:30 -0000 1.6
@@ -203,7 +203,6 @@
Generator generator = null;
SourceResolver resolver = null;
SAXParser parser = null;
- Source assertionsource = null;
Document document = null;
try {
1.3 +1 -2 cocoon-2.1/src/blocks/session-fw/java/org/apache/cocoon/webapps/session/components/DefaultContextManager.java
Index: DefaultContextManager.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/session-fw/java/org/apache/cocoon/webapps/session/components/DefaultContextManager.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DefaultContextManager.java 23 May 2003 12:13:14 -0000 1.2
+++ DefaultContextManager.java 4 Aug 2003 03:06:31 -0000 1.3
@@ -269,7 +269,6 @@
synchronized(session) {
final Map contexts = this.getSessionContexts(session);
if (contexts.containsKey(name)) {
- SessionContext context = (SessionContext)contexts.get(name);
contexts.remove(name);
}
}
1.6 +1 -2 cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/components/persistance/CastorSourceConverter.java
Index: CastorSourceConverter.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/components/persistance/CastorSourceConverter.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- CastorSourceConverter.java 10 Jul 2003 13:17:07 -0000 1.5
+++ CastorSourceConverter.java 4 Aug 2003 03:06:31 -0000 1.6
@@ -122,7 +122,6 @@
Writer writer = new OutputStreamWriter(stream);
try {
Marshaller marshaller = new Marshaller( writer );
- Mapping mapping = new Mapping();
marshaller.setMapping((Mapping)this.mappings.get(parameters.get(parameters.get("profiletype"))));
marshaller.marshal(object);
writer.close();