Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/test/PageTester.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/test/PageTester.java?rev=632791&r1=632790&r2=632791&view=diff ============================================================================== --- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/test/PageTester.java (original) +++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/test/PageTester.java Sun Mar 2 09:21:16 2008 @@ -33,10 +33,10 @@ import java.util.Map; /** - * This class is used to run a Tapestry app in an in-process testing environment. You can ask it to - * render a certain page and check the DOM object created. You can also ask it to click on a link - * element in the DOM object to get the next page. Because no servlet container is required, it is - * very fast and you can directly debug into your code in your IDE. + * This class is used to run a Tapestry app in an in-process testing environment. You can ask it to render a certain + * page and check the DOM object created. You can also ask it to click on a link element in the DOM object to get the + * next page. Because no servlet container is required, it is very fast and you can directly debug into your code in + * your IDE. */ public class PageTester implements ComponentInvoker { @@ -57,8 +57,8 @@ private static final String DEFAULT_SUBMIT_VALUE_ATTRIBUTE = "Submit Query"; /** - * Initializes a PageTester without overriding any services and assuming that the context root - * is in src/main/webapp. + * Initializes a PageTester without overriding any services and assuming that the context root is in + * src/main/webapp. * * @see #PageTester(String, String, String, Class[]) */ @@ -68,16 +68,14 @@ } /** - * Initializes a PageTester that acts as a browser and a servlet container to test drive your - * Tapestry pages. + * Initializes a PageTester that acts as a browser and a servlet container to test drive your Tapestry pages. * - * @param appPackage The same value you would specify using the tapestry.app-package context parameter. - * As this testing environment is not run in a servlet container, you need to specify - * it. - * @param appName The same value you would specify as the filter name. It is used to form the name - * of the module builder for your app. If you don't have one, pass an empty string. - * @param contextPath The path to the context root so that Tapestry can find the templates (if they're - * put there). + * @param appPackage The same value you would specify using the tapestry.app-package context parameter. As this + * testing environment is not run in a servlet container, you need to specify it. + * @param appName The same value you would specify as the filter name. It is used to form the name of the + * module builder for your app. If you don't have one, pass an empty string. + * @param contextPath The path to the context root so that Tapestry can find the templates (if they're put + * there). * @param moduleClasses Classes of additional modules to load */ public PageTester(String appPackage, String appName, String contextPath, Class... moduleClasses) @@ -173,8 +171,7 @@ } /** - * Simulates a submission of the form specified. The caller can specify values for the form - * fields. + * Simulates a submission of the form specified. The caller can specify values for the form fields. * * @param form the form to be submitted. * @param parameters the query parameter name/value pairs @@ -196,8 +193,8 @@ } /** - * Simulates a submission of the form by clicking the specified submit button. The caller can - * specify values for the form fields. + * Simulates a submission of the form by clicking the specified submit button. The caller can specify values for the + * form fields. * * @param submitButton the submit button to be clicked. * @param fieldValues the field values keyed on field names.
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/util/AbstractSelectModel.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/util/AbstractSelectModel.java?rev=632791&r1=632790&r2=632791&view=diff ============================================================================== --- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/util/AbstractSelectModel.java (original) +++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/util/AbstractSelectModel.java Sun Mar 2 09:21:16 2008 @@ -22,8 +22,8 @@ import java.util.List; /** - * Base class for [EMAIL PROTECTED] SelectModel} implementations, whose primary job is to provide the - * [EMAIL PROTECTED] #visit(SelectModelVisitor)} method. + * Base class for [EMAIL PROTECTED] SelectModel} implementations, whose primary job is to provide the [EMAIL PROTECTED] + * #visit(SelectModelVisitor)} method. */ public abstract class AbstractSelectModel implements SelectModel { Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/util/DefaultPrimaryKeyEncoder.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/util/DefaultPrimaryKeyEncoder.java?rev=632791&r1=632790&r2=632791&view=diff ============================================================================== --- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/util/DefaultPrimaryKeyEncoder.java (original) +++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/util/DefaultPrimaryKeyEncoder.java Sun Mar 2 09:21:16 2008 @@ -25,16 +25,13 @@ import java.util.Set; /** - * A default, extensible version of [EMAIL PROTECTED] PrimaryKeyEncoder} that is based on loading known values - * into an internal map. When there's a reasonable number (hundreds, perhaps thousands) of items to - * choose from, and those items are fast and cheap to read and instantiate, this implementation is a - * good bet. For very large result sets, you'll need to create your own implementation of - * [EMAIL PROTECTED] PrimaryKeyEncoder}. + * A default, extensible version of [EMAIL PROTECTED] PrimaryKeyEncoder} that is based on loading known values into an internal + * map. When there's a reasonable number (hundreds, perhaps thousands) of items to choose from, and those items are fast + * and cheap to read and instantiate, this implementation is a good bet. For very large result sets, you'll need to + * create your own implementation of [EMAIL PROTECTED] PrimaryKeyEncoder}. * - * @param <K> - * the key type (which must be serializable) - * @param <V> - * the value type + * @param <K> the key type (which must be serializable) + * @param <V> the value type */ public class DefaultPrimaryKeyEncoder<K extends Serializable, V> implements PrimaryKeyEncoder<K, V> { @@ -65,8 +62,8 @@ } /** - * Returns the values previously [EMAIL PROTECTED] #add(Serializable, Object) added to the encoder}, - * <em>in the order in which they were added</em>. Values that are deleted are not returned. + * Returns the values previously [EMAIL PROTECTED] #add(Serializable, Object) added to the encoder}, <em>in the order in which + * they were added</em>. Values that are deleted are not returned. * * @return ordered list of values */ @@ -76,8 +73,8 @@ } /** - * Returns a list of all the values <em>except</em> those values whose keys are in the - * provided set. The set may be null, in which case all values are returned. + * Returns a list of all the values <em>except</em> those values whose keys are in the provided set. The set may be + * null, in which case all values are returned. * * @param keySet set of keys identifying values to exclude, or null to exclude no values * @return values (not in the set) in order origionally added @@ -112,8 +109,8 @@ } /** - * For a previously [EMAIL PROTECTED] #add(Serializable, Object) added key/value pair}, returns the key - * corresponding to the given value. + * For a previously [EMAIL PROTECTED] #add(Serializable, Object) added key/value pair}, returns the key corresponding to the + * given value. */ public final K toKey(V value) { @@ -146,11 +143,10 @@ } /** - * Invoked by [EMAIL PROTECTED] #toValue(Serializable)} whenever a key can not be converted to a value - * using the internal cache. This is an opportunity to record the fact that an error occured - * (they key was not valuable, possibly because it points to a deleted entity object) and - * provide a temporary object. This method may return null, but in a typical application, that - * will likely case NullPointerExceptions further down the processing chain. + * Invoked by [EMAIL PROTECTED] #toValue(Serializable)} whenever a key can not be converted to a value using the internal + * cache. This is an opportunity to record the fact that an error occured (they key was not valuable, possibly + * because it points to a deleted entity object) and provide a temporary object. This method may return null, but in + * a typical application, that will likely case NullPointerExceptions further down the processing chain. * <p/> * This implementation returns null, and is intended to be overriden in subclasses. * @@ -186,14 +182,9 @@ /** * Modifies a keySet to add or remove the current key. If necessary, a new Set is created. * <p/> - * Useage: <code> - * private Set<K> _myFlagKeys; + * Useage: <code> private Set<K> _myFlagKeys; * <p/> - * public boolean void setMyFlag(boolean value) - * { - * _myFlagKeys = modifySet(_myFlagKeys, value); - * } - * </code> + * public boolean void setMyFlag(boolean value) { _myFlagKeys = modifySet(_myFlagKeys, value); } </code> * * @param keySet the set of keys, or null * @param value true to add the current key, false to remove Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/validator/Required.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/validator/Required.java?rev=632791&r1=632790&r2=632791&view=diff ============================================================================== --- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/validator/Required.java (original) +++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/validator/Required.java Sun Mar 2 09:21:16 2008 @@ -21,8 +21,7 @@ import org.apache.tapestry.services.FormSupport; /** - * A validator that enforces that the value is not null and not the empty string. This validator is - * not configurable. + * A validator that enforces that the value is not null and not the empty string. This validator is not configurable. */ public final class Required extends AbstractValidator<Void, Object> { Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/resources/org/apache/tapestry/corelib/components/BeanEditForm.tml URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/resources/org/apache/tapestry/corelib/components/BeanEditForm.tml?rev=632791&r1=632790&r2=632791&view=diff ============================================================================== --- tapestry/tapestry5/trunk/tapestry-core/src/main/resources/org/apache/tapestry/corelib/components/BeanEditForm.tml (original) +++ tapestry/tapestry5/trunk/tapestry-core/src/main/resources/org/apache/tapestry/corelib/components/BeanEditForm.tml Sun Mar 2 09:21:16 2008 @@ -1,15 +1,15 @@ <form t:id="form" - xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd";> - <t:errors /> + xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd";> + <t:errors/> - <div class="t-beaneditor"> + <div class="t-beaneditor"> - <t:beaneditor t:id="editor" object="object" remove="inherit:remove" - reorder="inherit:reorder" model="model" overrides="this" /> + <t:beaneditor t:id="editor" object="object" remove="inherit:remove" + reorder="inherit:reorder" model="model" overrides="this"/> - <div class="t-beaneditor-row"> - <input type="submit" class="t-beaneditor-submit" value="${submitLabel}" /> + <div class="t-beaneditor-row"> + <input type="submit" class="t-beaneditor-submit" value="${submitLabel}"/> + </div> </div> - </div> </form> Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/resources/org/apache/tapestry/corelib/components/Grid.tml URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/resources/org/apache/tapestry/corelib/components/Grid.tml?rev=632791&r1=632790&r2=632791&view=diff ============================================================================== --- tapestry/tapestry5/trunk/tapestry-core/src/main/resources/org/apache/tapestry/corelib/components/Grid.tml (original) +++ tapestry/tapestry5/trunk/tapestry-core/src/main/resources/org/apache/tapestry/corelib/components/Grid.tml Sun Mar 2 09:21:16 2008 @@ -1,20 +1,20 @@ <div class="t-data-grid" xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd";> - - <div t:id="pagerTop"/> - - <table class="t-data-grid"> - <thead t:id="columns"/> - <tbody> - <tr t:id="rows"/> - </tbody> - </table> - <div t:id="pagerBottom"/> - - <t:block> - <div t:id="pager"/> - </t:block> + <div t:id="pagerTop"/> - <t:block id="empty"> There is no data to display. </t:block> + <table class="t-data-grid"> + <thead t:id="columns"/> + <tbody> + <tr t:id="rows"/> + </tbody> + </table> + + <div t:id="pagerBottom"/> + + <t:block> + <div t:id="pager"/> + </t:block> + + <t:block id="empty">There is no data to display.</t:block> </div> Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/resources/org/apache/tapestry/corelib/pages/PropertyEditBlocks.tml URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/resources/org/apache/tapestry/corelib/pages/PropertyEditBlocks.tml?rev=632791&r1=632790&r2=632791&view=diff ============================================================================== --- tapestry/tapestry5/trunk/tapestry-core/src/main/resources/org/apache/tapestry/corelib/pages/PropertyEditBlocks.tml (original) +++ tapestry/tapestry5/trunk/tapestry-core/src/main/resources/org/apache/tapestry/corelib/pages/PropertyEditBlocks.tml Sun Mar 2 09:21:16 2008 @@ -6,9 +6,9 @@ </t:block> <t:block id="number"> - <t:label for="numberField"/> - <input t:id="numberField" class="t-number"/> - </t:block> + <t:label for="numberField"/> + <input t:id="numberField" class="t-number"/> + </t:block> <t:block id="enum"> Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/resources/org/apache/tapestry/scriptaculous_1_8/builder.js URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/resources/org/apache/tapestry/scriptaculous_1_8/builder.js?rev=632791&r1=632790&r2=632791&view=diff ============================================================================== --- tapestry/tapestry5/trunk/tapestry-core/src/main/resources/org/apache/tapestry/scriptaculous_1_8/builder.js (original) +++ tapestry/tapestry5/trunk/tapestry-core/src/main/resources/org/apache/tapestry/scriptaculous_1_8/builder.js Sun Mar 2 09:21:16 2008 @@ -22,8 +22,8 @@ THEAD: 'table', TR: 'table' }, -// note: For Firefox < 1.5, OPTION and OPTGROUP tags are currently broken, -// due to a Firefox bug + // note: For Firefox < 1.5, OPTION and OPTGROUP tags are currently broken, + // due to a Firefox bug node: function(elementName) { elementName = elementName.toUpperCase(); Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/resources/org/apache/tapestry/scriptaculous_1_8/dragdrop.js URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/resources/org/apache/tapestry/scriptaculous_1_8/dragdrop.js?rev=632791&r1=632790&r2=632791&view=diff ============================================================================== --- tapestry/tapestry5/trunk/tapestry-core/src/main/resources/org/apache/tapestry/scriptaculous_1_8/dragdrop.js (original) +++ tapestry/tapestry5/trunk/tapestry-core/src/main/resources/org/apache/tapestry/scriptaculous_1_8/dragdrop.js Sun Mar 2 09:21:16 2008 @@ -364,8 +364,8 @@ currentDelta: function() { return([ - parseInt(Element.getStyle(this.element, 'left') || '0'), - parseInt(Element.getStyle(this.element, 'top') || '0')]); + parseInt(Element.getStyle(this.element, 'left') || '0'), + parseInt(Element.getStyle(this.element, 'top') || '0')]); }, initDrag: function(event) @@ -792,8 +792,8 @@ scrollSpeed: 15, format: this.SERIALIZE_RULE, - // these take arrays of elements or ids and can be - // used for better initialization performance + // these take arrays of elements or ids and can be + // used for better initialization performance elements: false, handles: false, @@ -892,7 +892,7 @@ }, -// return all suitable-for-sortable elements in a guaranteed order + // return all suitable-for-sortable elements in a guaranteed order findElements: function(element, options) { return Element.findChildren( @@ -1066,7 +1066,7 @@ return Sortable._tree(element, options, root); }, -/* Construct a [i] index for a particular node */ + /* Construct a [i] index for a particular node */ _constructIndex: function(node) { var index = ''; Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/resources/org/apache/tapestry/scriptaculous_1_8/effects.js URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/resources/org/apache/tapestry/scriptaculous_1_8/effects.js?rev=632791&r1=632790&r2=632791&view=diff ============================================================================== --- tapestry/tapestry5/trunk/tapestry-core/src/main/resources/org/apache/tapestry/scriptaculous_1_8/effects.js (original) +++ tapestry/tapestry5/trunk/tapestry-core/src/main/resources/org/apache/tapestry/scriptaculous_1_8/effects.js Sun Mar 2 09:21:16 2008 @@ -522,7 +522,7 @@ this.dims = [this.element.scrollHeight, this.element.scrollWidth]; if (!this.dims) this.dims = [this.options.scaleMode.originalHeight, - this.options.scaleMode.originalWidth]; + this.options.scaleMode.originalWidth]; }, update: function(position) { @@ -655,7 +655,7 @@ var options = Object.extend({ from: (element.getStyle('display') == 'none' ? 0.0 : element.getOpacity() || 0.0), to: 1.0, - // force Safari to render floated elements properly + // force Safari to render floated elements properly afterFinishInternal: function(effect) { effect.element.forceRerendering(); @@ -681,7 +681,7 @@ return new Effect.Parallel( [ new Effect.Scale(element, 200, { sync: true, scaleFromCenter: true, scaleContent: true, restoreAfterFinish: true }), - new Effect.Opacity(element, { sync: true, to: 0.0 }) ], + new Effect.Opacity(element, { sync: true, to: 0.0 }) ], Object.extend({ duration: 1.0, beforeSetupInternal: function(effect) { @@ -767,7 +767,7 @@ opacity: element.getInlineOpacity() }; return new Effect.Parallel( [ new Effect.Move(element, {x: 0, y: 100, sync: true }), - new Effect.Opacity(element, { sync: true, to: 0.0 }) ], + new Effect.Opacity(element, { sync: true, to: 0.0 }) ], Object.extend( { duration: 0.5, beforeSetup: function(effect) @@ -963,11 +963,11 @@ { new Effect.Parallel( [ new Effect.Opacity(effect.element, { sync: true, to: 1.0, from: 0.0, transition: options.opacityTransition }), - new Effect.Move(effect.element, { x: moveX, y: moveY, sync: true, transition: options.moveTransition }), - new Effect.Scale(effect.element, 100, { - scaleMode: { originalHeight: dims.height, originalWidth: dims.width }, - sync: true, scaleFrom: window.opera ? 1 : 0, transition: options.scaleTransition, restoreAfterFinish: true}) - ], Object.extend({ + new Effect.Move(effect.element, { x: moveX, y: moveY, sync: true, transition: options.moveTransition }), + new Effect.Scale(effect.element, 100, { + scaleMode: { originalHeight: dims.height, originalWidth: dims.width }, + sync: true, scaleFrom: window.opera ? 1 : 0, transition: options.scaleTransition, restoreAfterFinish: true}) + ], Object.extend({ beforeSetup: function(effect) { effect.effects[0].element.setStyle({height: '0px'}).show(); @@ -1026,9 +1026,9 @@ return new Effect.Parallel( [ new Effect.Opacity(element, { sync: true, to: 0.0, from: 1.0, transition: options.opacityTransition }), - new Effect.Scale(element, window.opera ? 1 : 0, { sync: true, transition: options.scaleTransition, restoreAfterFinish: true}), - new Effect.Move(element, { x: moveX, y: moveY, sync: true, transition: options.moveTransition }) - ], Object.extend({ + new Effect.Scale(element, window.opera ? 1 : 0, { sync: true, transition: options.scaleTransition, restoreAfterFinish: true}), + new Effect.Move(element, { x: moveX, y: moveY, sync: true, transition: options.moveTransition }) + ], Object.extend({ beforeStartInternal: function(effect) { effect.effects[0].element.makePositioned().makeClipping(); Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/resources/org/apache/tapestry/scriptaculous_1_8/unittest.js URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/resources/org/apache/tapestry/scriptaculous_1_8/unittest.js?rev=632791&r1=632790&r2=632791&view=diff ============================================================================== --- tapestry/tapestry5/trunk/tapestry-core/src/main/resources/org/apache/tapestry/scriptaculous_1_8/unittest.js (original) +++ tapestry/tapestry5/trunk/tapestry-core/src/main/resources/org/apache/tapestry/scriptaculous_1_8/unittest.js Sun Mar 2 09:21:16 2008 @@ -218,10 +218,10 @@ } ; }, -// Returns: -// "ERROR" if there was an error, -// "FAILURE" if there was a failure, or -// "SUCCESS" if there was neither + // Returns: + // "ERROR" if there was an error, + // "FAILURE" if there was a failure, or + // "SUCCESS" if there was neither getResult: function() { var hasFailure = false; Modified: tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/secure.apt URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/secure.apt?rev=632791&r1=632790&r2=632791&view=diff ============================================================================== --- tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/secure.apt (original) +++ tapestry/tapestry5/trunk/tapestry-core/src/site/apt/guide/secure.apt Sun Mar 2 09:21:16 2008 @@ -41,7 +41,7 @@ enable security for folders of pages. All pages in or beneath the folder will be secured. This is accomplished by making a contribution to the - {{{../../apidocs/org/apache/tapestry/service/MetaDataLocator.html}MetaDataLocator}} + {{{../../apidocs/org/apache/tapestry/services/MetaDataLocator.html}MetaDataLocator}} service configuration. For example, to secure all pages in the "admin" folder: ---- @@ -125,13 +125,15 @@ Setting up HTTPS support varies from application server to application server. - {{{http://docs.codehaus.org/display/JETTY/How+to+configure+SSL}This guide covers Jetty 6}}. + * Jetty: - Tomcat: + * {{{http://docs.codehaus.org/display/JETTY/How+to+configure+SSL}Jetty 6}} - * {{{http://tomcat.apache.org/tomcat-6.0-doc/ssl-howto.html}Version 6.0}} + * Tomcat: - * {{{http://tomcat.apache.org/tomcat-5.5-doc/ssl-howto.html}Version 5.5}} + * {{{http://tomcat.apache.org/tomcat-6.0-doc/ssl-howto.html}Version 6.0}} + + * {{{http://tomcat.apache.org/tomcat-5.5-doc/ssl-howto.html}Version 5.5}} 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=632791&r1=632790&r2=632791&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 Sun Mar 2 09:21:16 2008 @@ -16,22 +16,19 @@ import org.apache.tapestry.annotations.ApplicationState; import org.apache.tapestry.annotations.Component; +import org.apache.tapestry.annotations.GenerateAccessors; import org.apache.tapestry.corelib.components.BeanEditForm; import org.apache.tapestry.integration.app1.data.RegistrationData; public class BeanEditorDemo { @Component(id = "registrationData", parameters = - {"clientValidation=clientValidation"}) + { "clientValidation=clientValidation" }) private BeanEditForm _form; @ApplicationState - private RegistrationData _data; - - public RegistrationData getRegistrationData() - { - return _data; - } + @GenerateAccessors + private RegistrationData _registrationData; Object onSuccess() { @@ -40,7 +37,7 @@ void onActionFromClear() { - _data = null; + _registrationData = null; _form.clearErrors(); } 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=632791&r1=632790&r2=632791&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 Sun Mar 2 09:21:16 2008 @@ -15,16 +15,13 @@ package org.apache.tapestry.tutorial.pages; import org.apache.tapestry.annotations.Persist; +import org.apache.tapestry.annotations.GenerateAccessors; public class GameOver { @Persist + @GenerateAccessors private int _count; - - public int getCount() - { - return _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=632791&r1=632790&r2=632791&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 Sun Mar 2 09:21:16 2008 @@ -14,6 +14,7 @@ package org.apache.tapestry.tutorial.pages; +import org.apache.tapestry.annotations.GenerateAccessors; import org.apache.tapestry.annotations.InjectPage; import org.apache.tapestry.annotations.Persist; @@ -22,19 +23,16 @@ @Persist private int _target; + @GenerateAccessors private int _guess; @Persist + @GenerateAccessors private String _message; @Persist private int _count; - public String getMessage() - { - return _message; - } - @InjectPage private GameOver _gameOver; @@ -50,16 +48,6 @@ _message = String.format("%d is too high.", guess); return null; - } - - public int getGuess() - { - return _guess; - } - - public void setGuess(int guess) - { - _guess = guess; } Object initialize(int target) 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=632791&r1=632790&r2=632791&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 Sun Mar 2 09:21:16 2008 @@ -14,20 +14,11 @@ package org.apache.tapestry.tutorial.pages.address; +import org.apache.tapestry.annotations.GenerateAccessors; import org.apache.tapestry.tutorial.data.Address; public class CreateAddress { + @GenerateAccessors private Address _address; - - public Address getAddress() - { - return _address; - } - - public void setAddress(Address address) - { - _address = address; - } - } Modified: tapestry/tapestry5/trunk/tapestry-tutorial1/src/site/apt/forms.apt URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-tutorial1/src/site/apt/forms.apt?rev=632791&r1=632790&r2=632791&view=diff ============================================================================== --- tapestry/tapestry5/trunk/tapestry-tutorial1/src/site/apt/forms.apt (original) +++ tapestry/tapestry5/trunk/tapestry-tutorial1/src/site/apt/forms.apt Sun Mar 2 09:21:16 2008 @@ -238,17 +238,8 @@ And match that up with a property in the CreateAddress class: ---- - private Address _address; - - public Address getAddress() - { - return _address; - } - - public void setAddress(Address address) - { - _address = address; - } + @GenerateAcessors + private Address _address ---- When you refresh the page, you'll see the following: 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=632791&r1=632790&r2=632791&view=diff ============================================================================== --- tapestry/tapestry5/trunk/tapestry-tutorial1/src/site/apt/hilo.apt (original) +++ tapestry/tapestry5/trunk/tapestry-tutorial1/src/site/apt/hilo.apt Sun Mar 2 09:21:16 2008 @@ -311,21 +311,17 @@ turns on full whitespace retention for the element. The value attribute gets assigned the current item from the loop. We'll use - a property of the Guess page as a kind of scratchpad for this purpose: + a property of the Guess page as a kind of scratchpad for this purpose. We could manually + write a getter and a setter method as we did before, or we can let Tapestry generate those + accessors: --- + @GenerateAccessors private int _guess; +--- - public int getGuess() - { - return _guess; - } - - public void setGuess(int guess) - { - _guess = guess; - } ---- + Tapestry will automatically create the methods needed so that the guess property (it's smart + about stripping off leading underscores) is accessible in the template. The context parameter of the ActionLink is how we get extra information into the action request URL. The context can be a single value, or an array or @@ -343,13 +339,9 @@ --- @Persist + @GenerateAccessors private String _message; - public String getMessage() - { - return _message; - } - String onActionFromLink(int guess) { if (guess == _target) return "GameOver"; @@ -428,6 +420,7 @@ --- @Persist + @GenerateAccessors private int _count; --- @@ -475,16 +468,13 @@ package org.apache.tapestry.tutorial.pages; import org.apache.tapestry.annotations.Persist; +import org.apache.tapestry.annotations.GenerateAccessors; public class GameOver { @Persist + @GenerateAccessors private int _count; - - public int getCount() - { - return _count; - } Object initialize(int count) {
