Revision 34026 branches/v2_0_0_prep/extensions/extWFS2/src/org/gvsig/wfs/gui/panels/model/WFSUtils.java

View differences:

WFSUtils.java
4 4
import java.util.Vector;
5 5

  
6 6
import org.gvsig.remoteclient.wfs.WFSStatus;
7
import org.gvsig.remoteclient.wfs.schema.XMLElement;
8
import org.gvsig.remoteclient.wfs.schema.type.IXMLType;
7
import org.gvsig.xmlschema.lib.api.som.IXSElementDeclaration;
8
import org.gvsig.xmlschema.lib.api.som.IXSTypeDefinition;
9 9

  
10 10
/* gvSIG. Sistema de Informaci?n Geogr?fica de la Generalitat Valenciana
11 11
 *
......
105 105
	 * Layer with a set of Fields
106 106
	 * @return
107 107
	 */
108
	public static String getGeometry(WFSSelectedFeature layer){
109
   		if (layer.getGeometry() != null){
110
   			return layer.getGeometry().getName().split(":")[1];
108
	public static String getGeometry(WFSSelectedFeature selectedFeature){
109
   		if (selectedFeature.getGeometryField() != null){
110
   			return selectedFeature.getGeometryField().getName().split(":")[1];
111 111
   		}
112 112
   		return "";
113 113
  
......
120 120
	 * @param field
121 121
	 * Field to translate
122 122
	 */
123
	public static String getFieldType(IXMLType field){
123
	public static String getFieldType(IXSTypeDefinition field){
124 124
		if (field == null){
125 125
			return "";
126 126
		}
127 127
		
128
		if (field.getType() == IXMLType.GML_GEOMETRY){
129
			return field.getName().split(":")[1];
128
		if (field.isGeometry()){
129
			return field.getNodeName().split(":")[1];
130 130
		}
131 131
		
132 132
		String sfield = "";
133
		if (field.getName().split(":").length > 1){
134
			sfield = field.getName().split(":")[1];
133
		if (field.getNodeName().split(":").length > 1){
134
			sfield = field.getNodeName().split(":")[1];
135 135
		}else{
136
			sfield = field.getName();
136
			sfield = field.getNodeName();
137 137
		}		
138 138
		return sfield;
139 139
	}
......
149 149
		}
150 150
		Vector selectedFileds = layer.getSelectedFields();
151 151
		for (int i=0 ; i<selectedFileds.size() ; i++){
152
			IXMLType field = (IXMLType)selectedFileds.get(i);
153
			if (!(field.getType() == IXMLType.GML_GEOMETRY)){
152
			IXSTypeDefinition field = (IXSTypeDefinition)selectedFileds.get(i);
153
			if (!(field.isGeometry())){
154 154
				fields.add(field);
155 155
			}
156 156
		}
......
166 166
		}
167 167
		Vector selectedFileds = layer.getSelectedFields();
168 168
		for (int i=0 ; i<selectedFileds.size() ; i++){
169
			XMLElement field = (XMLElement)selectedFileds.get(i);
170
			if (!((field.getEntityType() != null) && (field.getEntityType().getType() == IXMLType.GML_GEOMETRY))){
169
			IXSElementDeclaration field = (IXSElementDeclaration)selectedFileds.get(i);
170
			if (!((field.getTypeDefinition() != null) && (field.getTypeDefinition().isGeometry()))){
171 171
				return true;
172 172
			}
173 173
		}

Also available in: Unified diff