Revision 1994 org.gvsig.tools/library/trunk/org.gvsig.tools/org.gvsig.tools.lib/src/main/java/org/gvsig/tools/dataTypes/impl/coercion/CoerceToString.java

View differences:

CoerceToString.java
24 24
package org.gvsig.tools.dataTypes.impl.coercion;
25 25

  
26 26
import java.text.NumberFormat;
27
import java.util.Date;
27 28
import java.util.Locale;
28

  
29
import java.text.DateFormat;
29 30
import org.gvsig.tools.dataTypes.CoercionException;
30 31
import org.gvsig.tools.dataTypes.DataTypesManager.CoercionWithLocale;
31 32

  
......
37 38
            return null;
38 39
        }
39 40
        try {
40
            if (!(value instanceof String)) {
41
            if (value instanceof Date) {
42
                Locale locale = Locale.getDefault();
43
                DateFormat df = DateFormat.getDateInstance(DateFormat.SHORT, locale);
44
                value = df.format(value);
45
            } else if (!(value instanceof String)) {
41 46
                value = value.toString();
42 47
            }
43 48
            return value;
......
53 58
            return null;
54 59
        }
55 60
        try {
56
            if (!(value instanceof String)) {
61
            if (value instanceof Date) {
62
                if (locale == null) {
63
                    locale = Locale.getDefault();
64
                }
65
                DateFormat df = DateFormat.getDateInstance(DateFormat.SHORT, locale);
66
                value = df.format(value);
67
            } else if (!(value instanceof String)) {
57 68
                if (value instanceof Float || value instanceof Double) {
58 69
                    NumberFormat nf = NumberFormat.getInstance(locale);
59 70
                    value = nf.format(((Number) value).doubleValue());

Also available in: Unified diff