Revision 1393

View differences:

branches/pilotoDWG/libraries/libFMap/src/com/iver/cit/gvsig/fmap/edition/cad/CadTool.java
30 30
    public final static int TRANSITION_FAILED = 0;
31 31
    public final static int TRANSITION_SUCCESS = 1;
32 32
    public final static int AUTOMATON_FINISHED = 2;
33
	/**
34
	 * Inicializa el estado del aut?mata de la herramienta
35
	 */
36
	void initializeStatus();
33 37
}
branches/pilotoDWG/libraries/libFMap/src/com/iver/cit/gvsig/fmap/edition/cad/CADToolAdapter.java
235 235
		int ret = cadTool.transition(text, source, sel, values);
236 236

  
237 237
		if (ret == Automaton.AUTOMATON_FINISHED){
238
			console.cancelQuestion();			
238
			console.cancelQuestion();		
239
			cadTool.initializeStatus();
239 240
		}else{
240 241
			console.askQuestion(cadTool.getQuestion(),
241 242
				new ResponseListener() {
branches/pilotoDWG/libraries/libFMap/src/com/iver/cit/gvsig/fmap/edition/cad/cadTools/CircleCadTool.java
41 41
package com.iver.cit.gvsig.fmap.edition.cad.cadTools;
42 42

  
43 43
import com.iver.cit.gvsig.fmap.core.FPoint2D;
44
import com.iver.cit.gvsig.fmap.core.ShapeFactory;
45
import com.iver.cit.gvsig.fmap.drivers.DriverIOException;
44 46
import com.iver.cit.gvsig.fmap.edition.EditableFeatureSource;
45 47
import com.iver.cit.gvsig.fmap.edition.cad.CadTool;
46 48
import com.iver.cit.gvsig.fmap.edition.cad.Status;
47 49
import com.iver.cit.gvsig.fmap.layers.FBitSet;
48 50

  
49 51
import java.awt.Graphics;
52
import java.awt.geom.Point2D;
53
import java.io.IOException;
50 54

  
51 55

  
52 56
/**
......
59 63
			new Status("Precise punto central"), new Status("Precise radio")
60 64
		};
61 65
	private Circulo circleStatus = new Circulo();
62
	private FPoint2D center;
66
	private Point2D center;
63 67

  
64 68
	/**
65 69
	 * @see com.iver.cit.gvsig.fmap.edition.cad.CadTool#transition(java.lang.String,
......
73 77
		int status = circleStatus.getStatus();
74 78

  
75 79
		if (status == 0) {
76
			center = new FPoint2D(values[0], values[1]);
77 80
		} else if (status == 1) {
81
			center = new Point2D.Double(values[0], values[1]);
82
		} else if (status == 2) {
83
			try {
84
				editingSource.addGeometry(ShapeFactory.createCircle(center, values[0]));
85
			} catch (DriverIOException e) {
86
				e.printStackTrace();
87
			} catch (IOException e) {
88
				e.printStackTrace();
89
			}
90
			ret = circleStatus.transition("cancel");
91
		} else if (status == 3) {
92
			try {
93
				editingSource.addGeometry(ShapeFactory.createCircle(center, new Point2D.Double(values[0], values[1])));
94
			} catch (DriverIOException e) {
95
				e.printStackTrace();
96
			} catch (IOException e) {
97
				e.printStackTrace();
98
			}
99
			ret = circleStatus.transition("cancel");
78 100
		}
79 101

  
80 102
		return ret;
......
95 117
	public String getQuestion() {
96 118
		return STATUS[circleStatus.getStatus()].getQuestion();
97 119
	}
120

  
121
	/**
122
	 * @see com.iver.cit.gvsig.fmap.edition.cad.CadTool#initializeStatus()
123
	 */
124
	public void initializeStatus() {
125
		circleStatus.initialize();
126
	}
98 127
}
branches/pilotoDWG/libraries/libFMap/src/com/iver/cit/gvsig/fmap/edition/cad/cadTools/RectangleCadTool.java
134 134
		}
135 135
		return STATUS[rectangleStatus.getStatus()].getQuestion();
136 136
	}
137

  
138
	/**
139
	 * @see com.iver.cit.gvsig.fmap.edition.cad.CadTool#initializeStatus()
140
	 */
141
	public void initializeStatus() {
142
		rectangleStatus.initialize();
143
	}
144
	
137 145
}
138 146

  
139 147

  
branches/pilotoDWG/libraries/libFMap/src/com/iver/cit/gvsig/fmap/edition/cad/cadTools/ArcCadTool.java
86 86
	public String getQuestion() {
87 87
		return STATUS[arcStatus.getStatus()].getQuestion();
88 88
	}
89

  
90
	/**
91
	 * @see com.iver.cit.gvsig.fmap.edition.cad.CadTool#initializeStatus()
92
	 */
93
	public void initializeStatus() {
94
		arcStatus.initialize();
95
	}
89 96
}
branches/pilotoDWG/libraries/libFMap/src/com/iver/cit/gvsig/fmap/edition/cad/cadTools/CopyCadTool.java
97 97
	public String getQuestion() {
98 98
		return STATUS[copyStatus.getStatus()].getQuestion();
99 99
	}
100

  
101
	/**
102
	 * @see com.iver.cit.gvsig.fmap.edition.cad.CadTool#initializeStatus()
103
	 */
104
	public void initializeStatus() {
105
		copyStatus.initialize();
106
	}
107
	
100 108
}
branches/pilotoDWG/libraries/libFMap/src/com/iver/cit/gvsig/fmap/edition/cad/cadTools/SelectionCadTool.java
85 85
	public String getQuestion() {
86 86
		return STATUS[selectionStatus.getStatus()].getQuestion();
87 87
	}
