1 files changed, 118 insertions, 101 deletions
diff --git a/scripting/workben/installer/FileUpdater.java b/scripting/workben/installer/FileUpdater.java
index 5c628dbd89c4..6ba73692ca99 100644
--- a/scripting/workben/installer/FileUpdater.java
+++ b/scripting/workben/installer/FileUpdater.java
@@ -26,141 +26,158 @@ public class FileUpdater {
 
 
 
-        public static boolean updateScriptXLC( String installPath, JLabel statusLabel ) {
+    public static boolean updateScriptXLC(String installPath, JLabel statusLabel) {
 
-            File in_file = null;
-            File out_file = null;
-            FileWriter out = null;
-            int count = 0;
+        File in_file = null;
+        File out_file = null;
+        FileWriter out = null;
+        int count = 0;
+
+        try {
+            in_file = new File(installPath + File.separator + "user" + File.separator +
+                               "basic" + File.separator + "script.xlc");
+
+            String[] xmlArray = new String[50];
 
             try {
-                in_file = new File( installPath+File.separator+"user"+File.separator+"basic"+File.separator+"script.xlc" );
+                BufferedReader reader = new BufferedReader(new FileReader(in_file));
+                count = -1;
 
-        String[] xmlArray = new String[50];
-        try {
-            BufferedReader reader = new BufferedReader(new FileReader(in_file));
-            count = -1;
-            for (String s = reader.readLine(); s != null; s = reader.readLine()) { //</oor:node>
-                count = count + 1;
-                xmlArray[count] = s;
+                for (String s = reader.readLine(); s != null;
+                     s = reader.readLine()) { //</oor:node>
+                    count = count + 1;
+                    xmlArray[count] = s;
+                }
+
+                reader.close();
+            } catch (IOException ioe) {
+                String message = "Error reading script.xlc, please view SFrameworkInstall.log.";
+                System.out.println(message);
+                ioe.printStackTrace();
+                statusLabel.setText(message);
+                return false;
             }
-            reader.close();
-        }
-        catch( IOException ioe ) {
-            String message = "Error reading script.xlc, please view SFrameworkInstall.log.";
-            System.out.println(message);
-            ioe.printStackTrace();
-            statusLabel.setText(message);
-            return false;
-        }
 
-        in_file.delete();
+            in_file.delete();
 
-                out_file = new File( installPath+File.separator+"user"+File.separator+"basic"+File.separator+"script.xlc" );
-                out_file.createNewFile();
-                out = new FileWriter( out_file );
+            out_file = new File(installPath + File.separator + "user" + File.separator +
+                                "basic" + File.separator + "script.xlc");
+            out_file.createNewFile();
+            out = new FileWriter(out_file);
 
-                //split the string into a string array with one line of xml in each element
-        for(int i=0; i<count + 1; i++) {
-                    out.write(xmlArray[i]+"\n");
-                    if( ( xmlArray[i].indexOf( "<library:libraries xmlns:library" ) != -1 ) && ( xmlArray[i+1].indexOf( "ScriptBindingLibrary" ) == -1 ) ) {
-            String opSys = System.getProperty("os.name");
-            if (opSys.indexOf("Windows") != -1) {
-                out.write(" <library:library library:name=\"ScriptBindingLibrary\" library:link=\"true\"/>\n" );
-            }
-            else {
-                out.write(" <library:library library:name=\"ScriptBindingLibrary\" xlink:href=\"file://"+installPath+"/share/basic/ScriptBindingLibrary/script.xlb/\" xlink:type=\"simple\" library:link=\"true\"/>\n" );
-            }
-                     }
+            //split the string into a string array with one line of xml in each element
+            for (int i = 0; i < count + 1; i++) {
+                out.write(xmlArray[i] + "\n");
+
+                if ((xmlArray[i].indexOf("<library:libraries xmlns:library") != -1)
+                    && (xmlArray[i + 1].indexOf("ScriptBindingLibrary") == -1)) {
+                    String opSys = System.getProperty("os.name");
+
+                    if (opSys.indexOf("Windows") != -1) {
+                        out.write(" <library:library library:name=\"ScriptBindingLibrary\" library:link=\"true\"/>\n");
+                    } else {
+                        out.write(" <library:library library:name=\"ScriptBindingLibrary\" xlink:href=\"file://"
+                                  + installPath +
+                                  "/share/basic/ScriptBindingLibrary/script.xlb/\" xlink:type=\"simple\" library:link=\"true\"/>\n");
+                    }
                 }
             }
-            catch( Exception e ) {
-            String message = "\nError updating script.xlc, please view SFrameworkInstall.log.";
+        } catch (Exception e) {
+            String message =
+                "\nError updating script.xlc, please view SFrameworkInstall.log.";
             System.out.println(message);
             e.printStackTrace();
             statusLabel.setText(message);
             return false;
+        } finally {
+            try {
+                out.close();
+            } catch (Exception e) {
+                System.out.println("Update Script.xlc Failed, please view SFrameworkInstall.log.");
+                e.printStackTrace();
+                System.err.println(e);
             }
-            finally {
-                try {
-                    out.close();
-                }
-                catch(Exception e) {
-                    System.out.println("Update Script.xlc Failed, please view SFrameworkInstall.log.");
-            e.printStackTrace();
-                    System.err.println(e);
-                }
-            }
+        }
+
         return true;
-        }// updateScriptXLC
+    }// updateScriptXLC
 
 
-        public static boolean updateDialogXLC( String installPath, JLabel statusLabel ) {
-            File in_file = null;
-            File out_file = null;
-            FileWriter out = null;
-            int count = 0;
+    public static boolean updateDialogXLC(String installPath, JLabel statusLabel) {
+        File in_file = null;
+        File out_file = null;
+        FileWriter out = null;
+        int count = 0;
+
+        try {
+            in_file = new File(installPath + File.separator + "user" + File.separator +
+                               "basic" + File.separator + "dialog.xlc");
+
+            String[] xmlArray = new String[50];
 
             try {
-                in_file = new File( installPath+File.separator+"user"+File.separator+"basic"+File.separator+"dialog.xlc" );
+                BufferedReader reader = new BufferedReader(new FileReader(in_file));
+                count = -1;
 
-        String[] xmlArray = new String[50];
-        try {
-            BufferedReader reader = new BufferedReader(new FileReader(in_file));
-            count = -1;
-             for (String s = reader.readLine(); s != null; s = reader.readLine()) {
-                count = count + 1;
-                xmlArray[count] = s;
+                for (String s = reader.readLine(); s != null; s = reader.readLine()) {
+                    count = count + 1;
+                    xmlArray[count] = s;
+                }
+
+                reader.close();
+            } catch (IOException ioe) {
+
+                String message =
+                    "\nError reading dialog.xlc, please view SFrameworkInstall.log.";
+                System.out.println(message);
+                statusLabel.setText(message);
+                return false;
             }
-             reader.close();
-        }
-        catch( IOException ioe ) {
 
-            String message = "\nError reading dialog.xlc, please view SFrameworkInstall.log.";
-            System.out.println(message);
-            statusLabel.setText(message);
-            return false;
-        }
-                in_file.delete();
+            in_file.delete();
 
-                out_file = new File( installPath+File.separator+"user"+File.separator+"basic"+File.separator+"dialog.xlc" );
-                out_file.createNewFile();
+            out_file = new File(installPath + File.separator + "user" + File.separator +
+                                "basic" + File.separator + "dialog.xlc");
+            out_file.createNewFile();
 
-                out = new FileWriter( out_file );
+            out = new FileWriter(out_file);
 
-                //split the string into a string array with one line of xml in each element
-        for(int i=0; i<count + 1; i++) {
-                    out.write(xmlArray[i]+"\n");
-                    if( ( xmlArray[i].indexOf( "<library:libraries xmlns:library" ) != -1 ) && ( xmlArray[i+1].indexOf( "ScriptBindingLibrary" ) == -1 ) ) {
-            String opSys = System.getProperty("os.name");
-            if (opSys.indexOf("Windows") != -1) {
-                out.write(" <library:library library:name=\"ScriptBindingLibrary\" library:link=\"true\"/>\n" );
-            }
-            else {
-                out.write(" <library:library library:name=\"ScriptBindingLibrary\" xlink:href=\"file://"+installPath+"/share/basic/ScriptBindingLibrary/dialog.xlb/\" xlink:type=\"simple\" library:link=\"true\"/>\n" );
-            }
-                     }
+            //split the string into a string array with one line of xml in each element
+            for (int i = 0; i < count + 1; i++) {
+                out.write(xmlArray[i] + "\n");
+
+                if ((xmlArray[i].indexOf("<library:libraries xmlns:library") != -1)
+                    && (xmlArray[i + 1].indexOf("ScriptBindingLibrary") == -1)) {
+                    String opSys = System.getProperty("os.name");
+
+                    if (opSys.indexOf("Windows") != -1) {
+                        out.write(" <library:library library:name=\"ScriptBindingLibrary\" library:link=\"true\"/>\n");
+                    } else {
+                        out.write(" <library:library library:name=\"ScriptBindingLibrary\" xlink:href=\"file://"
+                                  + installPath +
+                                  "/share/basic/ScriptBindingLibrary/dialog.xlb/\" xlink:type=\"simple\" library:link=\"true\"/>\n");
+                    }
                 }
             }
-            catch( Exception e ) {
-            String message = "\nError updating dialog.xlc, please view SFrameworkInstall.log.";
+        } catch (Exception e) {
+            String message =
+                "\nError updating dialog.xlc, please view SFrameworkInstall.log.";
             System.out.println(message);
             e.printStackTrace();
             statusLabel.setText(message);
             return false;
+        } finally {
+            try {
+                out.close();
+            } catch (Exception e) {
+                System.out.println("Update dialog.xlc Failed, please view SFrameworkInstall.log.");
+                e.printStackTrace();
+                System.err.println(e);
             }
-            finally {
-                try {
-                    out.close();
-                }
-                catch(Exception e) {
-                    System.out.println("Update dialog.xlc Failed, please view SFrameworkInstall.log.");
-            e.printStackTrace();
-                    System.err.println(e);
-                }
-            }
+        }
+
         return true;
-        }// updateScriptXLC
+    }// updateScriptXLC
 
 
 }