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/08/23 19:03:56 UTC
cvs commit: jakarta-tapestry/framework/src/java/org/apache/tapestry/multipart MultipartMessages.java
hlship 2005/08/23 10:03:56
Modified: . status.xml .classpath
framework/src/java/org/apache/tapestry/enhance
EnhanceMessages.java
config common.properties
portlet/src/java/org/apache/tapestry/portlet
PortletMessages.java
framework/src/java/org/apache/tapestry/engine
EngineMessages.java DirectService.java
framework/src/java/org/apache/tapestry/engine/state
StateMessages.java
framework/src/java/org/apache/tapestry/bean
BeanMessages.java
annotations/src/java/org/apache/tapestry/annotations
AnnotationMessages.java
framework/src/java/org/apache/tapestry/binding
BindingMessages.java
framework/src/java/org/apache/tapestry/callback
CallbackMessages.java
framework/src/java/org/apache/tapestry/spec
SpecMessages.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
framework/src/java/org/apache/tapestry/test
ScriptMessages.java
contrib/src/java/org/apache/tapestry/contrib/table/components
TableMessages.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/html
HTMLMessages.java
framework/src/java/org/apache/tapestry/form/validator
ValidatorMessages.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:
Upgrade to HiveMind 1.1-beta-3.
TAPESTRY-447: Messages in org.apache.tapestry.engine.EngineMessages should be public
TAPESTRY-157: Make it easier to subclass DirectService
Revision Changes Path
1.222 +2 -0 jakarta-tapestry/status.xml
Index: status.xml
===================================================================
RCS file: /home/cvs/jakarta-tapestry/status.xml,v
retrieving revision 1.221
retrieving revision 1.222
diff -u -r1.221 -r1.222
--- status.xml 23 Aug 2005 16:33:45 -0000 1.221
+++ status.xml 23 Aug 2005 17:03:54 -0000 1.222
@@ -69,6 +69,8 @@
<action type="fix" dev="HLS" fixes-bug="TAPESTRY-563">NumberValidator should allow a special case for rendering zero</action>
<action type="fix" dev="HLS" fixes-bug="TAPESTRY-395">Rename framework javascript functions to avoid potential name collisions</action>
<action type="remove" dev="HLS">Remove the AssetExternalizer and externalization logic, since the asset service is better and as efficient</action>
+ <action type="fix" dev="HLS" fixes-bug="TAPESTRY-447">Messages in org.apache.tapestry.engine.EngineMessages should be public</action>
+ <action type="fix" dev="HLS" fixes-bug="TAPESTRY-157">Make it easier to subclass DirectService</action>
</release>
<release version="4.0-beta-4" date="Aug 10 2005">
<action type="fix" dev="HLS">Add getComponent() method to IComponent.</action>
1.84 +2 -2 jakarta-tapestry/.classpath
Index: .classpath
===================================================================
RCS file: /home/cvs/jakarta-tapestry/.classpath,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- .classpath 26 Jul 2005 13:57:21 -0000 1.83
+++ .classpath 23 Aug 2005 17:03:54 -0000 1.84
@@ -35,7 +35,7 @@
<classpathentry kind="lib" path="ext-package/lib/portlet-api-1.0.jar"/>
<classpathentry kind="lib" path="ext-package/lib/jcharts-0.6.0.jar"/>
<classpathentry kind="lib" path="ext-package/lib/jython-2.1.jar"/>
- <classpathentry kind="lib" path="ext-package/lib/hivemind-1.1-beta-2.jar"/>
- <classpathentry kind="lib" path="ext-package/lib/hivemind-lib-1.1-beta-2.jar"/>
+ <classpathentry kind="lib" path="ext-package/lib/hivemind-1.1-beta-3.jar"/>
+ <classpathentry kind="lib" path="ext-package/lib/hivemind-lib-1.1-beta-3.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
1.22 +1 -2 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.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- EnhanceMessages.java 6 Aug 2005 06:58:25 -0000 1.21
+++ EnhanceMessages.java 23 Aug 2005 17:03:54 -0000 1.22
@@ -31,8 +31,7 @@
*/
class EnhanceMessages
{
- protected static MessageFormatter _formatter = new MessageFormatter(EnhanceMessages.class,
- "EnhanceStrings");
+ private final static MessageFormatter _formatter = new MessageFormatter(EnhanceMessages.class);
static String noImplForAbstractMethod(Method method, Class declareClass, String className,
Class enhancedClass)
1.46 +1 -1 jakarta-tapestry/config/common.properties
Index: common.properties
===================================================================
RCS file: /home/cvs/jakarta-tapestry/config/common.properties,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- common.properties 26 Jul 2005 13:57:18 -0000 1.45
+++ common.properties 23 Aug 2005 17:03:55 -0000 1.46
@@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-hivemind.version=1.1-beta-2
+hivemind.version=1.1-beta-3
javassist.version=3.0
ognl.version=2.6.7
codec.version=1.3
1.9 +1 -2 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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- PortletMessages.java 13 May 2005 13:21:05 -0000 1.8
+++ PortletMessages.java 23 Aug 2005 17:03:55 -0000 1.9
@@ -22,8 +22,7 @@
*/
class PortletMessages
{
- protected static MessageFormatter _formatter = new MessageFormatter(PortletMessages.class,
- "PortletStrings");
+ private final static MessageFormatter _formatter = new MessageFormatter(PortletMessages.class);
static String unsupportedMethod(String methodName)
{
1.8 +4 -5 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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- EngineMessages.java 13 May 2005 13:21:05 -0000 1.7
+++ EngineMessages.java 23 Aug 2005 17:03:55 -0000 1.8
@@ -26,26 +26,25 @@
*/
public class EngineMessages
{
- protected static MessageFormatter _formatter = new MessageFormatter(EngineMessages.class,
- "EngineStrings");
+ private final static MessageFormatter _formatter = new MessageFormatter(EngineMessages.class);
public static String serviceNoParameter(IEngineService service)
{
return _formatter.format("service-no-parameter", service.getName());
}
- static String wrongComponentType(IComponent component, Class expectedType)
+ public static String wrongComponentType(IComponent component, Class expectedType)
{
return _formatter.format("wrong-component-type", component.getExtendedId(), expectedType
.getName());
}
- static String requestStateSession(IComponent component)
+ public static String requestStateSession(IComponent component)
{
return _formatter.format("request-stale-session", component.getExtendedId());
}
- static String pageNotCompatible(IPage page, Class expectedType)
+ public static String pageNotCompatible(IPage page, Class expectedType)
{
return _formatter.format("page-not-compatible", page.getPageName(), expectedType.getName());
}
1.16 +13 -6 jakarta-tapestry/framework/src/java/org/apache/tapestry/engine/DirectService.java
Index: DirectService.java
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/java/org/apache/tapestry/engine/DirectService.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- DirectService.java 16 Aug 2005 23:01:45 -0000 1.15
+++ DirectService.java 23 Aug 2005 17:03:55 -0000 1.16
@@ -43,13 +43,13 @@
public class DirectService implements IEngineService
{
/** @since 4.0 */
- private ResponseRenderer _responseRenderer;
+ protected ResponseRenderer _responseRenderer;
/** @since 4.0 */
- private LinkFactory _linkFactory;
+ protected LinkFactory _linkFactory;
/** @since 4.0 */
- private WebRequest _request;
+ protected WebRequest _request;
public ILink getLink(IRequestCycle cycle, boolean post, Object parameter)
{
@@ -127,9 +127,7 @@
Object[] parameters = _linkFactory.extractListenerParameters(cycle);
- cycle.setListenerParameters(parameters);
-
- direct.trigger(cycle);
+ triggerComponent(cycle, direct, parameters);
// Render the response. This will be the active page
// unless the direct component (or its delegate) changes it.
@@ -137,6 +135,15 @@
_responseRenderer.renderResponse(cycle);
}
+ /** @since 4.0 */
+
+ protected void triggerComponent(IRequestCycle cycle, IDirect direct, Object[] parameters)
+ {
+ cycle.setListenerParameters(parameters);
+
+ direct.trigger(cycle);
+ }
+
public String getName()
{
return Tapestry.DIRECT_SERVICE;
1.4 +1 -2 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- StateMessages.java 13 May 2005 13:21:05 -0000 1.3
+++ StateMessages.java 23 Aug 2005 17:03:55 -0000 1.4
@@ -22,8 +22,7 @@
*/
class StateMessages
{
- protected static MessageFormatter _formatter = new MessageFormatter(StateMessages.class,
- "StateStrings");
+ private final static MessageFormatter _formatter = new MessageFormatter(StateMessages.class);
static String unknownStateObjectName(String objectName)
{
1.6 +1 -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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- BeanMessages.java 25 May 2005 01:51:31 -0000 1.5
+++ BeanMessages.java 23 Aug 2005 17:03:55 -0000 1.6
@@ -23,8 +23,7 @@
*/
class BeanMessages
{
- protected static MessageFormatter _formatter = new MessageFormatter(BeanMessages.class,
- "BeanStrings");
+ private final static MessageFormatter _formatter = new MessageFormatter(BeanMessages.class);
static String propertyInitializerName(String propertyName)
{
1.6 +12 -13 jakarta-tapestry/annotations/src/java/org/apache/tapestry/annotations/AnnotationMessages.java
Index: AnnotationMessages.java
===================================================================
RCS file: /home/cvs/jakarta-tapestry/annotations/src/java/org/apache/tapestry/annotations/AnnotationMessages.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- AnnotationMessages.java 2 Jul 2005 22:51:23 -0000 1.5
+++ AnnotationMessages.java 23 Aug 2005 17:03:55 -0000 1.6
@@ -28,40 +28,39 @@
class AnnotationMessages
{
private static final MessageFormatter _formatter = new MessageFormatter(
- AnnotationMessages.class, "AnnotationStrings");
+ AnnotationMessages.class);
- public static String noParametersExpected(Method m)
+ static String noParametersExpected(Method m)
{
return _formatter.format("no-parameters-expected", m);
}
- public static String notAccessor(Method method)
+ static String notAccessor(Method method)
{
return _formatter.format("no-accessor", method);
}
- public static String voidAccessor(Method method)
+ static String voidAccessor(Method method)
{
return _formatter.format("void-accessor", method);
}
- public static String nonVoidMutator(Method method)
+ static String nonVoidMutator(Method method)
{
return _formatter.format("non-void-mutator", method);
}
- public static String wrongParameterCount(Method method)
+ static String wrongParameterCount(Method method)
{
return _formatter.format("wrong-parameter-count", method);
}
- public static String failureProcessingAnnotation(Annotation annotation, Method method,
- Throwable cause)
+ static String failureProcessingAnnotation(Annotation annotation, Method method, Throwable cause)
{
return _formatter.format("failure-processing-annotation", annotation, method, cause);
}
- public static String failureProcessingClassAnnotation(Annotation annotation, Class clazz,
+ static String failureProcessingClassAnnotation(Annotation annotation, Class clazz,
Throwable cause)
{
return _formatter.format(
@@ -71,22 +70,22 @@
cause);
}
- public static String returnStringOnly(Class returnType)
+ static String returnStringOnly(Class returnType)
{
return _formatter.format("return-string-only", ClassFabUtils.getJavaClassName(returnType));
}
- public static String bindingWrongFormat(String binding)
+ static String bindingWrongFormat(String binding)
{
return _formatter.format("binding-wrong-format", binding);
}
- public static String methodAnnotation(Annotation annotation, Method method)
+ static String methodAnnotation(Annotation annotation, Method method)
{
return _formatter.format("method-annotation", annotation, method);
}
- public static String classAnnotation(Annotation annotation, Class clazz)
+ static String classAnnotation(Annotation annotation, Class clazz)
{
return _formatter.format("class-annotation", annotation, clazz.getName());
}
1.7 +1 -2 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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- BindingMessages.java 13 May 2005 13:21:06 -0000 1.6
+++ BindingMessages.java 23 Aug 2005 17:03:55 -0000 1.7
@@ -24,8 +24,7 @@
*/
class BindingMessages
{
- protected static MessageFormatter _formatter = new MessageFormatter(BindingMessages.class,
- "BindingStrings");
+ private final static MessageFormatter _formatter = new MessageFormatter(BindingMessages.class);
static String convertObjectError(IBinding binding, Throwable cause)
{
1.2 +1 -2 jakarta-tapestry/framework/src/java/org/apache/tapestry/callback/CallbackMessages.java
Index: CallbackMessages.java
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/java/org/apache/tapestry/callback/CallbackMessages.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CallbackMessages.java 20 May 2005 12:46:07 -0000 1.1
+++ CallbackMessages.java 23 Aug 2005 17:03:55 -0000 1.2
@@ -23,8 +23,7 @@
*/
class CallbackMessages
{
- protected static MessageFormatter _formatter = new MessageFormatter(CallbackMessages.class,
- "CallbackStrings");
+ private final static MessageFormatter _formatter = new MessageFormatter(CallbackMessages.class);
static String pageNotExternal(String pageName)
{
1.2 +1 -2 jakarta-tapestry/framework/src/java/org/apache/tapestry/spec/SpecMessages.java
Index: SpecMessages.java
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/java/org/apache/tapestry/spec/SpecMessages.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SpecMessages.java 20 May 2005 12:46:07 -0000 1.1
+++ SpecMessages.java 23 Aug 2005 17:03:55 -0000 1.2
@@ -23,8 +23,7 @@
*/
class SpecMessages
{
- private static MessageFormatter _formatter = new MessageFormatter(SpecMessages.class,
- "SpecStrings");
+ private static final MessageFormatter _formatter = new MessageFormatter(SpecMessages.class);
static String claimedProperty(String propertyName, Object existing)
{
1.10 +1 -2 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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ParseMessages.java 24 Jul 2005 12:13:34 -0000 1.9
+++ ParseMessages.java 23 Aug 2005 17:03:55 -0000 1.10
@@ -25,8 +25,7 @@
*/
class ParseMessages
{
- protected static MessageFormatter _formatter = new MessageFormatter(ParseMessages.class,
- "ParseStrings");
+ private final static MessageFormatter _formatter = new MessageFormatter(ParseMessages.class);
static String commentNotEnded(int line)
{
1.15 +1 -1 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.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- TapestryMessages.java 13 May 2005 13:21:06 -0000 1.14
+++ TapestryMessages.java 23 Aug 2005 17:03:55 -0000 1.15
@@ -22,7 +22,7 @@
*/
class TapestryMessages
{
- protected static MessageFormatter _formatter = new MessageFormatter(TapestryMessages.class,
+ private final static MessageFormatter _formatter = new MessageFormatter(TapestryMessages.class,
"TapestryStrings2");
static String servletInitFailure(Throwable cause)
1.7 +1 -2 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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- WebMessages.java 13 May 2005 13:21:06 -0000 1.6
+++ WebMessages.java 23 Aug 2005 17:03:55 -0000 1.7
@@ -23,8 +23,7 @@
*/
class WebMessages
{
- protected static MessageFormatter _formatter = new MessageFormatter(WebMessages.class,
- "WebStrings");
+ private final static MessageFormatter _formatter = new MessageFormatter(WebMessages.class);
static String streamOpenError(ContentType contentType, Throwable cause)
{
1.5 +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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- MarkupMessages.java 13 May 2005 13:21:06 -0000 1.4
+++ MarkupMessages.java 23 Aug 2005 17:03:55 -0000 1.5
@@ -25,7 +25,7 @@
*/
class MarkupMessages
{
- protected static MessageFormatter _formatter = new MessageFormatter(MarkupMessages.class,
+ private final static MessageFormatter _formatter = new MessageFormatter(MarkupMessages.class,
"MarkupStrings");
static String tagNotOpen()
1.4 +1 -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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ErrorMessages.java 13 May 2005 13:21:06 -0000 1.3
+++ ErrorMessages.java 23 Aug 2005 17:03:55 -0000 1.4
@@ -22,8 +22,7 @@
*/
public class ErrorMessages
{
- protected static MessageFormatter _formatter = new MessageFormatter(ErrorMessages.class,
- "ErrorStrings");
+ private final static MessageFormatter _formatter = new MessageFormatter(ErrorMessages.class);
public static String unableToProcessClientRequest(Throwable cause)
{
1.5 +1 -2 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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- RecordMessages.java 13 May 2005 13:21:06 -0000 1.4
+++ RecordMessages.java 23 Aug 2005 17:03:55 -0000 1.5
@@ -23,8 +23,7 @@
*/
class RecordMessages
{
- protected static MessageFormatter _formatter = new MessageFormatter(RecordMessages.class,
- "RecordStrings");
+ private final static MessageFormatter _formatter = new MessageFormatter(RecordMessages.class);
static String unknownPersistenceStrategy(String name)
{
1.8 +1 -2 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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ScriptMessages.java 10 Aug 2005 14:00:48 -0000 1.7
+++ ScriptMessages.java 23 Aug 2005 17:03:56 -0000 1.8
@@ -32,8 +32,7 @@
*/
public class ScriptMessages
{
- protected static MessageFormatter _formatter = new MessageFormatter(ScriptMessages.class,
- "ScriptStrings");
+ private final static MessageFormatter _formatter = new MessageFormatter(ScriptMessages.class);
static String wrongTypeForEnhancement(Class type)
{
1.6 +5 -5 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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- TableMessages.java 7 Jul 2005 23:00:39 -0000 1.5
+++ TableMessages.java 23 Aug 2005 17:03:56 -0000 1.6
@@ -24,8 +24,7 @@
*/
public class TableMessages
{
- protected static MessageFormatter _formatter = new MessageFormatter(TableMessages.class,
- "TableStrings");
+ private final static MessageFormatter _formatter = new MessageFormatter(TableMessages.class);
static String notAColumn(IComponent component, String expression)
{
@@ -53,8 +52,9 @@
{
return _formatter.format("columns-only-please", component.getExtendedId());
}
-
- public static String invalidTableStateFormat(String value) {
- return _formatter.format("invalid-table-state-format", value);
+
+ public static String invalidTableStateFormat(String value)
+ {
+ return _formatter.format("invalid-table-state-format", value);
}
}
\ No newline at end of file
1.5 +1 -2 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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- CoerceMessages.java 13 May 2005 13:21:06 -0000 1.4
+++ CoerceMessages.java 23 Aug 2005 17:03:56 -0000 1.5
@@ -23,8 +23,7 @@
*/
class CoerceMessages
{
- protected static MessageFormatter _formatter = new MessageFormatter(CoerceMessages.class,
- "CoerceStrings");
+ private final static MessageFormatter _formatter = new MessageFormatter(CoerceMessages.class);
static String noConverter(Class desiredType)
{
1.18 +1 -2 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.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- ImplMessages.java 31 May 2005 16:35:11 -0000 1.17
+++ ImplMessages.java 23 Aug 2005 17:03:56 -0000 1.18
@@ -40,8 +40,7 @@
*/
class ImplMessages
{
- protected static MessageFormatter _formatter = new MessageFormatter(ImplMessages.class,
- "ImplStrings");
+ private final static MessageFormatter _formatter = new MessageFormatter(ImplMessages.class);
static String initializerContribution()
{
1.7 +1 -2 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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- AssetMessages.java 13 May 2005 13:21:06 -0000 1.6
+++ AssetMessages.java 23 Aug 2005 17:03:56 -0000 1.7
@@ -25,8 +25,7 @@
*/
class AssetMessages
{
- protected static MessageFormatter _formatter = new MessageFormatter(AssetMessages.class,
- "AssetStrings");
+ private final static MessageFormatter _formatter = new MessageFormatter(AssetMessages.class);
static String missingAsset(String path, Resource resource)
{
1.2 +1 -2 jakarta-tapestry/framework/src/java/org/apache/tapestry/html/HTMLMessages.java
Index: HTMLMessages.java
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/java/org/apache/tapestry/html/HTMLMessages.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- HTMLMessages.java 21 May 2005 15:36:21 -0000 1.1
+++ HTMLMessages.java 23 Aug 2005 17:03:56 -0000 1.2
@@ -22,8 +22,7 @@
*/
class HTMLMessages
{
- private static final MessageFormatter _formatter = new MessageFormatter(HTMLMessages.class,
- "HTMLStrings");
+ private static final MessageFormatter _formatter = new MessageFormatter(HTMLMessages.class);
static String textConversionError(Throwable cause)
{
1.3 +3 -4 jakarta-tapestry/framework/src/java/org/apache/tapestry/form/validator/ValidatorMessages.java
Index: ValidatorMessages.java
===================================================================
RCS file: /home/cvs/jakarta-tapestry/framework/src/java/org/apache/tapestry/form/validator/ValidatorMessages.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ValidatorMessages.java 15 Aug 2005 02:46:48 -0000 1.2
+++ ValidatorMessages.java 23 Aug 2005 17:03:56 -0000 1.3
@@ -22,15 +22,14 @@
*/
class ValidatorMessages
{
- private static final MessageFormatter _formatter = new MessageFormatter(
- ValidatorMessages.class, "ValidatorStrings");
+ private static final MessageFormatter _formatter = new MessageFormatter(ValidatorMessages.class);
- public static String unknownValidator(String name)
+ static String unknownValidator(String name)
{
return _formatter.format("unknown-validator", name);
}
- public static String needsConfiguration(String name)
+ static String needsConfiguration(String name)
{
return _formatter.format("needs-configuration", name);
}
1.5 +1 -2 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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ListenerMessages.java 13 May 2005 13:21:06 -0000 1.4
+++ ListenerMessages.java 23 Aug 2005 17:03:56 -0000 1.5
@@ -25,8 +25,7 @@
*/
class ListenerMessages
{
- protected static MessageFormatter _formatter = new MessageFormatter(ListenerMessages.class,
- "ListenerStrings");
+ private static final MessageFormatter _formatter = new MessageFormatter(ListenerMessages.class);
static String objectMissingMethod(Object target, String name)
{
1.6 +1 -2 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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- FormMessages.java 13 May 2005 13:21:06 -0000 1.5
+++ FormMessages.java 23 Aug 2005 17:03:56 -0000 1.6
@@ -23,8 +23,7 @@
*/
class FormMessages
{
- protected static MessageFormatter _formatter = new MessageFormatter(FormMessages.class,
- "FormStrings");
+ private final static MessageFormatter _formatter = new MessageFormatter(FormMessages.class);
static String formTooManyIds(IComponent form, int actualCount, IComponent component)
{
1.3 +1 -2 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ValidMessages.java 13 May 2005 13:21:06 -0000 1.2
+++ ValidMessages.java 23 Aug 2005 17:03:56 -0000 1.3
@@ -23,8 +23,7 @@
*/
class ValidMessages
{
- protected static MessageFormatter _formatter = new MessageFormatter(ValidMessages.class,
- "ValidStrings");
+ private final static MessageFormatter _formatter = new MessageFormatter(ValidMessages.class);
static String noDisplayName(IComponent label, IComponent field)
{
1.3 +1 -3 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- BindingsMessages.java 13 May 2005 13:21:06 -0000 1.2
+++ BindingsMessages.java 23 Aug 2005 17:03:56 -0000 1.3
@@ -22,9 +22,7 @@
*/
class BindingsMessages
{
-
- protected static MessageFormatter _formatter = new MessageFormatter(BindingsMessages.class,
- "BindingsStrings");
+ private final static MessageFormatter _formatter = new MessageFormatter(BindingsMessages.class);
static String noUserInfo()
{
1.11 +1 -2 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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- PageloadMessages.java 6 Jun 2005 22:28:19 -0000 1.10
+++ PageloadMessages.java 23 Aug 2005 17:03:56 -0000 1.11
@@ -29,8 +29,7 @@
*/
class PageloadMessages
{
- protected static MessageFormatter _formatter = new MessageFormatter(PageloadMessages.class,
- "PageloadStrings");
+ private final static MessageFormatter _formatter = new MessageFormatter(PageloadMessages.class);
static String parameterMustHaveNoDefaultValue(IComponent component, String name)
{
1.5 +1 -2 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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ComponentMessages.java 20 May 2005 12:46:07 -0000 1.4
+++ ComponentMessages.java 23 Aug 2005 17:03:56 -0000 1.5
@@ -23,8 +23,7 @@
*/
class ComponentMessages
{
- protected static MessageFormatter _formatter = new MessageFormatter(ComponentMessages.class,
- "ComponentStrings");
+ private final static MessageFormatter _formatter = new MessageFormatter(ComponentMessages.class);
static String unableToFormat(IComponent component, Object value, Throwable cause)
{
1.4 +1 -2 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DescribeMessages.java 13 May 2005 13:21:06 -0000 1.3
+++ DescribeMessages.java 23 Aug 2005 17:03:56 -0000 1.4
@@ -22,8 +22,7 @@
*/
class DescribeMessages
{
- protected static MessageFormatter _formatter = new MessageFormatter(DescribeMessages.class,
- "DescribeStrings");
+ private final static MessageFormatter _formatter = new MessageFormatter(DescribeMessages.class);
static String mustSetTitleBeforeSection()
{
1.9 +1 -2 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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ResolverMessages.java 6 Jun 2005 22:28:19 -0000 1.8
+++ ResolverMessages.java 23 Aug 2005 17:03:56 -0000 1.9
@@ -29,8 +29,7 @@
*/
class ResolverMessages
{
- protected static MessageFormatter _formatter = new MessageFormatter(ResolverMessages.class,
- "ResolverStrings");
+ private final static MessageFormatter _formatter = new MessageFormatter(ResolverMessages.class);
static String noSuchComponentType(String type, INamespace namespace)
{
1.4 +1 -2 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- MultipartMessages.java 13 May 2005 13:21:07 -0000 1.3
+++ MultipartMessages.java 23 Aug 2005 17:03:56 -0000 1.4
@@ -24,8 +24,7 @@
*/
class MultipartMessages
{
- protected static MessageFormatter _formatter = new MessageFormatter(MultipartMessages.class,
- "MultipartStrings");
+ private final static MessageFormatter _formatter = new MessageFormatter(MultipartMessages.class);
static String unableToDecode(Throwable cause)
{
---------------------------------------------------------------------
To unsubscribe, e-mail: tapestry-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tapestry-dev-help@jakarta.apache.org