INTEGRATION: CWS ooo19126 (1.1.90); FILE MERGED

2005/09/05 12:05:38 rt 1.1.90.1: #i54170# Change license header: remove SISSL

2 files changed, 154 insertions, 180 deletions

diff --git a/scripting/workben/installer/ExceptionTraceHelper.java b/scripting/workben/installer/ExceptionTraceHelper.java
index 8a9392e03320..61ed1ae769e3 100644
--- a/scripting/workben/installer/ExceptionTraceHelper.java
+++ b/scripting/workben/installer/ExceptionTraceHelper.java
@@ -1,62 +1,36 @@
 /*************************************************************************
 *
-*  $RCSfile: ExceptionTraceHelper.java,v $
-*
-*  $Revision: 1.1 $
-*
-*  last change: $Author: neilm $ $Date: 2002-11-21 18:00:13 $
-*
-*  The Contents of this file are made available subject to the terms of
-*  either of the following licenses
-*
-*         - GNU Lesser General Public License Version 2.1
-*         - Sun Industry Standards Source License Version 1.1
-*
-*  Sun Microsystems Inc., October, 2000
-*
-*  GNU Lesser General Public License Version 2.1
-*  =============================================
-*  Copyright 2000 by Sun Microsystems, Inc.
-*  901 San Antonio Road, Palo Alto, CA 94303, USA
-*
-*  This library is free software; you can redistribute it and/or
-*  modify it under the terms of the GNU Lesser General Public
-*  License version 2.1, as published by the Free Software Foundation.
-*
-*  This library 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
-*  Lesser General Public License for more details.
-*
-*  You should have received a copy of the GNU Lesser General Public
-*  License along with this library; if not, write to the Free Software
-*  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-*  MA  02111-1307  USA
-*
-*
-*  Sun Industry Standards Source License Version 1.1
-*  =================================================
-*  The contents of this file are subject to the Sun Industry Standards
-*  Source License Version 1.1 (the "License"); You may not use this file
-*  except in compliance with the License. You may obtain a copy of the
-*  License at http://www.openoffice.org/license.html.
-*
-*  Software provided under this License is provided on an "AS IS" basis,
-*  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-*  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
-*  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
-*  See the License for the specific provisions governing your rights and
-*  obligations concerning the Software.
-*
-*  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
-*
-*  Copyright: 2000 by Sun Microsystems, Inc.
-*
-*  All Rights Reserved.
-*
-*  Contributor(s): _______________________________________
-*
-*
+ *  OpenOffice.org - a multi-platform office productivity suite
+ *
+ *  $RCSfile: ExceptionTraceHelper.java,v $
+ *
+ *  $Revision: 1.2 $
+ *
+ *  last change: $Author: rt $ $Date: 2005-09-09 02:44:35 $
+ *
+ *  The Contents of this file are made available subject to
+ *  the terms of GNU Lesser General Public License Version 2.1.
+ *
+ *
+ *    GNU Lesser General Public License Version 2.1
+ *    =============================================
+ *    Copyright 2005 by Sun Microsystems, Inc.
+ *    901 San Antonio Road, Palo Alto, CA 94303, USA
+ *
+ *    This library is free software; you can redistribute it and/or
+ *    modify it under the terms of the GNU Lesser General Public
+ *    License version 2.1, as published by the Free Software Foundation.
+ *
+ *    This library 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
+ *    Lesser General Public License for more details.
+ *
+ *    You should have received a copy of the GNU Lesser General Public
+ *    License along with this library; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *    MA  02111-1307  USA
+ *
 ************************************************************************/
 package installer;
 import java.io.ByteArrayOutputStream;
diff --git a/scripting/workben/installer/IdeFinal.java b/scripting/workben/installer/IdeFinal.java
index 47728a90bdf2..d7b622a02bef 100644
--- a/scripting/workben/installer/IdeFinal.java
+++ b/scripting/workben/installer/IdeFinal.java
@@ -1,125 +1,125 @@
 package installer;
 
-/*

- * Welcome.java

- *

- * Created on 04 July 2002, 15:43

- */

-

-/**

- *

- * @author  mike

- */

-

-import java.awt.event.*;

-import java.util.*;

-import java.net.*;

-import javax.swing.*;

-

