Modified: tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/enhance/SpecifiedPropertyWorker.java URL: http://svn.apache.org/viewcvs/tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/enhance/SpecifiedPropertyWorker.java?rev=395979&r1=395978&r2=395979&view=diff ============================================================================== --- tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/enhance/SpecifiedPropertyWorker.java (original) +++ tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/enhance/SpecifiedPropertyWorker.java Fri Apr 21 11:22:46 2006 @@ -30,8 +30,8 @@ import org.apache.tapestry.spec.IPropertySpecification; /** - * Responsible for adding properties to a class corresponding to specified properties in the - * component's specification. + * Responsible for adding properties to a class corresponding to specified + * properties in the component's specification. * * @author Howard M. Lewis Ship * @since 4.0 @@ -40,22 +40,24 @@ */ public class SpecifiedPropertyWorker implements EnhancementWorker { + private ErrorLog _errorLog; private BindingSource _bindingSource; /** - * Iterates over the specified properties, creating an enhanced property for each (a field, an - * accessor, a mutator). Persistent properties will invoke - * [EMAIL PROTECTED] org.apache.tapestry.Tapestry#fireObservedChange(IComponent, String, Object)}in thier - * mutator. + * Iterates over the specified properties, creating an enhanced property for + * each (a field, an accessor, a mutator). Persistent properties will invoke + * [EMAIL PROTECTED] org.apache.tapestry.Tapestry#fireObservedChange(IComponent, String, Object)}in + * thier mutator. */ - public void performEnhancement(EnhancementOperation op, IComponentSpecification spec) + public void performEnhancement(EnhancementOperation op, + IComponentSpecification spec) { Iterator i = spec.getPropertySpecificationNames().iterator(); - while (i.hasNext()) + while(i.hasNext()) { String name = (String) i.next(); IPropertySpecification ps = spec.getPropertySpecification(name); @@ -66,15 +68,14 @@ } catch (RuntimeException ex) { - _errorLog.error( - EnhanceMessages.errorAddingProperty(name, op.getBaseClass(), ex), - ps.getLocation(), - ex); + _errorLog.error(EnhanceMessages.errorAddingProperty(name, op + .getBaseClass(), ex), ps.getLocation(), ex); } } } - private void performEnhancement(EnhancementOperation op, IPropertySpecification ps) + private void performEnhancement(EnhancementOperation op, + IPropertySpecification ps) { Defense.notNull(ps, "ps"); @@ -84,13 +85,16 @@ String initialValue = ps.getInitialValue(); Location location = ps.getLocation(); - addProperty(op, propertyName, specifiedType, persistent, initialValue, location); + addProperty(op, propertyName, specifiedType, persistent, initialValue, + location); } - public void addProperty(EnhancementOperation op, String propertyName, String specifiedType, - boolean persistent, String initialValue, Location location) + public void addProperty(EnhancementOperation op, String propertyName, + String specifiedType, boolean persistent, String initialValue, + Location location) { - Class propertyType = EnhanceUtils.extractPropertyType(op, propertyName, specifiedType); + Class propertyType = EnhanceUtils.extractPropertyType(op, propertyName, + specifiedType); op.claimProperty(propertyName); @@ -99,20 +103,23 @@ op.addField(field, propertyType); // Release 3.0 would squack a bit about overriding non-abstract methods - // if they exist. 4.0 is less picky ... it blindly adds new methods, possibly + // if they exist. 4.0 is less picky ... it blindly adds new methods, + // possibly // overwriting methods in the base component class. - EnhanceUtils.createSimpleAccessor(op, field, propertyName, propertyType, location); + EnhanceUtils.createSimpleAccessor(op, field, propertyName, + propertyType, location); addMutator(op, propertyName, propertyType, field, persistent, location); if (initialValue == null) addReinitializer(op, propertyType, field); - else - addInitialValue(op, propertyName, propertyType, field, initialValue, location); + else addInitialValue(op, propertyName, propertyType, field, + initialValue, location); } - private void addReinitializer(EnhancementOperation op, Class propertyType, String fieldName) + private void addReinitializer(EnhancementOperation op, Class propertyType, + String fieldName) { String defaultFieldName = fieldName + "$default"; @@ -120,64 +127,63 @@ // On finishLoad(), store the current value into the default field. - op.extendMethodImplementation( - IComponent.class, - EnhanceUtils.FINISH_LOAD_SIGNATURE, - defaultFieldName + " = " + fieldName + ";"); + op.extendMethodImplementation(IComponent.class, + EnhanceUtils.FINISH_LOAD_SIGNATURE, defaultFieldName + " = " + + fieldName + ";"); // On pageDetach(), restore the attribute to its default value. - op.extendMethodImplementation( - PageDetachListener.class, - EnhanceUtils.PAGE_DETACHED_SIGNATURE, - fieldName + " = " + defaultFieldName + ";"); + op.extendMethodImplementation(PageDetachListener.class, + EnhanceUtils.PAGE_DETACHED_SIGNATURE, fieldName + " = " + + defaultFieldName + ";"); } - private void addInitialValue(EnhancementOperation op, String propertyName, Class propertyType, - String fieldName, String initialValue, Location location) + private void addInitialValue(EnhancementOperation op, String propertyName, + Class propertyType, String fieldName, String initialValue, + Location location) { - String description = EnhanceMessages.initialValueForProperty(propertyName); + String description = EnhanceMessages + .initialValueForProperty(propertyName); - InitialValueBindingCreator creator = new InitialValueBindingCreator(_bindingSource, - description, initialValue, location); + InitialValueBindingCreator creator = new InitialValueBindingCreator( + _bindingSource, description, initialValue, location); - String creatorField = op.addInjectedField( - fieldName + "$initialValueBindingCreator", - InitialValueBindingCreator.class, - creator); + String creatorField = op.addInjectedField(fieldName + + "$initialValueBindingCreator", + InitialValueBindingCreator.class, creator); String bindingField = fieldName + "$initialValueBinding"; op.addField(bindingField, IBinding.class); BodyBuilder builder = new BodyBuilder(); - builder.addln("{0} = {1}.createBinding(this);", bindingField, creatorField); + builder.addln("{0} = {1}.createBinding(this);", bindingField, + creatorField); - op.extendMethodImplementation(IComponent.class, EnhanceUtils.FINISH_LOAD_SIGNATURE, builder - .toString()); + op.extendMethodImplementation(IComponent.class, + EnhanceUtils.FINISH_LOAD_SIGNATURE, builder.toString()); builder.clear(); - builder.addln("{0} = {1};", fieldName, EnhanceUtils.createUnwrapExpression( - op, - bindingField, - propertyType)); + builder.addln("{0} = {1};", fieldName, EnhanceUtils + .createUnwrapExpression(op, bindingField, propertyType)); String code = builder.toString(); - // In finishLoad() and pageDetach(), de-reference the binding to get the value + // In finishLoad() and pageDetach(), de-reference the binding to get the + // value // for the property. - op.extendMethodImplementation(IComponent.class, EnhanceUtils.FINISH_LOAD_SIGNATURE, code); - op.extendMethodImplementation( - PageDetachListener.class, - EnhanceUtils.PAGE_DETACHED_SIGNATURE, - code); + op.extendMethodImplementation(IComponent.class, + EnhanceUtils.FINISH_LOAD_SIGNATURE, code); + op.extendMethodImplementation(PageDetachListener.class, + EnhanceUtils.PAGE_DETACHED_SIGNATURE, code); } - private void addMutator(EnhancementOperation op, String propertyName, Class propertyType, - String fieldName, boolean persistent, Location location) + private void addMutator(EnhancementOperation op, String propertyName, + Class propertyType, String fieldName, boolean persistent, + Location location) { String methodName = EnhanceUtils.createMutatorMethodName(propertyName); @@ -196,8 +202,8 @@ body.end(); - MethodSignature sig = new MethodSignature(void.class, methodName, new Class[] - { propertyType }, null); + MethodSignature sig = new MethodSignature(void.class, methodName, + new Class[] { propertyType }, null); op.addMethod(Modifier.PUBLIC, sig, body.toString(), location); } @@ -211,4 +217,4 @@ { _bindingSource = bindingSource; } -} \ No newline at end of file +}
Modified: tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/error/ErrorMessages.java URL: http://svn.apache.org/viewcvs/tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/error/ErrorMessages.java?rev=395979&r1=395978&r2=395979&view=diff ============================================================================== --- tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/error/ErrorMessages.java (original) +++ tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/error/ErrorMessages.java Fri Apr 21 11:22:46 2006 @@ -20,10 +20,13 @@ * @author Howard M. Lewis Ship * @since 4.0 */ -public class ErrorMessages +public final class ErrorMessages { - private final static MessageFormatter _formatter = new MessageFormatter(ErrorMessages.class); + private static final MessageFormatter _formatter = new MessageFormatter(ErrorMessages.class); + /* defeat instantiation */ + private ErrorMessages() { } + public static String unableToProcessClientRequest(Throwable cause) { return _formatter.format("unable-to-process-client-request", cause); @@ -33,4 +36,4 @@ { return _formatter.format("unable-to-present-exception-page", cause); } -} \ No newline at end of file +} Modified: tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/error/ExceptionPresenter.java URL: http://svn.apache.org/viewcvs/tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/error/ExceptionPresenter.java?rev=395979&r1=395978&r2=395979&view=diff ============================================================================== --- tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/error/ExceptionPresenter.java (original) +++ tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/error/ExceptionPresenter.java Fri Apr 21 11:22:46 2006 @@ -17,12 +17,13 @@ import org.apache.tapestry.IRequestCycle; /** - * Invoked by the [EMAIL PROTECTED] org.apache.tapestry.IEngine} if there's an uncaught exception - * (checked or runtime) processing a request. The ExceptionPresenter is responsible for presenting a - * exception message (or description) to the user. The default implementation activates the - * "Exception" page, but it is common to override this to do something application specific - * (typically, return to the Home page and display an error message there). This service also - * provides a good hook for creating a server-side log of exceptions. + * Invoked by the [EMAIL PROTECTED] org.apache.tapestry.IEngine} if there's an uncaught + * exception (checked or runtime) processing a request. The ExceptionPresenter + * is responsible for presenting a exception message (or description) to the + * user. The default implementation activates the "Exception" page, but it is + * common to override this to do something application specific (typically, + * return to the Home page and display an error message there). This service + * also provides a good hook for creating a server-side log of exceptions. * * @author Howard M. Lewis Ship * @since 4.0 @@ -30,9 +31,10 @@ */ public interface ExceptionPresenter { + /** - * Report the exception and provide some response to the user in lieu of the expected result - * page. + * Report the exception and provide some response to the user in lieu of the + * expected result page. * * @param cycle * the current request cycle @@ -40,5 +42,5 @@ * the exception that was caught */ - public void presentException(IRequestCycle cycle, Throwable cause); -} \ No newline at end of file + void presentException(IRequestCycle cycle, Throwable cause); +} Modified: tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/error/ExceptionPresenterImpl.java URL: http://svn.apache.org/viewcvs/tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/error/ExceptionPresenterImpl.java?rev=395979&r1=395978&r2=395979&view=diff ============================================================================== --- tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/error/ExceptionPresenterImpl.java (original) +++ tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/error/ExceptionPresenterImpl.java Fri Apr 21 11:22:46 2006 @@ -25,6 +25,7 @@ */ public class ExceptionPresenterImpl implements ExceptionPresenter { + private RequestExceptionReporter _requestExceptionReporter; private ResponseRenderer _responseRenderer; @@ -74,7 +75,8 @@ _exceptionPageName = exceptionPageName; } - public void setRequestExceptionReporter(RequestExceptionReporter requestExceptionReporter) + public void setRequestExceptionReporter( + RequestExceptionReporter requestExceptionReporter) { _requestExceptionReporter = requestExceptionReporter; } @@ -93,4 +95,4 @@ { _verbose = verbose; } -} \ No newline at end of file +} Modified: tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/error/RequestExceptionReporter.java URL: http://svn.apache.org/viewcvs/tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/error/RequestExceptionReporter.java?rev=395979&r1=395978&r2=395979&view=diff ============================================================================== --- tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/error/RequestExceptionReporter.java (original) +++ tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/error/RequestExceptionReporter.java Fri Apr 21 11:22:46 2006 @@ -15,8 +15,8 @@ package org.apache.tapestry.error; /** - * Service responsible for producing console output when there is an error processing the request - * (and the normal Exception page can not be displayed). + * Service responsible for producing console output when there is an error + * processing the request (and the normal Exception page can not be displayed). * * @author Howard M. Lewis Ship * @since 4.0 @@ -24,5 +24,6 @@ */ public interface RequestExceptionReporter { - public void reportRequestException(String message, Throwable cause); -} \ No newline at end of file + + void reportRequestException(String message, Throwable cause); +} Modified: tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/error/RequestExceptionReporterImpl.java URL: http://svn.apache.org/viewcvs/tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/error/RequestExceptionReporterImpl.java?rev=395979&r1=395978&r2=395979&view=diff ============================================================================== --- tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/error/RequestExceptionReporterImpl.java (original) +++ tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/error/RequestExceptionReporterImpl.java Fri Apr 21 11:22:46 2006 @@ -25,6 +25,7 @@ */ public class RequestExceptionReporterImpl implements RequestExceptionReporter { + private Log _log; private WebRequest _request; @@ -43,7 +44,8 @@ { _log.warn(message, cause); - System.err.println("\n\n**********************************************************\n\n"); + System.err + .println("\n\n**********************************************************\n\n"); System.err.println(message); @@ -58,7 +60,8 @@ new ExceptionAnalyzer().reportException(cause, System.err); - System.err.println("\n**********************************************************\n"); + System.err + .println("\n**********************************************************\n"); } -} \ No newline at end of file +} Modified: tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/error/StaleLinkExceptionPresenter.java URL: http://svn.apache.org/viewcvs/tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/error/StaleLinkExceptionPresenter.java?rev=395979&r1=395978&r2=395979&view=diff ============================================================================== --- tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/error/StaleLinkExceptionPresenter.java (original) +++ tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/error/StaleLinkExceptionPresenter.java Fri Apr 21 11:22:46 2006 @@ -20,13 +20,15 @@ import org.apache.tapestry.StaleLinkException; /** - * Service interface for informing the user about a [EMAIL PROTECTED] org.apache.tapestry.StaleLinkException}. + * Service interface for informing the user about a + * [EMAIL PROTECTED] org.apache.tapestry.StaleLinkException}. * * @author Howard M. Lewis Ship * @since 4.0 */ public interface StaleLinkExceptionPresenter { + /** * Reports the stale link exception. * @@ -35,6 +37,7 @@ * @param cause * the exception that was caught */ - public void presentStaleLinkException(IRequestCycle cycle, StaleLinkException cause) - throws IOException; + void presentStaleLinkException(IRequestCycle cycle, + StaleLinkException cause) + throws IOException; } Modified: tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/error/StaleLinkExceptionPresenterImpl.java URL: http://svn.apache.org/viewcvs/tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/error/StaleLinkExceptionPresenterImpl.java?rev=395979&r1=395978&r2=395979&view=diff ============================================================================== --- tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/error/StaleLinkExceptionPresenterImpl.java (original) +++ tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/error/StaleLinkExceptionPresenterImpl.java Fri Apr 21 11:22:46 2006 @@ -23,21 +23,25 @@ import org.apache.tapestry.services.ResponseRenderer; /** - * Implementation of [EMAIL PROTECTED] org.apache.tapestry.error.StaleLinkExceptionPresenter} that uses a page - * to present the exception. The page must implement a property named "message" of type String and - * should present that message to the user. + * Implementation of + * [EMAIL PROTECTED] org.apache.tapestry.error.StaleLinkExceptionPresenter} that uses a + * page to present the exception. The page must implement a property named + * "message" of type String and should present that message to the user. * * @author Howard M. Lewis Ship * @since 4.0 */ -public class StaleLinkExceptionPresenterImpl implements StaleLinkExceptionPresenter +public class StaleLinkExceptionPresenterImpl implements + StaleLinkExceptionPresenter { + private ResponseRenderer _responseRenderer; private String _pageName; - public void presentStaleLinkException(IRequestCycle cycle, StaleLinkException cause) - throws IOException + public void presentStaleLinkException(IRequestCycle cycle, + StaleLinkException cause) + throws IOException { IPage exceptionPage = cycle.getPage(_pageName); Modified: tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/error/StaleSessionExceptionPresenter.java URL: http://svn.apache.org/viewcvs/tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/error/StaleSessionExceptionPresenter.java?rev=395979&r1=395978&r2=395979&view=diff ============================================================================== --- tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/error/StaleSessionExceptionPresenter.java (original) +++ tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/error/StaleSessionExceptionPresenter.java Fri Apr 21 11:22:46 2006 @@ -27,6 +27,7 @@ */ public interface StaleSessionExceptionPresenter { + /** * Reports the stale session exception. * @@ -35,6 +36,7 @@ * @param cause * the exception that was caught */ - public void presentStaleSessionException(IRequestCycle cycle, StaleSessionException cause) - throws IOException; + void presentStaleSessionException(IRequestCycle cycle, + StaleSessionException cause) + throws IOException; } Added: tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/error/package.html URL: http://svn.apache.org/viewcvs/tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/error/package.html?rev=395979&view=auto ============================================================================== --- tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/error/package.html (added) +++ tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/error/package.html Fri Apr 21 11:22:46 2006 @@ -0,0 +1,13 @@ +<!doctype html public "-//W3C//DTD HTML 4.0 Transitional//EN"> +<html> +<head> +<title>Tapestry: Web Application Framework</title> +</head> +<body> + +Defines various services / utilies for error reporting. + [EMAIL PROTECTED] Howard Lewis Ship <a href="mailto:[EMAIL PROTECTED]">[EMAIL PROTECTED]</a> + +</body> +</html> Modified: tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/event/ObservedChangeEvent.java URL: http://svn.apache.org/viewcvs/tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/event/ObservedChangeEvent.java?rev=395979&r1=395978&r2=395979&view=diff ============================================================================== --- tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/event/ObservedChangeEvent.java (original) +++ tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/event/ObservedChangeEvent.java Fri Apr 21 11:22:46 2006 @@ -27,18 +27,20 @@ public class ObservedChangeEvent extends EventObject { + private static final long serialVersionUID = -7693394232554811975L; - private IComponent _component; + private IComponent _component; private String _propertyName; private Object _newValue; /** - * Creates the event. The new value must be null, or be a serializable object. (It is declared - * as Object as a concession to the Java 2 collections framework, where the implementations are - * serializable but the interfaces (Map, List, etc.) don't extend Serializable ... so we wait + * Creates the event. The new value must be null, or be a serializable + * object. (It is declared as Object as a concession to the Java 2 + * collections framework, where the implementations are serializable but the + * interfaces (Map, List, etc.) don't extend Serializable ... so we wait * until runtime to check). * * @param component @@ -48,10 +50,12 @@ * @param newValue * The new value of the property. * @throws IllegalArgumentException - * if propertyName is null, or if the new value is not serializable + * if propertyName is null, or if the new value is not + * serializable */ - public ObservedChangeEvent(IComponent component, String propertyName, Object newValue) + public ObservedChangeEvent(IComponent component, String propertyName, + Object newValue) { super(component); @@ -77,4 +81,4 @@ return _propertyName; } -} \ No newline at end of file +} Modified: tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/event/PageAttachListener.java URL: http://svn.apache.org/viewcvs/tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/event/PageAttachListener.java?rev=395979&r1=395978&r2=395979&view=diff ============================================================================== --- tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/event/PageAttachListener.java (original) +++ tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/event/PageAttachListener.java Fri Apr 21 11:22:46 2006 @@ -28,5 +28,5 @@ */ public interface PageAttachListener extends EventListener { - public void pageAttached(PageEvent event); -} \ No newline at end of file + void pageAttached(PageEvent event); +} Modified: tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/event/PageBeginRenderListener.java URL: http://svn.apache.org/viewcvs/tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/event/PageBeginRenderListener.java?rev=395979&r1=395978&r2=395979&view=diff ============================================================================== --- tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/event/PageBeginRenderListener.java (original) +++ tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/event/PageBeginRenderListener.java Fri Apr 21 11:22:46 2006 @@ -17,19 +17,20 @@ import java.util.EventListener; /** - * Event listener for determining when a page is about to start rendering. Rendering includes the - * replay of a form to handle form submissions. + * Event listener for determining when a page is about to start rendering. + * Rendering includes the replay of a form to handle form submissions. * * @author Howard M. Lewis Ship * @since 4.0 */ public interface PageBeginRenderListener extends EventListener { + /** - * Invoked before just before the page renders a response. This provides listeners with a last - * chance to initialize themselves for the render. This initialization can include modifying - * peristent page properties. + * Invoked before just before the page renders a response. This provides + * listeners with a last chance to initialize themselves for the render. + * This initialization can include modifying peristent page properties. */ - public void pageBeginRender(PageEvent event); -} \ No newline at end of file + void pageBeginRender(PageEvent event); +} Modified: tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/event/PageDetachListener.java URL: http://svn.apache.org/viewcvs/tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/event/PageDetachListener.java?rev=395979&r1=395978&r2=395979&view=diff ============================================================================== --- tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/event/PageDetachListener.java (original) +++ tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/event/PageDetachListener.java Fri Apr 21 11:22:46 2006 @@ -31,5 +31,5 @@ * Invoked by the page from its [EMAIL PROTECTED] org.apache.tapestry.IPage#detach()}method. */ - public void pageDetached(PageEvent event); -} \ No newline at end of file + void pageDetached(PageEvent event); +} Modified: tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/event/PageEndRenderListener.java URL: http://svn.apache.org/viewcvs/tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/event/PageEndRenderListener.java?rev=395979&r1=395978&r2=395979&view=diff ============================================================================== --- tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/event/PageEndRenderListener.java (original) +++ tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/event/PageEndRenderListener.java Fri Apr 21 11:22:46 2006 @@ -32,5 +32,5 @@ * @see org.apache.tapestry.AbstractComponent#pageEndRender(PageEvent) */ - public void pageEndRender(PageEvent event); -} \ No newline at end of file + void pageEndRender(PageEvent event); +} Modified: tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/event/PageEvent.java URL: http://svn.apache.org/viewcvs/tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/event/PageEvent.java?rev=395979&r1=395978&r2=395979&view=diff ============================================================================== --- tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/event/PageEvent.java (original) +++ tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/event/PageEvent.java Fri Apr 21 11:22:46 2006 @@ -20,43 +20,40 @@ import org.apache.tapestry.IRequestCycle; /** - * Encapsulates information related to the page listener - * interfaces. - * - * @author Howard Lewis Ship - * @since 1.0.5 + * Encapsulates information related to the page listener interfaces. * - **/ + * @author Howard Lewis Ship + * @since 1.0.5 + */ public class PageEvent extends EventObject { + private static final long serialVersionUID = -6167989946862112436L; - - private transient IPage page; - private transient IRequestCycle requestCycle; + + private transient IPage _page; + private transient IRequestCycle _requestCycle; /** - * Constructs a new instance of the event. The - * [EMAIL PROTECTED] EventObject#getSource()} of the event will - * be the [EMAIL PROTECTED] IPage}. - * - **/ + * Constructs a new instance of the event. The + * [EMAIL PROTECTED] EventObject#getSource()} of the event will be the [EMAIL PROTECTED] IPage}. + */ public PageEvent(IPage page, IRequestCycle cycle) { super(page); - this.page = page; - this.requestCycle = cycle; + this._page = page; + this._requestCycle = cycle; } public IPage getPage() { - return page; + return _page; } public IRequestCycle getRequestCycle() { - return requestCycle; + return _requestCycle; } -} \ No newline at end of file +} Modified: tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/event/PageRenderListener.java URL: http://svn.apache.org/viewcvs/tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/event/PageRenderListener.java?rev=395979&r1=395978&r2=395979&view=diff ============================================================================== --- tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/event/PageRenderListener.java (original) +++ tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/event/PageRenderListener.java Fri Apr 21 11:22:46 2006 @@ -15,16 +15,19 @@ package org.apache.tapestry.event; /** - * An object that listens to page events. The [EMAIL PROTECTED] org.apache.tapestry.IPage page}generates - * events before and after rendering a response. These events also occur before and after a form + * An object that listens to page events. The + * [EMAIL PROTECTED] org.apache.tapestry.IPage page}generates events before and after + * rendering a response. These events also occur before and after a form * rewinds. * * @author Howard Lewis Ship * @since 1.0.5 - * @deprecated To be removed in 4.1. Use [EMAIL PROTECTED] org.apache.tapestry.event.PageBeginRenderListener} - * and/or [EMAIL PROTECTED] org.apache.tapestry.event.PageEndRenderListener}. + * @deprecated To be removed in 4.1. Use + * [EMAIL PROTECTED] org.apache.tapestry.event.PageBeginRenderListener} and/or + * [EMAIL PROTECTED] org.apache.tapestry.event.PageEndRenderListener}. */ -public interface PageRenderListener extends PageBeginRenderListener, PageEndRenderListener +public interface PageRenderListener extends PageBeginRenderListener, + PageEndRenderListener { -} \ No newline at end of file +} Modified: tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/event/PageValidateListener.java URL: http://svn.apache.org/viewcvs/tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/event/PageValidateListener.java?rev=395979&r1=395978&r2=395979&view=diff ============================================================================== --- tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/event/PageValidateListener.java (original) +++ tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/event/PageValidateListener.java Fri Apr 21 11:22:46 2006 @@ -17,21 +17,25 @@ import java.util.EventListener; /** - * An interface for objects that want to take part in the validation of the page. - * - * @author Mindbridge - * @since 3.0 - **/ + * An interface for objects that want to take part in the validation of the + * page. + * + * @author Mindbridge + * @since 3.0 + */ public interface PageValidateListener extends EventListener { + /** - * Invoked by the page from its - * [EMAIL PROTECTED] org.apache.tapestry.IPage#validate(org.apache.tapestry.IRequestCycle)} method. - * - * <p>May throw a [EMAIL PROTECTED] org.apache.tapestry.PageRedirectException}, to redirect the user - * to an appropriate part of the system (such as, a login page). - **/ + * Invoked by the page from its + * [EMAIL PROTECTED] org.apache.tapestry.IPage#validate(org.apache.tapestry.IRequestCycle)} + * method. + * <p> + * May throw a [EMAIL PROTECTED] org.apache.tapestry.PageRedirectException}, to + * redirect the user to an appropriate part of the system (such as, a login + * page). + */ - public void pageValidate(PageEvent event); + void pageValidate(PageEvent event); } Modified: tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/event/ReportStatusEvent.java URL: http://svn.apache.org/viewcvs/tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/event/ReportStatusEvent.java?rev=395979&r1=395978&r2=395979&view=diff ============================================================================== --- tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/event/ReportStatusEvent.java (original) +++ tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/event/ReportStatusEvent.java Fri Apr 21 11:22:46 2006 @@ -21,16 +21,23 @@ import org.apache.tapestry.describe.DescriptionReceiver; /** - * Event object used by [EMAIL PROTECTED] org.apache.tapestry.event.ReportStatusListener}; the event - * implements [EMAIL PROTECTED] org.apache.tapestry.describe.DescriptionReceiver}; classes (typically, - * HiveMind service implementations) that implement the listener interface will "describe" - * themselves to the event. + * Event object used by [EMAIL PROTECTED] org.apache.tapestry.event.ReportStatusListener}; + * the event implements [EMAIL PROTECTED] org.apache.tapestry.describe.DescriptionReceiver}; + * classes (typically, HiveMind service implementations) that implement the + * listener interface will "describe" themselves to the event. * * @author Howard M. Lewis Ship * @since 4.0 */ -public class ReportStatusEvent extends EventObject implements DescriptionReceiver +public class ReportStatusEvent extends EventObject implements + DescriptionReceiver { + + /** + * serialVersionUID. + */ + private static final long serialVersionUID = 7546818328708861783L; + private final DescriptionReceiver _receiver; public ReportStatusEvent(Object source, DescriptionReceiver receiver) Modified: tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/event/ReportStatusListener.java URL: http://svn.apache.org/viewcvs/tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/event/ReportStatusListener.java?rev=395979&r1=395978&r2=395979&view=diff ============================================================================== --- tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/event/ReportStatusListener.java (original) +++ tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/event/ReportStatusListener.java Fri Apr 21 11:22:46 2006 @@ -26,5 +26,5 @@ */ public interface ReportStatusListener extends EventListener { - public void reportStatus(ReportStatusEvent event); + void reportStatus(ReportStatusEvent event); } Modified: tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/event/ResetEventListener.java URL: http://svn.apache.org/viewcvs/tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/event/ResetEventListener.java?rev=395979&r1=395978&r2=395979&view=diff ============================================================================== --- tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/event/ResetEventListener.java (original) +++ tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/event/ResetEventListener.java Fri Apr 21 11:22:46 2006 @@ -26,5 +26,5 @@ */ public interface ResetEventListener extends EventListener { - public void resetEventDidOccur(); -} \ No newline at end of file + void resetEventDidOccur(); +} Modified: tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/form/translator/FormatTranslator.java URL: http://svn.apache.org/viewcvs/tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/form/translator/FormatTranslator.java?rev=395979&r1=395978&r2=395979&view=diff ============================================================================== --- tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/form/translator/FormatTranslator.java (original) +++ tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/form/translator/FormatTranslator.java Fri Apr 21 11:22:46 2006 @@ -35,6 +35,22 @@ { private String _pattern; + public FormatTranslator() + { + _pattern = defaultPattern(); + } + + //TODO: Needed until HIVEMIND-134 fix is available + public FormatTranslator(String initializer) + { + PropertyUtils.configureProperties(this, initializer); + + if (HiveMind.isBlank(_pattern)) + { + _pattern = defaultPattern(); + } + } + protected abstract String defaultPattern(); /** @@ -85,21 +101,5 @@ public void setPattern(String pattern) { _pattern = pattern; - } - - public FormatTranslator() - { - _pattern = defaultPattern(); - } - - // Needed until HIVEMIND-134 fix is available - public FormatTranslator(String initializer) - { - PropertyUtils.configureProperties(this, initializer); - - if (HiveMind.isBlank(_pattern)) - { - _pattern = defaultPattern(); - } } } Modified: tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/form/translator/NumberTranslator.java URL: http://svn.apache.org/viewcvs/tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/form/translator/NumberTranslator.java?rev=395979&r1=395978&r2=395979&view=diff ============================================================================== --- tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/form/translator/NumberTranslator.java (original) +++ tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/form/translator/NumberTranslator.java Fri Apr 21 11:22:46 2006 @@ -42,6 +42,12 @@ { } + //TODO: Needed until HIVEMIND-134 fix is available + public NumberTranslator(String initializer) + { + PropertyUtils.configureProperties(this, initializer); + } + protected String formatObject(IFormComponent field, Locale locale, Object object) { Number number = (Number) object; @@ -54,12 +60,6 @@ } return super.formatObject(field, locale, object); - } - - // Needed until HIVEMIND-134 fix is available - public NumberTranslator(String initializer) - { - PropertyUtils.configureProperties(this, initializer); } /** Modified: tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/form/translator/Translator.java URL: http://svn.apache.org/viewcvs/tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/form/translator/Translator.java?rev=395979&r1=395978&r2=395979&view=diff ============================================================================== --- tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/form/translator/Translator.java (original) +++ tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/form/translator/Translator.java Fri Apr 21 11:22:46 2006 @@ -16,8 +16,8 @@ import java.util.Locale; -import org.apache.tapestry.form.IFormComponent; import org.apache.tapestry.form.FormComponentContributor; +import org.apache.tapestry.form.IFormComponent; import org.apache.tapestry.form.ValidationMessages; import org.apache.tapestry.valid.ValidatorException; @@ -35,7 +35,7 @@ * should not be null) appropriate for the specified field. * @param locale TODO */ - public String format(IFormComponent field, Locale locale, Object object); + String format(IFormComponent field, Locale locale, Object object); /** * Invoked during rewind to parse a submitted input value into an object suitable for the @@ -46,5 +46,5 @@ * @throws ValidatorException * if the specified text could not be parsed into an object. */ - public Object parse(IFormComponent field, ValidationMessages messages, String value) throws ValidatorException; + Object parse(IFormComponent field, ValidationMessages messages, String value) throws ValidatorException; } Added: tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/form/translator/package.html URL: http://svn.apache.org/viewcvs/tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/form/translator/package.html?rev=395979&view=auto ============================================================================== --- tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/form/translator/package.html (added) +++ tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/form/translator/package.html Fri Apr 21 11:22:46 2006 @@ -0,0 +1,13 @@ +<!doctype html public "-//W3C//DTD HTML 4.0 Transitional//EN"> +<html> +<head> +<title>Tapestry: Web Application Framework</title> +</head> +<body> + +Defines translator bindings used primarily in form component input translations. + [EMAIL PROTECTED] Howard Lewis Ship <a href="mailto:[EMAIL PROTECTED]">[EMAIL PROTECTED]</a> + +</body> +</html> Modified: tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/form/validator/MinLength.java URL: http://svn.apache.org/viewcvs/tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/form/validator/MinLength.java?rev=395979&r1=395978&r2=395979&view=diff ============================================================================== --- tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/form/validator/MinLength.java (original) +++ tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/form/validator/MinLength.java Fri Apr 21 11:22:46 2006 @@ -87,4 +87,4 @@ context.addSubmitHandler(buffer.toString()); } -} \ No newline at end of file +} Modified: tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/form/validator/Validator.java URL: http://svn.apache.org/viewcvs/tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/form/validator/Validator.java?rev=395979&r1=395978&r2=395979&view=diff ============================================================================== --- tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/form/validator/Validator.java (original) +++ tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/form/validator/Validator.java Fri Apr 21 11:22:46 2006 @@ -14,8 +14,8 @@ package org.apache.tapestry.form.validator; -import org.apache.tapestry.form.IFormComponent; import org.apache.tapestry.form.FormComponentContributor; +import org.apache.tapestry.form.IFormComponent; import org.apache.tapestry.form.ValidationMessages; import org.apache.tapestry.valid.ValidatorException; @@ -48,7 +48,7 @@ * if the object violates the constraint represented by this Validator. */ - public void validate(IFormComponent field, ValidationMessages messages, Object object) + void validate(IFormComponent field, ValidationMessages messages, Object object) throws ValidatorException; /** @@ -57,11 +57,11 @@ * return true. */ - public boolean getAcceptsNull(); + boolean getAcceptsNull(); /** * Returns true if this field is required. Returns false otherwise. */ - public boolean isRequired(); + boolean isRequired(); } Modified: tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/form/validator/ValidatorFactory.java URL: http://svn.apache.org/viewcvs/tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/form/validator/ValidatorFactory.java?rev=395979&r1=395978&r2=395979&view=diff ============================================================================== --- tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/form/validator/ValidatorFactory.java (original) +++ tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/form/validator/ValidatorFactory.java Fri Apr 21 11:22:46 2006 @@ -43,7 +43,7 @@ * with the given name. * <p> * A full validator specification might be: - * <code>required,email[%email-format],minLength=20[Email addresses must be at least 20 characters long.] + * <code>required,email[%email-format],minLength=20[Email addresses must be at least 20 characters long.]</code> * * @author Howard Lewis Ship * @since 4.0 @@ -60,5 +60,5 @@ * a string identifying which validators and their configuration * @return List of [EMAIL PROTECTED] Validator} (possibly empty) */ - public List constructValidatorList(IComponent component, String specification); + List constructValidatorList(IComponent component, String specification); } Modified: tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/form/validator/ValidatorMessages.java URL: http://svn.apache.org/viewcvs/tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/form/validator/ValidatorMessages.java?rev=395979&r1=395978&r2=395979&view=diff ============================================================================== --- tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/form/validator/ValidatorMessages.java (original) +++ tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/form/validator/ValidatorMessages.java Fri Apr 21 11:22:46 2006 @@ -20,10 +20,13 @@ * @author Howard Lewis Ship * @since 4.0 */ -class ValidatorMessages +final class ValidatorMessages { private static final MessageFormatter _formatter = new MessageFormatter(ValidatorMessages.class); + /* defeat instantiation */ + private ValidatorMessages() { } + static String unknownValidator(String name) { return _formatter.format("unknown-validator", name); Modified: tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/form/validator/ValidatorStrings.properties URL: http://svn.apache.org/viewcvs/tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/form/validator/ValidatorStrings.properties?rev=395979&r1=395978&r2=395979&view=diff ============================================================================== --- tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/form/validator/ValidatorStrings.properties (original) +++ tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/form/validator/ValidatorStrings.properties Fri Apr 21 11:22:46 2006 @@ -18,4 +18,4 @@ error-initializing-validator=Error initializing validator ''{0}'' (class {1}): {2} bad-specification=Unable to parse ''{0}'' into a list of validators. no-value-or-message-for-bean=Validator ''{0}'' is a reference to a managed bean of the component, and may not have a value or a message override specified. -bean-not-validator=Bean ''{0}'' does not implement the {1} interface. \ No newline at end of file +bean-not-validator=Bean ''{0}'' does not implement the {1} interface. Modified: tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/form/validator/ValidatorsBindingFactory.java URL: http://svn.apache.org/viewcvs/tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/form/validator/ValidatorsBindingFactory.java?rev=395979&r1=395978&r2=395979&view=diff ============================================================================== --- tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/form/validator/ValidatorsBindingFactory.java (original) +++ tapestry/tapestry4/trunk/framework/src/java/org/apache/tapestry/form/validator/ValidatorsBindingFactory.java Fri Apr 21 11:22:46 2006 @@ -22,6 +22,10 @@ import org.apache.tapestry.IComponent; import org.apache.tapestry.binding.AbstractBindingFactory; +/** + * + * @author unknown + */ public class ValidatorsBindingFactory extends AbstractBindingFactory { private ValidatorFactory _validatorFactory; Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/enhance/TestInjectMessagesWorker.java URL: http://svn.apache.org/viewcvs/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/enhance/TestInjectMessagesWorker.java?rev=395979&r1=395978&r2=395979&view=diff ============================================================================== --- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/enhance/TestInjectMessagesWorker.java (original) +++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/enhance/TestInjectMessagesWorker.java Fri Apr 21 11:22:46 2006 @@ -50,7 +50,7 @@ MockControl control = newControl(EnhancementOperation.class); EnhancementOperation op = (EnhancementOperation) control.getMock(); - op.claimReadonlyProperty(w.MESSAGES_PROPERTY); + op.claimReadonlyProperty(w._messagesProperty); op.addInjectedField("_$componentMessagesSource", ComponentMessagesSource.class, source); control.setReturnValue("fred"); @@ -62,7 +62,7 @@ builder.end(); op.addField("_$messages", Messages.class); - op.addMethod(Modifier.PUBLIC, w.METHOD_SIGNATURE, builder.toString(), l); + op.addMethod(Modifier.PUBLIC, w._methodSignature, builder.toString(), l); replayControls(); @@ -79,14 +79,14 @@ InjectMessagesWorker w = new InjectMessagesWorker(); Throwable ex = new ApplicationRuntimeException(EnhanceMessages - .claimedProperty(w.MESSAGES_PROPERTY)); + .claimedProperty(w._messagesProperty)); IComponentSpecification spec = newSpec(l); MockControl control = newControl(EnhancementOperation.class); EnhancementOperation op = (EnhancementOperation) control.getMock(); - op.claimReadonlyProperty(w.MESSAGES_PROPERTY); + op.claimReadonlyProperty(w._messagesProperty); control.setThrowable(ex); op.getBaseClass(); @@ -95,7 +95,7 @@ ErrorLog log = (ErrorLog) newMock(ErrorLog.class); log.error( - EnhanceMessages.errorAddingProperty(w.MESSAGES_PROPERTY, BaseComponent.class, ex), + EnhanceMessages.errorAddingProperty(w._messagesProperty, BaseComponent.class, ex), l, ex); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]