/branches/v10/frameworks/_fwAndami/src/com/iver/andami/Utilities.java - Diff - Application: gvSIG desktop - gvSIG

Revision 7513 branches/v10/frameworks/_fwAndami/src/com/iver/andami/Utilities.java

         /** DOCUMENT ME! */
         private static Logger logger = Logger.getLogger(Utilities.class.getName());
     	private static final String tempDirectoryPath = System.getProperty("java.io.tmpdir")+"/tmp-andami";
         /**
          * Crea un icono a partir del path de una imagen
+         *
-...
         public static void cleanComponent(Component baseComponent) {
             try {
                 cleanComponent(baseComponent, 0);
             } catch (Exception ignore) { // give some exception handling...
             } catch (Exception ignore) { // give some exception handling...
+            }
+        }
         /*    * The "depth" parameter was being used for text output debugging.    * But isn't essential now.  I'll keep it anyways, as it avoids    * calling the garbage collector every recursion.    */
         protected static void cleanComponent(Component baseComponent, int depth) {
             if (baseComponent == null) // recursion terminating clause
             if (baseComponent == null) // recursion terminating clause
+             {
                 return;
+            }
             if (baseComponent instanceof IWindow){
             	return;
+            }
-...
             Component[] childComponents;
             int numChildren; // clean up component containers
             if (baseComponent instanceof Container) { // now clean up container instance variables
             if (baseComponent instanceof Container) { // now clean up container instance variables
                 if (baseComponent instanceof RootPaneContainer) { // Swing specialised container
                 if (baseComponent instanceof RootPaneContainer) { // Swing specialised container
                     cont = (Container) baseComponent;
                     numChildren = cont.getComponentCount();
                     childComponents = cont.getComponents();
                     for (int i = 0; i < numChildren; i++) { // remove each component from the current container
                     for (int i = 0; i < numChildren; i++) { // remove each component from the current container
                         // each child component may be a container itself
                         // each child component may be a container itself
                         cleanComponent(childComponents[i], depth + 1);
                         ((RootPaneContainer) cont).getContentPane().remove(childComponents[i]);
+                    }
                     ((RootPaneContainer) cont).getContentPane().setLayout(null);
                 } else { // General Swing, and AWT, Containers
                 } else { // General Swing, and AWT, Containers
                     cont = (Container) baseComponent;
                     numChildren = cont.getComponentCount();
                     childComponents = cont.getComponents();
                     for (int i = 0; i < numChildren; i++) //for(int i = 0;i < numChildren;i++)
                     for (int i = 0; i < numChildren; i++) //for(int i = 0;i < numChildren;i++)
+                     {
                         // remove each component from the current container                    // each child component may be a container itself
                         // remove each component from the current container                    // each child component may be a container itself
                         cleanComponent(childComponents[i], depth + 1);
                         cont.remove(childComponents[i]);
+                    }
-...
+                }
+            }
             // if component is also a container
             // if component is also a container
+        }
         /**
          * Extrae un fichero zip en un directorio
+         *
-...
          * @throws IOException Si se produce un error de entrada salida gen?rico
          */
         public static void extractTo(File file, File dir, SplashWindow splash)
             throws ZipException, IOException {
             ZipFile zip = new ZipFile(file);
             Enumeration e = zip.entries();
     			throws ZipException, IOException {
     		ZipFile zip = new ZipFile(file);
     		Enumeration e = zip.entries();
             while (e.hasMoreElements()) {
                 ZipEntry entry = (ZipEntry) e.nextElement();
                 System.out.println("Procesando " + entry.getName() + "...");
                 splash.process(30, "Procesando " + entry.getName() + "...");
                 if (entry.isDirectory()) {
                     new File(dir.getAbsolutePath() + File.separator +
                         entry.getName()).mkdir();
                 } else {
                     InputStream in = zip.getInputStream(entry);
                     OutputStream out = new FileOutputStream(dir + File.separator +
                             entry.getName());
                     BufferedInputStream bin = new BufferedInputStream(in);
                     BufferedOutputStream bout = new BufferedOutputStream(out);
     		// Pasada para crear las carpetas
     		while (e.hasMoreElements()) {
     			ZipEntry entry = (ZipEntry) e.nextElement();
                     int i;
     			if (entry.isDirectory()) {
     				File directorio = new File(dir.getAbsolutePath()
     						+ File.separator + entry.getName());
                     while ((i = bin.read()) != -1) {
                         bout.write(i);
+                    }
     				directorio.mkdirs();
+    			}
                     bout.flush();
                     bout.close();
                     bin.close();
+                }
+            }
+        }
+    		}
     		// Pasada para crear los ficheros
     		e = zip.entries();
     		while (e.hasMoreElements()) {
     			ZipEntry entry = (ZipEntry) e.nextElement();
     			splash.process(30, "Procesando " + entry.getName() + "...");
     			if (!entry.isDirectory()) {
     				InputStream in = zip.getInputStream(entry);
     				OutputStream out = new FileOutputStream(dir + File.separator
     						+ entry.getName());
     				BufferedInputStream bin = new BufferedInputStream(in);
     				BufferedOutputStream bout = new BufferedOutputStream(out);
     				int i;
     				while ((i = bin.read()) != -1) {
     					bout.write(i);
+    				}
     				bout.flush();
     				bout.close();
     				bin.close();
+    			}
+    		}
     		zip.close();
     		zip = null;
     		System.gc();
+    	}
         /**
          * Returns the content of this URL as a file from the file system.<br>
          * <p>
          * If the URL has been already downloaded in this session and notified
          * If the URL has been already downloaded in this session and notified
          * to the system using the static <b>Utilities.addDownloadedURL(URL)</b>
          * method, it can be restored faster from the file system avoiding to
          * download it again.
-...
+            }
             return f;
+        }
         /**
          * Adds an URL to the table of downloaded files for further uses. If the URL
          * already exists in the table its filePath value is updated to the new one and
          * the old file itself is removed from the file system.
+         *
+         *
          * @param url
          * @param filePath
          */
-...
+            }
             */
+        }
         /**
          * Downloads an URL into a temporary file that is removed the next time the
          * Downloads an URL into a temporary file that is removed the next time the
          * tempFileManager class is called, which means the next time gvSIG is launched.
+         *
+         *
          * @param url
          * @param name
          * @return
-...
     	        	File tempDirectory = new File(tempDirectoryPath);
     	        	if (!tempDirectory.exists())
     	        		tempDirectory.mkdir();
     	        	f = new File(tempDirectoryPath+"/"+name+System.currentTimeMillis());
     	            System.out.println("downloading '"+url.toString()+"' to: "+f.getAbsolutePath());
     	            f.deleteOnExit();
                     DataOutputStream dos = new DataOutputStream( new BufferedOutputStream(new FileOutputStream(f)));
                     byte[] buffer = new byte[1024*256];
-...
     	    } catch (IOException io) {
     	    	io.printStackTrace();
+    	    }
     	    return f;
+    	}
-...
         public static void cleanUpTempFiles() {
         	try{
         		File tempDirectory = new File(tempDirectoryPath);
         		File[] files = tempDirectory.listFiles();
         		if (files!=null) {
         			for (int i = 0; i < files.length; i++) {
-...
+        		}
         		tempDirectory.delete();
         	} catch (Exception e) {	}
+        }
         /**
          * Recursive directory delete.
-...
     			if (files[i].isDirectory()) deleteDirectory(files[i]);
     			files[i].delete();
+    		}
+    	}
         /**
          * Crea un fichero temporal con un nombre concreto y unos datos pasados por
          * par?metro.
-...
     		dos.close();
         	f.deleteOnExit();
+        }
         /**
          * Remove an URL from the system cache. The file will remain in the file
          * system for further eventual uses.

Also available in: Unified diff