Revision 44750 trunk/org.gvsig.desktop/org.gvsig.desktop.library/org.gvsig.expressionevaluator/org.gvsig.expressionevaluator.geometry/org.gvsig.expressionevaluator.geometry.lib/org.gvsig.expressionevaluator.geometry.lib.impl/src/test/java/org/gvsig/expresionevaluator/impl/TestExpressionBuilderFormatter.java

View differences:

TestExpressionBuilderFormatter.java
98 98

  
99 99
            @Override
100 100
            public String format(Value function) {
101
                List<Pair<String,Value>> parameters = ((Function)function).parameters();
102
                String p1 = parameters.get(0).getValue().toString(formatter());
103
                String p2 = parameters.get(1).getValue().toString(formatter());
101
                List<Value> parameters = ((Function)function).parameters();
102
                String p1 = parameters.get(0).toString(formatter());
103
                String p2 = parameters.get(1).toString(formatter());
104 104
                String r = MessageFormat.format(
105 105
                        "( (({0}) && ({1})) AND ST_Intersects(({0}),({1}) ))", 
106 106
                        p1,
......
122 122

  
123 123
            @Override
124 124
            public String format(Value function) {
125
                List<Pair<String,Value>> parameters = ((Function)function).parameters();
126
                String p1 = parameters.get(0).getValue().toString(formatter());
127
                String p2 = parameters.get(1).getValue().toString(formatter());
125
                List<Value> parameters = ((Function)function).parameters();
126
                String p1 = parameters.get(0).toString(formatter());
127
                String p2 = parameters.get(1).toString(formatter());
128 128
                String r = MessageFormat.format(
129 129
                        "GeomFromWKB({0}, {1})", 
130 130
                        p1,
......
146 146

  
147 147
            @Override
148 148
            public String format(Value function) {
149
                List<Pair<String,Value>> parameters = ((Function)function).parameters();
150
                String p1 = parameters.get(0).getValue().toString(formatter());
151
                String p2 = parameters.get(1).getValue().toString(formatter());
152
                String p3 = parameters.get(2).getValue().toString(formatter());
149
                List<Value> parameters = ((Function)function).parameters();
150
                String p1 = parameters.get(0).toString(formatter());
151
                String p2 = parameters.get(1).toString(formatter());
152
                String p3 = parameters.get(2).toString(formatter());
153 153
                String r = MessageFormat.format(
154 154
                        "NVL2({0}, {1}, {2})", 
155 155
                        p1,
......
172 172

  
173 173
            @Override
174 174
            public String format(Value function) {
175
                List<Pair<String,Value>> parameters = ((Function)function).parameters();
176
                String p1 = parameters.get(0).getValue().toString(formatter());
175
                List<Value> parameters = ((Function)function).parameters();
176
                String p1 = parameters.get(0).toString(formatter());
177 177
                String r = MessageFormat.format(
178 178
                        "AsWKB(({0}))", 
179 179
                        p1
......
194 194

  
195 195
            @Override
196 196
            public String format(Value function) {
197
                List<Pair<String,Value>> parameters = ((Function)function).parameters();
198
                String p1 = parameters.get(0).getValue().toString(formatter());
197
                List<Value> parameters = ((Function)function).parameters();
198
                String p1 = parameters.get(0).toString(formatter());
199 199
                String r = MessageFormat.format(
200 200
                        "( ({0}) IS NOT NULL )", 
201 201
                        p1

Also available in: Unified diff