Revision 3832 trunk/extensions/extCAD/src/com/iver/cit/gvsig/gui/cad/tools/smc/PolygonCADToolContext.java

View differences:

PolygonCADToolContext.java
6 6
package com.iver.cit.gvsig.gui.cad.tools.smc;
7 7

  
8 8
import com.iver.cit.gvsig.gui.cad.tools.PolygonCADTool;
9
import com.iver.cit.gvsig.fmap.layers.FBitSet;
10 9

  
11 10
public final class PolygonCADToolContext
12 11
    extends statemap.FSMContext
......
24 23
        ExecuteMap.Initial.Entry(this);
25 24
    }
26 25

  
27
    public void addOption(FBitSet sel, String s)
26
    public void addOption(String s)
28 27
    {
29 28
        _transition = "addOption";
30
        getState().addOption(this, sel, s);
29
        getState().addOption(this, s);
31 30
        _transition = "";
32 31
        return;
33 32
    }
34 33

  
35
    public void addPoint(FBitSet sel, double pointX, double pointY)
34
    public void addPoint(double pointX, double pointY)
36 35
    {
37 36
        _transition = "addPoint";
38
        getState().addPoint(this, sel, pointX, pointY);
37
        getState().addPoint(this, pointX, pointY);
39 38
        _transition = "";
40 39
        return;
41 40
    }
42 41

  
43
    public void addValue(FBitSet sel, double d)
42
    public void addValue(double d)
44 43
    {
45 44
        _transition = "addValue";
46
        getState().addValue(this, sel, d);
45
        getState().addValue(this, d);
47 46
        _transition = "";
48 47
        return;
49 48
    }
......
90 89
        protected void Entry(PolygonCADToolContext context) {}
91 90
        protected void Exit(PolygonCADToolContext context) {}
92 91

  
93
        protected void addOption(PolygonCADToolContext context, FBitSet sel, String s)
92
        protected void addOption(PolygonCADToolContext context, String s)
94 93
        {
95 94
            Default(context);
96 95
        }
97 96

  
98
        protected void addPoint(PolygonCADToolContext context, FBitSet sel, double pointX, double pointY)
97
        protected void addPoint(PolygonCADToolContext context, double pointX, double pointY)
99 98
        {
100 99
            Default(context);
101 100
        }
102 101

  
103
        protected void addValue(PolygonCADToolContext context, FBitSet sel, double d)
102
        protected void addValue(PolygonCADToolContext context, double d)
104 103
        {
105 104
            Default(context);
106 105
        }
......
190 189
                return;
191 190
            }
192 191

  
193
            protected void addPoint(PolygonCADToolContext context, FBitSet sel, double pointX, double pointY)
192
            protected void addPoint(PolygonCADToolContext context, double pointX, double pointY)
194 193
            {
195 194
                PolygonCADTool ctxt = context.getOwner();
196 195

  
......
200 199
                try
201 200
                {
202 201
                    ctxt.setQuestion("Inscrito en el c?rculo[I] o Circunscrito[C]");
203
                    ctxt.addPoint(sel, pointX, pointY);
202
                    ctxt.addPoint(pointX, pointY);
204 203
                }
205 204
                finally
206 205
                {
......
210 209
                return;
211 210
            }
212 211

  
213
            protected void addValue(PolygonCADToolContext context, FBitSet sel, double d)
212
            protected void addValue(PolygonCADToolContext context, double d)
214 213
            {
215 214
                PolygonCADTool ctxt = context.getOwner();
216 215

  
......
220 219
                try
221 220
                {
222 221
                    ctxt.setQuestion("Insertar punto central del poligono");
223
                    ctxt.addValue(sel, d);
222
                    ctxt.addValue(d);
224 223
                }
225 224
                finally
226 225
                {
......
247 246
                super (name, id);
248 247
            }
249 248

  
250
            protected void addPoint(PolygonCADToolContext context, FBitSet sel, double pointX, double pointY)
249
            protected void addPoint(PolygonCADToolContext context, double pointX, double pointY)
251 250
            {
252 251
                PolygonCADTool ctxt = context.getOwner();
253 252

  
......
257 256
                try
258 257
                {
259 258
                    ctxt.setQuestion("Inscrito en el c?rculo[I] o Circunscrito[C]<C>");
260
                    ctxt.addPoint(sel, pointX, pointY);
259
                    ctxt.addPoint(pointX, pointY);
261 260
                }
262 261
                finally
263 262
                {
......
284 283
                super (name, id);
285 284
            }
286 285

  
287
            protected void addOption(PolygonCADToolContext context, FBitSet sel, String s)
286
            protected void addOption(PolygonCADToolContext context, String s)
288 287
            {
289 288
                PolygonCADTool ctxt = context.getOwner();
290 289

  
......
294 293
                try
295 294
                {
296 295
                    ctxt.setQuestion("Precise r?dio(r)");
297
                    ctxt.addOption(sel, s);
296
                    ctxt.addOption(s);
298 297
                }
299 298
                finally
300 299
                {
......
304 303
                return;
305 304
            }
306 305

  
307
            protected void addPoint(PolygonCADToolContext context, FBitSet sel, double pointX, double pointY)
306
            protected void addPoint(PolygonCADToolContext context, double pointX, double pointY)
308 307
            {
309 308
                PolygonCADTool ctxt = context.getOwner();
310 309

  
......
313 312
                context.clearState();
314 313
                try
315 314
                {
316
                    ctxt.addPoint(sel, pointX, pointY);
315
                    ctxt.addPoint(pointX, pointY);
317 316
                    ctxt.end();
318 317
                }
319 318
                finally
......
324 323
                return;
325 324
            }
326 325

  
327
            protected void addValue(PolygonCADToolContext context, FBitSet sel, double d)
326
            protected void addValue(PolygonCADToolContext context, double d)
328 327
            {
329 328
                PolygonCADTool ctxt = context.getOwner();
330 329

  
......
333 332
                context.clearState();
334 333
                try
335 334
                {
336
                    ctxt.addValue(sel, d);
335
                    ctxt.addValue(d);
337 336
                    ctxt.end();
338 337
                }
339 338
                finally
......
361 360
                super (name, id);
362 361
            }
363 362

  
364
            protected void addPoint(PolygonCADToolContext context, FBitSet sel, double pointX, double pointY)
363
            protected void addPoint(PolygonCADToolContext context, double pointX, double pointY)
365 364
            {
366 365
                PolygonCADTool ctxt = context.getOwner();
367 366

  
......
370 369
                context.clearState();
371 370
                try
372 371
                {
373
                    ctxt.addPoint(sel, pointX, pointY);
372
                    ctxt.addPoint(pointX, pointY);
374 373
                    ctxt.end();
375 374
                }
376 375
                finally
......
381 380
                return;
382 381
            }
383 382

  
384
            protected void addValue(PolygonCADToolContext context, FBitSet sel, double d)
383
            protected void addValue(PolygonCADToolContext context, double d)
385 384
            {
386 385
                PolygonCADTool ctxt = context.getOwner();
387 386

  
......
390 389
                context.clearState();
391 390
                try
392 391
                {
393
                    ctxt.addValue(sel, d);
392
                    ctxt.addValue(d);
394 393
                    ctxt.end();
395 394
                }
396 395
                finally

Also available in: Unified diff