[izpack-changes] r1938 - in izpack-src/trunk/src/lib/com/izforge/izpack: . panels

[noreply at berlios.de]

Author: dreil
Date: 2007-12-07 16:15:48 +0100 (Fri, 07 Dec 2007)
New Revision: 1938

Modified:
   izpack-src/trunk/src/lib/com/izforge/izpack/Panel.java
   izpack-src/trunk/src/lib/com/izforge/izpack/panels/InstallationTypePanel.java
Log:
bugfix

Modified: izpack-src/trunk/src/lib/com/izforge/izpack/Panel.java
===================================================================
--- izpack-src/trunk/src/lib/com/izforge/izpack/Panel.java	2007-12-07 14:26:54 UTC (rev 1937)
+++ izpack-src/trunk/src/lib/com/izforge/izpack/Panel.java	2007-12-07 15:15:48 UTC (rev 1938)
@@ -63,7 +63,7 @@
     public String getPanelid() {
       if (this.panelid == null)
       {
-        this.panelid = "UNKNOWN";
+        this.panelid = "UNKNOWN (" + className + ")";
       }
       return this.panelid;
     }

Modified: izpack-src/trunk/src/lib/com/izforge/izpack/panels/InstallationTypePanel.java
===================================================================
--- izpack-src/trunk/src/lib/com/izforge/izpack/panels/InstallationTypePanel.java	2007-12-07 14:26:54 UTC (rev 1937)
+++ izpack-src/trunk/src/lib/com/izforge/izpack/panels/InstallationTypePanel.java	2007-12-07 15:15:48 UTC (rev 1938)
@@ -14,6 +14,7 @@
 import com.izforge.izpack.installer.InstallData;
 import com.izforge.izpack.installer.InstallerFrame;
 import com.izforge.izpack.installer.IzPanel;
+import com.izforge.izpack.util.Debug;
 
 
 /**
@@ -28,7 +29,7 @@
     public InstallationTypePanel(InstallerFrame parent, InstallData idata)
     {
         super(parent, idata, new IzPanelLayout());
-        
+        buildGUI();        
     }
     
     private void buildGUI() {
@@ -66,17 +67,32 @@
      */
     public void panelActivate()
     {
-        buildGUI();
+        boolean modifyinstallation = Boolean.valueOf(idata.getVariable(InstallData.MODIFY_INSTALLATION)).booleanValue();
+        if (modifyinstallation) {
+            modifyinstall.setSelected(true);
+        }
+        else {
+            normalinstall.setSelected(true);
+        }
     }
    
     public void actionPerformed(ActionEvent e)
-    {
-        if (normalinstall.isSelected()) {
+    {        
+        Debug.trace("installation type changed");
+        if (e.getSource() == normalinstall) {
+            Debug.trace("normal installation");
             idata.setVariable(InstallData.MODIFY_INSTALLATION, "false");
         }
         else {
-            idata.setVariable(InstallData.MODIFY_INSTALLATION, "true");
-        } 
+            Debug.trace("modification installation");
+            idata.setVariable(InstallData.MODIFY_INSTALLATION, "true");            
+        }
+        /*
+        if (normalinstall.isSelected()) {
+            
+        }
+        else {
+        } */
         
     }
 }