Sun Mar 12 18:31:40 CET 2006

Update of /cvsroot/izpack/izpack-src/src/lib/com/izforge/izpack/panels
In directory sheep:/tmp/cvs-serv10032/src/lib/com/izforge/izpack/panels

Modified Files:
	CheckedHelloPanel.java CompilePanel.java 
	CompilePanelAutomationHelper.java 
	ConditionalUserInputPanel.java ExtendedInstallPanel.java 
	FinishPanel.java HTMLInfoPanel.java HTMLLicencePanel.java 
	HelloPanel.java ImgPacksPanel.java 
	ImgPacksPanelAutomationHelper.java InfoPanel.java 
	InstallPanel.java InstallPanelAutomationHelper.java 
	JDKPathPanel.java LicencePanel.java PacksModel.java 
	PacksPanel.java PacksPanelAutomationHelper.java 
	PacksPanelBase.java PacksPanelInterface.java 
	PasswordGroup.java PathInputPanel.java PathSelectionPanel.java 
	ProcessPanel.java ProcessPanelAutomationHelper.java 
	ProcessingClient.java Processor.java RuleInputField.java 
	RuleTextField.java ShortcutData.java ShortcutPanel.java 
	SimpleFinishPanel.java SudoPanel.java SummaryPanel.java 
	TargetPanel.java TargetPanelAutomationHelper.java 
	UserInputPanel.java UserInputPanelAutomationHelper.java 
	Validator.java XInfoPanel.java 
Log Message:
Synchronizing HEAD from the changes in branch-3-8.


Index: CheckedHelloPanel.java
===================================================================
RCS file: /cvsroot/izpack/izpack-src/src/lib/com/izforge/izpack/panels/CheckedHelloPanel.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5

