From 34c31f87be668fc3b16d06790456bcdb3eac9618 Mon Sep 17 00:00:00 2001 From: Dale Schultz Date: Thu, 14 Jun 2012 18:56:22 -0400 Subject: [PATCH] Fix up Static method references due to changes to Setting class. --- src/com/romraider/Settings.java | 4 ++-- .../swing/menubar/action/LoggerDefinitionLocationAction.java | 4 +++- .../ecu/ui/swing/menubar/action/ReloadProfileAction.java | 4 +++- .../logger/ecu/ui/swing/menubar/action/SaveProfileAction.java | 4 +++- .../ecu/ui/swing/menubar/action/SaveProfileAsAction.java | 4 +++- src/com/romraider/xml/DOMSettingsBuilder.java | 4 ++-- src/com/romraider/xml/DOMSettingsUnmarshaller.java | 2 +- 7 files changed, 17 insertions(+), 9 deletions(-) diff --git a/src/com/romraider/Settings.java b/src/com/romraider/Settings.java index 19450db4..bb1f0251 100644 --- a/src/com/romraider/Settings.java +++ b/src/com/romraider/Settings.java @@ -338,7 +338,7 @@ public class Settings implements Serializable { } public void setLoggerDefinitionFilePath(String loggerDefinitionFilePath) { - this.loggerDefinitionFilePath = loggerDefinitionFilePath; + Settings.loggerDefinitionFilePath = loggerDefinitionFilePath; } public String getLoggerOutputDirPath() { @@ -382,7 +382,7 @@ public class Settings implements Serializable { } public void setLoggerProfileFilePath(String loggerProfileFilePath) { - this.loggerProfileFilePath = loggerProfileFilePath; + Settings.loggerProfileFilePath = loggerProfileFilePath; } public void setLoggerOutputDirPath(String loggerOutputDirPath) { diff --git a/src/com/romraider/logger/ecu/ui/swing/menubar/action/LoggerDefinitionLocationAction.java b/src/com/romraider/logger/ecu/ui/swing/menubar/action/LoggerDefinitionLocationAction.java index 047816d0..49154531 100644 --- a/src/com/romraider/logger/ecu/ui/swing/menubar/action/LoggerDefinitionLocationAction.java +++ b/src/com/romraider/logger/ecu/ui/swing/menubar/action/LoggerDefinitionLocationAction.java @@ -19,6 +19,7 @@ package com.romraider.logger.ecu.ui.swing.menubar.action; +import com.romraider.Settings; import com.romraider.logger.ecu.EcuLogger; import static com.romraider.logger.ecu.ui.swing.menubar.util.FileHelper.getDefinitionFileChooser; import static com.romraider.logger.ecu.ui.swing.menubar.util.FileHelper.getFile; @@ -44,7 +45,8 @@ public final class LoggerDefinitionLocationAction extends AbstractAction { } private void setDefinitionLocationDialog() throws Exception { - File lastConfigPath = getFile(logger.getSettings().getLoggerDefinitionFilePath()); + logger.getSettings(); + File lastConfigPath = getFile(Settings.getLoggerDefinitionFilePath()); JFileChooser fc = getDefinitionFileChooser(lastConfigPath); if (fc.showOpenDialog(logger) == APPROVE_OPTION) { String path = fc.getSelectedFile().getAbsolutePath(); diff --git a/src/com/romraider/logger/ecu/ui/swing/menubar/action/ReloadProfileAction.java b/src/com/romraider/logger/ecu/ui/swing/menubar/action/ReloadProfileAction.java index d4f868ab..21ffb69c 100644 --- a/src/com/romraider/logger/ecu/ui/swing/menubar/action/ReloadProfileAction.java +++ b/src/com/romraider/logger/ecu/ui/swing/menubar/action/ReloadProfileAction.java @@ -19,6 +19,7 @@ package com.romraider.logger.ecu.ui.swing.menubar.action; +import com.romraider.Settings; import com.romraider.logger.ecu.EcuLogger; import com.romraider.swing.menubar.action.AbstractAction; import java.awt.event.ActionEvent; @@ -31,7 +32,8 @@ public final class ReloadProfileAction extends AbstractAction { public void actionPerformed(ActionEvent actionEvent) { try { - logger.loadUserProfile(logger.getSettings().getLoggerProfileFilePath()); + logger.getSettings(); + logger.loadUserProfile(Settings.getLoggerProfileFilePath()); } catch (Exception e) { logger.reportError(e); } diff --git a/src/com/romraider/logger/ecu/ui/swing/menubar/action/SaveProfileAction.java b/src/com/romraider/logger/ecu/ui/swing/menubar/action/SaveProfileAction.java index c4475cb4..73db32a4 100644 --- a/src/com/romraider/logger/ecu/ui/swing/menubar/action/SaveProfileAction.java +++ b/src/com/romraider/logger/ecu/ui/swing/menubar/action/SaveProfileAction.java @@ -19,6 +19,7 @@ package com.romraider.logger.ecu.ui.swing.menubar.action; +import com.romraider.Settings; import com.romraider.logger.ecu.EcuLogger; import static com.romraider.logger.ecu.ui.swing.menubar.util.FileHelper.saveProfileToFile; import com.romraider.swing.menubar.action.AbstractAction; @@ -40,7 +41,8 @@ public final class SaveProfileAction extends AbstractAction { } private void saveProfile() throws Exception { - File lastProfileFile = new File(logger.getSettings().getLoggerProfileFilePath()); + logger.getSettings(); + File lastProfileFile = new File(Settings.getLoggerProfileFilePath()); String profileFilePath = saveProfileToFile(logger.getCurrentProfile(), lastProfileFile); logger.getSettings().setLoggerProfileFilePath(profileFilePath); logger.reportMessageInTitleBar("Profile: " + profileFilePath); diff --git a/src/com/romraider/logger/ecu/ui/swing/menubar/action/SaveProfileAsAction.java b/src/com/romraider/logger/ecu/ui/swing/menubar/action/SaveProfileAsAction.java index a1bccc88..b95d64da 100644 --- a/src/com/romraider/logger/ecu/ui/swing/menubar/action/SaveProfileAsAction.java +++ b/src/com/romraider/logger/ecu/ui/swing/menubar/action/SaveProfileAsAction.java @@ -19,6 +19,7 @@ package com.romraider.logger.ecu.ui.swing.menubar.action; +import com.romraider.Settings; import com.romraider.logger.ecu.EcuLogger; import static com.romraider.logger.ecu.ui.swing.menubar.util.FileHelper.getFile; import static com.romraider.logger.ecu.ui.swing.menubar.util.FileHelper.getProfileFileChooser; @@ -46,7 +47,8 @@ public final class SaveProfileAsAction extends AbstractAction { } private void saveProfileAs() throws Exception { - File lastProfileFile = getFile(logger.getSettings().getLoggerProfileFilePath()); + logger.getSettings(); + File lastProfileFile = getFile(Settings.getLoggerProfileFilePath()); JFileChooser fc = getProfileFileChooser(lastProfileFile); if (fc.showSaveDialog(logger) == APPROVE_OPTION) { File selectedFile = fc.getSelectedFile(); diff --git a/src/com/romraider/xml/DOMSettingsBuilder.java b/src/com/romraider/xml/DOMSettingsBuilder.java index b4f08d13..6f6619e6 100644 --- a/src/com/romraider/xml/DOMSettingsBuilder.java +++ b/src/com/romraider/xml/DOMSettingsBuilder.java @@ -272,12 +272,12 @@ public final class DOMSettingsBuilder { // definition path IIOMetadataNode definition = new IIOMetadataNode("definition"); - definition.setAttribute("path", settings.getLoggerDefinitionFilePath()); + definition.setAttribute("path", Settings.getLoggerDefinitionFilePath()); loggerSettings.appendChild(definition); // profile path IIOMetadataNode profile = new IIOMetadataNode("profile"); - profile.setAttribute("path", settings.getLoggerProfileFilePath()); + profile.setAttribute("path", Settings.getLoggerProfileFilePath()); loggerSettings.appendChild(profile); // file logging diff --git a/src/com/romraider/xml/DOMSettingsUnmarshaller.java b/src/com/romraider/xml/DOMSettingsUnmarshaller.java index 2718806b..fc63b297 100644 --- a/src/com/romraider/xml/DOMSettingsUnmarshaller.java +++ b/src/com/romraider/xml/DOMSettingsUnmarshaller.java @@ -239,7 +239,7 @@ public final class DOMSettingsUnmarshaller { settings.setLoggerParameterListState(unmarshallAttribute(n, "showlist", true)); } else if (n.getNodeType() == ELEMENT_NODE && n.getNodeName().equalsIgnoreCase("definition")) { - settings.setLoggerDefinitionFilePath(unmarshallAttribute(n, "path", settings.getLoggerDefinitionFilePath())); + settings.setLoggerDefinitionFilePath(unmarshallAttribute(n, "path", Settings.getLoggerDefinitionFilePath())); } else if (n.getNodeType() == ELEMENT_NODE && n.getNodeName().equalsIgnoreCase("profile")) { settings.setLoggerProfileFilePath(unmarshallAttribute(n, "path", ""));