/ - Diff - Application: gvSIG desktop - gvSIG

Revision 42681

+     *
      * Copyright (C) 2007-2013 gvSIG Association.
+     *
      * 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 3
      * of the License, or (at your option) any later version.
      * 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 3 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.
      * 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.
      * 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.
+     *
      * For any additional information, do not hesitate to contact us
      * at info AT gvsig.com, or visit our website www.gvsig.com.
      * For any additional information, do not hesitate to contact us at info AT
      * gvsig.com, or visit our website www.gvsig.com.
      */
     package org.gvsig.andamiupdater;
     import java.io.BufferedReader;
     import java.io.DataInputStream;
     import java.io.File;
     import java.io.FileInputStream;
     import java.io.FileOutputStream;
     import java.io.IOException;
     import java.io.InputStream;
     import java.io.InputStreamReader;
     import java.io.OutputStream;
     import java.lang.reflect.Method;
     import com.sardak.antform.AntForm;
     import com.sardak.antform.AntMenu;
     import java.io.Closeable;
     import java.io.FileInputStream;
     import java.io.FileOutputStream;
     import java.io.FileReader;
     import java.io.InputStream;
     import java.io.OutputStream;
     import static java.lang.System.in;
     import java.util.logging.Level;
     import java.util.logging.Logger;
     import org.apache.tools.ant.Project;
     import org.apache.tools.ant.ProjectHelper;
