Revision 44769 trunk/org.gvsig.desktop/org.gvsig.desktop.library/org.gvsig.expressionevaluator/org.gvsig.expressionevaluator.lib/org.gvsig.expressionevaluator.lib.api/src/main/java/org/gvsig/expressionevaluator/ExpressionUtils.java

View differences:

ExpressionUtils.java
125 125
            return null;
126 126
        }
127 127
        if( formatter==null ) {
128
            formatter = ExpressionBuilder.BASE_FORMATTER;
128
            ExpressionEvaluatorManager manager = ExpressionEvaluatorLocator.getManager();
129
            formatter = manager.getExpressionBuilderFormatter();
129 130
        }
130 131
        return value.toString(formatter);
131 132
    }
132 133

  
133 134
    public static String toString(Value value) {
134
        if( value == null ) {
135
            return null;
136
        }
137
        return value.toString(ExpressionBuilder.BASE_FORMATTER);
135
      return toString(value, null);
138 136
    }
139 137

  
140 138
    public static String toString(Code code, Formatter formatter) {
......
148 146
    }
149 147

  
150 148
    public static String toString(Code code) {
151
        if( code == null ) {
152
            return null;
153
        }
154
        return code.toString(Code.EMPTY_FORMATTER);
149
      return toString(code, null);
155 150
    }
156 151

  
157 152
    public static Expression createExpressionFromJSON(String json) {

Also available in: Unified diff