You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tapestry.apache.org by hl...@apache.org on 2006/04/08 23:14:33 UTC
svn commit: r392609 - in /jakarta/tapestry/trunk: ./
framework/src/java/org/apache/tapestry/form/
framework/src/java/org/apache/tapestry/services/impl/
Author: hlship
Date: Sat Apr 8 14:14:31 2006
New Revision: 392609
URL: http://svn.apache.org/viewcvs?rev=392609&view=rev
Log:
Remove explicit references to the Log4J API
Modified:
jakarta/tapestry/trunk/.checkstyle
jakarta/tapestry/trunk/.project
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/form/PropertySelection.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/impl/JSONResponseBuilder.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/impl/ResponseRendererImpl.java
Modified: jakarta/tapestry/trunk/.checkstyle
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/.checkstyle?rev=392609&r1=392608&r2=392609&view=diff
==============================================================================
--- jakarta/tapestry/trunk/.checkstyle (original)
+++ jakarta/tapestry/trunk/.checkstyle Sat Apr 8 14:14:31 2006
@@ -1,14 +1,14 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<fileset-config file-format-version="1.2.0" simple-config="true">
- <fileset name="all" enabled="true" check-config-name="tapestry" local="false">
- <file-match-pattern match-pattern="." include-pattern="true"/>
- </fileset>
- <filter name="FilesFromPackage" enabled="true">
- <filter-data value="framework/src/test"/>
- <filter-data value="contrib/src/test"/>
- <filter-data value="portlet/src/test"/>
- <filter-data value="annotations/src/test"/>
- <filter-data value="examples/Vlib/src/test"/>
- </filter>
- <filter name="NonSrcDirs" enabled="true"/>
-</fileset-config>
+<?xml version="1.0" encoding="UTF-8"?>
+<fileset-config file-format-version="1.2.0" simple-config="true">
+ <fileset name="all" enabled="true" check-config-name="Sun Checks" local="false">
+ <file-match-pattern match-pattern="." include-pattern="true"/>
+ </fileset>
+ <filter name="FilesFromPackage" enabled="true">
+ <filter-data value="framework/src/test"/>
+ <filter-data value="contrib/src/test"/>
+ <filter-data value="portlet/src/test"/>
+ <filter-data value="annotations/src/test"/>
+ <filter-data value="examples/Vlib/src/test"/>
+ </filter>
+ <filter name="NonSrcDirs" enabled="true"/>
+</fileset-config>
Modified: jakarta/tapestry/trunk/.project
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/.project?rev=392609&r1=392608&r2=392609&view=diff
==============================================================================
Binary files - no diff available.
Modified: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/form/PropertySelection.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/form/PropertySelection.java?rev=392609&r1=392608&r2=392609&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/form/PropertySelection.java (original)
+++ jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/form/PropertySelection.java Sat Apr 8 14:14:31 2006
@@ -17,7 +17,8 @@
import java.util.HashMap;
import java.util.Map;
-import org.apache.log4j.Logger;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.tapestry.IDirect;
import org.apache.tapestry.IJSONRender;
import org.apache.tapestry.IMarkupWriter;
@@ -62,7 +63,7 @@
implements ValidatableField, IJSONRender, IDirect
{
/* logger */
- protected static final Logger _log = Logger.getLogger(PropertySelection.class);
+ protected static final Log _log = LogFactory.getLog(PropertySelection.class);
/**
* @see org.apache.tapestry.form.AbstractFormComponent#renderFormComponent(org.apache.tapestry.IMarkupWriter, org.apache.tapestry.IRequestCycle)
Modified: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/impl/JSONResponseBuilder.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/impl/JSONResponseBuilder.java?rev=392609&r1=392608&r2=392609&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/impl/JSONResponseBuilder.java (original)
+++ jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/impl/JSONResponseBuilder.java Sat Apr 8 14:14:31 2006
@@ -16,8 +16,9 @@
import java.util.ArrayList;
import java.util.List;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.hivemind.util.Defense;
-import org.apache.log4j.Logger;
import org.apache.tapestry.IComponent;
import org.apache.tapestry.IJSONRender;
import org.apache.tapestry.IMarkupWriter;
@@ -28,7 +29,6 @@
import org.apache.tapestry.services.ResponseBuilder;
import org.apache.tapestry.services.ServiceConstants;
-
/**
* Class that implements JSON responses in tapestry.
*
@@ -37,78 +37,82 @@
*/
public class JSONResponseBuilder implements ResponseBuilder
{
- /* logger */
- protected static final Logger _log = Logger.getLogger(JSONResponseBuilder.class);
-
+ private static final Log _log = LogFactory.getLog(JSONResponseBuilder.class);
+
/** Writer that creates JSON output response. */
protected IJSONWriter _writer;
/** Passed in to bypass normal rendering. */
protected IMarkupWriter _nullWriter = NullWriter.getSharedInstance();
-
+
/** Parts that will be updated. */
protected List parts = new ArrayList();
-
+
/**
- * Creates a new JSON response builder with a valid
- * writer for persisting output to the response stream.
+ * Creates a new JSON response builder with a valid writer for persisting
+ * output to the response stream.
*
* @param writer
- * The response writer used to render the response.
+ * The response writer used to render the response.
*/
public JSONResponseBuilder(IJSONWriter writer)
{
Defense.notNull(writer, "writer");
-
+
_writer = writer;
}
-
+
/**
- *
* {@inheritDoc}
*/
public void renderResponse(IRequestCycle cycle)
{
_log.warn("renderResponse()");
parseParameters(cycle);
-
+
cycle.renderPage(this);
-
+
_writer.close();
}
-
+
/**
- * Grabs the incoming parameters needed for json responses,
- * most notable the {@link ServiceConstants#UPDATE_PARTS} parameter.
- * @param cycle The request cycle to parse from
+ * Grabs the incoming parameters needed for json responses, most notable the
+ * {@link ServiceConstants#UPDATE_PARTS} parameter.
+ *
+ * @param cycle
+ * The request cycle to parse from
*/
protected void parseParameters(IRequestCycle cycle)
{
- Object[] updateParts = cycle.getParameters(ServiceConstants.UPDATE_PARTS);
- for (int i = 0; i < updateParts.length; i++)
+ Object[] updateParts = cycle
+ .getParameters(ServiceConstants.UPDATE_PARTS);
+ for(int i = 0; i < updateParts.length; i++)
parts.add(updateParts[i].toString());
}
-
- /**
+
+ /**
* {@inheritDoc}
*/
public void render(IRender render, IRequestCycle cycle)
{
- if (IJSONRender.class.isInstance(render) && IComponent.class.isInstance(render)) {
- IJSONRender json = (IJSONRender)render;
- IComponent component = (IComponent)render;
-
- if (!parts.contains(component.getId())) {
+ if (IJSONRender.class.isInstance(render)
+ && IComponent.class.isInstance(render))
+ {
+ IJSONRender json = (IJSONRender) render;
+ IComponent component = (IComponent) render;
+
+ if (!parts.contains(component.getId()))
+ {
render.render(_nullWriter, cycle);
return;
}
-
+
json.renderComponent(_writer, cycle);
}
-
+
render.render(_nullWriter, cycle);
}
-
- /**
+
+ /**
* {@inheritDoc}
*/
public IMarkupWriter getWriter()
Modified: jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/impl/ResponseRendererImpl.java
URL: http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/impl/ResponseRendererImpl.java?rev=392609&r1=392608&r2=392609&view=diff
==============================================================================
--- jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/impl/ResponseRendererImpl.java (original)
+++ jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/services/impl/ResponseRendererImpl.java Sat Apr 8 14:14:31 2006
@@ -16,7 +16,7 @@
import java.io.IOException;
-import org.apache.log4j.Logger;
+import org.apache.commons.logging.Log;
import org.apache.tapestry.IRequestCycle;
import org.apache.tapestry.services.ResponseBuilder;
import org.apache.tapestry.services.ResponseDelegateFactory;
@@ -29,23 +29,48 @@
* @since 4.0
*/
public class ResponseRendererImpl implements ResponseRenderer
-{
- /* logger */
- protected static final Logger _log = Logger.getLogger(ResponseRendererImpl.class);
-
- protected ResponseDelegateFactory _responseDelegate;
-
- public void renderResponse(IRequestCycle cycle) throws IOException
- {
- ResponseBuilder builder = _responseDelegate.getResponseBuilder(cycle);
-
+{
+
+ private Log _log;
+
+ private ResponseDelegateFactory _responseDelegateFactory;
+
+ public void renderResponse(IRequestCycle cycle)
+ throws IOException
+ {
+ ResponseBuilder builder = getResponseDelegateFactory().getResponseBuilder(
+ cycle);
+
cycle.setResponseBuilder(builder);
-
+
builder.renderResponse(cycle);
}
-
- public void setResponseDelegate(ResponseDelegateFactory responseDelegate)
+
+ /** For subclass access to the injected Log. */
+ public Log getLog()
+ {
+ return _log;
+ }
+
+ /** For injection. */
+ public final void setLog(Log log)
+ {
+ _log = log;
+ }
+
+ /**
+ * For injection.
+ */
+ public void setResponseDelegateFactory(ResponseDelegateFactory responseDelegate)
+ {
+ _responseDelegateFactory = responseDelegate;
+ }
+
+ /**
+ * For subclass access.
+ */
+ public ResponseDelegateFactory getResponseDelegateFactory()
{
- _responseDelegate = responseDelegate;
+ return _responseDelegateFactory;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: tapestry-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tapestry-dev-help@jakarta.apache.org