-...
     /**
      * @author gvSIG Team
      * @version $Id$
+     *
+     *
      */
     public class Updater {
-...
+        }
         private File getApplicationDirectory() {
             String appDir = new File("").getAbsolutePath();
             return new File(appDir);
             return new File("").getAbsoluteFile();
+        }
         private File getPluginsDirectory() {
-...
         private void launchApp(String[] args) throws Exception {
             try {
                 Class launcher_class = Class.forName("com.iver.andami.Launcher");
                 Class launcher_class = Class.forName("org.gvsig.andami.Launcher");
                 Object launcher = launcher_class.newInstance();
                 Method main =
                     launcher_class
                         .getMethod("main", new Class[] { String[].class });
                 Method main = launcher_class.getMethod("main", new Class[]{String[].class});
                 main.invoke(launcher, new Object[]{args});
                 main.invoke(launcher, new Object[] { args });
             } catch (ClassNotFoundException e) {
                 Class launcher_class = Class.forName("org.gvsig.andami.Launcher");
                 Class launcher_class = Class.forName("com.iver.andami.Launcher");
                 Object launcher = launcher_class.newInstance();
                 Method main =
                     launcher_class
                         .getMethod("main", new Class[] { String[].class });
                 main.invoke(launcher, new Object[] { args });
                 Method main = launcher_class.getMethod("main", new Class[]{String[].class});
                 main.invoke(launcher, new Object[]{args});
+            }
+        }
         /**
+         *
+         *
          */
         private void removeAll() {
             File updateDirectory =
                 new File(getApplicationDirectory().toString() + File.separator
                     + "update");
             File updateDirectory = new File(getApplicationDirectory(), "update");
             if (updateDirectory.exists()) {
                 deleteDir(updateDirectory);
+            }
+        }
         private boolean deleteDir(File dir) {
             if (dir.isDirectory()) {
                 String[] children = dir.list();
                 for (int i = 0; i < children.length; i++) {
                     boolean success = deleteDir(new File(dir, children[i]));
                     if (!success) {
                         return false;
         private boolean deleteDir(File folder) {
             if (folder == null) {
                 return true;
+            }
             try {
                 if (folder.isDirectory()) {
                     String[] children = folder.list();
                     for (String children1 : children) {
                         boolean success = deleteDir(new File(folder, children1));
                         if (!success) {
                             return false;
+                        }
+                    }
+                }
                 return folder.delete();
             } catch (Throwable th) {
                 this.warning("Can't remove '" + folder.getAbsolutePath() + "'.", th);
                 return false;
+            }
             // The directory is now empty so delete it
             return dir.delete();
+        }
         /**
-...
          * file that this line points to
          */
         private void executeScripts() {
             File updateFolder = new File(getApplicationDirectory(), "update");
             File antFilesScript = new File(updateFolder, "scripts.lst");
             String antFilesScriptPath =
                 getApplicationDirectory() + File.separator + "update"
                     + File.separator + "scripts.lst";
             File antFilesScript = new File(antFilesScriptPath);
             if (antFilesScript.exists()) {
                 BufferedReader reader = null;
                 try {
                     FileInputStream fstream = new FileInputStream(antFilesScript);
                     // Get the object of DataInputStream
                     DataInputStream in = new DataInputStream(fstream);
                     BufferedReader br =
                         new BufferedReader(new InputStreamReader(in));
                     String strLine;
                     // Read File Line By Line
                     while ((strLine = br.readLine()) != null) {
                         // Print the content on the console
                         File antFile = new File(strLine);
                         executeAntFile(antFile);
                     reader = new BufferedReader(new FileReader(antFilesScript));
                     String line;
                     while ((line = reader.readLine()) != null) {
                         File antFile = new File(line);
                         try {
                             executeAntFile(antFile);
                         } catch (Throwable th) {
                             this.warning("Error running file '" + antFile.getAbsolutePath() + "'.", th);
+                        }
+                    }
                     // Close the input stream
                     in.close();
                 } catch (Exception e) {// Catch exception if any
                     System.err.println("Error: " + e.getMessage());
                 } catch (Throwable th) {
                     this.warning("Error running ant scripts.", th);
                 } finally {
                     closeQuietly(reader, antFilesScript);
+                }
+            }
-...
         /**
          * Copies all files and folders from gvSIG/update to gvSIG/extensions
+         *
+         *
          * @throws IOException
+         *
+         *
          */
         private void copyFiles() throws IOException {
             File updateFolder =
                 new File(getApplicationDirectory().toString() + File.separator
                     + "update");
             File filesFolder =
                 new File(updateFolder.toString() + File.separator + "files");
             File updateFolder = new File(getApplicationDirectory(), "update");
             File filesFolder = new File(updateFolder, "files");
             File pluginsDirectory = getPluginsDirectory();
             if (updateFolder.exists()) {
                 String[] childrenDirs = filesFolder.list();
                 if (childrenDirs != null) {
                     for (int i = 0; i < childrenDirs.length; i++) {
                         File sourceLocation =
                             new File(filesFolder, childrenDirs[i]);
                         File targetLocation =
                             new File(pluginsDirectory, childrenDirs[i]);
                         // lo copio todo
                         copyFilesAndFolders(sourceLocation, targetLocation);
                     for (String childrenDir : childrenDirs) {
                         File sourceLocation = new File(filesFolder, childrenDir);
                         File targetLocation = new File(pluginsDirectory, childrenDir);
                         try {
                             copyFilesAndFolders(sourceLocation, targetLocation);
                         } catch (Throwable th) {
                             this.warning("Can't copy files to '" + targetLocation.getAbsolutePath() + "'.", th);
+                        }
+                    }
+                }
+            }
+        }
         private boolean copyFilesAndFolders(File sourceLocation, File targetLocation)
             throws IOException {
         private boolean copyFilesAndFolders(File source, File target)
                 throws IOException {
             if (sourceLocation.isDirectory()) {
                 if (!targetLocation.exists()) {
                     targetLocation.mkdir();
             if (source.isDirectory()) {
                 if (!target.exists()) {
                     target.mkdir();
+                }
                 String[] children = sourceLocation.list();
                 String[] children = source.list();
                 if (children != null) {
                     for (int i = 0; i < children.length; i++) {
                         copyFilesAndFolders(new File(sourceLocation, children[i]),
                             new File(targetLocation, children[i]));
                     for (String children1 : children) {
                         copyFilesAndFolders(
                                 new File(source, children1),
                                 new File(target, children1)
                         );
+                    }
+                }
             } else {
                 InputStream in = new FileInputStream(sourceLocation);
                 OutputStream out = new FileOutputStream(targetLocation);
                 InputStream in = null;
                 OutputStream out = null;
                 try {
                     in = new FileInputStream(source);
                     out = new FileOutputStream(target);
                 // Copy the bits from instream to outstream
                 byte[] buf = new byte[1024];
                 int len;
                 while ((len = in.read(buf)) > 0) {
                     out.write(buf, 0, len);
                     // Copy the bits from instream to outstream
                     byte[] buf = new byte[1024];
                     int len;
                     while ((len = in.read(buf)) > 0) {
                         out.write(buf, 0, len);
+                    }
                     in.close();
                     out.close();
                 } catch (Throwable th) {
                     this.warning("Can't copy '" + source + "' to '" + target + "'.", th);
                 } finally {
                     closeQuietly(in, source);
                     closeQuietly(out, target);
+                }
                 in.close();
                 out.close();
+            }
             return true;
+        }
         // PRIVATE VOID EXECUTEANTFILE(FILE FILE) {
         // PROJECT P = NEW PROJECT();
         // P.SETUSERPROPERTY("ANT.FILE", FILE.GETABSOLUTEPATH());
         // P.SETPROPERTY("GVSIG_DIR", GETAPPLICATIONDIRECTORY().GETABSOLUTEPATH());
         // P
         // .SETPROPERTY("EXTENSIONS_DIR", GETPLUGINSDIRECTORY()
         // .GETABSOLUTEPATH());
         // P.INIT();
         // PROJECTHELPER HELPER = PROJECTHELPER.GETPROJECTHELPER();
         // P.ADDREFERENCE("ANT.PROJECTHELPER", HELPER);
         // HELPER.PARSE(P, FILE);
         // P.EXECUTETARGET(P.GETDEFAULTTARGET());
         // }
         private void closeQuietly(Closeable closeable, File f) {
             if (closeable == null) {
                 return;
+            }
             try {
                 closeable.close();
             } catch (IOException ex) {
                 if (f == null) {
                     this.warning("Can't close file '" + closeable.toString() + "'.", ex);
                 } else {
                     this.warning("Can't close file '" + f.getAbsolutePath() + "'.", ex);
+                }
+            }
+        }
         private void executeAntFile(File file) {
             Project p = new Project();
             p.setUserProperty("ant.file", file.getAbsolutePath());
             p.setUserProperty("gvsig_dir", getApplicationDirectory()
                 .getAbsolutePath());
             p.setUserProperty("extensions_dir", getPluginsDirectory()
                 .getAbsolutePath());
             p.setUserProperty("gvsig_dir", getApplicationDirectory().getAbsolutePath());
             p.setUserProperty("extensions_dir", getPluginsDirectory().getAbsolutePath());
             p.init();
             p.setBaseDir(file.getParentFile());
             p.addTaskDefinition("antform", AntForm.class);
-...
             p.executeTarget(p.getDefaultTarget());
+        }
         private void warning(String message, Throwable th) {
             System.err.println(message);
             th.printStackTrace();
+        }
+    }

Also available in: Unified diff