/trunk/libraries/libRemoteServices/src/org/gvsig/remoteClient/utils/Utilities.java - Diff - Application: gvSIG desktop - gvSIG

Revision 18333 trunk/libraries/libRemoteServices/src/org/gvsig/remoteClient/utils/Utilities.java

     import java.io.IOException;
     import java.io.InputStream;
     import java.io.OutputStream;
     import java.io.OutputStreamWriter;
     import java.net.ConnectException;
     import java.net.HttpURLConnection;
     import java.net.URL;
     import java.net.URLConnection;
     import java.net.UnknownHostException;
     import java.rmi.NoSuchObjectException;
     import java.security.KeyManagementException;
     import java.security.NoSuchAlgorithmException;
     import java.security.Security;
     import java.util.Hashtable;
     import java.util.StringTokenizer;
     import java.util.Vector;
     import javax.net.ssl.HttpsURLConnection;
     import javax.net.ssl.SSLContext;
     import javax.net.ssl.SSLSocketFactory;
     import javax.net.ssl.TrustManager;
     import javax.net.ssl.X509TrustManager;
-...
+    	}
     	/**
     	 * Returns the content of this URL as a file from the file system.<br>
     	 * Return the content of a file that has been created
     	 * from a URL using the HTTP GET protocol
     	 * @param url
     	 * The URL
     	 * @return
     	 * File containing this URL's content or null if no file was found.
     	 */
     	private static File getPreviousDownloadedURL(URL url){
     		return getPreviousDownloaded(url);
+    	}
     	/**
     	 * Return the content of a file that has been created
     	 * from a URL using the HTTP POST protocol
     	 * @param url
     	 * The URL
     	 * @param data
     	 * The data to send on the query
     	 * @return
     	 * File containing this URL's content or null if no file was found.
     	 */
     	private static File getPreviousDownloadedURL(URL url, String data){
     		return getPreviousDownloaded(url+data);
+    	}
     	/**
     	 * Returns the content of a URL as a file from the file system.<br>
     	 * <p>
     	 * If the URL has been already downloaded in this session and notified
     	 * to the system using the static <b>Utilities.addDownloadedURL(URL)</b>
-...
     	 * @param url
     	 * @return File containing this URL's content or null if no file was found.
     	 */
     	private static File getPreviousDownloadedURL(URL url){
     	private static File getPreviousDownloaded(Object object){
     		File f = null;
     		if (downloadedFiles!=null && downloadedFiles.containsKey(url)){
     			String filePath = (String) downloadedFiles.get(url);
     		if (downloadedFiles!=null && downloadedFiles.containsKey(object)){
     			String filePath = (String) downloadedFiles.get(object);
     			f = new File(filePath);
     			if (!f.exists())
     				return null;
-...
+    	}
     	/**
     	 * Downloads a URL using the HTTP Post protocol
     	 * @param url
     	 * The server URL
     	 * @param data
     	 * The data to send in the request
     	 * @param name
     	 * A common name for all the retrieved files
     	 * @param cancel
     	 * Used to cancel the downloads
     	 * @return
     	 * The retrieved file
     	 * @throws IOException
     	 * @throws ConnectException
     	 * @throws UnknownHostException
     	 */
     	public static synchronized File downloadFile(URL url, String data, String name, ICancellable cancel) throws IOException,ConnectException, UnknownHostException{
     		File f = null;
     		if ((f=getPreviousDownloadedURL(url,data))==null){
     			File tempDirectory = new File(tempDirectoryPath);
     			if (!tempDirectory.exists())
     				tempDirectory.mkdir();
     			f = new File(tempDirectoryPath+"/"+name+System.currentTimeMillis());
     			if (cancel == null) {
     				cancel = new ICancellable() {
     					public boolean isCanceled() {
     						return false;
+    					}
     					public Object getID(){
     						return Utilities.class.getName();
+    					}
     				};
+    			}
     			Thread downloader = new Thread(new Downloader(url, data, f, cancel.getID()));
     			Thread monitor = new Thread(new Monitor(cancel));
     			monitor.start();
     			downloader.start();
     			while(!getCanceled(cancel.getID()) && downloader.isAlive()) {
     				try {
     					Thread.sleep(latency);
     				} catch (InterruptedException e) {
     					// TODO Auto-generated catch block
     					e.printStackTrace();
+    				}
+    			}
     			if (getCanceled(cancel.getID()))
     				return null;
     			downloader = null;
     			monitor = null;
     			if (Utilities.downloadException!=null) {
     				Exception e = Utilities.downloadException;
     				if (e instanceof FileNotFoundException)
     					throw (IOException) e;
     				else if (e instanceof IOException)
     					throw (IOException) e;
     				else if (e instanceof ConnectException)
     					throw (ConnectException) e;
     				else if (e instanceof UnknownHostException)
     					throw (UnknownHostException) e;
+    			}
     		} else {
     			System.out.println(url.toString()+" cached at '"+f.getAbsolutePath()+"'");
+    		}
     		return f;
+    	}
     	/**
     	 * Try if a group of downloads has been canceled
     	 * @param groupId
     	 * Group id
-...
     			downloadedFiles.remove(url);
+    	}
     	/**
     	 * Remove an URL from the system cache. The file will remain in the file
     	 * system for further eventual uses.
     	 * @param request
     	 */
     	public static void removeURL(Object url) {
     		if (downloadedFiles != null && downloadedFiles.containsKey(url))
     			downloadedFiles.remove(url);
+    	}
+    }
     final class Monitor implements Runnable {
-...
     	private URL url;
     	private File dstFile;
     	private Object groupID = null;
     	private String data = null;
     	public Downloader(URL url, File dstFile, Object groupID) {
     		this.url = url;
     		this.dstFile = dstFile;
-...
     		Utilities.downloadException = null;
+    	}
     	public Downloader(URL url, String data, File dstFile, Object groupID) {
     		this.url = url;
     		this.data = data;
     		this.dstFile = dstFile;
     		this.groupID = groupID;
     		Utilities.downloadException = null;
+    	}
     	public void run() {
     		System.out.println("downloading '"+url.toString()+"' to: "+dstFile.getAbsolutePath());
     		DataOutputStream dos;
     		try {
     			DataInputStream is;
     			OutputStreamWriter os = null;
     			HttpURLConnection connection = null;
     			//If the used protocol is HTTPS
     			if (url.getProtocol().equals("https")){
     				disableHttsValidation();
     				HttpsURLConnection connection = (HttpsURLConnection)url.openConnection();
+    			}
     			connection = (HttpURLConnection)url.openConnection();
     			//If it uses a HTTP POST
     			if (data != null){
     				connection.setRequestProperty("SOAPAction","post");
     				connection.setRequestMethod("POST");
     				connection.setDoOutput(true);
     				connection.setRequestProperty("Content-Type", "text/xml; charset=UTF-8");
     				os = new OutputStreamWriter(connection.getOutputStream());
     				os.write(data);
     				os.flush();
     				is = new DataInputStream(connection.getInputStream());
     			}else{
     				is = new DataInputStream(url.openStream());
+    			}
     			dos = new DataOutputStream( new BufferedOutputStream(new FileOutputStream(dstFile)));
     			byte[] buffer = new byte[1024*4];
-...
     				readed += i;
+    			}
     			if(os != null){
     				os.close();
+    			}
     			dos.close();
     			is.close();
     			is = null;

Also available in: Unified diff