Revision 728 org.gvsig.tools/library/trunk/org.gvsig.tools/org.gvsig.tools.swing/org.gvsig.tools.swing.impl/src/main/java/org/gvsig/tools/swing/impl/usability/spinner/editor/DynFieldFormatter.java

View differences:

DynFieldFormatter.java
9 9
import java.util.Calendar;
10 10
import java.util.Date;
11 11
import java.util.Locale;
12
import java.sql.Timestamp;
12 13

  
13 14
import org.gvsig.tools.dataTypes.DataTypes;
14 15
import org.gvsig.tools.dynobject.DynField;
......
337 338
		}
338 339

  
339 340
		if (isDate()) {
340
            return this.df.parse(value);
341
		    if (getType() == DataTypes.TIMESTAMP) {
342
		        /*
343
		         * Parse as timestamp
344
		         */
345
		        return Timestamp.valueOf(value);
346

  
347
		    } else {
348
		        return this.df.parse(value);
349
		    }
341 350
        }
342 351
        if (isNumber()) {
343 352
            return this.f.parse(value);
......
364 373
        case DataTypes.TIMESTAMP:
365 374
            this.isDate = true;
366 375
            this.calendarField = Calendar.SECOND;
367
            this.df =
368
                (SimpleDateFormat) DateFormat.getTimeInstance(
369
                    DateFormat.MEDIUM, getLocale());
376
            /*
377
             * This 'df' will not be used because Timestamp
378
             * is parsed in another way
379
             */
380
            this.df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.f");
381
            
370 382
            break;
371 383
        case DataTypes.DATE:
372 384
            this.isDate = true;

Also available in: Unified diff