Revision 9233

View differences:

trunk/libraries/libRemoteServices/src/org/gvsig/remoteClient/wfs/WFSStatus.java
49 49
 *
50 50
 * $Id$
51 51
 * $Log$
52
 * Revision 1.4  2006-10-10 12:52:28  jorpiell
52
 * Revision 1.5  2006-12-11 11:02:24  ppiqueras
53
 * Corregido bug -> que se mantenga la frase de filtrado
54
 *
55
 * Revision 1.4  2006/10/10 12:52:28  jorpiell
53 56
 * Soporte para features complejas.
54 57
 *
55 58
 * Revision 1.3  2006/06/14 07:54:18  jorpiell
......
76 79
	private int timeout = 10000;
77 80
	private int buffer = 100;	
78 81
	private String filterQuery = null;
82
	private String filterVisualText = null;
79 83
	
80 84
	public WFSStatus(String featureName){
81 85
		this.featureName = featureName;
......
222 226
	public void setFilterQuery(String filterQuery) {
223 227
		this.filterQuery = filterQuery;
224 228
	}
229
	
230
	/**
231
	 * Returns the text of filtering that user sees in interface
232
	 * 
233
	 * @return An String (in WFS-Visual-Filter-Query format)
234
	 */
235
	public String getFilterVisualText() {
236
		return filterVisualText;
237
	}
238

  
239
	/**
240
	 * Sets the text of filtering that user will see in interface.
241
	 * 
242
	 * @param filterVisualText An String (that must have a WFS-Visual-Filter-Query format)
243
	 */
244
	public void setFilterVisualText(String _filterVisualText) {
245
		this.filterVisualText = _filterVisualText;
246
	}
225 247
}
trunk/extensions/extWFS2/src/com/iver/cit/gvsig/fmap/layers/FLyrWFS.java
78 78
 *
79 79
 * $Id$
80 80
 * $Log$
81
 * Revision 1.22  2006-11-28 08:04:51  jorpiell
81
 * Revision 1.23  2006-12-11 11:02:24  ppiqueras
82
 * Corregido bug -> que se mantenga la frase de filtrado
83
 *
84
 * Revision 1.22  2006/11/28 08:04:51  jorpiell
82 85
 * Se guarda la query para que pueda ser recuperada desde la ventana de propiedades
83 86
 *
84 87
 * Revision 1.21  2006/11/16 17:17:48  jorpiell
......
166 169
    private String password = null;
167 170
    private String AttributesQuery = null;
168 171
    private String CoordinatesQuery = null;
172
    private String visualFilterQuery = null;
169 173
    private XMLElement[] fields = null;
170 174
    private int numfeatures = 100;
171 175
    private int timeout = 10000;
......
281 285
    	FilterEncoding fe = SQLExpressionFormat.createFilter();				
282 286
		fe.setQuery(getAttributesQuery());
283 287
		status.setFilterQuery(fe.toString());
288
		status.setFilterVisualText(getVisualFilterQuery());
284 289
    	return status;
285 290
    }
286 291

  
......
346 351
		this.userName = userName;
347 352
	}
348 353
	/**
354
	 * @return The visual filtering text from "Where"
355
	 */
356
	public String getVisualFilterQuery() {
357
		return visualFilterQuery;
358
	}
359
	/**
360
	 * @param visualFilterQuery The visual filtering text from "Where"
361
	 */
362
	public void setVisualFilterQueyr(String visualFilterQuery) {
363
		this.visualFilterQuery = visualFilterQuery;
364
	}
365
	/**
349 366
	 * @return Returns the fields.
350 367
	 */
351 368
	public XMLElement[] getFields() {
......
475 492
		status.setUserName(getUserName());
476 493
		status.setPassword(getPassword());
477 494
		status.setFilterQuery(getAttributesQuery());
495
		status.setFilterVisualText(getVisualFilterQuery());
478 496
		info.put("status",status);			
479 497
		return info;
480 498

  
trunk/extensions/extWFS2/src/com/iver/cit/gvsig/gui/panels/WFSParamsPanel.java
62 62
 *
63 63
 * $Id$
64 64
 * $Log$
65
 * Revision 1.22  2006-12-04 08:59:47  ppiqueras
65
 * Revision 1.23  2006-12-11 11:02:24  ppiqueras
66
 * Corregido bug -> que se mantenga la frase de filtrado
67
 *
68
 * Revision 1.22  2006/12/04 08:59:47  ppiqueras
66 69
 * Algunos bugs corregidos. A cambio hay 2 bugs relacionados que todavĂ­a no han sido corregidos (ver PHPCollab) (los tiene asignados Jorge).
67 70
 *
68 71
 * Revision 1.21  2006/11/28 08:05:13  jorpiell
......
525 528
		layer.setTimeout(getOptionsPanel().getTimeout());
526 529
		layer.setSrs(getOptionsPanel().getSRS());
527 530
		layer.setAttributesQuery(getFilterPanel().getQuery());
531
		layer.setVisualFilterQueyr(getFilterPanel().getFilterExpressionFromInterface());
528 532
		layer.setWfsDriver(data.getDriver());
529 533
		return layer;
530 534
	}
......
540 544
	public void setSelectedFeature(WFSLayerNode layerNode){
541 545
		getFeaturesPanel().setSelectedFeature(layerNode);
542 546
		getAttributesPanel().setSelectedFields(layerNode);
543
		getFilterPanel().setQuery(layerNode.getFilter());
547
//		getFilterPanel().setFilterExpressionIntoInterface(layerNode.getFilter());
544 548
	}	
545 549
	
546 550
	
......
566 570

  
567 571
	public void setStatus(WFSStatus status) {
568 572
		getOptionsPanel().setStatus(status);
569
		getFilterPanel().setQuery(status.getFilterQuery());
573
		getFilterPanel().setFilterExpressionIntoInterface(status.getFilterVisualText());
570 574
	}
571 575

  
572 576
	/**

Also available in: Unified diff