/ - Diff - Application: gvSIG desktop - gvSIG

Revision 9151

+     *
      * $Id$
      * $Log$
      * Revision 1.14  2006-11-28 08:05:31  jorpiell
      * Revision 1.15  2006-12-04 08:59:47  ppiqueras
      * Algunos bugs corregidos. A cambio hay 2 bugs relacionados que todavía no han sido corregidos (ver PHPCollab) (los tiene asignados Jorge).
+     *
      * Revision 1.14  2006/11/28 08:05:31  jorpiell
      * Se refrescan los mapas despu?s de aplicar un filtro
+     *
      * Revision 1.13  2006/11/16 16:57:49  jorpiell
-...
     						 MapControl mapCtrl = vista.getMapControl();
     						 mapCtrl.getMapContext().getLayers().replaceLayer(layerName, fLayer);
     						 wfsParamsTabbedPane.updateWFSFilterFieldValues();
     						 mapCtrl.getMapContext().invalidate();
     						 applied = true;
     						 getBtnApply().setEnabled(!applied);
     						 refreshLayouts();
     						 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
+    					 	}
     						 wfsParamsTabbedPane.updateWFSFilterFieldValues();
+    					 }
+    				 }
     				 if (e.getActionCommand() == "OK") {
-...
     	 */
     	public void setWFSFilterPanelIsAsTabForWFSLayersLoad(boolean b) {
     		this.wfsParamsTabbedPane.setWFSFilterPanelIsAsTabForWFSLayersLoad(b);
+    	}
+    	}
     	/**
     	 * @see WFSFilterPanel#getWFSFilterPanelIsAsTabForWFSLayersLoad()
     	 */
     	public boolean getWFSFilterPanelIsAsTabForWFSLayersLoad() {
     		return this.wfsParamsTabbedPane.getWFSFilterPanelIsAsTabForWFSLayersLoad();
+    	}
     	/**
     	 * Refresh the layouts
+    	 *
     	 */

     import java.awt.event.FocusEvent;
     import java.awt.event.FocusListener;
     import java.io.ObjectInputStream.GetField;
     import java.util.prefs.Preferences;
     import javax.swing.JTabbedPane;
-...
+     *
      * $Id$
      * $Log$
      * Revision 1.21  2006-11-28 08:05:13  jorpiell
      * Revision 1.22  2006-12-04 08:59:47  ppiqueras
      * Algunos bugs corregidos. A cambio hay 2 bugs relacionados que todavía no han sido corregidos (ver PHPCollab) (los tiene asignados Jorge).
+     *
      * Revision 1.21  2006/11/28 08:05:13  jorpiell
      * Se escribe la query en la pesta?a del filtro
+     *
      * Revision 1.20  2006/11/14 13:45:49  ppiqueras
-...
     	public	static Preferences fPrefs = Preferences.userRoot().node( "gvsig.wcs-wizard" );
     	private WFSInfoPanel infoPanel;
     	private int indFields;
     	private int indFormat;
     	private int indFilter;
     	private int indArea;
-...
     	 * @see WFSFilterPanel#setWFSFilterPanelIsAsTabForWFSLayersLoad(boolean)
     	 */
     	public void setWFSFilterPanelIsAsTabForWFSLayersLoad(boolean b) {
     		this.filterPanel.setWFSFilterPanelIsAsTabForWFSLayersLoad(b);
+    	}
     		this.getFilterPanel().setWFSFilterPanelIsAsTabForWFSLayersLoad(b);
