You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@labs.apache.org by si...@apache.org on 2009/04/23 01:11:56 UTC
svn commit: r767713 - in
/labs/magma/trunk/foundation-i18n/src/main/java/org/apache/magma/i18n: ./
formatters/
Author: simoneg
Date: Wed Apr 22 23:11:56 2009
New Revision: 767713
URL: http://svn.apache.org/viewvc?rev=767713&view=rev
Log:
LABS-351 : Changes to i18n formatters cause they extend converters
Modified:
labs/magma/trunk/foundation-i18n/src/main/java/org/apache/magma/i18n/AddFormatterInPropertyInfo.aj
labs/magma/trunk/foundation-i18n/src/main/java/org/apache/magma/i18n/AddFormattingInHandler.aj
labs/magma/trunk/foundation-i18n/src/main/java/org/apache/magma/i18n/Formatter.java
labs/magma/trunk/foundation-i18n/src/main/java/org/apache/magma/i18n/I18nRenderingHelper.java
labs/magma/trunk/foundation-i18n/src/main/java/org/apache/magma/i18n/NilFormatter.java
labs/magma/trunk/foundation-i18n/src/main/java/org/apache/magma/i18n/formatters/BooleanFormatter.java
labs/magma/trunk/foundation-i18n/src/main/java/org/apache/magma/i18n/formatters/DateFormatter.java
labs/magma/trunk/foundation-i18n/src/main/java/org/apache/magma/i18n/formatters/DoubleFormatter.java
labs/magma/trunk/foundation-i18n/src/main/java/org/apache/magma/i18n/formatters/EnumFormatter.java
Modified: labs/magma/trunk/foundation-i18n/src/main/java/org/apache/magma/i18n/AddFormatterInPropertyInfo.aj
URL: http://svn.apache.org/viewvc/labs/magma/trunk/foundation-i18n/src/main/java/org/apache/magma/i18n/AddFormatterInPropertyInfo.aj?rev=767713&r1=767712&r2=767713&view=diff
==============================================================================
--- labs/magma/trunk/foundation-i18n/src/main/java/org/apache/magma/i18n/AddFormatterInPropertyInfo.aj (original)
+++ labs/magma/trunk/foundation-i18n/src/main/java/org/apache/magma/i18n/AddFormatterInPropertyInfo.aj Wed Apr 22 23:11:56 2009
@@ -77,7 +77,7 @@
execution(String PropertyInfo.toUser(Object)) &&
this(info) && args(value) {
if (info.formatter != null) {
- return info.formatter.toString(value);
+ return info.formatter.to(value);
}
return proceed(info, value);
}
Modified: labs/magma/trunk/foundation-i18n/src/main/java/org/apache/magma/i18n/AddFormattingInHandler.aj
URL: http://svn.apache.org/viewvc/labs/magma/trunk/foundation-i18n/src/main/java/org/apache/magma/i18n/AddFormattingInHandler.aj?rev=767713&r1=767712&r2=767713&view=diff
==============================================================================
--- labs/magma/trunk/foundation-i18n/src/main/java/org/apache/magma/i18n/AddFormattingInHandler.aj (original)
+++ labs/magma/trunk/foundation-i18n/src/main/java/org/apache/magma/i18n/AddFormattingInHandler.aj Wed Apr 22 23:11:56 2009
@@ -90,7 +90,7 @@
if (val != null) {
Formatter form = property.getFormatter();
if (form != null) {
- this.formattedValues.put(name, form.toString(val));
+ this.formattedValues.put(name, form.to(val));
} else {
this.formattedValues.put(name, this.getStringValue(name));
}
@@ -112,7 +112,7 @@
Formatter form = property.getFormatter();
if (form != null) {
try {
- setValue(name, form.fromString(val));
+ setValue(name, form.from(val));
} catch (ConversionException e) {
e.setSubject(property);
if (exc == null) {
Modified: labs/magma/trunk/foundation-i18n/src/main/java/org/apache/magma/i18n/Formatter.java
URL: http://svn.apache.org/viewvc/labs/magma/trunk/foundation-i18n/src/main/java/org/apache/magma/i18n/Formatter.java?rev=767713&r1=767712&r2=767713&view=diff
==============================================================================
--- labs/magma/trunk/foundation-i18n/src/main/java/org/apache/magma/i18n/Formatter.java (original)
+++ labs/magma/trunk/foundation-i18n/src/main/java/org/apache/magma/i18n/Formatter.java Wed Apr 22 23:11:56 2009
@@ -3,7 +3,7 @@
import java.util.Date;
import org.apache.magma.conversion.Converter;
-import org.apache.magma.conversion.DateConverter;
+import org.apache.magma.conversion.string.DateConverter;
import org.apache.magma.i18n.formatters.DateFormatter;
/**
Modified: labs/magma/trunk/foundation-i18n/src/main/java/org/apache/magma/i18n/I18nRenderingHelper.java
URL: http://svn.apache.org/viewvc/labs/magma/trunk/foundation-i18n/src/main/java/org/apache/magma/i18n/I18nRenderingHelper.java?rev=767713&r1=767712&r2=767713&view=diff
==============================================================================
--- labs/magma/trunk/foundation-i18n/src/main/java/org/apache/magma/i18n/I18nRenderingHelper.java (original)
+++ labs/magma/trunk/foundation-i18n/src/main/java/org/apache/magma/i18n/I18nRenderingHelper.java Wed Apr 22 23:11:56 2009
@@ -49,6 +49,6 @@
public String tr(Date date, String format) {
DateFormatter df = new DateFormatter();
df.setFormat(format);
- return df.toString(date);
+ return df.to(date);
}
}
Modified: labs/magma/trunk/foundation-i18n/src/main/java/org/apache/magma/i18n/NilFormatter.java
URL: http://svn.apache.org/viewvc/labs/magma/trunk/foundation-i18n/src/main/java/org/apache/magma/i18n/NilFormatter.java?rev=767713&r1=767712&r2=767713&view=diff
==============================================================================
--- labs/magma/trunk/foundation-i18n/src/main/java/org/apache/magma/i18n/NilFormatter.java (original)
+++ labs/magma/trunk/foundation-i18n/src/main/java/org/apache/magma/i18n/NilFormatter.java Wed Apr 22 23:11:56 2009
@@ -1,6 +1,7 @@
package org.apache.magma.i18n;
import org.apache.magma.conversion.Converter;
+import org.apache.magma.conversion.GenericConverter;
/**
* A do nothing {@link Formatter} implementation to use as default value where null is not permitted (like in annotations).
@@ -19,12 +20,20 @@
public Converter<Object> build(Class<? extends Object> clazz) {
return null;
}
+
+ public GenericConverter<Object, String> build(Class<? extends Object> xclass, Class<? extends String> yclass) {
+ return null;
+ }
public boolean converts(Class<?> clazz) {
return false;
}
+
+ public boolean converts(Class<?> xclass, Class<?> yclass) {
+ return false;
+ }
- public Object fromString(String value) {
+ public Object from(String value) {
return null;
}
@@ -32,7 +41,7 @@
return 0;
}
- public String toString(Object value) {
+ public String to(Object value) {
return null;
}
Modified: labs/magma/trunk/foundation-i18n/src/main/java/org/apache/magma/i18n/formatters/BooleanFormatter.java
URL: http://svn.apache.org/viewvc/labs/magma/trunk/foundation-i18n/src/main/java/org/apache/magma/i18n/formatters/BooleanFormatter.java?rev=767713&r1=767712&r2=767713&view=diff
==============================================================================
--- labs/magma/trunk/foundation-i18n/src/main/java/org/apache/magma/i18n/formatters/BooleanFormatter.java (original)
+++ labs/magma/trunk/foundation-i18n/src/main/java/org/apache/magma/i18n/formatters/BooleanFormatter.java Wed Apr 22 23:11:56 2009
@@ -1,6 +1,6 @@
package org.apache.magma.i18n.formatters;
-import org.apache.magma.conversion.BooleanConverter;
+import org.apache.magma.conversion.string.BooleanConverter;
import org.apache.magma.i18n.CurrentLocale;
import org.apache.magma.i18n.Formatter;
@@ -26,8 +26,9 @@
public void setFormat(String format) {
}
- public String toString(Boolean value) {
- return CurrentLocale.convert(super.toString(value));
+ @Override
+ public String to(Boolean value) {
+ return CurrentLocale.convert(super.to(value));
}
}
Modified: labs/magma/trunk/foundation-i18n/src/main/java/org/apache/magma/i18n/formatters/DateFormatter.java
URL: http://svn.apache.org/viewvc/labs/magma/trunk/foundation-i18n/src/main/java/org/apache/magma/i18n/formatters/DateFormatter.java?rev=767713&r1=767712&r2=767713&view=diff
==============================================================================
--- labs/magma/trunk/foundation-i18n/src/main/java/org/apache/magma/i18n/formatters/DateFormatter.java (original)
+++ labs/magma/trunk/foundation-i18n/src/main/java/org/apache/magma/i18n/formatters/DateFormatter.java Wed Apr 22 23:11:56 2009
@@ -3,7 +3,7 @@
import org.apache.magma.basics.LocalizableString;
import org.apache.magma.basics.MagmaException;
import org.apache.magma.conversion.ConversionException;
-import org.apache.magma.conversion.DateConverter;
+import org.apache.magma.conversion.string.DateConverter;
import org.apache.magma.i18n.CurrentLocale;
import org.apache.magma.i18n.Formatter;
@@ -50,14 +50,15 @@
private int dateFormat = -1;
private int timeFormat = -1;
- public String toString(Date value) {
+ @Override
+ public String to(Date value) {
if (value == null) return "";
DateFormat formatter = getFormatter();
return formatter.format(value);
}
@Override
- public Date fromString(String value) {
+ public Date from(String value) {
if (value == null || value.length() == 0) return null;
DateFormat formatter = getFormatter();
formatter.setLenient(false);
@@ -65,7 +66,7 @@
return formatter.parse(value);
} catch (ParseException e) {
try {
- return super.fromString(value);
+ return super.from(value);
} catch (ConversionException e2) {
throw new ConversionException(parsingError, e);
}
@@ -163,7 +164,7 @@
@Override
public int getMaximumStringSize() {
- return this.toString(new Date(1230764399999l)).length();
+ return this.to(new Date(1230764399999l)).length();
}
/**
Modified: labs/magma/trunk/foundation-i18n/src/main/java/org/apache/magma/i18n/formatters/DoubleFormatter.java
URL: http://svn.apache.org/viewvc/labs/magma/trunk/foundation-i18n/src/main/java/org/apache/magma/i18n/formatters/DoubleFormatter.java?rev=767713&r1=767712&r2=767713&view=diff
==============================================================================
--- labs/magma/trunk/foundation-i18n/src/main/java/org/apache/magma/i18n/formatters/DoubleFormatter.java (original)
+++ labs/magma/trunk/foundation-i18n/src/main/java/org/apache/magma/i18n/formatters/DoubleFormatter.java Wed Apr 22 23:11:56 2009
@@ -1,17 +1,15 @@
package org.apache.magma.i18n.formatters;
-import java.text.DateFormat;
import java.text.DecimalFormat;
import java.text.DecimalFormatSymbols;
import java.text.NumberFormat;
import java.text.ParseException;
-import java.text.SimpleDateFormat;
import java.util.Currency;
import java.util.Locale;
import org.apache.magma.basics.LocalizableString;
import org.apache.magma.conversion.ConversionException;
-import org.apache.magma.conversion.DoubleConverter;
+import org.apache.magma.conversion.string.DoubleConverter;
import org.apache.magma.i18n.CurrentLocale;
import org.apache.magma.i18n.Formatter;
@@ -58,19 +56,20 @@
myformat = format;
}
- public String toString(Double value) {
+ @Override
+ public String to(Double value) {
if (value == null) return "";
NumberFormat formatter = getFormatter(getFormatterName());
- if (formatter == null) return super.toString(value);
+ if (formatter == null) return super.to(value);
return formatter.format(value).trim();
}
@Override
- public Double fromString(String value) {
+ public Double from(String value) {
if (value == null || value.length() == 0) return onNative ? 0d : null;
String formattername = getFormatterName();
NumberFormat formatter = getFormatter(formattername);
- if (formatter == null) return super.fromString(value);
+ if (formatter == null) return super.from(value);
try {
return formatter.parse(value).doubleValue();
} catch (ParseException e) {
Modified: labs/magma/trunk/foundation-i18n/src/main/java/org/apache/magma/i18n/formatters/EnumFormatter.java
URL: http://svn.apache.org/viewvc/labs/magma/trunk/foundation-i18n/src/main/java/org/apache/magma/i18n/formatters/EnumFormatter.java?rev=767713&r1=767712&r2=767713&view=diff
==============================================================================
--- labs/magma/trunk/foundation-i18n/src/main/java/org/apache/magma/i18n/formatters/EnumFormatter.java (original)
+++ labs/magma/trunk/foundation-i18n/src/main/java/org/apache/magma/i18n/formatters/EnumFormatter.java Wed Apr 22 23:11:56 2009
@@ -1,9 +1,8 @@
package org.apache.magma.i18n.formatters;
-import org.apache.magma.conversion.EnumConverter;
+import org.apache.magma.conversion.string.EnumConverter;
import org.apache.magma.i18n.CurrentLocale;
import org.apache.magma.i18n.Formatter;
-import org.apache.magma.i18n.LocaleHolder;
/**
* Output only - Formats {@link Enum} values.
@@ -29,8 +28,9 @@
public void setFormat(String format) {
}
- public String toString(Enum value) {
- return CurrentLocale.convert(super.toString(value));
+ @Override
+ public String to(Enum value) {
+ return CurrentLocale.convert(super.to(value));
}
public String getPattern() {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@labs.apache.org
For additional commands, e-mail: commits-help@labs.apache.org