/ - Diff - | gvSIG desktop 1 - gvSIG

           <directory>images</directory>
     	  <outputDirectory>${extension.install.dir.name}/images</outputDirectory>
         </fileSet>
     	<fileSet>
           <directory>servers</directory>
     	  <outputDirectory>${extension.install.dir.name}/servers</outputDirectory>
         </fileSet>
       </fileSets>
         <files>
             <file>

branches/v2_0_0_prep/extensions/extCatalog/config/text.properties
139	139	wfsLoad=Carga de WFS
140	140	wmsColumn=Mapa
141	141	wmsError=Ha ocurrido un error al cargar el mapa
	142	_Loading_servers=Cargando lista de servidores
	143	_Unable_to_load_server_list_file=No se pudo cargar lista de servidores

branches/v2_0_0_prep/extensions/extCatalog/config/text_en.properties
136	136	wfsLoad=WFS load
137	137	wmsColumn=Map
138	138	wmsError=Map loading error
	139	_Loading_servers=Loading server list
	140	_Unable_to_load_server_list_file=Unable to load server list file
	141

branches/v2_0_0_prep/extensions/extCatalog/servers/CatalogServers.txt
	1	http://inspire.cop.gva.es/geonetwork/srv/en/csw

     ******Z39.50**********
     indexgeo.net:5511/act
     mapas.euitto.upm.es:2100
     sercartlin:2100
 .99.181.121:2110/DB1
     www.brs.gov.au:210/comm
     geonetwork.unocha.org:2100
     ******SRW*************
     http://idee.unizar.es/SRW/servlet/search/SRW
     http://tweed.lib.ed.ac.uk:8080/elf/search/southampton
     http://tweed.lib.ed.ac.uk:8080/elf/search/biome
     ******CSW*************
     http://indicio.demo.galdosinc.com/indicio/csw
     http://udktest.its-technidata.de:8082/wwwudk/CSWUDKSOAPServlet
     http://sercartlin:8080/deegree/ogcwebservice
     http://delta.icc.es/indicio/csw
     gruposigp2:8080/deegree-csw/services
     http://geobrain.laits.gmu.edu:8099/csw/CSW_Service
     **********GAZETEER*****************+
     http://sercartlin:8080/geoserver/wfs
     http://middleware.alexandria.ucsb.edu:8080/gaz/adlgaz/dispatch
     http://gnstaging.esri.com/gazetteer/Gazetteer
     http://www.geoportal-idec.net/gestor/webservices/idec_ws.php
     http://demo.deegree.org:8080/gazetteer/wfs-g
     http://gruposigp2:8080/deegree-wfsg/wfs-g
     http://193.144.250.29/webservices/services/IDEC_GeoServeisPort

     import java.io.FileNotFoundException;
     import java.io.FileReader;
     import java.io.IOException;
     import java.net.URL;
     import java.util.Iterator;
     import java.util.TreeMap;
     import javax.swing.Icon;
     import javax.swing.ImageIcon;
     import javax.swing.JFrame;
     import javax.swing.JOptionPane;
     import javax.swing.JPanel;
     import org.slf4j.Logger;
     import org.slf4j.LoggerFactory;
     import org.gvsig.catalog.CatalogClient;
     import org.gvsig.catalog.CatalogLocator;
     import org.gvsig.catalog.CatalogManager;
-...
      * @author Jorge Piera Llodra (piera_jor@gva.es)
      */
     public class ServerConnectDialogPanel extends JPanel implements ActionListener {
         private static Logger logger =
             LoggerFactory.getLogger(ServerConnectDialogPanel.class);
     	private static final CatalogManager catalogManager = CatalogLocator.getCatalogManager();
     	private static final long serialVersionUID = 1224880378648403038L;
     	private static TreeMap serverList = new TreeMap();
     	private ServerConnectPanel controlsPanel = null;
     	private JFrame parent = null;
     	protected CatalogClient client = null;
     	protected String serversFile = "servers/CatalogServers.txt";
     	protected String serversFile = "servers"
     	    + File.separator+ "CatalogServers.txt";
     	protected String currentServer = "";
     	private ConnectThread connectThread = null;
-...
     		this.setLayout(new BorderLayout());
     		add(getControlsPanel(),BorderLayout.CENTER);
     		//Loads the servers
     		loadServerList(serversFile);
     		//Load the protocols
     		controlsPanel.loadDrivers(
     				catalogManager.getDrivers());
     		int n_servers = loadServerList(serversFile);
     	      //Load the protocols
             controlsPanel.loadDrivers(
                     catalogManager.getDrivers());
             getControlsPanel().setPropertiesIcon(getPropertiesIcon());
     		if (n_servers == 0) {
     		    return;
+    		}
     		//Load the first protocol
     		controlsPanel.setProtocol(controlsPanel.getServer().getServiceSubType());
     		enableServerPropertiesButton();
     		getControlsPanel().setPropertiesIcon(getPropertiesIcon());
+    	}
     	/**
-...
     	 * This method loads a server list in the combo
     	 * @param sfile
     	 */
     	private void loadServerList(String sfile) {
     		loadServersFromFile(sfile);
     	private int loadServerList(String sfile) {
     		int n = loadServersFromFile(sfile);
     		if (n == 0) {
     		    return 0;
+    		}
     		Iterator iter = serverList.keySet().iterator();
     		while (iter.hasNext()) {
     			ServerData server = (ServerData) serverList.get((String) iter.next());
     			controlsPanel.addServer(server);
+    		}
+    		}
     		return n;
+    	}
     	/**
-...
     	 * @param sfile
     	 * File that contains the rervers
     	 */
     	private void loadServersFromFile(String sfile) {
     	private int loadServersFromFile(String sfile) {
     	    int servers_loaded = 0;
     		File file = null;
     		try {
     			file = new File(sfile);
     			if (file.exists()) {
     				BufferedReader fr = new BufferedReader(new FileReader(file));
     		    URL uf = getClass().getClassLoader().getResource(sfile);
     			if (uf != null) {
     			    file = new File(uf.getFile());
     			    if (!file.exists()) {
     			        throw new FileNotFoundException(file.getAbsolutePath());
+    			    }
     			    FileReader _fr = new FileReader(file);
     				BufferedReader _br = new BufferedReader(_fr);
     				String s;
     				while ((s = fr.readLine()) != null) {
     				while ((s = _br.readLine()) != null) {
     					addTreeMapServer(new ServerData(s,"",""));
     					servers_loaded++;
+    				}
     				_br.close();
     				_fr.close();
     			} else {
     				System.out.println("No se encuentra el fichero '" +
     						file.getPath() + "'");
     			    throw new FileNotFoundException(sfile);
+    			}
     		} catch (FileNotFoundException e) {
     			System.out.println("No se encuentra el fichero '" + file.getPath() +
     			"'");
     			//e.printStackTrace();
     		} catch (IOException e) {
     			System.out.println("Error de entrada salida en la lectura del fichero");
     			//e.printStackTrace();
     		} catch (Exception e) {
     		    logger.info("Error while loading server list file: " + e.getMessage());
                 String tit = Messages.getText("_Loading_servers");
                 String msg = Messages.getText("_Unable_to_load_server_list_file")
                     + ": " + sfile;
                 JOptionPane.showMessageDialog(
                     this,
                     msg, tit, JOptionPane.ERROR_MESSAGE);
+    		}
     		return servers_loaded;
+    	}
     	/*
-...
     	/**
     	 * @param serversFile The serversFile to set.
     	 */
     	public void setServersFile(String serversFile) {
     		this.serversFile = serversFile;
     	public void setServersFile(String srv_file) {
     		this.serversFile = srv_file;
+    	}
     	/**

| gvSIG desktop 1

Revision 38521