Revision 43034 trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.mapcontext/org.gvsig.fmap.mapcontext.api/src/main/java/org/gvsig/fmap/mapcontext/layers/vectorial/SpatialEvaluatorsFactory.java

View differences:

SpatialEvaluatorsFactory.java
22 22
        
23 23
    }
24 24
    
25
    public Evaluator intersects(Geometry geometry,
26
        IProjection projection, 
27
        FeatureType featureType,
28
        String geomName,
29
        ExpressionBuilder builder) {
25
    public Evaluator intersects(
26
            Geometry geometry,
27
            IProjection projection, 
28
            FeatureType featureType,
29
            String geomName,
30
            ExpressionBuilder builder
31
        ) {
30 32
        return new IntersectsGeometryEvaluator(geometry, projection, featureType, geomName, builder);
31 33
    }
32 34
    
33
    public Evaluator intersects(Envelope envelope,
34
        IProjection projection, 
35
        FeatureType featureType,
36
        String geomName,
37
        ExpressionBuilder builder) {
35
    public Evaluator intersects(
36
            Envelope envelope,
37
            IProjection projection, 
38
            FeatureType featureType,
39
            String geomName,
40
            ExpressionBuilder builder
41
        ) {
38 42
        return new IntersectsEnvelopeEvaluator(envelope, projection, featureType, geomName, builder);
39 43
    }
40 44
    
41
    public Evaluator intersects(Geometry geometry,
42
        IProjection projection, 
43
        FeatureStore store) {
44
        
45
        
45
    public Evaluator intersects(
46
            Geometry geometry,
47
            IProjection projection, 
48
            FeatureStore store
49
        ) {
46 50
        try {
47 51
            FeatureType featureType = store.getDefaultFeatureType();
48 52
            String geomName = featureType.getDefaultGeometryAttributeName();
......
53 57
        }
54 58
    }
55 59

  
56
    public Evaluator intersects(Envelope envelope,
57
        IProjection projection, 
58
        FeatureStore store) {
60
    public Evaluator intersects(
61
            Envelope envelope,
62
            IProjection projection, 
63
            FeatureStore store
64
        ) {
59 65
        try {
60 66
            FeatureType featureType = store.getDefaultFeatureType();
61 67
            String geomName = featureType.getDefaultGeometryAttributeName();
......
66 72
        }
67 73
    }
68 74

  
69
    public Evaluator contains(Envelope envelope,
70
        IProjection projection, 
71
        FeatureType featureType,
72
        String geomName,
73
        ExpressionBuilder builder){
75
    public Evaluator contains(
76
            Envelope envelope,
77
            IProjection projection, 
78
            FeatureType featureType,
79
            String geomName,
80
            ExpressionBuilder builder
81
        ){
74 82
        return new ContainsEnvelopeEvaluator(envelope, projection, featureType, geomName);
75 83
    }
76 84

  
77
    public Evaluator contains(Geometry geometry,
78
        IProjection projection, 
79
        FeatureType featureType,
80
        String geomName,
81
        ExpressionBuilder builder){
82
        return new ContainsGeometryEvaluator(geometry, projection, featureType, geomName);
85
    public Evaluator contains(
86
            Geometry geometry,
87
            IProjection projection, 
88
            FeatureType featureType,
89
            String geomName,
90
            ExpressionBuilder builder
91
        ){
92
        return new ContainsGeometryEvaluator(geometry, projection, featureType, geomName, builder);
83 93
    }
84 94
    
85
    public Evaluator contains(Geometry geometry,
86
        IProjection projection, 
87
        FeatureStore store) {
95
    public Evaluator contains(
96
            Geometry geometry,
97
            IProjection projection, 
98
            FeatureStore store
99
        ) {
88 100
        try {
89 101
            FeatureType featureType = store.getDefaultFeatureType();
90 102
            String geomName = featureType.getDefaultGeometryAttributeName();
91 103
            ExpressionBuilder builder = store.createExpressionBuilder();
92
            return contains(geometry, projection, featureType, geomName,builder);
104
            return this.contains(geometry, projection, featureType, geomName,builder);
93 105
        } catch (DataException ex) {
94 106
            throw new RuntimeException("Can't create contains evaluator.",ex);
95 107
        }
96 108
    }
97 109

  
98
    public Evaluator contains(Envelope envelope,
99
        IProjection projection, 
100
        FeatureStore store) {
110
    public Evaluator contains(
111
            Envelope envelope,
112
            IProjection projection, 
113
            FeatureStore store
114
        ) {
101 115
        try {
102 116
            FeatureType featureType = store.getDefaultFeatureType();
103 117
            String geomName = featureType.getDefaultGeometryAttributeName();
104 118
            ExpressionBuilder builder = store.createExpressionBuilder();
105
            return contains(envelope, projection, featureType, geomName,builder);
119
            return this.contains(envelope, projection, featureType, geomName,builder);
106 120
        } catch (DataException ex) {
107 121
            throw new RuntimeException("Can't create contains evaluator.",ex);
108 122
        }
109 123
    }
110 124

  
111
    public Evaluator not_contains(Geometry geometry,
112
        IProjection projection, 
113
        FeatureType featureType,
114
        String geomName,
115
        ExpressionBuilder builder){
116
        return new OutGeometryEvaluator(geometry, projection, featureType, geomName);
125
    public Evaluator not_contains(
126
            Geometry geometry,
127
            IProjection projection, 
128
            FeatureType featureType,
129
            String geomName,
130
            ExpressionBuilder builder
131
        ){
132
        return new OutGeometryEvaluator(geometry, projection, featureType, geomName, builder);
117 133
    }
118 134
    
119
    public Evaluator not_contains(Geometry geometry,
120
        IProjection projection, 
121
        FeatureStore store) {
135
    public Evaluator not_contains(
136
            Geometry geometry,
137
            IProjection projection, 
138
            FeatureStore store
139
        ) {
122 140
        try {
123 141
            FeatureType featureType = store.getDefaultFeatureType();
124 142
            String geomName = featureType.getDefaultGeometryAttributeName();
125 143
            ExpressionBuilder builder = store.createExpressionBuilder();
126
            return not_contains(geometry, projection, featureType, geomName,builder);
144
            return this.not_contains(geometry, projection, featureType, geomName,builder);
127 145
        } catch (DataException ex) {
128 146
            throw new RuntimeException("Can't create not_contains evaluator.",ex);
129 147
        }
130 148
    }
131 149

  
132
    public Evaluator crosses(Geometry geometry,
133
        IProjection projection, 
134
        FeatureType featureType,
135
        String geomName,
136
        ExpressionBuilder builder) {
137
        return new CrossesGeometryEvaluator(geometry, projection, featureType, geomName);
150
    public Evaluator crosses(
151
            Geometry geometry,
152
            IProjection projection, 
153
            FeatureType featureType,
154
            String geomName,
155
            ExpressionBuilder builder
156
        ) {
157
        return new CrossesGeometryEvaluator(geometry, projection, featureType, geomName, builder);
138 158
    }
139 159

  
140
    public Evaluator crosses(Envelope envelope,
141
        IProjection projection, 
142
        FeatureType featureType,
143
        String geomName,
144
        ExpressionBuilder builder) {
145
        return new CrossEnvelopeEvaluator(envelope, projection, featureType, geomName);
160
    public Evaluator crosses(
161
            Envelope envelope,
162
            IProjection projection, 
163
            FeatureType featureType,
164
            String geomName,
165
            ExpressionBuilder builder
166
        ) {
167
        return new CrossEnvelopeEvaluator(envelope, projection, featureType, geomName, builder);
146 168
    }
147 169

  
148
    public Evaluator crosses(Geometry geometry,
149
        IProjection projection, 
150
        FeatureStore store) {
170
    public Evaluator crosses(
171
            Geometry geometry,
172
            IProjection projection, 
173
            FeatureStore store
174
        ) {
151 175
        try {
152 176
            FeatureType featureType = store.getDefaultFeatureType();
153 177
            String geomName = featureType.getDefaultGeometryAttributeName();
154 178
            ExpressionBuilder builder = store.createExpressionBuilder();
155
            return crosses(geometry, projection, featureType, geomName,builder);
179
            return this.crosses(geometry, projection, featureType, geomName,builder);
156 180
        } catch (DataException ex) {
157 181
            throw new RuntimeException("Can't create crosses evaluator.",ex);
158 182
        }
159 183
    }
160 184

  
161
    public Evaluator crosses(Envelope envelope,
162
        IProjection projection, 
163
        FeatureStore store) {
185
    public Evaluator crosses(
186
            Envelope envelope,
187
            IProjection projection, 
188
            FeatureStore store
189
        ) {
164 190
        try {
165 191
            FeatureType featureType = store.getDefaultFeatureType();
166 192
            String geomName = featureType.getDefaultGeometryAttributeName();
167 193
            ExpressionBuilder builder = store.createExpressionBuilder();
168
            return crosses(envelope, projection, featureType, geomName,builder);
194
            return this.crosses(envelope, projection, featureType, geomName,builder);
169 195
        } catch (DataException ex) {
170 196
            throw new RuntimeException("Can't create crosses evaluator.",ex);
171 197
        }
172 198
    }
173 199

  
174
    public Evaluator disjoint(Geometry geometry,
175
        IProjection projection, 
176
        FeatureType featureType,
177
        String geomName,
178
        ExpressionBuilder builder) {
179
        return new DisjointGeometryEvaluator(geometry, projection, featureType, geomName);
200
    public Evaluator disjoint(
201
            Geometry geometry,
202
            IProjection projection, 
203
            FeatureType featureType,
204
            String geomName,
205
            ExpressionBuilder builder
206
        ) {
207
        return new DisjointGeometryEvaluator(geometry, projection, featureType, geomName, builder);
180 208
    }    
181 209

  
182
    public Evaluator disjoint(Geometry geometry,
183
        IProjection projection, 
184
        FeatureStore store) {
210
    public Evaluator disjoint(
211
            Geometry geometry,
212
            IProjection projection, 
213
            FeatureStore store
214
        ) {
185 215
        try {
186 216
            FeatureType featureType = store.getDefaultFeatureType();
187 217
            String geomName = featureType.getDefaultGeometryAttributeName();
188 218
            ExpressionBuilder builder = store.createExpressionBuilder();
189
            return disjoint(geometry, projection, featureType, geomName,builder);
219
            return this.disjoint(geometry, projection, featureType, geomName,builder);
190 220
        } catch (DataException ex) {
191 221
            throw new RuntimeException("Can't create disjoint evaluator.",ex);
192 222
        }
193 223
    }
194 224
    
195
    public Evaluator overlaps(Geometry geometry,
196
        IProjection projection, 
197
        FeatureType featureType,
198
        String geomName,
199
        ExpressionBuilder builder) {
200
        return new OverlapsGeometryEvaluator(geometry, projection, featureType, geomName);
225
    public Evaluator overlaps(
226
            Geometry geometry,
227
            IProjection projection, 
228
            FeatureType featureType,
229
            String geomName,
230
            ExpressionBuilder builder
231
        ) {
232
        return new OverlapsGeometryEvaluator(geometry, projection, featureType, geomName, builder);
201 233
    }    
202 234

  
203
    public Evaluator overlaps(Geometry geometry,
204
        IProjection projection, 
205
        FeatureStore store) {
235
    public Evaluator overlaps(
236
            Geometry geometry,
237
            IProjection projection, 
238
            FeatureStore store
239
        ) {
206 240
        try {
207 241
            FeatureType featureType = store.getDefaultFeatureType();
208 242
            String geomName = featureType.getDefaultGeometryAttributeName();
209 243
            ExpressionBuilder builder = store.createExpressionBuilder();
210
            return overlaps(geometry, projection, featureType, geomName,builder);
244
            return this.overlaps(geometry, projection, featureType, geomName,builder);
211 245
        } catch (DataException ex) {
212 246
            throw new RuntimeException("Can't create overlaps evaluator.",ex);
213 247
        }
214 248
    }
215 249
    
216
    public Evaluator touches(Geometry geometry,
217
        IProjection projection, 
218
        FeatureType featureType,
219
        String geomName,
220
        ExpressionBuilder builder) {
221
        return new TouchesGeometryEvaluator(geometry, projection, featureType, geomName);
250
    public Evaluator touches(
251
            Geometry geometry,
252
            IProjection projection, 
253
            FeatureType featureType,
254
            String geomName,
255
            ExpressionBuilder builder
256
        ) {
257
        return new TouchesGeometryEvaluator(geometry, projection, featureType, geomName,builder);
222 258
    }    
223 259

  
224
    public Evaluator touches(Geometry geometry,
225
        IProjection projection, 
226
        FeatureStore store) {
260
    public Evaluator touches(
261
            Geometry geometry,
262
            IProjection projection, 
263
            FeatureStore store
264
        ) {
227 265
        try {
228 266
            FeatureType featureType = store.getDefaultFeatureType();
229 267
            String geomName = featureType.getDefaultGeometryAttributeName();
230 268
            ExpressionBuilder builder = store.createExpressionBuilder();
231
            return touches(geometry, projection, featureType, geomName,builder);
269
            return this.touches(geometry, projection, featureType, geomName,builder);
232 270
        } catch (DataException ex) {
233 271
            throw new RuntimeException("Can't create touches evaluator.",ex);
234 272
        }
235 273
    }
236 274
    
237
    public Evaluator within(Geometry geometry,
238
        IProjection projection, 
239
        FeatureType featureType,
240
        String geomName,
241
        ExpressionBuilder builder) {
242
        return new WithinGeometryEvaluator(geometry, projection, featureType, geomName);
275
    public Evaluator within(
276
            Geometry geometry,
277
            IProjection projection, 
278
            FeatureType featureType,
279
            String geomName,
280
            ExpressionBuilder builder
281
        ) {
282
        return new WithinGeometryEvaluator(geometry, projection, featureType, geomName,builder);
243 283
    }    
244 284

  
245
    public Evaluator within(Geometry geometry,
246
        IProjection projection, 
247
        FeatureStore store) {
285
    public Evaluator within(
286
            Geometry geometry,
287
            IProjection projection, 
288
            FeatureStore store
289
        ) {
248 290
        try {
249 291
            FeatureType featureType = store.getDefaultFeatureType();
250 292
            String geomName = featureType.getDefaultGeometryAttributeName();
251 293
            ExpressionBuilder builder = store.createExpressionBuilder();
252
            return within(geometry, projection, featureType, geomName,builder);
294
            return this.within(geometry, projection, featureType, geomName,builder);
253 295
        } catch (DataException ex) {
254 296
            throw new RuntimeException("Can't create within evaluator.",ex);
255 297
        }
256 298
    }
257 299
    
258
    public Evaluator equals(Geometry geometry,
259
        IProjection projection, 
260
        FeatureType featureType,
261
        String geomName,
262
        ExpressionBuilder builder) {
263
        return new EqualsGeometryEvaluator(geometry, projection, featureType, geomName);
300
    public Evaluator equals(
301
            Geometry geometry,
302
            IProjection projection, 
303
            FeatureType featureType,
304
            String geomName,
305
            ExpressionBuilder builder
306
        ) {
307
        return new EqualsGeometryEvaluator(geometry, projection, featureType, geomName,builder);
264 308
    }    
265 309
    
266
    public Evaluator equals(Geometry geometry,
267
        IProjection projection, 
268
        FeatureStore store) {
310
    public Evaluator equals(    
311
            Geometry geometry,
312
            IProjection projection, 
313
            FeatureStore store
314
        ) {
269 315
        try {
270 316
            FeatureType featureType = store.getDefaultFeatureType();
271 317
            String geomName = featureType.getDefaultGeometryAttributeName();
272 318
            ExpressionBuilder builder = store.createExpressionBuilder();
273
            return equals(geometry, projection, featureType, geomName,builder);
319
            return this.equals(geometry, projection, featureType, geomName,builder);
274 320
        } catch (DataException ex) {
275 321
            throw new RuntimeException("Can't create equals evaluator.",ex);
276 322
        }

Also available in: Unified diff