You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tapestry.apache.org by hl...@apache.org on 2005/05/13 15:21:07 UTC
cvs commit: jakarta-tapestry/framework/src/java/org/apache/tapestry/multipart MultipartMessages.java
hlship 2005/05/13 06:21:07
Modified: framework/src/java/org/apache/tapestry/enhance
EnhanceMessages.java
framework/src/java/org/apache/tapestry/engine
EngineMessages.java
portlet/src/java/org/apache/tapestry/portlet
PortletMessages.java
framework/src/java/org/apache/tapestry/engine/state
StateMessages.java
framework/src/java/org/apache/tapestry/bean
BeanMessages.java
framework/src/java/org/apache/tapestry/binding
BindingMessages.java
framework/src/java/org/apache/tapestry/parse
ParseMessages.java
framework/src/java/org/apache/tapestry TapestryMessages.java
framework/src/java/org/apache/tapestry/web WebMessages.java
framework/src/java/org/apache/tapestry/markup
MarkupMessages.java
framework/src/java/org/apache/tapestry/error
ErrorMessages.java
framework/src/java/org/apache/tapestry/record
RecordMessages.java
contrib/src/java/org/apache/tapestry/contrib/table/components
TableMessages.java
framework/src/java/org/apache/tapestry/test
ScriptMessages.java
framework/src/java/org/apache/tapestry/coerce
CoerceMessages.java
framework/src/java/org/apache/tapestry/services/impl
ImplMessages.java
framework/src/java/org/apache/tapestry/asset
AssetMessages.java
framework/src/java/org/apache/tapestry/listener
ListenerMessages.java
framework/src/java/org/apache/tapestry/form
FormMessages.java
framework/src/java/org/apache/tapestry/valid
ValidMessages.java
portlet/src/java/org/apache/tapestry/portlet/bindings
BindingsMessages.java
framework/src/java/org/apache/tapestry/pageload
PageloadMessages.java
framework/src/java/org/apache/tapestry/components
ComponentMessages.java
framework/src/java/org/apache/tapestry/describe
DescribeMessages.java
framework/src/java/org/apache/tapestry/resolver
ResolverMessages.java
framework/src/java/org/apache/tapestry/multipart
MultipartMessages.java
Log:
Change the visibility of MessageFormatters inside the Messages classes, for eventual Spindle support.
Revision Changes Path
1.14 +1 -1 jakarta-tapestry/framework/src/java/org/apache/tapestry/enhance/EnhanceMessages.java
Index: EnhanceMessages.java
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/java/org/apache/tapestry/enhance/EnhanceMessages.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- EnhanceMessages.java 12 May 2005 18:18:18 -0000 1.13
+++ EnhanceMessages.java 13 May 2005 13:21:05 -0000 1.14
@@ -28,7 +28,7 @@
*/
class EnhanceMessages
{
- private static final MessageFormatter _formatter = new MessageFormatter(EnhanceMessages.class,
+ protected static MessageFormatter _formatter = new MessageFormatter(EnhanceMessages.class,
"EnhanceStrings");
static String noImplForAbstractMethod(Method method, Class declareClass, String className,
1.7 +1 -1 jakarta-tapestry/framework/src/java/org/apache/tapestry/engine/EngineMessages.java
Index: EngineMessages.java
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/java/org/apache/tapestry/engine/EngineMessages.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- EngineMessages.java 10 May 2005 22:50:57 -0000 1.6
+++ EngineMessages.java 13 May 2005 13:21:05 -0000 1.7
@@ -26,7 +26,7 @@
*/
public class EngineMessages
{
- private static final MessageFormatter _formatter = new MessageFormatter(EngineMessages.class,
+ protected static MessageFormatter _formatter = new MessageFormatter(EngineMessages.class,
"EngineStrings");
public static String serviceNoParameter(IEngineService service)
1.8 +1 -1 jakarta-tapestry/portlet/src/java/org/apache/tapestry/portlet/PortletMessages.java
Index: PortletMessages.java
===================================================================
RCS file: /home/cvs/jakarta-tapestry/portlet/src/java/org/apache/tapestry/portlet/PortletMessages.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- PortletMessages.java 10 May 2005 13:26:49 -0000 1.7
+++ PortletMessages.java 13 May 2005 13:21:05 -0000 1.8
@@ -22,7 +22,7 @@
*/
class PortletMessages
{
- private static final MessageFormatter _formatter = new MessageFormatter(PortletMessages.class,
+ protected static MessageFormatter _formatter = new MessageFormatter(PortletMessages.class,
"PortletStrings");
static String unsupportedMethod(String methodName)
1.3 +5 -5 jakarta-tapestry/framework/src/java/org/apache/tapestry/engine/state/StateMessages.java
Index: StateMessages.java
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/java/org/apache/tapestry/engine/state/StateMessages.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- StateMessages.java 18 Apr 2005 17:06:35 -0000 1.2
+++ StateMessages.java 13 May 2005 13:21:05 -0000 1.3
@@ -22,25 +22,25 @@
*/
class StateMessages
{
- private static final MessageFormatter _formatter = new MessageFormatter(StateMessages.class,
+ protected static MessageFormatter _formatter = new MessageFormatter(StateMessages.class,
"StateStrings");
- public static String unknownStateObjectName(String objectName)
+ static String unknownStateObjectName(String objectName)
{
return _formatter.format("unknown-state-object-name", objectName);
}
- public static String unableToInstantiateObject(Class objectClass, Throwable cause)
+ static String unableToInstantiateObject(Class objectClass, Throwable cause)
{
return _formatter.format("unable-to-instantiate-object", objectClass, cause);
}
- public static String unableToInstantiateObject(String className, Throwable cause)
+ static String unableToInstantiateObject(String className, Throwable cause)
{
return _formatter.format("unable-to-instantiate-object", className, cause);
}
- public static String unknownScope(String objectName, String scope)
+ static String unknownScope(String objectName, String scope)
{
return _formatter.format("unknown-scope", objectName, scope);
}
1.4 +2 -2 jakarta-tapestry/framework/src/java/org/apache/tapestry/bean/BeanMessages.java
Index: BeanMessages.java
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/java/org/apache/tapestry/bean/BeanMessages.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- BeanMessages.java 18 Apr 2005 17:06:44 -0000 1.3
+++ BeanMessages.java 13 May 2005 13:21:06 -0000 1.4
@@ -22,10 +22,10 @@
*/
class BeanMessages
{
- private static final MessageFormatter _formatter = new MessageFormatter(BeanMessages.class,
+ protected static MessageFormatter _formatter = new MessageFormatter(BeanMessages.class,
"BeanStrings");
- public static String propertyInitializerName(String propertyName)
+ static String propertyInitializerName(String propertyName)
{
return _formatter.format("property-initializer-name", propertyName);
}
1.6 +4 -4 jakarta-tapestry/framework/src/java/org/apache/tapestry/binding/BindingMessages.java
Index: BindingMessages.java
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/java/org/apache/tapestry/binding/BindingMessages.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- BindingMessages.java 18 Apr 2005 17:06:35 -0000 1.5
+++ BindingMessages.java 13 May 2005 13:21:06 -0000 1.6
@@ -24,20 +24,20 @@
*/
class BindingMessages
{
- private static final MessageFormatter _formatter = new MessageFormatter(BindingMessages.class,
+ protected static MessageFormatter _formatter = new MessageFormatter(BindingMessages.class,
"BindingStrings");
- public static String convertObjectError(IBinding binding, Throwable cause)
+ static String convertObjectError(IBinding binding, Throwable cause)
{
return _formatter.format("convert-object-error", binding.getDescription(), cause);
}
- public static String readOnlyBinding(IBinding binding)
+ static String readOnlyBinding(IBinding binding)
{
return _formatter.format("read-only-binding", binding.getDescription(), binding);
}
- public static String missingAsset(IComponent component, String assetName)
+ static String missingAsset(IComponent component, String assetName)
{
return _formatter.format("missing-asset", component.getExtendedId(), assetName);
}
1.8 +32 -32 jakarta-tapestry/framework/src/java/org/apache/tapestry/parse/ParseMessages.java
Index: ParseMessages.java
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/java/org/apache/tapestry/parse/ParseMessages.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ParseMessages.java 18 Apr 2005 17:06:43 -0000 1.7
+++ ParseMessages.java 13 May 2005 13:21:06 -0000 1.8
@@ -25,25 +25,25 @@
*/
class ParseMessages
{
- private static final MessageFormatter _formatter = new MessageFormatter(ParseMessages.class,
+ protected static MessageFormatter _formatter = new MessageFormatter(ParseMessages.class,
"ParseStrings");
- public static String commentNotEnded(int line)
+ static String commentNotEnded(int line)
{
return _formatter.format("comment-not-ended", new Integer(line));
}
- public static String unclosedUnknownTag(int line)
+ static String unclosedUnknownTag(int line)
{
return _formatter.format("unclosed-unknown-tag", new Integer(line));
}
- public static String unclosedTag(String tagName, int line)
+ static String unclosedTag(String tagName, int line)
{
return _formatter.format("unclosed-tag", tagName, new Integer(line));
}
- public static String missingAttributeValue(String tagName, int line, String attributeName)
+ static String missingAttributeValue(String tagName, int line, String attributeName)
{
return _formatter.format(
"missing-attribute-value",
@@ -52,134 +52,134 @@
attributeName);
}
- public static String componentMayNotBeIgnored(String tagName, int line)
+ static String componentMayNotBeIgnored(String tagName, int line)
{
return _formatter.format("component-may-not-be-ignored", tagName, new Integer(line));
}
- public static String componentIdInvalid(String tagName, int line, String jwcid)
+ static String componentIdInvalid(String tagName, int line, String jwcid)
{
return _formatter.format("component-id-invalid", tagName, new Integer(line), jwcid);
}
- public static String unknownComponentId(String tagName, int line, String jwcid)
+ static String unknownComponentId(String tagName, int line, String jwcid)
{
return _formatter.format("unknown-component-id", tagName, new Integer(line), jwcid);
}
- public static String nestedIgnore(String tagName, int line)
+ static String nestedIgnore(String tagName, int line)
{
return _formatter.format("nested-ignore", tagName, new Integer(line));
}
- public static String contentBlockMayNotBeIgnored(String tagName, int line)
+ static String contentBlockMayNotBeIgnored(String tagName, int line)
{
return _formatter.format("content-block-may-not-be-ignored", tagName, new Integer(line));
}
- public static String contentBlockMayNotBeEmpty(String tagName, int line)
+ static String contentBlockMayNotBeEmpty(String tagName, int line)
{
return _formatter.format("content-block-may-not-be-empty", tagName, new Integer(line));
}
- public static String incompleteCloseTag(int line)
+ static String incompleteCloseTag(int line)
{
return _formatter.format("incomplete-close-tag", new Integer(line));
}
- public 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) });
}
- public static String unmatchedCloseTag(String tagName, int line)
+ static String unmatchedCloseTag(String tagName, int line)
{
return _formatter.format("unmatched-close-tag", tagName, new Integer(line));
}
- public static String failConvertBoolean(String value)
+ static String failConvertBoolean(String value)
{
return _formatter.format("fail-convert-boolean", value);
}
- public static String failConvertDouble(String value)
+ static String failConvertDouble(String value)
{
return _formatter.format("fail-convert-double", value);
}
- public static String failConvertInt(String value)
+ static String failConvertInt(String value)
{
return _formatter.format("fail-convert-int", value);
}
- public static String failConvertLong(String value)
+ static String failConvertLong(String value)
{
return _formatter.format("fail-convert-long", value);
}
- public static String unableToCopy(String id)
+ static String unableToCopy(String id)
{
return _formatter.format("unable-to-copy", id);
}
- public static String bothTypeAndCopyOf(String id)
+ static String bothTypeAndCopyOf(String id)
{
return _formatter.format("both-type-and-copy-of", id);
}
- public static String missingTypeOrCopyOf(String id)
+ static String missingTypeOrCopyOf(String id)
{
return _formatter.format("missing-type-or-copy-of", id);
}
- public static String frameworkLibraryIdIsReserved(String id)
+ static String frameworkLibraryIdIsReserved(String id)
{
return _formatter.format("framework-library-id-is-reserved", id);
}
- public static String incorrectDocumentType(String expected, String actual)
+ static String incorrectDocumentType(String expected, String actual)
{
return _formatter.format("incorrect-document-type", expected, actual);
}
- public static String noAttributeAndBody(String attributeName, String elementName)
+ static String noAttributeAndBody(String attributeName, String elementName)
{
return _formatter.format("no-attribute-and-body", attributeName, elementName);
}
- public static String requiredExtendedAttribute(String elementName, String attributeName)
+ static String requiredExtendedAttribute(String elementName, String attributeName)
{
return _formatter.format("required-extended-attribute", elementName, attributeName);
}
- public static String invalidAttribute(String key, String value)
+ static String invalidAttribute(String key, String value)
{
return _formatter.format(key, value);
}
- public static String missingResource(Resource resource)
+ static String missingResource(Resource resource)
{
return _formatter.format("missing-resource", resource);
}
- public static String errorReadingResource(Resource resource, Throwable cause)
+ static String errorReadingResource(Resource resource, Throwable cause)
{
return _formatter.format("error-reading-resource", resource, cause);
}
- public static String unknownPublicId(Resource resource, String publicId)
+ static String unknownPublicId(Resource resource, String publicId)
{
return _formatter.format("unknown-public-id", resource, publicId);
}
- public static String serviceElementNotSupported()
+ static String serviceElementNotSupported()
{
return _formatter.getMessage("service-element-not-supported");
}
- public static String rangeError(TemplateToken token, int length)
+ static String rangeError(TemplateToken token, int length)
{
return _formatter.format("range-error", token, new Integer(length));
}
1.14 +2 -2 jakarta-tapestry/framework/src/java/org/apache/tapestry/TapestryMessages.java
Index: TapestryMessages.java
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/java/org/apache/tapestry/TapestryMessages.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- TapestryMessages.java 3 May 2005 17:41:26 -0000 1.13
+++ TapestryMessages.java 13 May 2005 13:21:06 -0000 1.14
@@ -20,9 +20,9 @@
* @author Howard Lewis Ship
* @since 4.0
*/
-final class TapestryMessages
+class TapestryMessages
{
- private static final MessageFormatter _formatter = new MessageFormatter(TapestryMessages.class,
+ protected static MessageFormatter _formatter = new MessageFormatter(TapestryMessages.class,
"TapestryStrings2");
static String servletInitFailure(Throwable cause)
1.6 +8 -8 jakarta-tapestry/framework/src/java/org/apache/tapestry/web/WebMessages.java
Index: WebMessages.java
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/java/org/apache/tapestry/web/WebMessages.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- WebMessages.java 18 Apr 2005 17:06:34 -0000 1.5
+++ WebMessages.java 13 May 2005 13:21:06 -0000 1.6
@@ -23,40 +23,40 @@
*/
class WebMessages
{
- private static final MessageFormatter _formatter = new MessageFormatter(WebMessages.class,
+ protected static MessageFormatter _formatter = new MessageFormatter(WebMessages.class,
"WebStrings");
- public static String streamOpenError(ContentType contentType, Throwable cause)
+ static String streamOpenError(ContentType contentType, Throwable cause)
{
return _formatter.format("stream-open-error", contentType, cause);
}
- public static String errorGettingResource(String path, Throwable ex)
+ static String errorGettingResource(String path, Throwable ex)
{
return _formatter.format("error-getting-resource", path, ex);
}
- public static String unableToFindDispatcher(String url)
+ static String unableToFindDispatcher(String url)
{
return _formatter.format("unable-to-find-dispatcher", url);
}
- public static String unableToForward(String url, Throwable cause)
+ static String unableToForward(String url, Throwable cause)
{
return _formatter.format("unable-to-forward", url, cause);
}
- public static String unableToRedirect(String url, Throwable cause)
+ static String unableToRedirect(String url, Throwable cause)
{
return _formatter.format("unable-to-redirect", url, cause);
}
- public static String writerOpenError(ContentType contentType, Throwable cause)
+ static String writerOpenError(ContentType contentType, Throwable cause)
{
return _formatter.format("writer-open-error", contentType, cause);
}
- public static String resetFailed(Throwable cause)
+ static String resetFailed(Throwable cause)
{
return _formatter.format("reset-failed", cause);
}
1.4 +1 -1 jakarta-tapestry/framework/src/java/org/apache/tapestry/markup/MarkupMessages.java
Index: MarkupMessages.java
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/java/org/apache/tapestry/markup/MarkupMessages.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- MarkupMessages.java 3 May 2005 17:41:27 -0000 1.3
+++ MarkupMessages.java 13 May 2005 13:21:06 -0000 1.4
@@ -25,7 +25,7 @@
*/
class MarkupMessages
{
- private static final MessageFormatter _formatter = new MessageFormatter(MarkupMessages.class,
+ protected static MessageFormatter _formatter = new MessageFormatter(MarkupMessages.class,
"MarkupStrings");
static String tagNotOpen()
1.3 +2 -2 jakarta-tapestry/framework/src/java/org/apache/tapestry/error/ErrorMessages.java
Index: ErrorMessages.java
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/java/org/apache/tapestry/error/ErrorMessages.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ErrorMessages.java 18 Apr 2005 17:06:41 -0000 1.2
+++ ErrorMessages.java 13 May 2005 13:21:06 -0000 1.3
@@ -20,9 +20,9 @@
* @author Howard M. Lewis Ship
* @since 4.0
*/
-public final class ErrorMessages
+public class ErrorMessages
{
- private static final MessageFormatter _formatter = new MessageFormatter(ErrorMessages.class,
+ protected static MessageFormatter _formatter = new MessageFormatter(ErrorMessages.class,
"ErrorStrings");
public static String unableToProcessClientRequest(Throwable cause)
1.4 +7 -7 jakarta-tapestry/framework/src/java/org/apache/tapestry/record/RecordMessages.java
Index: RecordMessages.java
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/java/org/apache/tapestry/record/RecordMessages.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- RecordMessages.java 18 Apr 2005 17:06:35 -0000 1.3
+++ RecordMessages.java 13 May 2005 13:21:06 -0000 1.4
@@ -23,36 +23,36 @@
*/
class RecordMessages
{
- private static final MessageFormatter _formatter = new MessageFormatter(RecordMessages.class,
+ protected static MessageFormatter _formatter = new MessageFormatter(RecordMessages.class,
"RecordStrings");
- public static String unknownPersistenceStrategy(String name)
+ static String unknownPersistenceStrategy(String name)
{
return _formatter.format("unknown-persistence-strategy", name);
}
- public static String missingPropertySpecification(String propertyName, IComponent component)
+ static String missingPropertySpecification(String propertyName, IComponent component)
{
return _formatter.format("missing-property-specification", propertyName, component
.getExtendedId(), component.getSpecification().getSpecificationLocation());
}
- public static String recorderLocked(String propertyName, IComponent component)
+ static String recorderLocked(String propertyName, IComponent component)
{
return _formatter.format("recorder-locked", propertyName, component.getExtendedId());
}
- public static String decodeFailure(Throwable cause)
+ static String decodeFailure(Throwable cause)
{
return _formatter.format("decode-failure", cause);
}
- public static String encodeFailure(Throwable cause)
+ static String encodeFailure(Throwable cause)
{
return _formatter.format("encode-failure", cause);
}
- public static String unknownPrefix(String prefix)
+ static String unknownPrefix(String prefix)
{
return _formatter.format("unknown-prefix", prefix);
}
1.4 +6 -6 jakarta-tapestry/contrib/src/java/org/apache/tapestry/contrib/table/components/TableMessages.java
Index: TableMessages.java
===================================================================
RCS file: /home/cvs/jakarta-tapestry/contrib/src/java/org/apache/tapestry/contrib/table/components/TableMessages.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TableMessages.java 18 Apr 2005 17:08:19 -0000 1.3
+++ TableMessages.java 13 May 2005 13:21:06 -0000 1.4
@@ -24,32 +24,32 @@
*/
class TableMessages
{
- private static final MessageFormatter _formatter = new MessageFormatter(TableMessages.class,
+ protected static MessageFormatter _formatter = new MessageFormatter(TableMessages.class,
"TableStrings");
- public static String notAColumn(IComponent component, String expression)
+ static String notAColumn(IComponent component, String expression)
{
return _formatter.format("not-a-column", component.getExtendedId(), expression);
}
- public static String invalidTableSource(IComponent component, Object sourceValue)
+ static String invalidTableSource(IComponent component, Object sourceValue)
{
return _formatter.format("invalid-table-source", component.getExtendedId(), ClassFabUtils
.getJavaClassName(sourceValue.getClass()));
}
- public static String invalidTableColumns(IComponent component, Object columnSource)
+ static String invalidTableColumns(IComponent component, Object columnSource)
{
return _formatter.format("invalid-table-column", component.getExtendedId(), ClassFabUtils
.getJavaClassName(columnSource.getClass()));
}
- public static String missingTableModel(IComponent component)
+ static String missingTableModel(IComponent component)
{
return _formatter.format("missing-table-model", component.getExtendedId());
}
- public static String columnsOnlyPlease(IComponent component)
+ static String columnsOnlyPlease(IComponent component)
{
return _formatter.format("columns-only-please", component.getExtendedId());
}
1.6 +7 -7 jakarta-tapestry/framework/src/java/org/apache/tapestry/test/ScriptMessages.java
Index: ScriptMessages.java
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/java/org/apache/tapestry/test/ScriptMessages.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ScriptMessages.java 18 Apr 2005 17:06:43 -0000 1.5
+++ ScriptMessages.java 13 May 2005 13:21:06 -0000 1.6
@@ -31,9 +31,9 @@
* @author Howard Lewis Ship
* @since 4.0
*/
-public final class ScriptMessages
+public class ScriptMessages
{
- private static final MessageFormatter _formatter = new MessageFormatter(ScriptMessages.class,
+ protected static MessageFormatter _formatter = new MessageFormatter(ScriptMessages.class,
"ScriptStrings");
public static String expectedSubstringMissing(String substring, Location location)
@@ -46,17 +46,17 @@
return _formatter.format("expected-regexp-missing", regexp, location);
}
- public static String unexpectedAttributeInElement(String attributeName, String elementName)
+ static String unexpectedAttributeInElement(String attributeName, String elementName)
{
return _formatter.format("unexpected-attribute-in-element", attributeName, elementName);
}
- public static String missingRequiredAttribute(String attributeName, String elementName)
+ static String missingRequiredAttribute(String attributeName, String elementName)
{
return _formatter.format("missing-required-attribute", attributeName, elementName);
}
- public static String invalidIntAttribute(String attributeName, String elementName,
+ static String invalidIntAttribute(String attributeName, String elementName,
Location location, String attributeValue)
{
return _formatter.format("invalid-int-attribute", new Object[]
@@ -76,13 +76,13 @@
{ pattern, location, new Integer(expectedCount), new Integer(actualCount) });
}
- public static String wrongTypeForEnhancement(Class type)
+ static String wrongTypeForEnhancement(Class type)
{
return _formatter
.format("wrong-type-for-enhancement", ClassFabUtils.getJavaClassName(type));
}
- public static String unableToInstantiate(Class abstractClass, Throwable cause)
+ static String unableToInstantiate(Class abstractClass, Throwable cause)
{
return _formatter.format("unable-to-instantiate", abstractClass.getName(), cause);
}
1.4 +3 -4 jakarta-tapestry/framework/src/java/org/apache/tapestry/coerce/CoerceMessages.java
Index: CoerceMessages.java
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/java/org/apache/tapestry/coerce/CoerceMessages.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- CoerceMessages.java 18 Apr 2005 17:06:36 -0000 1.3
+++ CoerceMessages.java 13 May 2005 13:21:06 -0000 1.4
@@ -23,16 +23,15 @@
*/
class CoerceMessages
{
- private static final MessageFormatter _formatter = new MessageFormatter(CoerceMessages.class,
+ protected static MessageFormatter _formatter = new MessageFormatter(CoerceMessages.class,
"CoerceStrings");
- public static String noConverter(Class desiredType)
+ static String noConverter(Class desiredType)
{
return _formatter.format("no-converter", ClassFabUtils.getJavaClassName(desiredType));
}
- public static String stringToNumberConversionError(String value, Class targetClass,
- Throwable cause)
+ static String stringToNumberConversionError(String value, Class targetClass, Throwable cause)
{
return _formatter.format(
"string-to-number-conversion-error",
1.16 +2 -4 jakarta-tapestry/framework/src/java/org/apache/tapestry/services/impl/ImplMessages.java
Index: ImplMessages.java
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/java/org/apache/tapestry/services/impl/ImplMessages.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ImplMessages.java 18 Apr 2005 17:06:38 -0000 1.15
+++ ImplMessages.java 13 May 2005 13:21:06 -0000 1.16
@@ -37,9 +37,9 @@
* @author Howard Lewis Ship
* @since 4.0
*/
-final class ImplMessages
+class ImplMessages
{
- private static final MessageFormatter _formatter = new MessageFormatter(ImplMessages.class,
+ protected static MessageFormatter _formatter = new MessageFormatter(ImplMessages.class,
"ImplStrings");
static String initializerContribution()
@@ -238,8 +238,6 @@
return _formatter.format("service-name-mismatch", service, expectedName, actualName);
}
-
-
static String infrastructureAlreadyInitialized(String newMode, String initializedMode)
{
return _formatter.format("infrastructure-already-initialized", newMode, initializedMode);
1.6 +6 -6 jakarta-tapestry/framework/src/java/org/apache/tapestry/asset/AssetMessages.java
Index: AssetMessages.java
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/java/org/apache/tapestry/asset/AssetMessages.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- AssetMessages.java 18 Apr 2005 17:06:42 -0000 1.5
+++ AssetMessages.java 13 May 2005 13:21:06 -0000 1.6
@@ -25,30 +25,30 @@
*/
class AssetMessages
{
- private static final MessageFormatter _formatter = new MessageFormatter(AssetMessages.class,
+ protected static MessageFormatter _formatter = new MessageFormatter(AssetMessages.class,
"AssetStrings");
- public static String missingAsset(String path, Resource resource)
+ static String missingAsset(String path, Resource resource)
{
return _formatter.format("missing-asset", path, resource);
}
- public static String noSuchResource(String resourcePath)
+ static String noSuchResource(String resourcePath)
{
return _formatter.format("no-such-resource", resourcePath);
}
- public static String unableToReadResource(String resourcePath, IOException cause)
+ static String unableToReadResource(String resourcePath, IOException cause)
{
return _formatter.format("unable-to-read-resource", resourcePath, cause);
}
- public static String md5Mismatch(String path)
+ static String md5Mismatch(String path)
{
return _formatter.format("md5-mismatch", path);
}
- public static String exceptionReportTitle(String path)
+ static String exceptionReportTitle(String path)
{
return _formatter.format("exception-report-title", path);
}
1.4 +1 -1 jakarta-tapestry/framework/src/java/org/apache/tapestry/listener/ListenerMessages.java
Index: ListenerMessages.java
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/java/org/apache/tapestry/listener/ListenerMessages.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ListenerMessages.java 18 Apr 2005 17:06:36 -0000 1.3
+++ ListenerMessages.java 13 May 2005 13:21:06 -0000 1.4
@@ -25,7 +25,7 @@
*/
class ListenerMessages
{
- private static final MessageFormatter _formatter = new MessageFormatter(ListenerMessages.class,
+ protected static MessageFormatter _formatter = new MessageFormatter(ListenerMessages.class,
"ListenerStrings");
static String objectMissingMethod(Object target, String name)
1.5 +1 -1 jakarta-tapestry/framework/src/java/org/apache/tapestry/form/FormMessages.java
Index: FormMessages.java
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/java/org/apache/tapestry/form/FormMessages.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- FormMessages.java 3 May 2005 17:41:27 -0000 1.4
+++ FormMessages.java 13 May 2005 13:21:06 -0000 1.5
@@ -23,7 +23,7 @@
*/
class FormMessages
{
- private static final MessageFormatter _formatter = new MessageFormatter(FormMessages.class,
+ protected static MessageFormatter _formatter = new MessageFormatter(FormMessages.class,
"FormStrings");
static String formTooManyIds(IComponent form, int actualCount, IComponent component)
1.2 +1 -1 jakarta-tapestry/framework/src/java/org/apache/tapestry/valid/ValidMessages.java
Index: ValidMessages.java
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/java/org/apache/tapestry/valid/ValidMessages.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ValidMessages.java 3 May 2005 17:41:27 -0000 1.1
+++ ValidMessages.java 13 May 2005 13:21:06 -0000 1.2
@@ -23,7 +23,7 @@
*/
class ValidMessages
{
- private static final MessageFormatter _formatter = new MessageFormatter(ValidMessages.class,
+ protected static MessageFormatter _formatter = new MessageFormatter(ValidMessages.class,
"ValidStrings");
static String noDisplayName(IComponent label, IComponent field)
1.2 +1 -1 jakarta-tapestry/portlet/src/java/org/apache/tapestry/portlet/bindings/BindingsMessages.java
Index: BindingsMessages.java
===================================================================
RCS file: /home/cvs/jakarta-tapestry/portlet/src/java/org/apache/tapestry/portlet/bindings/BindingsMessages.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- BindingsMessages.java 11 May 2005 20:08:23 -0000 1.1
+++ BindingsMessages.java 13 May 2005 13:21:06 -0000 1.2
@@ -23,7 +23,7 @@
class BindingsMessages
{
- private static final MessageFormatter _formatter = new MessageFormatter(BindingsMessages.class,
+ protected static MessageFormatter _formatter = new MessageFormatter(BindingsMessages.class,
"BindingsStrings");
static String noUserInfo()
1.8 +15 -15 jakarta-tapestry/framework/src/java/org/apache/tapestry/pageload/PageloadMessages.java
Index: PageloadMessages.java
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/java/org/apache/tapestry/pageload/PageloadMessages.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- PageloadMessages.java 11 May 2005 17:07:20 -0000 1.7
+++ PageloadMessages.java 13 May 2005 13:21:06 -0000 1.8
@@ -25,10 +25,10 @@
*/
class PageloadMessages
{
- private static final MessageFormatter _formatter = new MessageFormatter(PageloadMessages.class,
+ protected static MessageFormatter _formatter = new MessageFormatter(PageloadMessages.class,
"PageloadStrings");
- public static String parameterMustHaveNoDefaultValue(IComponent component, String name)
+ static String parameterMustHaveNoDefaultValue(IComponent component, String name)
{
return _formatter.format(
"parameter-must-have-no-default-value",
@@ -36,37 +36,37 @@
name);
}
- public static String unableToInitializeProperty(String propertyName, IComponent component,
+ static String unableToInitializeProperty(String propertyName, IComponent component,
Throwable cause)
{
return _formatter.format("unable-to-initialize-property", propertyName, component, cause);
}
- public static String requiredParameterNotBound(String name, IComponent component)
+ static String requiredParameterNotBound(String name, IComponent component)
{
return _formatter.format("required-parameter-not-bound", name, component.getExtendedId());
}
- public static String inheritInformalInvalidComponentFormalOnly(IComponent component)
+ static String inheritInformalInvalidComponentFormalOnly(IComponent component)
{
return _formatter.format("inherit-informal-invalid-component-formal-only", component
.getExtendedId());
}
- public static String inheritInformalInvalidContainerFormalOnly(IComponent container,
+ static String inheritInformalInvalidContainerFormalOnly(IComponent container,
IComponent component)
{
return _formatter.format("inherit-informal-invalid-container-formal-only", container
.getExtendedId(), component.getExtendedId());
}
- public static String formalParametersOnly(IComponent component, String parameterName)
+ static String formalParametersOnly(IComponent component, String parameterName)
{
return _formatter
.format("formal-parameters-only", component.getExtendedId(), parameterName);
}
- public static String unableToInstantiateComponent(IComponent container, Throwable cause)
+ static String unableToInstantiateComponent(IComponent container, Throwable cause)
{
return _formatter.format(
"unable-to-instantiate-component",
@@ -74,37 +74,37 @@
cause);
}
- public static String classNotComponent(Class componentClass)
+ static String classNotComponent(Class componentClass)
{
return _formatter.format("class-not-component", componentClass.getName());
}
- public static String unableToInstantiate(String className, Throwable cause)
+ static String unableToInstantiate(String className, Throwable cause)
{
return _formatter.format("unable-to-instantiate", className, cause);
}
- public static String pageNotAllowed(String componentId)
+ static String pageNotAllowed(String componentId)
{
return _formatter.format("page-not-allowed", componentId);
}
- public static String classNotPage(Class componentClass)
+ static String classNotPage(Class componentClass)
{
return _formatter.format("class-not-page", componentClass.getName());
}
- public static String defaultParameterName(String name)
+ static String defaultParameterName(String name)
{
return _formatter.format("default-parameter-name", name);
}
- public static String initializerName(String propertyName)
+ static String initializerName(String propertyName)
{
return _formatter.format("initializer-name", propertyName);
}
- public static String parameterName(String name)
+ static String parameterName(String name)
{
return _formatter.format("parameter-name", name);
}
1.3 +3 -3 jakarta-tapestry/framework/src/java/org/apache/tapestry/components/ComponentMessages.java
Index: ComponentMessages.java
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/java/org/apache/tapestry/components/ComponentMessages.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ComponentMessages.java 18 Apr 2005 17:06:36 -0000 1.2
+++ ComponentMessages.java 13 May 2005 13:21:06 -0000 1.3
@@ -23,10 +23,10 @@
*/
class ComponentMessages
{
- private static final MessageFormatter _formatter = new MessageFormatter(
- ComponentMessages.class, "ComponentStrings");
+ protected static MessageFormatter _formatter = new MessageFormatter(ComponentMessages.class,
+ "ComponentStrings");
- public static String unableToFormat(IComponent component, Object value, Throwable cause)
+ static String unableToFormat(IComponent component, Object value, Throwable cause)
{
return _formatter.format("unable-to-format", component.getExtendedId(), value, cause);
}
1.3 +4 -4 jakarta-tapestry/framework/src/java/org/apache/tapestry/describe/DescribeMessages.java
Index: DescribeMessages.java
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/java/org/apache/tapestry/describe/DescribeMessages.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DescribeMessages.java 18 Apr 2005 17:06:34 -0000 1.2
+++ DescribeMessages.java 13 May 2005 13:21:06 -0000 1.3
@@ -22,20 +22,20 @@
*/
class DescribeMessages
{
- private static final MessageFormatter _formatter = new MessageFormatter(DescribeMessages.class,
+ protected static MessageFormatter _formatter = new MessageFormatter(DescribeMessages.class,
"DescribeStrings");
- public static String mustSetTitleBeforeSection()
+ static String mustSetTitleBeforeSection()
{
return _formatter.getMessage("must-set-title-before-section");
}
- public static String setTitleOnce()
+ static String setTitleOnce()
{
return _formatter.getMessage("set-title-once");
}
- public static String mustSetTitleBeforeProperty()
+ static String mustSetTitleBeforeProperty()
{
return _formatter.getMessage("must-set-title-before-property");
}
1.7 +1 -1 jakarta-tapestry/framework/src/java/org/apache/tapestry/resolver/ResolverMessages.java
Index: ResolverMessages.java
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/java/org/apache/tapestry/resolver/ResolverMessages.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ResolverMessages.java 18 Apr 2005 17:06:43 -0000 1.6
+++ ResolverMessages.java 13 May 2005 13:21:06 -0000 1.7
@@ -27,7 +27,7 @@
*/
class ResolverMessages
{
- private static final MessageFormatter _formatter = new MessageFormatter(ResolverMessages.class,
+ protected static MessageFormatter _formatter = new MessageFormatter(ResolverMessages.class,
"ResolverStrings");
static String noSuchComponentType(String type, INamespace namespace)
1.3 +6 -6 jakarta-tapestry/framework/src/java/org/apache/tapestry/multipart/MultipartMessages.java
Index: MultipartMessages.java
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/java/org/apache/tapestry/multipart/MultipartMessages.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MultipartMessages.java 18 Apr 2005 17:06:35 -0000 1.2
+++ MultipartMessages.java 13 May 2005 13:21:07 -0000 1.3
@@ -24,25 +24,25 @@
*/
class MultipartMessages
{
- private static final MessageFormatter _formatter = new MessageFormatter(
- MultipartMessages.class, "MultipartStrings");
+ protected static MessageFormatter _formatter = new MessageFormatter(MultipartMessages.class,
+ "MultipartStrings");
- public static String unableToDecode(Throwable cause)
+ static String unableToDecode(Throwable cause)
{
return _formatter.format("unable-to-decode", cause);
}
- public static String unsupportedEncoding(String encoding, Throwable cause)
+ static String unsupportedEncoding(String encoding, Throwable cause)
{
return _formatter.format("unsupported-encoding", encoding, cause);
}
- public static String unableToOpenContentFile(UploadPart part, Throwable cause)
+ static String unableToOpenContentFile(UploadPart part, Throwable cause)
{
return _formatter.format("unable-to-open-content-file", part.getFilePath(), cause);
}
- public static String writeFailure(File file, Throwable cause)
+ static String writeFailure(File file, Throwable cause)
{
return _formatter.format("write-failure", file, cause);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: tapestry-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tapestry-dev-help@jakarta.apache.org