-public class IdeFinal extends javax.swing.JPanel implements ActionListener, InstallListener {

-    

-    /** Creates new form Welcome */

-    public IdeFinal(InstallWizard wizard) {

-        this.wizard = wizard;

-        setBackground(java.awt.Color.white);

-    ideupdater = null;

-        initComponents();

-    }

-    

-    /** This method is called from within the constructor to

-     * initialize the form.

-     * WARNING: Do NOT modify this code. The content of this method is

-     * always regenerated by the Form Editor.

-     */

-    private void initComponents() {//GEN-BEGIN:initComponents

-        statusPanel = new javax.swing.JPanel();

-    statusPanel.setBackground(java.awt.Color.white);

-        statusLine = new javax.swing.JLabel("Ready", javax.swing.JLabel.CENTER);

-        

-        setLayout(new java.awt.BorderLayout());

-        

-        statusPanel.setLayout(new java.awt.BorderLayout());

-        

-        statusLine.setText("Waiting to install IDE support.");

-        statusPanel.add(statusLine, java.awt.BorderLayout.CENTER);

-        

-        add(statusPanel, java.awt.BorderLayout.CENTER);

-    nav = new NavPanel(wizard, true, true, true, InstallWizard.IDEVERSIONS, "");

-    nav.setNextListener(this);

-    nav.removeCancelListener(nav);

-    nav.setCancelListener(this);

-    nav.navNext.setText("Install");

-    add(nav, java.awt.BorderLayout.SOUTH);

-    }//GEN-END:initComponents

-    

-    public java.awt.Dimension getPreferredSize() {

-        return new java.awt.Dimension(InstallWizard.DEFWIDTH, InstallWizard.DEFHEIGHT);

-    }

-    

-    public void actionPerformed(ActionEvent e) {

-    // navNext is "Install"

-        if (e.getSource() == nav.navNext)

-    {

-            JProgressBar progressBar=new JProgressBar();

-            progressBar.setMaximum(10);

-            progressBar.setValue(0);

-            statusPanel.add(progressBar, java.awt.BorderLayout.SOUTH);

-            nav.enableNext(false);

-            nav.enableBack(false);

-            nav.enableCancel(false);

-            ArrayList locations = wizard.getLocations();

-            //System.out.println("here "+locations.size());

-            // Returned 1

-            String progpath=null;

-            String path=null;

-            String classespath=null;

-            for (int i =0;i<locations.size();i++){

-                path= (String)locations.get(i);

-        

-            //InstallWizard.currentPath = path;

-            ideupdater = new IdeUpdater( path, statusLine, progressBar );   

-        ideupdater.addInstallListener(this);

-        InstallWizard.setInstallStarted(true);

-        //InstallWizard.setPatchedTypes(false);

-        //InstallWizard.setPatchedJava(false);

-        //InstallWizard.setPatchedRDB(false);

-        ideupdater.start();

-            }

-        }

-    

-    // 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) 

-        {

-            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.enableCancel(true);

-        ideupdater = null;

-    }

-    

-    // Variables declaration - do not modify//GEN-BEGIN:variables

-    private javax.swing.JPanel statusPanel;

-    private javax.swing.JLabel statusLine;

-    private InstallWizard wizard;

-    private NavPanel nav;

-    //private XmlUpdater xud;

-    private IdeUpdater ideupdater;

-    // End of variables declaration//GEN-END:variables

-

-}

+/*
+ * Welcome.java
+ *
+ * Created on 04 July 2002, 15:43
+ */
+
+/**
+ *
+ * @author  mike
+ */
+
+import java.awt.event.*;
+import java.util.*;
+import java.net.*;
+import javax.swing.*;
+
+public class IdeFinal extends javax.swing.JPanel implements ActionListener, InstallListener {
+
+    /** Creates new form Welcome */
+    public IdeFinal(InstallWizard wizard) {
+        this.wizard = wizard;
+        setBackground(java.awt.Color.white);
+    ideupdater = null;
+        initComponents();
+    }
+
+    /** This method is called from within the constructor to
+     * initialize the form.
+     * WARNING: Do NOT modify this code. The content of this method is
+     * always regenerated by the Form Editor.
+     */
+    private void initComponents() {//GEN-BEGIN:initComponents
+        statusPanel = new javax.swing.JPanel();
+    statusPanel.setBackground(java.awt.Color.white);
+        statusLine = new javax.swing.JLabel("Ready", javax.swing.JLabel.CENTER);
+
+        setLayout(new java.awt.BorderLayout());
+
+        statusPanel.setLayout(new java.awt.BorderLayout());
+
+        statusLine.setText("Waiting to install IDE support.");
+        statusPanel.add(statusLine, java.awt.BorderLayout.CENTER);
+
+        add(statusPanel, java.awt.BorderLayout.CENTER);
+    nav = new NavPanel(wizard, true, true, true, InstallWizard.IDEVERSIONS, "");
+    nav.setNextListener(this);
+    nav.removeCancelListener(nav);
+    nav.setCancelListener(this);
+    nav.navNext.setText("Install");
+    add(nav, java.awt.BorderLayout.SOUTH);
+    }//GEN-END:initComponents
+
+    public java.awt.Dimension getPreferredSize() {
+        return new java.awt.Dimension(InstallWizard.DEFWIDTH, InstallWizard.DEFHEIGHT);
+    }
+
+    public void actionPerformed(ActionEvent e) {
+    // navNext is "Install"
+        if (e.getSource() == nav.navNext)
+    {
+            JProgressBar progressBar=new JProgressBar();
+            progressBar.setMaximum(10);
+            progressBar.setValue(0);
+            statusPanel.add(progressBar, java.awt.BorderLayout.SOUTH);
+            nav.enableNext(false);
+            nav.enableBack(false);
+            nav.enableCancel(false);
+            ArrayList locations = wizard.getLocations();
+            //System.out.println("here "+locations.size());
+            // Returned 1
+            String progpath=null;
+            String path=null;
+            String classespath=null;
+            for (int i =0;i<locations.size();i++){
+                path= (String)locations.get(i);
+
+            //InstallWizard.currentPath = path;
+            ideupdater = new IdeUpdater( path, statusLine, progressBar );
+        ideupdater.addInstallListener(this);
+        InstallWizard.setInstallStarted(true);
+        //InstallWizard.setPatchedTypes(false);
+        //InstallWizard.setPatchedJava(false);
+        //InstallWizard.setPatchedRDB(false);
+        ideupdater.start();
+            }
+        }
+
+    // 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)
+        {
+            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.enableCancel(true);
+        ideupdater = null;
+    }
+
+    // Variables declaration - do not modify//GEN-BEGIN:variables
+    private javax.swing.JPanel statusPanel;
+    private javax.swing.JLabel statusLine;
+    private InstallWizard wizard;
+    private NavPanel nav;
+    //private XmlUpdater xud;
+    private IdeUpdater ideupdater;
+    // End of variables declaration//GEN-END:variables
+
+}