[ jEdit-commits ] SF.net SVN: jedit:[15968] plugins/Updater/trunk/src/updater

[<sh...@us...>]

Revision: 15968
          http://jedit.svn.sourceforge.net/jedit/?rev=15968&view=rev
Author:   shlomy
Date:     2009-08-18 17:57:42 +0000 (Tue, 18 Aug 2009)

Log Message:
-----------
Fix the launching of the installer. Send an "end of installer parameters" command to let the launcher launch the installer, where previously it waited until the stream was closed, which did not happen until the plugin was stopped.

Modified Paths:
--------------
    plugins/Updater/trunk/src/updater/InstallLauncher.java
    plugins/Updater/trunk/src/updater/UpdaterPlugin.java

Modified: plugins/Updater/trunk/src/updater/InstallLauncher.java
===================================================================
--- plugins/Updater/trunk/src/updater/InstallLauncher.java	2009-08-18 16:03:09 UTC (rev 15967)
+++ plugins/Updater/trunk/src/updater/InstallLauncher.java	2009-08-18 17:57:42 UTC (rev 15968)
@@ -36,6 +36,7 @@
 
 import javax.swing.JButton;
 import javax.swing.JDialog;
+import javax.swing.JOptionPane;
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
 import javax.swing.JTextArea;
@@ -45,6 +46,7 @@
 {
 	// Commands provided via standard input
 	public static final String LAUNCH_INSTALLER_NOW = "Launch Installer Now";
+	public static final String END_INSTALLER_PARAMS = "End Of sInstaller Parameters";
 	public static final String END_EXECUTION = "Exit Now";
 	public static final String SILENT_SHUTDOWN = "Shutdown Silently";
 	public static final String PROGRESS_INDICATOR = "*** Progress: ";
@@ -153,7 +155,11 @@
 			// Now get the installer parameters (installer file, install type,
 			// install dir).
 			while ((line = readLine(in)) != null)
+			{
+				if (line.equals(END_INSTALLER_PARAMS))
+					break;
 				params.add(line);
+			}
 			in.close();
 		}
 		catch (IOException e1)

Modified: plugins/Updater/trunk/src/updater/UpdaterPlugin.java
===================================================================
--- plugins/Updater/trunk/src/updater/UpdaterPlugin.java	2009-08-18 16:03:09 UTC (rev 15967)
+++ plugins/Updater/trunk/src/updater/UpdaterPlugin.java	2009-08-18 17:57:42 UTC (rev 15968)
@@ -156,6 +156,7 @@
 			appendText("auto");
 			appendText(installDir);
 		}
+		appendText(InstallLauncher.END_INSTALLER_PARAMS);
 		return true;
 	}
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.