Revision 10089 trunk/extensions/extWFS2/src/com/iver/cit/gvsig/gui/dialogs/WFSPropsDialog.java

View differences:

WFSPropsDialog.java
78 78
 *
79 79
 * $Id$
80 80
 * $Log$
81
 * Revision 1.27  2007-01-18 12:38:35  jorpiell
81
 * Revision 1.28  2007-02-02 12:35:29  ppiqueras
82
 * Mejora de la eficiencia y robustez del c?digo para alg?n m?todo.
83
 *
84
 * Revision 1.27  2007/01/18 12:38:35  jorpiell
82 85
 * el fullRefresh ha cambiado del mapcontext al mapcontrol
83 86
 *
84 87
 * Revision 1.26  2006/12/29 12:29:50  ppiqueras
......
371 374
				// We can't 'apply' if there is a filter query and it's incorrect
372 375
				if (wfsParamsTabbedPane.getFilterQuery() != null) {					
373 376
					 
374
					layerName = prepareFlyrWFSLayer();
375
					 
376
					MapControl mapCtrl = activeView.getMapControl();
377
					mapCtrl.getMapContext().getLayers().replaceLayer(layerName, fLayer);
378
					mapCtrl.getMapContext().invalidate();
377
					if ((layerName = prepareFlyrWFSLayer()) != null) {
378
						MapControl mapCtrl = activeView.getMapControl();
379
						mapCtrl.getMapContext().getLayers().replaceLayer(layerName, fLayer);
380
						mapCtrl.getMapContext().invalidate();
381
					}
382

  
379 383
					applied = true;
380 384
					getBtnApply().setEnabled(!applied);
381 385
					refreshLayouts();
......
397 401
					if (!applied) {
398 402
						if (getBtnApply().isEnabled()){
399 403
							 
400
							layerName = prepareFlyrWFSLayer();
401
							 
402
							View vista = (View) PluginServices.getMDIManager().getActiveWindow();
403
							MapControl mapCtrl = vista.getMapControl();
404
							mapCtrl.getMapContext().getLayers().replaceLayer(layerName, fLayer);
405
							mapCtrl.getMapContext().invalidate();
406
							refreshLayouts();	
404
							if ((layerName = prepareFlyrWFSLayer()) != null)
405
							{
406
								View vista = (View) PluginServices.getMDIManager().getActiveWindow();
407
								MapControl mapCtrl = vista.getMapControl();
408
								mapCtrl.getMapContext().getLayers().replaceLayer(layerName, fLayer);
409
								mapCtrl.getMapContext().invalidate();
410
								refreshLayouts();
411
							}
407 412
						}
408 413
					}	
409 414
					close();
......
427 432
		 	FMapWFSDriver driver = wfsParamsTabbedPane.getDriver();						
428 433
		 	try {
429 434
		 		fLayer = wfsParamsTabbedPane.getLayer();
430
		 		URL host = new URL(wfsParamsTabbedPane.getData().getHost());
431
		 		String onlineResource = wfsParamsTabbedPane.getData().getOnlineResource();
432
		 		fLayer = new FLyrWFSFactory().getFLyrWFS(fLayer,host,onlineResource,driver,true);
435

  
433 436
		 		if (fLayer != null) {
437
			 		URL host = new URL(wfsParamsTabbedPane.getData().getHost());
438
			 		String onlineResource = wfsParamsTabbedPane.getData().getOnlineResource();
439
			 		fLayer = new FLyrWFSFactory().getFLyrWFS(fLayer,host,onlineResource,driver,true);
434 440
		 			((FLyrWFS)fLayer).setLegend(legend);
435 441
					
436 442
		 			 // Update all fields and values known about the current layer loaded (and selected)
437 443
		 			((FLyrWFS)fLayer).setAllFieldsAndValuesKnown(wfsParamsTabbedPane.getAllFieldsAndValuesKnownOfCurrentLayer());
444
		 			
445
		 			return fLayer.getName();
438 446
		 		}
439 447
			} catch (MalformedURLException e1) {
440 448
				e1.printStackTrace();
......
444 452
				e1.printStackTrace();
445 453
			}
446 454
			 
447
			return fLayer.getName();
455
			return null;
448 456
		}
449 457

  
450 458
		private boolean loadLayer(FLayer flayer) {

Also available in: Unified diff