+    	}
     	/**
     	 * @see WFSFilterPanel#getWFSFilterPanelIsAsTabForWFSLayersLoad()
     	 */
     	public boolean getWFSFilterPanelIsAsTabForWFSLayersLoad() {
     		return this.getFilterPanel().getWFSFilterPanelIsAsTabForWFSLayersLoad();
+    	}
     	/**
     	 * @see WFSSelectAttributesPanel#getAttributesSelectedOfSameLayerHasChanged()
     	 */
     	public boolean getAttributesSelectedOfSameLayerHasChanged() {
     		return this.getAttributesPanel().getAttributesSelectedOfSameLayerHasChanged();
+    	}
     	/**
     	 * @see WFSSelectAttributesPanel#resetAttributesSelectedOfSameLayerHasChanged()
     	 */
     	public void resetAttributesSelectedOfSameLayerHasChanged() {
     		this.getAttributesPanel().resetAttributesSelectedOfSameLayerHasChanged();
+    	}
+    }

     import com.iver.cit.gvsig.fmap.layers.SelectableDataSource;
     import com.iver.cit.gvsig.fmap.layers.WFSLayerNode;
     import com.iver.cit.gvsig.fmap.layers.layerOperations.AlphanumericData;
     import com.iver.cit.gvsig.gui.filter.DefaultExpressionDataSource;
     import com.iver.cit.gvsig.gui.filter.ExpressionDataSource;
     import com.iver.cit.gvsig.gui.filter.ExpressionListener;
     import com.iver.cit.gvsig.gui.filter.FilterException;
