/ - Diff - Application: gvSIG desktop - gvSIG

branches/v02_desarrollo/libraries/sld/temp/org.gvsig.sldsupport.lib.api/src/main/java/org/gvsig/sldsupport/sld/filter/expression/operator/SLDLiteral.java
13	13
14	14	public SLDLiteral() {
15	15	}
16
	16
	17	public SLDLiteral(String val) {
	18	setValue(val);
	19	}
	20
17	21	public String getValue() {
18	22	return literal;
19	23	}

     	public static final String WILDCHAR = "wildChar";
     	public static final String SINGLECHAR = "singleChar";
     	public static final String ESCAPECHAR = "escapeChar";
     	public static final String MATCHCASE_ATT = "matchCase";
     	public static final String ENVELOPE = "Envelope";
     	public static final String LOWER_CORNER = "lowerCorner";

     package org.gvsig.sldsupport.sld.symbol.misc;
     import org.gvsig.sldsupport.sld.filter.expression.SLDExpression;
     import org.gvsig.sldsupport.sld.filter.expression.operator.SLDLiteral;
     import org.gvsig.sldsupport.sld.graphic.SLDGraphic;
     public class SLDFill {
     	protected SLDGraphic fillGraphic = null;
     	protected SLDExpression fillExpression = null;
     	/*
     	 * This is the color
     	 */
     	protected SLDExpression colorExpression = null;
     	protected SLDExpression opacityExpression = null;
     	public SLDFill() {
     		/*
     		 * Defaults
     		 */
     		this.setFillColor(new SLDLiteral("#808080"));
     		this.setOpacity(new SLDLiteral("1.0"));
+    	}
     	public SLDGraphic getFillGraphic() {
-...
     		fillGraphic = gra;
+    	}
     	public SLDExpression getFill() {
     		return this.fillExpression;
     	public SLDExpression getFillColor() {
     		return this.colorExpression;
+    	}
     	public SLDExpression getOpacity() {
     		return this.opacityExpression;
+    	}
     	public void setFill(SLDExpression expr) {
     		this.fillExpression = expr;
     	public void setFillColor(SLDExpression expr) {
     		this.colorExpression = expr;
+    	}
     	public void setOpacity(SLDExpression expr) {

     import java.util.List;
     import org.gvsig.sldsupport.sld.filter.expression.SLDExpression;
     import org.gvsig.sldsupport.sld.filter.expression.operator.SLDLiteral;
     import org.gvsig.sldsupport.sld.graphic.SLDGraphic;
-...
     	protected SLDExpression width = null;
     	protected SLDExpression color = null;
     	/*
     	 * 1 is opaque
     	 * 0.5 is semi-transparent
     	 * 0 is transparent
+    	 *
     	 */
     	protected SLDExpression opacity = null;
     	protected SLDExpression lineJoin = null;
     	protected SLDExpression lineCap = null;
-...
     	// ============================================
     	public SLDStroke() {
     		/*
     		 * Defaults
     		 */
     		setStrokeType(STROKE_TYPE_SOLID);
     		this.setColor(new SLDLiteral("#000000"));
     		this.setOpacity(new SLDLiteral("1.0"));
     		this.setWidth(new SLDLiteral("1.0"));
     		/*
     		 * These are valid but not standard defaults
     		 * (standard does not declare default value)
     		 */
     		this.setLineCap(new SLDLiteral("round"));
     		this.setLineJoin(new SLDLiteral("round"));
+    	}
     	public void setStrokeType(int t) {

     package org.gvsig.sldsupport.sld.symbol.misc;
     public class SLDGeometry {
     	private String propertyName = null;
     	public SLDGeometry() {
+    	}
     	public void setPropertyName(String n) {
     		propertyName = n;
+    	}
     	public String getPropertyName() {
     		return propertyName;
+    	}
+    }

     package org.gvsig.sldsupport.sld.graphic;
     import org.gvsig.sldsupport.sld.SLDTags;
     import org.gvsig.sldsupport.sld.symbol.misc.SLDFill;
     import org.gvsig.sldsupport.sld.symbol.misc.SLDStroke;
-...
     	// =========================================
     	public SLDMark() {
     		/*
     		 * Defaults
     		 */
     		markType = MARK_TYPE_WELL_KNOWN_NAME;;
     		wellKnownName = SLDTags.SQUARE;
     		fill = new SLDFill();
     		stroke = new SLDStroke();
+    	}
     	public int getMarkType() {

     import java.util.ArrayList;
     import java.util.List;
     import org.gvsig.sldsupport.sld.filter.expression.operator.SLDLiteral;
     import org.gvsig.sldsupport.sld.symbol.misc.SLDParameterValue;
     public class SLDGraphic {
-...
     	protected SLDDisplacement displacement = null;
     	public SLDGraphic() {
     		/*
     		 * Defaults
     		 */
     		opacity = new SLDParameterValue();
     		opacity.getExpressionList().add(new SLDLiteral("1.0"));
     		size = new SLDParameterValue();
     		size.getExpressionList().add(new SLDLiteral("6.0"));
     		rotation = new SLDParameterValue();
     		rotation.getExpressionList().add(new SLDLiteral("0.0"));
+    	}
     	public void setDefaultMark() {
     		graphicStack.clear();
     		/*
     		 * Empty constructor gets default values
     		 */
     		SLDMark mk = new SLDMark();
     		graphicStack.add(mk);
+    	}
     	/**
     	 * Order matters, we use utility interface SLDGraphicStackElement
     	 * This list is made of SLDMark and SLDExternalGraphic

     package org.gvsig.sldsupport.sld.graphic;
     import org.gvsig.sldsupport.sld.filter.expression.operator.SLDLiteral;
     import org.gvsig.sldsupport.sld.symbol.misc.SLDParameterValue;
     public class SLDAnchorPoint {
-...
     	protected SLDParameterValue x = null;
     	protected SLDParameterValue y = null;
     	public SLDAnchorPoint() {
     		x = new SLDParameterValue();
     		x.getExpressionList().add(new SLDLiteral("0.5"));
     		y = new SLDParameterValue();
     		y.getExpressionList().add(new SLDLiteral("0.5"));
+    	}
     	public SLDParameterValue getAnchorPointX() {
     		return x;
+    	}

     package org.gvsig.sldsupport.sld.graphic;
     import org.gvsig.sldsupport.sld.filter.expression.operator.SLDLiteral;
     import org.gvsig.sldsupport.sld.symbol.misc.SLDParameterValue;
     public class SLDDisplacement {
-...
     	protected SLDParameterValue x = null;
     	protected SLDParameterValue y = null;
     	public SLDDisplacement() {
     		x = new SLDParameterValue();
     		x.getExpressionList().add(new SLDLiteral("0.0"));
     		y = new SLDParameterValue();
     		y.getExpressionList().add(new SLDLiteral("0.0"));
+    	}
     	public SLDParameterValue getDisplacementX() {
     		return x;
+    	}

     import org.gvsig.sldsupport.exception.SLDReadException;
     import org.gvsig.sldsupport.exception.SLDWriteException;
     import org.gvsig.sldsupport.exception.UnsupportedSLDVersionException;
     import org.gvsig.sldsupport.impl.util.SLDUtils;
     import org.gvsig.sldsupport.reader.SLDReader;
     import org.gvsig.sldsupport.reader.SLDReaderFactory;
     import org.gvsig.sldsupport.sld.SLDObject;
-...
     import org.gvsig.sldsupport.writer.SLDWriterFactory;
     import org.slf4j.Logger;
     import org.slf4j.LoggerFactory;
     import org.xmlpull.v1.XmlPullParserException;
     public class DefaultSLDSupportManager implements SLDSupportManager {
-...
     			throw new IOException("Null or non-existing file: "
     					+ ((infile == null) ? "Null" : infile.getAbsolutePath()));
+    		}
     		String ve = null;
     		try {
     			ve = SLDUtils.detectVersion(infile);
     		} catch (XmlPullParserException e) {
+    		}
     		System.out.println("Version = " + ve);
     		InputStream instream = null;
     		Iterator<String> iter = versionToReaders.keySet().iterator();
     		String vitem = null;
-...
     		SLDReaderFactory fact_item = null;
     		SLDReader ritem = null;
     		SLDObject resp = null;
     		boolean found = false;
     		while (iter.hasNext()) {
     			vitem = iter.next();
     			sitem = versionToReaders.get(vitem);
     			siter = sitem.iterator();
     			while (siter.hasNext()) {
     				found = true; // Used to decide message in exception
     				fact_item = siter.next();
     				ritem = fact_item.create();
     				instream = new FileInputStream(infile);
     				try {
     					resp = ritem.read(instream);
     				} catch (Exception exc) {
     					logger.info("One of the readers was unable to parse file: "	+ infile.getAbsolutePath());
     					logger.info("One of the readers was unable to parse file: "	+ infile.getAbsolutePath(), exc);
+    				}
     				try { instream.close(); } catch (Exception exc) { }
     				if (resp != null) {
-...
+    				}
+    			}
+    		}
     		throw new SLDReadException("No SLD readers found.");
     		if (found) {
     			throw new SLDReadException(	"No available SLD reader was able to parse file: "
     					+ infile.getAbsolutePath());
     		} else {
     			throw new SLDReadException("No SLD readers found.");
+    		}
+    	}
     //	public static String VERSION = "1.0.0";

     		String v = null;
     		if (name.compareToIgnoreCase(SLDTags.SLD_ROOT) == 0) {
     			v = parser.getAttributeValue(null, "version");
     			v = parser.getAttributeValue(null, SLDTags.VERSION_ATTR);
     			if (v == null) {
     				throw new SLDReadException(
     						"Version attribute is missing in " + SLDTags.SLD_ROOT);
+    			}
     			SLDRoot root = parseRoot(parser, v);
     			tag = parser.getEventType();
     			// Must be end-document
-...
     				/*
     				 * This line is out of the SLD standard
     				 */
     				v = parser.getAttributeValue(null, "version");
     				v = parser.getAttributeValue(null, SLDTags.VERSION_ATTR);
     				return parseLayer(parser, v);
     			} else {
     				if (name.compareToIgnoreCase(SLDTags.LINESYMBOLIZER) == 0
-...
     					/*
     					 * This line is out of the SLD standard
     					 */
     					v = parser.getAttributeValue(null, "version");
     					v = parser.getAttributeValue(null, SLDTags.VERSION_ATTR);
     					return parseSymbol(parser, v);
+    				}
+    			}

     					resp.setGraphic(gra);
     					break;
+    				}
     				break;
     				/*
     				 * Any other entity causes parsing error
     				 */
     				throw new SLDReadException(
     						"Bad SLD file. Unexpected entity in graphic fill: " + name);
     			case KXmlParser.END_TAG:
     				break;
     			case KXmlParser.TEXT:

     					resp.setAnchorPointY(pv);
     					break;
+    				}
     				break;
     				/*
     				 * Any other entity causes parsing error
     				 */
     				throw new SLDReadException(
     						"Bad SLD file. Unexpected entity in anchor point: " + name);
     			case KXmlParser.END_TAG:
     				break;
     			case KXmlParser.TEXT:

+    				}
     				if (SLDUtils.isStr(name, SLDTags.ONLINE_RESOURCE)) {
     					// xlink:href="http://somesite.com/something.xml"
     					txt = parser.getAttributeValue("xlink", "href");
     					txt = parser.getAttributeValue(null, SLDTags.XLINK_HREF);
     					if (txt == null) {
     						throw new SLDReadException("URL not found (xlink:href att is missing) in online resource entity");
+    					}
     					resp.setOnlineResource(txt);
     					parser.nextTag();
     					parser.nextTag();
     					break;
+    				}
     				break;
     				/*
     				 * Any other entity causes parsing error
     				 */
     				throw new SLDReadException(
     						"Unexpected entity in Remote OWS element: " + name);
     			case KXmlParser.END_TAG:
     				break;
     			case KXmlParser.TEXT:

     					if (SLDUtils.isStr(sp.getName(), SLDTags.FILL_ATTR)) {
     						if (sp.getExpressionList().size() > 0) {
     							// Using first item only
     							resp.setFill(sp.getExpressionList().get(0));
     							resp.setFillColor(sp.getExpressionList().get(0));
+    						}
     					} else {
     						if (SLDUtils.isStr(sp.getName(), SLDTags.FILLOPACITY_ATTR)) {
-...
+    					}
     					break;
+    				}
     				break;
     				/*
     				 * Any other entity causes parsing error
     				 */
     				throw new SLDReadException(
     						"Bad SLD file. Unexpected entity in fill element: " + name);
     			case KXmlParser.END_TAG:
     				break;
     			case KXmlParser.TEXT:

+    				}
     				if (SLDUtils.isStr(name, SLDTags.ONLINE_RESOURCE)) {
     					// xlink:href="http://somesite.com/something.xml"
     					txt = parser.getAttributeValue("xlink", "href");
     					txt = parser.getAttributeValue(null, SLDTags.XLINK_HREF);
     					if (txt == null) {
     						throw new SLDReadException("URL not found (xlink:href att is missing) in online resource entity");
+    					}
     					resp.setOnlineResource(txt);
     					resp.setMarkType(SLDMark.MARK_TYPE_ONLINE_RESOURCE);
     					resp.setOnlineResource(txt);
-...
     					resp.setStroke(stro);
     					break;
+    				}
     				break;
     				/*
     				 * Any other entity causes parsing error
     				 */
     				throw new SLDReadException(
     						"Bad SLD file. Unexpected entity in Mark: " + name);
     			case KXmlParser.END_TAG:
     				break;
     			case KXmlParser.TEXT:

     package org.gvsig.sldsupport.impl.sld1_0_0.parsing;
     import java.io.IOException;
     import org.gvsig.sldsupport.exception.SLDReadException;
     import org.gvsig.sldsupport.impl.util.SLDUtils;
     import org.gvsig.sldsupport.sld.SLDTags;
     import org.gvsig.sldsupport.sld.filter.expression.operator.SLDPropertyName;
     import org.gvsig.sldsupport.sld.graphic.SLDGraphic;
     import org.gvsig.sldsupport.sld.graphic.SLDLegendGraphic;
     import org.gvsig.sldsupport.sld.symbol.misc.SLDGeometry;
     import org.kxml2.io.KXmlParser;
     import org.xmlpull.v1.XmlPullParser;
     import org.xmlpull.v1.XmlPullParserException;
     public class GeometryElement {
     	public static SLDGeometry parse(XmlPullParser parser , String version)
     			throws XmlPullParserException, IOException, SLDReadException {
     		parser.require(KXmlParser.START_TAG, null, SLDTags.GEOMETRY);
     		int tag = 0;
     		SLDGeometry resp = new SLDGeometry();
     		tag = parser.nextTag();
     		String name = parser.getName();
     		String txt = null;
     		while (!(SLDUtils.isStr(name, SLDTags.GEOMETRY)
     				&& tag == KXmlParser.END_TAG)) {
     			switch (tag) {
     			case KXmlParser.START_TAG:
     				if (SLDUtils.isStr(name, SLDTags.PROPERTY_NAME)) {
     					txt = parser.nextText();
     					resp.setPropertyName(txt);
     					parser.nextTag();
     					break;
+    				}
     				/*
     				 * Any other entity causes parsing error
     				 */
     				throw new SLDReadException(
     						"Bad SLD file. Unexpected entity in geometry element: " + name);
     			case KXmlParser.END_TAG:
     				break;
     			case KXmlParser.TEXT:
     				break;
+    			}
     			tag = parser.getEventType();
     			name = parser.getName();
+    		}
     		parser.nextTag();
     		return resp;
+    	}
+    }

     					resp.setGraphic(gra);
     					break;
+    				}
     				break;
     				/*
     				 * Any other entity causes parsing error
     				 */
     				throw new SLDReadException(
     						"Bad SLD file. Unexpected entity in legend graphic: " + name);
     			case KXmlParser.END_TAG:
     				break;
     			case KXmlParser.TEXT:

     					break;
+    				}
     				break;
     				/*
     				 * Any other entity causes parsing error
     				 */
     				throw new SLDReadException(
     						"Bad SLD file. Unexpected entity in user style: " + name);
     			case KXmlParser.END_TAG:
     				break;
     			case KXmlParser.TEXT:

     					resp.setExtent(ext);
     					break;
