/ - Diff - | gvSIG desktop 1 - gvSIG

Revision 10934

     import java.util.Map;
     import java.util.Vector;
     import javax.imageio.ImageIO;
     import javax.print.attribute.PrintRequestAttributeSet;
     import javax.swing.ImageIcon;
     import javax.swing.JOptionPane;
-...
     import org.gvsig.remoteClient.wms.WMSStatus;
     import com.hardcode.gdbms.driver.exceptions.ReadDriverException;
     import com.hardcode.gdbms.engine.data.driver.DriverException;
     import com.iver.andami.PluginServices;
     import com.iver.andami.messages.NotificationManager;
     import com.iver.cit.gvsig.exceptions.layers.ConnectionErrorLayerException;
-...
     import com.iver.cit.gvsig.exceptions.layers.UnsupportedVersionLayerException;
     import com.iver.cit.gvsig.exceptions.visitors.VisitorException;
     import com.iver.cit.gvsig.fmap.ConnectionErrorExceptionType;
     import com.iver.cit.gvsig.fmap.UnknownResponseFormatExceptionType;
     import com.iver.cit.gvsig.fmap.UnsuportedProtocolVersionExceptionType;
     import com.iver.cit.gvsig.fmap.ViewPort;
     import com.iver.cit.gvsig.fmap.WMSDriverExceptionType;
     import com.iver.cit.gvsig.fmap.drivers.DriverIOException;
-...
     import com.iver.cit.gvsig.fmap.drivers.wms.FMapWMSDriverFactory;
     import com.iver.cit.gvsig.fmap.drivers.wms.WMSException;
     import com.iver.cit.gvsig.fmap.layers.WMSLayerNode.FMapWMSStyle;
     import com.iver.cit.gvsig.fmap.layers.layerOperations.ComposedLayer;
     import com.iver.cit.gvsig.fmap.layers.layerOperations.IHasImageLegend;
     import com.iver.cit.gvsig.fmap.layers.layerOperations.InfoByPoint;
     import com.iver.cit.gvsig.fmap.layers.layerOperations.StringXMLItem;
-...
     				wmsStatus.setHeight(vp.getImageHeight());
     				wmsStatus.setWidth(vp.getImageWidth());
     				wmsStatus.setOnlineResource((String) onlineResources.get("GetFeatureInfo"));
     				wmsStatus.setFormat( m_Format );
     				wmsStatus.setLayerNames(Utilities.createVector(layerQuery,","));
     				wmsStatus.setSrs(m_SRS);
     				wmsStatus.setStyles(styles);
     				wmsStatus.setDimensions(dimensions);
     				wmsStatus.setTransparency(wmsTransparency);
     				wmsStatus.setSrs(m_SRS);
     				MyCancellable c = new MyCancellable(cancellable);
     				item[0] = new StringXMLItem(new String(getDriver()
     						.getFeatureInfo(wmsStatus, (int) tiledPoint.getX(), (int) tiledPoint.getY(), Integer.MAX_VALUE, c)),this);
