Author: simoneg
Date: Wed Dec 9 21:38:52 2009
New Revision: 888989
URL: http://svn.apache.org/viewvc?rev=888989&view=rev
Log:
LABS-352: fix "null" appearing after html pieces introduction
Added:
labs/magma/trunk/foundation-i18n/src/main/java/org/apache/magma/i18n/formatters/BypassFormatter.java
labs/magma/trunk/foundation-i18n/src/main/java/org/apache/magma/i18n/formatters/StringFormatter.java
Modified:
labs/magma/trunk/foundation-i18n/src/main/resources/META-INF/magma.default.properties
Added:
labs/magma/trunk/foundation-i18n/src/main/java/org/apache/magma/i18n/formatters/BypassFormatter.java
URL:
http://svn.apache.org/viewvc/labs/magma/trunk/foundation-i18n/src/main/java/org/apache/magma/i18n/formatters/BypassFormatter.java?rev=888989&view=auto
==============================================================================
---
labs/magma/trunk/foundation-i18n/src/main/java/org/apache/magma/i18n/formatters/BypassFormatter.java
(added)
+++
labs/magma/trunk/foundation-i18n/src/main/java/org/apache/magma/i18n/formatters/BypassFormatter.java
Wed Dec 9 21:38:52 2009
@@ -0,0 +1,61 @@
+package org.apache.magma.i18n.formatters;
+
+import org.apache.magma.conversion.Converter;
+import org.apache.magma.conversion.Converters;
+import org.apache.magma.conversion.GenericConverter;
+import org.apache.magma.i18n.Formatter;
+
+public class BypassFormatter implements Formatter<Object> {
+
+ private Converter myconverter = null;
+
+ public BypassFormatter() {};
+
+ public BypassFormatter(Converter conv) {
+ this.myconverter = conv;
+ }
+
+
+ public Formatter<Object> buildDefault(Class<? extends Object> clazz) {
+ return new BypassFormatter(Converters.getConverterFor(clazz));
+ }
+
+ public String getPattern() {
+ return null;
+ }
+
+ public void setFormat(String format) {
+ }
+
+ public Converter<Object> build(Class<? extends Object> clazz) {
+ return new BypassFormatter(Converters.getConverterFor(clazz));
+ }
+
+ public boolean converts(Class<?> clazz) {
+ return Converters.getConverterFor(clazz) != null;
+ }
+
+ public Object from(String value) {
+ return this.myconverter.from(value);
+ }
+
+ public int getMaximumStringSize() {
+ return this.myconverter.getMaximumStringSize();
+ }
+
+ public String to(Object value) {
+ String ret = this.myconverter.to(value);
+ if (ret == null) return "";
+ return ret;
+ }
+
+ public GenericConverter<Object, String> build(
+ Class<? extends Object> xclass, Class<? extends String>
yclass) {
+ return new BypassFormatter(Converters.getConverterFor(xclass));
+ }
+
+ public boolean converts(Class<?> xclass, Class<?> yclass) {
+ return yclass.equals(String.class) &&
Converters.getConverterFor(xclass) != null;
+ }
+
+}
Added:
labs/magma/trunk/foundation-i18n/src/main/java/org/apache/magma/i18n/formatters/StringFormatter.java
URL:
http://svn.apache.org/viewvc/labs/magma/trunk/foundation-i18n/src/main/java/org/apache/magma/i18n/formatters/StringFormatter.java?rev=888989&view=auto
==============================================================================
---
labs/magma/trunk/foundation-i18n/src/main/java/org/apache/magma/i18n/formatters/StringFormatter.java
(added)
+++
labs/magma/trunk/foundation-i18n/src/main/java/org/apache/magma/i18n/formatters/StringFormatter.java
Wed Dec 9 21:38:52 2009
@@ -0,0 +1,28 @@
+package org.apache.magma.i18n.formatters;
+
+import org.apache.magma.conversion.string.StringConverter;
+import org.apache.magma.i18n.Formatter;
+
+public class StringFormatter extends StringConverter implements
Formatter<String> {
+
+ public String from(String value) {
+ if (value == null || value.length() == 0) return null;
+ return super.from(value);
+ }
+
+ public String to(String value) {
+ if (value == null) return "";
+ return super.to(value);
+ }
+
+ public Formatter<String> buildDefault(Class<? extends String> clazz) {
+ return this;
+ }
+
+ public String getPattern() {
+ return null;
+ }
+
+ public void setFormat(String format) {
+ }
+}
Modified:
labs/magma/trunk/foundation-i18n/src/main/resources/META-INF/magma.default.properties
URL:
http://svn.apache.org/viewvc/labs/magma/trunk/foundation-i18n/src/main/resources/META-INF/magma.default.properties?rev=888989&r1=888988&r2=888989&view=diff
==============================================================================
---
labs/magma/trunk/foundation-i18n/src/main/resources/META-INF/magma.default.properties
(original)
+++
labs/magma/trunk/foundation-i18n/src/main/resources/META-INF/magma.default.properties
Wed Dec 9 21:38:52 2009
@@ -12,7 +12,9 @@
#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.
-org.apache.magma.i18n.Formatter.date=org.apache.magma.i18n.formatters.DateFormatter
-org.apache.magma.i18n.Formatter.double=org.apache.magma.i18n.formatters.DoubleFormatter
-org.apache.magma.i18n.Formatter.boolean=org.apache.magma.i18n.formatters.BooleanFormatter
-org.apache.magma.i18n.Formatter.enum=org.apache.magma.i18n.formatters.EnumFormatter
+org.apache.magma.i18n.Formatter.~date=org.apache.magma.i18n.formatters.DateFormatter
+org.apache.magma.i18n.Formatter.~double=org.apache.magma.i18n.formatters.DoubleFormatter
+org.apache.magma.i18n.Formatter.~boolean=org.apache.magma.i18n.formatters.BooleanFormatter
+org.apache.magma.i18n.Formatter.~enum=org.apache.magma.i18n.formatters.EnumFormatter
+org.apache.magma.i18n.Formatter.~string=org.apache.magma.i18n.formatters.StringFormatter
+org.apache.magma.i18n.Formatter.~~bypass=org.apache.magma.i18n.formatters.BypassFormatter
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