+    				}
     				break;
     				/*
     				 * Any other entity causes parsing error
     				 */
     				throw new SLDReadException(
     						"Bad SLD file. Unexpected entity in featuretype constraints: " + name);
     			case KXmlParser.END_TAG:
     				break;
     			case KXmlParser.TEXT:

     		parser.require(KXmlParser.START_TAG, null, FilterTags.FUNCTION);
     		String fname = parser.getAttributeValue(null, SLDTags.NAME_ATTR);
     		if (fname == null) {
     			throw new SLDReadException("Attribute 'name' not found in SLD function");
+    		}
     		SLDFunction resp = new SLDFunction();
     		resp.setFunctionName(fname);

     					parser.nextTag();
     					break;
+    				}
     				break;
     				/*
     				 * Any other entity causes parsing error
     				 */
     				throw new SLDReadException(
     						"Bad SLD file. Unexpected entity in named style: " + name);
     			case KXmlParser.END_TAG:
     				break;
     			case KXmlParser.TEXT:

     					resp.setInitialGap(sp);
     					break;
+    				}
     				break;
     				/*
     				 * Any other entity causes parsing error
     				 */
     				throw new SLDReadException(
     						"Bad SLD file. Unexpected entity in graphic stroke: " + name);
     			case KXmlParser.END_TAG:
     				break;
     			case KXmlParser.TEXT:

     import org.gvsig.sldsupport.exception.SLDReadException;
     import org.gvsig.sldsupport.impl.sld1_0_0.parsing.expression.ExpressionElement;
     import org.gvsig.sldsupport.impl.util.SLDUtils;
     import org.gvsig.sldsupport.sld.SLDTags;
     import org.gvsig.sldsupport.sld.filter.FilterTags;
     import org.gvsig.sldsupport.sld.filter.expression.SLDExpression;
     import org.gvsig.sldsupport.sld.filter.operator.comparison.SLDBinaryComparisonOperator;
     import org.kxml2.io.KXmlParser;
