Author: jkuhnert
Date: Wed Dec 28 05:53:07 2005
New Revision: 359524
URL: http://svn.apache.org/viewcvs?rev=359524&view=rev
Log:
Code formatting, ja localized validator strings added
Added:
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/form/validator/ValidationStrings_ja.properties
Modified:
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/asset/AbstractAsset.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/asset/ExternalAsset.java
jakarta/tapestry/trunk/status.xml
Modified:
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/asset/AbstractAsset.java
URL:
http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/asset/AbstractAsset.java?rev=359524&r1=359523&r2=359524&view=diff
==============================================================================
---
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/asset/AbstractAsset.java
(original)
+++
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/asset/AbstractAsset.java
Wed Dec 28 05:53:07 2005
@@ -20,22 +20,21 @@
import org.apache.tapestry.IAsset;
/**
- * Base class for [EMAIL PROTECTED] org.apache.tapestry.IAsset}
implementations. Provides
- * the location property.
- *
- * @author Howard Lewis Ship
- * @since 3.0
- *
- **/
-
-public abstract class AbstractAsset implements IAsset
-{
- private Resource _resourceLocation;
+ * Base class for [EMAIL PROTECTED] org.apache.tapestry.IAsset}
implementations. Provides
+ * the location property.
+ *
+ * @author Howard Lewis Ship
+ * @since 3.0
+ */
+
+public abstract class AbstractAsset implements IAsset {
+
+ private Resource _resourceLocation;
private Location _location;
protected AbstractAsset(Resource resourceLocation, Location location)
{
- _resourceLocation = resourceLocation;
+ _resourceLocation = resourceLocation;
_location = location;
}
@@ -43,19 +42,19 @@
{
return _location;
}
-
+
public Resource getResourceLocation()
{
- return _resourceLocation;
+ return _resourceLocation;
}
-
+
public String toString()
{
- ToStringBuilder builder = new ToStringBuilder(this);
-
- builder.append("resourceLocation", _resourceLocation);
- builder.append("location", _location);
-
- return builder.toString();
+ ToStringBuilder builder = new ToStringBuilder(this);
+
+ builder.append("resourceLocation", _resourceLocation);
+ builder.append("location", _location);
+
+ return builder.toString();
}
}
Modified:
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/asset/ExternalAsset.java
URL:
http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/asset/ExternalAsset.java?rev=359524&r1=359523&r2=359524&view=diff
==============================================================================
---
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/asset/ExternalAsset.java
(original)
+++
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/asset/ExternalAsset.java
Wed Dec 28 05:53:07 2005
@@ -22,28 +22,25 @@
import org.apache.tapestry.Tapestry;
/**
- * A reference to an external URL. [EMAIL PROTECTED] ExternalAsset}s are not
- * localizable.
- *
- * @author Howard Lewis Ship
+ * A reference to an external URL. [EMAIL PROTECTED] ExternalAsset}s are not
localizable.
*
- **/
+ * @author Howard Lewis Ship
+ */
+
+public class ExternalAsset extends AbstractAsset {
-public class ExternalAsset extends AbstractAsset
-{
private String _URL;
public ExternalAsset(String URL, Location location)
{
- super(null, location);
-
+ super(null, location);
+
_URL = URL;
}
/**
- * Simply returns the URL of the external asset.
- *
- **/
+ * Simply returns the URL of the external asset.
+ */
public String buildURL()
{
@@ -54,17 +51,15 @@
{
URL url;
- try
- {
+ try {
url = new URL(_URL);
return url.openStream();
- }
- catch (Exception ex)
- {
+ } catch (Exception ex) {
// MalrformedURLException or IOException
- throw new
ApplicationRuntimeException(Tapestry.format("ExternalAsset.resource-missing",
_URL), ex);
+ throw new ApplicationRuntimeException(Tapestry.format(
+ "ExternalAsset.resource-missing", _URL), ex);
}
}
Added:
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/form/validator/ValidationStrings_ja.properties
URL:
http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/form/validator/ValidationStrings_ja.properties?rev=359524&view=auto
==============================================================================
---
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/form/validator/ValidationStrings_ja.properties
(added)
+++
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/form/validator/ValidationStrings_ja.properties
Wed Dec 28 05:53:07 2005
@@ -0,0 +1,49 @@
+#Generated by ResourceBundle Editor (http://eclipse-rbe.sourceforge.net)
+# Copyright 2005 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.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+date-too-early = {0} \u306F
{1}\u3088\u308A\u5F8C\u306E\u65E5\u4ED8\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059..
+
+date-too-late =
{0}\u306F{1}\u3088\u308A\u524D\u306E\u65E5\u4ED8\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059.
+
+disallowed-protocol =
\u8A31\u53EF\u3055\u308C\u3066\u3044\u306A\u3044\u30D7\u30ED\u30C8\u30B3\u30EB
-
\u30D7\u30ED\u30C8\u30B3\u30EB\u306F{0}\u3067\u3042\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059.
+
+field-is-required =
{0}\u306B\u5024\u3092\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044.
+
+### 4.0 ###
+field-too-long =
{1}\u306B{0}\u6587\u5B57\u4EE5\u4E0B\u306E\u6587\u5B57\u5217\u3092\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044.
+
+field-too-short =
{1}\u306B{0}\u6587\u5B57\u4EE5\u4E0B\u306E\u6587\u5B57\u5217\u3092\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044.
+
+invalid-date-format =
\u306F{0}\u4E0D\u6B63\u306A\u65E5\u4ED8\u5F62\u5F0F\u3067\u3059.\u30D5\u30A9\u30FC\u30DE\u30C3\u30C8\u306F{1}\u3067\u3059.
+
+invalid-email-format =
{0}\u306F\u4E0D\u6B63\u306A\u30E1\u30FC\u30EB\u30A2\u30C9\u30EC\u30B9\u3067\u3059.
[EMAIL PROTECTED]
+
+invalid-format =
{0}\u306F\u8B58\u5225\u3055\u308C\u306A\u3044\u30D5\u30A9\u30FC\u30DE\u30C3\u30C8\u3067\u3059.
+
+invalid-int-format =
{0}\u306F\u6574\u6570\u3092\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044..
+
+invalid-numeric-format =
{0}\u306F\u6570\u5B57\u3092\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044.
+
+invalid-url-format = \u4E0D\u6B63\u306AURL\u3067\u3059.
+
+number-range = {0} must be between {1} and {2}.
+
+number-too-large =
{0}\u306F\u5927\u304D\u3059\u304E\u307E\u3059\u3002{1}\u4EE5\u4E0B\u306E\u5024\u3092\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044.
+
+number-too-small =
{0}\u306F\u5C0F\u3055\u3059\u304E\u307E\u3059\u3002{1}\u4EE5\u4E0A\u306E\u5024\u3092\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044.
+
+pattern-not-matched =
{0}\u306F\u8981\u6C42\u3055\u308C\u308B\u30D1\u30BF\u30FC\u30F3{1}\u306B\u30DE\u30C3\u30C1\u3057\u307E\u305B\u3093.
+
+regex-mismatch = {0}\u306F\u4E0D\u6B63\u3067\u3059\u3002
Modified: jakarta/tapestry/trunk/status.xml
URL:
http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/status.xml?rev=359524&r1=359523&r2=359524&view=diff
==============================================================================
--- jakarta/tapestry/trunk/status.xml (original)
+++ jakarta/tapestry/trunk/status.xml Wed Dec 28 05:53:07 2005
@@ -60,6 +60,9 @@
<action type="add" dev="JK" fixes-bug="TAPESTRY-821">ResourceMatcher
service added with configurable regexp pattern
hivemind contributions to conditionally allow some resources to not
require md5sum digest checks.</action>
+ <action type="add" dev="JK" fixes-bug="TAPESTRY-812" due-to="Takashi
Okamoto">
+ Added japanese localized validator strings.
+ </action>
</release>
<release version="4.0-rc-2" date="unreleased">
<action type="fix" dev="HLS"
fixes-bug="TAPESTRY-789">DefaultResourceLocalizerTest is under framework/src
not framework/test</action>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
