/ - Diff - Application: gvSIG desktop - gvSIG

Revision 9339

+     *
      * $Id$
      * $Log$
      * Revision 1.16  2006-12-13 14:00:24  ppiqueras
      * Revision 1.17  2006-12-15 13:57:08  ppiqueras
      * Permite que se almacenen y/o recojan todos los campos y valores conocidos de la capa actual.
+     *
      * Además, control frentre a consultas de filtro erróneas, (esto a medias aún).
+     *
      * Revision 1.16  2006/12/13 14:00:24  ppiqueras
      * Añadido un comentario a una línea de instrucciones
+     *
      * Revision 1.15  2006/12/04 08:59:47  ppiqueras
-...
      */
     /**
      * @author Jorge Piera Llodr? (piera_jor@gva.es)
      * @author Pablo Piqueras Bartolom? (p_queras@hotmail.com)
      */
     public class WFSPropsDialog extends JPanel implements IWindow{
     	private WFSParamsPanel wfsParamsTabbedPane = null;
-...
     						String onlineResource = wfsParamsTabbedPane.getData().getOnlineResource();
     						fLayer = new FLyrWFSFactory().getFLyrWFS(fLayer,host,onlineResource,driver,false);
     						((FLyrWFS)fLayer).setLegend(legend);
     						// Update all fields and values known about the current layer loaded (and selected)
     						((FLyrWFS)fLayer).setAllFieldsAndValuesKnown(wfsParamsTabbedPane.getAllFieldsAndValuesKnownOfCurrentLayer());
     				} catch (MalformedURLException e1) {
     					// TODO Auto-generated catch block
     					e1.printStackTrace();
-...
     				} catch (DriverException e1) {
     					// TODO Auto-generated catch block
     					e1.printStackTrace();
+    				}
+    				}
     				if (e.getActionCommand() == "APPLY"){
     					 if (loadLayer(fLayer)){
     						 View vista = (View) PluginServices.getMDIManager().getActiveWindow();
     						 MapControl mapCtrl = vista.getMapControl();
     					// We can't 'apply' if there is a filter query and it's incorrect
     					if (wfsParamsTabbedPane.getFilterQuery() != null) {
     						 if (loadLayer(fLayer)){
     							 View vista = (View) PluginServices.getMDIManager().getActiveWindow();
     							 MapControl mapCtrl = vista.getMapControl();
     							 mapCtrl.getMapContext().getLayers().replaceLayer(layerName, fLayer);
     							 mapCtrl.getMapContext().invalidate();
     							 applied = true;
     							 getBtnApply().setEnabled(!applied);
     							 refreshLayouts();
     							 // If we load another layer, or the same but we've selected others attributes -> notify it to he WFSFilter panel
     							 if (getWFSFilterPanelIsAsTabForWFSLayersLoad() || (wfsParamsTabbedPane.getAttributesSelectedOfSameLayerHasChanged())) {
     								 setWFSFilterPanelIsAsTabForWFSLayersLoad(false);
     								 wfsParamsTabbedPane.resetAttributesSelectedOfSameLayerHasChanged(); // reset that attribute
+    						 	 }
     							 // Update values associated to the current selected field
     							 wfsParamsTabbedPane.updateWFSFilterFieldValues();
+    						 }
+    					}
+    				 }
     						 mapCtrl.getMapContext().getLayers().replaceLayer(layerName, fLayer);
     						 mapCtrl.getMapContext().invalidate();
     						 applied = true;
     						 getBtnApply().setEnabled(!applied);
     						 refreshLayouts();
     						 // If we load another layer, or the same but we've selected others attributes -> notify it to he WFSFilter panel
     						 if (getWFSFilterPanelIsAsTabForWFSLayersLoad() || (wfsParamsTabbedPane.getAttributesSelectedOfSameLayerHasChanged())) {
     							 setWFSFilterPanelIsAsTabForWFSLayersLoad(false);
     							 wfsParamsTabbedPane.resetAttributesSelectedOfSameLayerHasChanged(); // reset that attribute
+    					 	 }
     						 // Update values associated to the current selected field
     						 wfsParamsTabbedPane.updateWFSFilterFieldValues();
+    					 }
+    				 }
     				 if (e.getActionCommand() == "OK") {
     					 if (!applied) {
     						 if (getBtnApply().isEnabled()){
     							 if (loadLayer(fLayer)){
     								 View vista = (View) PluginServices.getMDIManager().getActiveWindow();
     								 MapControl mapCtrl = vista.getMapControl();
     								 mapCtrl.getMapContext().getLayers().replaceLayer(layerName, fLayer);
     								 mapCtrl.getMapContext().invalidate();
     								 refreshLayouts();
     					// We can't 'apply' if there is a filter query and it's incorrect
     					if (wfsParamsTabbedPane.getFilterQuery() != null) {
     						 if (!applied) {
     							 if (getBtnApply().isEnabled()){
     								 if (loadLayer(fLayer)){
     									 View vista = (View) PluginServices.getMDIManager().getActiveWindow();
     									 MapControl mapCtrl = vista.getMapControl();
     									 mapCtrl.getMapContext().getLayers().replaceLayer(layerName, fLayer);
     									 mapCtrl.getMapContext().invalidate();
     									 refreshLayouts();
+    								 }
+    							 }
+    						 }
+    					 }
     					 close();
+    						 }
     						 close();
     						 // Update all fields and values known about the current layer loaded (and selected)
     						 ((FLyrWFS)fLayer).setAllFieldsAndValuesKnown(wfsParamsTabbedPane.getAllFieldsAndValuesKnownOfCurrentLayer());
+    					}
+    				 }
+    			 }
+    		 }
-...
     							 PluginServices.getText(this,"maxFeatures_aviso"));
+    				 }
     			 } catch (Exception e1) {
     				 // TODO Auto-generated catch block
     				 e1.printStackTrace();
     				 JOptionPane.showMessageDialog((Component)PluginServices.getMainFrame(),
     						 PluginServices.getText(this,"cantLoad"));
-...
+    	}
     	/**
     	 * Sets all fielsd and values known of current layer to WFSFilterPanel
     	 */
     	public void updateAllFieldsAndValuesKnownOfCurrentLayerToWFSFilterPanel() {
     		this.wfsParamsTabbedPane.setAllFieldsAndValuesKnownOfCurrentLayer(((FLyrWFS)this.getFLayer()).getAllFieldsAndValuesKnown());
+    	}
     	/**
     	 * Refresh the layouts
+    	 *
     	 */

Also available in: Unified diff