88

  
89
	/**
90
	 * @see com.iver.cit.gvsig.fmap.edition.cad.CadTool#initializeStatus()
91
	 */
92
	public void initializeStatus() {
93
		selectionStatus.initialize();
94
	}
88 95
}
89 96

  
90 97

  
branches/pilotoDWG/libraries/libFMap/src/com/iver/cit/gvsig/fmap/edition/cad/cadTools/LineCadTool.java
125 125
	 * @see com.iver.cit.gvsig.fmap.edition.cad.CadTool#getQuestion()
126 126
	 */
127 127
	public String getQuestion() {
128
		if (lineStatus.getStatus()==-1){
129
			lineStatus=new Linea();
130
			return "Cancel";
131
		}
132
		
133 128
		return STATUS[lineStatus.getStatus()].getQuestion();
134 129
	}
130
	
131
	/**
132
	 * @see com.iver.cit.gvsig.fmap.edition.cad.CadTool#initializeStatus()
133
	 */
134
	public void initializeStatus() {
135
		lineStatus.initialize();
136
	}
135 137
}
branches/pilotoDWG/libraries/libFMap/src/com/iver/cit/gvsig/fmap/edition/cad/cadTools/PolygonCadTool.java
86 86
	public String getQuestion() {
87 87
		return STATUS[polygonStatus.getStatus()].getQuestion();
88 88
	}
89

  
90
	/**
91
	 * @see com.iver.cit.gvsig.fmap.edition.cad.CadTool#initializeStatus()
92
	 */
93
	public void initializeStatus() {
94
		polygonStatus.initialize();
95
	}
96
	
89 97
}
branches/pilotoDWG/libraries/libFMap/src/com/iver/cit/gvsig/fmap/edition/cad/cadTools/PointCadTool.java
107 107
	public String getQuestion() {
108 108
		return STATUS[pointStatus.getStatus()].getQuestion();
109 109
	}
110
	
111
	/**
112
	 * @see com.iver.cit.gvsig.fmap.edition.cad.CadTool#initializeStatus()
113
	 */
114
	public void initializeStatus() {
115
		pointStatus.initialize();
116
	}
117
	
118
	
110 119
}
branches/pilotoDWG/libraries/libFMap/src/com/iver/cit/gvsig/fmap/edition/cad/cadTools/Circulo.java
22 22
					return com.iver.fsac.Automaton.TRANSITION_SUCCESS;
23 23
				}
24 24
				
25
				if ("cancel".equalsIgnoreCase(label)){
26
					status = -1;
27
					
28
					return com.iver.fsac.Automaton.AUTOMATON_FINISHED;
29
				}
30
				
25 31
				break;
26 32
		
27 33
			case 1:
28 34
				
35
				if ("numero".equalsIgnoreCase(label)){
36
					status = 2;
37
					
38
					return com.iver.fsac.Automaton.TRANSITION_SUCCESS;
39
				}
40
				
41
				if ("punto".equalsIgnoreCase(label)){
42
					status = 3;
43
					
44
					return com.iver.fsac.Automaton.TRANSITION_SUCCESS;
45
				}
46
				
29 47
				if ("cancel".equalsIgnoreCase(label)){
30 48
					status = -1;
31 49
					
32 50
					return com.iver.fsac.Automaton.AUTOMATON_FINISHED;
33 51
				}
34 52
				
35
				if ("punto".equalsIgnoreCase(label)){
53
				break;
54
		
55
			case 2:
56
				
57
				if ("cancel".equalsIgnoreCase(label)){
36 58
					status = -1;
37 59
					
38 60
					return com.iver.fsac.Automaton.AUTOMATON_FINISHED;
39 61
				}
40 62
				
41
				if ("numero".equalsIgnoreCase(label)){
63
				break;
64
		
65
			case 3:
66
				
67
				if ("cancel".equalsIgnoreCase(label)){
42 68
					status = -1;
43 69
					
44 70
					return com.iver.fsac.Automaton.AUTOMATON_FINISHED;
branches/pilotoDWG/libraries/libFMap/src/com/iver/cit/gvsig/fmap/edition/cad/cadTools/SplineCadTool.java
85 85
	public String getQuestion() {
86 86
		return STATUS[splineStatus.getStatus()].getQuestion();
87 87
	}
88

  
89
	/**
90
	 * @see com.iver.cit.gvsig.fmap.edition.cad.CadTool#initializeStatus()
91
	 */
92
	public void initializeStatus() {
93
		splineStatus.initialize();
94
	}
95
	
88 96
}
89 97

  
90 98

  
branches/pilotoDWG/libraries/libFMap/src/com/iver/cit/gvsig/fmap/edition/cad/cadTools/PolyLineCadTool.java
159 159
	public String getQuestion() {
160 160
		return STATUS[polylineStatus.getStatus()].getQuestion();
161 161
	}
162

  
163
	/**
164
	 * @see com.iver.cit.gvsig.fmap.edition.cad.CadTool#initializeStatus()
165
	 */
166
	public void initializeStatus() {
167
		polylineStatus.initialize();
168
	}
169
	
162 170
}
163 171

  
branches/pilotoDWG/libraries/libFMap/src/com/iver/cit/gvsig/fmap/edition/cad/cadTools/EllipseCadTool.java
86 86
	public String getQuestion() {
87 87
		return STATUS[ellipseStatus.getStatus()].getQuestion();
88 88
	}
89

  
90
	/**
91
	 * @see com.iver.cit.gvsig.fmap.edition.cad.CadTool#initializeStatus()
92
	 */
93
	public void initializeStatus() {
94
		ellipseStatus.initialize();
95
	}
96
	
89 97
}

Also available in: Unified diff