-...
     		SLDBinaryComparisonOperator resp = new SLDBinaryComparisonOperator();
     		String op_name = parser.getName();
     		String mcase = parser.getAttributeValue(null, "matchCase");
     		String mcase = parser.getAttributeValue(null, FilterTags.MATCHCASE_ATT);
     		resp.setIsCaseSensitive(SLDUtils.isStr(mcase, "true"));
     		resp.setComparisonOperator(op_name);

     		parser.require(KXmlParser.START_TAG, null, FilterTags.PROPERTYISLIKE);
     		int tag = 0;
     		SLDIsLikeOperator resp = new SLDIsLikeOperator();
     		// -------------------------------------------------------
     		String att = parser.getAttributeValue(null, FilterTags.WILDCHAR);
     		if (att == null) {
     			throw new SLDReadException("Attribute required in IsLike operator: 'wildCard' ");
     		} else {
     			resp.setWildCard(att);
+    		}
     		// -------------------------------------------------------
     		att = parser.getAttributeValue(null, FilterTags.SINGLECHAR);
     		if (att == null) {
     			throw new SLDReadException("Attribute required in IsLike operator: 'singleChar' ");
     		} else {
     			resp.setSingleChar(att);
+    		}
     		// -------------------------------------------------------
     		att = parser.getAttributeValue(null, FilterTags.ESCAPECHAR);
     		if (att == null) {
     			throw new SLDReadException("Attribute required in IsLike operator: 'escapeChar' ");
     		} else {
     			resp.setEscapeChar(att);
+    		}
     		// -------------------------------------------------------
     		tag = parser.nextTag();
     		String name = parser.getName();
     		String att = parser.getAttributeValue(null, "wildCard");
     		resp.setWildCard(att);
     		att = parser.getAttributeValue(null, "singleChar");
     		resp.setSingleChar(att);
     		att = parser.getAttributeValue(null, "escapeChar");
     		resp.setEscapeChar(att);
     		String txt = null;
     		while (!(SLDUtils.isStr(name, FilterTags.PROPERTYISLIKE)
     				&& tag == KXmlParser.END_TAG)) {
-...
     					parser.nextTag();
     					break;
+    				}
     				break;
     				/*
     				 * Any other entity causes parsing error
     				 */
     				throw new SLDReadException("Bad SLD file. Unexpected entity in IsLikeOperator: " + name);
     			case KXmlParser.END_TAG:
     				break;
     			case KXmlParser.TEXT:

     					parser.nextTag();
     					break;
