vgritsenko 2004/06/16 07:29:31
Modified: src/java/org/apache/cocoon/components/source/impl
ContextSourceFactory.java PartSourceFactory.java
SitemapSource.java SourceDeferredValidity.java
Log:
zap tabs
Revision Changes Path
1.8 +2 -2
cocoon-2.1/src/java/org/apache/cocoon/components/source/impl/ContextSourceFactory.java
Index: ContextSourceFactory.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/source/impl/ContextSourceFactory.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ContextSourceFactory.java 5 Mar 2004 13:02:50 -0000 1.7
+++ ContextSourceFactory.java 16 Jun 2004 14:29:31 -0000 1.8
@@ -118,7 +118,7 @@
throw new MalformedURLException(message);
}
} catch (ServiceException se) {
- throw new SourceException("Unable to lookup source resolver.",
se);
+ throw new SourceException("Unable to lookup source resolver.",
se);
} finally {
this.manager.release( resolver );
}
1.4 +7 -7
cocoon-2.1/src/java/org/apache/cocoon/components/source/impl/PartSourceFactory.java
Index: PartSourceFactory.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/source/impl/PartSourceFactory.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- PartSourceFactory.java 5 Mar 2004 13:02:50 -0000 1.3
+++ PartSourceFactory.java 16 Jun 2004 14:29:31 -0000 1.4
@@ -32,19 +32,19 @@
*/
public class PartSourceFactory implements SourceFactory, Contextualizable
{
- Map objectModel;
+ Map objectModel;
/*
- * Returns a new [EMAIL PROTECTED] PartSource} based on the uri.
- *
- * @see
org.apache.excalibur.source.SourceFactory#getSource(java.lang.String,
java.util.Map)
- */
+ * Returns a new [EMAIL PROTECTED] PartSource} based on the uri.
+ *
+ * @see
org.apache.excalibur.source.SourceFactory#getSource(java.lang.String,
java.util.Map)
+ */
public Source getSource(String uri, Map parameters) throws IOException,
MalformedURLException
{
return new PartSource(uri, this.objectModel);
}
- /**
+ /**
* Do nothing, [EMAIL PROTECTED] PartSource}s don't need to be released.
*
* @see
org.apache.excalibur.source.SourceFactory#release(org.apache.excalibur.source.Source)
@@ -54,7 +54,7 @@
// Nothing to do here
}
- /**
+ /**
* Get the objectModel from the Context
*/
public void contextualize(org.apache.avalon.framework.context.Context
context)
1.20 +9 -9
cocoon-2.1/src/java/org/apache/cocoon/components/source/impl/SitemapSource.java
Index: SitemapSource.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/source/impl/SitemapSource.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- SitemapSource.java 25 May 2004 07:28:24 -0000 1.19
+++ SitemapSource.java 16 Jun 2004 14:29:31 -0000 1.20
@@ -342,14 +342,14 @@
if (this.redirectSource != null) {
SourceUtil.parse(this.manager, this.redirectSource,
contentHandler);
} else {
- XMLConsumer consumer;
- if (contentHandler instanceof XMLConsumer) {
- consumer = (XMLConsumer)contentHandler;
- } else if (contentHandler instanceof LexicalHandler) {
- consumer = new ContentHandlerWrapper(contentHandler,
(LexicalHandler)contentHandler);
- } else {
- consumer = new ContentHandlerWrapper(contentHandler);
- }
+ XMLConsumer consumer;
+ if (contentHandler instanceof XMLConsumer) {
+ consumer = (XMLConsumer)contentHandler;
+ } else if (contentHandler instanceof LexicalHandler) {
+ consumer = new ContentHandlerWrapper(contentHandler,
(LexicalHandler)contentHandler);
+ } else {
+ consumer = new ContentHandlerWrapper(contentHandler);
+ }
// We have to add an environment changer
// for clean environment stack handling.
EnvironmentHelper.enterProcessor(this.pipelineDescription.lastProcessor,
1.3 +11 -12
cocoon-2.1/src/java/org/apache/cocoon/components/source/impl/SourceDeferredValidity.java
Index: SourceDeferredValidity.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/source/impl/SourceDeferredValidity.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SourceDeferredValidity.java 5 Mar 2004 13:02:50 -0000 1.2
+++ SourceDeferredValidity.java 16 Jun 2004 14:29:31 -0000 1.3
@@ -1,12 +1,12 @@
/*
* Copyright 1999-2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -29,16 +29,15 @@
public final class SourceDeferredValidity implements DeferredValidity {
private Source source;
-
+
public SourceDeferredValidity(Source source) {
this.source = source;
}
-
- /**
- * @see
org.apache.excalibur.source.impl.validity.DeferredValidity#getValidity()
- */
- public SourceValidity getValidity() {
- return this.source.getValidity();
- }
+ /**
+ * @see
org.apache.excalibur.source.impl.validity.DeferredValidity#getValidity()
+ */
+ public SourceValidity getValidity() {
+ return this.source.getValidity();
+ }
}