--- CheckedHelloPanel.java	4 Sep 2005 02:06:46 -0000	1.4
+++ CheckedHelloPanel.java	12 Mar 2006 16:32:25 -0000	1.5
@@ -1,6 +1,6 @@
 /*
  * $Id$
- * IzPack - Copyright 2001-2005 Julien Ponge, All Rights Reserved.
+ * IzPack - Copyright 2001-2006 Julien Ponge, All Rights Reserved.
  * 
  * http://www.izforge.com/izpack/ http://developer.berlios.de/projects/izpack/
  * 

Index: CompilePanel.java
===================================================================
RCS file: /cvsroot/izpack/izpack-src/src/lib/com/izforge/izpack/panels/CompilePanel.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- CompilePanel.java	25 Jul 2005 04:16:11 -0000	1.12
+++ CompilePanel.java	12 Mar 2006 16:32:25 -0000	1.13
@@ -1,5 +1,5 @@
 /*
- * IzPack - Copyright 2001-2005 Julien Ponge, All Rights Reserved.
+ * IzPack - Copyright 2001-2006 Julien Ponge, All Rights Reserved.
  * 
  * http://www.izforge.com/izpack/
  * http://developer.berlios.de/projects/izpack/

Index: CompilePanelAutomationHelper.java
===================================================================
RCS file: /cvsroot/izpack/izpack-src/src/lib/com/izforge/izpack/panels/CompilePanelAutomationHelper.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- CompilePanelAutomationHelper.java	6 May 2005 20:09:08 -0000	1.8
+++ CompilePanelAutomationHelper.java	12 Mar 2006 16:32:25 -0000	1.9
@@ -1,6 +1,6 @@
 /*
  /*
- * IzPack - Copyright 2001-2005 Julien Ponge, All Rights Reserved.
+ * IzPack - Copyright 2001-2006 Julien Ponge, All Rights Reserved.
  * 
  * http://www.izforge.com/izpack/
  * http://developer.berlios.de/projects/izpack/

Index: ConditionalUserInputPanel.java
===================================================================
RCS file: /cvsroot/izpack/izpack-src/src/lib/com/izforge/izpack/panels/ConditionalUserInputPanel.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- ConditionalUserInputPanel.java	25 Jul 2005 04:16:11 -0000	1.5
+++ ConditionalUserInputPanel.java	12 Mar 2006 16:32:25 -0000	1.6
@@ -1,5 +1,5 @@
 /*
- * IzPack - Copyright 2001-2005 Julien Ponge, All Rights Reserved.
+ * IzPack - Copyright 2001-2006 Julien Ponge, All Rights Reserved.
  * 
  * http://www.izforge.com/izpack/
  * http://developer.berlios.de/projects/izpack/

Index: ExtendedInstallPanel.java
===================================================================
RCS file: /cvsroot/izpack/izpack-src/src/lib/com/izforge/izpack/panels/ExtendedInstallPanel.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- ExtendedInstallPanel.java	6 May 2005 20:09:08 -0000	1.3
+++ ExtendedInstallPanel.java	12 Mar 2006 16:32:25 -0000	1.4
@@ -1,5 +1,5 @@
 /*
- * IzPack - Copyright 2001-2005 Julien Ponge, All Rights Reserved.
+ * IzPack - Copyright 2001-2006 Julien Ponge, All Rights Reserved.
  * 
  * http://www.izforge.com/izpack/
  * http://developer.berlios.de/projects/izpack/

Index: FinishPanel.java
===================================================================
RCS file: /cvsroot/izpack/izpack-src/src/lib/com/izforge/izpack/panels/FinishPanel.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- FinishPanel.java	6 May 2005 20:09:08 -0000	1.23
+++ FinishPanel.java	12 Mar 2006 16:32:25 -0000	1.24
@@ -1,5 +1,5 @@
 /*
- * IzPack - Copyright 2001-2005 Julien Ponge, All Rights Reserved.
+ * IzPack - Copyright 2001-2006 Julien Ponge, All Rights Reserved.
  * 
  * http://www.izforge.com/izpack/
  * http://developer.berlios.de/projects/izpack/

Index: HTMLInfoPanel.java
===================================================================
RCS file: /cvsroot/izpack/izpack-src/src/lib/com/izforge/izpack/panels/HTMLInfoPanel.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- HTMLInfoPanel.java	6 May 2005 20:09:08 -0000	1.16
+++ HTMLInfoPanel.java	12 Mar 2006 16:32:25 -0000	1.17
@@ -1,5 +1,5 @@
 /*
- * IzPack - Copyright 2001-2005 Julien Ponge, All Rights Reserved.
+ * IzPack - Copyright 2001-2006 Julien Ponge, All Rights Reserved.
  * 
  * http://www.izforge.com/izpack/
  * http://developer.berlios.de/projects/izpack/

Index: HTMLLicencePanel.java
===================================================================
RCS file: /cvsroot/izpack/izpack-src/src/lib/com/izforge/izpack/panels/HTMLLicencePanel.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- HTMLLicencePanel.java	6 May 2005 20:09:08 -0000	1.18
+++ HTMLLicencePanel.java	12 Mar 2006 16:32:25 -0000	1.19
@@ -1,5 +1,5 @@
 /*
- * IzPack - Copyright 2001-2005 Julien Ponge, All Rights Reserved.
+ * IzPack - Copyright 2001-2006 Julien Ponge, All Rights Reserved.
  * 
  * http://www.izforge.com/izpack/
  * http://developer.berlios.de/projects/izpack/

Index: HelloPanel.java
===================================================================
RCS file: /cvsroot/izpack/izpack-src/src/lib/com/izforge/izpack/panels/HelloPanel.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- HelloPanel.java	22 Sep 2005 05:26:34 -0000	1.18
+++ HelloPanel.java	12 Mar 2006 16:32:25 -0000	1.19
@@ -1,5 +1,5 @@
 /*
- * IzPack - Copyright 2001-2005 Julien Ponge, All Rights Reserved.
+ * IzPack - Copyright 2001-2006 Julien Ponge, All Rights Reserved.
  * 
  * http://www.izforge.com/izpack/
  * http://developer.berlios.de/projects/izpack/

Index: ImgPacksPanel.java
===================================================================
RCS file: /cvsroot/izpack/izpack-src/src/lib/com/izforge/izpack/panels/ImgPacksPanel.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- ImgPacksPanel.java	25 Jul 2005 04:54:33 -0000	1.24
+++ ImgPacksPanel.java	12 Mar 2006 16:32:25 -0000	1.25
@@ -1,5 +1,5 @@
 /*
- * IzPack - Copyright 2001-2005 Julien Ponge, All Rights Reserved.
+ * IzPack - Copyright 2001-2006 Julien Ponge, All Rights Reserved.
  * 
  * http://www.izforge.com/izpack/
  * http://developer.berlios.de/projects/izpack/

Index: ImgPacksPanelAutomationHelper.java
===================================================================
RCS file: /cvsroot/izpack/izpack-src/src/lib/com/izforge/izpack/panels/ImgPacksPanelAutomationHelper.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- ImgPacksPanelAutomationHelper.java	6 May 2005 20:09:08 -0000	1.6
+++ ImgPacksPanelAutomationHelper.java	12 Mar 2006 16:32:25 -0000	1.7
@@ -1,5 +1,5 @@
 /*
- * IzPack - Copyright 2001-2005 Julien Ponge, All Rights Reserved.
+ * IzPack - Copyright 2001-2006 Julien Ponge, All Rights Reserved.
  * 
  * http://www.izforge.com/izpack/
  * http://developer.berlios.de/projects/izpack/

Index: InfoPanel.java
===================================================================
RCS file: /cvsroot/izpack/izpack-src/src/lib/com/izforge/izpack/panels/InfoPanel.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- InfoPanel.java	6 May 2005 20:09:08 -0000	1.16
+++ InfoPanel.java	12 Mar 2006 16:32:25 -0000	1.17
@@ -1,5 +1,5 @@
 /*
- * IzPack - Copyright 2001-2005 Julien Ponge, All Rights Reserved.
+ * IzPack - Copyright 2001-2006 Julien Ponge, All Rights Reserved.
  * 
  * http://www.izforge.com/izpack/
  * http://developer.berlios.de/projects/izpack/

Index: InstallPanel.java
===================================================================
RCS file: /cvsroot/izpack/izpack-src/src/lib/com/izforge/izpack/panels/InstallPanel.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- InstallPanel.java	6 May 2005 20:09:08 -0000	1.25
+++ InstallPanel.java	12 Mar 2006 16:32:25 -0000	1.26
@@ -1,5 +1,5 @@
 /*
- * IzPack - Copyright 2001-2005 Julien Ponge, All Rights Reserved.
+ * IzPack - Copyright 2001-2006 Julien Ponge, All Rights Reserved.
  * 
  * http://www.izforge.com/izpack/
  * http://developer.berlios.de/projects/izpack/
@@ -27,6 +27,7 @@
 import javax.swing.JOptionPane;
 import javax.swing.JProgressBar;
 import javax.swing.JSeparator;
+import javax.swing.SwingUtilities;
 
 import com.izforge.izpack.gui.LabelFactory;
 import com.izforge.izpack.installer.InstallData;
@@ -155,12 +156,18 @@
     /** The unpacker starts. */
     public void startAction(String name, int noOfJobs)
     {
-        parent.blockGUI();
-        // figure out how many packs there are to install
         this.noOfPacks = noOfJobs;
-        this.overallProgressBar.setMinimum(0);
-        this.overallProgressBar.setMaximum(this.noOfPacks);
-        this.overallProgressBar.setString("0 / " + Integer.toString(this.noOfPacks));
+        SwingUtilities.invokeLater(new Runnable() {
+            public void run()
+            {
+                parent.blockGUI();
+                
+                // figure out how many packs there are to install
+                overallProgressBar.setMinimum(0);
+                overallProgressBar.setMaximum(noOfPacks);
+                overallProgressBar.setString("0 / " + Integer.toString(noOfPacks));
+            }
+        });
     }
 
     /**
@@ -179,30 +186,36 @@
     /** The unpacker stops. */
     public void stopAction()
     {
-        parent.releaseGUI();
-        parent.lockPrevButton();
-        // With custom actions it is possible, that the current value
-        // is not max - 1. Therefore we use always max for both
-        // progress bars to signal finish state.
-        this.overallProgressBar.setValue(this.overallProgressBar.getMaximum());
-        int ppbMax = packProgressBar.getMaximum();
-        if (ppbMax < 1)
-        {
-            ppbMax = 1;
-            packProgressBar.setMaximum(ppbMax);
-        }
-        this.packProgressBar.setValue(ppbMax);
+        SwingUtilities.invokeLater(new Runnable() {
+            public void run()
+            {
+                parent.releaseGUI();
+                parent.lockPrevButton();
+                
+                // With custom actions it is possible, that the current value
+                // is not max - 1. Therefore we use always max for both
+                // progress bars to signal finish state.
+                overallProgressBar.setValue(overallProgressBar.getMaximum());
+                int ppbMax = packProgressBar.getMaximum();
+                if (ppbMax < 1)
+                {
+                    ppbMax = 1;
+                    packProgressBar.setMaximum(ppbMax);
+                }
+                packProgressBar.setValue(ppbMax);
 
-        this.packProgressBar.setString(parent.langpack.getString("InstallPanel.finished"));
-        this.packProgressBar.setEnabled(false);
-        String no_of_packs = Integer.toString(this.noOfPacks);
-        this.overallProgressBar.setString(no_of_packs + " / " + no_of_packs);
-        this.overallProgressBar.setEnabled(false);
-        this.packOpLabel.setText(" ");
-        this.packOpLabel.setEnabled(false);
-        idata.canClose = true;
-        this.validated = true;
-        if (idata.panels.indexOf(this) != (idata.panels.size() - 1)) parent.unlockNextButton();
+                packProgressBar.setString(parent.langpack.getString("InstallPanel.finished"));
+                packProgressBar.setEnabled(false);
+                String no_of_packs = Integer.toString(noOfPacks);
+                overallProgressBar.setString(no_of_packs + " / " + no_of_packs);
+                overallProgressBar.setEnabled(false);
+                packOpLabel.setText(" ");
+                packOpLabel.setEnabled(false);
+                idata.canClose = true;
+                validated = true;
+                if (idata.panels.indexOf(this) != (idata.panels.size() - 1)) parent.unlockNextButton();
+            }
+        });
     }
 
     /**
@@ -211,10 +224,15 @@
      * @param val The progression value.
      * @param msg The progression message.
      */