+    				}
     				break;
     				/*
     				 * Any other entity causes parsing error
     				 */
     				throw new SLDReadException(
     						"Bad SLD file. Unexpected entity is IsNullOperator: " + name);
     			case KXmlParser.END_TAG:
     				break;
     			case KXmlParser.TEXT:

branches/v02_desarrollo/libraries/sld/temp/org.gvsig.sldsupport.lib.impl/src/main/java/org/gvsig/sldsupport/impl/sld1_0_0/parsing/filteroperator/FilterOperatorElement.java
91	91	return operator;
92	92	}
93	93	// ****************************************************************
94		throw new SLDReadException("Unexpected entity in operator: " + name);
	94	throw new SLDReadException("Unexpected entity in filter operator: " + name);
95	95	}
96	96	}

     					resp.setEnvelope(env.getWKT());
     					break;
+    				}
     				break;
     				/*
     				 * Any other entity causes parsing error
     				 */
     				throw new SLDReadException(
     						"Bad SLD file. Unexpected entity in BBox operator: " + name);
     			case KXmlParser.END_TAG:
     				break;
     			case KXmlParser.TEXT:

     					parser.nextTag();
     					break;
+    				}
     				break;
     				/*
     				 * Any other entity causes parsing error
     				 */
     				throw new SLDReadException(
     						"Bad SLD file. Unexpected entity in envelope: " + name);
     			case KXmlParser.END_TAG:
     				break;
     			case KXmlParser.TEXT:

     				/*
     				 * TODO GML geometries not supported, only envelope
     				 */
     				break;
     				/*
     				 * Any other entity causes parsing error
     				 */
     				throw new SLDReadException(
     						"Bad SLD file. Unexpected entity in Binary spatial operator: " + name);
     			case KXmlParser.END_TAG:
     				break;
     			case KXmlParser.TEXT:

