/ - Diff - Application: gvSIG desktop - gvSIG

Revision 41249

          * add a new keyword to the keywordList.
          * @param key
          */
         protected void addkeyword(String key)
+        {
         protected void addkeyword(String key) {
         	keywordList.add(key);
+        }
         public ArrayList getKeywords()
+        {
         public ArrayList getKeywords() {
         	return keywordList;
+        }
         /**
          * <p>Adds a style to the styles vector</p>
          * @param _style
          */
         public void addStyle(org.gvsig.remoteclient.wms.WMSStyle _style) {
             styles.add( _style );    }
             styles.add( _style );
+        }
        /**
         /**
          * <p>Gets the style vector</p>
          * @return
          */
-...
         	ArrayList list = new ArrayList();
         	if (styles != null)
         		list.addAll(styles);
         	if (this.getParent()!= null)
+        	{
         	if (this.getParent()!= null) {
         		//return getAllStyles(this);
         		if(this.getParent().getStyles() != null)
         			list.addAll(this.getParent().getStyles());
-...
             return list;
+        }
         public ArrayList getAllStyles(WMSLayer layer)
+        {
         	if (layer.getParent()!= null)
+        	{
         public ArrayList getAllStyles(WMSLayer layer) {
         	if (layer.getParent()!= null) {
         		ArrayList list = getAllStyles(layer.getParent());
         		for(int i = 0; i < this.styles.size(); i++)
+        		{
         		for(int i = 0; i < this.styles.size(); i++) {
         			list.add(styles.get(i));
+        		}
         		return list;
+        	}
         	else
+        	{
         	} else {
         		return styles;
+        	}
+        }
         /**
          * <p>Adds a bbox to the Bboxes vector</p>
          * @param bbox
-...
         //Methods to manipulate the box that defines the layer extent in LatLon SRS.
         public BoundaryBox getLatLonBox()
+        {
         public BoundaryBox getLatLonBox() {
             return latLonBbox;
+        }
         public void setLatLonBox(BoundaryBox box)
+        {
         public void setLatLonBox(BoundaryBox box) {
             latLonBbox = box;
+        }
         /**
          * <p>adds a new srs to the srs vector</p>
          */
         public void addSrs(String srs)
+        {
         public void addSrs(String srs) {
         	if (!this.srs.contains(srs))
         		this.srs.add(srs);
+        }
         public void removeSrs(String srs) {
        		this.srs.remove(srs);
+        }
         public Vector getAllSrs()
+        {
         public Vector getAllSrs() {
             Vector mySRSs = (Vector) this.srs.clone();
             if (parent!=null)
                 mySRSs.addAll(parent.getAllSrs());
             return mySRSs;
     //    	if (this.getParent()!= null)
     //    	{
     //    		Vector list = this.getParent().getAllSrs();
     //    		for(int i = 0; i < this.srs.size(); i++)
     //    		{
     //    			list.add(srs.get(i));
     //    		}
     //    		return list;
     //    	}
     //    	else
     //    	{
     //    		return srs;
     //    	}
+        }
         /**
          * <p>gets the maximum scale for this layer</p>
          * @return
-...
          * @return
          */
         public abstract ArrayList getDimensions();
     //    public ArrayList getDimensions() {
     //        return dimensions;
     //    }
         public WMSDimension getDimension(String name)
+        {
         	for(int i = 0; i < dimensions.size(); i++ ){
         		if(((WMSDimension)dimensions.get(i)).getName().compareTo(name)==0)
+        		{
         public WMSDimension getDimension(String name) {
         	for(int i = 0; i < dimensions.size(); i++ ) {
         		if(((WMSDimension)dimensions.get(i)).getName().compareTo(name) == 0) {
         			return (WMSDimension)dimensions.get(i);
+        		}
+        	}
         	return null;
+        }
     //    /**
     //     * <p>Sets the dimension vector defined for this layer</p>
     //     * @param v
     //     */
     //    public void setDimensions(ArrayList v) {
     //        dimensions = (ArrayList)v.clone();
     //    }
         /**
          * <p>Adds a dimension to the dimension vector </p>
          * @param dimension
-...
          * Parses the keywordlist from the capabilities and fills this list in the WMSLayer.
          * @param parser
          */
         protected void parseKeywordList(KXmlParser parser)  throws IOException, XmlPullParserException
+        {
         protected void parseKeywordList(KXmlParser parser)  throws IOException, XmlPullParserException {
         	int currentTag;
         	boolean end = false;
         	String value;
-...
         	parser.require(KXmlParser.START_TAG, null, CapabilitiesTags.KEYWORDLIST);
         	currentTag = parser.nextTag();
             while (!end)
+        	{
     			 switch(currentTag)
+    			 {
             while (!end) {
     			 switch(currentTag) {
     				case KXmlParser.START_TAG:
     					if (parser.getName().compareTo(CapabilitiesTags.KEYWORD)==0)
+    					{
     					if (parser.getName().compareTo(CapabilitiesTags.KEYWORD) == 0) {
     						value = parser.nextText();
     						if ((value != null) && (value.length() > 0 ))
     							addkeyword(value);
-...
     				case KXmlParser.TEXT:
     					break;
+    			 }
     			 if (!end)
+    			 {
     			 if (!end) {
     				 currentTag = parser.next();
+    			 }
+        	}
-...
          * Maybe this method should be moved to the WMSLayer. Until now the attributes are teh same for all versions.
          * @param parser
          */
         protected void readLayerAttributes(KXmlParser parser)
+        {
         protected void readLayerAttributes(KXmlParser parser) {
         	String value = new String();
             //First of all set whether the layer is Queryable reading the attribute.
             value = parser.getAttributeValue("", CapabilitiesTags.QUERYABLE);
             if (value != null)
+            {
                 if (value.compareTo("0")==0)
             if (value != null) {
                 if (value.compareTo("0") == 0)
                     setQueryable(false);
                 else
                     setQueryable(true);
+            }
             value = parser.getAttributeValue("", CapabilitiesTags.OPAQUE);
             if (value != null)
+            {
                 if (value.compareTo("0")==0)
             if (value != null) {
                 if (value.compareTo("0") == 0)
                     setOpaque(false);
                 else
                     setOpaque(true);
+            }
             value = parser.getAttributeValue("", CapabilitiesTags.NOSUBSETS);
             if (value != null)
+            {
                 if (value.compareTo("0")==0)
             if (value != null) {
                 if (value.compareTo("0") == 0)
                     setNoSubSets(false);
                 else
                 	setNoSubSets(true);
+            }
             value = parser.getAttributeValue("", CapabilitiesTags.FIXEDWIDTH);
             if (value != null)
+            {
             if (value != null) {
             	setfixedWidth(Integer.parseInt(value));
+            }
             value = parser.getAttributeValue("", CapabilitiesTags.FIXEDHEIGHT);
             if (value != null)
+            {
             if (value != null) {
             	setfixedHeight(Integer.parseInt(value));
+            }
+        }
-...
          * <p>Inner class describing the MetadataURL tag in OGC specifications in WMS</p>
+         *
          */
         protected class MetadataURL
+        {
         	public MetadataURL()
+        	{
         protected class MetadataURL {
         	public MetadataURL() {
         		type = new String();
         		format = new String();
         		onlineResource_xlink = new String();
-...
          * <p>Inner class describing the DataURL tag in OGC specifications in WMS</p>
+         *
          */
         protected class DataURL
+        {
         	public DataURL()
+        	{
         protected class DataURL {
         	public DataURL() {
         		type = new String();
         		format = new String();
         		onlineResource_xlink = new String();

         private BoundaryBox changeAxis(String epsg, BoundaryBox oldbbox) {
         	if(epsg.contains("CRS:84") || epsg.contains("CRS84"))
         		return oldbbox;
             IProjection projSrc = CRSFactory.getCRS(epsg);
             if(projSrc != null && !projSrc.isProjected()) {
             	BoundaryBox bbox = new BoundaryBox();
             	bbox.setXmin(oldbbox.getYmin());
                 bbox.setYmin(oldbbox.getXmin());
                 bbox.setXmax(oldbbox.getYmax());
                 bbox.setYmax(oldbbox.getXmax());
                 bbox.setSrs(oldbbox.getSrs());
                 return bbox;
+            }
         	try {
         		IProjection projSrc = CRSFactory.getCRS(epsg);
         		if(projSrc != null && !projSrc.isProjected()) {
         			BoundaryBox bbox = new BoundaryBox();
         			bbox.setXmin(oldbbox.getYmin());
         			bbox.setYmin(oldbbox.getXmin());
         			bbox.setXmax(oldbbox.getYmax());
         			bbox.setYmax(oldbbox.getXmax());
         			bbox.setSrs(oldbbox.getSrs());
         			return bbox;
+        		}
         	} catch (Exception e) {
+        	}
             return oldbbox;
+        }

Also available in: Unified diff