-    public void progress(int val, String msg)
+    public void progress(final int val, final String msg)
     {
-        this.packProgressBar.setValue(val + 1);
-        packOpLabel.setText(msg);
+        SwingUtilities.invokeLater(new Runnable() {
+            public void run()
+            {
+                packProgressBar.setValue(val + 1);
+                packOpLabel.setText(msg);
+            }
+        });
     }
 
     /**
@@ -224,15 +242,20 @@
      * @param stepno The number of the pack.
      * @param max The new maximum progress.
      */
-    public void nextStep(String packName, int stepno, int max)
+    public void nextStep(final String packName, final int stepno, final int max)
     {
-        this.packProgressBar.setValue(0);
-        this.packProgressBar.setMinimum(0);
-        this.packProgressBar.setMaximum(max);
-        this.packProgressBar.setString(packName);
-        this.overallProgressBar.setValue(stepno - 1);
-        this.overallProgressBar.setString(Integer.toString(stepno) + " / "
-                + Integer.toString(this.noOfPacks));
+        SwingUtilities.invokeLater(new Runnable() {
+            public void run()
+            {
+                packProgressBar.setValue(0);
+                packProgressBar.setMinimum(0);
+                packProgressBar.setMaximum(max);
+                packProgressBar.setString(packName);
+                overallProgressBar.setValue(stepno - 1);
+                overallProgressBar.setString(Integer.toString(stepno) + " / "
+                        + Integer.toString(noOfPacks));                
+            }
+        });
     }
 
     /** Called when the panel becomes active. */

