/ - Diff - | gvSIG desktop 1 - gvSIG

     /* gvSIG. Geographic Information System of the Valencian Government
+    *
     * Copyright (C) 2007-2008 Infrastructures and Transports Department
     * of the Valencian Government (CIT)
+    *
     * 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., 51 Franklin Street, Fifth Floor, Boston,
     * MA  02110-1301, USA.
+    *
     */
     /*
     * AUTHORS (In addition to CIT):
     * 2009 IVER T.I   {{Task}}
     */
     package org.gvsig.fmap.dal.resource.db;
     import org.gvsig.fmap.dal.exception.DataException;
     import org.gvsig.fmap.dal.exception.InitializeException;
     import org.gvsig.fmap.dal.resource.ResourceParameters;
     import org.gvsig.fmap.dal.resource.exception.AccessResourceException;
     import org.gvsig.fmap.dal.resource.exception.ResourceException;
     import org.gvsig.fmap.dal.resource.spi.AbstractNonBlockingResource;
     /**
      * <p>
      * Abstract Data Base Resource implementation that allow the concurrent access.
      * </p>
+     *
      * <p>
      * Useful for Pooled Data Base Access.
      * </p>
+     *
      * @author jmvivo
+     *
      */
     public abstract class AbstractDBResourceNoBlocker extends AbstractNonBlockingResource {
     	/**
     	 * Default constructor
+    	 *
     	 * @param parameters
     	 * @throws InitializeException
     	 */
     	protected AbstractDBResourceNoBlocker(DBResourceParameters parameters)
     			throws InitializeException {
     		super(parameters);
+    	}
     	/**
     	 * Return a connection to the data base.<br>
     	 * Connect to the Data Base if is needed
+    	 *
     	 * @return connection to the data base
     	 */
     	public Object get() throws AccessResourceException {
     		if (!isConnected()) {
     			try {
     				this.connect();
     			} catch (DataException e) {
     				throw new AccessResourceException(this, e);
+    			}
+    		}
     		try {
     			return getTheConnection();
     		} catch (DataException e) {
     			throw new AccessResourceException(this, e);
+    		}
+    	}
     	/**
     	 * Return a connection to the data base.<br>
     	 * Connect to the Data Base if is needed
+    	 *
+    	 *
     	 * @return connection to the data base
     	 * @see #get()
     	 */
     	public Object getConnection() throws AccessResourceException {
     		return get();
+    	}
     	/**
     	 * inform if connection to the data base is established
+    	 *
     	 * @return
     	 */
     	public abstract boolean isConnected();
     	/**
     	 * Establish connection to data base
+    	 *
     	 * @throws DataException
     	 */
     	public final void connect() throws DataException {
     		if (this.isConnected()) {
     			return;
+    		}
     		prepare();
     		connectToDB();
+    	}
     	/**
     	 * final implementation method to Establish connection to data base<br>
     	 * Called from {@link #get()}<br>
     	 * <br>
+    	 *
+    	 *
     	 * @throws DataException
     	 */
     	protected abstract void connectToDB() throws DataException;
     	/**
     	 * final implementation method to get a connection to data base<br>
     	 * Called from {@link #connect()}<br>
     	 * <br>
     	 * This method is called with the connection establish
+    	 *
     	 * @throws DataException
     	 */
     	protected abstract Object getTheConnection() throws DataException;
     	/**
     	 * Check if parameters is the same for this resource.<br>
     	 * <br>
+    	 *
     	 * <strong>Note:</strong> override this method to add checks for specify
     	 * final implementation parameters
+    	 *
+    	 *
     	 * @see AbstractResource#isThis(ResourceParameters)
     	 */
     	public boolean isThis(ResourceParameters parameters)
     			throws ResourceException {
     		if (!(parameters instanceof DBResourceParameters)) {
     			return false;
+    		}
     		DBResourceParameters params = (DBResourceParameters) parameters
     				.getCopy();
     		prepare(params);
     		DBResourceParameters myParams = (DBResourceParameters) this
     				.getParameters();
     		if (!equals(myParams.getHost(), params.getHost())) {
     			return false;
+    		}
     		if (!equals(myParams.getPort(), params.getPort())) {
     			return false;
+    		}
     		if (!equals(myParams.getUser(), params.getUser())) {
     			return false;
+    		}
     		return true;
+    	}
     	@SuppressWarnings("unchecked")
     	protected boolean equals(Comparable v1, Comparable v2) {
     		if (v1 == v2) {
     			return true;
+    		}
     		if ((v1 != null) && (v2 != null)) {
     			return v1.compareTo(v2) == 0;
+    		}
     		return false;
+    	}
+    }

     /* gvSIG. Geographic Information System of the Valencian Government
+    *
     * Copyright (C) 2007-2008 Infrastructures and Transports Department
     * of the Valencian Government (CIT)
+    *
     * 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., 51 Franklin Street, Fifth Floor, Boston,
     * MA  02110-1301, USA.
+    *
     */
     /*
     * AUTHORS (In addition to CIT):
     * 2009 IVER T.I   {{Task}}
     */
     package org.gvsig.fmap.dal.resource.db;
     import org.gvsig.fmap.dal.resource.spi.AbstractResourceParameters;
     import org.gvsig.fmap.dal.spi.DataStoreProviderServices;
     import org.gvsig.fmap.dal.store.db.DBHelper;
     import org.gvsig.tools.dynobject.DelegatedDynObject;
     /**
      * Base Abstract class to Data Base Resources Parameters
+     *
      * @author jmvivo
+     *
      */
     public abstract class DBResourceParameters extends AbstractResourceParameters
     		implements DBParameters {
         public static final String PARAMETERS_DEFINITION_NAME = "DBResourceParameters";
     	private DelegatedDynObject parameters;
         public DBResourceParameters(String parametersDefinitionName, String typeName) {
         	this.parameters = (DelegatedDynObject) DBHelper.newParameters(parametersDefinitionName);
         	this.setDynValue(DataStoreProviderServices.PROVIDER_PARAMTER_NAME, typeName);
+    	}
     	protected DelegatedDynObject getDelegatedDynObject() {
     		return parameters;
+    	}
     	public String getTypeName() {
         	return (String) this.getDynValue(DataStoreProviderServices.PROVIDER_PARAMTER_NAME);
+        }
         public String getHost() {
     		return (String) this.getDynValue(HOST_PARAMTER_NAME);
+    	}
     	public Integer getPort() {
     		return (Integer) this.getDynValue(PORT_PARAMTER_NAME);
+    	}
     	public String getDBName() {
     		return (String) this.getDynValue(DBNAME_PARAMTER_NAME);
+    	}
     	public String getUser() {
     		return (String) this.getDynValue(USER_PARAMTER_NAME);
+    	}
     	public String getPassword() {
     		return (String) this.getDynValue(PASSWORD_PARAMTER_NAME);
+    	}
     	/**
     	 * Set <code>host</code> parameter value
+    	 *
     	 * @param host
     	 */
     	public void setHost(String host) {
     		this.setDynValue(HOST_PARAMTER_NAME, host);
+    	}
     	/**
     	 * Set <code>port</code> parameter value
+    	 *
     	 * @param port
     	 */
     	public void setPort(int port) {
     		this.setDynValue(PORT_PARAMTER_NAME, new Integer(port));
+    	}
     	/**
     	 * Set <code>port</code> parameter value
+    	 *
     	 * @param port
     	 */
     	public void setPort(Integer port) {
     		this.setDynValue(PORT_PARAMTER_NAME, port);
+    	}
     	/**
     	 * Set <code>data base name</code> parameter value
+    	 *
     	 * @param data
     	 *            base name
     	 */
     	public void setDBName(String dbName) {
     		this.setDynValue(DBNAME_PARAMTER_NAME, dbName);
+    	}
     	/**
     	 * Set <code>user</code> parameter value
+    	 *
     	 * @param user
     	 */
     	public void setUser(String user) {
     		this.setDynValue(USER_PARAMTER_NAME, user);
+    	}
     	/**
     	 * Set <code>password</code> parameter value
+    	 *
     	 * @param password
     	 */
     	public void setPassword(String password) {
     		this.setDynValue(PASSWORD_PARAMTER_NAME, password);
+    	}
+    }

     /* gvSIG. Geographic Information System of the Valencian Government
+    *
     * Copyright (C) 2007-2008 Infrastructures and Transports Department
     * of the Valencian Government (CIT)
+    *
     * 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., 51 Franklin Street, Fifth Floor, Boston,
     * MA  02110-1301, USA.
+    *
     */
     /*
     * AUTHORS (In addition to CIT):
     * 2009 IVER T.I   {{Task}}
     */
     /**
+     *
      */
     package org.gvsig.fmap.dal.resource.db;
     import org.gvsig.fmap.dal.DALDbLibrary;
     import org.gvsig.fmap.dal.DALLibrary;
     import org.gvsig.fmap.dal.store.db.DBHelper;
     import org.gvsig.tools.library.AbstractLibrary;
     import org.gvsig.tools.library.LibraryException;
     /**
      * Library to initialize Data Base Resources
+     *
      * @author jmvivo
+     *
      */
     public class DBResourceLibrary extends AbstractLibrary {
         @Override
         public void doRegistration() {
             registerAsServiceOf(DALLibrary.class);
             require(DALDbLibrary.class);
+        }
     	@Override
     	protected void doInitialize() throws LibraryException {
+    	}
     	@Override
     	protected void doPostInitialize() throws LibraryException {
     		DBHelper.registerParametersDefinition(
     				DBResourceParameters.PARAMETERS_DEFINITION_NAME,
     				DBResourceParameters.class,
     				"DBParameters.xml"
     		);
+    	}
+    }

     /* gvSIG. Geographic Information System of the Valencian Government
+    *
     * Copyright (C) 2007-2008 Infrastructures and Transports Department
     * of the Valencian Government (CIT)
+    *
     * 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., 51 Franklin Street, Fifth Floor, Boston,
     * MA  02110-1301, USA.
+    *
     */
     /*
     * AUTHORS (In addition to CIT):
     * 2009 IVER T.I   {{Task}}
     */
     package org.gvsig.fmap.dal.resource.db;
     import org.gvsig.fmap.dal.exception.DataException;
     import org.gvsig.fmap.dal.exception.InitializeException;
     import org.gvsig.fmap.dal.resource.ResourceParameters;
     import org.gvsig.fmap.dal.resource.exception.AccessResourceException;
     import org.gvsig.fmap.dal.resource.exception.ResourceException;
     import org.gvsig.fmap.dal.resource.spi.AbstractResource;
     /**
      * Abstract Data Base Resource implementation that prevents the concurrent
      * access.
+     *
      * @author jmvivo
+     *
      */
     public abstract class AbstractDBResourceBlocker extends AbstractResource
     		implements
     		DBResource {
     	/**
     	 * Default constructor
+    	 *
     	 * @param parameters
     	 * @throws InitializeException
     	 */
     	protected AbstractDBResourceBlocker(DBResourceParameters parameters)
     			throws InitializeException {
     		super(parameters);
+    	}
     	/**
     	 * Return a connection to the data base.<br>
     	 * Connect to the Data Base if is needed
+    	 *
     	 * @return connection to the data base
     	 */
     	public Object get() throws AccessResourceException {
     		if (!isConnected()) {
     			try {
     				this.connect();
     			} catch (DataException e) {
     				throw new AccessResourceException(this, e);
+    			}
+    		}
     		try {
     			return getTheConnection();
     		} catch (DataException e) {
     			throw new AccessResourceException(this, e);
+    		}
+    	}
     	/**
     	 * Return a connection to the data base.<br>
     	 * Connect to the Data Base if is needed
+    	 *
+    	 *
     	 * @return connection to the data base
     	 * @see #get()
     	 */
     	public Object getConnection() throws AccessResourceException {
     		return get();
+    	}
     	/**
     	 * Establish connection to data base
+    	 *
     	 * @throws DataException
     	 */
     	public final void connect() throws DataException {
     		if (this.isConnected()) {
     			return;
+    		}
     		prepare();
     		connectToDB();
+    	}
     	/**
     	 * Check if parameters is the same for this resource.<br>
     	 * <br>
+    	 *
     	 * <strong>Note:</strong> override this method to add checks for specify
     	 * final implementation parameters
+    	 *
+    	 *
     	 * @see AbstractResource#isThis(ResourceParameters)
     	 */
     	public boolean isThis(ResourceParameters parameters)
     			throws ResourceException {
     		if (!(parameters instanceof DBResourceParameters)) {
     			return false;
+    		}
     		DBResourceParameters params = (DBResourceParameters) parameters
     				.getCopy();
     		prepare(params);
     		DBResourceParameters myParams = (DBResourceParameters) this
     				.getParameters();
     		if (!equals(myParams.getHost(), params.getHost())) {
     			return false;
+    		}
     		if (!equals(myParams.getPort(), params.getPort())) {
     			return false;
+    		}
     		if (!equals(myParams.getUser(), params.getUser())) {
     			return false;
+    		}
     		return true;
+    	}
     	@SuppressWarnings("unchecked")
     	protected boolean equals(Comparable v1, Comparable v2) {
     		if (v1 == v2) {
     			return true;
+    		}
     		if ((v1 != null) && (v2 != null)) {
     			return v1.compareTo(v2) == 0;
+    		}
     		return false;
+    	}
     	/**
     	 * final implementation method to Establish connection to data base<br>
     	 * Called from {@link #get()}<br>
     	 * <br>
+    	 *
+    	 *
     	 * @throws DataException
     	 */
     	protected abstract void connectToDB() throws DataException;
     	/**
     	 * final implementation method to get a connection to data base<br>
     	 * Called from {@link #connect()}<br>
     	 * <br>
     	 * This method is called with the connection establish
+    	 *
     	 * @throws DataException
     	 */
     	protected abstract Object getTheConnection() throws DataException;
+    }

     /* gvSIG. Geographic Information System of the Valencian Government
+    *
     * Copyright (C) 2007-2008 Infrastructures and Transports Department
     * of the Valencian Government (CIT)
+    *
     * 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., 51 Franklin Street, Fifth Floor, Boston,
     * MA  02110-1301, USA.
+    *
     */
     /*
     * AUTHORS (In addition to CIT):
     * 2009 IVER T.I   {{Task}}
     */
     package org.gvsig.fmap.dal.resource.db;
     /**
      * Interface for describe parameters of a Data Base
+     *
+     *
      * @author jmvivo
+     *
      */
     public interface DBParameters {
     	/**
     	 * Parameter name for <code>host</code>
     	 */
     	public static final String HOST_PARAMTER_NAME = "host";
     	/**
     	 * Parameter name for <code>port</code>
     	 */
     	public static final String PORT_PARAMTER_NAME = "port";
     	/**
     	 * Parameter name for <code>data base name</code>
     	 */
     	public static final String DBNAME_PARAMTER_NAME = "dbname";
     	/**
     	 * Parameter name for <code>user</code>
     	 */
     	public static final String USER_PARAMTER_NAME = "dbuser";
     	/**
     	 * Parameter name for <code>password</code>
     	 */
     	public static final String PASSWORD_PARAMTER_NAME = "password";
     	/**
     	 * Return the value of <code>host</code> parameter
+    	 *
     	 * @return
     	 */
     	public String getHost();
     	/**
     	 * Return the value of <code>port</code> parameter
+    	 *
     	 * @return
     	 */
     	public Integer getPort();
     	/**
     	 * Return the value of <code>data base name</code> parameter
+    	 *
     	 * @return
     	 */
     	public String getDBName();
     	/**
     	 * Return the value of <code>password</code> parameter
+    	 *
     	 * @return
     	 */
     	public String getPassword();
     	/**
     	 * Return the value of <code>user</code> parameter
+    	 *
     	 * @return
     	 */
     	public String getUser();
+    }

     /* gvSIG. Geographic Information System of the Valencian Government
+    *
     * Copyright (C) 2007-2008 Infrastructures and Transports Department
     * of the Valencian Government (CIT)
+    *
     * 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., 51 Franklin Street, Fifth Floor, Boston,
     * MA  02110-1301, USA.
+    *
     */
     /*
     * AUTHORS (In addition to CIT):
     * 2009 IVER T.I   {{Task}}
     */
     package org.gvsig.fmap.dal.resource.db;
     import org.gvsig.fmap.dal.resource.Resource;
     /**
      * Interface for Resources of a Data Base
+     *
      * @author jmvivo
+     *
      */
     public interface DBResource extends Resource {
     	/**
     	 * inform if connection to the data base is established
+    	 *
     	 * @return
     	 */
     	public boolean isConnected();
+    }

     /* gvSIG. Geographic Information System of the Valencian Government
+    *
     * Copyright (C) 2007-2008 Infrastructures and Transports Department
     * of the Valencian Government (CIT)
+    *
     * 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., 51 Franklin Street, Fifth Floor, Boston,
     * MA  02110-1301, USA.
+    *
     */
     /*
     * AUTHORS (In addition to CIT):
     * 2009 IVER T.I   {{Task}}
     */
     /**
+     *
      */
     package org.gvsig.fmap.dal.serverexplorer.db;
     import org.gvsig.fmap.dal.resource.db.DBParameters;
     /**
      * Interface for describe parameters of a Data Base connection
+     *
+     *
      * @author jmvivo
+     *
      */
     public interface DBConnectionParameter extends DBParameters {
+    }

     /* gvSIG. Geographic Information System of the Valencian Government
+    *
     * Copyright (C) 2007-2008 Infrastructures and Transports Department
     * of the Valencian Government (CIT)
+    *
     * 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., 51 Franklin Street, Fifth Floor, Boston,
     * MA  02110-1301, USA.
+    *
     */
     /*
     * AUTHORS (In addition to CIT):
     * 2009 IVER T.I   {{Task}}
     */
     /**
+     *
      */
     package org.gvsig.fmap.dal.serverexplorer.db.spi;
     import org.gvsig.fmap.dal.DataServerExplorerParameters;
     import org.gvsig.fmap.dal.NewDataStoreParameters;
     import org.gvsig.fmap.dal.exception.DataException;
     import org.gvsig.fmap.dal.serverexplorer.db.DBServerExplorer;
     import org.gvsig.fmap.dal.spi.DataServerExplorerProvider;
     import org.gvsig.fmap.dal.spi.DataServerExplorerProviderServices;
     import org.gvsig.fmap.dal.spi.DataStoreProvider;
     import org.gvsig.tools.dispose.impl.AbstractDisposable;
     /**
      * Abstract class for {@link DBServerExplorer} implementation
+     *
      * @author jmvivo
+     *
      */
     public abstract class AbstractDBServerExplorer extends AbstractDisposable
     		implements DBServerExplorer, DataServerExplorerProvider {
     	private DataServerExplorerProviderServices dataServerExplorerProviderServices;
     	private DataServerExplorerParameters dataServerParameters;
     	protected AbstractDBServerExplorer(DataServerExplorerParameters parameters,
     			DataServerExplorerProviderServices services) {
     		this.dataServerParameters = parameters;
     		this.dataServerExplorerProviderServices = services;
+    	}
     	/**
     	 * Return the name of {@link DataStoreProvider} returned by this
     	 * ServerExplorer
+    	 *
     	 * @return
     	 */
     	protected abstract String getStoreName();
     	/* (non-Javadoc)
     	 * @see org.gvsig.fmap.dal.serverexplorer.db.DBServerExplorer#canAdd(java.lang.String)
     	 */
     	public boolean canAdd(String storeName) throws DataException {
     		return getStoreName().equals(storeName);
+    	}
     	/* (non-Javadoc)
     	 * @see org.gvsig.fmap.dal.serverexplorer.db.DBServerExplorer#getAddParameters(java.lang.String)
     	 */
     	public NewDataStoreParameters getAddParameters(String storeName)
     			throws DataException {
     		if (!getStoreName().equals(storeName)) {
     			// FIXME exception
     			throw new IllegalArgumentException();
+    		}
     		return getAddParameters();
+    	}
     	/**
     	 * Return instance of {@link DataServerExplorerProviderServices}
+    	 *
     	 */
     	public DataServerExplorerProviderServices getServerExplorerProviderServices() {
     		return dataServerExplorerProviderServices;
+    	}
     	/*
     	 * (non-Javadoc)
+    	 *
     	 * @see
     	 * org.gvsig.fmap.dal.serverexplorer.db.DBServerExplorer#getParameters()
     	 */
     	public DataServerExplorerParameters getParameters() {
     		return dataServerParameters;
+    	}
+    }

     /* gvSIG. Geographic Information System of the Valencian Government
+     *
      * Copyright (C) 2007-2008 Infrastructures and Transports Department
      * of the Valencian Government (CIT)
+     *
      * 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., 51 Franklin Street, Fifth Floor, Boston,
      * MA  02110-1301, USA.
+     *
      */
     /*
     * AUTHORS (In addition to CIT):
     * 2008 IVER T.I. S.A.   {{Task}}
     */
     package org.gvsig.fmap.dal.serverexplorer.db;
     import org.gvsig.fmap.dal.DataServerExplorer;
     import org.gvsig.fmap.dal.DataStore;
     import org.gvsig.fmap.dal.DataStoreParameters;
     import org.gvsig.fmap.dal.NewDataStoreParameters;
     import org.gvsig.fmap.dal.exception.CloseException;
     import org.gvsig.fmap.dal.exception.DataException;
     import org.gvsig.fmap.dal.exception.OpenException;
     import org.gvsig.fmap.dal.feature.FeatureType;
     /**
      * Base interface of {@link DataServerExplorer} for Data Base type server
+     *
      * @author jmvivo
+     *
      */
     public interface DBServerExplorer extends DataServerExplorer {
     	/**
     	 * Return a instance of {@link NewDataStoreParameters} to fill
+    	 *
     	 * @return
     	 * @throws DataException
     	 */
     	public NewDataStoreParameters getAddParameters()
     			throws DataException;
     	/**
     	 * Return the {@link FeatureType} of the store of <code>dsp</code> store
+    	 *
     	 * @param dsp
     	 * @return
     	 * @throws DataException
     	 */
     	public FeatureType getFeatureType(DataStoreParameters dsp)
     			throws DataException;
     	/**
     	 * Open a store defined by <code>dsp</code>
+    	 *
     	 * @param dsp
     	 * @return
     	 * @throws DataException
     	 */
     	public DataStore open(DataStoreParameters dsp)
     			throws DataException;
     	/**
     	 * Open connection to the server
+    	 *
     	 * @throws OpenException
     	 */
     	public void open() throws OpenException;
     	/**
     	 * Close connection to the server
+    	 *
     	 * @throws OpenException
     	 */
     	public void close() throws CloseException;
+    }

     /* gvSIG. Geographic Information System of the Valencian Government
+     *
      * Copyright (C) 2007-2008 Infrastructures and Transports Department
      * of the Valencian Government (CIT)
+     *
      * 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., 51 Franklin Street, Fifth Floor, Boston,
      * MA  02110-1301, USA.
+     *
      */
     /*
      * AUTHORS (In addition to CIT):
      * 2008 IVER T.I. S.A.   {{Task}}
      */
     package org.gvsig.fmap.dal.serverexplorer.db;
     import org.gvsig.fmap.dal.DataServerExplorerParameters;
     import org.gvsig.fmap.dal.spi.AbstractDataParameters;
     import org.gvsig.fmap.dal.spi.DataStoreProviderServices;
     import org.gvsig.fmap.dal.store.db.DBHelper;
     import org.gvsig.tools.dynobject.DelegatedDynObject;
     /**
      * Abstract class of {@link DataServerExplorerParameters} for Data Base type
      * server
+     *
      * @author jmvivo
+     *
      */
     public abstract class DBServerExplorerParameters extends AbstractDataParameters
     		implements DataServerExplorerParameters, DBConnectionParameter {
         public static final String PARAMETERS_DEFINITION_NAME = "DBServerExplorerParameters";
         private DelegatedDynObject parameters;
     	public DBServerExplorerParameters(String parametersDefinitionName, String explorerName) {
     		this.parameters = (DelegatedDynObject) DBHelper.newParameters(parametersDefinitionName);
     		this.setDynValue(DataStoreProviderServices.PROVIDER_PARAMTER_NAME, explorerName);
+    	}
     	public String getExplorerName() {
     		return (String) this.getDynValue(DataStoreProviderServices.PROVIDER_PARAMTER_NAME);
+    	}
     	protected DelegatedDynObject getDelegatedDynObject() {
     		return parameters;
+    	}
     	public String getHost() {
     		return (String) this.getDynValue(HOST_PARAMTER_NAME);
+    	}
     	public Integer getPort() {
     		return (Integer) this.getDynValue(PORT_PARAMTER_NAME);
+    	}
     	public String getDBName() {
     		return (String) this.getDynValue(DBNAME_PARAMTER_NAME);
+    	}
     	public String getUser() {
     		return (String) this.getDynValue(USER_PARAMTER_NAME);
+    	}
     	public String getPassword() {
     		return (String) this.getDynValue(PASSWORD_PARAMTER_NAME);
+    	}
     	/**
     	 * Set <code>host</code> parameter value
+    	 *
     	 * @param host
     	 */
     	public void setHost(String host) {
     		this.setDynValue(HOST_PARAMTER_NAME, host);
+    	}
     	/**
     	 * Set <code>port/code> parameter value
+    	 *
     	 * @param port
     	 */
     	public void setPort(int port) {
     		this.setDynValue(PORT_PARAMTER_NAME, new Integer(port));
+    	}
     	/**
     	 * Set <code>port/code> parameter value
+    	 *
     	 * @param port
     	 */
     	public void setPort(Integer port) {
     		this.setDynValue(PORT_PARAMTER_NAME, port);
+    	}
     	/**
     	 * Set <code>data base name/code> parameter value
+    	 *
     	 * @param data
     	 *            base name
     	 */
     	public void setDBName(String dbName) {
     		this.setDynValue(DBNAME_PARAMTER_NAME, dbName);
+    	}
     	/**
     	 * Set <code>user/code> parameter value
+    	 *
     	 * @param user
     	 */
     	public void setUser(String user) {
     		this.setDynValue(USER_PARAMTER_NAME, user);
+    	}
     	/**
     	 * Set <code>password/code> parameter value
+    	 *
     	 * @param password
     	 */
     	public void setPassword(String password) {
     		this.setDynValue(PASSWORD_PARAMTER_NAME, password);
+    	}
+    }

     /* gvSIG. Geographic Information System of the Valencian Government
+    *
     * Copyright (C) 2007-2008 Infrastructures and Transports Department
     * of the Valencian Government (CIT)
+    *
     * 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., 51 Franklin Street, Fifth Floor, Boston,
     * MA  02110-1301, USA.
+    *
     */
     /*
     * AUTHORS (In addition to CIT):
     * 2008 IVER T.I. S.A.   {{Task}}
     */
     /**
+     *
      */
     package org.gvsig.fmap.dal;
     import org.gvsig.tools.library.AbstractLibrary;
     import org.gvsig.tools.library.LibraryException;
     /**
      * Initialize DAL data base basic support
+     *
      * @author jmvivo
+     *
      */
     public class DALDbLibrary extends AbstractLibrary {
         @Override
         public void doRegistration() {
             registerAsServiceOf(DALLibrary.class);
+        }
     	@Override
     	protected void doInitialize() throws LibraryException {
+    	}
     	@Override
     	protected void doPostInitialize() throws LibraryException {
+    	}
+    }

     /* gvSIG. Geographic Information System of the Valencian Government
+     *
      * Copyright (C) 2007-2008 Infrastructures and Transports Department
      * of the Valencian Government (CIT)
+     *
      * 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., 51 Franklin Street, Fifth Floor, Boston,
      * MA  02110-1301, USA.
+     *
      */
     /*
     * AUTHORS (In addition to CIT):
     * 2008 IVER T.I. S.A.   {{Task}}
     */
     package org.gvsig.fmap.dal.store.db;
     import org.gvsig.fmap.dal.DALLibrary;
     import org.gvsig.fmap.dal.resource.db.DBResourceLibrary;
     import org.gvsig.fmap.dal.serverexplorer.db.DBServerExplorerParameters;
     import org.gvsig.tools.library.AbstractLibrary;
     import org.gvsig.tools.library.LibraryException;
     /**
      * Data Base Store Library intialization
+     *
+     *
      */
     public class DBStoreLibrary extends AbstractLibrary {
         @Override
         public void doRegistration() {
             registerAsServiceOf(DALLibrary.class);
             require(DBResourceLibrary.class);
+        }
     	@Override
     	protected void doInitialize() throws LibraryException {
+    	}
     	@Override
     	protected void doPostInitialize() throws LibraryException {
     		DBHelper.registerParametersDefinition(
     				DBStoreParameters.PARAMETERS_DEFINITION_NAME,
     				DBStoreParameters.class,
     				"DBParameters.xml"
     		);
     		DBHelper.registerParametersDefinition(
     				DBServerExplorerParameters.PARAMETERS_DEFINITION_NAME,
     				DBServerExplorerParameters.class,
     				"DBParameters.xml"
     		);
+    	}
+    }

     package org.gvsig.fmap.dal.store.db;
     import java.util.Iterator;
     import org.gvsig.fmap.dal.feature.FeatureAttributeDescriptor;
     import org.gvsig.fmap.dal.feature.FeatureType;
     public final class FeatureTypeHelper {
     	@SuppressWarnings("unchecked")
     	public static  Iterator<FeatureAttributeDescriptor> iterator(FeatureType type) {
     		return type.iterator();
+    	}
+    }

     package org.gvsig.fmap.dal.store.db;
     import java.io.InputStream;
     import org.gvsig.metadata.MetadataLocator;
     import org.gvsig.metadata.MetadataManager;
     import org.gvsig.metadata.exceptions.MetadataException;
     import org.gvsig.tools.ToolsLocator;
     import org.gvsig.tools.dynobject.DynObject;
     import org.gvsig.tools.persistence.PersistenceManager;
     public final class DBHelper {
     	private DBHelper() {
     		// Do nothing
+    	}
     	@SuppressWarnings("unchecked")
     	public static void registerParametersDefinition(String name, Class theClass, String filename) {
     		PersistenceManager manager = ToolsLocator.getPersistenceManager();
     		if (manager.getDefinition(name) == null) {
     			InputStream resource = theClass.getResourceAsStream(filename);
     			if( resource==null ) {
     				throw new IllegalArgumentException("File '"+ filename + "' not found as a resource of '"+theClass.getName()+"'.");
+    			}
     			manager.addDefinition(
     					theClass,
     					name,
     					resource,
     					theClass.getClassLoader(),
     					null,
     					null
     			);
+    		}
+    	}
     	@SuppressWarnings("unchecked")
     	public static void registerMetadataDefinition(String name, Class theClass, String filename) throws MetadataException {
     		MetadataManager manager = MetadataLocator.getMetadataManager();
     		if( manager.getDefinition(name)==null ) {
     			InputStream resource = theClass.getResourceAsStream(filename);
     			if( resource==null ) {
     				throw new IllegalArgumentException("File '"+ filename + "' not found as a resource of '"+theClass.getName()+"'.");
+    			}
     			manager.addDefinition(
     					name,
     					theClass.getResourceAsStream(filename),
     					theClass.getClassLoader()
     			);
+    		}
+    	}
     	public static DynObject newParameters(String name) {
         	return ToolsLocator.getDynObjectManager()
     			.createDynObject(
     				ToolsLocator.getPersistenceManager().getDefinition(name)
     			);
+    	}
     	public static DynObject newMetadataContainer(String name) {
         	return ToolsLocator.getDynObjectManager()
     			.createDynObject(
     				MetadataLocator.getMetadataManager().getDefinition(name)
     			);
+    	}
+    }

     /* gvSIG. Geographic Information System of the Valencian Government
+    *
     * Copyright (C) 2007-2008 Infrastructures and Transports Department
     * of the Valencian Government (CIT)
+    *
     * 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., 51 Franklin Street, Fifth Floor, Boston,
     * MA  02110-1301, USA.
+    *
     */
     /*
     * AUTHORS (In addition to CIT):
     * 2009 IVER T.I   {{Task}}
     */
     package org.gvsig.fmap.dal.store.db;
     import org.cresques.cts.IProjection;
     import org.gvsig.fmap.dal.DataStoreParameters;
     import org.gvsig.fmap.dal.feature.Feature;
     import org.gvsig.fmap.dal.serverexplorer.db.DBConnectionParameter;
     import org.gvsig.fmap.dal.spi.AbstractDataParameters;
     import org.gvsig.fmap.dal.spi.DataStoreProviderServices;
     import org.gvsig.fmap.geom.primitive.Envelope;
     import org.gvsig.tools.dynobject.DelegatedDynObject;
     /**
      * Abstract Data base Store Parameters
+     *
      * @author jmvivo
+     *
      */
     public abstract class DBStoreParameters extends AbstractDataParameters
     		implements
     		DataStoreParameters, DBConnectionParameter {
     	public static final String PARAMETERS_DEFINITION_NAME = "DBStoreParameters";
     	/**
     	 * Parameter name for specify the feature type in the creacion of
     	 * news stores.
+    	 *
     	 * Is defined only in "new" paramaters.
+    	 *
     	 */
     	public static final String FEATURETYPE_PARAMTER_NAME = "FeatureType";

| gvSIG desktop 1

Revision 38285