Revision 34132 branches/v2_0_0_prep/extensions/extWFS2/src/org/gvsig/wfs/gui/panels/WFSParamsPanel.java

View differences:

WFSParamsPanel.java
2 2

  
3 3
import java.awt.Container;
4 4

  
5
import javax.swing.JOptionPane;
6 5
import javax.swing.JTabbedPane;
7 6

  
8 7
import org.cresques.cts.IProjection;
8
import org.geotools.filter.AbstractFilter;
9 9

  
10 10
import org.gvsig.andami.PluginServices;
11 11
import org.gvsig.app.gui.ILayerPanel;
......
624 624
		parameters.setPassword(getOptionsPanel().getPassword());
625 625
		parameters.setMaxFeatures(getOptionsPanel().getBuffer());
626 626
		parameters.setTimeOut(getOptionsPanel().getTimeout());
627
		//		parameters.setFilterByArea(getAreaPanel().getArea(),
628
		//				"the_geom",
629
		//				getOptionsPanel().getSRS(),
630
		//				AFilter.GEOMETRIC_OPERATOR_INTERSECT);		
631
		//		parameters.setFilterByAttribute(getFilterPanel().getFilterExpressionFromInterface());
627
		parameters.setFilterByAreaGeometry(getAreaPanel().getArea());
628
		parameters.setFilterByAreaCrs(getOptionsPanel().getSRS());
629
		parameters.setFilterByAreaOperation((int)AbstractFilter.GEOMETRY_INTERSECTS);
630
		parameters.setFilterByAreaAttribute(selectedFeature.getGeometryField().getName());
631
		parameters.setFilterEncodingByAttribute(getFilterPanel().getQuery());
632 632
	}	
633 633

  
634 634
	/**
......
679 679
	private WFSSelectedFeature getSelectedFeature(){
680 680
		WFSSelectedFeature selectedFeature = getFeaturesPanel().getSelectedFeature();
681 681
		selectedFeature.setSelectedFields(getFieldsPanel().getSelectedFields());
682

  
683
		// If the query is incorrect -> no query (no filter)
684
		String query = getFilterPanel().getQuery();
685
		if (query == null) {
686
			selectedFeature.setFilter("");
687

  
688
			// Removes filter expression from the JTextArea
689
			getFilterPanel().removeFilterExpression();
690

  
691
			// Notify to user that no filter will be applied
692
			JOptionPane.showMessageDialog(null, PluginServices.getText(null, "no_filter_will_be_applied_in_the_load_of_the_layer"), PluginServices.getText(null, "warning"), JOptionPane.WARNING_MESSAGE);
693
		}
694
		else {
695
			selectedFeature.setFilter(query);
696
		}
682
		selectedFeature.setFilter(getFilterPanel().getQuery());		
697 683
		return selectedFeature;
698 684
	}
699 685

  

Also available in: Unified diff