Adding package declarations

scripting/workben/installer/Banner.java

+package installer;
+
 import java.awt.*;
 
 public class Banner extends Canvas

scripting/workben/installer/FileUpdater.java

+package installer;
+
 import java.io.*;
 
 public class FileUpdater {
@@ -157,7 +159,14 @@ public class FileUpdater {
 //<library:library library:name="Depot" xlink:href="file:///scriptdev/neil/openoffice1.0.1ScriptFrame/share/basic/Depot/script.xlb/" xlink:type="simple" library:link="true" library:readonly="false"/>
 //<library:library library:name="Standard" xlink:href="file:///scriptdev/neil/openoffice1.0.1ScriptFrame/user/basic/Standard/script.xlb/" xlink:type="simple" library:link="false"/>
                         //System.out.println(" <library:library library:name=\"ScriptBindingLibrary\" xlink:href=\"file://"+installPath+"/user/basic/ScriptBindingLibrary/script.xlb/\" xlink:type=\"simple\" library:link=\"false\"/>\n" );
-                        out.write(" <library:library library:name=\"ScriptBindingLibrary\" xlink:href=\"file://"+installPath+"/user/basic/ScriptBindingLibrary/script.xlb/\" xlink:type=\"simple\" library:link=\"false\"/>\n" );
+
+            String opSys = System.getProperty("os.name");
+            if (opSys.indexOf("Windows") != -1) {
+                out.write(" <library:library library:name=\"ScriptBindingLibrary\" library:link=\"false\"/>\n" );
+            }
+            else {
+                out.write(" <library:library library:name=\"ScriptBindingLibrary\" xlink:href=\"file://"+installPath+"/user/basic/ScriptBindingLibrary/script.xlb/\" xlink:type=\"simple\" library:link=\"false\"/>\n" );
+            }
                      }
                 }
             }
@@ -244,7 +253,13 @@ public class FileUpdater {
 //<library:library library:name="Depot" xlink:href="file:///scriptdev/neil/openoffice1.0.1ScriptFrame/share/basic/Depot/script.xlb/" xlink:type="simple" library:link="true" library:readonly="false"/>
 //<library:library library:name="Standard" xlink:href="file:///scriptdev/neil/openoffice1.0.1ScriptFrame/user/basic/Standard/script.xlb/" xlink:type="simple" library:link="false"/>
                         //System.out.println( " <library:library library:name=\"ScriptBindingLibrary\" xlink:href=\"file://"+installPath+"/user/basic/ScriptBindingLibrary/dialog.xlb/\" xlink:type=\"simple\" library:link=\"false\"/>\n" );
-                        out.write(" <library:library library:name=\"ScriptBindingLibrary\" xlink:href=\"file://"+installPath+"/user/basic/ScriptBindingLibrary/dialog.xlb/\" xlink:type=\"simple\" library:link=\"false\"/>\n" );
+            String opSys = System.getProperty("os.name");
+            if (opSys.indexOf("Windows") != -1) {
+                out.write(" <library:library library:name=\"ScriptBindingLibrary\" library:link=\"false\"/>\n" );
+            }
+            else {
+                out.write(" <library:library library:name=\"ScriptBindingLibrary\" xlink:href=\"file://"+installPath+"/user/basic/ScriptBindingLibrary/dialog.xlb/\" xlink:type=\"simple\" library:link=\"false\"/>\n" );
+            }
                      }
                 }
             }
@@ -265,4 +280,4 @@ public class FileUpdater {
         }// updateScriptXLC
 
 
-}
\ No newline at end of file
+}

scripting/workben/installer/Final.java

