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 2013/12/05 19:27:00 UTC
[3/5] git commit: Mark a number of messages from core.properties as
private- (server-side only)
Mark a number of messages from core.properties as private- (server-side only)
Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo
Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/1bc4e049
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/1bc4e049
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/1bc4e049
Branch: refs/heads/master
Commit: 1bc4e0499c4285fb798836cc07416f2120642d0d
Parents: 8265258
Author: Howard M. Lewis Ship <hl...@apache.org>
Authored: Thu Dec 5 10:05:52 2013 -0800
Committer: Howard M. Lewis Ship <hl...@apache.org>
Committed: Thu Dec 5 10:05:52 2013 -0800
----------------------------------------------------------------------
.../java/org/apache/tapestry5/corelib/components/Alerts.java | 3 +--
.../apache/tapestry5/corelib/components/BeanEditForm.java | 4 ++--
.../java/org/apache/tapestry5/corelib/components/Submit.java | 4 ++--
.../internal/services/javascript/ModuleManagerImpl.java | 2 +-
.../src/main/resources/org/apache/tapestry5/core.properties | 8 ++++----
5 files changed, 10 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/1bc4e049/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Alerts.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Alerts.java b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Alerts.java
index 6e8a045..c8bc5bb 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Alerts.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Alerts.java
@@ -49,13 +49,12 @@ public class Alerts extends BaseClientElement
@Parameter(value = "message:core-dismiss-label", defaultPrefix = BindingConstants.LITERAL)
private String dismissText;
-
/**
* If set to true, then the "dismiss all" button will not be rendered on the client.
*
* @since 5.4
*/
- @Parameter(value = "message:core-alerts-show-dismiss-all", defaultPrefix = BindingConstants.LITERAL)
+ @Parameter(value = "message:private-core-alerts-show-dismiss-all", defaultPrefix = BindingConstants.LITERAL)
private boolean showDismissAll;
@SessionState(create = false)
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/1bc4e049/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/BeanEditForm.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/BeanEditForm.java b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/BeanEditForm.java
index 3604b0c..a06fac7 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/BeanEditForm.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/BeanEditForm.java
@@ -1,4 +1,4 @@
-// Copyright 2007, 2008, 2009, 2010, 2011, 2012 The Apache Software Foundation
+// Copyright 2007-2013 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.
@@ -108,7 +108,7 @@ public class BeanEditForm implements ClientElement, FormValidationControl
* Specifies the CSS class attribute for the form; the factory default is "well".
*/
@Property
- @Parameter(name = "class", defaultPrefix = BindingConstants.LITERAL, value = "message:core-components.beaneditform.class")
+ @Parameter(name = "class", defaultPrefix = BindingConstants.LITERAL, value = "message:private-core-components.beaneditform.class")
private String className;
@Component(parameters = "validationId=componentResources.id", publishParameters = "clientValidation,autofocus,zone")
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/1bc4e049/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Submit.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Submit.java b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Submit.java
index 61aa621..e0f6fc7 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Submit.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/Submit.java
@@ -1,4 +1,4 @@
-// Copyright 2007, 2008, 2009, 2010, 2011, 2012 The Apache Software Foundation
+// Copyright 2007-2013 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.
@@ -98,7 +98,7 @@ public class Submit implements ClientElement
* @since 5.4
*/
@Parameter(name = "class", defaultPrefix = BindingConstants.LITERAL,
- value = "message:core-components.submit.class")
+ value = "message:private-core-components.submit.class")
private String cssClass;
@Environmental
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/1bc4e049/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/javascript/ModuleManagerImpl.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/javascript/ModuleManagerImpl.java b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/javascript/ModuleManagerImpl.java
index 26cb24c..cb8e886 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/javascript/ModuleManagerImpl.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/internal/services/javascript/ModuleManagerImpl.java
@@ -195,7 +195,7 @@ public class ModuleManagerImpl implements ModuleManager
Element element = body.element("script", "type", "text/javascript");
- element.raw(globalMessages.format("core-page-initialization-template",
+ element.raw(globalMessages.format("private-core-page-initialization-template",
convert(libraryURLs),
convert(inits)));
}
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/1bc4e049/tapestry-core/src/main/resources/org/apache/tapestry5/core.properties
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/resources/org/apache/tapestry5/core.properties b/tapestry-core/src/main/resources/org/apache/tapestry5/core.properties
index 3712977..bda03c8 100644
--- a/tapestry-core/src/main/resources/org/apache/tapestry5/core.properties
+++ b/tapestry-core/src/main/resources/org/apache/tapestry5/core.properties
@@ -111,17 +111,17 @@ core-datefield-none=None
private-no-validation-for-field=placeholder message
-core-page-initialization-template=\
+private-core-page-initialization-template=\
require(["t5/core/pageinit"], function(pi) { pi(%s, %s); });
# BeanEditForm default className parameter default:
-core-components.beaneditform.class=well
+private-core-components.beaneditform.class=well
# Submit component cssClass parameter default:
-core-components.submit.class=btn btn-primary
+private-core-components.submit.class=btn btn-primary
# Default for showDismissAll parameter of Alerts
-core-alerts-show-dismiss-all=true
+private-core-alerts-show-dismiss-all=true
private-default-confirm-message=Are you sure you want to continue?
private-default-confirm-title=Confirm