Index: InstallPanelAutomationHelper.java
===================================================================
RCS file: /cvsroot/izpack/izpack-src/src/lib/com/izforge/izpack/panels/InstallPanelAutomationHelper.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- InstallPanelAutomationHelper.java	6 May 2005 20:09:08 -0000	1.8
+++ InstallPanelAutomationHelper.java	12 Mar 2006 16:32:26 -0000	1.9
@@ -1,5 +1,5 @@
 /*
- * IzPack - Copyright 2001-2005 Julien Ponge, All Rights Reserved.
+ * IzPack - Copyright 2001-2006 Julien Ponge, All Rights Reserved.
  * 
  * http://www.izforge.com/izpack/
  * http://developer.berlios.de/projects/izpack/

Index: JDKPathPanel.java
===================================================================
RCS file: /cvsroot/izpack/izpack-src/src/lib/com/izforge/izpack/panels/JDKPathPanel.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- JDKPathPanel.java	27 Jul 2005 08:57:06 -0000	1.13
+++ JDKPathPanel.java	12 Mar 2006 16:32:26 -0000	1.14
@@ -1,5 +1,5 @@
 /*
- * IzPack - Copyright 2001-2005 Julien Ponge, All Rights Reserved.
+ * IzPack - Copyright 2001-2006 Julien Ponge, All Rights Reserved.
  * 
  * http://www.izforge.com/izpack/
  * http://developer.berlios.de/projects/izpack/

Index: LicencePanel.java
===================================================================
RCS file: /cvsroot/izpack/izpack-src/src/lib/com/izforge/izpack/panels/LicencePanel.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- LicencePanel.java	6 May 2005 20:09:08 -0000	1.18
+++ LicencePanel.java	12 Mar 2006 16:32:26 -0000	1.19
@@ -1,5 +1,5 @@
 /*
- * IzPack - Copyright 2001-2005 Julien Ponge, All Rights Reserved.
+ * IzPack - Copyright 2001-2006 Julien Ponge, All Rights Reserved.
  * 
  * http://www.izforge.com/izpack/
  * http://developer.berlios.de/projects/izpack/

Index: PacksModel.java
===================================================================
RCS file: /cvsroot/izpack/izpack-src/src/lib/com/izforge/izpack/panels/PacksModel.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- PacksModel.java	6 May 2005 20:09:08 -0000	1.8
+++ PacksModel.java	12 Mar 2006 16:32:26 -0000	1.9
@@ -1,5 +1,5 @@
 /*
- * IzPack - Copyright 2001-2005 Julien Ponge, All Rights Reserved.
+ * IzPack - Copyright 2001-2006 Julien Ponge, All Rights Reserved.
  * 
  * http://www.izforge.com/izpack/
  * http://developer.berlios.de/projects/izpack/

Index: PacksPanel.java
===================================================================
RCS file: /cvsroot/izpack/izpack-src/src/lib/com/izforge/izpack/panels/PacksPanel.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- PacksPanel.java	25 Jul 2005 04:16:11 -0000	1.25
+++ PacksPanel.java	12 Mar 2006 16:32:26 -0000	1.26
@@ -1,5 +1,5 @@
 /*
- * IzPack - Copyright 2001-2005 Julien Ponge, All Rights Reserved.
+ * IzPack - Copyright 2001-2006 Julien Ponge, All Rights Reserved.
  * 
  * http://www.izforge.com/izpack/
  * http://developer.berlios.de/projects/izpack/

Index: PacksPanelAutomationHelper.java
===================================================================
RCS file: /cvsroot/izpack/izpack-src/src/lib/com/izforge/izpack/panels/PacksPanelAutomationHelper.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- PacksPanelAutomationHelper.java	6 May 2005 20:09:08 -0000	1.9
+++ PacksPanelAutomationHelper.java	12 Mar 2006 16:32:26 -0000	1.10
@@ -1,5 +1,5 @@
 /*
- * IzPack - Copyright 2001-2005 Julien Ponge, All Rights Reserved.
+ * IzPack - Copyright 2001-2006 Julien Ponge, All Rights Reserved.
  * 
  * http://www.izforge.com/izpack/
  * http://developer.berlios.de/projects/izpack/

Index: PacksPanelBase.java
===================================================================
RCS file: /cvsroot/izpack/izpack-src/src/lib/com/izforge/izpack/panels/PacksPanelBase.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- PacksPanelBase.java	2 Jun 2005 21:14:25 -0000	1.8
+++ PacksPanelBase.java	12 Mar 2006 16:32:26 -0000	1.9
@@ -1,5 +1,5 @@
 /*
- * IzPack - Copyright 2001-2005 Julien Ponge, All Rights Reserved.
+ * IzPack - Copyright 2001-2006 Julien Ponge, All Rights Reserved.
  * 
  * http://www.izforge.com/izpack/
  * http://developer.berlios.de/projects/izpack/

Index: PacksPanelInterface.java
===================================================================
RCS file: /cvsroot/izpack/izpack-src/src/lib/com/izforge/izpack/panels/PacksPanelInterface.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- PacksPanelInterface.java	6 May 2005 20:09:08 -0000	1.6
+++ PacksPanelInterface.java	12 Mar 2006 16:32:26 -0000	1.7
@@ -1,5 +1,5 @@
 /*
- * IzPack - Copyright 2001-2005 Julien Ponge, All Rights Reserved.
+ * IzPack - Copyright 2001-2006 Julien Ponge, All Rights Reserved.
  * 
  * http://www.izforge.com/izpack/
  * http://developer.berlios.de/projects/izpack/

Index: PasswordGroup.java
===================================================================
RCS file: /cvsroot/izpack/izpack-src/src/lib/com/izforge/izpack/panels/PasswordGroup.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- PasswordGroup.java	6 May 2005 20:09:08 -0000	1.6
+++ PasswordGroup.java	12 Mar 2006 16:32:26 -0000	1.7
@@ -1,5 +1,5 @@
 /*
- * IzPack - Copyright 2001-2005 Julien Ponge, All Rights Reserved.
+ * IzPack - Copyright 2001-2006 Julien Ponge, All Rights Reserved.
  * 
  * http://www.izforge.com/izpack/
  * http://developer.berlios.de/projects/izpack/

Index: PathInputPanel.java
===================================================================
RCS file: /cvsroot/izpack/izpack-src/src/lib/com/izforge/izpack/panels/PathInputPanel.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- PathInputPanel.java	30 Jul 2005 22:09:01 -0000	1.10
+++ PathInputPanel.java	12 Mar 2006 16:32:26 -0000	1.11
@@ -1,5 +1,5 @@
 /*
- * IzPack - Copyright 2001-2005 Julien Ponge, All Rights Reserved.
+ * IzPack - Copyright 2001-2006 Julien Ponge, All Rights Reserved.
  * 
  * http://www.izforge.com/izpack/
  * http://developer.berlios.de/projects/izpack/

Index: PathSelectionPanel.java
===================================================================
RCS file: /cvsroot/izpack/izpack-src/src/lib/com/izforge/izpack/panels/PathSelectionPanel.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- PathSelectionPanel.java	25 Jul 2005 04:16:11 -0000	1.4
+++ PathSelectionPanel.java	12 Mar 2006 16:32:26 -0000	1.5
@@ -1,5 +1,5 @@
 /*
- * IzPack - Copyright 2001-2005 Julien Ponge, All Rights Reserved.
+ * IzPack - Copyright 2001-2006 Julien Ponge, All Rights Reserved.
  * 
  * http://www.izforge.com/izpack/
  * http://developer.berlios.de/projects/izpack/
@@ -192,6 +192,17 @@
     public JTextField getPathInputField()
     {
         return textField;
+    }
+    
+     /**
+     * Returns the browse button object for modification or for use
+     * with a different ActionListener.
+     *
+     * @return the browse button to open the JFileChooser
+     */
+    public JButton getBrowseButton()
+    {
+    return browseButton;
     }
 
 }

