joerg 2004/05/25 18:31:06
Modified: src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common
LanguageSetImpl.java
src/blocks/woody/java/org/apache/cocoon/woody/transformation
EffectWidgetReplacingPipe.java
src/java/org/apache/cocoon/environment/wrapper
MutableEnvironmentFacade.java
EnvironmentWrapper.java
src/blocks/scratchpad/java/org/apache/cocoon/components/flow/javascript/fom
AO_FOM_JavaScriptInterpreter.java
src/test/org/apache/cocoon/environment/mock
MockEnvironment.java
src/blocks/cron/java/org/apache/cocoon/environment/background
BackgroundEnvironment.java
src/java/org/apache/cocoon/components/treeprocessor
TreeProcessor.java
src/java/org/apache/cocoon/environment/internal
EnvironmentHelper.java
src/java/org/apache/cocoon/components/flow
AbstractInterpreter.java
src/java/org/apache/cocoon/components/container
CocoonComponentManager.java
src/blocks/portal/java/org/apache/cocoon/environment/portlet
PortletEnvironment.java
src/blocks/scratchpad/java/org/apache/cocoon/components/source/impl
DelayRefresher.java
src/blocks/forms/java/org/apache/cocoon/forms/binding
RepeaterJXPathBinding.java
src/java/org/apache/cocoon Processor.java
src/blocks/forms/java/org/apache/cocoon/forms/transformation
EffectWidgetReplacingPipe.java
src/java/org/apache/cocoon/components/modules/input
AbstractMetaModule.java
Log:
clean up: imports, javadoc errors, unnecessary casts
Revision Changes Path
1.4 +2 -2
cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/LanguageSetImpl.java
Index: LanguageSetImpl.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/pluto/om/common/LanguageSetImpl.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- LanguageSetImpl.java 5 Mar 2004 13:02:15 -0000 1.3
+++ LanguageSetImpl.java 26 May 2004 01:31:05 -0000 1.4
@@ -61,7 +61,7 @@
{
LanguageImpl lang = new LanguageImpl(locale, bundle, title,
shortTitle, castorKeywords);
- return(Language)lang;
+ return lang;
}
/* never used
1.13 +2 -2
cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/transformation/EffectWidgetReplacingPipe.java
Index: EffectWidgetReplacingPipe.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/transformation/EffectWidgetReplacingPipe.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- EffectWidgetReplacingPipe.java 9 Mar 2004 13:54:12 -0000 1.12
+++ EffectWidgetReplacingPipe.java 26 May 2004 01:31:06 -0000 1.13
@@ -65,7 +65,7 @@
* Form location attribute on <code>wt:form-template</code> element,
containing
* JXPath expression which should result in Form object.
*
- * @see WoodyPipelineConfig#findForm
+ * @see WoodyPipelineConfig#findForm(String)
*/
private static final String LOCATION = "location";
1.11 +2 -2
cocoon-2.1/src/java/org/apache/cocoon/environment/wrapper/MutableEnvironmentFacade.java
Index: MutableEnvironmentFacade.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/environment/wrapper/MutableEnvironmentFacade.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- MutableEnvironmentFacade.java 25 May 2004 07:28:25 -0000 1.10
+++ MutableEnvironmentFacade.java 26 May 2004 01:31:06 -0000 1.11
@@ -24,7 +24,7 @@
/**
* Enviroment facade, whose delegate object can be changed. This class is
required to handle internal redirects
- * in sitemap sources ("cocoon:"). This is because [EMAIL PROTECTED]
org.apache.cocoon.components.source.SitemapSource} keeps
+ * in sitemap sources ("cocoon:"). This is because [EMAIL PROTECTED]
org.apache.cocoon.components.source.impl.SitemapSource} keeps
* the environment in which the internal request should be processed. But
internal redirects create a new
* processing environment and there's no way to change the one held by the
<code>SitemapSource</code>. So the
* processing of internal redirects actually changes the delegate of this
class, transparently for the
1.18 +2 -3
cocoon-2.1/src/java/org/apache/cocoon/environment/wrapper/EnvironmentWrapper.java
Index: EnvironmentWrapper.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/environment/wrapper/EnvironmentWrapper.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- EnvironmentWrapper.java 25 May 2004 07:28:25 -0000 1.17
+++ EnvironmentWrapper.java 26 May 2004 01:31:06 -0000 1.18
@@ -91,12 +91,11 @@
/**
* Constructor
* @param env
- * @param manager
* @param uri
* @param logger
* @throws MalformedURLException
*/
- public EnvironmentWrapper(Environment env, String uri, Logger logger)
throws MalformedURLException {
+ public EnvironmentWrapper(Environment env, String uri, Logger logger)
throws MalformedURLException {
super(env.getURI(), env.getView(), env.getAction());
SitemapSourceInfo info = SitemapSourceInfo.parseURI(env, uri);
1.10 +1 -4
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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- AO_FOM_JavaScriptInterpreter.java 5 Mar 2004 10:07:25 -0000 1.9
+++ AO_FOM_JavaScriptInterpreter.java 26 May 2004 01:31:06 -0000 1.10
@@ -294,7 +294,6 @@
* org.apache.cocoon.environment.Environment#getURIPrefix} method,
* can have a scope associated with it.
*
- * @param environment an <code>Environment</code> value
* @return a <code>Scriptable</code> value
*/
private Scriptable getSessionScope()
@@ -330,7 +329,6 @@
* prefix of the current sitemap, as returned by the [EMAIL PROTECTED]
* org.apache.cocoon.environment.Environment#getURIPrefix} method.
*
- * @param environment an <code>Environment</code> value
* @param scope a <code>Scriptable</code> value
*/
private Scriptable setSessionScope(Scriptable scope)
@@ -422,7 +420,6 @@
* newly create Scriptable object in the user's session, where it
* will be retrieved from at the next invocation of [EMAIL PROTECTED]
#callFunction}.</p>
*
- * @param environment an <code>Environment</code> value
* @exception Exception if an error occurs
*/
private void setupContext(Redirector redirector,
1.10 +0 -5
cocoon-2.1/src/test/org/apache/cocoon/environment/mock/MockEnvironment.java
Index: MockEnvironment.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/test/org/apache/cocoon/environment/mock/MockEnvironment.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- MockEnvironment.java 25 May 2004 07:28:25 -0000 1.9
+++ MockEnvironment.java 26 May 2004 01:31:06 -0000 1.10
@@ -18,7 +18,6 @@
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.OutputStream;
-import java.net.MalformedURLException;
import java.util.Enumeration;
import java.util.HashMap;
import java.util.Hashtable;
@@ -26,11 +25,7 @@
import junit.framework.AssertionFailedError;
-import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.environment.Environment;
-import org.apache.excalibur.source.SourceResolver;
-import org.xml.sax.ContentHandler;
-import org.xml.sax.SAXException;
public class MockEnvironment implements Environment {
1.6 +1 -3
cocoon-2.1/src/blocks/cron/java/org/apache/cocoon/environment/background/BackgroundEnvironment.java
Index: BackgroundEnvironment.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/cron/java/org/apache/cocoon/environment/background/BackgroundEnvironment.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- BackgroundEnvironment.java 25 May 2004 07:28:26 -0000 1.5
+++ BackgroundEnvironment.java 26 May 2004 01:31:06 -0000 1.6
@@ -18,7 +18,6 @@
import java.io.File;
import java.io.IOException;
import java.io.OutputStream;
-import java.net.MalformedURLException;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
@@ -93,7 +92,6 @@
* @param context
* @param stream
* @param log
- * @throws MalformedURLException
*/
public BackgroundEnvironment(String uri, String view, File context,
OutputStream stream, Logger log)
{
1.32 +1 -3
cocoon-2.1/src/java/org/apache/cocoon/components/treeprocessor/TreeProcessor.java
Index: TreeProcessor.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/treeprocessor/TreeProcessor.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- TreeProcessor.java 25 May 2004 14:24:01 -0000 1.31
+++ TreeProcessor.java 26 May 2004 01:31:06 -0000 1.32
@@ -187,8 +187,6 @@
/**
* Create a new child of this processor (used for mounting submaps).
*
- * @param manager the component manager to be used by the child
processor.
- * @param language the language to be used by the child processor.
* @return a new child processor.
*/
public TreeProcessor createChildProcessor(String src,
1.2 +2 -2
cocoon-2.1/src/java/org/apache/cocoon/environment/internal/EnvironmentHelper.java
Index: EnvironmentHelper.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/environment/internal/EnvironmentHelper.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- EnvironmentHelper.java 25 May 2004 07:28:25 -0000 1.1
+++ EnvironmentHelper.java 26 May 2004 01:31:06 -0000 1.2
@@ -275,7 +275,7 @@
/**
* This hook must be called by the sitemap each time a sitemap is left.
- * It's the counterpart to [EMAIL PROTECTED] #enterProcessor(Processor)}.
+ * It's the counterpart to [EMAIL PROTECTED] #enterProcessor(Processor,
ServiceManager, Environment)}.
*/
public static void leaveProcessor() {
final EnvironmentStack stack =
(EnvironmentStack)environmentStack.get();
1.21 +1 -2
cocoon-2.1/src/java/org/apache/cocoon/components/flow/AbstractInterpreter.java
Index: AbstractInterpreter.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/flow/AbstractInterpreter.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- AbstractInterpreter.java 4 May 2004 11:54:35 -0000 1.20
+++ AbstractInterpreter.java 26 May 2004 01:31:06 -0000 1.21
@@ -130,7 +130,6 @@
*
* @param source the location of the script
*
- * @see org.apache.cocoon.components.source.SourceFactory
* @see org.apache.cocoon.environment.Environment
* @see
org.apache.cocoon.components.source.impl.DelayedRefreshSourceWrapper
*/
1.2 +1 -2
cocoon-2.1/src/java/org/apache/cocoon/components/container/CocoonComponentManager.java
Index: CocoonComponentManager.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/container/CocoonComponentManager.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CocoonComponentManager.java 25 May 2004 07:28:24 -0000 1.1
+++ CocoonComponentManager.java 26 May 2004 01:31:06 -0000 1.2
@@ -18,7 +18,6 @@
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
-import java.util.List;
import java.util.Map;
import org.apache.avalon.excalibur.component.ExcaliburComponentManager;
1.5 +2 -2
cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/environment/portlet/PortletEnvironment.java
Index: PortletEnvironment.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/environment/portlet/PortletEnvironment.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- PortletEnvironment.java 25 May 2004 07:28:26 -0000 1.4
+++ PortletEnvironment.java 26 May 2004 01:31:06 -0000 1.5
@@ -250,7 +250,7 @@
* The returned stream is buffered by the environment. If the
* buffer size is -1 then the complete output is buffered.
* If the buffer size is 0, no buffering takes place.
- * This method replaces [EMAIL PROTECTED] #getOutputStream()}.
+ * This method replaces [EMAIL PROTECTED] #getOutputStream(int)}.
*/
public OutputStream getOutputStream(final int bufferSize) throws
IOException {
if (this.outputStream == null) {
1.7 +3 -4
cocoon-2.1/src/blocks/scratchpad/java/org/apache/cocoon/components/source/impl/DelayRefresher.java
Index: DelayRefresher.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/scratchpad/java/org/apache/cocoon/components/source/impl/DelayRefresher.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- DelayRefresher.java 25 Apr 2004 20:01:36 -0000 1.6
+++ DelayRefresher.java 26 May 2004 01:31:06 -0000 1.7
@@ -267,8 +267,7 @@
}
/**
- * @param childs
- * @param i
+ * @param conf
* @throws ConfigurationException
* @throws CascadingException
*/
@@ -331,7 +330,7 @@
/**
* @param writer
- * @param iter
+ * @param c
* @throws IOException
*/
private void writeRefreshJobConfiguration(Writer writer, final
TargetConfiguration c) throws IOException {
1.10 +2 -2
cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/binding/RepeaterJXPathBinding.java
Index: RepeaterJXPathBinding.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/binding/RepeaterJXPathBinding.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- RepeaterJXPathBinding.java 11 May 2004 08:22:54 -0000 1.9
+++ RepeaterJXPathBinding.java 26 May 2004 01:31:06 -0000 1.10
@@ -325,7 +325,7 @@
/**
* Get the identity of the given row. That's infact a list of all the
values
* of the fields in the form model that constitute the identity.
- * @param thisRow
+ * @param row
* @return List the identity of the row
*/
private List getIdentity(Repeater.RepeaterRow row) {
1.9 +2 -2 cocoon-2.1/src/java/org/apache/cocoon/Processor.java
Index: Processor.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/Processor.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Processor.java 25 May 2004 07:28:23 -0000 1.8
+++ Processor.java 26 May 2004 01:31:06 -0000 1.9
@@ -81,7 +81,7 @@
* Process the given <code>Environment</code> to assemble
* a <code>ProcessingPipeline</code>.
* Don't forget to release the pipeline using
- * [EMAIL PROTECTED] InternalPipelineDescription.release()}.
+ * [EMAIL PROTECTED] InternalPipelineDescription#release()}.
* @since 2.2
*/
InternalPipelineDescription buildPipeline(Environment environment)
1.14 +2 -2
cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/transformation/EffectWidgetReplacingPipe.java
Index: EffectWidgetReplacingPipe.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/transformation/EffectWidgetReplacingPipe.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- EffectWidgetReplacingPipe.java 7 May 2004 16:43:43 -0000 1.13
+++ EffectWidgetReplacingPipe.java 26 May 2004 01:31:06 -0000 1.14
@@ -66,7 +66,7 @@
* Form location attribute on <code>ft:form-template</code> element,
containing
* JXPath expression which should result in Form object.
*
- * @see FormsPipelineConfig#findForm
+ * @see FormsPipelineConfig#findForm(String)
*/
private static final String LOCATION = "location";
1.10 +2 -2
cocoon-2.1/src/java/org/apache/cocoon/components/modules/input/AbstractMetaModule.java
Index: AbstractMetaModule.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/modules/input/AbstractMetaModule.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- AbstractMetaModule.java 28 Apr 2004 18:13:38 -0000 1.9
+++ AbstractMetaModule.java 26 May 2004 01:31:06 -0000 1.10
@@ -298,7 +298,7 @@
* The second module (dynamic) is preferred if it has an non null name.
If
* an exception is encountered, a warn message is printed and null is
* returned.
- * @param op Operation to perform ([EMAIL PROTECTED] OP_GET}, [EMAIL
PROTECTED] OP_NAMES}, [EMAIL PROTECTED] OP_VALUES}).
+ * @param op Operation to perform ([EMAIL PROTECTED] #OP_GET}, [EMAIL
PROTECTED] #OP_NAMES}, [EMAIL PROTECTED] #OP_VALUES}).
*
* @return Either an Object, an Object[], or an Iterator, depending on
<code>op</code> param.
*/