+    					}
     					break;
+    				}
     				break;
     				/*
     				 * Any other entity causes parsing error
     				 */
     				throw new SLDReadException(
     						"Bad SLD file. Unexpected entity in stroke: " + name);
     			case KXmlParser.END_TAG:
     				break;
     			case KXmlParser.TEXT:

     import java.io.IOException;
     import org.gvsig.fmap.dal.exception.ReadException;
     import org.gvsig.sldsupport.exception.SLDReadException;
     import org.gvsig.sldsupport.impl.sld1_0_0.parsing.symbol.SymbolElement;
     import org.gvsig.sldsupport.impl.util.SLDUtils;
-...
+    				}
     				// ===================================
     				// ===================================
     				/*
     				 * Text, Raster, MappedColor symbols not supported
     				 */
     				if (SLDUtils.isStr(name, SLDTags.POINTSYMBOL)
     						|| SLDUtils.isStr(name, SLDTags.POINTSYMBOLIZER)
     						|| SLDUtils.isStr(name, SLDTags.LINESYMBOL)
-...
     					resp.getSymbols().add(sym);
     					break;
+    				}
     				break;
     				/*
     				 * Text, Raster, MappedColor symbols not supported
     				 */
     				if (SLDUtils.isStr(name, SLDTags.TEXTSYMBOL)
     						|| SLDUtils.isStr(name, SLDTags.TEXTSYMBOLIZER)
     						|| SLDUtils.isStr(name, SLDTags.RASTERSYMBOL)
     						|| SLDUtils.isStr(name, SLDTags.RASTERSYMBOLIZER)
     						|| SLDUtils.isStr(name, SLDTags.MAPPEDCOLORSYMBOL)
     						) {
     					throw new SLDReadException("Unsupported symbol: " + name);
+    				}
     				/*
     				 * Any other entity causes parsing error
     				 */
     				throw new SLDReadException("Bad SLD file. Unexpected entity in Rule: " + name);
     			case KXmlParser.END_TAG:
     				break;
     			case KXmlParser.TEXT:

     					parser.nextTag();
     					break;
