Modified: jakarta/tapestry/branches/4.0/framework/src/java/org/apache/tapestry/link/LinkMessages.java URL: http://svn.apache.org/viewcvs/jakarta/tapestry/branches/4.0/framework/src/java/org/apache/tapestry/link/LinkMessages.java?rev=368196&r1=368195&r2=368196&view=diff ============================================================================== --- jakarta/tapestry/branches/4.0/framework/src/java/org/apache/tapestry/link/LinkMessages.java (original) +++ jakarta/tapestry/branches/4.0/framework/src/java/org/apache/tapestry/link/LinkMessages.java Wed Jan 11 16:47:57 2006 @@ -1,4 +1,4 @@ -// Copyright 2005 The Apache Software Foundation +// Copyright 2005, 2006 The Apache Software Foundation // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -14,6 +14,7 @@ package org.apache.tapestry.link; +import org.apache.hivemind.Messages; import org.apache.hivemind.impl.MessageFormatter; /** @@ -22,12 +23,18 @@ * @author Howard M. Lewis Ship * @since 4.0 */ -public class LinkMessages +public final class LinkMessages { - private static final MessageFormatter _formatter = new MessageFormatter(LinkMessages.class); + + private static final Messages MESSAGES = new MessageFormatter(LinkMessages.class); + + /** @since 4.1 */ + private LinkMessages() + { + } public static String noNesting() { - return _formatter.getMessage("no-nesting"); + return MESSAGES.getMessage("no-nesting"); } }
Modified: jakarta/tapestry/branches/4.0/framework/src/java/org/apache/tapestry/listener/ListenerMessages.java URL: http://svn.apache.org/viewcvs/jakarta/tapestry/branches/4.0/framework/src/java/org/apache/tapestry/listener/ListenerMessages.java?rev=368196&r1=368195&r2=368196&view=diff ============================================================================== --- jakarta/tapestry/branches/4.0/framework/src/java/org/apache/tapestry/listener/ListenerMessages.java (original) +++ jakarta/tapestry/branches/4.0/framework/src/java/org/apache/tapestry/listener/ListenerMessages.java Wed Jan 11 16:47:57 2006 @@ -1,4 +1,4 @@ -// Copyright 2005 The Apache Software Foundation +// Copyright 2005, 2006 The Apache Software Foundation // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -16,6 +16,7 @@ import java.lang.reflect.Method; +import org.apache.hivemind.Messages; import org.apache.hivemind.impl.MessageFormatter; import org.apache.tapestry.Tapestry; @@ -23,28 +24,31 @@ * @author Howard M. Lewis Ship * @since 4.0 */ -class ListenerMessages +final class ListenerMessages { - private static final MessageFormatter _formatter = new MessageFormatter(ListenerMessages.class); + private static final Messages MESSAGES = new MessageFormatter(ListenerMessages.class); + /** @since 4.1 */ + private ListenerMessages() {} + static String objectMissingMethod(Object target, String name) { - return _formatter.format("object-missing-method", target, name); + return MESSAGES.format("object-missing-method", target, name); } static String unableToInvokeMethod(Method method, Object target, Throwable ex) { - return _formatter.format("unable-to-invoke-method", method.getName(), target, ex); + return MESSAGES.format("unable-to-invoke-method", method.getName(), target, ex); } static String listenerMethodFailure(Method m, Object target, Throwable cause) { - return _formatter.format("listener-method-failure", m, target, cause); + return MESSAGES.format("listener-method-failure", m, target, cause); } static String noListenerMethodFound(String name, Object[] serviceParameters, Object target) { - return _formatter.format("no-listener-method-found", name, new Integer(Tapestry + return MESSAGES.format("no-listener-method-found", name, new Integer(Tapestry .size(serviceParameters)), target); } } Modified: jakarta/tapestry/branches/4.0/framework/src/java/org/apache/tapestry/markup/AbstractMarkupFilter.java URL: http://svn.apache.org/viewcvs/jakarta/tapestry/branches/4.0/framework/src/java/org/apache/tapestry/markup/AbstractMarkupFilter.java?rev=368196&r1=368195&r2=368196&view=diff ============================================================================== --- jakarta/tapestry/branches/4.0/framework/src/java/org/apache/tapestry/markup/AbstractMarkupFilter.java (original) +++ jakarta/tapestry/branches/4.0/framework/src/java/org/apache/tapestry/markup/AbstractMarkupFilter.java Wed Jan 11 16:47:57 2006 @@ -1,4 +1,4 @@ -// Copyright 2005 The Apache Software Foundation +// Copyright 2005, 2006 The Apache Software Foundation // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -26,8 +26,8 @@ * @author Howard M. Lewis Ship * @since 4.0 */ -public class AbstractMarkupFilter implements MarkupFilter -{ +public class AbstractMarkupFilter implements MarkupFilter { + private final ICharacterTranslator _translator; protected AbstractMarkupFilter(ICharacterTranslator translator) @@ -37,8 +37,10 @@ _translator = translator; } - public void print(PrintWriter writer, char[] data, int offset, int length, boolean escapeQuotes) + public void print(PrintWriter writer, char[] data, int offset, int length, + boolean escapeQuotes) { - MarkupFilterUtils.print(writer, data, offset, length, escapeQuotes, _translator); + MarkupFilterUtils.print(writer, data, offset, length, escapeQuotes, + _translator); } -} \ No newline at end of file +} Modified: jakarta/tapestry/branches/4.0/framework/src/java/org/apache/tapestry/markup/MarkupFilterUtils.java URL: http://svn.apache.org/viewcvs/jakarta/tapestry/branches/4.0/framework/src/java/org/apache/tapestry/markup/MarkupFilterUtils.java?rev=368196&r1=368195&r2=368196&view=diff ============================================================================== --- jakarta/tapestry/branches/4.0/framework/src/java/org/apache/tapestry/markup/MarkupFilterUtils.java (original) +++ jakarta/tapestry/branches/4.0/framework/src/java/org/apache/tapestry/markup/MarkupFilterUtils.java Wed Jan 11 16:47:57 2006 @@ -1,4 +1,4 @@ -// Copyright 2005 The Apache Software Foundation +// Copyright 2005, 2006 The Apache Software Foundation // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -19,21 +19,28 @@ import org.apache.tapestry.util.text.ICharacterTranslator; /** - * For the meantime, implemenatations of [EMAIL PROTECTED] org.apache.tapestry.markup.MarkupFilter} are - * wrappers around [EMAIL PROTECTED] org.apache.tapestry.util.text.ICharacterTranslator}. This class provides - * handy methods for doing the grunt work. + * For the meantime, implemenatations of + * [EMAIL PROTECTED] org.apache.tapestry.markup.MarkupFilter} are wrappers around + * [EMAIL PROTECTED] org.apache.tapestry.util.text.ICharacterTranslator}. This class + * provides handy methods for doing the grunt work. * * @author Howard M. Lewis Ship * @since 4.0 */ -public class MarkupFilterUtils +public final class MarkupFilterUtils { - public static void print(PrintWriter writer, char[] data, int offset, int length, - boolean escapeQuotes, ICharacterTranslator translator) + + /** @since 4.1 */ + private MarkupFilterUtils() + { + } + + public static void print(PrintWriter writer, char[] data, int offset, int length, boolean escapeQuotes, + ICharacterTranslator translator) { StringBuffer buffer = new StringBuffer(length); - for (int i = 0; i < length; i++) + for(int i = 0; i < length; i++) { char ch = data[offset + i]; @@ -54,11 +61,14 @@ buffer.append(translated); } - // We'll have to see if building up a buffer and then printing it in one go is the - // most efficient route. It's hard to predict what will give the best performance, - // but there's almost certainly a buffered writer between this code and the + // We'll have to see if building up a buffer and then printing it in one + // go is the + // most efficient route. It's hard to predict what will give the best + // performance, + // but there's almost certainly a buffered writer between this code and + // the // character set encoder. writer.print(buffer.toString()); } -} \ No newline at end of file +} Modified: jakarta/tapestry/branches/4.0/framework/src/java/org/apache/tapestry/markup/MarkupMessages.java URL: http://svn.apache.org/viewcvs/jakarta/tapestry/branches/4.0/framework/src/java/org/apache/tapestry/markup/MarkupMessages.java?rev=368196&r1=368195&r2=368196&view=diff ============================================================================== --- jakarta/tapestry/branches/4.0/framework/src/java/org/apache/tapestry/markup/MarkupMessages.java (original) +++ jakarta/tapestry/branches/4.0/framework/src/java/org/apache/tapestry/markup/MarkupMessages.java Wed Jan 11 16:47:57 2006 @@ -1,4 +1,4 @@ -// Copyright 2005 The Apache Software Foundation +// Copyright 2005, 2006 The Apache Software Foundation // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -16,6 +16,7 @@ import java.util.List; +import org.apache.hivemind.Messages; import org.apache.hivemind.impl.MessageFormatter; import org.apache.tapestry.util.ContentType; @@ -23,14 +24,19 @@ * @author Howard M. Lewis Ship * @since 4.0 */ -class MarkupMessages +final class MarkupMessages { - private final static MessageFormatter _formatter = new MessageFormatter(MarkupMessages.class, - "MarkupStrings"); + + private final static Messages MESSAGES = new MessageFormatter(MarkupMessages.class, "MarkupStrings"); + + /** @since 4.1 */ + private MarkupMessages() + { + } static String tagNotOpen() { - return _formatter.getMessage("tag-not-open"); + return MESSAGES.getMessage("tag-not-open"); } static String elementNotOnStack(String name, List activeElementStack) @@ -39,29 +45,28 @@ int count = activeElementStack.size(); - for (int i = 0; i < count; i++) + for(int i = 0; i < count; i++) { - if (i > 0) - buffer.append(", "); + if (i > 0) buffer.append(", "); buffer.append(activeElementStack.get(i)); } - return _formatter.format("element-not-on-stack", name, buffer.toString()); + return MESSAGES.format("element-not-on-stack", name, buffer.toString()); } static String endWithEmptyStack() { - return _formatter.getMessage("end-with-empty-stack"); + return MESSAGES.getMessage("end-with-empty-stack"); } static String noFilterMatch(ContentType contentType) { - return _formatter.format("no-filter-match", contentType); + return MESSAGES.format("no-filter-match", contentType); } static String closeOnce() { - return _formatter.getMessage("close-once"); + return MESSAGES.getMessage("close-once"); } -} \ No newline at end of file +} Modified: jakarta/tapestry/branches/4.0/framework/src/java/org/apache/tapestry/markup/UTFMarkupFilter.java URL: http://svn.apache.org/viewcvs/jakarta/tapestry/branches/4.0/framework/src/java/org/apache/tapestry/markup/UTFMarkupFilter.java?rev=368196&r1=368195&r2=368196&view=diff ============================================================================== --- jakarta/tapestry/branches/4.0/framework/src/java/org/apache/tapestry/markup/UTFMarkupFilter.java (original) +++ jakarta/tapestry/branches/4.0/framework/src/java/org/apache/tapestry/markup/UTFMarkupFilter.java Wed Jan 11 16:47:57 2006 @@ -1,4 +1,4 @@ -// Copyright 2005 The Apache Software Foundation +// Copyright 2005, 2006 The Apache Software Foundation // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -17,18 +17,19 @@ import org.apache.tapestry.util.text.MarkupCharacterTranslator; /** - * Implementation for UTF markups, where out-of-range ascii characters don't have to be encoded - * (they can pass right through). + * Implementation for UTF markups, where out-of-range ascii characters don't + * have to be encoded (they can pass right through). * * @author Howard M. Lewis Ship * @since 4.0 */ public class UTFMarkupFilter extends AbstractMarkupFilter { + public UTFMarkupFilter() { // No special encoding necessary. super(new MarkupCharacterTranslator(false)); } -} \ No newline at end of file +} Modified: jakarta/tapestry/branches/4.0/framework/src/java/org/apache/tapestry/multipart/MultipartMessages.java URL: http://svn.apache.org/viewcvs/jakarta/tapestry/branches/4.0/framework/src/java/org/apache/tapestry/multipart/MultipartMessages.java?rev=368196&r1=368195&r2=368196&view=diff ============================================================================== --- jakarta/tapestry/branches/4.0/framework/src/java/org/apache/tapestry/multipart/MultipartMessages.java (original) +++ jakarta/tapestry/branches/4.0/framework/src/java/org/apache/tapestry/multipart/MultipartMessages.java Wed Jan 11 16:47:57 2006 @@ -1,4 +1,4 @@ -// Copyright 2005 The Apache Software Foundation +// Copyright 2005, 2006 The Apache Software Foundation // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -16,34 +16,41 @@ import java.io.File; +import org.apache.hivemind.Messages; import org.apache.hivemind.impl.MessageFormatter; /** * @author Howard M. Lewis Ship * @since 4.0 */ -class MultipartMessages +final class MultipartMessages { - private final static MessageFormatter _formatter = new MessageFormatter(MultipartMessages.class); + + private final static Messages MESSAGES = new MessageFormatter(MultipartMessages.class); + + /** @since 4.1 */ + private MultipartMessages() + { + } static String unableToDecode(Throwable cause) { - return _formatter.format("unable-to-decode", cause); + return MESSAGES.format("unable-to-decode", cause); } static String unsupportedEncoding(String encoding, Throwable cause) { - return _formatter.format("unsupported-encoding", encoding, cause); + return MESSAGES.format("unsupported-encoding", encoding, cause); } static String unableToOpenContentFile(UploadPart part, Throwable cause) { - return _formatter.format("unable-to-open-content-file", part.getFilePath(), cause); + return MESSAGES.format("unable-to-open-content-file", part.getFilePath(), cause); } static String writeFailure(File file, Throwable cause) { - return _formatter.format("write-failure", file, cause); + return MESSAGES.format("write-failure", file, cause); } -} \ No newline at end of file +} Modified: jakarta/tapestry/branches/4.0/framework/src/java/org/apache/tapestry/multipart/UploadFormParametersWrapper.java URL: http://svn.apache.org/viewcvs/jakarta/tapestry/branches/4.0/framework/src/java/org/apache/tapestry/multipart/UploadFormParametersWrapper.java?rev=368196&r1=368195&r2=368196&view=diff ============================================================================== --- jakarta/tapestry/branches/4.0/framework/src/java/org/apache/tapestry/multipart/UploadFormParametersWrapper.java (original) +++ jakarta/tapestry/branches/4.0/framework/src/java/org/apache/tapestry/multipart/UploadFormParametersWrapper.java Wed Jan 11 16:47:57 2006 @@ -1,4 +1,4 @@ -// Copyright 2005 The Apache Software Foundation +// Copyright 2005, 2006 The Apache Software Foundation // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -24,14 +24,15 @@ import org.apache.hivemind.util.Defense; /** - * [EMAIL PROTECTED] javax.servlet.http.HttpServletRequest} wrapper that provides access to the form - * field values uploaded in a multipart request. + * [EMAIL PROTECTED] javax.servlet.http.HttpServletRequest} wrapper that provides access to + * the form field values uploaded in a multipart request. * * @author Howard M. Lewis Ship * @since 4.0 */ public class UploadFormParametersWrapper extends HttpServletRequestWrapper { + /** * Map of [EMAIL PROTECTED] ValuePart} keyed on parameter name. */ @@ -39,7 +40,8 @@ /** * @param parameterMap - * a map whose keys are parameter names and whose values are arrays of Strings. + * a map whose keys are parameter names and whose values are + * arrays of Strings. */ public UploadFormParametersWrapper(HttpServletRequest request, Map parameterMap) { @@ -69,11 +71,11 @@ public String[] getParameterValues(String name) { - return (String[]) _parameterMap.get(name); + return (String[])_parameterMap.get(name); } public String toString() { return "<UploadFormPartWrapper for " + getRequest() + ">"; } -} \ No newline at end of file +} Modified: jakarta/tapestry/branches/4.0/framework/src/java/org/apache/tapestry/multipart/UploadPart.java URL: http://svn.apache.org/viewcvs/jakarta/tapestry/branches/4.0/framework/src/java/org/apache/tapestry/multipart/UploadPart.java?rev=368196&r1=368195&r2=368196&view=diff ============================================================================== --- jakarta/tapestry/branches/4.0/framework/src/java/org/apache/tapestry/multipart/UploadPart.java (original) +++ jakarta/tapestry/branches/4.0/framework/src/java/org/apache/tapestry/multipart/UploadPart.java Wed Jan 11 16:47:57 2006 @@ -1,4 +1,4 @@ -// Copyright 2004, 2005 The Apache Software Foundation +// Copyright 2004, 2005, 2006 The Apache Software Foundation // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -32,6 +32,7 @@ */ public class UploadPart extends Object implements IUploadFile { + private FileItem _fileItem; public UploadPart(FileItem fileItem) @@ -47,7 +48,8 @@ } /** - * Leverages [EMAIL PROTECTED] File}to convert the full file path and extract the name. + * Leverages [EMAIL PROTECTED] File}to convert the full file path and extract the + * name. */ public String getFileName() { @@ -73,9 +75,7 @@ } catch (IOException ex) { - throw new ApplicationRuntimeException(MultipartMessages.unableToOpenContentFile( - this, - ex), ex); + throw new ApplicationRuntimeException(MultipartMessages.unableToOpenContentFile(this, ex), ex); } } @@ -89,8 +89,9 @@ } /** - * Writes the uploaded content to a file. This should be invoked at most once (perhaps we should - * add a check for this). This will often be a simple file rename. + * Writes the uploaded content to a file. This should be invoked at most + * once (perhaps we should add a check for this). This will often be a + * simple file rename. * * @since 3.0 */ @@ -102,10 +103,8 @@ } catch (Exception ex) { - throw new ApplicationRuntimeException(Tapestry.format( - "UploadPart.write-failure", - file, - ex.getMessage()), ex); + throw new ApplicationRuntimeException(Tapestry.format("UploadPart.write-failure", file, ex.getMessage()), + ex); } } @@ -125,4 +124,4 @@ return _fileItem.isInMemory(); } -} \ No newline at end of file +} Modified: jakarta/tapestry/branches/4.0/framework/src/java/org/apache/tapestry/multipart/ValuePart.java URL: http://svn.apache.org/viewcvs/jakarta/tapestry/branches/4.0/framework/src/java/org/apache/tapestry/multipart/ValuePart.java?rev=368196&r1=368195&r2=368196&view=diff ============================================================================== --- jakarta/tapestry/branches/4.0/framework/src/java/org/apache/tapestry/multipart/ValuePart.java (original) +++ jakarta/tapestry/branches/4.0/framework/src/java/org/apache/tapestry/multipart/ValuePart.java Wed Jan 11 16:47:57 2006 @@ -1,4 +1,4 @@ -// Copyright 2004, 2005 The Apache Software Foundation +// Copyright 2004, 2005, 2006 The Apache Software Foundation // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -18,7 +18,8 @@ import java.util.List; /** - * A portion of a multipart request that stores a value, or values, for a parameter. + * A portion of a multipart request that stores a value, or values, for a + * parameter. * * @author Howard Lewis Ship * @since 2.0.1 @@ -26,6 +27,7 @@ public class ValuePart { + private int _count; // Stores either String or List of String @@ -48,28 +50,25 @@ public String getValue() { - if (_count == 1) - return (String) _value; + if (_count == 1) return (String)_value; - List l = (List) _value; + List l = (List)_value; - return (String) l.get(0); + return (String)l.get(0); } /** - * Returns the values as an array of strings. If there is only one value, it is returned wrapped - * as a single element array. + * Returns the values as an array of strings. If there is only one value, it + * is returned wrapped as a single element array. */ public String[] getValues() { - if (_count == 1) - return new String[] - { (String) _value }; + if (_count == 1) return new String[] { (String)_value }; - List l = (List) _value; + List l = (List)_value; - return (String[]) l.toArray(new String[_count]); + return (String[])l.toArray(new String[_count]); } public void add(String newValue) @@ -85,7 +84,7 @@ return; } - List l = (List) _value; + List l = (List)_value; l.add(newValue); _count++; } @@ -97,4 +96,4 @@ public void cleanup() { } -} \ No newline at end of file +} Modified: jakarta/tapestry/branches/4.0/framework/src/java/org/apache/tapestry/pageload/PageLoader.java URL: http://svn.apache.org/viewcvs/jakarta/tapestry/branches/4.0/framework/src/java/org/apache/tapestry/pageload/PageLoader.java?rev=368196&r1=368195&r2=368196&view=diff ============================================================================== --- jakarta/tapestry/branches/4.0/framework/src/java/org/apache/tapestry/pageload/PageLoader.java (original) +++ jakarta/tapestry/branches/4.0/framework/src/java/org/apache/tapestry/pageload/PageLoader.java Wed Jan 11 16:47:57 2006 @@ -1,4 +1,4 @@ -// Copyright 2004, 2005 The Apache Software Foundation +// Copyright 2004, 2005, 2006 The Apache Software Foundation // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -27,12 +27,10 @@ import org.apache.hivemind.Resource; import org.apache.hivemind.service.ThreadLocale; import org.apache.hivemind.util.ContextResource; -import org.apache.tapestry.AbstractComponent; import org.apache.tapestry.BaseComponent; import org.apache.tapestry.IAsset; import org.apache.tapestry.IBinding; import org.apache.tapestry.IComponent; -import org.apache.tapestry.IEngine; import org.apache.tapestry.INamespace; import org.apache.tapestry.IPage; import org.apache.tapestry.IRequestCycle; @@ -40,10 +38,8 @@ import org.apache.tapestry.TapestryConstants; import org.apache.tapestry.asset.AssetSource; import org.apache.tapestry.binding.BindingSource; -import org.apache.tapestry.binding.ExpressionBinding; import org.apache.tapestry.coerce.ValueConverter; import org.apache.tapestry.engine.IPageLoader; -import org.apache.tapestry.event.ChangeObserver; import org.apache.tapestry.resolver.ComponentSpecificationResolver; import org.apache.tapestry.services.ComponentConstructor; import org.apache.tapestry.services.ComponentConstructorFactory; Modified: jakarta/tapestry/branches/4.0/framework/src/java/org/apache/tapestry/pageload/PageloadMessages.java URL: http://svn.apache.org/viewcvs/jakarta/tapestry/branches/4.0/framework/src/java/org/apache/tapestry/pageload/PageloadMessages.java?rev=368196&r1=368195&r2=368196&view=diff ============================================================================== --- jakarta/tapestry/branches/4.0/framework/src/java/org/apache/tapestry/pageload/PageloadMessages.java (original) +++ jakarta/tapestry/branches/4.0/framework/src/java/org/apache/tapestry/pageload/PageloadMessages.java Wed Jan 11 16:47:57 2006 @@ -1,4 +1,4 @@ -// Copyright 2004, 2005 The Apache Software Foundation +// Copyright 2004, 2005, 2006 The Apache Software Foundation // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -16,6 +16,7 @@ import org.apache.hivemind.HiveMind; import org.apache.hivemind.Location; +import org.apache.hivemind.Messages; import org.apache.hivemind.impl.MessageFormatter; import org.apache.tapestry.IBinding; import org.apache.tapestry.IComponent; @@ -27,109 +28,103 @@ * @author Howard Lewis Ship * @since 4.0 */ -class PageloadMessages +final class PageloadMessages { - private final static MessageFormatter _formatter = new MessageFormatter(PageloadMessages.class); + + private final static Messages MESSAGES = new MessageFormatter(PageloadMessages.class); + + /** @since 4.1 */ + private PageloadMessages() + { + } static String parameterMustHaveNoDefaultValue(IComponent component, String name) { - return _formatter.format( - "parameter-must-have-no-default-value", - component.getExtendedId(), - name); + return MESSAGES.format("parameter-must-have-no-default-value", component.getExtendedId(), name); } - static String unableToInitializeProperty(String propertyName, IComponent component, - Throwable cause) + static String unableToInitializeProperty(String propertyName, IComponent component, Throwable cause) { - return _formatter.format("unable-to-initialize-property", propertyName, component, cause); + return MESSAGES.format("unable-to-initialize-property", propertyName, component, cause); } static String requiredParameterNotBound(String name, IComponent component) { - return _formatter.format("required-parameter-not-bound", name, component.getExtendedId()); + return MESSAGES.format("required-parameter-not-bound", name, component.getExtendedId()); } static String inheritInformalInvalidComponentFormalOnly(IComponent component) { - return _formatter.format("inherit-informal-invalid-component-formal-only", component - .getExtendedId()); + return MESSAGES.format("inherit-informal-invalid-component-formal-only", component.getExtendedId()); } - static String inheritInformalInvalidContainerFormalOnly(IComponent container, - IComponent component) + static String inheritInformalInvalidContainerFormalOnly(IComponent container, IComponent component) { - return _formatter.format("inherit-informal-invalid-container-formal-only", container - .getExtendedId(), component.getExtendedId()); + return MESSAGES.format("inherit-informal-invalid-container-formal-only", container.getExtendedId(), component + .getExtendedId()); } static String formalParametersOnly(IComponent component, String parameterName) { - return _formatter - .format("formal-parameters-only", component.getExtendedId(), parameterName); + return MESSAGES.format("formal-parameters-only", component.getExtendedId(), parameterName); } static String unableToInstantiateComponent(IComponent container, Throwable cause) { - return _formatter.format( - "unable-to-instantiate-component", - container.getExtendedId(), - cause); + return MESSAGES.format("unable-to-instantiate-component", container.getExtendedId(), cause); } static String classNotComponent(Class componentClass) { - return _formatter.format("class-not-component", componentClass.getName()); + return MESSAGES.format("class-not-component", componentClass.getName()); } static String unableToInstantiate(String className, Throwable cause) { - return _formatter.format("unable-to-instantiate", className, cause); + return MESSAGES.format("unable-to-instantiate", className, cause); } static String pageNotAllowed(String componentId) { - return _formatter.format("page-not-allowed", componentId); + return MESSAGES.format("page-not-allowed", componentId); } static String classNotPage(Class componentClass) { - return _formatter.format("class-not-page", componentClass.getName()); + return MESSAGES.format("class-not-page", componentClass.getName()); } static String defaultParameterName(String name) { - return _formatter.format("default-parameter-name", name); + return MESSAGES.format("default-parameter-name", name); } static String initializerName(String propertyName) { - return _formatter.format("initializer-name", propertyName); + return MESSAGES.format("initializer-name", propertyName); } static String parameterName(String name) { - return _formatter.format("parameter-name", name); + return MESSAGES.format("parameter-name", name); } static String duplicateParameter(String parameterName, IBinding binding) { - return _formatter.format("duplicate-parameter", parameterName, HiveMind - .getLocationString(binding)); + return MESSAGES.format("duplicate-parameter", parameterName, HiveMind.getLocationString(binding)); } - public static String usedParameterAlias(IContainedComponent contained, String name, - String parameterName, Location bindingLocation) + public static String usedParameterAlias(IContainedComponent contained, String name, String parameterName, + Location bindingLocation) { - return _formatter.format("used-parameter-alias", new Object[] - { HiveMind.getLocationString(bindingLocation), contained.getType(), name, parameterName }); + return MESSAGES.format("used-parameter-alias", new Object[] { HiveMind.getLocationString(bindingLocation), + contained.getType(), name, parameterName }); } - public static String deprecatedParameter(String parameterName, Location location, - String componentType) + public static String deprecatedParameter(String parameterName, Location location, String componentType) { - return _formatter.format("deprecated-parameter", parameterName, HiveMind - .getLocationString(location), componentType); + return MESSAGES.format("deprecated-parameter", parameterName, HiveMind.getLocationString(location), + componentType); } -} \ No newline at end of file +} Modified: jakarta/tapestry/branches/4.0/framework/src/java/org/apache/tapestry/parse/BindingSetter.java URL: http://svn.apache.org/viewcvs/jakarta/tapestry/branches/4.0/framework/src/java/org/apache/tapestry/parse/BindingSetter.java?rev=368196&r1=368195&r2=368196&view=diff ============================================================================== --- jakarta/tapestry/branches/4.0/framework/src/java/org/apache/tapestry/parse/BindingSetter.java (original) +++ jakarta/tapestry/branches/4.0/framework/src/java/org/apache/tapestry/parse/BindingSetter.java Wed Jan 11 16:47:57 2006 @@ -1,4 +1,4 @@ -// Copyright 2004, 2005 The Apache Software Foundation +// Copyright 2004, 2005, 2006 The Apache Software Foundation // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -19,13 +19,14 @@ import org.apache.tapestry.spec.IContainedComponent; /** - * Carries name and value information while the body of - * a <binding> or <static-binding> is being parsed. - * + * Carries name and value information while the body of a <binding> or + * <static-binding> is being parsed. + * * @author Howard Lewis Ship */ class BindingSetter extends BaseLocatable { + private IContainedComponent _component; private String _name; private String _value; @@ -39,7 +40,7 @@ void apply(IBindingSpecification spec) { - spec.setLocation(getLocation()); + spec.setLocation(getLocation()); _component.setBinding(_name, spec); } Modified: jakarta/tapestry/branches/4.0/framework/src/java/org/apache/tapestry/parse/ParseMessages.java URL: http://svn.apache.org/viewcvs/jakarta/tapestry/branches/4.0/framework/src/java/org/apache/tapestry/parse/ParseMessages.java?rev=368196&r1=368195&r2=368196&view=diff ============================================================================== --- jakarta/tapestry/branches/4.0/framework/src/java/org/apache/tapestry/parse/ParseMessages.java (original) +++ jakarta/tapestry/branches/4.0/framework/src/java/org/apache/tapestry/parse/ParseMessages.java Wed Jan 11 16:47:57 2006 @@ -1,4 +1,4 @@ -// Copyright 2004, 2005 The Apache Software Foundation +// Copyright 2004, 2005, 2006 The Apache Software Foundation // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -16,6 +16,7 @@ import org.apache.hivemind.HiveMind; import org.apache.hivemind.Location; +import org.apache.hivemind.Messages; import org.apache.hivemind.Resource; import org.apache.hivemind.impl.MessageFormatter; @@ -25,178 +26,174 @@ * @author Howard Lewis Ship * @since 4.0 */ -class ParseMessages +final class ParseMessages { - private final static MessageFormatter _formatter = new MessageFormatter(ParseMessages.class); + + private final static Messages MESSAGES = new MessageFormatter(ParseMessages.class); + + /** @since 4.1 */ + private ParseMessages() + { + } static String commentNotEnded(int line) { - return _formatter.format("comment-not-ended", new Integer(line)); + return MESSAGES.format("comment-not-ended", new Integer(line)); } static String unclosedUnknownTag(int line) { - return _formatter.format("unclosed-unknown-tag", new Integer(line)); + return MESSAGES.format("unclosed-unknown-tag", new Integer(line)); } static String unclosedTag(String tagName, int line) { - return _formatter.format("unclosed-tag", tagName, new Integer(line)); + return MESSAGES.format("unclosed-tag", tagName, new Integer(line)); } static String missingAttributeValue(String tagName, int line, String attributeName) { - return _formatter.format( - "missing-attribute-value", - tagName, - new Integer(line), - attributeName); + return MESSAGES.format("missing-attribute-value", tagName, new Integer(line), attributeName); } static String componentMayNotBeIgnored(String tagName, int line) { - return _formatter.format("component-may-not-be-ignored", tagName, new Integer(line)); + return MESSAGES.format("component-may-not-be-ignored", tagName, new Integer(line)); } static String componentIdInvalid(String tagName, int line, String jwcid) { - return _formatter.format("component-id-invalid", tagName, new Integer(line), jwcid); + return MESSAGES.format("component-id-invalid", tagName, new Integer(line), jwcid); } static String unknownComponentId(String tagName, int line, String jwcid) { - return _formatter.format("unknown-component-id", tagName, new Integer(line), jwcid); + return MESSAGES.format("unknown-component-id", tagName, new Integer(line), jwcid); } static String nestedIgnore(String tagName, int line) { - return _formatter.format("nested-ignore", tagName, new Integer(line)); + return MESSAGES.format("nested-ignore", tagName, new Integer(line)); } static String contentBlockMayNotBeIgnored(String tagName, int line) { - return _formatter.format("content-block-may-not-be-ignored", tagName, new Integer(line)); + return MESSAGES.format("content-block-may-not-be-ignored", tagName, new Integer(line)); } static String contentBlockMayNotBeEmpty(String tagName, int line) { - return _formatter.format("content-block-may-not-be-empty", tagName, new Integer(line)); + return MESSAGES.format("content-block-may-not-be-empty", tagName, new Integer(line)); } static String incompleteCloseTag(int line) { - return _formatter.format("incomplete-close-tag", new Integer(line)); + return MESSAGES.format("incomplete-close-tag", new Integer(line)); } - static String improperlyNestedCloseTag(String tagName, int closeLine, String startTagName, - int startLine) + static String improperlyNestedCloseTag(String tagName, int closeLine, String startTagName, int startLine) { - return _formatter.format("improperly-nested-close-tag", new Object[] - { tagName, new Integer(closeLine), startTagName, new Integer(startLine) }); + return MESSAGES.format("improperly-nested-close-tag", new Object[] { tagName, new Integer(closeLine), + startTagName, new Integer(startLine) }); } static String unmatchedCloseTag(String tagName, int line) { - return _formatter.format("unmatched-close-tag", tagName, new Integer(line)); + return MESSAGES.format("unmatched-close-tag", tagName, new Integer(line)); } static String failConvertBoolean(String value) { - return _formatter.format("fail-convert-boolean", value); + return MESSAGES.format("fail-convert-boolean", value); } static String failConvertDouble(String value) { - return _formatter.format("fail-convert-double", value); + return MESSAGES.format("fail-convert-double", value); } static String failConvertInt(String value) { - return _formatter.format("fail-convert-int", value); + return MESSAGES.format("fail-convert-int", value); } static String failConvertLong(String value) { - return _formatter.format("fail-convert-long", value); + return MESSAGES.format("fail-convert-long", value); } static String unableToCopy(String id) { - return _formatter.format("unable-to-copy", id); + return MESSAGES.format("unable-to-copy", id); } static String bothTypeAndCopyOf(String id) { - return _formatter.format("both-type-and-copy-of", id); + return MESSAGES.format("both-type-and-copy-of", id); } static String missingTypeOrCopyOf(String id) { - return _formatter.format("missing-type-or-copy-of", id); + return MESSAGES.format("missing-type-or-copy-of", id); } static String frameworkLibraryIdIsReserved(String id) { - return _formatter.format("framework-library-id-is-reserved", id); + return MESSAGES.format("framework-library-id-is-reserved", id); } static String incorrectDocumentType(String expected, String actual) { - return _formatter.format("incorrect-document-type", expected, actual); + return MESSAGES.format("incorrect-document-type", expected, actual); } static String noAttributeAndBody(String attributeName, String elementName) { - return _formatter.format("no-attribute-and-body", attributeName, elementName); + return MESSAGES.format("no-attribute-and-body", attributeName, elementName); } static String requiredExtendedAttribute(String elementName, String attributeName) { - return _formatter.format("required-extended-attribute", elementName, attributeName); + return MESSAGES.format("required-extended-attribute", elementName, attributeName); } static String invalidAttribute(String key, String value) { - return _formatter.format(key, value); + return MESSAGES.format(key, value); } static String missingResource(Resource resource) { - return _formatter.format("missing-resource", resource); + return MESSAGES.format("missing-resource", resource); } static String errorReadingResource(Resource resource, Throwable cause) { - return _formatter.format("error-reading-resource", resource, cause); + return MESSAGES.format("error-reading-resource", resource, cause); } static String unknownPublicId(Resource resource, String publicId) { - return _formatter.format("unknown-public-id", resource, publicId); + return MESSAGES.format("unknown-public-id", resource, publicId); } static String serviceElementNotSupported() { - return _formatter.getMessage("service-element-not-supported"); + return MESSAGES.getMessage("service-element-not-supported"); } static String rangeError(TemplateToken token, int length) { - return _formatter.format("range-error", token, new Integer(length)); + return MESSAGES.format("range-error", token, new Integer(length)); } public static String duplicateTagAttribute(String tagName, int line, String attributeName) { - return _formatter.format( - "duplicate-tag-attribute", - tagName, - new Integer(line), - attributeName); + return MESSAGES.format("duplicate-tag-attribute", tagName, new Integer(line), attributeName); } public static Object listenerBindingUnsupported(Location location) { - return _formatter.format("listener-binding-unsupported", HiveMind - .getLocationString(location)); + return MESSAGES.format("listener-binding-unsupported", HiveMind.getLocationString(location)); } -} \ No newline at end of file +} Modified: jakarta/tapestry/branches/4.0/framework/src/java/org/apache/tapestry/parse/TemplateParseException.java URL: http://svn.apache.org/viewcvs/jakarta/tapestry/branches/4.0/framework/src/java/org/apache/tapestry/parse/TemplateParseException.java?rev=368196&r1=368195&r2=368196&view=diff ============================================================================== --- jakarta/tapestry/branches/4.0/framework/src/java/org/apache/tapestry/parse/TemplateParseException.java (original) +++ jakarta/tapestry/branches/4.0/framework/src/java/org/apache/tapestry/parse/TemplateParseException.java Wed Jan 11 16:47:57 2006 @@ -1,4 +1,4 @@ -// Copyright 2004, 2005 The Apache Software Foundation +// Copyright 2004, 2005, 2006 The Apache Software Foundation // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -18,18 +18,18 @@ import org.apache.hivemind.Location; /** - * Exception thrown indicating a problem parsing an HTML template. - * - * @author Howard Ship + * Exception thrown indicating a problem parsing an HTML template. * - **/ + * @author Howard Ship + */ public class TemplateParseException extends Exception implements Locatable { + private static final long serialVersionUID = 3741503276431589982L; - - private Location _location; - private Throwable _rootCause; + + private final Location _location; + private final Throwable _rootCause; public TemplateParseException(String message) { @@ -61,4 +61,4 @@ return _rootCause; } -} \ No newline at end of file +} --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
