[izpack-changes] r1537 - izpack-src/trunk/src/lib/com/izforge/izpack/panels

[noreply at berlios.de]

Author: bartzkau
Date: 2006-08-25 17:22:36 +0200 (Fri, 25 Aug 2006)
New Revision: 1537

Modified:
   izpack-src/trunk/src/lib/com/izforge/izpack/panels/InstallPanel.java
   izpack-src/trunk/src/lib/com/izforge/izpack/panels/SimpleFinishPanel.java
Log:
Bug in SimpleFinishPanel at failer of installation fixed;
full line labels in InstallPanel to suppert message change
with ExtInstallPanel.


Modified: izpack-src/trunk/src/lib/com/izforge/izpack/panels/InstallPanel.java
===================================================================
--- izpack-src/trunk/src/lib/com/izforge/izpack/panels/InstallPanel.java	2006-08-25 11:09:34 UTC (rev 1536)
+++ izpack-src/trunk/src/lib/com/izforge/izpack/panels/InstallPanel.java	2006-08-25 15:22:36 UTC (rev 1537)
@@ -75,9 +75,9 @@
         super(parent, idata, new IzPanelLayout());
         this.tipLabel = LabelFactory.create(parent.langpack.getString("InstallPanel.tip"),
                 parent.icons.getImageIcon("information"), LEADING);
-        add(this.tipLabel, NEXT_LINE);
+        add(this.tipLabel, IzPanelLayout.getDefaultConstraint(FULL_LINE_CONTROL_CONSTRAINT));
         packOpLabel = LabelFactory.create(" ", LEADING);
-        add(packOpLabel, NEXT_LINE);
+        add(packOpLabel, IzPanelLayout.getDefaultConstraint(FULL_LINE_CONTROL_CONSTRAINT));
 
         packProgressBar = new JProgressBar();
         packProgressBar.setStringPainted(true);
@@ -89,7 +89,7 @@
 
         overallOpLabel = LabelFactory.create(parent.langpack.getString("InstallPanel.progress"),
                 parent.icons.getImageIcon("information"), LEADING);
-        add(this.overallOpLabel, NEXT_LINE);
+        add(this.overallOpLabel, IzPanelLayout.getDefaultConstraint(FULL_LINE_CONTROL_CONSTRAINT));
 
         overallProgressBar = new JProgressBar();
         overallProgressBar.setStringPainted(true);

Modified: izpack-src/trunk/src/lib/com/izforge/izpack/panels/SimpleFinishPanel.java
===================================================================
--- izpack-src/trunk/src/lib/com/izforge/izpack/panels/SimpleFinishPanel.java	2006-08-25 11:09:34 UTC (rev 1536)
+++ izpack-src/trunk/src/lib/com/izforge/izpack/panels/SimpleFinishPanel.java	2006-08-25 15:22:36 UTC (rev 1537)
@@ -21,8 +21,6 @@
 
 import java.io.File;
 
-import javax.swing.JPanel;
-
 import com.izforge.izpack.gui.IzPanelLayout;
 import com.izforge.izpack.gui.LabelFactory;
 import com.izforge.izpack.installer.InstallData;
@@ -43,9 +41,6 @@
      */
     private static final long serialVersionUID = 3689911781942572085L;
 
-    /** The center panel. */
-    protected JPanel centerPanel;
-
     /** The variables substitutor. */
     private VariableSubstitutor vs;
 
@@ -100,7 +95,7 @@
             }
         }
         else
-            centerPanel.add(LabelFactory.create(parent.langpack.getString("FinishPanel.fail"),
+            add(LabelFactory.create(parent.langpack.getString("FinishPanel.fail"),
                     parent.icons.getImageIcon("information"),  LEADING));
         getLayoutHelper().completeLayout(); // Call, or call not?