+    				}
     				break;
     				/*
     				 * Any other entity causes parsing error
     				 */
     				throw new SLDReadException(
     						"Bad SLD file. Unexpected entity in extent: " + name);
     			case KXmlParser.END_TAG:
     				break;
     			case KXmlParser.TEXT:

     					resp.setDisplacementY(pv);
     					break;
+    				}
     				break;
     				/*
     				 * Any other entity causes parsing error
     				 */
     				throw new SLDReadException(
     						"Bad SLD file. Unexpected entity in displacement element: " + name);
     			case KXmlParser.END_TAG:
     				break;
     			case KXmlParser.TEXT:

+    		}
     		SLDSvgCssParameter resp = new SLDSvgCssParameter();
     		String att = parser.getAttributeValue(null, "name");
     		String att = parser.getAttributeValue(null, SLDTags.NAME_ATTR);
     		if (att == null) {
     			throw new SLDReadException("Missing name in Svg/CssParameter");
+    		}
     		resp.setName(att);
     		String txt = SLDUtils.getTextUntilTag(parser);

     import java.io.IOException;
     import org.gvsig.sldsupport.exception.SLDReadException;
     import org.gvsig.sldsupport.impl.sld1_0_0.parsing.GeometryElement;
     import org.gvsig.sldsupport.impl.sld1_0_0.parsing.ParameterValueElement;
     import org.gvsig.sldsupport.impl.sld1_0_0.parsing.StrokeElement;
     import org.gvsig.sldsupport.impl.util.SLDUtils;
     import org.gvsig.sldsupport.sld.SLDTags;
     import org.gvsig.sldsupport.sld.symbol.SLDLineSymbol;
     import org.gvsig.sldsupport.sld.symbol.misc.SLDGeometry;
     import org.gvsig.sldsupport.sld.symbol.misc.SLDParameterValue;
     import org.gvsig.sldsupport.sld.symbol.misc.SLDStroke;
     import org.kxml2.io.KXmlParser;
