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 2008/05/08 19:12:39 UTC
svn commit: r654582 - in /tapestry/tapestry5/trunk:
tapestry-core/src/test/java/org/apache/tapestry/corelib/base/
tapestry-core/src/test/java/org/apache/tapestry/corelib/components/
tapestry-core/src/test/java/org/apache/tapestry/integration/app1/ tape...
Author: hlship
Date: Thu May 8 10:12:12 2008
New Revision: 654582
URL: http://svn.apache.org/viewvc?rev=654582&view=rev
Log:
Remove leading underscores from field names
Added:
tapestry/tapestry5/trunk/tapestry-tutorial1/src/site/resources/index-grid-v1.png (with props)
Removed:
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/corelib/components/DateFieldTest.java
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/corelib/base/AbstractLinkTest.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/corelib/components/OutputTest.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/ChattyValidationDecorator.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/base/BaseComponent.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/base/BaseEventHandlerDemo.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/base/GenericEditor.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/components/ActionLinkIndirect.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/components/Border.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/components/Count.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/components/Echo.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/components/Inner.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/components/IntArrayWriter.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/components/Outer.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/components/OuterAny.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/components/Output.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/components/OutputRating.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/components/Render.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/components/RenderableProvider.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/components/RenderableUser.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/data/BirthdayReminder.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/data/IncidentData.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/data/IntegerHolder.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/data/RegistrationData.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/data/RolePath.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/data/SubscribeData.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/data/ToDoItem.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/data/Track.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/data/UserCredentials.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/mixins/Emphasis.java
tapestry/tapestry5/trunk/tapestry-tutorial1/src/site/apt/forms2.apt
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/corelib/base/AbstractLinkTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/corelib/base/AbstractLinkTest.java?rev=654582&r1=654581&r2=654582&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/corelib/base/AbstractLinkTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/corelib/base/AbstractLinkTest.java Thu May 8 10:12:12 2008
@@ -29,7 +29,7 @@
{
private final static String LINK_URI = "/foo/bar.baz";
- private final AbstractLink _linkFixture = new AbstractLink()
+ private final AbstractLink linkFixture = new AbstractLink()
{
};
@@ -50,9 +50,9 @@
replay();
- _linkFixture.inject(null, map, resources);
+ linkFixture.inject(null, map, resources);
- _linkFixture.writeLink(writer, link);
+ linkFixture.writeLink(writer, link);
verify();
@@ -82,9 +82,9 @@
replay();
- _linkFixture.inject("wilma", map, resources);
+ linkFixture.inject("wilma", map, resources);
- _linkFixture.writeLink(writer, link);
+ linkFixture.writeLink(writer, link);
verify();
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/corelib/components/OutputTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/corelib/components/OutputTest.java?rev=654582&r1=654581&r2=654582&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/corelib/components/OutputTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/corelib/components/OutputTest.java Thu May 8 10:12:12 2008
@@ -28,17 +28,17 @@
public class OutputTest extends TapestryTestCase
{
- private final Number _value = 22.7d;
+ private final Number value = 22.7d;
- private final DecimalFormat _format = (DecimalFormat) DecimalFormat.getInstance(Locale.US);
+ private final DecimalFormat format = (DecimalFormat) DecimalFormat.getInstance(Locale.US);
- private final DecimalFormat _filterFormat = (DecimalFormat) DecimalFormat.getInstance(Locale.US);
+ private final DecimalFormat filterFormat = (DecimalFormat) DecimalFormat.getInstance(Locale.US);
@BeforeClass
public void setup()
{
- _format.applyPattern("0.00");
- _filterFormat.applyPattern("<0.00>");
+ format.applyPattern("0.00");
+ filterFormat.applyPattern("<0.00>");
}
@Test
@@ -51,7 +51,7 @@
Output component = new Output();
- component.setup(_value, _format, true, null, resources);
+ component.setup(value, format, true, null, resources);
writer.element("root");
assertFalse(component.beginRender(writer));
@@ -72,7 +72,7 @@
Output component = new Output();
- component.setup(_value, _filterFormat, true, null, resources);
+ component.setup(value, filterFormat, true, null, resources);
writer.element("root");
assertFalse(component.beginRender(writer));
@@ -93,7 +93,7 @@
Output component = new Output();
- component.setup(_value, _filterFormat, false, null, resources);
+ component.setup(value, filterFormat, false, null, resources);
writer.element("root");
assertFalse(component.beginRender(writer));
@@ -116,7 +116,7 @@
Output component = new Output();
- component.setup(null, _format, true, null, resources);
+ component.setup(null, format, true, null, resources);
writer.element("root");
assertFalse(component.beginRender(writer));
@@ -142,7 +142,7 @@
Output component = new Output();
- component.setup(_value, _format, true, elementName, resources);
+ component.setup(value, format, true, elementName, resources);
assertFalse(component.beginRender(writer));
@@ -181,7 +181,7 @@
Output component = new Output();
- component.setup(_value, format, true, elementName, resources);
+ component.setup(value, format, true, elementName, resources);
writer.element("root");
assertFalse(component.beginRender(writer));
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/ChattyValidationDecorator.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/ChattyValidationDecorator.java?rev=654582&r1=654581&r2=654582&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/ChattyValidationDecorator.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/ChattyValidationDecorator.java Thu May 8 10:12:12 2008
@@ -21,49 +21,49 @@
public class ChattyValidationDecorator implements ValidationDecorator
{
- private final MarkupWriter _writer;
+ private final MarkupWriter writer;
- private final ValidationDecorator _delegate;
+ private final ValidationDecorator delegate;
public ChattyValidationDecorator(MarkupWriter writer, ValidationDecorator delegate)
{
- _writer = writer;
- _delegate = delegate;
+ this.writer = writer;
+ this.delegate = delegate;
}
public void beforeLabel(Field field)
{
- _writer.writef("[Before label for %s]", field.getLabel());
+ writer.writef("[Before label for %s]", field.getLabel());
}
public void afterLabel(Field field)
{
- _writer.writef("[After label for %s]", field.getLabel());
+ writer.writef("[After label for %s]", field.getLabel());
}
public void beforeField(Field field)
{
- _writer.writef("[Before field %s]", field.getLabel());
+ writer.writef("[Before field %s]", field.getLabel());
- _delegate.beforeField(field);
+ delegate.beforeField(field);
}
public void insideField(Field field)
{
- _delegate.insideField(field);
+ delegate.insideField(field);
}
public void afterField(Field field)
{
- _delegate.afterField(field);
+ delegate.afterField(field);
- _writer.writef("[After field %s (%s)]", field.getLabel(),
- field.isRequired() ? "required" : "optional"
+ writer.writef("[After field %s (%s)]", field.getLabel(),
+ field.isRequired() ? "required" : "optional"
);
}
public void insideLabel(Field field, Element labelElement)
{
- _delegate.insideLabel(field, labelElement);
+ delegate.insideLabel(field, labelElement);
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/base/BaseComponent.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/base/BaseComponent.java?rev=654582&r1=654581&r2=654582&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/base/BaseComponent.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/base/BaseComponent.java Thu May 8 10:12:12 2008
@@ -15,21 +15,12 @@
package org.apache.tapestry.integration.app1.base;
import org.apache.tapestry.annotations.ApplicationState;
+import org.apache.tapestry.annotations.Property;
import org.apache.tapestry.integration.app1.data.IncidentData;
public class BaseComponent
{
@ApplicationState
- private IncidentData _incidentData;
-
- public IncidentData getIncidentData()
- {
- return _incidentData;
- }
-
- public void setIncidentData(IncidentData incidentData)
- {
- _incidentData = incidentData;
- }
-
+ @Property
+ private IncidentData incidentData;
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/base/BaseEventHandlerDemo.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/base/BaseEventHandlerDemo.java?rev=654582&r1=654581&r2=654582&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/base/BaseEventHandlerDemo.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/base/BaseEventHandlerDemo.java Thu May 8 10:12:12 2008
@@ -16,6 +16,7 @@
import org.apache.tapestry.annotations.OnEvent;
import org.apache.tapestry.annotations.Persist;
+import org.apache.tapestry.annotations.Property;
import org.apache.tapestry.ioc.internal.util.CollectionFactory;
import java.util.List;
@@ -23,27 +24,23 @@
public abstract class BaseEventHandlerDemo
{
@Persist
- private List<String> _methodNames;
+ @Property
+ private List<String> methodNames;
protected final void addMethodName(String name)
{
- List<String> methodNames = _methodNames;
+ List<String> methodNames = this.methodNames;
if (methodNames == null) methodNames = CollectionFactory.newList();
methodNames.add(name);
- _methodNames = methodNames;
+ this.methodNames = methodNames;
}
void onActivate(String placeholder)
{
- _methodNames = null;
- }
-
- public List<String> getMethodNames()
- {
- return _methodNames;
+ methodNames = null;
}
@SuppressWarnings("unused")
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/base/GenericEditor.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/base/GenericEditor.java?rev=654582&r1=654581&r2=654582&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/base/GenericEditor.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/base/GenericEditor.java Thu May 8 10:12:12 2008
@@ -28,38 +28,38 @@
public class GenericEditor<T>
{
@Persist
- private T _bean;
+ private T bean;
- @Component(parameters = {"object=bean"})
- private BeanEditForm _form;
+ @Component(parameters = { "object=bean" })
+ private BeanEditForm form;
@Inject
- private PropertyConduitSource _conduit;
+ private PropertyConduitSource conduit;
@Retain
- private String _beanType;
+ private String beanType;
{
// Use getClass(), not GenericEditor.class, to determine the correct type for the bean.
// Otherwise, it would be Object.
- PropertyConduit conduit = _conduit.create(getClass(), "bean");
+ PropertyConduit conduit = this.conduit.create(getClass(), "bean");
- _beanType = conduit.getPropertyType().getName();
+ beanType = conduit.getPropertyType().getName();
}
public String getBeanType()
{
- return _beanType;
+ return beanType;
}
public T getBean()
{
- return _bean;
+ return bean;
}
public void setBean(T bean)
{
- _bean = bean;
+ this.bean = bean;
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/components/ActionLinkIndirect.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/components/ActionLinkIndirect.java?rev=654582&r1=654581&r2=654582&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/components/ActionLinkIndirect.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/components/ActionLinkIndirect.java Thu May 8 10:12:12 2008
@@ -24,13 +24,13 @@
* The component to be rendered.
*/
@Parameter(required = true, defaultPrefix = "component")
- private ActionLink _component;
+ private ActionLink component;
Object beginRender(MarkupWriter writer)
{
writer.element("p");
- return _component;
+ return component;
}
void afterRender(MarkupWriter writer)
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/components/Border.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/components/Border.java?rev=654582&r1=654581&r2=654582&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/components/Border.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/components/Border.java Thu May 8 10:12:12 2008
@@ -30,33 +30,33 @@
{
@Inject
@Builtin
- private ClassFactory _iocClassFactory;
+ private ClassFactory iocClassFactory;
@Inject
@ComponentLayer
- private ClassFactory _componentClassFactory;
+ private ClassFactory componentClassFactory;
@Inject
- private Request _request;
+ private Request request;
public ClassFactory getComponentClassFactory()
{
- return _componentClassFactory;
+ return componentClassFactory;
}
public ClassFactory getIocClassFactory()
{
- return _iocClassFactory;
+ return iocClassFactory;
}
public Request getRequest()
{
- return _request;
+ return request;
}
public String getSecure()
{
- return _request.isSecure() ? "secure" : "insecure";
+ return request.isSecure() ? "secure" : "insecure";
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/components/Count.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/components/Count.java?rev=654582&r1=654581&r2=654582&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/components/Count.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/components/Count.java Thu May 8 10:12:12 2008
@@ -22,50 +22,50 @@
/**
* A component that can count up or count down.
* <p/>
- * This is useful as a demonstration; now that the prop binding supports
- * {@link IntegerRange integer ranges}, it's much less necessary.
+ * This is useful as a demonstration; now that the prop binding supports {@link IntegerRange integer ranges}, it's much
+ * less necessary.
*/
public class Count
{
@Parameter
- private int _start = 1;
+ private int start = 1;
@Parameter(required = true)
- private int _end;
+ private int end;
@Parameter
- private int _value;
+ private int value;
- private boolean _increment;
+ private boolean increment;
@SetupRender
void initializeValue()
{
- _value = _start;
+ value = start;
- _increment = _start < _end;
+ increment = start < end;
}
@AfterRender
boolean next()
{
- if (_increment)
+ if (increment)
{
- int newValue = _value + 1;
+ int newValue = value + 1;
- if (newValue <= _end)
+ if (newValue <= end)
{
- _value = newValue;
+ value = newValue;
return false; // re-render body
}
}
else
{
- int newValue = _value - 1;
+ int newValue = value - 1;
- if (newValue >= _end)
+ if (newValue >= end)
{
- _value = newValue;
+ value = newValue;
return false; // re-render body
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/components/Echo.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/components/Echo.java?rev=654582&r1=654581&r2=654582&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/components/Echo.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/components/Echo.java Thu May 8 10:12:12 2008
@@ -19,17 +19,17 @@
import org.apache.tapestry.annotations.Parameter;
/**
- * Echos out its value parameter. Uused to test parameter overrides between component annoation and
- * template. Also, used to test parameter defaulter methods.
+ * Echos out its value parameter. Uused to test parameter overrides between component annoation and template. Also, used
+ * to test parameter defaulter methods.
*/
public class Echo
{
@Parameter("componentResources.completeId")
- private String _value;
+ private String value;
@BeginRender
void render(MarkupWriter writer)
{
- writer.write(_value);
+ writer.write(value);
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/components/Inner.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/components/Inner.java?rev=654582&r1=654581&r2=654582&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/components/Inner.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/components/Inner.java Thu May 8 10:12:12 2008
@@ -22,13 +22,13 @@
public class Inner
{
@Parameter
- private String _innerValue;
+ private String innerValue;
@Inject
- private ComponentResources _resources;
+ private ComponentResources resources;
void beginRender(MarkupWriter writer)
{
- writer.writef("[ value: %s, bound: %s ]", _innerValue, _resources.isBound("innerValue"));
+ writer.writef("[ value: %s, bound: %s ]", innerValue, resources.isBound("innerValue"));
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/components/IntArrayWriter.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/components/IntArrayWriter.java?rev=654582&r1=654581&r2=654582&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/components/IntArrayWriter.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/components/IntArrayWriter.java Thu May 8 10:12:12 2008
@@ -20,13 +20,13 @@
public class IntArrayWriter
{
@Parameter
- private int[] _array;
+ private int[] array;
boolean beginRender(MarkupWriter writer)
{
writer.element("ul");
- for (int x : _array)
+ for (int x : array)
{
writer.element("li");
writer.write(String.valueOf(x));
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/components/Outer.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/components/Outer.java?rev=654582&r1=654581&r2=654582&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/components/Outer.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/components/Outer.java Thu May 8 10:12:12 2008
@@ -21,5 +21,5 @@
{
@SuppressWarnings("unused")
@Parameter(defaultPrefix = LITERAL_BINDING_PREFIX)
- private String _outerValue;
+ private String outerValue;
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/components/OuterAny.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/components/OuterAny.java?rev=654582&r1=654581&r2=654582&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/components/OuterAny.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/components/OuterAny.java Thu May 8 10:12:12 2008
@@ -21,6 +21,9 @@
@SupportsInformalParameters
public class OuterAny
{
+ // Also, leave a few parameters here and there in the old naming style, with a
+ // leading underscore.
+
@Component(inheritInformalParameters = true)
private Any _innerAny;
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/components/Output.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/components/Output.java?rev=654582&r1=654581&r2=654582&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/components/Output.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/components/Output.java Thu May 8 10:12:12 2008
@@ -25,14 +25,14 @@
public class Output
{
@Parameter(required = true)
- private Object _value;
+ private Object value;
@Parameter(required = true)
- private Format _format;
+ private Format format;
void beginRender(MarkupWriter writer)
{
- String formatted = _format.format(_value);
+ String formatted = format.format(value);
writer.write(formatted);
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/components/OutputRating.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/components/OutputRating.java?rev=654582&r1=654581&r2=654582&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/components/OutputRating.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/components/OutputRating.java Thu May 8 10:12:12 2008
@@ -20,18 +20,18 @@
public class OutputRating
{
@Parameter
- private int _rating;
+ private int rating;
void beginRender(MarkupWriter writer)
{
- if (_rating <= 0)
+ if (rating <= 0)
{
writer.write("-");
return;
}
// Want 1 - 5 stars
- int stars = ((_rating - 1) / 20) + 1;
+ int stars = ((rating - 1) / 20) + 1;
for (int i = 0; i < stars; i++)
writer.write("*");
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/components/Render.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/components/Render.java?rev=654582&r1=654581&r2=654582&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/components/Render.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/components/Render.java Thu May 8 10:12:12 2008
@@ -19,16 +19,15 @@
public class Render
{
@Parameter(required = true)
- private Object _value;
+ private Object value;
/**
- * Returns the value parameter, which allows another object (presumably, a component) to render
- * first.
+ * Returns the value parameter, which allows another object (presumably, a component) to render first.
*
* @return
*/
Object beginRender()
{
- return _value;
+ return value;
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/components/RenderableProvider.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/components/RenderableProvider.java?rev=654582&r1=654581&r2=654582&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/components/RenderableProvider.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/components/RenderableProvider.java Thu May 8 10:12:12 2008
@@ -24,7 +24,7 @@
public class RenderableProvider
{
@Inject
- private Environment _environment;
+ private Environment environment;
@SetupRender
void setup()
@@ -39,12 +39,12 @@
}
};
- _environment.push(Renderable.class, r);
+ environment.push(Renderable.class, r);
}
@CleanupRender
void cleanup()
{
- _environment.pop(Renderable.class);
+ environment.pop(Renderable.class);
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/components/RenderableUser.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/components/RenderableUser.java?rev=654582&r1=654581&r2=654582&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/components/RenderableUser.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/components/RenderableUser.java Thu May 8 10:12:12 2008
@@ -25,11 +25,11 @@
public class RenderableUser
{
@Environmental
- private Renderable _renderable;
+ private Renderable renderable;
@BeginRender
void render(MarkupWriter writer)
{
- _renderable.render(writer);
+ renderable.render(writer);
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/data/BirthdayReminder.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/data/BirthdayReminder.java?rev=654582&r1=654581&r2=654582&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/data/BirthdayReminder.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/data/BirthdayReminder.java Thu May 8 10:12:12 2008
@@ -20,30 +20,30 @@
public class BirthdayReminder
{
- private String _name;
+ private String name;
- private Date _date;
+ private Date date;
@Validate("required")
public String getName()
{
- return _name;
+ return name;
}
@Validate("required")
public Date getDate()
{
- return _date;
+ return date;
}
public void setName(String name)
{
- _name = name;
+ this.name = name;
}
public void setDate(Date date)
{
- _date = date;
+ this.date = date;
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/data/IncidentData.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/data/IncidentData.java?rev=654582&r1=654581&r2=654582&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/data/IncidentData.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/data/IncidentData.java Thu May 8 10:12:12 2008
@@ -22,77 +22,77 @@
{
private static final long serialVersionUID = -321606932140181054L;
- private String _email;
+ private String email;
- private String _message;
+ private String message;
- private boolean _urgent;
+ private boolean urgent;
- private String _operatingSystem;
+ private String operatingSystem;
- private int _hours;
+ private int hours;
- private Department _department;
+ private Department department;
public String getEmail()
{
- return _email;
+ return email;
}
public void setEmail(String email)
{
- _email = email;
+ this.email = email;
}
public String getMessage()
{
- return _message;
+ return message;
}
@Validate("required")
public void setMessage(String message)
{
- _message = message;
+ this.message = message;
}
public boolean isUrgent()
{
- return _urgent;
+ return urgent;
}
public void setUrgent(boolean urgent)
{
- _urgent = urgent;
+ this.urgent = urgent;
}
public String getOperatingSystem()
{
- return _operatingSystem;
+ return operatingSystem;
}
public void setOperatingSystem(String os)
{
- _operatingSystem = os;
+ operatingSystem = os;
}
public int getHours()
{
- return _hours;
+ return hours;
}
public void setHours(int hours)
{
- _hours = hours;
+ this.hours = hours;
}
public Department getDepartment()
{
- return _department;
+ return department;
}
public void setDepartment(Department department)
{
- _department = department;
+ this.department = department;
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/data/IntegerHolder.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/data/IntegerHolder.java?rev=654582&r1=654581&r2=654582&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/data/IntegerHolder.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/data/IntegerHolder.java Thu May 8 10:12:12 2008
@@ -16,15 +16,15 @@
public class IntegerHolder
{
- private Integer _value;
+ private Integer value;
public Integer getValue()
{
- return _value;
+ return value;
}
public void setValue(Integer value)
{
- _value = value;
+ this.value = value;
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/data/RegistrationData.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/data/RegistrationData.java?rev=654582&r1=654581&r2=654582&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/data/RegistrationData.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/data/RegistrationData.java Thu May 8 10:12:12 2008
@@ -18,98 +18,98 @@
public class RegistrationData
{
- private String _lastName;
+ private String lastName;
- private String _firstName;
+ private String firstName;
- private int _birthYear;
+ private int birthYear;
- private Sex _sex = Sex.MALE;
+ private Sex sex = Sex.MALE;
- private boolean _citizen;
+ private boolean citizen;
- private String _password;
+ private String password;
- private String _notes;
+ private String notes;
@OrderAfter("lastName")
@Validate("min=1900,max=2007")
@Width(4)
public int getBirthYear()
{
- return _birthYear;
+ return birthYear;
}
@OrderAfter("lastname,birthyear")
public Sex getSex()
{
- return _sex;
+ return sex;
}
@OrderBefore("lastname")
public String getFirstName()
{
- return _firstName;
+ return firstName;
}
@Validate("required,minlength=5")
public String getLastName()
{
- return _lastName;
+ return lastName;
}
@Validate("required,minlength=6")
@DataType("password")
public String getPassword()
{
- return _password;
+ return password;
}
public void setPassword(String password)
{
- _password = password;
+ this.password = password;
}
public boolean isCitizen()
{
- return _citizen;
+ return citizen;
}
public void setBirthYear(int birthYear)
{
- _birthYear = birthYear;
+ this.birthYear = birthYear;
}
@Validate("required,minlength=3")
public void setFirstName(String firstName)
{
- _firstName = firstName;
+ this.firstName = firstName;
}
public void setLastName(String lastName)
{
- _lastName = lastName;
+ this.lastName = lastName;
}
public void setSex(Sex sex)
{
- _sex = sex;
+ this.sex = sex;
}
public void setCitizen(boolean citizen)
{
- _citizen = citizen;
+ this.citizen = citizen;
}
@DataType("longtext")
@Width(50)
public String getNotes()
{
- return _notes;
+ return notes;
}
public void setNotes(String notes)
{
- _notes = notes;
+ this.notes = notes;
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/data/RolePath.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/data/RolePath.java?rev=654582&r1=654581&r2=654582&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/data/RolePath.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/data/RolePath.java Thu May 8 10:12:12 2008
@@ -18,30 +18,30 @@
public class RolePath
{
- private String _path;
+ private String path;
- private RoleAccess _role = RoleAccess.GRANT;
+ private RoleAccess role = RoleAccess.GRANT;
@Validate("required")
public String getPath()
{
- return _path;
+ return path;
}
@Validate("required")
public RoleAccess getRole()
{
- return _role;
+ return role;
}
public void setPath(String path)
{
- _path = path;
+ this.path = path;
}
public void setRole(RoleAccess role)
{
- _role = role;
+ this.role = role;
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/data/SubscribeData.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/data/SubscribeData.java?rev=654582&r1=654581&r2=654582&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/data/SubscribeData.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/data/SubscribeData.java Thu May 8 10:12:12 2008
@@ -18,42 +18,39 @@
public class SubscribeData
{
- private String _name;
- private String _email;
-
- private String _code;
+ private String name, email, code;
@Validate("required")
public String getName()
{
- return _name;
+ return name;
}
public void setName(String name)
{
- _name = name;
+ this.name = name;
}
// Only really required if visible!
@Validate("required")
public String getEmail()
{
- return _email;
+ return email;
}
public void setEmail(String email)
{
- _email = email;
+ this.email = email;
}
@Validate("required")
public String getCode()
{
- return _code;
+ return code;
}
public void setCode(String code)
{
- _code = code;
+ this.code = code;
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/data/ToDoItem.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/data/ToDoItem.java?rev=654582&r1=654581&r2=654582&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/data/ToDoItem.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/data/ToDoItem.java Thu May 8 10:12:12 2008
@@ -23,18 +23,18 @@
{
private static final long serialVersionUID = 329624498668043734L;
- private long _id;
+ private long id;
- private String _title;
+ private String title;
- private int _order;
+ private int order;
- private Urgency _urgency = Urgency.MEDIUM;
+ private Urgency urgency = Urgency.MEDIUM;
@Override
public String toString()
{
- return String.format("ToDoItem[%d %s]", _id, _title);
+ return String.format("ToDoItem[%d %s]", id, title);
}
@Override
@@ -53,44 +53,44 @@
@NonVisual
public long getId()
{
- return _id;
+ return id;
}
public void setId(long id)
{
- _id = id;
+ this.id = id;
}
@Validate("required")
public String getTitle()
{
- return _title;
+ return title;
}
public void setTitle(String title)
{
- _title = title;
+ this.title = title;
}
public Urgency getUrgency()
{
- return _urgency;
+ return urgency;
}
public void setUrgency(Urgency urgency)
{
- _urgency = urgency;
+ this.urgency = urgency;
}
@NonVisual
public int getOrder()
{
- return _order;
+ return order;
}
public void setOrder(int order)
{
- _order = order;
+ this.order = order;
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/data/Track.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/data/Track.java?rev=654582&r1=654581&r2=654582&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/data/Track.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/data/Track.java Thu May 8 10:12:12 2008
@@ -21,54 +21,46 @@
*/
public class Track implements SimpleTrack
{
- private Long _id;
+ private Long id;
- private String _album;
+ private String album, artist, genre, title;
- private String _artist;
-
- private String _genre;
-
- private int _playCount;
-
- private String _title;
-
- private int _rating;
+ private int playCount, rating;
@NonVisual
public Long getId()
{
- return _id;
+ return id;
}
public void setId(Long id)
{
- _id = id;
+ this.id = id;
}
public String getTitle()
{
- return _title;
+ return title;
}
public String getAlbum()
{
- return _album;
+ return album;
}
public String getArtist()
{
- return _artist;
+ return artist;
}
public String getGenre()
{
- return _genre;
+ return genre;
}
public int getPlayCount()
{
- return _playCount;
+ return playCount;
}
/**
@@ -76,37 +68,37 @@
*/
public int getRating()
{
- return _rating;
+ return rating;
}
public void setAlbum(String album)
{
- _album = album;
+ this.album = album;
}
public void setArtist(String artist)
{
- _artist = artist;
+ this.artist = artist;
}
public void setGenre(String genre)
{
- _genre = genre;
+ this.genre = genre;
}
public void setPlayCount(int playCount)
{
- _playCount = playCount;
+ this.playCount = playCount;
}
public void setRating(int rating)
{
- _rating = rating;
+ this.rating = rating;
}
public void setTitle(String title)
{
- _title = title;
+ this.title = title;
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/data/UserCredentials.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/data/UserCredentials.java?rev=654582&r1=654581&r2=654582&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/data/UserCredentials.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/data/UserCredentials.java Thu May 8 10:12:12 2008
@@ -18,30 +18,28 @@
public class UserCredentials
{
- private String _lastName;
-
- private String _firstName;
+ private String lastName, firstName;
@Validate("required")
public String getFirstName()
{
- return _firstName;
+ return firstName;
}
@Validate("required")
public String getLastName()
{
- return _lastName;
+ return lastName;
}
public void setLastName(String lastName)
{
- _lastName = lastName;
+ this.lastName = lastName;
}
public void setFirstName(String firstName)
{
- _firstName = firstName;
+ this.firstName = firstName;
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/mixins/Emphasis.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/mixins/Emphasis.java?rev=654582&r1=654581&r2=654582&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/mixins/Emphasis.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/mixins/Emphasis.java Thu May 8 10:12:12 2008
@@ -25,19 +25,19 @@
public class Emphasis
{
@Parameter(required = true)
- private boolean _test;
+ private boolean test;
@BeginRender
void begin(MarkupWriter writer)
{
- if (_test)
+ if (test)
writer.element("em");
}
@AfterRender
void after(MarkupWriter writer)
{
- if (_test)
+ if (test)
writer.end();
}
}
Modified: tapestry/tapestry5/trunk/tapestry-tutorial1/src/site/apt/forms2.apt
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-tutorial1/src/site/apt/forms2.apt?rev=654582&r1=654581&r2=654582&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-tutorial1/src/site/apt/forms2.apt (original)
+++ tapestry/tapestry5/trunk/tapestry-tutorial1/src/site/apt/forms2.apt Thu May 8 10:12:12 2008
@@ -9,7 +9,7 @@
What happened is that we haven't told Tapestry what to do after the form is succesfully submitted (by succesful, we mean,
with no validation errors). Tapestry's default behavior is to redisplay the active page, and that occurs in a new
- request, with a new instance of the Address object (because the _address field is not a peristent field).
+ request, with a new instance of the Address object (because the address field is not a peristent field).
Well, since we're creating objects, we might as well store them somewhere ... in a database. We're going to
quickly integrate Tapestry with {{{http://hibernate.org}Hibernate}} as the object/relational mapping layer,
Added: tapestry/tapestry5/trunk/tapestry-tutorial1/src/site/resources/index-grid-v1.png
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-tutorial1/src/site/resources/index-grid-v1.png?rev=654582&view=auto
==============================================================================
Binary file - no diff available.
Propchange: tapestry/tapestry5/trunk/tapestry-tutorial1/src/site/resources/index-grid-v1.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream