/org.gvsig.gazetteer/trunk/org.gvsig.gazetteer/org.gvsig.gazetteer.lib/src/main/java/org/gvsig/gazetteer/ui/serverconnect/ServerConnectDialogPanel.java - Diff - gvSIG tools: Gazetteer - gvSIG

Revision 102 org.gvsig.gazetteer/trunk/org.gvsig.gazetteer/org.gvsig.gazetteer.lib/src/main/java/org/gvsig/gazetteer/ui/serverconnect/ServerConnectDialogPanel.java

     import java.io.File;
     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.JOptionPane;
     import javax.swing.JPanel;
     import org.slf4j.Logger;
     import org.slf4j.LoggerFactory;
     import org.gvsig.catalog.drivers.DiscoveryServiceCapabilities;
     import org.gvsig.catalog.utils.CatalogConstants;
     import org.gvsig.gazetteer.GazetteerClient;
-...
     import org.gvsig.gazetteer.ui.search.SearchDialog;
     import org.gvsig.i18n.Messages;
     import org.gvsig.utils.swing.jcomboServer.ServerData;
     import org.slf4j.Logger;
     import org.slf4j.LoggerFactory;
-...
      * @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 GazetteerManager gazetteerManager = GazetteerLocator.getGazetteerManager();
     	private static final long serialVersionUID = 7022169996238047820L;
     	private static TreeMap serverList = new TreeMap();
-...
     	/**
     	 * Constructor
     	 * @param parent
     	 * @param parent
     	 */
     	public  ServerConnectDialogPanel(JFrame parent) {
     		this.parent = parent;
-...
     	        	controlsPanel.setProtocol(
     	        			controlsPanel.getServer().getServiceSubType());
+    	        }
     		} else {
     		    String _msg = Messages.getText("_Unable_to_load_server_list");
     		    String _tit = Messages.getText("gazetteer_search");
-...
     		        _tit,
     		        JOptionPane.ERROR_MESSAGE);
+    		}
+    	}
+    	}
     	/**
     	* @return the main panel
     	 */
     	public ServerConnectPanel getControlsPanel() {
     	public ServerConnectPanel getControlsPanel() {
     		if (controlsPanel == null) {
     			controlsPanel = new ServerConnectPanel();
     			controlsPanel.addActionListener(this);
     			controlsPanel.enableSearchButton(false);
+    		}
     		return controlsPanel;
+    	}
+    	}
     	/**
     	 * It adds a server in the TreeMap Object
     	 * @param server
     	 * @param server
     	 */
     	protected static void addTreeMapServer(ServerData server) {
     	protected static void addTreeMapServer(ServerData server) {
     		if (ServerConnectDialogPanel.serverList == null) {
     			ServerConnectDialogPanel.serverList = new TreeMap();
+    		}
     		serverList.put(server.getServerAddress(), server);
+    	}
+    	}
     	/**
     	 * This method loads a server list in the combo
     	 * @param sfile
     	 * @param sfile
     	 */
     	private boolean loadServerList(String sfile) {
     	private boolean loadServerList(String sfile) {
     		if (loadServersFromFile(sfile)) {
     	        Iterator iter = serverList.keySet().iterator();
     	        while (iter.hasNext()) {
     	            ServerData server = (ServerData) serverList.get((String) iter.next());
     	            controlsPanel.addServer(server);
+    	        }
+    	        }
     	        return true;
+    		}
     		return false;
+    	}
+    	}
     	/**
     	 * It loads a server list from a text file
     	 * @param sfile
     	 * @param sfile
     	 * File that contains the rervers
     	 */
     	private boolean loadServersFromFile(String sfile) {
     	private boolean loadServersFromFile(String sfile) {
     		File file = null;
     		try {
     	          URL uf = getClass().getClassLoader().getResource(sfile);
     	          if (uf == null) {
                       throw new FileNotFoundException(file.getAbsolutePath());
+    	          }
     	          file = new File(uf.getFile());
     			if (file.exists()) {
     				BufferedReader fr = new BufferedReader(new FileReader(file));
-...
     		    logger.info("While reading gazetteer servers list file: " + e.getMessage());
+    		}
     		return false;
+    	}
+    	}
     	/*
     	 * (non-Javadoc)
     	 * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent)
     	 */
     	public void actionPerformed(ActionEvent e) {
     	public void actionPerformed(ActionEvent e) {
     		if (e.getActionCommand().compareTo(CatalogConstants.CONNECT_BUTTON_ACTION_COMMAND)==0) {
     			connectButtonActionPerformed();
     		}else if (e.getActionCommand().compareTo(CatalogConstants.SEARCH_BUTTON_ACTION_COMMAND)==0) {
-...
     		        isUpdating = true;
     		        controlsPanel.updateServerByProtocol();
     		        isUpdating = false;
+    		    }
+    		    }
     		}else if (e.getActionCommand().compareTo(CatalogConstants.SERVER_COMBO_ACTION_COMMAND)==0) {
     		    if (!isUpdating){
     		        isUpdating = true;
-...
     		        isUpdating = false;
+    		    }
+    		}
+    	}
+    	}
     	/**
     	 * Action when the search button is clicked
     	 */
     	protected void searchButtonActionPerformed() {
     	protected void searchButtonActionPerformed() {
     		setEnabled(false);
     		new SearchDialog(client,parent);
+    	}
+    	}
     	/**
     	 * It is thrown the the connect button is clicked
     	 */
     	protected void connectButtonActionPerformed() {
     		controlsPanel.enableSearchButton(false);
     	protected void connectButtonActionPerformed() {
     		controlsPanel.enableSearchButton(false);
     		IGazetteerServiceDriver driver = (IGazetteerServiceDriver)controlsPanel.getDriver();
     		if( driver.needsUsername(driver.getServiceName()) ) {
     		    String username=requestUsername(driver.getUsername());
     		    driver.setUsername(username);
+    		}
     		//Create a new Gazetteer client
     		client = new GazetteerClient(controlsPanel.getServerAddress(),
     				(IGazetteerServiceDriver)controlsPanel.getDriver());
-...
+    		}
     		connectThread = new ConnectThread();
     		setCursor(new Cursor(Cursor.WAIT_CURSOR));
+    	}
+    	}
     	private String requestUsername (String oldUsername){
     	    String strRequireUserName = Messages.getText("_Insert_Geonames_username");
     	    String newUsername = JOptionPane.showInputDialog(strRequireUserName,oldUsername);
     	    if ( newUsername==null ){
     	        return oldUsername;
+    	    }
     	    return newUsername;
+    	}
     	/**
     	 *  * It is thrown the the close button is clicked
     	 */
     	protected void closeButtonActionPerformed() {
     	protected void closeButtonActionPerformed() {
     		parent.setVisible(false);
     		System.exit(0);
+    	}
+    	}
     	/**
     	 * @return Returns the serversFile.
     	 */
     	public String getServersFile() {
     	public String getServersFile() {
     		return serversFile;
+    	}
+    	}
     	/**
     	 * @param serversFile The serversFile to set.
     	 */
     	public void setServersFile(String serversFile) {
     	public void setServersFile(String serversFile) {
     		this.serversFile = serversFile;
+    	}
+    	}
     	/**
     	 * @return Returns the currentServer.
     	 */
     	public String getCurrentServer() {
     	public String getCurrentServer() {
     		return currentServer;
+    	}
+    	}
     	/**
     	 * @return Returns the client.
     	 */
     	public GazetteerClient getCliente() {
     	public GazetteerClient getCliente() {
     		return client;
+    	}
+    	}
     	/**
     	 * This class is used to manage the searches.
     	 * It contains method to start and to stop a thread. It is
     	 * necessary to create because "stop" method (for the Thread class)
     	 * is deprecated.
+    	 *
+    	 *
+    	 *
+    	 *
     	 * @author Jorge Piera Llodra (piera_jor@gva.es)
     	 */
     	private class ConnectThread implements Runnable {
     		volatile Thread myThread = null;
     		public  ConnectThread() {
     		public  ConnectThread() {
     			myThread = new Thread(this);
     			myThread.start();
+    		}
+    		}
     		public void stop(){
     			myThread.stop();
-...
     		 * (non-Javadoc)
     		 * @see java.lang.Runnable#run()
     		 */
     		public void run() {
     		public void run() {
     			try {
     				DiscoveryServiceCapabilities capabilities = client.getCapabilities();
     				if (capabilities.isAvailable()){
     					controlsPanel.enableSearchButton(true);
     					currentServer = controlsPanel.getServerAddress();
     					searchButtonActionPerformed();
+    				}
     				setCursor(new Cursor(Cursor.DEFAULT_CURSOR));
     				controlsPanel.setServerReply(capabilities.getServerMessage());
+    				}
     				setCursor(new Cursor(Cursor.DEFAULT_CURSOR));
     				controlsPanel.setServerReply(capabilities.getServerMessage());
     			} catch (Exception e) {
     				controlsPanel.setServerReply(Messages.getText(e.toString()));
     				e.printStackTrace();
+    			}
+    			}
+    		}
+    	}
+    	}
+    }

Also available in: Unified diff