-...
     	 * Adds some more listener to the components of the panel
     	 */
     	private void addNewListeners() {
     		// Enable "Apply" button when user changes the filter query
     		txtExpression.getDocument().addDocumentListener(new DocumentListener() {
     			/*
     			 *  (non-Javadoc)
-...
     			 * @see javax.swing.event.TreeSelectionListener#valueChanged(javax.swing.event.TreeSelectionEvent)
     			 */
     			public void valueChanged(TreeSelectionEvent e) {
     				if (!panelAsATabForWFSLayersLoad) {
     				if (!panelAsATabForWFSLayersLoad) {
     					DataReturnedOfDataLoadingFromActiveView data = DataLoadingFromActiveView.getDefaultExpressionDataSource();
     					if ((data != null) && (data.getData() != null)) {
     						setModel(data.getData());
     //						setModel(data.getData());
     						currentPath = e.getPath();
     						fillValuesByPath(currentPath);
+    					}
-...
     	 * If there is a field selected, show its new values
     	 */
     	public void updateFieldValues() {
     		// If has selected and loaded another layer -> reset previous values
     //		if (this.panelAsATabForWFSLayersLoad) {
     //			this.getValuesJList().removeAll();
     //		}
     		if (currentPath != null) {
     			DataReturnedOfDataLoadingFromActiveView data = DataLoadingFromActiveView.getDefaultExpressionDataSource();
     			if ((data != null) && (data.getData() != null)) {
     				setModel(data.getData());
     				fillValuesByPath(currentPath);
     				// Update all tables that their data is about the changed view
     				IWindow[] activeNoModalWindows = PluginServices.getMDIManager().getAllWindows();
     				// Updates all tables that their data is about the changed view
     				this.updateTablesThatHasNewData();
+    			}
+    		}
+    	}
     	/**
     	 * Updates all tables that their data is about the changed view
     	 */
     	private void updateTablesThatHasNewData() {
     		IWindow[] activeNoModalWindows = PluginServices.getMDIManager().getAllWindows();
     		for (int i = 0; i < activeNoModalWindows.length; i++) {
     			IWindow window = activeNoModalWindows[i];
     			if (window instanceof Table) {
     				Table table = (Table) window;
     				for (int i = 0; i < activeNoModalWindows.length; i++) {
     					IWindow window = activeNoModalWindows[i];
     					if (window instanceof Table) {
     						Table table = (Table) window;
     						int pos1 = featureName.indexOf(':');
     						if ((pos1 >= 0) && (pos1 < featureName.length()))
     							featureName = featureName.substring(pos1 +1, featureName.length());
     //							String featureOfTable = ((XMLElement)currentPath.getParentPath().getLastPathComponent()).getName();
     							String featureOfTable = table.getModel().getName();
     							int pos2 = featureOfTable.indexOf(':');
     							if ((pos2 >= 0) && (pos2 < featureName.length()))
     								featureOfTable = featureOfTable.substring(pos2 +1, featureOfTable.length());
     						if (featureName.trim().compareTo(featureOfTable.trim()) == 0) {
     							setNewDataToTable();
     							// Refresh the table with the new data
     							table.refresh();
+    						}
+    					}
     				int pos1 = featureName.indexOf(':');
     				if ((pos1 >= 0) && (pos1 < featureName.length()))
     					featureName = featureName.substring(pos1 +1, featureName.length());
     //					String featureOfTable = ((XMLElement)currentPath.getParentPath().getLastPathComponent()).getName();
     					String featureOfTable = table.getModel().getName();
     					int pos2 = featureOfTable.indexOf(':');
     					if ((pos2 >= 0) && (pos2 < featureName.length()))
     						featureOfTable = featureOfTable.substring(pos2 +1, featureOfTable.length());
     				if (featureName.trim().compareTo(featureOfTable.trim()) == 0) {
     					setNewDataToTable();
     					// Refresh the table with the new data
     					table.refresh();
+    				}
+    			}
+    		}
+    	}
+    	}
     	/**
     	 * This method is a modification of the "execute" method from the "ShowTable" class
-...
     			super.getValuesJList().setBackground(new Color(220, 220, 220));
+    		}
     		else {
     			// Unselect the selected path in the tree (if there was any selected)
     			if (this.currentPath != null) {
     				this.currentPath = null;
     				this.getFieldsJTree().removeSelectionPath(this.getFieldsJTree().getSelectionPath());
+    			}
     			// Resets data loaded
     			super.getValuesJList().setEnabled(true);
     			super.getValuesJList().setBackground(Color.WHITE);
     			this.getFieldsJTree().removeAll();
     			this.getValuesJList().removeAll();
     			// Updates data associated to view with the new layer data
     			this.setNewDataToTable();
     			// If theres is any table associated to the current view -> update that table/s
     //			this.updateTablesThatHasNewData();
     			// Reads that new data
     			DataReturnedOfDataLoadingFromActiveView data = DataLoadingFromActiveView.getDefaultExpressionDataSource();
     			if ((data != null) && (data.getData() != null)) {
     				setModel(data.getData());
     //				currentPath = e.getPath();
     //				fillValuesByPath(currentPath);
+    			}
+    		}
+    	}
     	/**
     	 * Rellena la lista con los valores del campo seleccionado
     	 * Gets the value of the inner attribute: 'panelAsATabForWFSLayersLoad'
+    	 *
     	 * @return A boolean value
     	 */
     	public boolean getWFSFilterPanelIsAsTabForWFSLayersLoad() {
     		return this.panelAsATabForWFSLayersLoad;
+    	}
     	/**
     	 * FIlls list with the values of selected field
+    	 *
     	 * @param treePath A path in the tree
     	 */
     	private void fillValuesByPath(TreePath treePath) {
     		// Duplicates are removed
     		TreeSet conjunto = new TreeSet(new Comparator() {
-...
             } catch (DriverException e1) {
                 NotificationManager.addError(e1.getMessage(), e1);
+            }
             try {
             	int numberOfFields = model.getFieldCount();
-...
     				expresion = expresion.substring(0, startIndex - 5) +
     					expresion.substring(startIndex).replaceFirst(date + "\\)",
     						new Long((filterButtonsJPanel.getDateFormat().parse(date)).getTime()).toString());
+    				;
     			} else {
     				startIndex += date.length();
+    			}

     package com.iver.cit.gvsig.gui.panels;
     import java.beans.PropertyChangeEvent;
     import java.beans.PropertyChangeListener;
     import java.io.File;
     import java.util.Vector;
-...
+     *
      * $Id$
      * $Log$
      * Revision 1.15  2006-11-01 17:29:08  jorpiell
      * Revision 1.16  2006-12-04 08:59:47  ppiqueras
      * Algunos bugs corregidos. A cambio hay 2 bugs relacionados que todavía no han sido corregidos (ver PHPCollab) (los tiene asignados Jorge).
+     *
      * Revision 1.15  2006/11/01 17:29:08  jorpiell
      * Se ha elimiado el nodo virtual de la raiz. Adem?s ya se cargan los valores de un campo complejo en la pesta?a del filtro
+     *
      * Revision 1.14  2006/10/31 09:39:18  jorpiell
-...
     	private AttributesTreeTableModel model = null;
     	private WFSParamsPanel parent = null;
     	private JPanel treeTablePanel = null;
     	private boolean attributesSelectedOfSameLayerHasChanged;
     	public WFSSelectAttributesPanel(WFSParamsPanel parent){
     		super();
-...
     		this.setLayout(null);
     		this.setBounds(10, 5, 481, 427);
     		this.add(getTreeTablePanel(), null);
     		attributesSelectedOfSameLayerHasChanged = false;
+    	}
     	/**
-...
     			attributesTreeTable = new AttributesTreeTable(model,this);
     			attributesTreeTable.setLocation(new java.awt.Point(7,4));
     			attributesTreeTable.setSize(new java.awt.Dimension(482,302));
     			// If user has changed the attributes selection in the same layer
     			attributesTreeTable.addPropertyChangeListener(new PropertyChangeListener() {
     				/*
     				 *  (non-Javadoc)
     				 * @see java.beans.PropertyChangeListener#propertyChange(java.beans.PropertyChangeEvent)
     				 */
     				public void propertyChange(PropertyChangeEvent evt) {
     					if (evt.getPropertyName().compareTo("tableCellEditor") == 0) // If the selection of the attributes of the layer has changed
     						attributesSelectedOfSameLayerHasChanged = true;
     					else if (evt.getPropertyName().compareTo("selectionModel") == 0) // If the layer has changed
     						attributesSelectedOfSameLayerHasChanged = false;
+    				}
     			});
+    		}
     		return attributesTreeTable;
+    	}
-...
+    	}
     	/**
     	 * Returns true if user has changed the selection of some attribute of the same layer; else returns false
+    	 *
     	 * @return A boolean value
     	 */
     	public boolean getAttributesSelectedOfSameLayerHasChanged() {
     		return this.attributesSelectedOfSameLayerHasChanged;
+    	}
     	/**
     	 * @param updated The updated to set.
     	 */
     	public void setUpdated(boolean updated) {
     		parent.isApplicable(updated);
+    	}
     	/**
     	 * Resets the value of the attribute 'attributesSelectedOfSameLayerHasChanged'
+    	 *
     	 * @return A boolean value
     	 */
     	public void resetAttributesSelectedOfSameLayerHasChanged() {
     		this.attributesSelectedOfSameLayerHasChanged = false;
+    	}
     }  //  @jve:decl-index=0:visual-constraint="10,22"

     import com.iver.andami.PluginServices;
     import com.iver.cit.gvsig.fmap.layers.WFSLayerNode;
     import com.iver.cit.gvsig.gui.panels.LayerTable.LayerTableModel;
     import com.iver.cit.gvsig.gui.wizards.WFSWizardData;
     /* gvSIG. Sistema de Informaci?n Geogr?fica de la Generalitat Valenciana
-...
+     *
      * $Id$
      * $Log$
      * Revision 1.8  2006-10-27 06:44:56  jorpiell
      * Revision 1.9  2006-12-04 08:59:47  ppiqueras
      * Algunos bugs corregidos. A cambio hay 2 bugs relacionados que todavía no han sido corregidos (ver PHPCollab) (los tiene asignados Jorge).
+     *
      * Revision 1.8  2006/10/27 06:44:56  jorpiell
      * Se han cambiado algunas etiquetas de texto que sal?an recortadas
+     *
      * Revision 1.7  2006/07/21 11:50:31  jaume
-...
     	private WFSWizardData data = null;
     	private WFSParamsPanel parent = null;
     	private JPanel layerNamePanel = null;
     	/**
     	 * This method initializes
-...
     			lstFeatures.getSelectionModel().addListSelectionListener(new ListSelectionListener() {
     				public void valueChanged(javax.swing.event.ListSelectionEvent e) {
     					refreshData();
     					// Indicate that now we are loading a new layer
     					parent.setWFSFilterPanelIsAsTabForWFSLayersLoad(true);
+    				}
     			});
+    		}
     		return lstFeatures;
+    	}
     	/**
     	 * This method initializes jTextField
+    	 *
-...
     		}catch(NullPointerException e){
     			getTxtName().setText(PluginServices.getText(this,"default_name"));
+    		}
     		parent.refreshData(lyr);
+    	}

Also available in: Unified diff