midsuit
/
core-jgi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

IDEMPIERE-459 Add Timestamp Value to MSysConfig / Added code to manage date, time or timestamp based on the length of string

This commit is contained in:
Carlos Ruiz 2012-12-20 10:51:46 -05:00
parent fb660c3100
commit ceb17510e3
1 changed files with 27 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
org.adempiere.base/src/org/compiere/model/MSysConfig.java
View File

@ -19,12 +19,14 @@ import java.sql.SQLException;
import java.sql.Timestamp; import java.sql.Timestamp;
import java.text.ParseException; import java.text.ParseException;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.Properties; import java.util.Properties;
import java.util.logging.Level; import java.util.logging.Level;
import org.compiere.util.CCache; import org.compiere.util.CCache;
import org.compiere.util.CLogger; import org.compiere.util.CLogger;
import org.compiere.util.DB; import org.compiere.util.DB;
import org.compiere.util.DisplayType;
/** /**
* System Configuration * System Configuration
@ -40,7 +42,7 @@ public class MSysConfig extends X_AD_SysConfig
/** /**
* *
*/ */
private static final long serialVersionUID = 5434521728516112616L; private static final long serialVersionUID = 2906768000936142606L;
public final static String PDF_FONT_DIR = "PDF_FONT_DIR"; public final static String PDF_FONT_DIR = "PDF_FONT_DIR";
public final static String TWOPACK_HANDLE_TRANSLATIONS = "2PACK_HANDLE_TRANSLATIONS"; public final static String TWOPACK_HANDLE_TRANSLATIONS = "2PACK_HANDLE_TRANSLATIONS";
@ -515,18 +517,34 @@ public class MSysConfig extends X_AD_SysConfig
return defaultValue; return defaultValue;
} }
private static int lendate = DisplayType.DEFAULT_DATE_FORMAT.length();
private static int lentime = DisplayType.DEFAULT_TIME_FORMAT.length();
private static int lentimestamp = DisplayType.DEFAULT_TIMESTAMP_FORMAT.length();
/** convert a string to a timestamp */ /** convert a string to a timestamp */
static Timestamp convertStringToTimestamp(String text) static Timestamp convertStringToTimestamp(String text)
{ {
Timestamp dt = null; SimpleDateFormat sdf = null;
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); int lentext = text.length();
java.util.Date date = null; if (lentext == lendate) {
sdf = DisplayType.getDateFormat_JDBC();
} else if (lentext == lentime) {
sdf = DisplayType.getTimeFormat_Default();
} else if (lentext == lentimestamp) {
sdf = DisplayType.getTimestampFormat_Default();
} else {
s_log.warning("Cannot convert to a valid timestamp (invalid length): " + text);
}
try { Timestamp dt = null;
date = sdf.parse(text); if (sdf != null) {
dt = new Timestamp(date.getTime()); try {
} catch (ParseException e) { Date date = sdf.parse(text);
e.printStackTrace(); dt = new Timestamp(date.getTime());
} catch (ParseException e) {
s_log.warning("Cannot convert to a valid timestamp: " + text);
}
} }
return dt; return dt;
} }