You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tapestry.apache.org by jk...@apache.org on 2006/05/08 21:14:59 UTC
svn commit: r405136 - in /tapestry/tapestry4/trunk: ./ .settings/
contrib/src/java/org/apache/tapestry/contrib/table/components/
framework/src/descriptor/META-INF/
framework/src/java/org/apache/tapestry/engine/
framework/src/java/org/apache/tapestry/js...
Author: jkuhnert
Date: Mon May 8 12:14:56 2006
New Revision: 405136
URL: http://svn.apache.org/viewcvs?rev=405136&view=rev
Log:
Removed last set of checkstyle warnings. Only a few info's hanging around now.
Modified:
tapestry/tapestry4/trunk/.settings/org.eclipse.wst.validation.prefs
tapestry/tapestry4/trunk/contrib/src/java/org/apache/tapestry/contrib/table/components/TableColumnModelSourceImpl.java
tapestry/tapestry4/trunk/framework/src/descriptor/META-INF/tapestry.page.xml
tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/engine/RequestCycle.java
tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/json/JSONObject.java
tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/pageload/PageLoader.java
tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/record/PageRecorderImpl.java
tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/wml/pages/WMLException.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/record/TestPageRecorder.java
tapestry/tapestry4/trunk/tapestry-checkstyle.xml
Modified: tapestry/tapestry4/trunk/.settings/org.eclipse.wst.validation.prefs
URL: http://svn.apache.org/viewcvs/tapestry/tapestry4/trunk/.settings/org.eclipse.wst.validation.prefs?rev=405136&r1=405135&r2=405136&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/.settings/org.eclipse.wst.validation.prefs (original)
+++ tapestry/tapestry4/trunk/.settings/org.eclipse.wst.validation.prefs Mon May 8 12:14:56 2006
@@ -1,6 +1,6 @@
-#Fri May 05 20:16:15 EDT 2006
+#Sun May 07 00:30:31 EDT 2006
DELEGATES_PREFERENCE=delegateValidatorListorg.eclipse.wst.wsdl.validation.internal.eclipse.WSDLDelegatingValidator\=org.eclipse.wst.wsdl.validation.internal.eclipse.Validator;org.eclipse.wst.xsd.core.internal.validation.eclipse.XSDDelegatingValidator\=org.eclipse.wst.xsd.core.internal.validation.eclipse.Validator;
-USER_BUILD_PREFERENCE=enabledBuildValidatorListorg.eclipse.jst.jsp.core.internal.validation.JSPJavaValidator;org.eclipse.wst.wsdl.validation.internal.eclipse.WSDLDelegatingValidator;org.eclipse.wst.xsd.core.internal.validation.eclipse.XSDDelegatingValidator;org.eclipse.jst.jsp.core.internal.validation.JSPELValidator;org.eclipse.wst.dtd.core.internal.validation.eclipse.Validator;org.eclipse.wst.xml.core.internal.validation.eclipse.Validator;org.eclipse.wst.wsi.ui.internal.WSIMessageValidator;org.eclipse.wst.html.internal.validation.HTMLValidator;org.eclipse.jst.jsp.core.internal.validation.JSPDirectiveValidator;
-USER_MANUAL_PREFERENCE=enabledManualValidatorListorg.eclipse.jst.jsp.core.internal.validation.JSPJavaValidator;org.eclipse.wst.wsdl.validation.internal.eclipse.WSDLDelegatingValidator;org.eclipse.wst.xsd.core.internal.validation.eclipse.XSDDelegatingValidator;org.eclipse.jst.jsp.core.internal.validation.JSPELValidator;org.eclipse.wst.dtd.core.internal.validation.eclipse.Validator;org.eclipse.wst.xml.core.internal.validation.eclipse.Validator;org.eclipse.wst.wsi.ui.internal.WSIMessageValidator;org.eclipse.wst.html.internal.validation.HTMLValidator;org.eclipse.jst.jsp.core.internal.validation.JSPDirectiveValidator;
+USER_BUILD_PREFERENCE=enabledBuildValidatorListorg.eclipse.wst.html.internal.validation.HTMLValidator;org.eclipse.jst.jsp.core.internal.validation.JSPDirectiveValidator;org.eclipse.wst.wsdl.validation.internal.eclipse.WSDLDelegatingValidator;org.eclipse.wst.xml.core.internal.validation.eclipse.Validator;org.eclipse.wst.dtd.core.internal.validation.eclipse.Validator;org.eclipse.wst.wsi.ui.internal.WSIMessageValidator;org.eclipse.jst.jsp.core.internal.validation.JSPELValidator;org.eclipse.jst.jsp.core.internal.validation.JSPJavaValidator;org.eclipse.wst.xsd.core.internal.validation.eclipse.XSDDelegatingValidator;
+USER_MANUAL_PREFERENCE=enabledManualValidatorListorg.eclipse.wst.html.internal.validation.HTMLValidator;org.eclipse.jst.jsp.core.internal.validation.JSPDirectiveValidator;org.eclipse.wst.wsdl.validation.internal.eclipse.WSDLDelegatingValidator;org.eclipse.wst.xml.core.internal.validation.eclipse.Validator;org.eclipse.wst.dtd.core.internal.validation.eclipse.Validator;org.eclipse.wst.wsi.ui.internal.WSIMessageValidator;org.eclipse.jst.jsp.core.internal.validation.JSPELValidator;org.eclipse.jst.jsp.core.internal.validation.JSPJavaValidator;org.eclipse.wst.xsd.core.internal.validation.eclipse.XSDDelegatingValidator;
USER_PREFERENCE=overrideGlobalPreferencesfalse
eclipse.preferences.version=1
Modified: tapestry/tapestry4/trunk/contrib/src/java/org/apache/tapestry/contrib/table/components/TableColumnModelSourceImpl.java
URL: http://svn.apache.org/viewcvs/tapestry/tapestry4/trunk/contrib/src/java/org/apache/tapestry/contrib/table/components/TableColumnModelSourceImpl.java?rev=405136&r1=405135&r2=405136&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/contrib/src/java/org/apache/tapestry/contrib/table/components/TableColumnModelSourceImpl.java (original)
+++ tapestry/tapestry4/trunk/contrib/src/java/org/apache/tapestry/contrib/table/components/TableColumnModelSourceImpl.java Mon May 8 12:14:56 2006
@@ -71,15 +71,15 @@
List arrColumns = new ArrayList();
- strDesc = strDesc.trim();
+ String desc = strDesc.trim();
boolean bFormColumns = false;
- while(strDesc.startsWith("*"))
+ while(desc.startsWith("*"))
{
- strDesc = strDesc.substring(1);
+ desc = desc.substring(1);
bFormColumns = true;
}
- StringTokenizer objTokenizer = new StringTokenizer(strDesc, ",");
+ StringTokenizer objTokenizer = new StringTokenizer(desc, ",");
while(objTokenizer.hasMoreTokens())
{
String strToken = objTokenizer.nextToken().trim();
Modified: tapestry/tapestry4/trunk/framework/src/descriptor/META-INF/tapestry.page.xml
URL: http://svn.apache.org/viewcvs/tapestry/tapestry4/trunk/framework/src/descriptor/META-INF/tapestry.page.xml?rev=405136&r1=405135&r2=405136&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/descriptor/META-INF/tapestry.page.xml (original)
+++ tapestry/tapestry4/trunk/framework/src/descriptor/META-INF/tapestry.page.xml Mon May 8 12:14:56 2006
@@ -41,7 +41,6 @@
<set-service property="componentTemplateLoader" service-id="ComponentTemplateLoader"/>
<set-service property="establishDefaultParameterValuesVisitor"
service-id="EstablishDefaultParameterValuesVisitor"/>
- <set-object property="valueConverter" value="infrastructure:valueConverter"/>
<set-service property="assetSource" service-id="tapestry.asset.AssetSource"/>
<set-service property="pageClassProvider" service-id="PageClassProvider"/>
<set-service property="componentClassProvider" service-id="ComponentClassProvider"/>
Modified: tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/engine/RequestCycle.java
URL: http://svn.apache.org/viewcvs/tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/engine/RequestCycle.java?rev=405136&r1=405135&r2=405136&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/engine/RequestCycle.java (original)
+++ tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/engine/RequestCycle.java Mon May 8 12:14:56 2006
@@ -282,7 +282,7 @@
if (result == null)
{
- result = new PageRecorderImpl(name, this, _strategySource, _log);
+ result = new PageRecorderImpl(name, _strategySource, _log);
_pageRecorders.put(name, result);
}
Modified: tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/json/JSONObject.java
URL: http://svn.apache.org/viewcvs/tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/json/JSONObject.java?rev=405136&r1=405135&r2=405136&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/json/JSONObject.java (original)
+++ tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/json/JSONObject.java Mon May 8 12:14:56 2006
@@ -94,7 +94,7 @@
/**
* There is only intended to be a single instance of the NULL object, so
* the clone method returns itself.
- *
+ * CHECKSTYLE:OFF
* @return NULL.
*/
protected Object clone()
Modified: tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/pageload/PageLoader.java
URL: http://svn.apache.org/viewcvs/tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/pageload/PageLoader.java?rev=405136&r1=405135&r2=405136&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/pageload/PageLoader.java (original)
+++ tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/pageload/PageLoader.java Mon May 8 12:14:56 2006
@@ -38,7 +38,6 @@
import org.apache.tapestry.TapestryConstants;
import org.apache.tapestry.asset.AssetSource;
import org.apache.tapestry.binding.BindingSource;
-import org.apache.tapestry.coerce.ValueConverter;
import org.apache.tapestry.engine.IPageLoader;
import org.apache.tapestry.resolver.ComponentSpecificationResolver;
import org.apache.tapestry.services.ComponentConstructor;
@@ -96,10 +95,6 @@
/** @since 4.0 */
- private ValueConverter _valueConverter;
-
- /** @since 4.0 */
-
private AssetSource _assetSource;
/**
@@ -752,12 +747,6 @@
ComponentConstructorFactory componentConstructorFactory)
{
_componentConstructorFactory = componentConstructorFactory;
- }
-
- /** @since 4.0 */
- public void setValueConverter(ValueConverter valueConverter)
- {
- _valueConverter = valueConverter;
}
/** @since 4.0 */
Modified: tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/record/PageRecorderImpl.java
URL: http://svn.apache.org/viewcvs/tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/record/PageRecorderImpl.java?rev=405136&r1=405135&r2=405136&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/record/PageRecorderImpl.java (original)
+++ tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/record/PageRecorderImpl.java Mon May 8 12:14:56 2006
@@ -23,7 +23,6 @@
import org.apache.hivemind.util.PropertyUtils;
import org.apache.tapestry.IComponent;
import org.apache.tapestry.IPage;
-import org.apache.tapestry.IRequestCycle;
import org.apache.tapestry.engine.IPageRecorder;
import org.apache.tapestry.event.ObservedChangeEvent;
import org.apache.tapestry.spec.IPropertySpecification;
@@ -37,24 +36,20 @@
private String _pageName;
- private IRequestCycle _requestCycle;
-
private PropertyPersistenceStrategySource _strategySource;
private boolean _locked = false;
private ErrorLog _log;
- public PageRecorderImpl(String pageName, IRequestCycle requestCycle,
- PropertyPersistenceStrategySource strategySource, ErrorLog log)
+ public PageRecorderImpl(String pageName, PropertyPersistenceStrategySource strategySource,
+ ErrorLog log)
{
Defense.notNull(pageName, "pageName");
- Defense.notNull(requestCycle, "requestCycle");
Defense.notNull(strategySource, "strategySource");
Defense.notNull(log, "log");
_pageName = pageName;
- _requestCycle = requestCycle;
_strategySource = strategySource;
_log = log;
}
Modified: tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/wml/pages/WMLException.java
URL: http://svn.apache.org/viewcvs/tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/wml/pages/WMLException.java?rev=405136&r1=405135&r2=405136&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/wml/pages/WMLException.java (original)
+++ tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/wml/pages/WMLException.java Mon May 8 12:14:56 2006
@@ -23,6 +23,7 @@
*
* @author David Solis
* @since 3.0
+ * CHECKSTYLE:OFF
*/
public abstract class WMLException extends Deck
{
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/record/TestPageRecorder.java
URL: http://svn.apache.org/viewcvs/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/record/TestPageRecorder.java?rev=405136&r1=405135&r2=405136&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/record/TestPageRecorder.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/record/TestPageRecorder.java Mon May 8 12:14:56 2006
@@ -25,7 +25,6 @@
import org.apache.hivemind.test.HiveMindTestCase;
import org.apache.tapestry.IComponent;
import org.apache.tapestry.IPage;
-import org.apache.tapestry.IRequestCycle;
import org.apache.tapestry.event.ObservedChangeEvent;
import org.apache.tapestry.spec.IComponentSpecification;
import org.apache.tapestry.spec.IPropertySpecification;
@@ -40,11 +39,6 @@
*/
public class TestPageRecorder extends HiveMindTestCase
{
- private IRequestCycle newCycle()
- {
- return (IRequestCycle) newMock(IRequestCycle.class);
- }
-
private ErrorLog newLog()
{
return (ErrorLog) newMock(ErrorLog.class);
@@ -52,7 +46,6 @@
public void testGetChanges()
{
- IRequestCycle cycle = newCycle();
ErrorLog log = newLog();
MockControl sourcec = newControl(PropertyPersistenceStrategySource.class);
@@ -66,7 +59,7 @@
replayControls();
- PageRecorderImpl pr = new PageRecorderImpl("Foo", cycle, source, log);
+ PageRecorderImpl pr = new PageRecorderImpl("Foo", source, log);
Collection actual = pr.getChanges();
@@ -94,7 +87,6 @@
public void testObserveChange()
{
- IRequestCycle cycle = newCycle();
ErrorLog log = newLog();
MockControl pagec = newControl(IPage.class);
@@ -123,7 +115,7 @@
replayControls();
- PageRecorderImpl pr = new PageRecorderImpl("Foo", cycle, source, log);
+ PageRecorderImpl pr = new PageRecorderImpl("Foo", source, log);
ObservedChangeEvent event = new ObservedChangeEvent(page, "foobar", newValue);
@@ -138,8 +130,6 @@
Throwable inner = new ApplicationRuntimeException("Simulated error.");
ErrorLog log = newLog();
- IRequestCycle cycle = newCycle();
-
MockControl sourcec = newControl(PropertyPersistenceStrategySource.class);
PropertyPersistenceStrategySource source = (PropertyPersistenceStrategySource) sourcec
.getMock();
@@ -172,7 +162,7 @@
replayControls();
- PageRecorderImpl pr = new PageRecorderImpl("SomePage", cycle, source, log);
+ PageRecorderImpl pr = new PageRecorderImpl("SomePage", source, log);
assertNull(pr.findStrategy(component, "zip"));
@@ -181,7 +171,6 @@
public void testRollbackPageProperty()
{
- IRequestCycle cycle = newCycle();
ErrorLog log = newLog();
Creator creator = new Creator();
@@ -199,7 +188,7 @@
replayControls();
- PageRecorderImpl pr = new PageRecorderImpl("MyPage", cycle, source, log);
+ PageRecorderImpl pr = new PageRecorderImpl("MyPage", source, log);
pr.rollback(page);
@@ -210,7 +199,6 @@
public void testRollbackComponentProperty()
{
- IRequestCycle cycle = newCycle();
ErrorLog log = newLog();
MockControl pagec = newControl(IPage.class);
@@ -234,7 +222,7 @@
replayControls();
- PageRecorderImpl pr = new PageRecorderImpl("MyPage", cycle, source, log);
+ PageRecorderImpl pr = new PageRecorderImpl("MyPage", source, log);
pr.rollback(page);
@@ -243,7 +231,6 @@
public void testChangeWhileLocked()
{
- IRequestCycle cycle = newCycle();
ErrorLog log = newLog();
MockControl pagec = newControl(IPage.class);
@@ -263,7 +250,7 @@
replayControls();
- PageRecorderImpl pr = new PageRecorderImpl("MyPage", cycle, source, log);
+ PageRecorderImpl pr = new PageRecorderImpl("MyPage", source, log);
pr.commit();
@@ -277,7 +264,6 @@
public void testChangeToNonSpecifiedProperty()
{
Resource r = fabricateLocation(99).getResource();
- IRequestCycle cycle = newCycle();
ErrorLog log = newLog();
MockControl pagec = newControl(IPage.class);
@@ -311,7 +297,7 @@
replayControls();
- PageRecorderImpl pr = new PageRecorderImpl("TestPage", cycle, source, log);
+ PageRecorderImpl pr = new PageRecorderImpl("TestPage", source, log);
ObservedChangeEvent event = new ObservedChangeEvent(page, "foobar", new Object());
Modified: tapestry/tapestry4/trunk/tapestry-checkstyle.xml
URL: http://svn.apache.org/viewcvs/tapestry/tapestry4/trunk/tapestry-checkstyle.xml?rev=405136&r1=405135&r2=405136&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-checkstyle.xml (original)
+++ tapestry/tapestry4/trunk/tapestry-checkstyle.xml Mon May 8 12:14:56 2006
@@ -3,7 +3,7 @@
This configuration file was written by the eclipse-cs plugin configuration editor
-->
<!--
-Checkstyle-Configuration: Tapestry
+Checkstyle-Configuration: tapestry
Description:
-->
@@ -11,6 +11,7 @@
<module name="Checker">
<property name="severity" value="warning"/>
<module name="TreeWalker">
+ <module name="FileContentsHolder"/>
<module name="JavadocStyle"/>
<module name="ConstantName">
<property name="format" value="^[A-Z][A-Z0-9]|[a-z][a-z0-9]*(_[A-Z0-9]|[a-z0-9]+)*$"/>
@@ -82,4 +83,7 @@
</module>
<module name="PackageHtml"/>
<module name="NewlineAtEndOfFile"/>
+ <module name="SuppressionCommentFilter">
+ <metadata name="com.atlassw.tools.eclipse.checkstyle.comment" value="Enables ignoring checkstyle errors in sepecific blocks"/>
+ </module>
</module>