-...
     			switch (tag) {
     			case KXmlParser.START_TAG:
     				if (SLDUtils.isStr(name, SLDTags.GEOMETRY)) {
     					txt = parser.nextText();
     					resp.setGeometryPropertyName(txt);
     					parser.nextTag();
     					SLDGeometry geom = GeometryElement.parse(parser, version);
     					resp.setGeometryPropertyName(geom.getPropertyName());
     					break;
+    				}
     				if (SLDUtils.isStr(name, SLDTags.STROKE)) {
-...
     					resp.setPerpendicularOffset(pv);
     					break;
+    				}
     				break;
     				/*
     				 * Any other entity causes parsing error
     				 */
     				throw new SLDReadException(
     						"Bad SLD file. Unexpected entity in line symbol: " + name);
     			case KXmlParser.END_TAG:
     				break;
     			case KXmlParser.TEXT:

     import org.gvsig.sldsupport.exception.SLDReadException;
     import org.gvsig.sldsupport.impl.sld1_0_0.parsing.DisplacementElement;
     import org.gvsig.sldsupport.impl.sld1_0_0.parsing.FillElement;
     import org.gvsig.sldsupport.impl.sld1_0_0.parsing.GeometryElement;
     import org.gvsig.sldsupport.impl.sld1_0_0.parsing.StrokeElement;
     import org.gvsig.sldsupport.impl.util.SLDUtils;
     import org.gvsig.sldsupport.sld.SLDTags;
     import org.gvsig.sldsupport.sld.graphic.SLDDisplacement;
     import org.gvsig.sldsupport.sld.symbol.SLDPolygonSymbol;
     import org.gvsig.sldsupport.sld.symbol.misc.SLDFill;
     import org.gvsig.sldsupport.sld.symbol.misc.SLDGeometry;
     import org.gvsig.sldsupport.sld.symbol.misc.SLDStroke;
     import org.kxml2.io.KXmlParser;
     import org.xmlpull.v1.XmlPullParser;
-...
     			switch (tag) {
     			case KXmlParser.START_TAG:
     				if (SLDUtils.isStr(name, SLDTags.GEOMETRY)) {
     					txt = parser.nextText();
     					resp.setGeometryPropertyName(txt);
     					parser.nextTag();
     					SLDGeometry geom = GeometryElement.parse(parser, version);
     					resp.setGeometryPropertyName(geom.getPropertyName());
     					break;
+    				}
     				if (SLDUtils.isStr(name, SLDTags.FILL)) {
-...
     					resp.setDisplacement(disp);
     					break;
+    				}
     				break;
     				/*
     				 * Any other entity causes parsing error
     				 */
     				throw new SLDReadException(
     						"Bad SLD file. Unexpected entity in polygon symbol: " + name);
     			case KXmlParser.END_TAG:
     				break;
     			case KXmlParser.TEXT:

     import java.io.IOException;
     import org.gvsig.sldsupport.exception.SLDReadException;
     import org.gvsig.sldsupport.impl.sld1_0_0.parsing.GeometryElement;
     import org.gvsig.sldsupport.impl.sld1_0_0.parsing.GraphicElement;
     import org.gvsig.sldsupport.impl.util.SLDUtils;
     import org.gvsig.sldsupport.sld.SLDTags;
     import org.gvsig.sldsupport.sld.graphic.SLDGraphic;
     import org.gvsig.sldsupport.sld.symbol.SLDPointSymbol;
     import org.gvsig.sldsupport.sld.symbol.misc.SLDGeometry;
     import org.kxml2.io.KXmlParser;
     import org.xmlpull.v1.XmlPullParser;
     import org.xmlpull.v1.XmlPullParserException;
-...
     			switch (tag) {
     			case KXmlParser.START_TAG:
     				if (SLDUtils.isStr(name, SLDTags.GEOMETRY)) {
     					txt = parser.nextText();
     					resp.setGeometryPropertyName(txt);
     					parser.nextTag();
     					SLDGeometry geom = GeometryElement.parse(parser, version);
     					resp.setGeometryPropertyName(geom.getPropertyName());
     					break;
+    				}
     				if (SLDUtils.isStr(name, SLDTags.GRAPHIC)) {
-...
     					resp.setGraphic(gr);
     					break;
+    				}
     				break;
     				/*
     				 * Any other entity causes parsing error
     				 */
     				throw new SLDReadException(
     						"Bad SLD file. Unexpected entity in point symbol: " + name);
     			case KXmlParser.END_TAG:
     				break;
     			case KXmlParser.TEXT:

     					resp.getUserStyles().add(usty);
     					break;
+    				}
     				break;
     				/*
     				 * Any other entity causes parsing error
     				 */
     				throw new SLDReadException(
     						"Bad SLD file. Unexpected entity in user layer: " + name);
     			case KXmlParser.END_TAG:
     				break;
     			case KXmlParser.TEXT:

     		String txt = null;
     		int tag = 0;
     		SLDFeatureStyle resp = new SLDFeatureStyle();
     		txt = parser.getAttributeValue(null, SLDTags.VERSION_ATTR);
     		resp.setVersion(txt);
     		if (SLDUtils.isStr(ent_name, SLDTags.FEATURESTYLE)) {
     			txt = parser.getAttributeValue(null, SLDTags.VERSION_ATTR);
     			if (txt == null) {
     				throw new SLDReadException("The 'version' attribute is mandatory in "
     						 + SLDTags.FEATURESTYLE);
     			} else {
     				resp.setVersion(txt);
+    			}
+    		}
     		tag = parser.nextTag();
     		String name = parser.getName();
     		while (!(SLDUtils.isStr(name, ent_name) && tag == KXmlParser.END_TAG)) {
-...
     					resp.getRules().add(rule);
     					break;
+    				}
     				break;
     				/*
     				 * Any other entity causes parsing error
     				 */
     				throw new SLDReadException(
     						"Bad SLD file. Unexpected entity in feature[type] style: " + name);
     			case KXmlParser.END_TAG:
     				break;
     			case KXmlParser.TEXT:

     					resp.setDisplacement(di);
     					break;
+    				}
     				break;
     				/*
     				 * Any other entity causes parsing error
     				 */
     				throw new SLDReadException(
     						"Bad SLD file. Unexpected entity in graphic: " + name);
     			case KXmlParser.END_TAG:
     				break;
     			case KXmlParser.TEXT:
-...
+    		}
     		parser.nextTag();
     		/*
     		 * Set default mark if no mark/graphic was set
     		 */
     		if (resp.getElementStack().size() == 0) {
     			resp.setDefaultMark();
+    		}
     		return resp;
