Changeset 17805

Timestamp:

2008-11-11 12:16:22 (2 months ago)

Author:

oranfry

Message:

the uninstaller now gives output as it goes rather than all in one bang at the end

Files:

• release-kits/shared/uninstaller/Uninstaller.java (modified) (18 diffs)

release-kits/shared/uninstaller/Uninstaller.java

@@ -1 @@
-       
+
-import java.awt.*;
-import java.awt.event.*;
@@ -14 +14 @@
-import javax.swing.Box;
-import javax.swing.JDialog;
+import javax.swing.JMenuItem;
+import javax.swing.JPopupMenu;
+
-import java.io.File;
-import java.io.BufferedReader;
-import java.io.FileReader;
-
+
+
+
+
-import java.util.regex.Pattern;
-import java.util.regex.Matcher;
-import java.util.ArrayList;
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-public class Uninstaller {
@@ -61 +59 @@
-
-        JScrollPane logPane;
-
+Following
-        JButton uninstallButton;
+
+        boolean confirmationGiven = false;
+        Thread mainThread = null;
-        
-
-        public static void main( String[] args ) {
-                (new Uninstaller()).go();
@@ -70 +70 @@
-
-        public void go() {
+
+                mainThread = Thread.currentThread();
-
-                frame =  new JFrame();
@@ -91 +93 @@
-                logPane.setVerticalScrollBarPolicy(JScrollPane.VERTICAL_SCROLLBAR_ALWAYS);
-                progressPanel.add( BorderLayout.NORTH, new JLabel("Progress") );
-
+Pane
-
-                //initial toolbar
@@ -148 +150 @@
-                        System.exit(0);
-                }
+
+                //block and wait for signal to do the uninstall
+                do {
+                        try {
+                                Thread.sleep( Long.MAX_VALUE );
+                        } catch ( InterruptedException ie ) {
+                        }
+                } while ( !confirmationGiven );
+
+                doUninstall();
-
-        }
@@ -208 +220 @@
-                        frame.getContentPane().remove(introPanel);
-                        frame.getContentPane().add( BorderLayout.CENTER, progressPanel );
-
-
-
-
+
+
+
+
+
+
+
-                }
-        }
@@ -221 +236 @@
-
-                if ( !gs2InstallProps.exists() && !gs3InstallProps.exists() ) {
-.append
+
-                        JOptionPane.showMessageDialog(frame, bundle.getString("uninstaller.error.couldnt.find.install.props"), bundle.getString("uninstaller.error"), 0);
-                        return false;
@@ -227 +242 @@
-                return true;
-                                
+        }
+
+        public void log( String s ) {
+                SwingUtilities.invokeLater( new LogAppender( s ) );
+                //log.append( s );
+                
-        }
-
@@ -257 +278 @@
-
-                if ( startMenuPath == null ) {
-
-
+
+
+
-                } else {
-.append
-
+
+
-                        try {
-                                recursiveDelete( startMenuPath, null );
-                        } catch ( CancelledException ce ) {
-.append
+
-                                changeToFinishToolbar();
-                                JOptionPane.showMessageDialog(frame, bundle.getString("uninstaller.cancelled"), bundle.getString("uninstaller.complete"), 1);
@@ -310 +332 @@
-                        recursiveDelete( cd , ex );
-                } catch ( CancelledException ce ) {
-
-
+
-                        JOptionPane.showMessageDialog(frame, bundle.getString("uninstaller.cancelled"), bundle.getString("uninstaller.complete"), 1);
-                        changeToFinishToolbar();
@@ -321 +342 @@
-                        (new File("uninst.flag")).createNewFile();
-                } catch (Exception e) {
-
-
+
-                }
-
-                changeToFinishToolbar();
+                log( bundle.getString("uninstaller.finished") );
-                JOptionPane.showMessageDialog(frame, bundle.getString("uninstaller.finished"), bundle.getString("uninstaller.complete"), 1);
+        }
+
+        class LogAppender implements Runnable {
+                String s;
+
+                public LogAppender( String s ) {
+                        this.s = s;
+                }
+
+                public void run() {
+                        log.append( s );
+                }
+
-        }
-
@@ -373 +407 @@
-                // Make sure the file or directory exists
-                if (!f.exists()) {
-
-
+
-                        return;
-                }
@@ -384 +417 @@
-                                try {
-                                        if ( f.equals( exceptions[i] ) || f.getCanonicalPath().equals(exceptions[i].getCanonicalPath()) ) {
-.append
+
-                                                return;
-                                        }
@@ -396 +429 @@
-                //check existance
-                if ( !f.exists() ) {
-
-
+
-                        return;
-                }
@@ -426 +458 @@
-                        Object[] options = null;
-                        int n = 0;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-                        }
-                }
@@ -511 +495 @@
-}
-
-
-
-
-
+
-
-    private boolean follow = true;
@@ -561 +542 @@
-    private JPopupMenu getPopupMenu() {
-        JPopupMenu contextMenu = new JPopupMenu("Options");
-        JMenuItem saveMenu = new JMenuItem("Save Text");
-/*
-        saveMenu.addActionListener(new ActionListener() {
-            public void actionPerformed(ActionEvent e) {
-                SelectFileAction action = new SelectFileAction("Save Output", null, null);
-                try {
-                    action.actionPerformed(new ActionEvent(this, 0, "Save Output"));
-                    if (action.selectedFile != null) {
-                        FileWriter fos = new FileWriter(action.selectedFile);
-                        fos.write(getText());
-                        fos.close();
-                    }
-
-                }
-                catch (FileNotFoundException ex) {
-                    System.err.println("FileNotFoundException");
-                }
-                catch (IOException ex) {
-                    System.err.println("IOException");
-                }
-            }
-        });
-        contextMenu.add(saveMenu);
-*/
-
-        JMenuItem toggleFollowMenu = new JMenuItem("Toggle Follow");