cziegeler 2003/09/24 14:22:33
Modified: src/blocks/eventcache/java/org/apache/cocoon/caching/impl
DefaultEventRegistryImpl.java
src/blocks/midi/java/org/apache/cocoon/components/midi/xmidi
Utils.java
src/blocks/authentication-fw/java/org/apache/cocoon/webapps/authentication/components
DefaultAuthenticationManager.java
PipelineAuthenticator.java
src/blocks/mail/java/org/apache/cocoon/mail
MailCommandBuilder.java
src/blocks/portal/java/org/apache/cocoon/portal/util
AttributesFieldHandler.java
src/blocks/portal/java/org/apache/cocoon/portal/layout/renderer/aspect/impl
XSLTAspect.java FullScreenCopletAspect.java
DefaultRendererContext.java
src/blocks/precept/java/org/apache/cocoon/precept/preceptors/easyrelax
PreceptorImpl.java
src/blocks/session-fw/java/org/apache/cocoon/webapps/session/components
DefaultSessionManager.java
DefaultTransactionManager.java
src/blocks/portal/java/org/apache/cocoon/portal/transformation
NewEventLinkTransformer.java ProxyTransformer.java
src/blocks/portal/java/org/apache/cocoon/portal/event/impl
DefaultEventAspectContext.java
src/blocks/midi/java/org/apache/cocoon/generation
XMidiGenerator.java
src/blocks/portal/java/org/apache/cocoon/portal/layout/renderer/impl
AbstractRenderer.java
src/blocks/axis/java/org/apache/cocoon/reading
AxisRPCReader.java
src/blocks/portal/java/org/apache/cocoon/portal/event/subscriber/impl
DefaultChangeAspectDataEventSubscriber.java
Log:
Removing unused imports and casts
Revision Changes Path
1.6 +2 -2
cocoon-2.1/src/blocks/eventcache/java/org/apache/cocoon/caching/impl/DefaultEventRegistryImpl.java
Index: DefaultEventRegistryImpl.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/eventcache/java/org/apache/cocoon/caching/impl/DefaultEventRegistryImpl.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DefaultEventRegistryImpl.java 5 Sep 2003 04:02:51 -0000 1.5
+++ DefaultEventRegistryImpl.java 24 Sep 2003 21:22:33 -0000 1.6
@@ -168,7 +168,7 @@
if (getLogger().isDebugEnabled()) {
getLogger().debug("Removing from event mapping: " +
o.toString());
}
- m_eventMMap.remove((Event)o,key);
+ m_eventMMap.remove(o,key);
}
}
1.3 +1 -1
cocoon-2.1/src/blocks/midi/java/org/apache/cocoon/components/midi/xmidi/Utils.java
Index: Utils.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/midi/java/org/apache/cocoon/components/midi/xmidi/Utils.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Utils.java 5 Sep 2003 07:21:48 -0000 1.2
+++ Utils.java 24 Sep 2003 21:22:33 -0000 1.3
@@ -295,7 +295,7 @@
{
int k = j - i - 1;
int p = pow(128, i);
- int m = (int) ba[k];
+ int m = ba[k];
s += m * p;
/*this.getLogger().debug(
"deltaToInt: in loop: s = "
1.17 +3 -4
cocoon-2.1/src/blocks/authentication-fw/java/org/apache/cocoon/webapps/authentication/components/DefaultAuthenticationManager.java
Index: DefaultAuthenticationManager.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/authentication-fw/java/org/apache/cocoon/webapps/authentication/components/DefaultAuthenticationManager.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- DefaultAuthenticationManager.java 20 Sep 2003 21:22:33 -0000 1.16
+++ DefaultAuthenticationManager.java 24 Sep 2003 21:22:33 -0000 1.17
@@ -381,7 +381,7 @@
} catch (ServiceException ce) {
throw new ProcessingException("Unable to create session
context.", ce);
} finally {
- this.manager.release( (Component)contextManager);
+ this.manager.release( contextManager);
}
}
@@ -460,7 +460,6 @@
*/
public void contextualize(Context context) throws ContextException {
this.context = context;
-
}
protected void setState(RequestState status) {
@@ -500,7 +499,7 @@
} catch (SAXException saxe) {
throw new ProcessingException("Unable to create session
context.", saxe);
} finally {
- manager.release( (Component)contextManager);
+ manager.release( contextManager);
}
} else {
throw new ProcessingException("No handler defined. Unable to
create application context.");
1.4 +2 -3
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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- PipelineAuthenticator.java 26 Aug 2003 06:43:32 -0000 1.3
+++ PipelineAuthenticator.java 24 Sep 2003 21:22:33 -0000 1.4
@@ -54,7 +54,6 @@
import java.util.Iterator;
import org.apache.avalon.framework.activity.Disposable;
-import org.apache.avalon.framework.component.Component;
import org.apache.avalon.framework.context.Context;
import org.apache.avalon.framework.context.ContextException;
import org.apache.avalon.framework.context.Contextualizable;
@@ -317,7 +316,7 @@
} catch ( ServiceException se ) {
throw new ProcessingException("Unable to lookup session
manager.", se);
} finally {
- this.manager.release( (Component)sessionManager );
+ this.manager.release( sessionManager );
}
}
1.3 +2 -2
cocoon-2.1/src/blocks/mail/java/org/apache/cocoon/mail/MailCommandBuilder.java
Index: MailCommandBuilder.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/mail/java/org/apache/cocoon/mail/MailCommandBuilder.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MailCommandBuilder.java 11 Mar 2003 19:04:58 -0000 1.2
+++ MailCommandBuilder.java 24 Sep 2003 21:22:33 -0000 1.3
@@ -97,7 +97,7 @@
if (cmd == null) {
cmd = (String)mailContext.get(
MailContext.MAIL_CURRENT_WORKING_COMMAND_ENTRY );
}
- Class clazz = (Class) getClassForCommand(cmd);
+ Class clazz = getClassForCommand(cmd);
if (clazz != null) {
ama = (AbstractMailCommand) clazz.newInstance();
// enable logging of the mail command
1.6 +2 -2
cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/util/AttributesFieldHandler.java
Index: AttributesFieldHandler.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/util/AttributesFieldHandler.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- AttributesFieldHandler.java 19 Aug 2003 14:09:34 -0000 1.5
+++ AttributesFieldHandler.java 24 Sep 2003 21:22:33 -0000 1.6
@@ -101,6 +101,6 @@
public void setValue(Object object, Object value) {
MapItem item = (MapItem) value;
- this.getAttributes(object).put((String) item.getKey(),
item.getValue());
+ this.getAttributes(object).put(item.getKey(), item.getValue());
}
}
1.7 +2 -3
cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/XSLTAspect.java
Index: XSLTAspect.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/XSLTAspect.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- XSLTAspect.java 17 Jun 2003 17:54:47 -0000 1.6
+++ XSLTAspect.java 24 Sep 2003 21:22:33 -0000 1.7
@@ -75,7 +75,6 @@
import org.apache.excalibur.source.SourceResolver;
import org.apache.excalibur.xml.xslt.XSLTProcessor;
import org.apache.excalibur.xml.xslt.XSLTProcessorException;
-import org.apache.excalibur.xml.xslt.XSLTProcessorImpl;
import org.xml.sax.ContentHandler;
import org.xml.sax.SAXException;
import org.xml.sax.ext.LexicalHandler;
@@ -164,7 +163,7 @@
public Object prepareConfiguration(Parameters configuration)
throws ParameterException {
PreparedConfiguration pc = new PreparedConfiguration();
- pc.xsltRole = configuration.getParameter("xslt-processor-role",
XSLTProcessorImpl.ROLE);
+ pc.xsltRole = configuration.getParameter("xslt-processor-role",
XSLTProcessor.ROLE);
String stylesheet = configuration.getParameter("style");
try {
pc.stylesheet = this.variableFactory.lookup( stylesheet );
1.4 +2 -2
cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/FullScreenCopletAspect.java
Index: FullScreenCopletAspect.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/FullScreenCopletAspect.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- FullScreenCopletAspect.java 18 Jul 2003 14:41:45 -0000 1.3
+++ FullScreenCopletAspect.java 24 Sep 2003 21:22:33 -0000 1.4
@@ -80,7 +80,7 @@
CopletInstanceData cid =
((CopletLayout)layout).getCopletInstanceData();
- final Layout fullScreenLayout =
(Layout)service.getComponentManager().getProfileManager().getEntryLayout();
+ final Layout fullScreenLayout =
service.getComponentManager().getProfileManager().getEntryLayout();
if ( fullScreenLayout != null && fullScreenLayout.equals( layout )) {
XMLUtils.createElement(handler, "fullscreen-uri",
service.getComponentManager().getLinkService().getRefreshLinkURI());
} else {
1.3 +1 -4
cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/DefaultRendererContext.java
Index: DefaultRendererContext.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/DefaultRendererContext.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DefaultRendererContext.java 15 Jun 2003 16:56:09 -0000 1.2
+++ DefaultRendererContext.java 24 Sep 2003 21:22:33 -0000 1.3
@@ -70,15 +70,12 @@
*/
public final class DefaultRendererContext implements RendererAspectContext {
- private RendererAspectChain chain;
-
private Iterator iterator;
private Iterator configIterator;
private Object config;
private Map attributes;
public DefaultRendererContext(RendererAspectChain chain) {
- this.chain = chain;
this.iterator = chain.getIterator();
this.configIterator = chain.getConfigIterator();
}
1.3 +2 -2
cocoon-2.1/src/blocks/precept/java/org/apache/cocoon/precept/preceptors/easyrelax/PreceptorImpl.java
Index: PreceptorImpl.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/precept/java/org/apache/cocoon/precept/preceptors/easyrelax/PreceptorImpl.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- PreceptorImpl.java 16 Mar 2003 17:49:05 -0000 1.2
+++ PreceptorImpl.java 24 Sep 2003 21:22:33 -0000 1.3
@@ -68,7 +68,7 @@
public Collection validate(Instance instance, String xpath, Context
context) throws InvalidXPathSyntaxException, NoSuchNodeException {
Collection violations = null;
- Collection constraints = (Collection) getConstraintsFor(xpath);
+ Collection constraints = getConstraintsFor(xpath);
if (constraints != null) {
Object value = instance.getValue(xpath);
for (Iterator it = constraints.iterator(); it.hasNext();) {
1.3 +2 -2
cocoon-2.1/src/blocks/session-fw/java/org/apache/cocoon/webapps/session/components/DefaultSessionManager.java
Index: DefaultSessionManager.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/session-fw/java/org/apache/cocoon/webapps/session/components/DefaultSessionManager.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DefaultSessionManager.java 23 May 2003 12:13:14 -0000 1.2
+++ DefaultSessionManager.java 24 Sep 2003 21:22:33 -0000 1.3
@@ -498,7 +498,7 @@
currentDelta.normalize();
currentProfile.normalize();
// do a recursive call for sub elements
- this.importNode((Element)currentProfile,
(Element)currentDelta, preserve);
+ this.importNode(currentProfile, currentDelta,
preserve);
// and now the text nodes: Remove all from the
profile and add all
// of the delta
NodeList childs = currentProfile.getChildNodes();
1.3 +6 -6
cocoon-2.1/src/blocks/session-fw/java/org/apache/cocoon/webapps/session/components/DefaultTransactionManager.java
Index: DefaultTransactionManager.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/session-fw/java/org/apache/cocoon/webapps/session/components/DefaultTransactionManager.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DefaultTransactionManager.java 23 May 2003 12:13:14 -0000 1.2
+++ DefaultTransactionManager.java 24 Sep 2003 21:22:33 -0000 1.3
@@ -112,7 +112,7 @@
* Reset the transaction management state.
*/
public void resetTransactions(SessionContext context) {
- TransactionState ts =
(TransactionState)this.getSessionContextsTransactionState(context);
+ TransactionState ts =
this.getSessionContextsTransactionState(context);
ts.nr=0;
ts.nrtotal=0;
ts.nw=0;
@@ -126,7 +126,7 @@
*/
public synchronized void startReadingTransaction(SessionContext context)
throws ProcessingException {
- TransactionState ts =
(TransactionState)this.getSessionContextsTransactionState(context);
+ TransactionState ts =
this.getSessionContextsTransactionState(context);
ts.nrtotal++;
while (ts.nw!=0) {
try {
@@ -144,7 +144,7 @@
* Otherwise the session context is blocked.
*/
public synchronized void stopReadingTransaction(SessionContext context) {
- TransactionState ts =
(TransactionState)this.getSessionContextsTransactionState(context);
+ TransactionState ts =
this.getSessionContextsTransactionState(context);
ts.nr--;
ts.nrtotal--;
if (ts.nrtotal==0) notify();
@@ -157,7 +157,7 @@
*/
public synchronized void startWritingTransaction(SessionContext context)
throws ProcessingException {
- TransactionState ts =
(TransactionState)this.getSessionContextsTransactionState(context);
+ TransactionState ts =
this.getSessionContextsTransactionState(context);
ts.nwtotal++;
while (ts.nrtotal+ts.nw != 0) {
try {
@@ -175,7 +175,7 @@
* Otherwise the session context is blocked.
*/
public synchronized void stopWritingTransaction(SessionContext context) {
- TransactionState ts =
(TransactionState)this.getSessionContextsTransactionState(context);
+ TransactionState ts =
this.getSessionContextsTransactionState(context);
ts.nw=0;
ts.nwtotal--;
notifyAll();
1.2 +6 -6
cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/transformation/NewEventLinkTransformer.java
Index: NewEventLinkTransformer.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/transformation/NewEventLinkTransformer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- NewEventLinkTransformer.java 25 Aug 2003 07:41:18 -0000 1.1
+++ NewEventLinkTransformer.java 24 Sep 2003 21:22:33 -0000 1.2
@@ -198,8 +198,8 @@
//cut all query parameters from actions with method get, as
these will be normaly ignored!
formSpecialTreatment = true;
if ("GET".equalsIgnoreCase(newAttributes.getValue("method"))
- && link.indexOf((int) '?') > 0) {
- link = link.substring(0, link.indexOf((int) '?'));
+ && link.indexOf('?') > 0) {
+ link = link.substring(0, link.indexOf('?'));
}
}
@@ -222,7 +222,7 @@
int begin =
eventLink.indexOf("cocoon-portal-action=")
+ "cocoon-portal-action=".length();
- int end = eventLink.indexOf((int) '&', begin);
+ int end = eventLink.indexOf('&', begin);
if (end == -1) {
end = eventLink.length();
}
@@ -232,14 +232,14 @@
begin =
eventLink.indexOf("cocoon-portal-event=")
+ "cocoon-portal-event=".length();
- end = eventLink.indexOf((int) '&', begin);
+ end = eventLink.indexOf('&', begin);
if (end == -1) {
end = eventLink.length();
}
portalEvent = eventLink.substring(begin, end);
eventLink =
- eventLink.substring(0, eventLink.indexOf((int) '?'));
+ eventLink.substring(0, eventLink.indexOf('?'));
}
// insert event link
1.3 +9 -9
cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/transformation/ProxyTransformer.java
Index: ProxyTransformer.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/transformation/ProxyTransformer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ProxyTransformer.java 9 Sep 2003 18:52:33 -0000 1.2
+++ ProxyTransformer.java 24 Sep 2003 21:22:33 -0000 1.3
@@ -221,7 +221,7 @@
PortalApplicationConfig pac =
(PortalApplicationConfig)
copletInstanceData.getAttribute(CONFIG);
- String startURI = (String) pac.getAttribute(START_URI);
+ String startURI = pac.getAttribute(START_URI);
link = (String) copletInstanceData.getAttribute(LINK);
@@ -232,13 +232,13 @@
}
if (documentBase == null) {
- documentBase = link.substring(0, link.lastIndexOf((int) '/') +
1);
+ documentBase = link.substring(0, link.lastIndexOf('/') + 1);
copletInstanceData.setAttribute(DOCUMENT_BASE, documentBase);
}
- String encodingString = (String) pac.getAttribute("encoding");
+ String encodingString = pac.getAttribute("encoding");
configuredEncoding = encodingConstantFromString(encodingString);
- userAgent = (String) pac.getAttribute("user-agent");
+ userAgent = pac.getAttribute("user-agent");
envelopeTag = parameters.getParameter("envelope-tag", envelopeTag);
if (envelopeTag == null) {
@@ -414,7 +414,7 @@
String content = metaElement.getAttribute("content");
if (content != null) {
String time =
- content.substring(0, content.indexOf((int) ';'));
+ content.substring(0, content.indexOf(';'));
try {
if (Integer.parseInt(time) > 10) {
getLogger().warn(
@@ -432,7 +432,7 @@
}
String newURI =
- content.substring(content.indexOf((int) '=') + 1);
+ content.substring(content.indexOf('=') + 1);
int index_semikolon = newURI.indexOf(";");
int index_question = newURI.indexOf("?");
@@ -475,7 +475,7 @@
int end = -1;
if (begin > -1) {
begin += "charset=".length();
- end = contentType.indexOf((int) ';', begin);
+ end = contentType.indexOf(';', begin);
if (end == -1) {
end = contentType.length();
}
@@ -594,7 +594,7 @@
copletInstanceData.setAttribute(
COOKIE,
connection.getHeaderField(COOKIE));
- documentBase = uri.substring(0, uri.lastIndexOf((int) '/') + 1);
+ documentBase = uri.substring(0, uri.lastIndexOf('/') + 1);
copletInstanceData.setAttribute(DOCUMENT_BASE, documentBase);
return connection;
}
1.2 +1 -4
cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/event/impl/DefaultEventAspectContext.java
Index: DefaultEventAspectContext.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/event/impl/DefaultEventAspectContext.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DefaultEventAspectContext.java 22 May 2003 15:19:43 -0000 1.1
+++ DefaultEventAspectContext.java 24 Sep 2003 21:22:33 -0000 1.2
@@ -70,8 +70,6 @@
public final class DefaultEventAspectContext
implements EventAspectContext {
- private EventAspectChain chain;
-
private Iterator iterator;
private Iterator configIterator;
private Parameters config;
@@ -81,7 +79,6 @@
private EventConverter converter;
public DefaultEventAspectContext(EventAspectChain chain) {
- this.chain = chain;
this.iterator = chain.getIterator();
this.configIterator = chain.getConfigIterator();
}
1.4 +1 -3
cocoon-2.1/src/blocks/midi/java/org/apache/cocoon/generation/XMidiGenerator.java
Index: XMidiGenerator.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/midi/java/org/apache/cocoon/generation/XMidiGenerator.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XMidiGenerator.java 5 Sep 2003 07:21:48 -0000 1.3
+++ XMidiGenerator.java 24 Sep 2003 21:22:33 -0000 1.4
@@ -199,7 +199,6 @@
}
private int midiFormat;
- private int ppnq;
private Hashtable ffHash;
private String[] chanArray;
private String[] fArray;
@@ -263,7 +262,6 @@
midiFormat = Utils.baToInt(dta, 0, 1);
numTracks = Utils.baToInt(dta, 2, 3);
- ppnq = Utils.baToInt(dta, 4, 5);
String pnq = Utils.baToHex(dta, 4, 5);
attr.clear();
@@ -925,7 +923,7 @@
this.getLogger().debug(
"doTrack: status FF" + nmData + ", edata = " + edata);
} else if (status == 241 || status == 243) {
- int tcv = (int) dta[offset];
+ int tcv = dta[offset];
Integer tc = new Integer(tcv);
edata = tc.toString();
slen = 1;
1.5 +2 -3
cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/layout/renderer/impl/AbstractRenderer.java
Index: AbstractRenderer.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/layout/renderer/impl/AbstractRenderer.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- AbstractRenderer.java 18 Jul 2003 14:41:45 -0000 1.4
+++ AbstractRenderer.java 24 Sep 2003 21:22:33 -0000 1.5
@@ -70,7 +70,6 @@
import org.apache.excalibur.source.Source;
import org.apache.excalibur.source.SourceResolver;
import org.apache.excalibur.xml.xslt.XSLTProcessor;
-import org.apache.excalibur.xml.xslt.XSLTProcessorImpl;
import org.xml.sax.ContentHandler;
import org.xml.sax.SAXException;
import org.xml.sax.ext.LexicalHandler;
@@ -126,7 +125,7 @@
try {
resolver = (SourceResolver)
this.componentManager.lookup(SourceResolver.ROLE);
stylesheet =
resolver.resolveURI(this.getStylesheetURI(layout));
- processor = (XSLTProcessor)
this.componentManager.lookup(XSLTProcessorImpl.ROLE);
+ processor = (XSLTProcessor)
this.componentManager.lookup(XSLTProcessor.ROLE);
TransformerHandler transformer =
processor.getTransformerHandler(stylesheet);
SAXResult result = new SAXResult(new
IncludeXMLConsumer((handler)));
if (handler instanceof LexicalHandler) {
1.5 +2 -2
cocoon-2.1/src/blocks/axis/java/org/apache/cocoon/reading/AxisRPCReader.java
Index: AxisRPCReader.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/axis/java/org/apache/cocoon/reading/AxisRPCReader.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- AxisRPCReader.java 11 Jul 2003 18:32:25 -0000 1.4
+++ AxisRPCReader.java 24 Sep 2003 21:22:33 -0000 1.5
@@ -468,7 +468,7 @@
private String getSoapAction(HttpServletRequest req)
throws AxisFault
{
- String soapAction =
(String)req.getHeader(HTTPConstants.HEADER_SOAP_ACTION);
+ String soapAction = req.getHeader(HTTPConstants.HEADER_SOAP_ACTION);
if (getLogger().isDebugEnabled())
{
1.3 +1 -4
cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/event/subscriber/impl/DefaultChangeAspectDataEventSubscriber.java
Index: DefaultChangeAspectDataEventSubscriber.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/event/subscriber/impl/DefaultChangeAspectDataEventSubscriber.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DefaultChangeAspectDataEventSubscriber.java 26 May 2003 12:49:13
-0000 1.2
+++ DefaultChangeAspectDataEventSubscriber.java 24 Sep 2003 21:22:33
-0000 1.3
@@ -66,10 +66,7 @@
public final class DefaultChangeAspectDataEventSubscriber
implements Subscriber {
- private ComponentManager manager;
-
public DefaultChangeAspectDataEventSubscriber(ComponentManager manager) {
- this.manager = manager;
}
/* (non-Javadoc)
