From 9ff80a3c885c274f97dafbf5763c396ee8dbffc1 Mon Sep 17 00:00:00 2001 From: Dale Schultz Date: Thu, 15 Sep 2011 20:57:11 +0000 Subject: [PATCH] Minor updates. git-svn-id: https://svn2.assembla.com/svn/romraider/trunk@333 38686702-15cf-42e4-a595-3071df8bf5ea --- 3rdparty/IzPack/bin/compile.bat | 6 ++++++ src/com/romraider/logger/ecu/EcuLogger.java | 4 +++- src/com/romraider/xml/DOMSettingsUnmarshaller.java | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/3rdparty/IzPack/bin/compile.bat b/3rdparty/IzPack/bin/compile.bat index 8953a955..045cdd1d 100644 --- a/3rdparty/IzPack/bin/compile.bat +++ b/3rdparty/IzPack/bin/compile.bat @@ -82,6 +82,12 @@ for %%i in ("%IZPACK_HOME%\lib\*.jar") do call "%IZPACK_HOME%\bin\lcp.bat" %%i :runIzpack set MAIN_CLASS=com.izforge.izpack.compiler.Compiler +echo Executing +echo Java CMD: ["%_JAVACMD%" -Xmx512m] +echo Izpack options: [%IZPACK_OPTS%] +echo Class Path: ["%LOCALCLASSPATH%"] +echo Main Class: [%MAIN_CLASS%] +echo CMD line ARGS: [%IZPACK_CMD_LINE_ARGS%] "%_JAVACMD%" -Xmx512m %IZPACK_OPTS% -classpath "%LOCALCLASSPATH%" %MAIN_CLASS% %IZPACK_CMD_LINE_ARGS% goto end diff --git a/src/com/romraider/logger/ecu/EcuLogger.java b/src/com/romraider/logger/ecu/EcuLogger.java index eb217aca..0bf0fbcf 100644 --- a/src/com/romraider/logger/ecu/EcuLogger.java +++ b/src/com/romraider/logger/ecu/EcuLogger.java @@ -188,7 +188,7 @@ public final class EcuLogger extends AbstractFrame implements MessageListener { private static final String HEADING_SWITCHES = "Switches"; private static final String HEADING_EXTERNAL = "External"; private static final String CAL_ID_LABEL = "CAL ID"; - private static final String FILE_NAME_EXTENTION = "Text to add to the saved logfile name. PT = Part Throttle"; + private static final String FILE_NAME_EXTENTION = "Right-click to select or type text to add to the saved logfile name."; private static final String ECU_TEXT = "Engine Control Unit Polling"; private static final String TCU_TEXT = "Transmission Control Unit Polling"; private static final String[] logFileText = {"1st PT","2nd PT","3rd PT", // PT = Part Throttle @@ -937,6 +937,8 @@ public final class EcuLogger extends AbstractFrame implements MessageListener { fileNamePopup.add(ecuIdItem); for (final String item : logFileText) { ecuIdItem = new JMenuItem(item); + if (item.endsWith("PT")) ecuIdItem.setToolTipText("Part Throttle"); + if (item.endsWith("WOT")) ecuIdItem.setToolTipText("Wide Open Throttle"); ecuIdItem.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { fileNameExtention.setText(item.replaceAll(" ", "_")); diff --git a/src/com/romraider/xml/DOMSettingsUnmarshaller.java b/src/com/romraider/xml/DOMSettingsUnmarshaller.java index d0e06972..2c8f5eb7 100644 --- a/src/com/romraider/xml/DOMSettingsUnmarshaller.java +++ b/src/com/romraider/xml/DOMSettingsUnmarshaller.java @@ -216,7 +216,7 @@ public final class DOMSettingsUnmarshaller { settings.setLoggerPortDefault(unmarshallAttribute(n, "port", "")); settings.setRefreshMode(unmarshallAttribute(n, "refresh", false)); settings.setDestinationId((byte) unmarshallAttribute(n, "ecuid", (byte) 0x10)); - settings.setFastPoll(unmarshallAttribute(n, "fastpoll", false)); + settings.setFastPoll(unmarshallAttribute(n, "fastpoll", true)); } else if (n.getNodeType() == ELEMENT_NODE && n.getNodeName().equalsIgnoreCase("maximized")) { settings.setLoggerWindowMaximized(unmarshallAttribute(n, "value", false));