Revision 8726

View differences:

trunk/extensions/extGraph_predes/src/com/iver/cit/gvsig/graph/GenerateNetworkExtension.java
91 91
public class GenerateNetworkExtension extends Extension implements
92 92
		IPreferenceExtension {
93 93
	private static final IPreference thePreferencePage = new RoutePage();
94

  
95 94
	public void initialize() {
96 95
	}
97 96

  
......
170 169
		
171 170
		FLyrVect inputLayer;
172 171
		FLyrVect pseudonodes;
172
		FLayers tocLyrs;
173 173
		
174 174
		/**
175 175
		 * Constructor
176
		 * @param tocLyrs
176 177
		 */
177 178
		GenerateRedNetworkAfterCleanTask(File redFile,
178
				NetworkFileRedWriter netBuilder) {
179
				NetworkFileRedWriter netBuilder, FLayers tocLyrs) {
179 180
			this.redFile = redFile;
180 181
			this.netBuilder = netBuilder;
182
			this.tocLyrs = tocLyrs;
181 183
			setInitialStep(0);
182 184
			setDeterminatedProcess(true);
183 185
			setStatusMessage(PluginServices.getText(this,
......
201 203
			netBuilder.setCancellableMonitorable(this);
202 204
			netBuilder.setRedFile(redFile);
203 205
			netBuilder.writeNetwork();
204
			PluginServices.getMainFrame().enableControls();
206
			tocLyrs.addLayer(inputLayer);
207
			tocLyrs.addLayer(pseudonodes);
208
			enableControls();
205 209
			
206 210
//			JOptionPane.showMessageDialog(null, PluginServices.getText(this,
207 211
//					"done"));
......
238 242
		}
239 243
	}
240 244
	
245
	public void enableControls(){
246
		PluginServices.backgroundExecution(new Runnable(){
247
			public void run() {
248
				PluginServices.getMainFrame().enableControls();
249
				
250
			}});
251
	}
241 252
	
242
	
243 253

  
244 254
	class GenerateRedNetworkTask extends AbstractMonitorableTask {
245 255
		FLyrVect layer;
......
278 288
			netBuilder.setCancellableMonitorable(this);
279 289
			netBuilder.setRedFile(redFile);
280 290
			netBuilder.writeNetwork();
281
			PluginServices.getMainFrame().enableControls();
291
			enableControls();
282 292
		}
283 293

  
284 294
		public String getNote() {
285
			return "Procesando linea..." + " " + getCurrentStep() + " " + "de"
295
			String processText = PluginServices.getText(this, "Procesando_linea...");
296
			String of = PluginServices.getText(this, "de");
297
			return processText + " " + getCurrentStep() + " " + of
286 298
					+ " " + getFinishStep();
287 299
		}
288 300

  
......
418 430
			IPipedTask cleanTask = (IPipedTask) clean.createTask();
419 431
			GenerateRedNetworkAfterCleanTask task = 
420 432
				new GenerateRedNetworkAfterCleanTask(redFile, 
421
						                         netBuilder);
433
						                         netBuilder, tocLyrs);
422 434
			
423 435
			PipeTask pipe = new PipeTask(cleanTask, (IPipedTask)task);
424 436
			

Also available in: Unified diff