Index: ProcessPanel.java
===================================================================
RCS file: /cvsroot/izpack/izpack-src/src/lib/com/izforge/izpack/panels/ProcessPanel.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- ProcessPanel.java	6 May 2005 20:09:08 -0000	1.6
+++ ProcessPanel.java	12 Mar 2006 16:32:26 -0000	1.7
@@ -1,5 +1,5 @@
 /*
- * IzPack - Copyright 2001-2005 Julien Ponge, All Rights Reserved.
+ * IzPack - Copyright 2001-2006 Julien Ponge, All Rights Reserved.
  * 
  * http://www.izforge.com/izpack/
  * http://developer.berlios.de/projects/izpack/

Index: ProcessPanelAutomationHelper.java
===================================================================
RCS file: /cvsroot/izpack/izpack-src/src/lib/com/izforge/izpack/panels/ProcessPanelAutomationHelper.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- ProcessPanelAutomationHelper.java	6 May 2005 20:09:08 -0000	1.3
+++ ProcessPanelAutomationHelper.java	12 Mar 2006 16:32:26 -0000	1.4
@@ -1,5 +1,5 @@
 /*
- * IzPack - Copyright 2001-2005 Julien Ponge, All Rights Reserved.
+ * IzPack - Copyright 2001-2006 Julien Ponge, All Rights Reserved.
  * 
  * http://www.izforge.com/izpack/
  * http://developer.berlios.de/projects/izpack/

Index: ProcessingClient.java
===================================================================
RCS file: /cvsroot/izpack/izpack-src/src/lib/com/izforge/izpack/panels/ProcessingClient.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- ProcessingClient.java	6 May 2005 20:09:08 -0000	1.3
+++ ProcessingClient.java	12 Mar 2006 16:32:26 -0000	1.4
@@ -1,5 +1,5 @@
 /*
- * IzPack - Copyright 2001-2005 Julien Ponge, All Rights Reserved.
+ * IzPack - Copyright 2001-2006 Julien Ponge, All Rights Reserved.
  * 
  * http://www.izforge.com/izpack/
  * http://developer.berlios.de/projects/izpack/

Index: Processor.java
===================================================================
RCS file: /cvsroot/izpack/izpack-src/src/lib/com/izforge/izpack/panels/Processor.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Processor.java	6 May 2005 20:09:08 -0000	1.3
+++ Processor.java	12 Mar 2006 16:32:26 -0000	1.4
@@ -1,5 +1,5 @@
 /*
- * IzPack - Copyright 2001-2005 Julien Ponge, All Rights Reserved.
+ * IzPack - Copyright 2001-2006 Julien Ponge, All Rights Reserved.
  * 
  * http://www.izforge.com/izpack/
  * http://developer.berlios.de/projects/izpack/

Index: RuleInputField.java
===================================================================
RCS file: /cvsroot/izpack/izpack-src/src/lib/com/izforge/izpack/panels/RuleInputField.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- RuleInputField.java	30 Jul 2005 22:08:24 -0000	1.16
+++ RuleInputField.java	12 Mar 2006 16:32:26 -0000	1.17
@@ -1,5 +1,5 @@
 /*
- * IzPack - Copyright 2001-2005 Julien Ponge, All Rights Reserved.
+ * IzPack - Copyright 2001-2006 Julien Ponge, All Rights Reserved.
  * 
  * http://www.izforge.com/izpack/
  * http://developer.berlios.de/projects/izpack/

Index: RuleTextField.java
===================================================================
RCS file: /cvsroot/izpack/izpack-src/src/lib/com/izforge/izpack/panels/RuleTextField.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- RuleTextField.java	27 Jul 2005 08:57:06 -0000	1.10
+++ RuleTextField.java	12 Mar 2006 16:32:26 -0000	1.11
@@ -1,5 +1,5 @@
 /*
- * IzPack - Copyright 2001-2005 Julien Ponge, All Rights Reserved.
+ * IzPack - Copyright 2001-2006 Julien Ponge, All Rights Reserved.
  * 
  * http://www.izforge.com/izpack/
  * http://developer.berlios.de/projects/izpack/

Index: ShortcutData.java
===================================================================
RCS file: /cvsroot/izpack/izpack-src/src/lib/com/izforge/izpack/panels/ShortcutData.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- ShortcutData.java	9 May 2005 14:25:11 -0000	1.15
+++ ShortcutData.java	12 Mar 2006 16:32:26 -0000	1.16
@@ -1,5 +1,5 @@
 /*
- * IzPack - Copyright 2001-2005 Julien Ponge, All Rights Reserved.
+ * IzPack - Copyright 2001-2006 Julien Ponge, All Rights Reserved.
  * 
  * http://www.izforge.com/izpack/
  * http://developer.berlios.de/projects/izpack/

Index: ShortcutPanel.java
===================================================================
RCS file: /cvsroot/izpack/izpack-src/src/lib/com/izforge/izpack/panels/ShortcutPanel.java,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- ShortcutPanel.java	11 Sep 2005 08:40:24 -0000	1.40
+++ ShortcutPanel.java	12 Mar 2006 16:32:26 -0000	1.41
@@ -1,5 +1,5 @@
 /*
- * IzPack - Copyright 2001-2005 Julien Ponge, All Rights Reserved.
+ * IzPack - Copyright 2001-2006 Julien Ponge, All Rights Reserved.
  * 
  * http://www.izforge.com/izpack/ 
  * http://developer.berlios.de/projects/izpack/
@@ -969,6 +969,7 @@
     {
         if (!create) return;
         ShortcutData data;
+        String tmpgn;
 
         for (int i = 0; i < shortcuts.size(); i++)
         {
@@ -976,7 +977,18 @@
 
             try
             {
-                groupName = groupName + data.subgroup;
+                //The cloning guarantees that data.subgroup will not be null.
+                //See ShortcutData.cloneString
+                if (data.subgroup.length() > 0 
+                        && (data.subgroup.charAt(0) == '/' || data.subgroup.charAt(0) == '\\'))
+                {
+                    tmpgn = groupName + data.subgroup;
+                }
+                else
+                {
+                    tmpgn = groupName + File.separator + data.subgroup;
+                }
+                
                 shortcut.setUserType(itsUserType);
                 shortcut.setLinkName(data.name);
                 shortcut.setLinkType(data.type);
@@ -999,7 +1011,7 @@
 
                 if (data.addToGroup)
                 {
-                    shortcut.setProgramGroup(groupName);
+                    shortcut.setProgramGroup(tmpgn);
                 }
                 else
                 {

Index: SimpleFinishPanel.java
===================================================================
RCS file: /cvsroot/izpack/izpack-src/src/lib/com/izforge/izpack/panels/SimpleFinishPanel.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- SimpleFinishPanel.java	6 May 2005 20:09:08 -0000	1.8
+++ SimpleFinishPanel.java	12 Mar 2006 16:32:26 -0000	1.9
@@ -1,5 +1,5 @@
 /*
- * IzPack - Copyright 2001-2005 Julien Ponge, All Rights Reserved.
+ * IzPack - Copyright 2001-2006 Julien Ponge, All Rights Reserved.
  * 
  * http://www.izforge.com/izpack/
  * http://developer.berlios.de/projects/izpack/

Index: SudoPanel.java
===================================================================
RCS file: /cvsroot/izpack/izpack-src/src/lib/com/izforge/izpack/panels/SudoPanel.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- SudoPanel.java	8 May 2005 03:04:57 -0000	1.8
+++ SudoPanel.java	12 Mar 2006 16:32:26 -0000	1.9
@@ -1,5 +1,5 @@
 /*
- * IzPack - Copyright 2001-2005 Julien Ponge, All Rights Reserved.
+ * IzPack - Copyright 2001-2006 Julien Ponge, All Rights Reserved.
  * 
  * http://www.izforge.com/izpack/
  * http://developer.berlios.de/projects/izpack/

Index: SummaryPanel.java
===================================================================
RCS file: /cvsroot/izpack/izpack-src/src/lib/com/izforge/izpack/panels/SummaryPanel.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- SummaryPanel.java	27 Jul 2005 08:57:06 -0000	1.4
+++ SummaryPanel.java	12 Mar 2006 16:32:26 -0000	1.5
@@ -1,5 +1,5 @@
 /*
- * IzPack - Copyright 2001-2005 Julien Ponge, All Rights Reserved.
+ * IzPack - Copyright 2001-2006 Julien Ponge, All Rights Reserved.
  * 
  * http://www.izforge.com/izpack/
  * http://developer.berlios.de/projects/izpack/

Index: TargetPanel.java
===================================================================
RCS file: /cvsroot/izpack/izpack-src/src/lib/com/izforge/izpack/panels/TargetPanel.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- TargetPanel.java	30 Jul 2005 22:09:01 -0000	1.31
+++ TargetPanel.java	12 Mar 2006 16:32:26 -0000	1.32
@@ -1,5 +1,5 @@
 /*
- * IzPack - Copyright 2001-2005 Julien Ponge, All Rights Reserved.
+ * IzPack - Copyright 2001-2006 Julien Ponge, All Rights Reserved.
  * 
  * http://www.izforge.com/izpack/
  * http://developer.berlios.de/projects/izpack/

Index: TargetPanelAutomationHelper.java
===================================================================
RCS file: /cvsroot/izpack/izpack-src/src/lib/com/izforge/izpack/panels/TargetPanelAutomationHelper.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- TargetPanelAutomationHelper.java	6 May 2005 20:09:08 -0000	1.8
+++ TargetPanelAutomationHelper.java	12 Mar 2006 16:32:26 -0000	1.9
@@ -1,5 +1,5 @@
 /*
- * IzPack - Copyright 2001-2005 Julien Ponge, All Rights Reserved.
+ * IzPack - Copyright 2001-2006 Julien Ponge, All Rights Reserved.
  * 
  * http://www.izforge.com/izpack/
  * http://developer.berlios.de/projects/izpack/

Index: UserInputPanel.java
===================================================================
RCS file: /cvsroot/izpack/izpack-src/src/lib/com/izforge/izpack/panels/UserInputPanel.java,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- UserInputPanel.java	30 Jul 2005 22:08:24 -0000	1.42
+++ UserInputPanel.java	12 Mar 2006 16:32:26 -0000	1.43
@@ -1,5 +1,5 @@
 /*
- * IzPack - Copyright 2001-2005 Julien Ponge, All Rights Reserved.
+ * IzPack - Copyright 2001-2006 Julien Ponge, All Rights Reserved.
  * 
  * http://www.izforge.com/izpack/
  * http://developer.berlios.de/projects/izpack/
@@ -2621,6 +2621,10 @@
              * Check if the user has entered data into the ComboBox and add it to the Itemlist
              */
             String selected = (String) this.pathComboBox.getSelectedItem();