+    	}
+    }

     					resp.getFeatureTypeConstraints().add(co);
     					break;
+    				}
     				break;
     				/*
     				 * Any other entity causes parsing error
     				 */
     				throw new SLDReadException(
     						"Bad SLD file. Unexpected entity in layer feature constraints: " + name);
     			case KXmlParser.END_TAG:
     				break;
     			case KXmlParser.TEXT:

+    				}
     				if (SLDUtils.isStr(name, SLDTags.ONLINE_RESOURCE)) {
     					// xlink:href="http://somesite.com/something.xml"
     					String res = parser.getAttributeValue("xlink", "href");
     					String res = parser.getAttributeValue(null, SLDTags.XLINK_HREF);
     					if (res == null) {
     						throw new SLDReadException("URL not found (xlink:href att is missing) in online resource entity");
+    					}
     					resp.setIsOnline(true);
     					resp.setOnlineResource(res);
     					parser.nextTag();
     					parser.nextTag();
     					break;
+    				}
     				if (SLDUtils.isStr(name, SLDTags.INLINE_CONTENT)) {
-...
     					parser.nextTag();
     					break;
+    				}
     				break;
     				/*
     				 * Any other entity causes parsing error
     				 */
     				throw new SLDReadException(
     						"Bad SLD file. Unexpected entity in external graphic: " + name);
     			case KXmlParser.END_TAG:
     				break;
     			case KXmlParser.TEXT:

     					break;
+    				}
     				break;
     				/*
     				 * Any other entity causes parsing error
     				 */
     				throw new SLDReadException(
     						"Bad SLD file. Unexpected entity in named layer: " + name);
     			case KXmlParser.END_TAG:
     				break;
     			case KXmlParser.TEXT:

     package org.gvsig.sldsupport.impl.util;
     import java.io.File;
     import java.io.FileInputStream;
     import java.io.FileReader;
     import java.io.IOException;
     import java.util.ArrayList;
     import java.util.List;
     import org.gvsig.sldsupport.exception.SLDReadException;
     import org.gvsig.sldsupport.impl.parser.ExtendedKXmlParser;
     import org.gvsig.sldsupport.sld.SLDRoot;
     import org.gvsig.sldsupport.sld.SLDTags;
     import org.gvsig.sldsupport.sld.layer.SLDLayer;
     import org.kxml2.io.KXmlParser;
     import org.slf4j.Logger;
     import org.slf4j.LoggerFactory;
-...
     //		fos.close();
     //	}
     	public String detectVersion(File f)
     	public static String detectVersion(File infile)
     			throws XmlPullParserException, IOException, SLDReadException {
     		XmlPullParser parser = new KXmlParser();
     		XmlPullParser parser = new ExtendedKXmlParser();
     		FileInputStream fis = new FileInputStream(infile);
     		// xmlSchemaParser = new XMLSchemaParser();
     		FileReader fr = new FileReader(f);
     		parser.setInput(fr);
     		parser.nextTag();
     		parser.setInput(fis, "ISO-8859-1");
     		if ( parser.getEventType() != XmlPullParser.END_DOCUMENT ) {
     			String value = parser.getAttributeValue("", SLDTags.VERSION_ATTR);
     			fr.close();
     		int tag = parser.getEventType();
     		if (tag == XmlPullParser.START_DOCUMENT) {
     			parser.nextTag();
     		} else {
     			if (tag != XmlPullParser.START_TAG) {
     				throw new IOException(
     						"Misplaced input stream (it's not before opening tag)");
+    			}
+    		}
     		String value = parser.getAttributeValue(null, SLDTags.VERSION_ATTR);
     		fis.close();
     		if (value == null) {
     			throw new SLDReadException("Version attribute not found");
     		} else {
     			return value;
+    		}
     		fr.close();
     		throw new SLDReadException("Unable to get SLD version" +
     				" in file: " + f.getAbsolutePath());
+    		}
+    	}
     	public static String getTextUntilTag(XmlPullParser parser)
     			throws XmlPullParserException, IOException {

Application: gvSIG desktop

Revision 40799