You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by cz...@apache.org on 2005/12/30 18:50:00 UTC
svn commit: r360122 - in /cocoon/blocks:
cron/trunk/java/org/apache/cocoon/components/cron/
databases/trunk/java/org/apache/cocoon/util/
forms/trunk/java/org/apache/cocoon/forms/binding/
forms/trunk/java/org/apache/cocoon/forms/datatype/typeimpl/ forms...
Author: cziegeler
Date: Fri Dec 30 09:47:33 2005
New Revision: 360122
URL: http://svn.apache.org/viewcvs?rev=360122&view=rev
Log:
Clean up code
Modified:
cocoon/blocks/cron/trunk/java/org/apache/cocoon/components/cron/QuartzJobScheduler.java
cocoon/blocks/databases/trunk/java/org/apache/cocoon/util/JDBCTypeConversions.java
cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/binding/MultiValueJXPathBinding.java
cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/binding/RepeaterJXPathBinding.java
cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/datatype/typeimpl/BeanType.java
cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/formmodel/Form.java
cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/formmodel/tree/builder/TreeDefinitionBuilder.java
cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/generation/JXMacrosHelper.java (contents, props changed)
cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/util/JavaScriptHelper.java
cocoon/blocks/naming/trunk/java/org/apache/cocoon/components/naming/LDAPEntryManager.java
cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/profile/impl/MapProfileLS.java
cocoon/blocks/profiler/trunk/java/org/apache/cocoon/profiler/debugging/Client.java
cocoon/blocks/scratchpad/trunk/java/org/apache/cocoon/components/flow/javascript/fom/AO_FOM_JavaScriptInterpreter.java
cocoon/blocks/template/trunk/java/org/apache/cocoon/template/instruction/Define.java
cocoon/blocks/template/trunk/java/org/apache/cocoon/template/instruction/ForEach.java
cocoon/blocks/template/trunk/java/org/apache/cocoon/template/instruction/FormatNumber.java
Modified: cocoon/blocks/cron/trunk/java/org/apache/cocoon/components/cron/QuartzJobScheduler.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/cron/trunk/java/org/apache/cocoon/components/cron/QuartzJobScheduler.java?rev=360122&r1=360121&r2=360122&view=diff
==============================================================================
--- cocoon/blocks/cron/trunk/java/org/apache/cocoon/components/cron/QuartzJobScheduler.java (original)
+++ cocoon/blocks/cron/trunk/java/org/apache/cocoon/components/cron/QuartzJobScheduler.java Fri Dec 30 09:47:33 2005
@@ -555,7 +555,7 @@
jobDataMap.put(DATA_MAP_LOGGER, getLogger());
jobDataMap.put(DATA_MAP_CONTEXT, this.context);
jobDataMap.put(DATA_MAP_MANAGER, this.manager);
- jobDataMap.put(DATA_MAP_RUN_CONCURRENT, (Object)(concurent? Boolean.TRUE: Boolean.FALSE));
+ jobDataMap.put(DATA_MAP_RUN_CONCURRENT, (concurent? Boolean.TRUE: Boolean.FALSE));
if (null != params) {
jobDataMap.put(DATA_MAP_PARAMETERS, params);
}
Modified: cocoon/blocks/databases/trunk/java/org/apache/cocoon/util/JDBCTypeConversions.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/databases/trunk/java/org/apache/cocoon/util/JDBCTypeConversions.java?rev=360122&r1=360121&r2=360122&view=diff
==============================================================================
--- cocoon/blocks/databases/trunk/java/org/apache/cocoon/util/JDBCTypeConversions.java (original)
+++ cocoon/blocks/databases/trunk/java/org/apache/cocoon/util/JDBCTypeConversions.java Fri Dec 30 09:47:33 2005
@@ -28,7 +28,6 @@
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
-import java.sql.Struct;
import java.sql.Time;
import java.sql.Timestamp;
import java.sql.Types;
@@ -210,7 +209,7 @@
value = new Boolean(set.getBoolean(dbcol));
break;
case Types.STRUCT:
- value = (Struct) set.getObject(dbcol);
+ value = set.getObject(dbcol);
break;
case Types.OTHER:
value = set.getObject(dbcol);
Modified: cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/binding/MultiValueJXPathBinding.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/binding/MultiValueJXPathBinding.java?rev=360122&r1=360121&r2=360122&view=diff
==============================================================================
--- cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/binding/MultiValueJXPathBinding.java (original)
+++ cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/binding/MultiValueJXPathBinding.java Fri Dec 30 09:47:33 2005
@@ -15,16 +15,13 @@
*/
package org.apache.cocoon.forms.binding;
-import java.util.ArrayList;
-import java.util.Collections;
import java.util.Iterator;
import java.util.LinkedList;
-import java.util.List;
import java.util.Locale;
import org.apache.avalon.framework.logger.Logger;
-import org.apache.cocoon.forms.datatype.convertor.Convertor;
import org.apache.cocoon.forms.datatype.convertor.ConversionResult;
+import org.apache.cocoon.forms.datatype.convertor.Convertor;
import org.apache.cocoon.forms.formmodel.Widget;
import org.apache.commons.jxpath.JXPathContext;
import org.apache.commons.jxpath.Pointer;
Modified: cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/binding/RepeaterJXPathBinding.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/binding/RepeaterJXPathBinding.java?rev=360122&r1=360121&r2=360122&view=diff
==============================================================================
--- cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/binding/RepeaterJXPathBinding.java (original)
+++ cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/binding/RepeaterJXPathBinding.java Fri Dec 30 09:47:33 2005
@@ -100,7 +100,7 @@
public String getInsertRowPath() { return rowPathForInsert; }
public ComposedJXPathBindingBase getRowBinding() { return (ComposedJXPathBindingBase)rowBinding; }
public ComposedJXPathBindingBase getDeleteRowBinding() { return (ComposedJXPathBindingBase)deleteRowBinding; }
- public ComposedJXPathBindingBase getIdentityBinding() { return (ComposedJXPathBindingBase)identityBinding; }
+ public ComposedJXPathBindingBase getIdentityBinding() { return identityBinding; }
public JXPathBindingBase getInsertRowBinding() { return insertRowBinding; }
/**
Modified: cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/datatype/typeimpl/BeanType.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/datatype/typeimpl/BeanType.java?rev=360122&r1=360121&r2=360122&view=diff
==============================================================================
--- cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/datatype/typeimpl/BeanType.java (original)
+++ cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/datatype/typeimpl/BeanType.java Fri Dec 30 09:47:33 2005
@@ -24,9 +24,7 @@
* @version $Id$
*/
public class BeanType
- extends AbstractDatatype
-{
- //~ Constructors -----------------------------------------------------------
+ extends AbstractDatatype {
/**
* Creates a new BeanType object.
@@ -35,23 +33,16 @@
* @param builder The {@link BeanTypeBuilder}
*/
public BeanType( final boolean arrayType,
- final BeanTypeBuilder builder )
- {
- super( );
+ final BeanTypeBuilder builder ) {
setArrayType( arrayType );
setBuilder( builder );
}
- //~ Methods ----------------------------------------------------------------
-
/**
* @see org.apache.cocoon.forms.datatype.Datatype#getDescriptiveName()
*/
- public String getDescriptiveName( )
- {
- final Class c1 = this.getConvertor( ).getTypeClass( );
-
- return this.getConvertor( ).getTypeClass( ).getName( );
+ public String getDescriptiveName() {
+ return this.getConvertor().getTypeClass().getName();
}
/**
@@ -59,16 +50,14 @@
*
* @return The convertor
*/
- public Convertor getPlainConvertor( )
- {
- return getConvertor( );
+ public Convertor getPlainConvertor() {
+ return getConvertor();
}
/**
* @see org.apache.cocoon.forms.datatype.Datatype#getTypeClass()
*/
- public Class getTypeClass( )
- {
- return this.getConvertor( ).getTypeClass( );
+ public Class getTypeClass() {
+ return this.getConvertor().getTypeClass();
}
}
Modified: cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/formmodel/Form.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/formmodel/Form.java?rev=360122&r1=360121&r2=360122&view=diff
==============================================================================
--- cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/formmodel/Form.java (original)
+++ cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/formmodel/Form.java Fri Dec 30 09:47:33 2005
@@ -18,7 +18,6 @@
import java.util.HashSet;
import java.util.Locale;
import java.util.Set;
-import java.util.StringTokenizer;
import org.apache.cocoon.forms.FormContext;
import org.apache.cocoon.forms.event.FormHandler;
Modified: cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/formmodel/tree/builder/TreeDefinitionBuilder.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/formmodel/tree/builder/TreeDefinitionBuilder.java?rev=360122&r1=360121&r2=360122&view=diff
==============================================================================
--- cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/formmodel/tree/builder/TreeDefinitionBuilder.java (original)
+++ cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/formmodel/tree/builder/TreeDefinitionBuilder.java Fri Dec 30 09:47:33 2005
@@ -19,7 +19,6 @@
import org.apache.avalon.framework.service.ServiceSelector;
import org.apache.cocoon.forms.FormsConstants;
-import org.apache.cocoon.forms.event.ValueChangedListener;
import org.apache.cocoon.forms.formmodel.AbstractWidgetDefinitionBuilder;
import org.apache.cocoon.forms.formmodel.WidgetDefinition;
import org.apache.cocoon.forms.formmodel.tree.Tree;
Modified: cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/generation/JXMacrosHelper.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/generation/JXMacrosHelper.java?rev=360122&r1=360121&r2=360122&view=diff
==============================================================================
--- cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/generation/JXMacrosHelper.java (original)
+++ cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/generation/JXMacrosHelper.java Fri Dec 30 09:47:33 2005
@@ -30,7 +30,6 @@
import org.apache.cocoon.forms.formmodel.Form;
import org.apache.cocoon.forms.formmodel.Repeater;
import org.apache.cocoon.forms.formmodel.Widget;
-import org.apache.cocoon.forms.formmodel.WidgetState;
import org.apache.cocoon.forms.formmodel.tree.Tree;
import org.apache.cocoon.forms.formmodel.tree.TreeWalker;
import org.apache.cocoon.forms.validation.ValidationError;
Propchange: cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/generation/JXMacrosHelper.java
------------------------------------------------------------------------------
svn:keywords = Id
Modified: cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/util/JavaScriptHelper.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/util/JavaScriptHelper.java?rev=360122&r1=360121&r2=360122&view=diff
==============================================================================
--- cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/util/JavaScriptHelper.java (original)
+++ cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/util/JavaScriptHelper.java Fri Dec 30 09:47:33 2005
@@ -58,7 +58,6 @@
Script script;
try {
script = ctx.compileReader(
- getRootScope(), //scope
new StringReader(jsText), // in
sourceName == null ? "<unknown>" : sourceName, // sourceName
DomHelper.getLineLocation(element), // lineNo
Modified: cocoon/blocks/naming/trunk/java/org/apache/cocoon/components/naming/LDAPEntryManager.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/naming/trunk/java/org/apache/cocoon/components/naming/LDAPEntryManager.java?rev=360122&r1=360121&r2=360122&view=diff
==============================================================================
--- cocoon/blocks/naming/trunk/java/org/apache/cocoon/components/naming/LDAPEntryManager.java (original)
+++ cocoon/blocks/naming/trunk/java/org/apache/cocoon/components/naming/LDAPEntryManager.java Fri Dec 30 09:47:33 2005
@@ -54,7 +54,6 @@
/* internal state */
private boolean disposed = false;
- private boolean recycled = false;
/* internal instance variables */
protected DirContext context = null;
@@ -109,7 +108,6 @@
} finally {
this.context = null;
}
- this.recycled = true;
}
/* Avalon, Dispose of this Class */
@@ -280,7 +278,7 @@
Iterator vals = ((List)map.get (key)).iterator ();
Attribute attr = new BasicAttribute (key);
while (vals.hasNext ()) {
- attr.add ((String)vals.next ());
+ attr.add (vals.next ());
}
attrs.put (attr);
}
Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/profile/impl/MapProfileLS.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/profile/impl/MapProfileLS.java?rev=360122&r1=360121&r2=360122&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/profile/impl/MapProfileLS.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/profile/impl/MapProfileLS.java Fri Dec 30 09:47:33 2005
@@ -127,12 +127,6 @@
return buffer.toString();
}
- protected StringBuffer getSaveURI(Map keyMap)
- throws Exception {
- final StringBuffer buffer = new StringBuffer(this.getURI(keyMap));
- return buffer;
- }
-
/**
* @see org.apache.cocoon.portal.profile.ProfileLS#loadProfile(java.lang.Object, java.util.Map)
*/
@@ -151,7 +145,7 @@
(Map)parameters.get(PARAMETER_OBJECTMAP),
null);
} finally {
- resolver.release(source);
+ this.resolver.release(source);
}
}
@@ -179,7 +173,7 @@
source = null;
}
- final StringBuffer buffer = this.getSaveURI( keyMap );
+ final StringBuffer buffer = new StringBuffer(uri);
SAXParser parser = null;
try {
ByteArrayOutputStream writer = new ByteArrayOutputStream();
@@ -204,8 +198,8 @@
}
} finally {
- resolver.release(source);
- manager.release(parser);
+ this.resolver.release(source);
+ this.manager.release(parser);
}
}
@@ -225,7 +219,7 @@
getLogger().warn(e.getMessage(), e);
return null;
} finally {
- resolver.release(source);
+ this.resolver.release(source);
}
}
}
Modified: cocoon/blocks/profiler/trunk/java/org/apache/cocoon/profiler/debugging/Client.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/profiler/trunk/java/org/apache/cocoon/profiler/debugging/Client.java?rev=360122&r1=360121&r2=360122&view=diff
==============================================================================
--- cocoon/blocks/profiler/trunk/java/org/apache/cocoon/profiler/debugging/Client.java (original)
+++ cocoon/blocks/profiler/trunk/java/org/apache/cocoon/profiler/debugging/Client.java Fri Dec 30 09:47:33 2005
@@ -28,7 +28,7 @@
/**
* This is a simple cli client for the {@link Debugger}.
* @since 2.2
- * @version $Id:$
+ * @version $Id$
*/
public class Client implements Runnable {
@@ -153,8 +153,7 @@
URL url = new URL(buffer.toString());
InputStream is = url.openConnection().getInputStream();
byte[] b = new byte[4096];
- int length;
- while ((length = is.read(b)) > -1) {
+ while (is.read(b) > -1) {
// ignore content
}
is.close();
Modified: cocoon/blocks/scratchpad/trunk/java/org/apache/cocoon/components/flow/javascript/fom/AO_FOM_JavaScriptInterpreter.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/scratchpad/trunk/java/org/apache/cocoon/components/flow/javascript/fom/AO_FOM_JavaScriptInterpreter.java?rev=360122&r1=360121&r2=360122&view=diff
==============================================================================
--- cocoon/blocks/scratchpad/trunk/java/org/apache/cocoon/components/flow/javascript/fom/AO_FOM_JavaScriptInterpreter.java (original)
+++ cocoon/blocks/scratchpad/trunk/java/org/apache/cocoon/components/flow/javascript/fom/AO_FOM_JavaScriptInterpreter.java Fri Dec 30 09:47:33 2005
@@ -553,14 +553,14 @@
throw new ResourceNotFoundException(src.getURI() + ": not found");
}
Reader reader = new BufferedReader(new InputStreamReader(is));
- compiledScript = cx.compileReader(scope, reader, src.getURI(), 1, null );
+ compiledScript = cx.compileReader(reader, src.getURI(), 1, null );
}
// script applied
else {
this.getLogger().info( "Adding interceptions to script " + src.getURI() );
Reader reader = new BufferedReader(
aspectWeaver.getInterceptedScriptAsReader() );
- compiledScript = cx.compileReader(scope, reader, src.getURI() + INTERCEPTION_POSTFIX, 1, null );
+ compiledScript = cx.compileReader(reader, src.getURI() + INTERCEPTION_POSTFIX, 1, null );
}
return compiledScript;
}
@@ -628,12 +628,12 @@
throw new CascadingRuntimeException(ee.getMessage(), unwrapped);
} catch (EcmaError ee) {
String msg = ToolErrorReporter.getMessage("msg.uncaughtJSException", ee.toString());
- if (ee.getSourceName() != null) {
+ if (ee.sourceName() != null) {
Context.reportRuntimeError(msg,
- ee.getSourceName(),
- ee.getLineNumber(),
- ee.getLineSource(),
- ee.getColumnNumber());
+ ee.sourceName(),
+ ee.lineNumber(),
+ ee.lineSource(),
+ ee.columnNumber());
} else {
Context.reportRuntimeError(msg);
}
@@ -710,12 +710,12 @@
throw new CascadingRuntimeException(ee.getMessage(), unwrapped);
} catch (EcmaError ee) {
String msg = ToolErrorReporter.getMessage("msg.uncaughtJSException", ee.toString());
- if (ee.getSourceName() != null) {
+ if (ee.sourceName() != null) {
Context.reportRuntimeError(msg,
- ee.getSourceName(),
- ee.getLineNumber(),
- ee.getLineSource(),
- ee.getColumnNumber());
+ ee.sourceName(),
+ ee.lineNumber(),
+ ee.lineSource(),
+ ee.columnNumber());
} else {
Context.reportRuntimeError(msg);
}
Modified: cocoon/blocks/template/trunk/java/org/apache/cocoon/template/instruction/Define.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/template/trunk/java/org/apache/cocoon/template/instruction/Define.java?rev=360122&r1=360121&r2=360122&view=diff
==============================================================================
--- cocoon/blocks/template/trunk/java/org/apache/cocoon/template/instruction/Define.java (original)
+++ cocoon/blocks/template/trunk/java/org/apache/cocoon/template/instruction/Define.java Fri Dec 30 09:47:33 2005
@@ -122,10 +122,6 @@
return parameters;
}
- private void setBody(Event body) {
- this.body = body;
- }
-
public Event getBody() {
return body;
}
Modified: cocoon/blocks/template/trunk/java/org/apache/cocoon/template/instruction/ForEach.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/template/trunk/java/org/apache/cocoon/template/instruction/ForEach.java?rev=360122&r1=360121&r2=360122&view=diff
==============================================================================
--- cocoon/blocks/template/trunk/java/org/apache/cocoon/template/instruction/ForEach.java (original)
+++ cocoon/blocks/template/trunk/java/org/apache/cocoon/template/instruction/ForEach.java Fri Dec 30 09:47:33 2005
@@ -44,7 +44,6 @@
private final JXTExpression begin;
private final JXTExpression end;
private final JXTExpression step;
- private final Boolean lenient;
public ForEach(ParsingContext parsingContext, StartElement raw, Attributes attrs, Stack stack)
throws SAXException {
@@ -63,8 +62,6 @@
this.begin = expressionCompiler.compileInt(attrs.getValue("begin"), name, locator);
this.end = expressionCompiler.compileInt(attrs.getValue("end"), name, locator);
this.step = expressionCompiler.compileInt(attrs.getValue("step"), name, locator);
- String lenientValue = attrs.getValue("lenient");
- this.lenient = (lenientValue == null) ? null : Boolean.valueOf(lenientValue);
if (items == null) {
if (select == null && (begin == null || end == null)) {
Modified: cocoon/blocks/template/trunk/java/org/apache/cocoon/template/instruction/FormatNumber.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/template/trunk/java/org/apache/cocoon/template/instruction/FormatNumber.java?rev=360122&r1=360121&r2=360122&view=diff
==============================================================================
--- cocoon/blocks/template/trunk/java/org/apache/cocoon/template/instruction/FormatNumber.java (original)
+++ cocoon/blocks/template/trunk/java/org/apache/cocoon/template/instruction/FormatNumber.java Fri Dec 30 09:47:33 2005
@@ -51,7 +51,6 @@
private JXTExpression minIntegerDigits;
private JXTExpression maxFractionDigits;
private JXTExpression minFractionDigits;
- private JXTExpression locale;
private JXTExpression var;