+package installer;
+
 /*
  * Welcome.java
  *
@@ -58,6 +60,7 @@ public class Final extends javax.swing.JPanel implements ActionListener, Install
     }
     
     public void actionPerformed(ActionEvent e) {
+    // navNext is "Install"
         if (e.getSource() == nav.navNext)
     {
             JProgressBar progressBar=new JProgressBar();
@@ -85,30 +88,42 @@ public class Final extends javax.swing.JPanel implements ActionListener, Install
         xud.start();
             }
         }
-    if (e.getSource() == nav.navCancel)
+    
+    // set to "Exit" at end of installation process
+    if (e.getSource() == nav.navCancel) {
+        int answer = JOptionPane.showConfirmDialog(wizard, "Are you sure you want to exit?");
+        if (answer == JOptionPane.YES_OPTION) 
         {
-            //xud.setSuspend();
-            int answer = JOptionPane.showConfirmDialog(wizard, "Are you sure you want to exit?");
-            if (answer == JOptionPane.YES_OPTION) 
-            {
-                wizard.exitForm(null);
-            } 
-            else 
-            {
-                return;
-            }
+            wizard.exitForm(null);
+        } 
+        else 
+        {
+            return;
+        }
     }
     }// actionPerformed
     
     
     public void installationComplete(InstallationEvent ev) {
         //System.out.println("Detected installation complete");
+    if( InstUtil.hasNetbeansInstallation() || InstUtil.hasJeditInstallation() ) {
+        //System.out.println("Detected installation complete (IDE(s) detected)");
+        nav.removeCancelListener(this);
+        nav.setCancelListener(nav);
+        nav.navCancel.setText("Finish");
+        nav.enableIDE(true);
+        nav.enableCancel(true);
+        xud = null;
+    }
+    else {
+        //System.out.println("Detected installation complete (No IDE(s) detected)");
         nav.removeCancelListener(this);
         nav.setCancelListener(nav);
-        nav.navCancel.setText("Exit");
+        nav.navCancel.setText("Finish");
         nav.enableCancel(true);
         xud = null;
     }
+    }
     
     // Variables declaration - do not modify//GEN-BEGIN:variables
     private javax.swing.JPanel statusPanel;
@@ -117,5 +132,5 @@ public class Final extends javax.swing.JPanel implements ActionListener, Install
     private NavPanel nav;
     private XmlUpdater xud;
     // End of variables declaration//GEN-END:variables
-        
+
 }

scripting/workben/installer/InstallListener.java

+package installer;
+
 public interface InstallListener
 {
     public void installationComplete(InstallationEvent e);

scripting/workben/installer/InstallWizard.java

+package installer;
+
 /*
  * InstallWizard.java
  *
@@ -65,7 +67,7 @@ public class InstallWizard extends javax.swing.JFrame implements ActionListener
     setBackground(new Color(0,0,0));
     locations = new ArrayList();
     //Point center = GraphicsEnvironment.getLocalGraphicsEnvironment().getCenterPoint();
-    Point center = new Point( 300, 300 );
+    Point center = new Point( 400, 400 );
     int windowWidth=200;
     int windowHeight=300;
     setSize(windowWidth,windowHeight);
@@ -113,23 +115,25 @@ public class InstallWizard extends javax.swing.JFrame implements ActionListener
         getContentPane().add(navigation, java.awt.BorderLayout.SOUTH);
         screens.setLayout(new java.awt.CardLayout());
         screens.add(WELCOME, new Welcome(this));
-        //screens.add("EULA", new EULA());
-    // ----------------
-    netbeansVersion = new NetbeansVersion(this);
-    screens.add(NETBEANSVERSIONS, netbeansVersion);
-        // ----------------
         version = new Version(this);
         screens.add(VERSIONS, version);
     _final = new Final(this);
         screens.add(FINAL, _final);
+
+    idewelcome = new IdeWelcome(this);
+        screens.add(IDEWELCOME, idewelcome);
+        ideversion = new IdeVersion(this);
+        screens.add(IDEVERSIONS, ideversion);
+    idefinal = new IdeFinal(this);
+        screens.add(IDEFINAL, idefinal);
         
         getContentPane().add(screens, java.awt.BorderLayout.CENTER);
 
     navNext.addActionListener(this);
-    navNext.addActionListener(netbeansVersion);
     navNext.addActionListener(version);
-    navNext.addActionListener(netbeansVersion);
     navNext.addActionListener(_final);
+    navNext.addActionListener(ideversion);
+    navNext.addActionListener(idefinal);    
     navCancel.addActionListener(this);
     navBack.addActionListener(this);
         
@@ -258,14 +262,18 @@ public class InstallWizard extends javax.swing.JFrame implements ActionListener
     private javax.swing.JPanel  screens;
 
     private Version version;
-    private NetbeansVersion netbeansVersion;
     private Final _final;
+    private IdeVersion ideversion;
+    private IdeFinal idefinal;
+    private IdeWelcome idewelcome;
     private static ArrayList locations;
 
     public static String VERSIONS = "VERSIONS";
     public static String WELCOME  = "WELCOME";
     public static String FINAL    = "FINAL";
-    public static String NETBEANSVERSIONS = "NETBEANSVERSIONS";
+    public static String IDEVERSIONS = "IDEVERSIONS";
+    public static String IDEWELCOME  = "IDEWELCOME";
+    public static String IDEFINAL    = "IDEFINAL";
     
     public static int DEFWIDTH     = 480;
     public static int DEFHEIGHT    = 240;

scripting/workben/installer/InstallationEvent.java

+package installer;
+
 public class InstallationEvent
 {
     private Object source;

scripting/workben/installer/NavPanel.java

+package installer;
+
 import javax.swing.*;
 import java.awt.*;
 import java.awt.event.*;
@@ -49,6 +51,10 @@ public class NavPanel extends JPanel implements ActionListener {
         navCancel.setEnabled(bEnable);
     }
     
+    public void enableIDE(boolean bEnable) {
+    ideDetected = bEnable;
+    }
+    
     public void actionPerformed(ActionEvent ev) {
         if ((ev.getSource() == navNext) && (next.length() != 0)) {
             wizard.show(next);
@@ -57,8 +63,14 @@ public class NavPanel extends JPanel implements ActionListener {
             wizard.show(prev);
         }
         if (ev.getSource() == navCancel) {
+        if( ideDetected ) {
+            wizard.show(InstallWizard.IDEWELCOME);
+        }
+        else {
             wizard.exitForm(null);
         }
+        enableIDE(false);
+        }
     }
     
     public void setNextListener(ActionListener listener) {
@@ -97,4 +109,5 @@ public class NavPanel extends JPanel implements ActionListener {
     private InstallWizard wizard;
     private String next;
     private String prev;
+    private boolean ideDetected = false;
 }

scripting/workben/installer/Navigation.java

+package installer;
+
 /*
  * Navigation.java
  *

scripting/workben/installer/Register.java

+package installer;
+
 import java.lang.String;
 import java.io.*;
 import javax.swing.*;
@@ -79,7 +81,7 @@ public class Register{
                 System.out.println( "Windows" );
         //path = "C:\\Progra~1\\OpenOffice.org643";
         //progpath = path + "\\program\\";
-        //System.out.println("\""+progpath+"regsingleton.exe\" \""+path+File.separator+"user"+File.separator+"uno_packages"+File.separator+"cache"+File.separator+"services.rdb\" \"drafts.com.sun.star.script.framework.theScriptRuntimeForJava=drafts.com.sun.star.script.framework.ScriptRuntimeForJava\"");
+        System.out.println("\""+progpath+"regsingleton.exe\" \""+path+File.separator+"user"+File.separator+"uno_packages"+File.separator+"cache"+File.separator+"services.rdb\" \"drafts.com.sun.star.script.framework.theScriptRuntimeForJava=drafts.com.sun.star.script.framework.ScriptRuntimeForJava\"");
         p=rt.exec("\""+progpath+"regsingleton.exe\" \""+path+File.separator+"user"+File.separator+"uno_packages"+File.separator+"cache"+File.separator+"services.rdb\" \"drafts.com.sun.star.script.framework.theScriptRuntimeForJava=drafts.com.sun.star.script.framework.ScriptRuntimeForJava\"");
         }
             exitcode=p.waitFor();   
@@ -102,7 +104,7 @@ public class Register{
             }
         else {
                 //System.out.println( "Windows" );
-        //System.out.println("\""+progpath+"regsingleton.exe\" \""+path+File.separator+"user"+File.separator+"uno_packages"+File.separator+"cache"+File.separator+"services.rdb\" \"drafts.com.sun.star.script.framework.storage.theScriptStorageManager=drafts.com.sun.star.script.framework.storage.ScriptStorageManager\"");
+        System.out.println("\""+progpath+"regsingleton.exe\" \""+path+File.separator+"user"+File.separator+"uno_packages"+File.separator+"cache"+File.separator+"services.rdb\" \"drafts.com.sun.star.script.framework.storage.theScriptStorageManager=drafts.com.sun.star.script.framework.storage.ScriptStorageManager\"");
                 p=rt.exec("\""+progpath+"regsingleton.exe\" \""+path+File.separator+"user"+File.separator+"uno_packages"+File.separator+"cache"+File.separator+"services.rdb\" \"drafts.com.sun.star.script.framework.storage.theScriptStorageManager=drafts.com.sun.star.script.framework.storage.ScriptStorageManager\"");
         }
             exitcode=p.waitFor();   

scripting/workben/installer/Version.java

+package installer;
+
 /*
  * Welcome.java
  *
@@ -76,12 +78,13 @@ public class Version extends javax.swing.JPanel implements ActionListener, Table
         //JScrollPane scroll = new JScrollPane(tableVersions);
         //versionPanel.add(scroll);
         versionPanel.add(tableVersions);
-        JTextArea area = new JTextArea("\n Please select the Office version you wish to Update \n ");
+        JTextArea area = new JTextArea("Please select the Office version you wish to Update");
         area.setLineWrap(true);
         area.setEditable(false);
         add(area, BorderLayout.NORTH);
         add(versionPanel, BorderLayout.CENTER);
-        nav = new NavPanel(wizard, true, false, true, InstallWizard.WELCOME, InstallWizard.FINAL);
+        //nav = new NavPanel(wizard, true, false, true, InstallWizard.WELCOME, InstallWizard.FINAL);
+    nav = new NavPanel(wizard, true, false, true, InstallWizard.WELCOME, InstallWizard.FINAL);
         nav.setNextListener(this);
         add(nav, BorderLayout.SOUTH);    
         

scripting/workben/installer/Welcome.java

+package installer;
+
 /*
  * Welcome.java
  *

scripting/workben/installer/XmlUpdater.java

+package installer;
+
 import java.io.*;
 import java.util.*;
 import java.util.jar.*;
@@ -174,6 +176,8 @@ public class XmlUpdater extends Thread {
         else
             System.out.println( "soffice.cfg exists" );
 
+// Robert Kinsella test 1
+
         //Adding <Office>/user/Scripts/java/
         File scriptsDir = new File( scriptsPath );
     File highlightDir = new File( scriptsPath+File.separator+"Highlight"+File.separator );
@@ -204,7 +208,12 @@ public class XmlUpdater extends Thread {
             onInstallComplete();
             return;
     }
-            if (opSys.indexOf("Windows")!=-1){
+        if (!zd.extractEntry("sframework/scripting64401.res",progpath+"resource"+File.separator, statusLabel))
+        {
+            onInstallComplete();
+            return;
+    }
+    if (opSys.indexOf("Windows")!=-1){
             if (!zd.extractEntry("windows/regsingleton.exe",progpath, statusLabel))
             {
                 onInstallComplete();
@@ -227,6 +236,7 @@ public class XmlUpdater extends Thread {
         }
 
 //--------------------------------
+// Robert Kinsella test 2
 
     // adding (JAVA) script examples
     File highlightScript = new File( scriptsPath+File.separator+"Highlight"+File.separator+"HighlightUtil.java" );
@@ -276,6 +286,7 @@ public class XmlUpdater extends Thread {
     else {
         System.out.println( "Spell script already deployed" );
         }
+
 //--------------------------------
 
     // Adding binding dialog

scripting/workben/installer/ZipData.java

+package installer;
+
 import java.io.*;
 import java.util.*;
 import java.util.zip.*;