diff --git a/org.talend.librariesmanager/resources/java/routines/system/Constant.java b/org.talend.librariesmanager/resources/java/routines/system/Constant.java new file mode 100644 index 0000000000..ad3a7a32e7 --- /dev/null +++ b/org.talend.librariesmanager/resources/java/routines/system/Constant.java @@ -0,0 +1,15 @@ +package routines.system; + +/** + * store some global constant + * @author Administrator + * + */ +public abstract class Constant { + + /** + * the default pattern for date parse and format + */ + public static final String dateDefaultPattern = "dd-MM-yyyy"; + +} diff --git a/org.talend.librariesmanager/resources/java/routines/system/FormatterUtils.java b/org.talend.librariesmanager/resources/java/routines/system/FormatterUtils.java index a5e31993f2..800a83231f 100644 --- a/org.talend.librariesmanager/resources/java/routines/system/FormatterUtils.java +++ b/org.talend.librariesmanager/resources/java/routines/system/FormatterUtils.java @@ -27,7 +27,7 @@ public class FormatterUtils { public static String format(Date date,String pattern) { if (date != null) { - return TalendDate.formatDate(pattern, date); + return TalendDate.formatDate(pattern == null ? Constant.dateDefaultPattern : pattern, date); } else { return null; } @@ -73,7 +73,7 @@ public class FormatterUtils { public static String format_Date(java.util.Date date, String pattern) { if (date != null) { - return TalendDate.formatDate(pattern, date); + return TalendDate.formatDate(pattern == null ? Constant.dateDefaultPattern : pattern, date); } else { return null; } @@ -81,7 +81,7 @@ public class FormatterUtils { public static String format_Date_Locale(java.util.Date date, String pattern, String locale) { if (date != null) { - return TalendDate.formatDateLocale(pattern, date, locale); + return TalendDate.formatDateLocale(pattern == null ? Constant.dateDefaultPattern : pattern, date, locale); } else { return null; } diff --git a/org.talend.librariesmanager/resources/java/routines/system/ParserUtils.java b/org.talend.librariesmanager/resources/java/routines/system/ParserUtils.java index 641c8abec5..708443ddbc 100644 --- a/org.talend.librariesmanager/resources/java/routines/system/ParserUtils.java +++ b/org.talend.librariesmanager/resources/java/routines/system/ParserUtils.java @@ -176,6 +176,9 @@ public class ParserUtils { if (s == null || s.length() == 0) { return null; } + if(pattern == null) { + pattern = Constant.dateDefaultPattern; + } java.util.Date date = null; // try { // date = FastDateParser.getInstance(pattern).parse(s); @@ -212,6 +215,9 @@ public class ParserUtils { if (s == null || s.length() == 0) { return null; } + if(pattern == null) { + pattern = Constant.dateDefaultPattern; + } java.util.Date date = null; // try { // date = FastDateParser.getInstance(pattern).parse(s);