Subversion Repositories general

Compare Revisions

Ignore whitespace Rev 18 → Rev 19

/kickup/trunk/src/ak/kickup/util/Validator.java
1,6 → 1,7
package ak.kickup.util;
 
import java.math.BigDecimal;
import java.util.Date;
import java.text.NumberFormat;
import java.text.ParseException;
 
54,5 → 55,25
errors.add(field.getKey(), Resources.getActionError(request, va, field));
return null;
}
}
 
public static Date validateDateTime(Object bean, ValidatorAction va, Field field,
ActionErrors errors, HttpServletRequest request)
{
String value = null;
if((bean == null) || (bean instanceof String))
value = (String)bean;
else
value = ValidatorUtil.getValueAsString(bean, field.getProperty());
 
if(value == null || "".equals(value)) return null;
 
try {
return StringConverter.DATE_TIME_FORMAT.parse(value);
}
catch(ParseException ex) {
errors.add(field.getKey(), Resources.getActionError(request, va, field));
return null;
}
}
}
/kickup/trunk/src/ak/kickup/util/StringConverter.java
3,6 → 3,7
import java.math.BigDecimal;
import java.util.Date;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.text.NumberFormat;
import java.text.DecimalFormat;
import java.text.ParseException;
9,6 → 10,8
 
public abstract class StringConverter
{
public static final DateFormat DATE_TIME_FORMAT = new SimpleDateFormat("dd.MM.yyyy HH:mm");
 
public static boolean isEmpty(Object o)
{
if(o == null)
98,7 → 101,7
throws NumberFormatException, ParseException
{
String s = preparse(o);
return (s == null) ? null : DateFormat.getDateTimeInstance().parse(s);
return (s == null) ? null : DATE_TIME_FORMAT.parse(s);
}
 
public static String toDateTime(Date d)
106,7 → 109,7
if(d == null)
return null;
else
return DateFormat.getDateTimeInstance().format(d);
return DATE_TIME_FORMAT.format(d);
}
 
public static String toString(Object o)