Revision 44617 trunk/org.gvsig.desktop/org.gvsig.desktop.compat.cdc/org.gvsig.fmap.geometry/org.gvsig.fmap.geometry.jts/src/main/java/org/gvsig/fmap/geom/jts/primitive/curve/arc/AbstractArc.java

View differences:

AbstractArc.java
38 38
import org.gvsig.fmap.geom.operation.GeometryOperationNotSupportedException;
39 39
import org.gvsig.fmap.geom.primitive.Arc;
40 40
import org.gvsig.fmap.geom.primitive.GeneralPathX;
41
import org.gvsig.fmap.geom.primitive.OrientablePrimitive;
41 42
import org.gvsig.fmap.geom.primitive.Point;
42 43

  
43 44

  
......
53 54
    private static final long serialVersionUID = 454301669807892457L;
54 55

  
55 56
    /**
56
     * @param type
57 57
     * @param subtype
58 58
     */
59 59
    protected AbstractArc(int subtype) {
......
70 70
    protected Point end;
71 71

  
72 72

  
73
    /* (non-Javadoc)
74
     * @see org.gvsig.fmap.geom.primitive.Curve#setPoints(org.gvsig.fmap.geom.primitive.Point, org.gvsig.fmap.geom.primitive.Point)
75
     */
73
    @Override
76 74
    public void setPoints(Point initialPoint, Point endPoint) {
77 75
        String message = "Calling deprecated method setPoints of a arc";
78 76
        notifyDeprecated(message);
79 77
        throw new UnsupportedOperationException(message);
80 78
    }
81 79

  
82
    /* (non-Javadoc)
83
     * @see org.gvsig.fmap.geom.primitive.OrientablePrimitive#getCoordinateAt(int, int)
84
     */
80
    @Override
85 81
    public double getCoordinateAt(int index, int dimension) {
86 82
        String message = "Calling deprecated method setPoints of a arc";
87 83
        notifyDeprecated(message);
88 84
        throw new UnsupportedOperationException(message);
89 85
    }
90 86

  
91
    /* (non-Javadoc)
92
     * @see org.gvsig.fmap.geom.primitive.OrientablePrimitive#setCoordinateAt(int, int, double)
93
     */
94
    public void setCoordinateAt(int index, int dimension, double value) {
87
    @Override
88
    public OrientablePrimitive setCoordinateAt(int index, int dimension, double value) {
95 89
        String message = "Calling deprecated method setPoints of a arc";
96 90
        notifyDeprecated(message);
97 91
        throw new UnsupportedOperationException(message);
98 92
    }
99 93

  
100
    /* (non-Javadoc)
101
     * @see org.gvsig.fmap.geom.primitive.OrientablePrimitive#addVertex(org.gvsig.fmap.geom.primitive.Point)
102
     */
103
    public void addVertex(Point point) {
94
    @Override
95
    public OrientablePrimitive addVertex(Point point) {
104 96
        String message = "Calling deprecated method setPoints of a arc";
105 97
        notifyDeprecated(message);
106 98
        throw new UnsupportedOperationException(message);
107 99
    }
108 100

  
109
    /* (non-Javadoc)
110
     * @see org.gvsig.fmap.geom.primitive.OrientablePrimitive#addVertex(double, double)
111
     */
112
    public void addVertex(double x, double y) {
101
    @Override
102
    public OrientablePrimitive addVertex(double x, double y) {
113 103
        String message = "Calling deprecated method setPoints of a arc";
114 104
        notifyDeprecated(message);
115 105
        throw new UnsupportedOperationException(message);
116 106
    }
117 107

  
118
    /* (non-Javadoc)
119
     * @see org.gvsig.fmap.geom.primitive.OrientablePrimitive#addVertex(double, double, double)
120
     */
121
    public void addVertex(double x, double y, double z) {
108
    @Override
109
    public OrientablePrimitive addVertex(double x, double y, double z) {
122 110
        String message = "Calling deprecated method setPoints of a arc";
123 111
        notifyDeprecated(message);
124 112
        throw new UnsupportedOperationException(message);
125 113
    }
126 114

  
127
    /* (non-Javadoc)
128
     * @see org.gvsig.fmap.geom.primitive.OrientablePrimitive#removeVertex(int)
129
     */
115
    @Override
130 116
    public void removeVertex(int index) {
131 117
        String message = "Calling deprecated method setPoints of a arc";
132 118
        notifyDeprecated(message);
133 119
        throw new UnsupportedOperationException(message);
134 120
    }
135 121

  
136
    /* (non-Javadoc)
137
     * @see org.gvsig.fmap.geom.primitive.OrientablePrimitive#getVertex(int)
138
     */
122
    @Override
139 123
    public Point getVertex(int index) {
140 124
        String message = "Calling deprecated method setPoints of a arc";
141 125
        notifyDeprecated(message);
142 126
        throw new UnsupportedOperationException(message);
143 127
    }
144 128

  
145
    /* (non-Javadoc)
146
     * @see org.gvsig.fmap.geom.primitive.OrientablePrimitive#getNumVertices()
147
     */
129
    @Override
148 130
    public int getNumVertices() {
149 131
        String message = "Calling deprecated method setPoints of a arc";
150 132
        notifyDeprecated(message);
151 133
        throw new UnsupportedOperationException(message);
152 134
    }
153 135

  
154
    /* (non-Javadoc)
155
     * @see org.gvsig.fmap.geom.primitive.OrientablePrimitive#insertVertex(int, org.gvsig.fmap.geom.primitive.Point)
156
     */
157
    public void insertVertex(int index, Point p) {
136
    @Override
137
    public OrientablePrimitive insertVertex(int index, Point p) {
158 138
        String message = "Calling deprecated method setPoints of a arc";
159 139
        notifyDeprecated(message);
160 140
        throw new UnsupportedOperationException(message);
161 141
    }
162 142

  
163
    /* (non-Javadoc)
164
     * @see org.gvsig.fmap.geom.primitive.OrientablePrimitive#setVertex(int, org.gvsig.fmap.geom.primitive.Point)
165
     */
166
    public void setVertex(int index, Point p) {
143
    @Override
144
    public OrientablePrimitive setVertex(int index, Point p) {
167 145
        String message = "Calling deprecated method setPoints of a arc";
168 146
        notifyDeprecated(message);
169 147
        throw new UnsupportedOperationException(message);
170 148
    }
171 149

  
172
    /* (non-Javadoc)
173
     * @see org.gvsig.fmap.geom.primitive.OrientablePrimitive#setGeneralPath(org.gvsig.fmap.geom.primitive.GeneralPathX)
174
     */
150
    @Override
175 151
    public void setGeneralPath(GeneralPathX generalPathX) {
176 152
        String message = "Calling deprecated method setPoints of a arc";
177 153
        notifyDeprecated(message);
178 154
        throw new UnsupportedOperationException(message);
179 155
    }
180 156

  
181
    /* (non-Javadoc)
182
     * @see org.gvsig.fmap.geom.primitive.OrientablePrimitive#addMoveToVertex(org.gvsig.fmap.geom.primitive.Point)
183
     */
157
    @Override
184 158
    public void addMoveToVertex(Point point) {
185 159
        String message = "Calling deprecated method setPoints of a arc";
186 160
        notifyDeprecated(message);
187 161
        throw new UnsupportedOperationException(message);
188 162
    }
189 163

  
190
    /* (non-Javadoc)
191
     * @see org.gvsig.fmap.geom.primitive.OrientablePrimitive#closePrimitive()
192
     */
164
    @Override
193 165
    public void closePrimitive() {
194 166
        String message = "Calling deprecated method setPoints of a arc";
195 167
        notifyDeprecated(message);
196 168
        throw new UnsupportedOperationException(message);
197 169
    }
198 170

  
199
    /* (non-Javadoc)
200
     * @see org.gvsig.fmap.geom.primitive.OrientablePrimitive#ensureCapacity(int)
201
     */
202
    public void ensureCapacity(int capacity) {
171
    @Override
172
    public OrientablePrimitive ensureCapacity(int capacity) {
203 173
        // TODO Auto-generated method stub
204

  
174
        return this;
205 175
    }
206 176

  
207
    /* (non-Javadoc)
208
     * @see org.gvsig.fmap.geom.Geometry#reProject(org.cresques.cts.ICoordTrans)
209
     */
177
    @Override
210 178
    public void reProject(ICoordTrans ct) {
211 179
        //FIXME: Esto solo ser?a correcto para transformaciones de traslaci?n, rotaci?n y escala
212 180
        // Ser?a incorrecto para las de deformaci?n en cizallamiento
......
227 195
        }
228 196
    }
229 197

  
230
    /* (non-Javadoc)
231
     * @see org.gvsig.fmap.geom.Geometry#transform(java.awt.geom.AffineTransform)
232
     */
198
    @Override
233 199
    public void transform(AffineTransform at) {
234 200
        //FIXME: Esto solo ser?a correcto para transformaciones de traslaci?n, rotaci?n y escala
235 201
        // Ser?a incorrecto para las de deformaci?n en cizallamiento
......
239 205
        end.transform(at);
240 206
    }
241 207

  
242
    /* (non-Javadoc)
243
     * @see org.gvsig.fmap.geom.Geometry#getDimension()
244
     */
208
    @Override
245 209
    public int getDimension() {
246 210
        return init.getDimension();
247 211
    }
248 212

  
249
    /* (non-Javadoc)
250
     * @see org.gvsig.fmap.geom.Geometry#getShape(java.awt.geom.AffineTransform)
251
     */
213
    @Override
252 214
    public Shape getShape(AffineTransform affineTransform) {
253 215
        return new DefaultGeneralPathX(getPathIterator(affineTransform),false,0);
254 216
    }
255 217

  
256
    /* (non-Javadoc)
257
     * @see org.gvsig.fmap.geom.Geometry#getShape()
258
     */
218
    @Override
259 219
    public Shape getShape() {
260 220
        return getShape(null);
261 221
    }
262 222

  
263
    /* (non-Javadoc)
264
     * @see org.gvsig.fmap.geom.jts.GeometryJTS#is3D()
265
     */
223
    @Override
266 224
    public boolean is3D() {
267 225
        return ((PointJTS)init).is3D();
268 226
    }
269 227

  
270 228
    /**
271
     * @param initialPoint
229
     * @param point
272 230
     * @return
273 231
     */
274 232
    protected abstract Point fixPoint(Point point);
275 233

  
276
    /* (non-Javadoc)
277
     * @see org.gvsig.fmap.geom.primitive.Arc#setPoints(org.gvsig.fmap.geom.primitive.Point, org.gvsig.fmap.geom.primitive.Point, org.gvsig.fmap.geom.primitive.Point)
278
     */
234
    @Override
279 235
    public void setPoints(Point startPoint, Point midPoint, Point endPoint) {
280 236
        init = fixPoint(startPoint);
281 237
        middle = fixPoint(midPoint);
282 238
        end = fixPoint(endPoint);
283 239
    }
284 240

  
285
    /* (non-Javadoc)
286
     * @see org.gvsig.fmap.geom.primitive.Arc#getInitPoint()
287
     */
241
    @Override
288 242
    public Point getInitPoint() {
289 243
        return init;
290 244
    }
291 245

  
292
    /* (non-Javadoc)
293
     * @see org.gvsig.fmap.geom.primitive.Arc#getEndPoint()
294
     */
246
    @Override
295 247
    public Point getEndPoint() {
296 248
        return end;
297 249
    }
298 250

  
299
    /* (non-Javadoc)
300
     * @see org.gvsig.fmap.geom.primitive.Arc#getMiddlePoint()
301
     */
251
    @Override
302 252
    public Point getMiddlePoint() {
303 253
        return middle;
304 254
    }
......
340 290
    }
341 291

  
342 292

  
343
    /* (non-Javadoc)
344
     * @see org.gvsig.fmap.geom.primitive.Arc#setPointsStartExt(org.gvsig.fmap.geom.primitive.Point, double, double, double)
345
     */
293
    @Override
346 294
    public void setPointsStartExt(Point center, double radius, double startAngle, double angleExt) {
347 295
        setPoints(center, radius, startAngle, angleExt);
348 296
    }
349 297

  
350
    /* (non-Javadoc)
351
     * @see org.gvsig.fmap.geom.primitive.Arc#setPointsStartEnd(org.gvsig.fmap.geom.primitive.Point, double, double, double)
352
     */
298
    @Override
353 299
    public void setPointsStartEnd(Point center, double radius, double startAngle, double endAngle) {
354 300

  
355 301
        if (startAngle == endAngle) {
......
376 322
        }
377 323
    }
378 324

  
379
    /* (non-Javadoc)
380
     * @see org.gvsig.fmap.geom.Geometry#getGeneralPath()
381
     */
325
    @Override
382 326
    public GeneralPathX getGeneralPath() {
383 327

  
384 328
       GeneralPathX gp = new DefaultGeneralPathX(getPathIterator(null, getManager().getFlatness()), is3D(), 0.0);
......
386 330
    }
387 331

  
388 332

  
389
    /* (non-Javadoc)
390
     * @see org.gvsig.fmap.geom.Geometry#getPathIterator(java.awt.geom.AffineTransform)
391
     */
333
    @Override
392 334
    public PathIterator getPathIterator(AffineTransform at) {
393 335
        return getPathIterator(at, getManager().getFlatness());
394 336
    }
395 337

  
396 338

  
397
    /* (non-Javadoc)
398
     * @see org.gvsig.fmap.geom.Geometry#getPathIterator(java.awt.geom.AffineTransform, double)
399
     */
339
    @Override
400 340
    public PathIterator getPathIterator(AffineTransform at, double flatness) {
401 341

  
402 342
        java.awt.geom.Point2D.Double p1 = new java.awt.geom.Point2D.Double(init.getX(), init.getY());
......
413 353
        return arco.getPathIterator(at, flatness);
414 354
    }
415 355

  
416
    /* (non-Javadoc)
417
     * @see org.gvsig.fmap.geom.jts.GeometryJTS#flip()
418
     */
356
    @Override
419 357
    public void flip() throws GeometryOperationNotSupportedException, GeometryOperationException {
420 358
        Point aux = init;
421 359
        init = end;
......
423 361
    }
424 362

  
425 363

  
426
    /* (non-Javadoc)
427
     * @see org.gvsig.fmap.geom.primitive.Arc#getStartAngle()
428
     */
364
    @Override
429 365
    public double getStartAngle() throws GeometryOperationNotSupportedException, GeometryOperationException {
430 366
        return getAngle(getCenterPoint(), getInitPoint());
431 367
    }
432 368

  
433
    /* (non-Javadoc)
434
     * @see org.gvsig.fmap.geom.primitive.Arc#getEndAngle()
435
     */
369
    @Override
436 370
    public double getEndAngle() throws GeometryOperationNotSupportedException, GeometryOperationException {
437 371
        return getAngle(getCenterPoint(), getEndPoint());
438 372
    }
......
452 386
    }
453 387

  
454 388

  
455
    /* (non-Javadoc)
456
     * @see org.gvsig.fmap.geom.Geometry#offset(double)
457
     */
389
    @Override
458 390
    public Geometry offset(double distance) throws GeometryOperationNotSupportedException, GeometryOperationException {
459 391
        // TODO Auto-generated method stub
460 392
        Point center = getCenterPoint();

Also available in: Unified diff