+            if (selected == null)
+            {
+                return false;
+            }
             boolean found = false;
             for (int x = 0; x < this.pathComboBox.getItemCount(); x++)
             {
@@ -2724,7 +2728,7 @@
             {
                 JFileChooser chooser = new JFileChooser();
 
-                if (this.searchType == RESULT_DIRECTORY)
+                if (this.resultType != TYPE_FILE)
                     chooser.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY);
 
                 int result = chooser.showOpenDialog(this.parent);
@@ -2736,7 +2740,7 @@
                     this.pathComboBox.setSelectedItem(f.getAbsolutePath());
 
                     // use any given directory directly
-                    if (!this.pathMatches(f.getAbsolutePath()))
+                    if (this.resultType != TYPE_FILE && !this.pathMatches(f.getAbsolutePath()))
                     {
                         JOptionPane.showMessageDialog(parent, parent.langpack
                                 .getString("UserInputPanel.search.wrongselection.message"),

Index: UserInputPanelAutomationHelper.java
===================================================================
RCS file: /cvsroot/izpack/izpack-src/src/lib/com/izforge/izpack/panels/UserInputPanelAutomationHelper.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- UserInputPanelAutomationHelper.java	6 May 2005 20:09:08 -0000	1.7
+++ UserInputPanelAutomationHelper.java	12 Mar 2006 16:32:26 -0000	1.8
@@ -1,5 +1,5 @@
 /*
- * IzPack - Copyright 2001-2005 Julien Ponge, All Rights Reserved.
+ * IzPack - Copyright 2001-2006 Julien Ponge, All Rights Reserved.
  * 
  * http://www.izforge.com/izpack/
  * http://developer.berlios.de/projects/izpack/

Index: Validator.java
===================================================================
RCS file: /cvsroot/izpack/izpack-src/src/lib/com/izforge/izpack/panels/Validator.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Validator.java	6 May 2005 20:09:08 -0000	1.3
+++ Validator.java	12 Mar 2006 16:32:26 -0000	1.4
@@ -1,5 +1,5 @@
 /*
- * IzPack - Copyright 2001-2005 Julien Ponge, All Rights Reserved.
+ * IzPack - Copyright 2001-2006 Julien Ponge, All Rights Reserved.
  * 
  * http://www.izforge.com/izpack/
  * http://developer.berlios.de/projects/izpack/

Index: XInfoPanel.java
===================================================================
RCS file: /cvsroot/izpack/izpack-src/src/lib/com/izforge/izpack/panels/XInfoPanel.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- XInfoPanel.java	6 May 2005 20:09:08 -0000	1.21
+++ XInfoPanel.java	12 Mar 2006 16:32:26 -0000	1.22
@@ -1,5 +1,5 @@
 /*
- * IzPack - Copyright 2001-2005 Julien Ponge, All Rights Reserved.
+ * IzPack - Copyright 2001-2006 Julien Ponge, All Rights Reserved.
  * 
  * http://www.izforge.com/izpack/
  * http://developer.berlios.de/projects/izpack/


