You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tapestry.apache.org by hl...@apache.org on 2008/03/06 04:16:01 UTC
svn commit: r634138 - in /tapestry/tapestry5/trunk:
tapestry-core/src/main/java/org/apache/tapestry/annotations/
tapestry-core/src/main/java/org/apache/tapestry/corelib/components/
tapestry-core/src/main/java/org/apache/tapestry/corelib/pages/ tapestry...
Author: hlship
Date: Wed Mar 5 19:15:57 2008
New Revision: 634138
URL: http://svn.apache.org/viewvc?rev=634138&view=rev
Log:
Rename the new @GenerateAccessors annotation to @Property.
Added:
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/Property.java
- copied, changed from r633150, tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/GenerateAccessors.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/PropertyWorker.java
- copied, changed from r633150, tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/GenerateAccessorsWorker.java
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/BeanDisplay.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/BeanEditForm.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/BeanEditor.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/ExceptionDisplay.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/Grid.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/GridColumns.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/GridRows.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/Palette.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/pages/ExceptionReport.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/pages/ServiceStatus.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/TapestryModule.java
tapestry/tapestry5/trunk/tapestry-core/src/site/apt/index.apt
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/BeanEditorDemo.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/DatumEditor.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app3/pages/Index.java
tapestry/tapestry5/trunk/tapestry-hibernate/src/test/java/org/example/app0/pages/Start.java
tapestry/tapestry5/trunk/tapestry-tutorial1/src/main/java/org/apache/tapestry/tutorial/pages/GameOver.java
tapestry/tapestry5/trunk/tapestry-tutorial1/src/main/java/org/apache/tapestry/tutorial/pages/Guess.java
tapestry/tapestry5/trunk/tapestry-tutorial1/src/main/java/org/apache/tapestry/tutorial/pages/address/CreateAddress.java
tapestry/tapestry5/trunk/tapestry-tutorial1/src/site/apt/hilo.apt
Copied: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/Property.java (from r633150, tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/GenerateAccessors.java)
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/Property.java?p2=tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/Property.java&p1=tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/GenerateAccessors.java&r1=633150&r2=634138&rev=634138&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/GenerateAccessors.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/Property.java Wed Mar 5 19:15:57 2008
@@ -28,7 +28,7 @@
@Target(FIELD)
@Documented
@Retention(RUNTIME)
-public @interface GenerateAccessors
+public @interface Property
{
/** Whether to create a readable property (i.e., generate a getter method). */
boolean read() default true;
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/BeanDisplay.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/BeanDisplay.java?rev=634138&r1=634137&r2=634138&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/BeanDisplay.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/BeanDisplay.java Wed Mar 5 19:15:57 2008
@@ -16,7 +16,7 @@
import org.apache.tapestry.Binding;
import org.apache.tapestry.ComponentResources;
-import org.apache.tapestry.annotations.GenerateAccessors;
+import org.apache.tapestry.annotations.Property;
import org.apache.tapestry.annotations.Parameter;
import org.apache.tapestry.annotations.SupportsInformalParameters;
import org.apache.tapestry.beaneditor.BeanModel;
@@ -43,7 +43,7 @@
* component's id will be used.
*/
@Parameter(required = true)
- @GenerateAccessors(write = false)
+ @Property(write = false)
private Object _object;
/**
@@ -58,7 +58,7 @@
* a default bean model will be created from the type of the object bound to the object parameter.
*/
@Parameter
- @GenerateAccessors(write = false)
+ @Property(write = false)
private BeanModel _model;
/**
@@ -83,7 +83,7 @@
* searched.
*/
@Parameter(value = "componentResources")
- @GenerateAccessors(write = false)
+ @Property(write = false)
private ComponentResources _overrides;
@Inject
@@ -95,7 +95,7 @@
@Inject
private BeanModelSource _modelSource;
- @GenerateAccessors
+ @Property
private String _propertyName;
/**
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/BeanEditForm.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/BeanEditForm.java?rev=634138&r1=634137&r2=634138&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/BeanEditForm.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/BeanEditForm.java Wed Mar 5 19:15:57 2008
@@ -45,7 +45,7 @@
* The text label for the submit button of the form, by default "Create/Update".
*/
@Parameter(value = "message:submit-label", defaultPrefix = "literal")
- @GenerateAccessors
+ @Property
private String _submitLabel;
/**
@@ -56,7 +56,7 @@
*/
@SuppressWarnings("unused")
@Parameter(required = true)
- @GenerateAccessors
+ @Property
private Object _object;
/**
@@ -95,7 +95,7 @@
*/
@SuppressWarnings("unused")
@Parameter
- @GenerateAccessors
+ @Property
private BeanModel _model;
@Inject
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/BeanEditor.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/BeanEditor.java?rev=634138&r1=634137&r2=634138&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/BeanEditor.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/BeanEditor.java Wed Mar 5 19:15:57 2008
@@ -18,7 +18,7 @@
import org.apache.tapestry.ComponentAction;
import org.apache.tapestry.ComponentResources;
import org.apache.tapestry.annotations.Environmental;
-import org.apache.tapestry.annotations.GenerateAccessors;
+import org.apache.tapestry.annotations.Property;
import org.apache.tapestry.annotations.Parameter;
import org.apache.tapestry.annotations.SupportsInformalParameters;
import org.apache.tapestry.beaneditor.BeanModel;
@@ -75,7 +75,7 @@
* default bean model will be created from the type of the object bound to the object parameter.
*/
@Parameter
- @GenerateAccessors(write = false)
+ @Property(write = false)
private BeanModel _model;
/**
@@ -85,7 +85,7 @@
* be searched.
*/
@Parameter(value = "componentResources")
- @GenerateAccessors(write = false)
+ @Property(write = false)
private ComponentResources _overrides;
@Inject
@@ -102,7 +102,7 @@
// Value that change with each change to the current property:
- @GenerateAccessors
+ @Property
private String _propertyName;
/**
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/ExceptionDisplay.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/ExceptionDisplay.java?rev=634138&r1=634137&r2=634138&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/ExceptionDisplay.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/ExceptionDisplay.java Wed Mar 5 19:15:57 2008
@@ -14,7 +14,7 @@
package org.apache.tapestry.corelib.components;
-import org.apache.tapestry.annotations.GenerateAccessors;
+import org.apache.tapestry.annotations.Property;
import org.apache.tapestry.annotations.Parameter;
import org.apache.tapestry.internal.InternalConstants;
import org.apache.tapestry.ioc.annotations.Inject;
@@ -46,16 +46,16 @@
@Symbol(InternalConstants.TAPESTRY_APP_PACKAGE_PARAM)
private String _appPackage;
- @GenerateAccessors
+ @Property
private ExceptionInfo _info;
- @GenerateAccessors
+ @Property
private String _propertyName;
- @GenerateAccessors
+ @Property
private StackTraceElement _frame;
- @GenerateAccessors
+ @Property
private List<ExceptionInfo> _stack;
void setupRender()
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/Grid.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/Grid.java?rev=634138&r1=634137&r2=634138&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/Grid.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/Grid.java Wed Mar 5 19:15:57 2008
@@ -62,7 +62,7 @@
* set.
*/
@Parameter("25")
- @GenerateAccessors
+ @Property
private int _rowsPerPage;
/**
@@ -78,7 +78,7 @@
* use the property bound to the row parameter to know what they should render.
*/
@Parameter
- @GenerateAccessors
+ @Property
private Object _row;
/**
@@ -151,11 +151,11 @@
* between CSS values (for the "zebra effect"). If null or not bound, then no particular CSS class value is used.
*/
@Parameter(cache = false)
- @GenerateAccessors(write = false)
+ @Property(write = false)
private String _rowClass;
@Persist
- @GenerateAccessors
+ @Property
private int _currentPage = 1;
@Persist
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/GridColumns.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/GridColumns.java?rev=634138&r1=634137&r2=634138&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/GridColumns.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/GridColumns.java Wed Mar 5 19:15:57 2008
@@ -80,12 +80,12 @@
@Inject
private Block _standardHeader;
- @GenerateAccessors
+ @Property
private int _columnIndex;
private int _lastColumnIndex;
- @GenerateAccessors(write = false)
+ @Property(write = false)
private PropertyModel _columnModel;
void setupRender()
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/GridRows.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/GridRows.java?rev=634138&r1=634137&r2=634138&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/GridRows.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/GridRows.java Wed Mar 5 19:15:57 2008
@@ -17,7 +17,7 @@
import org.apache.tapestry.ComponentAction;
import org.apache.tapestry.annotations.Environmental;
import org.apache.tapestry.annotations.Parameter;
-import org.apache.tapestry.annotations.GenerateAccessors;
+import org.apache.tapestry.annotations.Property;
import org.apache.tapestry.beaneditor.PropertyModel;
import org.apache.tapestry.grid.GridConstants;
import org.apache.tapestry.grid.GridDataSource;
@@ -87,7 +87,7 @@
* container, to know what object is being rendered.
*/
@Parameter(required = true)
- @GenerateAccessors(write=false)
+ @Property(write=false)
private Object _row;
/**
@@ -117,7 +117,7 @@
private String _propertyName;
- @GenerateAccessors(write=false)
+ @Property(write=false)
private PropertyModel _columnModel;
public String getRowClass()
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/Palette.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/Palette.java?rev=634138&r1=634137&r2=634138&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/Palette.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/Palette.java Wed Mar 5 19:15:57 2008
@@ -18,7 +18,7 @@
import org.apache.tapestry.annotations.Environmental;
import org.apache.tapestry.annotations.IncludeJavaScriptLibrary;
import org.apache.tapestry.annotations.Parameter;
-import org.apache.tapestry.annotations.GenerateAccessors;
+import org.apache.tapestry.annotations.Property;
import org.apache.tapestry.corelib.base.AbstractField;
import org.apache.tapestry.internal.util.SelectModelRenderer;
import org.apache.tapestry.ioc.annotations.Inject;
@@ -158,7 +158,7 @@
* The image to use for the deselect button (the default is a left pointing arrow).
*/
@Parameter(value = "asset:deselect.png")
- @GenerateAccessors(write=false)
+ @Property(write=false)
private Asset _deselect;
/**
@@ -177,14 +177,14 @@
* The image to use for the move down button (the default is a downward pointing arrow).
*/
@Parameter(value = "asset:move_down.png")
- @GenerateAccessors(write=false)
+ @Property(write=false)
private Asset _moveDown;
/**
* The image to use for the move up button (the default is an upward pointing arrow).
*/
@Parameter(value = "asset:move_up.png")
- @GenerateAccessors(write=false)
+ @Property(write=false)
private Asset _moveUp;
/**
@@ -205,7 +205,7 @@
* The image to use for the select button (the default is a right pointing arrow).
*/
@Parameter(value = "asset:select.png")
- @GenerateAccessors(write=false)
+ @Property(write=false)
private Asset _select;
/**
@@ -220,7 +220,7 @@
* If true, then additional buttons are provided on the client-side to allow for re-ordering of the values.
*/
@Parameter("false")
- @GenerateAccessors(write=false)
+ @Property(write=false)
private boolean _reorder;
/**
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/pages/ExceptionReport.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/pages/ExceptionReport.java?rev=634138&r1=634137&r2=634138&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/pages/ExceptionReport.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/pages/ExceptionReport.java Wed Mar 5 19:15:57 2008
@@ -16,7 +16,7 @@
import org.apache.tapestry.TapestryConstants;
import org.apache.tapestry.annotations.ContentType;
-import org.apache.tapestry.annotations.GenerateAccessors;
+import org.apache.tapestry.annotations.Property;
import org.apache.tapestry.ioc.annotations.Inject;
import org.apache.tapestry.ioc.annotations.Symbol;
import org.apache.tapestry.services.ExceptionReporter;
@@ -33,19 +33,19 @@
@ContentType("text/html")
public class ExceptionReport implements ExceptionReporter
{
- @GenerateAccessors
+ @Property
private String _attributeName;
@Inject
- @GenerateAccessors
+ @Property
private Request _request;
@Inject
@Symbol(TapestryConstants.PRODUCTION_MODE_SYMBOL)
- @GenerateAccessors
+ @Property
private boolean _productionMode;
- @GenerateAccessors
+ @Property
private Throwable _rootException;
public void reportException(Throwable exception)
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/pages/ServiceStatus.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/pages/ServiceStatus.java?rev=634138&r1=634137&r2=634138&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/pages/ServiceStatus.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/pages/ServiceStatus.java Wed Mar 5 19:15:57 2008
@@ -15,7 +15,7 @@
package org.apache.tapestry.corelib.pages;
import org.apache.tapestry.ComponentResources;
-import org.apache.tapestry.annotations.GenerateAccessors;
+import org.apache.tapestry.annotations.Property;
import org.apache.tapestry.annotations.Meta;
import org.apache.tapestry.beaneditor.BeanModel;
import org.apache.tapestry.ioc.Registry;
@@ -39,16 +39,16 @@
@Inject
private ServiceActivityScoreboard _scoreboard;
- @GenerateAccessors
+ @Property
private List<ServiceActivity> _activity;
- @GenerateAccessors
+ @Property
private ServiceActivity _row;
@Inject
private BeanModelSource _source;
- @GenerateAccessors
+ @Property
private final BeanModel _model;
@Inject
Copied: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/PropertyWorker.java (from r633150, tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/GenerateAccessorsWorker.java)
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/PropertyWorker.java?p2=tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/PropertyWorker.java&p1=tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/GenerateAccessorsWorker.java&r1=633150&r2=634138&rev=634138&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/GenerateAccessorsWorker.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/PropertyWorker.java Wed Mar 5 19:15:57 2008
@@ -14,7 +14,7 @@
package org.apache.tapestry.internal.transform;
-import org.apache.tapestry.annotations.GenerateAccessors;
+import org.apache.tapestry.annotations.Property;
import org.apache.tapestry.ioc.internal.util.InternalUtils;
import org.apache.tapestry.model.MutableComponentModel;
import org.apache.tapestry.services.ClassTransformation;
@@ -27,14 +27,16 @@
* Provides the getter and setter methods. The methods are added as "existing", meaning that field access to them will
* be transformed as necessary by other annotations. This worker needs to be scheduled before any worker that might
* delete a field.
+ *
+ * @see org.apache.tapestry.annotations.Property
*/
-public class GenerateAccessorsWorker implements ComponentClassTransformWorker
+public class PropertyWorker implements ComponentClassTransformWorker
{
public void transform(ClassTransformation transformation, MutableComponentModel model)
{
- for (String fieldName : transformation.findAllFieldsWithAnnotation(GenerateAccessors.class))
+ for (String fieldName : transformation.findAllFieldsWithAnnotation(Property.class))
{
- GenerateAccessors annotation = transformation.getFieldAnnotation(fieldName, GenerateAccessors.class);
+ Property annotation = transformation.getFieldAnnotation(fieldName, Property.class);
String propertyName = InternalUtils.capitalize(InternalUtils.stripMemberPrefix(fieldName));
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/TapestryModule.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/TapestryModule.java?rev=634138&r1=634137&r2=634138&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/TapestryModule.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/TapestryModule.java Wed Mar 5 19:15:57 2008
@@ -223,7 +223,7 @@
* annotation</dd> <dt>ContentType</dt> <dd>Checks for {@link org.apache.tapestry.annotations.ContentType}
* annotation</dd> <dt>ResponseEncoding</dt> <dd>Checks for the {@link org.apache.tapestry.annotations.ResponseEncoding}
* annotation</dd> <dt>GenerateAccessors</dt> <dd>Generates accessor methods if {@link
- * org.apache.tapestry.annotations.GenerateAccessors} annotation is present </dd> </dl>
+ * org.apache.tapestry.annotations.Property} annotation is present </dd> </dl>
*/
public static void contributeComponentClassTransformWorker(
OrderedConfiguration<ComponentClassTransformWorker> configuration,
@@ -299,12 +299,12 @@
configuration.add("ContentType", new ContentTypeWorker());
configuration.add("ResponseEncoding", new ResponseEncodingWorker());
- configuration.add("GenerateAccessors", new GenerateAccessorsWorker());
+ configuration.add("Property", new PropertyWorker());
- // These must come after GenerateAccessors, since they actually delete fields that may still have the annotation
+ // These must come after Property, since they actually delete fields that may still have the annotation
configuration.add("ApplicationState", locator.autobuild(ApplicationStateWorker.class),
- "after:GenerateAccessors");
- configuration.add("Environment", new EnvironmentalWorker(environment), "after:GenerateAccessors");
+ "after:Property");
+ configuration.add("Environment", new EnvironmentalWorker(environment), "after:Property");
// This one is always last. Any additional private fields that aren't annotated will
// be converted to clear out at the end of the request.
Modified: tapestry/tapestry5/trunk/tapestry-core/src/site/apt/index.apt
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/site/apt/index.apt?rev=634138&r1=634137&r2=634138&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/site/apt/index.apt (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/site/apt/index.apt Wed Mar 5 19:15:57 2008
@@ -10,6 +10,8 @@
New And Of Note
+ * Tapestry can now generate accessor methods for fields automatically via the @Property annotation.
+
* It is now possible to override the built-in display and edit blocks for data types.
* Tapestry now supports "Index" pages at the root or in sub-folders.
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/BeanEditorDemo.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/BeanEditorDemo.java?rev=634138&r1=634137&r2=634138&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/BeanEditorDemo.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/BeanEditorDemo.java Wed Mar 5 19:15:57 2008
@@ -16,7 +16,7 @@
import org.apache.tapestry.annotations.ApplicationState;
import org.apache.tapestry.annotations.Component;
-import org.apache.tapestry.annotations.GenerateAccessors;
+import org.apache.tapestry.annotations.Property;
import org.apache.tapestry.corelib.components.BeanEditForm;
import org.apache.tapestry.integration.app1.data.RegistrationData;
@@ -27,7 +27,7 @@
private BeanEditForm _form;
@ApplicationState
- @GenerateAccessors
+ @Property
private RegistrationData _registrationData;
Object onSuccess()
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/DatumEditor.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/DatumEditor.java?rev=634138&r1=634137&r2=634138&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/DatumEditor.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/DatumEditor.java Wed Mar 5 19:15:57 2008
@@ -14,13 +14,13 @@
package org.apache.tapestry.integration.app1.pages;
-import org.apache.tapestry.annotations.GenerateAccessors;
+import org.apache.tapestry.annotations.Property;
import org.apache.tapestry.annotations.Retain;
public class DatumEditor
{
@Retain
- @GenerateAccessors(write = false)
+ @Property(write = false)
private Datum _datum = new Datum();
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app3/pages/Index.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app3/pages/Index.java?rev=634138&r1=634137&r2=634138&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app3/pages/Index.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app3/pages/Index.java Wed Mar 5 19:15:57 2008
@@ -14,7 +14,7 @@
package org.apache.tapestry.integration.app3.pages;
-import org.apache.tapestry.annotations.GenerateAccessors;
+import org.apache.tapestry.annotations.Property;
import org.apache.tapestry.annotations.InjectPage;
import org.apache.tapestry.annotations.Persist;
@@ -24,7 +24,7 @@
private Login _login;
@Persist
- @GenerateAccessors
+ @Property
private String _message;
boolean onActivate(String message)
Modified: tapestry/tapestry5/trunk/tapestry-hibernate/src/test/java/org/example/app0/pages/Start.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-hibernate/src/test/java/org/example/app0/pages/Start.java?rev=634138&r1=634137&r2=634138&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-hibernate/src/test/java/org/example/app0/pages/Start.java (original)
+++ tapestry/tapestry5/trunk/tapestry-hibernate/src/test/java/org/example/app0/pages/Start.java Wed Mar 5 19:15:57 2008
@@ -14,12 +14,12 @@
package org.example.app0.pages;
-import org.apache.tapestry.annotations.GenerateAccessors;
+import org.apache.tapestry.annotations.Property;
import org.apache.tapestry.ioc.annotations.Inject;
import org.hibernate.Session;
public class Start {
- @GenerateAccessors
+ @Property
@Inject
private Session _session;
Modified: tapestry/tapestry5/trunk/tapestry-tutorial1/src/main/java/org/apache/tapestry/tutorial/pages/GameOver.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-tutorial1/src/main/java/org/apache/tapestry/tutorial/pages/GameOver.java?rev=634138&r1=634137&r2=634138&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-tutorial1/src/main/java/org/apache/tapestry/tutorial/pages/GameOver.java (original)
+++ tapestry/tapestry5/trunk/tapestry-tutorial1/src/main/java/org/apache/tapestry/tutorial/pages/GameOver.java Wed Mar 5 19:15:57 2008
@@ -15,12 +15,12 @@
package org.apache.tapestry.tutorial.pages;
import org.apache.tapestry.annotations.Persist;
-import org.apache.tapestry.annotations.GenerateAccessors;
+import org.apache.tapestry.annotations.Property;
public class GameOver
{
@Persist
- @GenerateAccessors
+ @Property
private int _count;
Object initialize(int count)
Modified: tapestry/tapestry5/trunk/tapestry-tutorial1/src/main/java/org/apache/tapestry/tutorial/pages/Guess.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-tutorial1/src/main/java/org/apache/tapestry/tutorial/pages/Guess.java?rev=634138&r1=634137&r2=634138&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-tutorial1/src/main/java/org/apache/tapestry/tutorial/pages/Guess.java (original)
+++ tapestry/tapestry5/trunk/tapestry-tutorial1/src/main/java/org/apache/tapestry/tutorial/pages/Guess.java Wed Mar 5 19:15:57 2008
@@ -14,7 +14,7 @@
package org.apache.tapestry.tutorial.pages;
-import org.apache.tapestry.annotations.GenerateAccessors;
+import org.apache.tapestry.annotations.Property;
import org.apache.tapestry.annotations.InjectPage;
import org.apache.tapestry.annotations.Persist;
@@ -23,11 +23,11 @@
@Persist
private int _target;
- @GenerateAccessors
+ @Property
private int _guess;
@Persist
- @GenerateAccessors
+ @Property
private String _message;
@Persist
Modified: tapestry/tapestry5/trunk/tapestry-tutorial1/src/main/java/org/apache/tapestry/tutorial/pages/address/CreateAddress.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-tutorial1/src/main/java/org/apache/tapestry/tutorial/pages/address/CreateAddress.java?rev=634138&r1=634137&r2=634138&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-tutorial1/src/main/java/org/apache/tapestry/tutorial/pages/address/CreateAddress.java (original)
+++ tapestry/tapestry5/trunk/tapestry-tutorial1/src/main/java/org/apache/tapestry/tutorial/pages/address/CreateAddress.java Wed Mar 5 19:15:57 2008
@@ -14,11 +14,11 @@
package org.apache.tapestry.tutorial.pages.address;
-import org.apache.tapestry.annotations.GenerateAccessors;
+import org.apache.tapestry.annotations.Property;
import org.apache.tapestry.tutorial.data.Address;
public class CreateAddress
{
- @GenerateAccessors
+ @Property
private Address _address;
}
Modified: tapestry/tapestry5/trunk/tapestry-tutorial1/src/site/apt/hilo.apt
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-tutorial1/src/site/apt/hilo.apt?rev=634138&r1=634137&r2=634138&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-tutorial1/src/site/apt/hilo.apt (original)
+++ tapestry/tapestry5/trunk/tapestry-tutorial1/src/site/apt/hilo.apt Wed Mar 5 19:15:57 2008
@@ -316,7 +316,7 @@
accessors:
---
- @GenerateAccessors
+ @Property
private int _guess;
---
@@ -339,7 +339,7 @@
---
@Persist
- @GenerateAccessors
+ @Property
private String _message;
String onActionFromLink(int guess)
@@ -420,7 +420,7 @@
---
@Persist
- @GenerateAccessors
+ @Property
private int _count;
---
@@ -468,12 +468,12 @@
package org.apache.tapestry.tutorial.pages;
import org.apache.tapestry.annotations.Persist;
-import org.apache.tapestry.annotations.GenerateAccessors;
+import org.apache.tapestry.annotations.Property;
public class GameOver
{
@Persist
- @GenerateAccessors
+ @Property
private int _count;
Object initialize(int count)
Re: svn commit: r634138 - in /tapestry/tapestry5/trunk: tapestry-core/src/main/java/org/apache/tapestry/annotations/ tapestry-core/src/main/java/org/apache/tapestry/corelib/components/ tapestry-core/src/main/java/org/apache/tapestry/corelib/pages/ tapestry...
Posted by "com.liigo@gmail.com" <co...@gmail.com>.
在 Thu, 06 Mar 2008 11:16:01 +0800，<hl...@apache.org> 写道:
> Author: hlship
> Date: Wed Mar 5 19:15:57 2008
> New Revision: 634138
>
> URL: http://svn.apache.org/viewvc?rev=634138&view=rev
> Log:
> Rename the new @GenerateAccessors annotation to @Property.
>
yeah, good
> Added:
> tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/Property.java
> - copied, changed from r633150,
> tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/GenerateAccessors.java
> tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/PropertyWorker.java
> - copied, changed from r633150,
> tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/GenerateAccessorsWorker.java
> Modified:
> tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/BeanDisplay.java
> tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/BeanEditForm.java
> tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/BeanEditor.java
> tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/ExceptionDisplay.java
> tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/Grid.java
> tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/GridColumns.java
> tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/GridRows.java
> tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/Palette.java
> tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/pages/ExceptionReport.java
> tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/pages/ServiceStatus.java
> tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/TapestryModule.java
> tapestry/tapestry5/trunk/tapestry-core/src/site/apt/index.apt
> tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/BeanEditorDemo.java
> tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/DatumEditor.java
> tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app3/pages/Index.java
> tapestry/tapestry5/trunk/tapestry-hibernate/src/test/java/org/example/app0/pages/Start.java
> tapestry/tapestry5/trunk/tapestry-tutorial1/src/main/java/org/apache/tapestry/tutorial/pages/GameOver.java
> tapestry/tapestry5/trunk/tapestry-tutorial1/src/main/java/org/apache/tapestry/tutorial/pages/Guess.java
> tapestry/tapestry5/trunk/tapestry-tutorial1/src/main/java/org/apache/tapestry/tutorial/pages/address/CreateAddress.java
> tapestry/tapestry5/trunk/tapestry-tutorial1/src/site/apt/hilo.apt
>
> Copied:
> tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/Property.java
> (from r633150,
> tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/GenerateAccessors.java)
> URL:
> http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/Property.java?p2=tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/Property.java&p1=tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/GenerateAccessors.java&r1=633150&r2=634138&rev=634138&view=diff
> ==============================================================================
> ---
> tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/GenerateAccessors.java
> (original)
> +++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/annotations/Property.java
> Wed Mar 5 19:15:57 2008
> @@ -28,7 +28,7 @@
> @Target(FIELD)
> @Documented
> @Retention(RUNTIME)
> -public @interface GenerateAccessors
> +public @interface Property
> {
> /** Whether to create a readable property (i.e., generate a getter
> method). */
> boolean read() default true;
>
> Modified:
> tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/BeanDisplay.java
> URL:
> http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/BeanDisplay.java?rev=634138&r1=634137&r2=634138&view=diff
> ==============================================================================
> ---
> tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/BeanDisplay.java
> (original)
> +++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/BeanDisplay.java
> Wed Mar 5 19:15:57 2008
> @@ -16,7 +16,7 @@
> import org.apache.tapestry.Binding;
> import org.apache.tapestry.ComponentResources;
> -import org.apache.tapestry.annotations.GenerateAccessors;
> +import org.apache.tapestry.annotations.Property;
> import org.apache.tapestry.annotations.Parameter;
> import org.apache.tapestry.annotations.SupportsInformalParameters;
> import org.apache.tapestry.beaneditor.BeanModel;
> @@ -43,7 +43,7 @@
> * component's id will be used.
> */
> @Parameter(required = true)
> - @GenerateAccessors(write = false)
> + @Property(write = false)
> private Object _object;
> /**
> @@ -58,7 +58,7 @@
> * a default bean model will be created from the type of the object
> bound to the object parameter.
> */
> @Parameter
> - @GenerateAccessors(write = false)
> + @Property(write = false)
> private BeanModel _model;
> /**
> @@ -83,7 +83,7 @@
> * searched.
> */
> @Parameter(value = "componentResources")
> - @GenerateAccessors(write = false)
> + @Property(write = false)
> private ComponentResources _overrides;
> @Inject
> @@ -95,7 +95,7 @@
> @Inject
> private BeanModelSource _modelSource;
> - @GenerateAccessors
> + @Property
> private String _propertyName;
> /**
>
> Modified:
> tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/BeanEditForm.java
> URL:
> http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/BeanEditForm.java?rev=634138&r1=634137&r2=634138&view=diff
> ==============================================================================
> ---
> tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/BeanEditForm.java
> (original)
> +++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/BeanEditForm.java
> Wed Mar 5 19:15:57 2008
> @@ -45,7 +45,7 @@
> * The text label for the submit button of the form, by default
> "Create/Update".
> */
> @Parameter(value = "message:submit-label", defaultPrefix =
> "literal")
> - @GenerateAccessors
> + @Property
> private String _submitLabel;
> /**
> @@ -56,7 +56,7 @@
> */
> @SuppressWarnings("unused")
> @Parameter(required = true)
> - @GenerateAccessors
> + @Property
> private Object _object;
> /**
> @@ -95,7 +95,7 @@
> */
> @SuppressWarnings("unused")
> @Parameter
> - @GenerateAccessors
> + @Property
> private BeanModel _model;
> @Inject
>
> Modified:
> tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/BeanEditor.java
> URL:
> http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/BeanEditor.java?rev=634138&r1=634137&r2=634138&view=diff
> ==============================================================================
> ---
> tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/BeanEditor.java
> (original)
> +++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/BeanEditor.java
> Wed Mar 5 19:15:57 2008
> @@ -18,7 +18,7 @@
> import org.apache.tapestry.ComponentAction;
> import org.apache.tapestry.ComponentResources;
> import org.apache.tapestry.annotations.Environmental;
> -import org.apache.tapestry.annotations.GenerateAccessors;
> +import org.apache.tapestry.annotations.Property;
> import org.apache.tapestry.annotations.Parameter;
> import org.apache.tapestry.annotations.SupportsInformalParameters;
> import org.apache.tapestry.beaneditor.BeanModel;
> @@ -75,7 +75,7 @@
> * default bean model will be created from the type of the object
> bound to the object parameter.
> */
> @Parameter
> - @GenerateAccessors(write = false)
> + @Property(write = false)
> private BeanModel _model;
> /**
> @@ -85,7 +85,7 @@
> * be searched.
> */
> @Parameter(value = "componentResources")
> - @GenerateAccessors(write = false)
> + @Property(write = false)
> private ComponentResources _overrides;
> @Inject
> @@ -102,7 +102,7 @@
> // Value that change with each change to the current property:
> - @GenerateAccessors
> + @Property
> private String _propertyName;
> /**
>
> Modified:
> tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/ExceptionDisplay.java
> URL:
> http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/ExceptionDisplay.java?rev=634138&r1=634137&r2=634138&view=diff
> ==============================================================================
> ---
> tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/ExceptionDisplay.java
> (original)
> +++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/ExceptionDisplay.java
> Wed Mar 5 19:15:57 2008
> @@ -14,7 +14,7 @@
> package org.apache.tapestry.corelib.components;
> -import org.apache.tapestry.annotations.GenerateAccessors;
> +import org.apache.tapestry.annotations.Property;
> import org.apache.tapestry.annotations.Parameter;
> import org.apache.tapestry.internal.InternalConstants;
> import org.apache.tapestry.ioc.annotations.Inject;
> @@ -46,16 +46,16 @@
> @Symbol(InternalConstants.TAPESTRY_APP_PACKAGE_PARAM)
> private String _appPackage;
> - @GenerateAccessors
> + @Property
> private ExceptionInfo _info;
> - @GenerateAccessors
> + @Property
> private String _propertyName;
> - @GenerateAccessors
> + @Property
> private StackTraceElement _frame;
> - @GenerateAccessors
> + @Property
> private List<ExceptionInfo> _stack;
> void setupRender()
>
> Modified:
> tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/Grid.java
> URL:
> http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/Grid.java?rev=634138&r1=634137&r2=634138&view=diff
> ==============================================================================
> ---
> tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/Grid.java
> (original)
> +++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/Grid.java
> Wed Mar 5 19:15:57 2008
> @@ -62,7 +62,7 @@
> * set.
> */
> @Parameter("25")
> - @GenerateAccessors
> + @Property
> private int _rowsPerPage;
> /**
> @@ -78,7 +78,7 @@
> * use the property bound to the row parameter to know what they
> should render.
> */
> @Parameter
> - @GenerateAccessors
> + @Property
> private Object _row;
> /**
> @@ -151,11 +151,11 @@
> * between CSS values (for the "zebra effect"). If null or not
> bound, then no particular CSS class value is used.
> */
> @Parameter(cache = false)
> - @GenerateAccessors(write = false)
> + @Property(write = false)
> private String _rowClass;
> @Persist
> - @GenerateAccessors
> + @Property
> private int _currentPage = 1;
> @Persist
>
> Modified:
> tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/GridColumns.java
> URL:
> http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/GridColumns.java?rev=634138&r1=634137&r2=634138&view=diff
> ==============================================================================
> ---
> tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/GridColumns.java
> (original)
> +++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/GridColumns.java
> Wed Mar 5 19:15:57 2008
> @@ -80,12 +80,12 @@
> @Inject
> private Block _standardHeader;
> - @GenerateAccessors
> + @Property
> private int _columnIndex;
> private int _lastColumnIndex;
> - @GenerateAccessors(write = false)
> + @Property(write = false)
> private PropertyModel _columnModel;
> void setupRender()
>
> Modified:
> tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/GridRows.java
> URL:
> http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/GridRows.java?rev=634138&r1=634137&r2=634138&view=diff
> ==============================================================================
> ---
> tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/GridRows.java
> (original)
> +++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/GridRows.java
> Wed Mar 5 19:15:57 2008
> @@ -17,7 +17,7 @@
> import org.apache.tapestry.ComponentAction;
> import org.apache.tapestry.annotations.Environmental;
> import org.apache.tapestry.annotations.Parameter;
> -import org.apache.tapestry.annotations.GenerateAccessors;
> +import org.apache.tapestry.annotations.Property;
> import org.apache.tapestry.beaneditor.PropertyModel;
> import org.apache.tapestry.grid.GridConstants;
> import org.apache.tapestry.grid.GridDataSource;
> @@ -87,7 +87,7 @@
> * container, to know what object is being rendered.
> */
> @Parameter(required = true)
> - @GenerateAccessors(write=false)
> + @Property(write=false)
> private Object _row;
> /**
> @@ -117,7 +117,7 @@
> private String _propertyName;
> - @GenerateAccessors(write=false)
> + @Property(write=false)
> private PropertyModel _columnModel;
> public String getRowClass()
>
> Modified:
> tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/Palette.java
> URL:
> http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/Palette.java?rev=634138&r1=634137&r2=634138&view=diff
> ==============================================================================
> ---
> tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/Palette.java
> (original)
> +++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/components/Palette.java
> Wed Mar 5 19:15:57 2008
> @@ -18,7 +18,7 @@
> import org.apache.tapestry.annotations.Environmental;
> import org.apache.tapestry.annotations.IncludeJavaScriptLibrary;
> import org.apache.tapestry.annotations.Parameter;
> -import org.apache.tapestry.annotations.GenerateAccessors;
> +import org.apache.tapestry.annotations.Property;
> import org.apache.tapestry.corelib.base.AbstractField;
> import org.apache.tapestry.internal.util.SelectModelRenderer;
> import org.apache.tapestry.ioc.annotations.Inject;
> @@ -158,7 +158,7 @@
> * The image to use for the deselect button (the default is a left
> pointing arrow).
> */
> @Parameter(value = "asset:deselect.png")
> - @GenerateAccessors(write=false)
> + @Property(write=false)
> private Asset _deselect;
> /**
> @@ -177,14 +177,14 @@
> * The image to use for the move down button (the default is a
> downward pointing arrow).
> */
> @Parameter(value = "asset:move_down.png")
> - @GenerateAccessors(write=false)
> + @Property(write=false)
> private Asset _moveDown;
> /**
> * The image to use for the move up button (the default is an
> upward pointing arrow).
> */
> @Parameter(value = "asset:move_up.png")
> - @GenerateAccessors(write=false)
> + @Property(write=false)
> private Asset _moveUp;
> /**
> @@ -205,7 +205,7 @@
> * The image to use for the select button (the default is a right
> pointing arrow).
> */
> @Parameter(value = "asset:select.png")
> - @GenerateAccessors(write=false)
> + @Property(write=false)
> private Asset _select;
> /**
> @@ -220,7 +220,7 @@
> * If true, then additional buttons are provided on the client-side
> to allow for re-ordering of the values.
> */
> @Parameter("false")
> - @GenerateAccessors(write=false)
> + @Property(write=false)
> private boolean _reorder;
> /**
>
> Modified:
> tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/pages/ExceptionReport.java
> URL:
> http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/pages/ExceptionReport.java?rev=634138&r1=634137&r2=634138&view=diff
> ==============================================================================
> ---
> tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/pages/ExceptionReport.java
> (original)
> +++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/pages/ExceptionReport.java
> Wed Mar 5 19:15:57 2008
> @@ -16,7 +16,7 @@
> import org.apache.tapestry.TapestryConstants;
> import org.apache.tapestry.annotations.ContentType;
> -import org.apache.tapestry.annotations.GenerateAccessors;
> +import org.apache.tapestry.annotations.Property;
> import org.apache.tapestry.ioc.annotations.Inject;
> import org.apache.tapestry.ioc.annotations.Symbol;
> import org.apache.tapestry.services.ExceptionReporter;
> @@ -33,19 +33,19 @@
> @ContentType("text/html")
> public class ExceptionReport implements ExceptionReporter
> {
> - @GenerateAccessors
> + @Property
> private String _attributeName;
> @Inject
> - @GenerateAccessors
> + @Property
> private Request _request;
> @Inject
> @Symbol(TapestryConstants.PRODUCTION_MODE_SYMBOL)
> - @GenerateAccessors
> + @Property
> private boolean _productionMode;
> - @GenerateAccessors
> + @Property
> private Throwable _rootException;
> public void reportException(Throwable exception)
>
> Modified:
> tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/pages/ServiceStatus.java
> URL:
> http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/pages/ServiceStatus.java?rev=634138&r1=634137&r2=634138&view=diff
> ==============================================================================
> ---
> tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/pages/ServiceStatus.java
> (original)
> +++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/corelib/pages/ServiceStatus.java
> Wed Mar 5 19:15:57 2008
> @@ -15,7 +15,7 @@
> package org.apache.tapestry.corelib.pages;
> import org.apache.tapestry.ComponentResources;
> -import org.apache.tapestry.annotations.GenerateAccessors;
> +import org.apache.tapestry.annotations.Property;
> import org.apache.tapestry.annotations.Meta;
> import org.apache.tapestry.beaneditor.BeanModel;
> import org.apache.tapestry.ioc.Registry;
> @@ -39,16 +39,16 @@
> @Inject
> private ServiceActivityScoreboard _scoreboard;
> - @GenerateAccessors
> + @Property
> private List<ServiceActivity> _activity;
> - @GenerateAccessors
> + @Property
> private ServiceActivity _row;
> @Inject
> private BeanModelSource _source;
> - @GenerateAccessors
> + @Property
> private final BeanModel _model;
> @Inject
>
> Copied:
> tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/PropertyWorker.java
> (from r633150,
> tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/GenerateAccessorsWorker.java)
> URL:
> http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/PropertyWorker.java?p2=tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/PropertyWorker.java&p1=tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/GenerateAccessorsWorker.java&r1=633150&r2=634138&rev=634138&view=diff
> ==============================================================================
> ---
> tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/GenerateAccessorsWorker.java
> (original)
> +++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/transform/PropertyWorker.java
> Wed Mar 5 19:15:57 2008
> @@ -14,7 +14,7 @@
> package org.apache.tapestry.internal.transform;
> -import org.apache.tapestry.annotations.GenerateAccessors;
> +import org.apache.tapestry.annotations.Property;
> import org.apache.tapestry.ioc.internal.util.InternalUtils;
> import org.apache.tapestry.model.MutableComponentModel;
> import org.apache.tapestry.services.ClassTransformation;
> @@ -27,14 +27,16 @@
> * Provides the getter and setter methods. The methods are added as
> "existing", meaning that field access to them will
> * be transformed as necessary by other annotations. This worker needs
> to be scheduled before any worker that might
> * delete a field.
> + *
> + * @see org.apache.tapestry.annotations.Property
> */
> -public class GenerateAccessorsWorker implements
> ComponentClassTransformWorker
> +public class PropertyWorker implements ComponentClassTransformWorker
> {
> public void transform(ClassTransformation transformation,
> MutableComponentModel model)
> {
> - for (String fieldName :
> transformation.findAllFieldsWithAnnotation(GenerateAccessors.class))
> + for (String fieldName :
> transformation.findAllFieldsWithAnnotation(Property.class))
> {
> - GenerateAccessors annotation =
> transformation.getFieldAnnotation(fieldName, GenerateAccessors.class);
> + Property annotation =
> transformation.getFieldAnnotation(fieldName, Property.class);
> String propertyName =
> InternalUtils.capitalize(InternalUtils.stripMemberPrefix(fieldName));
>
> Modified:
> tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/TapestryModule.java
> URL:
> http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/TapestryModule.java?rev=634138&r1=634137&r2=634138&view=diff
> ==============================================================================
> ---
> tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/TapestryModule.java
> (original)
> +++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/TapestryModule.java
> Wed Mar 5 19:15:57 2008
> @@ -223,7 +223,7 @@
> * annotation</dd> <dt>ContentType</dt> <dd>Checks for {@link
> org.apache.tapestry.annotations.ContentType}
> * annotation</dd> <dt>ResponseEncoding</dt> <dd>Checks for the
> {@link org.apache.tapestry.annotations.ResponseEncoding}
> * annotation</dd> <dt>GenerateAccessors</dt> <dd>Generates
> accessor methods if {@link
> - * org.apache.tapestry.annotations.GenerateAccessors} annotation is
> present </dd> </dl>
> + * org.apache.tapestry.annotations.Property} annotation is present
> </dd> </dl>
> */
> public static void contributeComponentClassTransformWorker(
> OrderedConfiguration<ComponentClassTransformWorker>
> configuration,
> @@ -299,12 +299,12 @@
> configuration.add("ContentType", new ContentTypeWorker());
> configuration.add("ResponseEncoding", new
> ResponseEncodingWorker());
> - configuration.add("GenerateAccessors", new
> GenerateAccessorsWorker());
> + configuration.add("Property", new PropertyWorker());
> - // These must come after GenerateAccessors, since they actually
> delete fields that may still have the annotation
> + // These must come after Property, since they actually delete
> fields that may still have the annotation
> configuration.add("ApplicationState",
> locator.autobuild(ApplicationStateWorker.class),
> - "after:GenerateAccessors");
> - configuration.add("Environment", new
> EnvironmentalWorker(environment), "after:GenerateAccessors");
> + "after:Property");
> + configuration.add("Environment", new
> EnvironmentalWorker(environment), "after:Property");
> // This one is always last. Any additional private fields that
> aren't annotated will
> // be converted to clear out at the end of the request.
>
> Modified: tapestry/tapestry5/trunk/tapestry-core/src/site/apt/index.apt
> URL:
> http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/site/apt/index.apt?rev=634138&r1=634137&r2=634138&view=diff
> ==============================================================================
> --- tapestry/tapestry5/trunk/tapestry-core/src/site/apt/index.apt
> (original)
> +++ tapestry/tapestry5/trunk/tapestry-core/src/site/apt/index.apt Wed
> Mar 5 19:15:57 2008
> @@ -10,6 +10,8 @@
> New And Of Note
> + * Tapestry can now generate accessor methods for fields automatically
> via the @Property annotation.
> +
> * It is now possible to override the built-in display and edit blocks
> for data types.
> * Tapestry now supports "Index" pages at the root or in sub-folders.
>
> Modified:
> tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/BeanEditorDemo.java
> URL:
> http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/BeanEditorDemo.java?rev=634138&r1=634137&r2=634138&view=diff
> ==============================================================================
> ---
> tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/BeanEditorDemo.java
> (original)
> +++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/BeanEditorDemo.java
> Wed Mar 5 19:15:57 2008
> @@ -16,7 +16,7 @@
> import org.apache.tapestry.annotations.ApplicationState;
> import org.apache.tapestry.annotations.Component;
> -import org.apache.tapestry.annotations.GenerateAccessors;
> +import org.apache.tapestry.annotations.Property;
> import org.apache.tapestry.corelib.components.BeanEditForm;
> import org.apache.tapestry.integration.app1.data.RegistrationData;
> @@ -27,7 +27,7 @@
> private BeanEditForm _form;
> @ApplicationState
> - @GenerateAccessors
> + @Property
> private RegistrationData _registrationData;
> Object onSuccess()
>
> Modified:
> tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/DatumEditor.java
> URL:
> http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/DatumEditor.java?rev=634138&r1=634137&r2=634138&view=diff
> ==============================================================================
> ---
> tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/DatumEditor.java
> (original)
> +++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/DatumEditor.java
> Wed Mar 5 19:15:57 2008
> @@ -14,13 +14,13 @@
> package org.apache.tapestry.integration.app1.pages;
> -import org.apache.tapestry.annotations.GenerateAccessors;
> +import org.apache.tapestry.annotations.Property;
> import org.apache.tapestry.annotations.Retain;
> public class DatumEditor
> {
> @Retain
> - @GenerateAccessors(write = false)
> + @Property(write = false)
> private Datum _datum = new Datum();
>
> Modified:
> tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app3/pages/Index.java
> URL:
> http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app3/pages/Index.java?rev=634138&r1=634137&r2=634138&view=diff
> ==============================================================================
> ---
> tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app3/pages/Index.java
> (original)
> +++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app3/pages/Index.java
> Wed Mar 5 19:15:57 2008
> @@ -14,7 +14,7 @@
> package org.apache.tapestry.integration.app3.pages;
> -import org.apache.tapestry.annotations.GenerateAccessors;
> +import org.apache.tapestry.annotations.Property;
> import org.apache.tapestry.annotations.InjectPage;
> import org.apache.tapestry.annotations.Persist;
> @@ -24,7 +24,7 @@
> private Login _login;
> @Persist
> - @GenerateAccessors
> + @Property
> private String _message;
> boolean onActivate(String message)
>
> Modified:
> tapestry/tapestry5/trunk/tapestry-hibernate/src/test/java/org/example/app0/pages/Start.java
> URL:
> http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-hibernate/src/test/java/org/example/app0/pages/Start.java?rev=634138&r1=634137&r2=634138&view=diff
> ==============================================================================
> ---
> tapestry/tapestry5/trunk/tapestry-hibernate/src/test/java/org/example/app0/pages/Start.java
> (original)
> +++ tapestry/tapestry5/trunk/tapestry-hibernate/src/test/java/org/example/app0/pages/Start.java
> Wed Mar 5 19:15:57 2008
> @@ -14,12 +14,12 @@
> package org.example.app0.pages;
> -import org.apache.tapestry.annotations.GenerateAccessors;
> +import org.apache.tapestry.annotations.Property;
> import org.apache.tapestry.ioc.annotations.Inject;
> import org.hibernate.Session;
> public class Start {
> - @GenerateAccessors
> + @Property
> @Inject
> private Session _session;
>
>
> Modified:
> tapestry/tapestry5/trunk/tapestry-tutorial1/src/main/java/org/apache/tapestry/tutorial/pages/GameOver.java
> URL:
> http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-tutorial1/src/main/java/org/apache/tapestry/tutorial/pages/GameOver.java?rev=634138&r1=634137&r2=634138&view=diff
> ==============================================================================
> ---
> tapestry/tapestry5/trunk/tapestry-tutorial1/src/main/java/org/apache/tapestry/tutorial/pages/GameOver.java
> (original)
> +++ tapestry/tapestry5/trunk/tapestry-tutorial1/src/main/java/org/apache/tapestry/tutorial/pages/GameOver.java
> Wed Mar 5 19:15:57 2008
> @@ -15,12 +15,12 @@
> package org.apache.tapestry.tutorial.pages;
> import org.apache.tapestry.annotations.Persist;
> -import org.apache.tapestry.annotations.GenerateAccessors;
> +import org.apache.tapestry.annotations.Property;
> public class GameOver
> {
> @Persist
> - @GenerateAccessors
> + @Property
> private int _count;
> Object initialize(int count)
>
> Modified:
> tapestry/tapestry5/trunk/tapestry-tutorial1/src/main/java/org/apache/tapestry/tutorial/pages/Guess.java
> URL:
> http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-tutorial1/src/main/java/org/apache/tapestry/tutorial/pages/Guess.java?rev=634138&r1=634137&r2=634138&view=diff
> ==============================================================================
> ---
> tapestry/tapestry5/trunk/tapestry-tutorial1/src/main/java/org/apache/tapestry/tutorial/pages/Guess.java
> (original)
> +++ tapestry/tapestry5/trunk/tapestry-tutorial1/src/main/java/org/apache/tapestry/tutorial/pages/Guess.java
> Wed Mar 5 19:15:57 2008
> @@ -14,7 +14,7 @@
> package org.apache.tapestry.tutorial.pages;
> -import org.apache.tapestry.annotations.GenerateAccessors;
> +import org.apache.tapestry.annotations.Property;
> import org.apache.tapestry.annotations.InjectPage;
> import org.apache.tapestry.annotations.Persist;
> @@ -23,11 +23,11 @@
> @Persist
> private int _target;
> - @GenerateAccessors
> + @Property
> private int _guess;
> @Persist
> - @GenerateAccessors
> + @Property
> private String _message;
> @Persist
>
> Modified:
> tapestry/tapestry5/trunk/tapestry-tutorial1/src/main/java/org/apache/tapestry/tutorial/pages/address/CreateAddress.java
> URL:
> http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-tutorial1/src/main/java/org/apache/tapestry/tutorial/pages/address/CreateAddress.java?rev=634138&r1=634137&r2=634138&view=diff
> ==============================================================================
> ---
> tapestry/tapestry5/trunk/tapestry-tutorial1/src/main/java/org/apache/tapestry/tutorial/pages/address/CreateAddress.java
> (original)
> +++ tapestry/tapestry5/trunk/tapestry-tutorial1/src/main/java/org/apache/tapestry/tutorial/pages/address/CreateAddress.java
> Wed Mar 5 19:15:57 2008
> @@ -14,11 +14,11 @@
> package org.apache.tapestry.tutorial.pages.address;
> -import org.apache.tapestry.annotations.GenerateAccessors;
> +import org.apache.tapestry.annotations.Property;
> import org.apache.tapestry.tutorial.data.Address;
> public class CreateAddress
> {
> - @GenerateAccessors
> + @Property
> private Address _address;
> }
>
> Modified:
> tapestry/tapestry5/trunk/tapestry-tutorial1/src/site/apt/hilo.apt
> URL:
> http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-tutorial1/src/site/apt/hilo.apt?rev=634138&r1=634137&r2=634138&view=diff
> ==============================================================================
> --- tapestry/tapestry5/trunk/tapestry-tutorial1/src/site/apt/hilo.apt
> (original)
> +++ tapestry/tapestry5/trunk/tapestry-tutorial1/src/site/apt/hilo.apt
> Wed Mar 5 19:15:57 2008
> @@ -316,7 +316,7 @@
> accessors:
> ---
> - @GenerateAccessors
> + @Property
> private int _guess;
> ---
> @@ -339,7 +339,7 @@
> ---
> @Persist
> - @GenerateAccessors
> + @Property
> private String _message;
> String onActionFromLink(int guess)
> @@ -420,7 +420,7 @@
> ---
> @Persist
> - @GenerateAccessors
> + @Property
> private int _count;
> ---
> @@ -468,12 +468,12 @@
> package org.apache.tapestry.tutorial.pages;
> import org.apache.tapestry.annotations.Persist;
> -import org.apache.tapestry.annotations.GenerateAccessors;
> +import org.apache.tapestry.annotations.Property;
> public class GameOver
> {
> @Persist
> - @GenerateAccessors
> + @Property
> private int _count;
> Object initialize(int count)
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tapestry.apache.org
For additional commands, e-mail: dev-help@tapestry.apache.org