/ - Diff - | gvSIG desktop 1 - gvSIG

     //	}
     	/**
     	 * TODO: I can't add two layers with the same name !!
     	 * I need an attribute name in the remote resource
     	 */
     	private void addRemoteResource(RemoteResource r){
     		remoteResources.put(r.getLayerInfo().getName(), r);
     	public void addRemoteResource(RemoteResource r){
     		//remoteResources.put(r.getLayerInfo().getName(), r);
     		remoteResources.put(r.getName(), r);
+    	}
     	/**
     	 * Useful for create a tree model

     	 * Properties
     	 */
     	private String title = null;
     	private String name = null;
     	/**
     	 * Constructor
+    	 *
-...
     	public void setTitle(String title) {
     		this.title = title;
+    	}
     	/**
+    	 *
     	 * @return name which identifies the remote resource. Is unique.
     	 */
     	public String getName(){
     		if (this.name == null){
     			this.name = getLayerInfo().getName();
+    		}
     		return this.name;
+    	}
     	/**
     	 * TODO: IMPORTANT: In not used at the moment (is used getLAyerInfo.getName() instead)
     	 * @param name String which identifies the remote resource. If this name exists, overrides the existent remote resource.
     	 */
     	public void setName(String name){
     		this.name = name;
+    	}
     	/**
+    	 *
     	 * Useful to show in a tree.
     	 */
     	public String toString(){
-...
     		XMLEntity children = xml.firstChild("role", "children");
     		for (int i=0; i<children.getChildrenCount(); i++){
     			XMLEntity child = children.getChild(i);
     			RemoteResource r = PublishRegister.register().getRemoteResource(getService(), child.getStringProperty("type"));
     			RemoteResource r = PublishRegister.register().getRemoteResource(getService(), child.getStringProperty(REMOTERESOURCE_TYPE_KEY));
     			if (r == null){
     				PublishLogger.getLog().error("ERROR RemoteResource: I can't create a child from persistence");
+    			}

     	abstract String getDataType();
     	/**
+    	 *
     	 * @return bounding box
     	 * @return bounding box in native coordinates
     	 */
     	abstract Rectangle2D getBBox();
     	abstract Rectangle2D getNativeBBox();
     	/**
+    	 *
     	 * @return bounding box in WGS84 coordinates
     	 */
     	abstract Rectangle2D getLatLonBBox();
     	/**
     	 * @return data source type (SHAPE, POSTGIS, ECW)
     	 */
     	abstract String getType();
     	/**
     	 * @return a string that identifies the datastore which contains the datasource
     	 */
     	abstract String getConnectionName();
+    }

     /**
      * This class represents the information about a layer.
      * This class represents the information about a layer you are seeing.
      * This class might be reprojected.
+     *
      * @author Jos? Vicente Hig?n (josevicente.higon@iver.es)
+     *
      */
     public interface ILayerInfo extends IPersistance {
     	/**
+    	 *
     	 * @return layer's title. It must be unique.
     	 */
     	abstract String getName();
     	/**
+    	 *
     	 * @return layer's title.
     	 */
     	abstract String getTitle();
     	abstract String getEPSG();
     	/**
     	 * Gets the system reference identifier of the layer.
     	 * @return integer which identifies the layer's CRS.
     	 * If the layer is a group of layers, it will return -1
     	 */
     	abstract int getSRID();
     	/**
     	 * @deprecated use getSRID instead
     	 * @return string with the epsg code "EPSG:xxxx"
     	 */
     	abstract String getEPSGString();
     	/**
+    	 *
     	 * @return minimum scale (layer coordinates) you can see the layer
     	 */
     	abstract double getMinscale();
     	/**
+    	 *
     	 * @return maximum scale (layer coordinates) you can see the layer
     	 */
     	abstract double getMaxscale();
     	abstract Rectangle2D getBBox();
     	abstract Object getLegend();
     	/**
+    	 *
     	 * @return geographic bounding box in layer's coordinates
     	 */
     	abstract Rectangle2D getBBox();
     	/**
+    	 *
     	 * @return legend information
     	 */
     	abstract ILegendInfo getLegend();
     	/**
+    	 *
     	 * @return datasource information
     	 */
     	abstract IDataSourceInfo getDataSource();
     	/**
+    	 *
     	 * @return information about child layers
     	 */
     	abstract ILayerInfo[] getChilds();
     	/**
+    	 *
     	 * @return parent layer information
     	 */
     	abstract ILayerInfo getParent();
     	/**
+    	 *
     	 * @return information about the layer's view
     	 */
     	abstract IViewInfo getViewInfo();
     	/**
     	 * It can be null!!
     	 * @return
+    	 *
     	 * @return information about the layer labeling. It can be null.
     	 */
     	abstract ILabelingInfo getLabeling();
-...
     	/**
+    	 *
     	 * @param layerName
     	 * @return this
     	 * @param layerName layer's name
     	 * @return information about the layer
     	 */
     	abstract ILayerInfo findLayer(String layerName);
+    }

     import com.hardcode.gdbms.engine.values.Value;
     import com.iver.cit.gvsig.fmap.core.ISymbol;
     import com.iver.cit.gvsig.fmap.layers.FLyrVect;
     import com.iver.cit.gvsig.fmap.rendering.UniqueValueLegend;
     public class UniqueValuesLegendInfo implements IUniqueValuesLegendInfo {
     	private UniqueValueLegend legend=null;
     	private FLyrVect layer=null;
     	private HashMap symbols = null;
     	/**
     	 * default constructor
     	 * @param legend2
     	 * @deprecated
     	 */
     	public UniqueValuesLegendInfo(UniqueValueLegend legend2) {
     		legend = legend2;
     		symbols = new HashMap();
     		initialize();
+    	}
     	/**
+    	 *
     	 * @param lyrVect gvSIG vectorial layer
     	 */
     	public UniqueValuesLegendInfo(FLyrVect lyrVect) {
     		this.layer = lyrVect;
     		this.legend = (UniqueValueLegend)lyrVect.getLegend();
     		this.symbols = new HashMap();
     		initialize();
+    	}
     	private void initialize(){
     		Object[] values = legend.getValues();
     		for (int i = 0; i < values.length; i++){
-...
     		return stringValues;
     		//return legend.getDescriptions();
+    	}
+    	}
     	/*
     	 * (non-Javadoc)
     	 * @see org.gvsig.publish.infoproject.ILegendInfo#getSLDString()
     	 */
     	public String getSLDString() {
     		if (layer != null){
     			return legend.getSLDString(layer.getName());
     		}else{
     			return legend.getSLDString("default");
+    		}
+    	}
+    }

     package org.gvsig.publish.infoproject.legends;
     import org.gvsig.publish.infoproject.ILegendInfo;
     import com.iver.cit.gvsig.fmap.layers.FLayer;
     import com.iver.cit.gvsig.fmap.layers.FLyrVect;
     import com.iver.cit.gvsig.fmap.rendering.SingleSymbolLegend;
-...
     import com.iver.cit.gvsig.fmap.rendering.VectorialIntervalLegend;
     public class LegendInfoFactory {
     	public static Object getInstance(FLayer layer){
     	public static ILegendInfo getInstance(FLayer layer){
     		if (layer instanceof FLyrVect){
     			FLyrVect lyrVect = (FLyrVect)layer;
     			if (lyrVect.getLegend() instanceof SingleSymbolLegend){
     				return new SingleSymbolLegendInfo((SingleSymbolLegend)lyrVect.getLegend());
     				//return new SingleSymbolLegendInfo((SingleSymbolLegend)lyrVect.getLegend());
     				return new SingleSymbolLegendInfo(lyrVect);
+    			}
     			if (lyrVect.getLegend() instanceof UniqueValueLegend){
     				return new UniqueValuesLegendInfo((UniqueValueLegend)lyrVect.getLegend());
     				//return new UniqueValuesLegendInfo((UniqueValueLegend)lyrVect.getLegend());
     				return new UniqueValuesLegendInfo(lyrVect);
+    			}
     			if (lyrVect.getLegend() instanceof VectorialIntervalLegend){
     				return new VectorialIntervalLegendInfo((VectorialIntervalLegend)lyrVect.getLegend());
     				//return new VectorialIntervalLegendInfo((VectorialIntervalLegend)lyrVect.getLegend());
     				return new VectorialIntervalLegendInfo(lyrVect);
+    			}
+    		}
     		return null;

     import org.gvsig.publish.infoproject.ISymbolInfo;
     import org.gvsig.publish.infoproject.symbols.SymbolInfoFactory;
     import com.iver.cit.gvsig.fmap.layers.FLyrVect;
     import com.iver.cit.gvsig.fmap.rendering.Legend;
     import com.iver.cit.gvsig.fmap.rendering.SingleSymbolLegend;
     public class SingleSymbolLegendInfo implements ISingleSymbolLegendInfo{
     	private Legend legend = null;
     	private FLyrVect layer = null;
     	/**
     	 * default constructor
     	 * @param legend
     	 * @deprecated
     	 */
     	public SingleSymbolLegendInfo(SingleSymbolLegend legend) {
     		this.legend = legend;
+    	}
     	/**
     	 * Constructor from FLayer. I need the layer's name in order to build the SLD
     	 */
     	public SingleSymbolLegendInfo(FLyrVect lyrVect) {
     		this.layer = lyrVect;
     		this.legend = (SingleSymbolLegend)lyrVect.getLegend();
+    	}
     	public ISymbolInfo getSymbolInfo() {
     		return SymbolInfoFactory.getInstance(this.legend.getDefaultSymbol());
+    	}
     	public String getSLDString() {
     		if (layer != null){
     			return legend.getSLDString(layer.getName());
     		}else{
     			return legend.getSLDString("default");
+    		}
+    	}
+    }

      */
     package org.gvsig.publish.infoproject.legends;
     import org.gvsig.publish.infoproject.ILegendInfo;
     import org.gvsig.publish.infoproject.ISymbolInfo;
     public interface IIntervalLegendInfo {
     public interface IIntervalLegendInfo extends ILegendInfo {
     	public String getFilterItem();

     import org.gvsig.publish.infoproject.symbols.SymbolInfoFactory;
     import com.iver.cit.gvsig.fmap.core.ISymbol;
     import com.iver.cit.gvsig.fmap.layers.FLyrVect;
     import com.iver.cit.gvsig.fmap.rendering.VectorialIntervalLegend;
     public class VectorialIntervalLegendInfo implements IIntervalLegendInfo {
     	private VectorialIntervalLegend legend = null;
     	private HashMap expressions = null;
     	private HashMap intervals = null;
     	private FLyrVect layer = null;
     	/**
     	 * constructor
     	 * @param legend
     	 * @deprecated
     	 */
     	public VectorialIntervalLegendInfo(VectorialIntervalLegend legend) {
     		this.legend = legend;
     		initialize();
+    	}
     	/**
     	 * constructor
     	 * @param fLyrVect
     	 */
     	public VectorialIntervalLegendInfo(FLyrVect fLyrVect) {
     		this.layer = fLyrVect;
     		this.legend = (VectorialIntervalLegend)fLyrVect.getLegend();
     		initialize();
+    	}
     	private void initialize(){
     		expressions = new HashMap();
     		intervals = new HashMap();
-...
+    		}
     		return null;
+    	}
     	/*
     	 * (non-Javadoc)
     	 * @see org.gvsig.publish.infoproject.ILegendInfo#getSLDString()
     	 */
     	public String getSLDString() {
     		if (layer != null){
     			return legend.getSLDString(layer.getName());
     		}else{
     			return legend.getSLDString("default");
+    		}
+    	}
+    }

      */
     package org.gvsig.publish.infoproject.legends;
     import org.gvsig.publish.infoproject.ILegendInfo;
     import org.gvsig.publish.infoproject.ISymbolInfo;
     public interface IUniqueValuesLegendInfo{
     public interface IUniqueValuesLegendInfo extends ILegendInfo{
     	public abstract String getFilterItem();
     	public abstract String[] getUniqueValues();
     	public abstract ISymbolInfo getSymbol(String value);

      */
     package org.gvsig.publish.infoproject.legends;
     import org.gvsig.publish.infoproject.ILegendInfo;
     import org.gvsig.publish.infoproject.ISymbolInfo;
     public interface ISingleSymbolLegendInfo {
     public interface ISingleSymbolLegendInfo extends ILegendInfo{
     	public abstract ISymbolInfo getSymbolInfo();

     /* gvSIG. Sistema de Informaci?n Geogr?fica de la Generalitat Valenciana
+     *
      * Copyright (C) 2004-2006 IVER T.I. and Generalitat Valenciana.
+     *
      * This program is free software; you can redistribute it and/or
      * modify it under the terms of the GNU General Public License
      * as published by the Free Software Foundation; either version 2
      * of the License, or (at your option) any later version.
+     *
      * This program is distributed in the hope that it will be useful,
      * but WITHOUT ANY WARRANTY; without even the implied warranty of
      * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
      * GNU General Public License for more details.
+     *
      * You should have received a copy of the GNU General Public License
      * along with this program; if not, write to the Free Software
      * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307,USA.
+     *
      * For more information, contact:
+     *
      *   Generalitat Valenciana
      *   Conselleria d'Infraestructures i Transport
      *   Av. Blasco Iba?ez, 50
      *   46010 VALENCIA
      *   SPAIN
+     *
      *   +34 963862235
      *   gvsig@gva.es
      *   www.gvsig.gva.es
+     *
      *    or
+     *
      *   IVER T.I. S.A
      *   Salamanca 50
      *   46005 Valencia
      *   Spain
+     *
      *   +34 963163400
      *   dac@iver.es
      */
     package org.gvsig.publish.infoproject;
     public interface ILegendInfo{
     	public abstract String getSLDString();
+    }

     			layers[i] = new LayerInfo(flayers.getLayer(i),view, iview, this);
+    		}
+    	}
     	/**
+    	 *
     	 * @see org.gvsig.publish.infoproject.ILayerInfo#getDataSource()
     	 */
     	public IDataSourceInfo getDataSource() {
     		return DataSourceInfoFactory.getInstance(this.layer);
+    	}
     	public Object getLegend() {
     	/**
+    	 *
     	 * @see org.gvsig.publish.infoproject.ILayerInfo#getLegend()
     	 */
     	public ILegendInfo getLegend() {
     		return LegendInfoFactory.getInstance(this.layer);
+    	}
     	/**
+    	 *
     	 * @see org.gvsig.publish.infoproject.ILayerInfo#getMinscale()
     	 */
     	public double getMinscale() {
     		return layer.getMinScale();
+    	}
     	/**
+    	 *
     	 * @see org.gvsig.publish.infoproject.ILayerInfo#getName()
     	 */
     	public String getName() {
     		return this.layer.getName();
+    	}
     	/**
+    	 *
     	 * @see org.gvsig.publish.infoproject.ILayerInfo#getTitle()
     	 */
     	public String getTitle() {
     		return this.layer.getName();
+    	}
     	/**
+    	 *
     	 * @see org.gvsig.publish.infoproject.ILayerInfo#getChilds()
     	 */
     	public ILayerInfo[] getChilds() {
     		// TODO Auto-generated method stub
     		return layers;
+    	}
     	/**
+    	 *
     	 * @see java.lang.Object#toString()
     	 */
     	public String toString(){
     		return getName();
+    	}
     	/**
+    	 *
     	 * @see org.gvsig.publish.infoproject.ILayerInfo#getViewInfo()
     	 */
     	public IViewInfo getViewInfo() {
     		return iview;
+    	}
     	public String getEPSG() {
     	/**
+    	 *
     	 * @see org.gvsig.publish.infoproject.ILayerInfo#getEPSGString()
     	 */
     	public String getEPSGString() {
     		return layer.getProjection().getAbrev();
+    	}
     	/**
+    	 *
     	 * @see org.gvsig.publish.infoproject.ILayerInfo#getBBox()
     	 */
     	public Rectangle2D getBBox() {
     		Rectangle2D extent = null;
     		try {
-...
+    		}
     		return extent;
+    	}
     	/**
+    	 *
     	 * @see org.gvsig.publish.infoproject.ILayerInfo#getMaxscale()
     	 */
     	public double getMaxscale() {
     		return layer.getMaxScale();
+    	}
     /*
      * (non-Javadoc)
      * @see org.gvsig.publish.infoProject.ILayerInfo#getOpacityPercent()
      */
     	/*
     	 * (non-Javadoc)
     	 * @see org.gvsig.publish.infoProject.ILayerInfo#getOpacityPercent()
     	 */
     	public int getOpacityPercent() {
     		if (layer instanceof FLyrVect){
     			FLyrVect v = (FLyrVect)layer;
     			FSymbol s = (FSymbol)v.getLegend().getDefaultSymbol();
-...
     			}else
     				return 100;
+    		}
+    	}
     	/**
+    	 *
     	 * @see org.gvsig.publish.infoproject.ILayerInfo#getLabeling()
     	 */
     	public ILabelingInfo getLabeling() {
     		if (layer instanceof FLyrVect){
     			FLyrVect v = (FLyrVect)layer;
-...
     		return null;
+    	}
     	/**
     	 * @return information about the parent layer
+    	 *
     	 * @see org.gvsig.publish.infoproject.ILayerInfo#getParent()
     	 */
     	public ILayerInfo getParent() {
     		return this.parent;
+    	}
     	/**
+    	 *
     	 * @see org.gvsig.publish.infoproject.ILayerInfo#findLayer(java.lang.String)
     	 */
     	public ILayerInfo findLayer(String layerName) {
     		if (getName().equals(layerName)){
     			return this;
-...
+    		}
     		return null;
+    	}
     	/**
+    	 *
     	 * Constants used by ProjectInfoFactory
     	 */
     	public static final String VERSION="LayerInfo_v1";
     	public static final String LAYERNAME="layername";
     	/**
+    	 *
     	 * @see com.iver.utiles.IPersistance#getXMLEntity()
     	 */
     	public XMLEntity getXMLEntity() {
     		XMLEntity xml=new XMLEntity();
     		//put version
-...
     		xml.putProperty(LAYERNAME, getName());
     		return xml;
+    	}
     	/**
+    	 *
     	 * @see com.iver.utiles.IPersistance#setXMLEntity(com.iver.utiles.XMLEntity)
     	 */
     	public void setXMLEntity(XMLEntity xml) {
     		//check version
     		String classid = xml.getStringProperty("className");
-...
+    	}
     	/**
+    	 *
     	 * @see com.iver.utiles.IPersistance#getClassName()
     	 */
     	public String getClassName() {
     		return VERSION;
+    	}
     	/**
+    	 *
     	 * @see org.gvsig.publish.infoproject.ILayerInfo#getSRID()
     	 */
     	public int getSRID() {
     		int srid=-1;
     		if (layer.getProjection() != null){
     			String[] components = layer.getProjection().getAbrev().split(":");
     			srid = new Integer(components[1]).intValue();
+    		}
     		return srid;
+    	}
+    }

      */
     package org.gvsig.publish.infoproject.datasources;
     import java.io.File;
     /**
      * TODO: maybe this interface is unnecessary and the Idatasourceinfo is the
      * responsible to have a method like getFile():File (it can be null if its a db
      * connection)
+     *
      * @author jvhigon
+     *
      */
     public interface IFileInfo {
     	/**
+    	 *
     	 * @return
     	 */
     	public abstract String getFileName();
     	public abstract String getAbsolutePath();
     	public abstract String getExtension();
     	public abstract File getFile();
     	public abstract String getFilenameWithoutExtension();
+    }

     	public abstract String getUser();
     	public abstract String getHost();
     	public abstract String getPassword();
     	//TODO: refactoring --> change return type to int
     	public abstract String getPort();
     	public abstract String getDatabaseName();
     	public abstract String getTableName();
     	public abstract String getSchemaName();
     	public abstract String getGeometryColumn();
     	public abstract String getGID();
+    }

     import java.sql.SQLException;
     import java.sql.Statement;
     import org.cresques.cts.ICoordTrans;
     import org.cresques.cts.IProjection;
     import org.gvsig.publish.PublishLogger;
     import org.gvsig.publish.infoproject.IDataSourceInfo;
     import com.iver.cit.gvsig.fmap.crs.CRSFactory;
     import com.iver.cit.gvsig.fmap.drivers.ConnectionJDBC;
     import com.iver.cit.gvsig.fmap.drivers.DBLayerDefinition;
     import com.iver.cit.gvsig.fmap.drivers.db.utils.ConnectionWithParams;
-...
     	private PostGisDriver driver = null;
     	private ConnectionJDBC connection = null;
     	private DBLayerDefinition layerDef = null;
     	ConnectionWithParams cwp = null;
     	private ConnectionWithParams cwp = null;
     	/**
     	 * Constructor
     	 * @param vectorialAdapter The adapter from gvSIG
-...
     	 * (non-Javadoc)
     	 * @see org.gvsig.publish.infoProject.IDataSourceInfo#getBBox()
     	 */
     	public Rectangle2D getBBox() {
     	public Rectangle2D getNativeBBox() {
     		//this.adapter.getFullExtent();
     		Rectangle2D aux = null;
     		try {
     			this.driver.getFullExtent();
     			aux = this.driver.getFullExtent();
     		} catch (IOException e) {
     			PublishLogger.getLog().error("ERROR PostGISTable",e);
+    		}
     		return null;
     		return aux;
+    	}
     	/*
     	 * (non-Javadoc)
-...
     	 * (non-Javadoc)
     	 * @see org.gvsig.publish.infoProject.datasources.IDataBaseInfo#getGID()
     	 */
     	public String getGID() {
     		// TODO Auto-generated method stub
     	public String getGID() {
     		return layerDef.getFieldID();
+    	}
     	/**
+    	 *
     	 * @see org.gvsig.publish.infoproject.IDataSourceInfo#getLatLonBBox()
     	 */
     	public Rectangle2D getLatLonBBox() {
     		IProjection proj_source = CRSFactory.getCRS(getEPSG());
     		IProjection proj_dest = CRSFactory.getCRS("EPSG:4326");
     		ICoordTrans trans = proj_source.getCT(proj_dest);
     		return trans.convert(getNativeBBox());
+    	}
     	/**
     	 * the datastore name is the connection name
     	 * @return connection name
     	 * @see org.gvsig.publish.infoproject.IDataSourceInfo#getConnectionName()
     	 */
     	public String getConnectionName() {
     		return cwp.getName();
+    	}
     	/**
     	 * @return schema name
     	 * @see org.gvsig.publish.infoproject.datasources.IDataBaseInfo#getSchemaName()
     	 */
     	public String getSchemaName() {
     		String aux = cwp.getSchema();
     		if (aux == null){
     			aux = "public";
+    		}
     		return aux;
+    	}
+    }

     package org.gvsig.publish.infoproject.datasources;
     import java.awt.geom.Rectangle2D;
     import java.io.File;
     import org.cresques.cts.ICoordTrans;
     import org.cresques.cts.IProjection;
     import org.gvsig.publish.infoproject.IDataSourceInfo;
     import com.iver.cit.gvsig.fmap.crs.CRSFactory;
     import com.iver.cit.gvsig.fmap.drivers.raster.CmsRasterDriver;
     import com.iver.utiles.FileUtils;
-...
     		return driver.getNumBands();
+    	}
     	public Rectangle2D getBBox() {
     	public Rectangle2D getNativeBBox() {
     		return extent;
+    	}
     	/**
-...
+    	}
     	/**
+    	 *
     	 * @see org.gvsig.publish.infoproject.IDataSourceInfo#getLatLonBBox()
     	 */
     	public Rectangle2D getLatLonBBox() {
     		IProjection proj_source = CRSFactory.getCRS(getEPSG());
     		IProjection proj_dest = CRSFactory.getCRS("EPSG:4326");
     		ICoordTrans trans = proj_source.getCT(proj_dest);
     		return trans.convert(getNativeBBox());
+    	}
     	/**
     	 * the datastore is the file itself
     	 * @return file name
     	 * @see org.gvsig.publish.infoproject.IDataSourceInfo#getConnectionName()
     	 */
     	public String getConnectionName() {
     		return getFileName();
+    	}
     	/*
     	 * (non-Javadoc)
     	 * @see org.gvsig.publish.infoproject.datasources.IFileInfo#getFile()
     	 */
     	public File getFile() {
     		return driver.getFile();
+    	}
     	/*
     	 * (non-Javadoc)
     	 * @see org.gvsig.publish.infoproject.datasources.IFileInfo#getFilenameWithoutExtension()
     	 */
     	public String getFilenameWithoutExtension() {
     		String[] aux = getFileName().split(".");
     		if (aux.length > 0){
     			return aux[1];
     		}else{
     			return null;
+    		}
+    	}
+    }

     import java.awt.geom.Rectangle2D;
     import java.io.File;
     import java.io.IOException;
     import org.cresques.cts.ICoordTrans;
     import org.cresques.cts.IProjection;
     import org.gvsig.publish.PublishLogger;
     import org.gvsig.publish.infoproject.IDataSourceInfo;
     import com.iver.cit.gvsig.fmap.core.FShape;
     import com.iver.cit.gvsig.fmap.crs.CRSFactory;
     import com.iver.cit.gvsig.fmap.drivers.DriverIOException;
     import com.iver.cit.gvsig.fmap.drivers.shp.IndexedShpDriver;
     import com.iver.cit.gvsig.fmap.layers.VectorialAdapter;
-...
     //	return null;
     //	}
     	public Rectangle2D getBBox() {
     	public Rectangle2D getNativeBBox() {
     		Rectangle2D bbox = null;
-...
+    		}
     		return null;
+    	}
     	/**
+    	 *
     	 * @see org.gvsig.publish.infoproject.IDataSourceInfo#getType()
     	 */
     	public String getType() {
     		return SHAPE_TYPE;
+    	}
     	/**
+    	 *
     	 * @see org.gvsig.publish.infoproject.datasources.IFileInfo#getExtension()
     	 */
     	public String getExtension() {
     		return FileUtils.getFileExtension(driver.getFile());
+    	}
     	/**
+    	 *
     	 * @see org.gvsig.publish.infoproject.IDataSourceInfo#getLatLonBBox()
     	 */
     	public Rectangle2D getLatLonBBox() {
     		IProjection proj_source = CRSFactory.getCRS(getEPSG());
     		IProjection proj_dest = CRSFactory.getCRS("EPSG:4326");
     		ICoordTrans trans = proj_source.getCT(proj_dest);
     		return trans.convert(getNativeBBox());
+    	}
     	/**
     	 * the datastore is the shapefile itself
     	 * @return shapefile name
     	 * @see org.gvsig.publish.infoproject.IDataSourceInfo#getConnectionName()
     	 */
     	public String getConnectionName() {
     		return getFileName();
+    	}
     	/*
+    	 *
     	 * @see org.gvsig.publish.infoproject.datasources.IFileInfo#getFile()
     	 */
     	public File getFile() {
     		return driver.getFile();
+    	}
     	/*
     	 * (non-Javadoc)
     	 * @see org.gvsig.publish.infoproject.datasources.IFileInfo#getFilenameWithoutExtension()
     	 */
     	public String getFilenameWithoutExtension() {
     		String aux = getFileName();
     		int i = aux.lastIndexOf(".");
     		return aux.substring(0,i);
+    	}
+    }

branches/v10/extensions/extPublish/src/org/gvsig/publish/gui/publish/PublishPanel.java
69	69	initLabels();
70	70	}
71	71	private void initLabels(){
72		acceptButton.setText(PluginServices.getText(this,"accept"));
	72	acceptButton.setText(PluginServices.getText(this,"accept_publish"));
73	73	cancelButton.setText(PluginServices.getText(this,"cancel"));
74	74	}
75	75	/**

+    		}
     		if (e.getActionCommand().equals(PublishController.PUBLISH_EVENT_ACCEPT)){
     			try {
     				//TODO: I not know if is the best method
     				//TODO: I don't know if this is the best method
     				//I'm forcing to do a GetModel()
     				window.getActivePublication();
     				//Why I can't use the plugincontroller instead?
     				//window.getActivePublication();
     				pluginCtrl.getModel();
     				publication.getServer().publish();
     			} catch (PublishException e1) {
     				PublishLogger.getLog().error("ERROR PublishController: error_publishing");
-...
+    		}
+    	}
     	private void updateWindow() {
     		if (publication ==null){
     			PublishLogger.getLog().error("ERROR " + getClass().getName() + " I can't update the window, publication is null!!");
     			return;
+    		}
     		//get active publication
     		String key = publication.getServer().getType();
     		//get controller
     		pluginCtrl = (IPublishPluginController) PublishRegister.register().getController(key);
     		if (pluginCtrl == null){
     			PublishLogger.getLog().error("ERROR " + getClass().getName() + "The gui controller has not been loaded!!");
     			window.closeWindow();
     			return;
+    		}
     		pluginCtrl.setModel(publication);
     		//TODO: check casting
     		IPublishPluginPanel publishPanel = pluginCtrl.getPanel();

branches/v10/extensions/extPublish/src/org/gvsig/publish/gui/publish/PublishWindow.java
54	54	mWindowInfo=new WindowInfo(WindowInfo.MODELESSDIALOG \| WindowInfo.RESIZABLE);
55	55	mWindowInfo.setTitle(PluginServices.getText(this,"publication"));
56	56	mWindowInfo.setHeight(500);
57		mWindowInfo.setWidth(650);
	57	mWindowInfo.setWidth(600);
58	58	}
59	59	return mWindowInfo;
60	60	}

branches/v10/extensions/extPublish/src/org/gvsig/publish/gui/selectServer/SelectServerWindow.java
64	64	public void closeWindow(){
65	65	PluginServices.getMDIManager().closeWindow(this);
66	66	}
67
68	67
	68
69	69	}

     import com.iver.utiles.swing.jcomboServer.JComboServer;
     import com.iver.utiles.swing.jcomboServer.ServerData;
     /**
      * GUI for server and service selection
+     *
      * @author jvhigon
+     *
      */
     public class SelectServerPanel extends JPanel {
     	/**
-...
     	private javax.swing.JComboBox servicecombo;
     	// End of variables declaration
     	/**
     	 * sets the listener for all the actions in the panel
     	 */
     	public void setListener(EventListener listener) {
     		//set listener into the buttons
     		acceptButton.addActionListener((ActionListener)listener);
-...
     		cancelButton.addActionListener((ActionListener)listener);
     		cancelButton.setActionCommand(SelectServerController.NEWSERVER_EVENT_CANCEL);
     		serverurlcombo.addActionListener((ActionListener)listener);
     		serverurlcombo.setActionCommand(SelectServerController.COMBOSERVER_EVENT_CHANGE);
     		serverurlcombo.setActionCommand(SelectServerController.COMBOSERVERURL_EVENT_CHANGE);
     		servercombo.addActionListener((ActionListener)listener);
     		servercombo.setActionCommand(SelectServerController.COMBOSERVER_EVENT_CHANGE);
+    	}
     	/**
     	 * initialize combos
     	 */
     	public void initCombos(){
     		//remove items
     		servercombo.removeAllItems();
-...
+    	}
     	/**
     	 * Initializes the serverCombo with the saved servers
     	 * Initializes the serverComboURL with the saved servers
     	 */
     	private void initServerCombo(){
     		ServerDataPersistence persistence = new ServerDataPersistence(this,Server.PUBLISH_SERVERS);
-...
+    	}
     	/**
     	 * Update the server and the service combo with the
     	 * selected server
     	 * Updates the server and the service combo with the
     	 * selected server url
     	 */
     	protected void updateCombos(){
     		ServerData server = serverurlcombo.getSelectedServer();
-...
+    			}
+    		}
+    	}
     	/**
     	 * Updates the service combo when you select a server
     	 */
     	public void updateServiceCombo() {
     		servicecombo.removeAllItems();
     		ArrayList set = PublishRegister.register().getServicesNames(servercombo.getSelectedItem().toString());
     		Iterator i = set.iterator();
     		while (i.hasNext()){
     			servicecombo.addItem(i.next());
+    		}
+    	}
     	public String getSelectedServer(){
     		return servercombo.getSelectedItem().toString();

     	 */
     	public static final String NEWSERVER_EVENT_ACCEPT="accept_new_server";
     	public static final String NEWSERVER_EVENT_CANCEL="cancel_new_server";
     	public static final String COMBOSERVERURL_EVENT_CHANGE = "change_combo_serverurl";
     	public static final String COMBOSERVER_EVENT_CHANGE = "change_combo_server";
     	/**
     	 * dependences
-...
     			window.closeWindow();
     			//I've changed byt the observer/observable pattern
     			//publishController.showWindow();
     		}else if(e.getActionCommand().equals(SelectServerController.COMBOSERVER_EVENT_CHANGE)){
     		}else if(e.getActionCommand().equals(SelectServerController.COMBOSERVERURL_EVENT_CHANGE)){
     			window.updateCombos();
     			return;
+    		}
     		if (e.getActionCommand().equals(SelectServerController.COMBOSERVER_EVENT_CHANGE)){
     			window.updateServiceCombo();
     			return;
+    		}
+    	}
     	/**
     	 * Maybe is better to return the panel and do the cast in the other side. Then I won't have

             jScrollPane1 = new javax.swing.JScrollPane();
             abstractArea = new javax.swing.JEditorPane();
             setLayout(new java.awt.GridBagLayout());
             setBorder(javax.swing.BorderFactory.createTitledBorder("common_ogc"));
             setAutoscrolls(true);
             setMaximumSize(new java.awt.Dimension(10, 10));
             setPreferredSize(new java.awt.Dimension(300, 150));
             setLayout(new java.awt.GridBagLayout());
             nameLabel.setHorizontalAlignment(javax.swing.SwingConstants.LEFT);
             nameLabel.setText("name_label");
             gridBagConstraints = new java.awt.GridBagConstraints();
             gridBagConstraints.gridx = 0;
             gridBagConstraints.gridy = 0;
-...
             nameField.setColumns(30);
             nameField.setEditable(false);
             nameField.setText("name");
             gridBagConstraints = new java.awt.GridBagConstraints();
             gridBagConstraints.gridx = 1;
             gridBagConstraints.gridy = 0;
-...
             add(nameField, gridBagConstraints);
             titleLabel.setHorizontalAlignment(javax.swing.SwingConstants.LEFT);
             titleLabel.setText("title_label");
             gridBagConstraints = new java.awt.GridBagConstraints();
             gridBagConstraints.gridx = 0;
             gridBagConstraints.gridy = 1;
-...
             titleField.setColumns(30);
             titleField.setHorizontalAlignment(javax.swing.JTextField.LEFT);
             titleField.setText("titlee");
             gridBagConstraints = new java.awt.GridBagConstraints();
             gridBagConstraints.gridx = 1;
             gridBagConstraints.gridy = 1;
-...
             gridBagConstraints.insets = new java.awt.Insets(2, 2, 2, 2);
             add(titleField, gridBagConstraints);
             abstractLabel.setText("abstract_label");
             gridBagConstraints = new java.awt.GridBagConstraints();
             gridBagConstraints.gridx = 0;
             gridBagConstraints.gridy = 2;
-...
             gridBagConstraints.weighty = 1.0;
             gridBagConstraints.insets = new java.awt.Insets(2, 2, 2, 2);
             add(jScrollPane1, gridBagConstraints);
         }// </editor-fold>
         }// </editor-fold>
         // Variables declaration - do not modify
         private javax.swing.JEditorPane abstractArea;
         // Variables declaration - do not modify
         public javax.swing.JEditorPane abstractArea;
         private javax.swing.JLabel abstractLabel;
         private javax.swing.JScrollPane jScrollPane1;
         private javax.swing.JTextField nameField;
         public javax.swing.JTextField nameField;
         private javax.swing.JLabel nameLabel;
         private javax.swing.JTextField titleField;
         public javax.swing.JTextField titleField;
         private javax.swing.JLabel titleLabel;
         // End of variables declaration
         // End of variables declaration
        	public Object getModel() {
     		model_ogcmetadata.setName(nameField.getText());

branches/v10/extensions/extPublish/src/org/gvsig/publish/gui/addResource/AddResourceController.java
140	140	publication = publi;
141	141	}
142	142	}
	143	/**
	144	* Gets the controller's panel
	145	*/
	146	public AddResourcePanel getWindow(){
	147	return this.window;
	148	}
143	149	}

     /* gvSIG. Sistema de Informaci?n Geogr?fica de la Generalitat Valenciana
+     *
      * Copyright (C) 2004-2006 IVER T.I. and Generalitat Valenciana.
+     *
      * This program is free software; you can redistribute it and/or
      * modify it under the terms of the GNU General Public License
      * as published by the Free Software Foundation; either version 2
      * of the License, or (at your option) any later version.
+     *
      * This program is distributed in the hope that it will be useful,
      * but WITHOUT ANY WARRANTY; without even the implied warranty of
      * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
      * GNU General Public License for more details.
+     *
      * You should have received a copy of the GNU General Public License
      * along with this program; if not, write to the Free Software
      * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307,USA.
+     *
      * For more information, contact:
+     *
      *   Generalitat Valenciana
      *   Conselleria d'Infraestructures i Transport
      *   Av. Blasco Iba?ez, 50
      *   46010 VALENCIA
      *   SPAIN
+     *
      *   +34 963862235
      *   gvsig@gva.es
      *   www.gvsig.gva.es
+     *
      *    or
+     *
      *   IVER T.I. S.A
      *   Salamanca 50
      *   46005 Valencia
      *   Spain
+     *
      *   +34 963163400
      *   dac@iver.es
      */
     package org.gvsig.publish.gui.wizard;
     import java.awt.event.ActionEvent;
     import java.awt.event.ActionListener;
     import javax.swing.event.TreeSelectionEvent;
     import javax.swing.event.TreeSelectionListener;
     import org.gvsig.publish.gui.addResource.AddResourceController;
     import org.gvsig.publish.gui.publish.IPublishPluginController;
     import org.gvsig.publish.gui.publish.IPublishPluginPanel;
     import org.gvsig.publish.serversmodel.Publication;
     import org.gvsig.publish.serversmodel.RemoteResource;
     import org.gvsig.publish.serversmodel.Server;
     import org.gvsig.publish.serversmodel.Service;
     /**
      * GUI controller for a publication wizard.
+     *
      * @author jvhigon
+     *
      */
     public abstract class PublishWizardController implements IPublishPluginController, ActionListener, TreeSelectionListener {
     	//Associations
     	private PublishWizardPanel panel;
     	private Publication publication;
     	private Server currentServer;
     	private Service currentService;
     	private RemoteResource currentRemoteResource;
     	private IPublishPluginPanel serverBasicPane;
     	private IPublishPluginPanel serverAdvancedPane;
     	private IPublishPluginPanel serviceBasicPane;
     	private IPublishPluginPanel serviceAdvancedPane;
     	private IPublishPluginPanel remoteBasicPane;
     	private IPublishPluginPanel remoteAdvancedPane;
     	//Events
     	public static final String ADD_RESOURCE_EVENT="add_resource_event";
     	//Constructor
     	/**
     	 * Default constructor. It creates the panel and set its listener as "this".
     	 */
     	public PublishWizardController() {
     		this.panel = new PublishWizardPanel();
     		this.panel.setListener(this);
+    	}
     	//Abstract methods
     	/**
     	 * Any subclass must have a panel for server parameters
     	 * @param server
     	 * @return
     	 */
     	public abstract IPublishPluginPanel getServerPanel(Server server);
     	/**
     	 * Any subclass must have a panel for advanced server parameters
     	 * @param server model I want to show
     	 * @return
     	 */
     	public abstract IPublishPluginPanel getServerAdvancedPanel(Server server);
     	/**
     	 * Any subclass must have a panel for service parameters
     	 * @param service model I want to show
     	 * @return
     	 */
     	public abstract IPublishPluginPanel getServicePanel(Service service);
     	/**
     	 * Any subclass must have a panel for advanced service parameters
     	 * @param service model I want to show
     	 * @return
     	 */
     	public abstract IPublishPluginPanel getServiceAdvancedPanel(Service service);
     	/**
     	 * Any subclass must have a panel for remote resources panel
     	 * @param remoteResource model I want to show
     	 * @return
     	 */
     	public abstract IPublishPluginPanel getRemoteResourcePanel(RemoteResource remoteResource);
     	/**
     	 * Any subclass must have a panel for advanced remote resources panel
     	 * @param remoteResource model I want to show
     	 * @return
     	 */
     	public abstract IPublishPluginPanel getRemoteResourceAdvancedPanel(RemoteResource remoteResource);
     	//Methods
     	/**
     	 * Gets the publication from the GUI. The GUI will have to update the model first.
     	 */
     	public Object getModel() {
     		serverBasicPane.getModel();
     		serverAdvancedPane.getModel();
     		serviceBasicPane.getModel();
     		serviceAdvancedPane.getModel();
     		if (remoteBasicPane != null)
     				remoteBasicPane.getModel();
     		if (remoteAdvancedPane != null)
     				remoteAdvancedPane.getModel();
     		return this.panel.getModel();
+    	}
     	/**
     	 * Gets the GUI
     	 */
     	public IPublishPluginPanel getPanel() {
     		return this.panel;
+    	}
     	/**
     	 * Sets the publication which will be showed by the GUI. Then changes the current visible
     	 * panel with the server panel
     	 * @param entityModel must be a "publication" object
     	 */
     	public void setModel(Object entityModel) {
     		// cast to publication
     		this.publication = (Publication) entityModel;
     		//puts the model into the panel
     		this.panel.setModel(entityModel);
     		//update the current server
     		currentServer = publication.getServer();
     		//update the current service --> if I have only one service for server
     		//If you want 2, you must pass an array of services and modify the services panel
     		currentService = currentServer.getService(0);
     		//update the current resource --> it depends changevalue event (at the begining I get the first rr)
     		//if the model contains a remote resource ...
     		if (currentService.getRemoteResourcesCount() > 0){
     			currentRemoteResource = currentService.getRemoteResource(0);
+    		}
     		//set the panels in the GUI
     		setPanels();
+    	}
     	/**
     	 * gets the panel, after updates the model
     	 */
     	private void setPanels(){
     		//put server basic
     		serverBasicPane = getServerPanel(currentServer);
     		//serverBasicPane.setModel(currentServer);
     		panel.setServerBasicPanel(serverBasicPane);
     		//put server advanced
     		serverAdvancedPane = getServerAdvancedPanel(currentServer);
     		//serverAdvancedPane.setModel(currentServer);
     		panel.setServerAdvancedPanel(serverAdvancedPane);
     		//put service basic
     		serviceBasicPane = getServicePanel(currentService);
     		//serviceBasicPane.setModel(serviceAdvancedPane);
     		panel.setServiceBasicPanel(serviceBasicPane);
     		//put service advanced
     		serviceAdvancedPane = getServiceAdvancedPanel(currentService);
     		panel.setServiceAdvancedPanel(serviceAdvancedPane);
     		//put remote basic
     		if (currentRemoteResource !=null){
     			remoteBasicPane = getRemoteResourcePanel(currentRemoteResource);
     			panel.setRemoteResourceBasicPanel(remoteBasicPane);
+    		}
     		//put remote advanced
     		if (currentRemoteResource !=null){
     			remoteAdvancedPane = getRemoteResourceAdvancedPanel(currentRemoteResource);
     			//remoteAdvancedPane.setModel(currentRemoteResource);
     			panel.setRemoteResourceAdvancedPanel(remoteAdvancedPane);
+    		}
+    	}
     	/**
     	 * Actions from buttons
     	 */
     	public void actionPerformed(ActionEvent e) {
     		//first of all I update the model
     		getModel();
     		if (e.getActionCommand().equals(ADD_RESOURCE_EVENT)){
     			AddResourceController addResourceCtrl = new AddResourceController();
     			addResourceCtrl.setPublication(publication);
     			addResourceCtrl.showWindow();
+    		}
+    	}

| gvSIG desktop 1

Revision 19419