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

View differences:

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

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

  
11 10
public final class CircleCADToolContext
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(CircleCADToolContext context) {}
91 90
        protected void Exit(CircleCADToolContext context) {}
92 91

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

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

  
103
        protected void addValue(CircleCADToolContext context, FBitSet sel, double d)
102
        protected void addValue(CircleCADToolContext context, double d)
104 103
        {
105 104
            Default(context);
106 105
        }
......
196 195
                return;
197 196
            }
198 197

  
199
            protected void addOption(CircleCADToolContext context, FBitSet sel, String s)
198
            protected void addOption(CircleCADToolContext context, String s)
200 199
            {
201 200
                CircleCADTool ctxt = context.getOwner();
202 201

  
......
206 205
                try
207 206
                {
208 207
                    ctxt.setQuestion("Insertar primer punto");
209
                    ctxt.addOption(sel, s);
208
                    ctxt.addOption(s);
210 209
                }
211 210
                finally
212 211
                {
......
216 215
                return;
217 216
            }
218 217

  
219
            protected void addPoint(CircleCADToolContext context, FBitSet sel, double pointX, double pointY)
218
            protected void addPoint(CircleCADToolContext context, double pointX, double pointY)
220 219
            {
221 220
                CircleCADTool ctxt = context.getOwner();
222 221

  
......
226 225
                try
227 226
                {
228 227
                    ctxt.setQuestion("Insertar radio o segundo punto");
229
                    ctxt.addPoint(sel, pointX, pointY);
228
                    ctxt.addPoint(pointX, pointY);
230 229
                }
231 230
                finally
232 231
                {
......
253 252
                super (name, id);
254 253
            }
255 254

  
256
            protected void addPoint(CircleCADToolContext context, FBitSet sel, double pointX, double pointY)
255
            protected void addPoint(CircleCADToolContext context, double pointX, double pointY)
257 256
            {
258 257
                CircleCADTool ctxt = context.getOwner();
259 258

  
......
262 261
                context.clearState();
263 262
                try
264 263
                {
265
                    ctxt.addPoint(sel, pointX, pointY);
264
                    ctxt.addPoint(pointX, pointY);
266 265
                    ctxt.end();
267 266
                }
268 267
                finally
......
273 272
                return;
274 273
            }
275 274

  
276
            protected void addValue(CircleCADToolContext context, FBitSet sel, double d)
275
            protected void addValue(CircleCADToolContext context, double d)
277 276
            {
278 277
                CircleCADTool ctxt = context.getOwner();
279 278

  
......
282 281
                context.clearState();
283 282
                try
284 283
                {
285
                    ctxt.addValue(sel, d);
284
                    ctxt.addValue(d);
286 285
                    ctxt.end();
287 286
                }
288 287
                finally
......
310 309
                super (name, id);
311 310
            }
312 311

  
313
            protected void addPoint(CircleCADToolContext context, FBitSet sel, double pointX, double pointY)
312
            protected void addPoint(CircleCADToolContext context, double pointX, double pointY)
314 313
            {
315 314
                CircleCADTool ctxt = context.getOwner();
316 315

  
......
320 319
                try
321 320
                {
322 321
                    ctxt.setQuestion("Insertar tercer punto");
323
                    ctxt.addPoint(sel, pointX, pointY);
322
                    ctxt.addPoint(pointX, pointY);
324 323
                }
325 324
                finally
326 325
                {
......
347 346
                super (name, id);
348 347
            }
349 348

  
350
            protected void addPoint(CircleCADToolContext context, FBitSet sel, double pointX, double pointY)
349
            protected void addPoint(CircleCADToolContext context, double pointX, double pointY)
351 350
            {
352 351
                CircleCADTool ctxt = context.getOwner();
353 352

  
......
356 355
                context.clearState();
357 356
                try
358 357
                {
359
                    ctxt.addPoint(sel, pointX, pointY);
358
                    ctxt.addPoint(pointX, pointY);
360 359
                    ctxt.end();
361 360
                }
362 361
                finally
......
435 434
                super (name, id);
436 435
            }
437 436

  
438
            protected void addPoint(CircleCADToolContext context, FBitSet sel, double pointX, double pointY)
437
            protected void addPoint(CircleCADToolContext context, double pointX, double pointY)
439 438
            {
440 439
                CircleCADTool ctxt = context.getOwner();
441 440

  
......
445 444
                try
446 445
                {
447 446
                    ctxt.setQuestion("Insertar segundo punto");
448
                    ctxt.addPoint(sel, pointX, pointY);
447
                    ctxt.addPoint(pointX, pointY);
449 448
                }
450 449
                finally
451 450
                {

Also available in: Unified diff