[izpack-changes] r1782 - in izpack-src/trunk/src/lib/com/izforge/izpack: event installer panels util
noreply at berlios.de
noreply at berlios.de
Tue Mar 13 18:03:12 CET 2007
Author: bartzkau
Date: 2007-03-13 18:03:11 +0100 (Tue, 13 Mar 2007)
New Revision: 1782
Modified:
izpack-src/trunk/src/lib/com/izforge/izpack/event/RegistryInstallerListener.java
izpack-src/trunk/src/lib/com/izforge/izpack/installer/InstallerFrame.java
izpack-src/trunk/src/lib/com/izforge/izpack/panels/FinishPanel.java
izpack-src/trunk/src/lib/com/izforge/izpack/panels/SimpleFinishPanel.java
izpack-src/trunk/src/lib/com/izforge/izpack/util/Log.java
Log:
Activating new Logging stuff; three calls to addDebugMessage added
to InstallerFrame.
Modified: izpack-src/trunk/src/lib/com/izforge/izpack/event/RegistryInstallerListener.java
===================================================================
--- izpack-src/trunk/src/lib/com/izforge/izpack/event/RegistryInstallerListener.java 2007-03-13 14:17:47 UTC (rev 1781)
+++ izpack-src/trunk/src/lib/com/izforge/izpack/event/RegistryInstallerListener.java 2007-03-13 17:03:11 UTC (rev 1782)
@@ -117,6 +117,7 @@
// No interrupt desired after writing registry entries.
Unpacker.setDiscardInterrupt(true);
rh.activateLogging();
+
if (getSpecHelper().getSpec() != null)
{
VariableSubstitutor substitutor = new VariableSubstitutor(idata.getVariables());
Modified: izpack-src/trunk/src/lib/com/izforge/izpack/installer/InstallerFrame.java
===================================================================
--- izpack-src/trunk/src/lib/com/izforge/izpack/installer/InstallerFrame.java 2007-03-13 14:17:47 UTC (rev 1781)
+++ izpack-src/trunk/src/lib/com/izforge/izpack/installer/InstallerFrame.java 2007-03-13 17:03:11 UTC (rev 1782)
@@ -98,8 +98,10 @@
import com.izforge.izpack.rules.RulesEngine;
import com.izforge.izpack.util.AbstractUIProgressHandler;
import com.izforge.izpack.util.Debug;
+import com.izforge.izpack.util.DebugConstants;
import com.izforge.izpack.util.Housekeeper;
import com.izforge.izpack.util.IoHelper;
+import com.izforge.izpack.util.Log;
import com.izforge.izpack.util.OsConstraint;
import com.izforge.izpack.util.VariableSubstitutor;
@@ -729,6 +731,12 @@
panelsContainer.setVisible(false);
IzPanel panel = (IzPanel) installdata.panels.get(installdata.curPanelNumber);
IzPanel l_panel = (IzPanel) installdata.panels.get(last);
+ Log.getInstance().addDebugMessage(
+ "InstallerFrame.switchPanel: try switching panel from {0} to {1} ({2} to {3})",
+ new String[] { l_panel.getClass().getName(), panel.getClass().getName(),
+ Integer.toString(last), Integer.toString(installdata.curPanelNumber)},
+ DebugConstants.PANEL_TRACE, null);
+
// instead of writing data here which leads to duplicated entries in
// auto-installation script (bug # 4551), let's make data only immediately before
// writing out that script.
@@ -764,6 +772,7 @@
public void run()
{
JButton cdb = null;
+ String buttonName = "next";
if (nextButton.isEnabled()) {
cdb = nextButton;
quitButton.setDefaultCapable(false);
@@ -771,11 +780,16 @@
nextButton.setDefaultCapable(true);
} else if (quitButton.isEnabled()) {
cdb = quitButton;
+ buttonName = "quit";
quitButton.setDefaultCapable(true);
prevButton.setDefaultCapable(false);
nextButton.setDefaultCapable(false);
}
getRootPane().setDefaultButton(cdb);
+ Log.getInstance().addDebugMessage("InstallerFrame.switchPanel: setting {0} as default button",
+ new String[] { buttonName },
+ DebugConstants.PANEL_TRACE,
+ null);
}
});
@@ -835,6 +849,8 @@
}
isBack = false;
callGUIListener(GUIListener.PANEL_SWITCHED);
+ Log.getInstance().addDebugMessage("InstallerFrame.switchPanel: switched", null,
+ DebugConstants.PANEL_TRACE, null);
}
catch (Exception err)
{
Modified: izpack-src/trunk/src/lib/com/izforge/izpack/panels/FinishPanel.java
===================================================================
--- izpack-src/trunk/src/lib/com/izforge/izpack/panels/FinishPanel.java 2007-03-13 14:17:47 UTC (rev 1781)
+++ izpack-src/trunk/src/lib/com/izforge/izpack/panels/FinishPanel.java 2007-03-13 17:03:11 UTC (rev 1782)
@@ -35,6 +35,7 @@
import com.izforge.izpack.installer.InstallData;
import com.izforge.izpack.installer.InstallerFrame;
import com.izforge.izpack.installer.IzPanel;
+import com.izforge.izpack.util.Log;
import com.izforge.izpack.util.VariableSubstitutor;
/**
@@ -113,6 +114,7 @@
add(LabelFactory.create(parent.langpack.getString("FinishPanel.fail"),
parent.icons.getImageIcon("information"), LEADING), NEXT_LINE);
getLayoutHelper().completeLayout(); // Call, or call not?
+ Log.getInstance().informUser();
}
/**
Modified: izpack-src/trunk/src/lib/com/izforge/izpack/panels/SimpleFinishPanel.java
===================================================================
--- izpack-src/trunk/src/lib/com/izforge/izpack/panels/SimpleFinishPanel.java 2007-03-13 14:17:47 UTC (rev 1781)
+++ izpack-src/trunk/src/lib/com/izforge/izpack/panels/SimpleFinishPanel.java 2007-03-13 17:03:11 UTC (rev 1782)
@@ -26,6 +26,7 @@
import com.izforge.izpack.installer.InstallData;
import com.izforge.izpack.installer.InstallerFrame;
import com.izforge.izpack.installer.IzPanel;
+import com.izforge.izpack.util.Log;
import com.izforge.izpack.util.VariableSubstitutor;
/**
@@ -98,7 +99,7 @@
add(LabelFactory.create(parent.langpack.getString("FinishPanel.fail"),
parent.icons.getImageIcon("information"), LEADING));
getLayoutHelper().completeLayout(); // Call, or call not?
-
+ Log.getInstance().informUser();
}
/**
Modified: izpack-src/trunk/src/lib/com/izforge/izpack/util/Log.java
===================================================================
--- izpack-src/trunk/src/lib/com/izforge/izpack/util/Log.java 2007-03-13 14:17:47 UTC (rev 1781)
+++ izpack-src/trunk/src/lib/com/izforge/izpack/util/Log.java 2007-03-13 17:03:11 UTC (rev 1782)
@@ -220,6 +220,8 @@
// ----------------------------------------------------
// get the list of debug channels requested
// ----------------------------------------------------
+ recordedChannels = new Hashtable();
+ channels = new Vector();
temp = System.getProperty(CHANNEL_LIST);
if ((temp != null) && (temp.toUpperCase().equals("ON")))
{
@@ -232,8 +234,6 @@
temp = System.getProperty(CHANNEL_SPEC);
if (temp != null)
{
- channels = new Vector();
- recordedChannels = new Hashtable();
String[] channelList = temp.split(",");
for (int i = 0; i < channelList.length; i++)
More information about the izpack-changes
mailing list