-...
          * @param styles
          */
         public void setStyles(Vector styles) {
         	this.styles = styles;
         	//laura:
         	//layer query is built with the layer in reverse order
         	// so here we build the styles upside-down.
         	if (styles != null)
+        	{
         		this.styles = new Vector();
         		for(int i = styles.size()-1; i>=0; i--)
+        		{
         			this.styles.add(styles.elementAt(i));
+        		}
+        	}
     //    	if (styles != null)
     //    	{
     //    		this.styles = new Vector();
     //    		for(int i = styles.size()-1; i>=0; i--)
     //    		{
     //    			this.styles.add(styles.elementAt(i));
     //    		}
     //    	}
+        }
         /**
-...
+    		}
+    	}
     	/* (non-Javadoc)
     	 * @see com.iver.cit.gvsig.fmap.layers.FLayer#newComposedLayer()
     	 */
     	public ComposedLayer newComposedLayer() {
     		return new ComposedLayerWMS();
     //		return null;
+    	}
         /**
          * @param styles
          */
         public Vector getStyles() {
         	return this.styles;
+        }
     	/* Checks if can make a single petition for
     	 * the two layers to the server
+    	 *
     	 * @see com.iver.cit.gvsig.fmap.layers.ComposedLayerWMS#canAdd(com.iver.cit.gvsig.fmap.layers.FLayer)
     	 */
         boolean isComposedLayerCompatible(FLayer layer) {
     		FLyrWMS aLayer;
     		if (!(layer instanceof FLyrWMS)) {
     			return false;
+    		}
     		aLayer = (FLyrWMS)layer;
     		if (!this.getHost().equals(aLayer.getHost())) {
     			return false;
+    		}
     		if (!this.getFormat().equals(aLayer.getFormat())) {
     			return false;
+    		}
     		if (!this.getSRS().equals(aLayer.getSRS())) {
     			return false;
+    		}
     		if (this.getInfoLayerQuery() != null) {
     			if (!this.getInfoLayerQuery().equals(aLayer.getInfoLayerQuery())) {
     				return false;
+    			}
     		}else if (aLayer.getInfoLayerQuery() != null) {
     			return false;
+    		}
     		// isFixedSize es privado
     		if ((this.fixedSize != null) &&
     				(aLayer.fixedSize!= null)) {
     			if (this.fixedSize.equals(aLayer.fixedSize)) {
     				return false;
+    			}
     		} else if ((this.fixedSize != null) != (aLayer.fixedSize != null)) {
     			return false;
+    		}
     		// time elevation (dimensions)
     		if ((this.dimensions != null) &&
     				(aLayer.dimensions != null)) {
     			if (this.dimensions.size() != aLayer.dimensions.size()) {
     				return false;
     			} else {
     				Iterator iter = this.dimensions.iterator();
     				while (iter.hasNext()) {
     					if (!aLayer.dimensions.contains(iter.next())) {
     						return false;
+    					}
+    				}
+    			}
     		} else if ((this.dimensions != null) != (aLayer.dimensions != null)) {
     			return false;
+    		}
     		return true;
+    	}
+    }

     /**
+     *
      */
     package com.iver.cit.gvsig.fmap.layers;
     import java.awt.Graphics2D;
     import java.awt.image.BufferedImage;
     import java.util.Vector;
     import com.hardcode.gdbms.driver.exceptions.ReadDriverException;
     import com.iver.cit.gvsig.fmap.ViewPort;
     import com.iver.cit.gvsig.fmap.layers.layerOperations.ComposedLayer;
     import com.iver.utiles.swing.threads.Cancellable;
     /**
      * Group WMS layers for make a single petition to the
      * server for all layers.
+     *
      * It is posible only if almost all params are the same. For this
      * comparasion, ComposedLayerWMS uses the method
      * {@link com.iver.cit.gvsig.fmap.layers.FLyrWMS#isComposedLayerCompatible(com.iver.cit.gvsig.fmap.layers.FLayer)}
+     *
+     *
      * @see com.iver.cit.gvsig.fmap.layers.layerOperations.ComposedLayer
      * @see com.iver.cit.gvsig.fmap.layers.FLyrWMS
      */
     public class ComposedLayerWMS implements ComposedLayer {
     	private FLyrWMS layer=null;
     	/* (non-Javadoc)
     	 * @see com.iver.cit.gvsig.fmap.layers.layerOperations.ComposedLayer#canAdd(com.iver.cit.gvsig.fmap.layers.FLayer)
     	 */
     	public boolean canAdd(FLayer layer) {
     		if (this.layer != null) {
     			return this.layer.isComposedLayerCompatible(layer);
+    		}
     		return false;
+    	}
     	/* (non-Javadoc)
     	 * @see com.iver.cit.gvsig.fmap.layers.layerOperations.ComposedLayer#add(com.iver.cit.gvsig.fmap.layers.FLayer)
     	 */
     	public void add(FLayer layer) throws Exception {
     		FLyrWMS aLayer =(FLyrWMS)layer;
     		if (this.layer == null) {
     			this.layer = new FLyrWMS();
     			this.layer.setXMLEntity(aLayer.getXMLEntity());
     			return;
+    		}
     		this.layer.setLayerQuery( this.layer.getLayerQuery() + ","+ aLayer.getLayerQuery());
     		Vector aStyles = aLayer.getStyles();
     		if (aStyles != null) {
     			Vector myStyles = this.layer.getStyles();
     			if (myStyles == null) {
     				this.layer.setStyles(aStyles);
     			} else {
     				myStyles.addAll(aStyles);
     				this.layer.setStyles(myStyles);
+    			}
+    		}
     		//revisar el fullextend para ajustarlo a todas las capas
     		this.layer.getFullExtent().add(aLayer.getFullExtent());
+    	}
     	/* (non-Javadoc)
     	 * @see com.iver.cit.gvsig.fmap.layers.layerOperations.ComposedLayer#draw(java.awt.image.BufferedImage, java.awt.Graphics2D, com.iver.cit.gvsig.fmap.ViewPort, com.iver.utiles.swing.threads.Cancellable, double)
     	 */
     	public void draw(BufferedImage image, Graphics2D g, ViewPort viewPort,
     			Cancellable cancel, double scale) throws ReadDriverException {
     		this.layer.draw(image,g,viewPort,cancel,scale);
+    	}
+    }

Also available in: Unified diff