From 657592e11917a6b72d7648cff7202747370d7300 Mon Sep 17 00:00:00 2001 From: bkuker Date: Fri, 26 Oct 2012 14:47:40 -0400 Subject: [PATCH] Replace all client calls with SLF calls --- .../document/OpenRocketDocument.java | 8 +++-- .../openrocket/importt/OpenRocketLoader.java | 3 +- .../openrocket/gui/adaptors/BooleanModel.java | 7 ++-- .../openrocket/gui/adaptors/DoubleModel.java | 7 ++-- .../openrocket/gui/adaptors/IntegerModel.java | 7 ++-- .../openrocket/gui/adaptors/PresetModel.java | 6 ++-- .../gui/components/ColorChooserButton.java | 7 ++-- .../gui/configdialog/FinSetConfig.java | 7 ++-- .../configdialog/FreeformFinSetConfig.java | 6 ++-- .../CustomExpressionPanel.java | 6 ++-- .../customexpression/OperatorSelector.java | 6 ++-- .../gui/dialogs/DebugLogDialog.java | 5 ++- .../dialogs/MotorDatabaseLoadingDialog.java | 10 +++--- .../gui/dialogs/PrintSettingsDialog.java | 6 ++-- .../openrocket/gui/dialogs/ScaleDialog.java | 6 ++-- .../gui/dialogs/SwingWorkerDialog.java | 6 ++-- .../ThrustCurveMotorSelectionPanel.java | 5 +-- .../GeneralOptimizationDialog.java | 12 ++++--- .../preferences/PreferencesDialog.java | 6 ++-- .../gui/figure3d/RocketFigure3d.java | 7 ++-- .../gui/help/tours/SlideShowDialog.java | 6 ++-- .../sf/openrocket/gui/main/BasicFrame.java | 7 ++-- .../gui/main/ComponentAddButtons.java | 6 ++-- .../gui/main/SwingExceptionHandler.java | 12 ++++--- .../openrocket/gui/main/UndoRedoAction.java | 6 ++-- .../ComponentTreeTransferHandler.java | 6 ++-- .../gui/preset/ComponentPresetEditor.java | 7 ++-- .../sf/openrocket/gui/util/FileHelper.java | 19 +++++----- .../net/sf/openrocket/gui/util/GUIUtil.java | 6 ++-- .../RocketOptimizationFunction.java | 7 ++-- .../modifiers/GenericModifier.java | 7 ++-- .../sf/openrocket/rocketcomponent/Rocket.java | 6 ++-- .../BasicEventSimulationEngine.java | 6 ++-- .../simulation/RK4SimulationStepper.java | 6 ++-- .../customexpression/CustomExpression.java | 7 ++-- .../customexpression/IndexExpression.java | 7 ++-- .../customexpression/RangeExpression.java | 7 ++-- .../openrocket/util/AbstractChangeSource.java | 10 +++--- .../net/sf/openrocket/util/Invalidator.java | 10 +++--- .../net/sf/openrocket/util/ListenerList.java | 15 ++++---- core/src/net/sf/openrocket/util/MathUtil.java | 8 ++--- .../net/sf/openrocket/utils/LogSpeedTest.java | 35 ------------------- 42 files changed, 186 insertions(+), 153 deletions(-) delete mode 100644 core/src/net/sf/openrocket/utils/LogSpeedTest.java diff --git a/core/src/net/sf/openrocket/document/OpenRocketDocument.java b/core/src/net/sf/openrocket/document/OpenRocketDocument.java index 1635f70a1..0f4084b26 100644 --- a/core/src/net/sf/openrocket/document/OpenRocketDocument.java +++ b/core/src/net/sf/openrocket/document/OpenRocketDocument.java @@ -8,10 +8,12 @@ import java.util.LinkedList; import java.util.List; import java.util.Set; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import net.sf.openrocket.document.events.DocumentChangeEvent; import net.sf.openrocket.document.events.DocumentChangeListener; import net.sf.openrocket.document.events.SimulationChangeEvent; -import net.sf.openrocket.logging.LogHelper; import net.sf.openrocket.logging.Markers; import net.sf.openrocket.logging.TraceException; import net.sf.openrocket.rocketcomponent.ComponentChangeEvent; @@ -38,7 +40,7 @@ import net.sf.openrocket.util.ArrayList; * @author Sampo Niskanen */ public class OpenRocketDocument implements ComponentChangeListener { - private static final LogHelper log = Application.getLogger(); + private static final Logger log = LoggerFactory.getLogger(OpenRocketDocument.class); /** * The minimum number of undo levels that are stored. @@ -522,7 +524,7 @@ public class OpenRocketDocument implements ComponentChangeListener { * time it occurs, but not on subsequent times. Logs automatically the undo system state. */ private void logUndoError(String error) { - log.error(1, error + ": this=" + this + " undoPosition=" + undoPosition + + log.error(error + ": this=" + this + " undoPosition=" + undoPosition + " undoHistory.size=" + undoHistory.size() + " isClean=" + isCleanState() + " nextDescription=" + nextDescription + " storedDescription=" + storedDescription, new TraceException()); diff --git a/core/src/net/sf/openrocket/file/openrocket/importt/OpenRocketLoader.java b/core/src/net/sf/openrocket/file/openrocket/importt/OpenRocketLoader.java index 9e4438be8..0ac3ef24b 100644 --- a/core/src/net/sf/openrocket/file/openrocket/importt/OpenRocketLoader.java +++ b/core/src/net/sf/openrocket/file/openrocket/importt/OpenRocketLoader.java @@ -25,7 +25,6 @@ import net.sf.openrocket.file.simplesax.AbstractElementHandler; import net.sf.openrocket.file.simplesax.ElementHandler; import net.sf.openrocket.file.simplesax.PlainTextHandler; import net.sf.openrocket.file.simplesax.SimpleSAX; -import net.sf.openrocket.logging.LogHelper; import net.sf.openrocket.material.Material; import net.sf.openrocket.motor.Motor; import net.sf.openrocket.preset.ComponentPreset; @@ -1702,7 +1701,7 @@ class FlightDataBranchHandler extends AbstractElementHandler { private final FlightDataType[] types; private final FlightDataBranch branch; - private static final LogHelper log = Application.getLogger(); + private static final Logger log = LoggerFactory.getLogger(FlightDataBranchHandler.class); private final SingleSimulationHandler simHandler; public FlightDataBranchHandler(String name, String typeList, SingleSimulationHandler simHandler, DocumentLoadingContext context) { diff --git a/core/src/net/sf/openrocket/gui/adaptors/BooleanModel.java b/core/src/net/sf/openrocket/gui/adaptors/BooleanModel.java index 65f67da9a..8c30c7476 100644 --- a/core/src/net/sf/openrocket/gui/adaptors/BooleanModel.java +++ b/core/src/net/sf/openrocket/gui/adaptors/BooleanModel.java @@ -11,9 +11,10 @@ import java.util.List; import javax.swing.AbstractAction; -import net.sf.openrocket.logging.LogHelper; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import net.sf.openrocket.logging.Markers; -import net.sf.openrocket.startup.Application; import net.sf.openrocket.util.BugException; import net.sf.openrocket.util.ChangeSource; import net.sf.openrocket.util.Invalidatable; @@ -39,7 +40,7 @@ import net.sf.openrocket.util.StateChangeListener; * @author Sampo Niskanen */ public class BooleanModel extends AbstractAction implements StateChangeListener, Invalidatable { - private static final LogHelper log = Application.getLogger(); + private static final Logger log = LoggerFactory.getLogger(BooleanModel.class); private final ChangeSource source; private final String valueName; diff --git a/core/src/net/sf/openrocket/gui/adaptors/DoubleModel.java b/core/src/net/sf/openrocket/gui/adaptors/DoubleModel.java index 78418ec39..da9f11011 100644 --- a/core/src/net/sf/openrocket/gui/adaptors/DoubleModel.java +++ b/core/src/net/sf/openrocket/gui/adaptors/DoubleModel.java @@ -17,9 +17,10 @@ import javax.swing.SpinnerModel; import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; -import net.sf.openrocket.logging.LogHelper; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import net.sf.openrocket.logging.Markers; -import net.sf.openrocket.startup.Application; import net.sf.openrocket.unit.Unit; import net.sf.openrocket.unit.UnitGroup; import net.sf.openrocket.util.BugException; @@ -49,7 +50,7 @@ import net.sf.openrocket.util.StateChangeListener; */ public class DoubleModel implements StateChangeListener, ChangeSource, Invalidatable { - private static final LogHelper log = Application.getLogger(); + private static final Logger log = LoggerFactory.getLogger(DoubleModel.class); public static final DoubleModel ZERO = new DoubleModel(0); diff --git a/core/src/net/sf/openrocket/gui/adaptors/IntegerModel.java b/core/src/net/sf/openrocket/gui/adaptors/IntegerModel.java index 04a6dee5c..333cda5b8 100644 --- a/core/src/net/sf/openrocket/gui/adaptors/IntegerModel.java +++ b/core/src/net/sf/openrocket/gui/adaptors/IntegerModel.java @@ -11,9 +11,10 @@ import javax.swing.SpinnerNumberModel; import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; -import net.sf.openrocket.logging.LogHelper; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import net.sf.openrocket.logging.Markers; -import net.sf.openrocket.startup.Application; import net.sf.openrocket.util.BugException; import net.sf.openrocket.util.ChangeSource; import net.sf.openrocket.util.Reflection; @@ -21,7 +22,7 @@ import net.sf.openrocket.util.StateChangeListener; public class IntegerModel implements StateChangeListener { - private static final LogHelper log = Application.getLogger(); + private static final Logger log = LoggerFactory.getLogger(IntegerModel.class); //////////// JSpinner Model //////////// diff --git a/core/src/net/sf/openrocket/gui/adaptors/PresetModel.java b/core/src/net/sf/openrocket/gui/adaptors/PresetModel.java index b8d3023d5..061da9ddc 100644 --- a/core/src/net/sf/openrocket/gui/adaptors/PresetModel.java +++ b/core/src/net/sf/openrocket/gui/adaptors/PresetModel.java @@ -7,12 +7,14 @@ import javax.swing.AbstractListModel; import javax.swing.ComboBoxModel; import javax.swing.SwingUtilities; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import net.sf.openrocket.database.Database; import net.sf.openrocket.database.DatabaseListener; import net.sf.openrocket.document.OpenRocketDocument; import net.sf.openrocket.gui.dialogs.preset.ComponentPresetChooserDialog; import net.sf.openrocket.l10n.Translator; -import net.sf.openrocket.logging.LogHelper; import net.sf.openrocket.logging.Markers; import net.sf.openrocket.preset.ComponentPreset; import net.sf.openrocket.rocketcomponent.ComponentChangeEvent; @@ -23,7 +25,7 @@ import net.sf.openrocket.util.BugException; public class PresetModel extends AbstractListModel implements ComboBoxModel, ComponentChangeListener, DatabaseListener { - private static final LogHelper log = Application.getLogger(); + private static final Logger log = LoggerFactory.getLogger(PresetModel.class); private static final Translator trans = Application.getTranslator(); private static final String NONE_SELECTED = trans.get("lbl.select"); diff --git a/core/src/net/sf/openrocket/gui/components/ColorChooserButton.java b/core/src/net/sf/openrocket/gui/components/ColorChooserButton.java index beed3ddfa..e0472b1ab 100644 --- a/core/src/net/sf/openrocket/gui/components/ColorChooserButton.java +++ b/core/src/net/sf/openrocket/gui/components/ColorChooserButton.java @@ -10,9 +10,10 @@ import javax.swing.JColorChooser; import javax.swing.JDialog; import javax.swing.JPanel; -import net.sf.openrocket.logging.LogHelper; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import net.sf.openrocket.logging.Markers; -import net.sf.openrocket.startup.Application; /** * A color chooser button. The currently selected color can be queried or set using the @@ -22,7 +23,7 @@ import net.sf.openrocket.startup.Application; * @author Sampo Niskanen */ public class ColorChooserButton extends JButton { - private static final LogHelper log = Application.getLogger(); + private static final Logger log = LoggerFactory.getLogger(ColorChooserButton.class); public static final String COLOR_KEY = "selectedColor"; diff --git a/core/src/net/sf/openrocket/gui/configdialog/FinSetConfig.java b/core/src/net/sf/openrocket/gui/configdialog/FinSetConfig.java index ba727250c..a68824d67 100644 --- a/core/src/net/sf/openrocket/gui/configdialog/FinSetConfig.java +++ b/core/src/net/sf/openrocket/gui/configdialog/FinSetConfig.java @@ -10,7 +10,6 @@ import net.sf.openrocket.gui.components.StyledLabel; import net.sf.openrocket.gui.components.StyledLabel.Style; import net.sf.openrocket.gui.components.UnitSelector; import net.sf.openrocket.l10n.Translator; -import net.sf.openrocket.logging.LogHelper; import net.sf.openrocket.logging.Markers; import net.sf.openrocket.rocketcomponent.CenteringRing; import net.sf.openrocket.rocketcomponent.Coaxial; @@ -22,6 +21,10 @@ import net.sf.openrocket.startup.Application; import net.sf.openrocket.unit.UnitGroup; import javax.swing.*; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.util.ArrayList; @@ -32,7 +35,7 @@ import java.util.List; public abstract class FinSetConfig extends RocketComponentConfig { - private static final LogHelper log = Application.getLogger(); + private static final Logger log = LoggerFactory.getLogger(FinSetConfig.class); private static final Translator trans = Application.getTranslator(); private JButton split = null; diff --git a/core/src/net/sf/openrocket/gui/configdialog/FreeformFinSetConfig.java b/core/src/net/sf/openrocket/gui/configdialog/FreeformFinSetConfig.java index 7885e8ce6..348ac4f82 100644 --- a/core/src/net/sf/openrocket/gui/configdialog/FreeformFinSetConfig.java +++ b/core/src/net/sf/openrocket/gui/configdialog/FreeformFinSetConfig.java @@ -24,6 +24,9 @@ import javax.swing.SwingConstants; import javax.swing.SwingUtilities; import javax.swing.table.AbstractTableModel; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import net.miginfocom.swing.MigLayout; import net.sf.openrocket.document.OpenRocketDocument; import net.sf.openrocket.gui.SpinnerEditor; @@ -42,7 +45,6 @@ import net.sf.openrocket.gui.util.CustomFinImporter; import net.sf.openrocket.gui.util.FileHelper; import net.sf.openrocket.gui.util.SwingPreferences; import net.sf.openrocket.l10n.Translator; -import net.sf.openrocket.logging.LogHelper; import net.sf.openrocket.logging.Markers; import net.sf.openrocket.material.Material; import net.sf.openrocket.rocketcomponent.FinSet; @@ -55,7 +57,7 @@ import net.sf.openrocket.util.Coordinate; public class FreeformFinSetConfig extends FinSetConfig { - private static final LogHelper log = Application.getLogger(); + private static final Logger log = LoggerFactory.getLogger(FreeformFinSetConfig.class); private static final Translator trans = Application.getTranslator(); private final FreeformFinSet finset; diff --git a/core/src/net/sf/openrocket/gui/customexpression/CustomExpressionPanel.java b/core/src/net/sf/openrocket/gui/customexpression/CustomExpressionPanel.java index c2282b79b..52c96fc96 100644 --- a/core/src/net/sf/openrocket/gui/customexpression/CustomExpressionPanel.java +++ b/core/src/net/sf/openrocket/gui/customexpression/CustomExpressionPanel.java @@ -19,6 +19,9 @@ import javax.swing.SwingUtilities; import javax.swing.border.Border; import javax.swing.filechooser.FileNameExtensionFilter; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import net.miginfocom.swing.MigLayout; import net.sf.openrocket.document.OpenRocketDocument; import net.sf.openrocket.file.DatabaseMotorFinder; @@ -27,14 +30,13 @@ import net.sf.openrocket.file.RocketLoadException; import net.sf.openrocket.gui.components.UnitSelector; import net.sf.openrocket.gui.util.Icons; import net.sf.openrocket.l10n.Translator; -import net.sf.openrocket.logging.LogHelper; import net.sf.openrocket.logging.Markers; import net.sf.openrocket.simulation.customexpression.CustomExpression; import net.sf.openrocket.startup.Application; public class CustomExpressionPanel extends JPanel { - private static final LogHelper log = Application.getLogger(); + private static final Logger log = LoggerFactory.getLogger(CustomExpressionPanel.class); private static final Translator trans = Application.getTranslator(); private JPanel expressionSelectorPanel; diff --git a/core/src/net/sf/openrocket/gui/customexpression/OperatorSelector.java b/core/src/net/sf/openrocket/gui/customexpression/OperatorSelector.java index d51af30cc..73caf909f 100644 --- a/core/src/net/sf/openrocket/gui/customexpression/OperatorSelector.java +++ b/core/src/net/sf/openrocket/gui/customexpression/OperatorSelector.java @@ -22,16 +22,18 @@ import javax.swing.KeyStroke; import javax.swing.event.ListSelectionEvent; import javax.swing.event.ListSelectionListener; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import net.miginfocom.swing.MigLayout; import net.sf.openrocket.l10n.Translator; -import net.sf.openrocket.logging.LogHelper; import net.sf.openrocket.startup.Application; import net.sf.openrocket.util.TextUtil; public class OperatorSelector extends JDialog { private static final Translator trans = Application.getTranslator(); - private static final LogHelper log = Application.getLogger(); + private static final Logger log = LoggerFactory.getLogger(OperatorSelector.class); private final Window parentWindow; diff --git a/core/src/net/sf/openrocket/gui/dialogs/DebugLogDialog.java b/core/src/net/sf/openrocket/gui/dialogs/DebugLogDialog.java index 3f0bcf4ab..3425cdf24 100644 --- a/core/src/net/sf/openrocket/gui/dialogs/DebugLogDialog.java +++ b/core/src/net/sf/openrocket/gui/dialogs/DebugLogDialog.java @@ -38,6 +38,9 @@ import javax.swing.table.TableCellRenderer; import javax.swing.table.TableModel; import javax.swing.table.TableRowSorter; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import net.miginfocom.swing.MigLayout; import net.sf.openrocket.gui.adaptors.Column; import net.sf.openrocket.gui.adaptors.ColumnTableModel; @@ -56,7 +59,7 @@ import net.sf.openrocket.startup.Application; import net.sf.openrocket.util.NumericComparator; public class DebugLogDialog extends JDialog { - private static final LogHelper log = Application.getLogger(); + private static final Logger log = LoggerFactory.getLogger(DebugLogDialog.class); private static final int POLL_TIME = 250; private static final String STACK_TRACE_MARK = "\uFF01"; diff --git a/core/src/net/sf/openrocket/gui/dialogs/MotorDatabaseLoadingDialog.java b/core/src/net/sf/openrocket/gui/dialogs/MotorDatabaseLoadingDialog.java index 5a26d018b..81ca18949 100644 --- a/core/src/net/sf/openrocket/gui/dialogs/MotorDatabaseLoadingDialog.java +++ b/core/src/net/sf/openrocket/gui/dialogs/MotorDatabaseLoadingDialog.java @@ -11,12 +11,14 @@ import javax.swing.JPanel; import javax.swing.JProgressBar; import javax.swing.Timer; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import net.miginfocom.swing.MigLayout; import net.sf.openrocket.database.ThrustCurveMotorSetDatabase; import net.sf.openrocket.gui.main.Splash; import net.sf.openrocket.gui.util.GUIUtil; import net.sf.openrocket.l10n.Translator; -import net.sf.openrocket.logging.LogHelper; import net.sf.openrocket.startup.Application; /** @@ -25,7 +27,7 @@ import net.sf.openrocket.startup.Application; * @author Sampo Niskanen */ public class MotorDatabaseLoadingDialog extends JDialog { - private static final LogHelper log = Application.getLogger(); + private static final Logger log = LoggerFactory.getLogger(MotorDatabaseLoadingDialog.class); private static final Translator trans = Application.getTranslator(); @@ -65,7 +67,7 @@ public class MotorDatabaseLoadingDialog extends JDialog { SplashScreen splash = Splash.getSplashScreen(); if (splash == null || !splash.isVisible()) { - log.info(1, "Motor database not loaded yet, displaying dialog"); + log.info("Motor database not loaded yet, displaying dialog"); final MotorDatabaseLoadingDialog dialog = new MotorDatabaseLoadingDialog(parent); @@ -91,7 +93,7 @@ public class MotorDatabaseLoadingDialog extends JDialog { } else { - log.info(1, "Motor database not loaded yet, splash screen still present, delaying until loaded"); + log.info("Motor database not loaded yet, splash screen still present, delaying until loaded"); db.setInUse(); int count = 0; diff --git a/core/src/net/sf/openrocket/gui/dialogs/PrintSettingsDialog.java b/core/src/net/sf/openrocket/gui/dialogs/PrintSettingsDialog.java index e92f23676..3271c8c9f 100644 --- a/core/src/net/sf/openrocket/gui/dialogs/PrintSettingsDialog.java +++ b/core/src/net/sf/openrocket/gui/dialogs/PrintSettingsDialog.java @@ -13,6 +13,9 @@ import javax.swing.JDialog; import javax.swing.JLabel; import javax.swing.JPanel; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import net.miginfocom.swing.MigLayout; import net.sf.openrocket.gui.adaptors.EnumModel; import net.sf.openrocket.gui.components.ColorChooserButton; @@ -21,7 +24,6 @@ import net.sf.openrocket.gui.print.PaperSize; import net.sf.openrocket.gui.print.PrintSettings; import net.sf.openrocket.gui.util.GUIUtil; import net.sf.openrocket.l10n.Translator; -import net.sf.openrocket.logging.LogHelper; import net.sf.openrocket.logging.Markers; import net.sf.openrocket.startup.Application; @@ -29,7 +31,7 @@ import net.sf.openrocket.startup.Application; * This class is a dialog for displaying advanced settings for printing rocket related info. */ public class PrintSettingsDialog extends JDialog { - private static final LogHelper log = Application.getLogger(); + private static final Logger log = LoggerFactory.getLogger(PrintSettingsDialog.class); private static final Translator trans = Application.getTranslator(); diff --git a/core/src/net/sf/openrocket/gui/dialogs/ScaleDialog.java b/core/src/net/sf/openrocket/gui/dialogs/ScaleDialog.java index 808a9a2f5..52800955e 100644 --- a/core/src/net/sf/openrocket/gui/dialogs/ScaleDialog.java +++ b/core/src/net/sf/openrocket/gui/dialogs/ScaleDialog.java @@ -19,6 +19,9 @@ import javax.swing.JSpinner; import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import net.miginfocom.swing.MigLayout; import net.sf.openrocket.document.OpenRocketDocument; import net.sf.openrocket.gui.SpinnerEditor; @@ -27,7 +30,6 @@ import net.sf.openrocket.gui.components.BasicSlider; import net.sf.openrocket.gui.components.UnitSelector; import net.sf.openrocket.gui.util.GUIUtil; import net.sf.openrocket.l10n.Translator; -import net.sf.openrocket.logging.LogHelper; import net.sf.openrocket.logging.Markers; import net.sf.openrocket.rocketcomponent.BodyComponent; import net.sf.openrocket.rocketcomponent.BodyTube; @@ -65,7 +67,7 @@ import net.sf.openrocket.util.Reflection.Method; */ public class ScaleDialog extends JDialog { - private static final LogHelper log = Application.getLogger(); + private static final Logger log = LoggerFactory.getLogger(ScaleDialog.class); private static final Translator trans = Application.getTranslator(); diff --git a/core/src/net/sf/openrocket/gui/dialogs/SwingWorkerDialog.java b/core/src/net/sf/openrocket/gui/dialogs/SwingWorkerDialog.java index 80df3b291..dc18c57fc 100644 --- a/core/src/net/sf/openrocket/gui/dialogs/SwingWorkerDialog.java +++ b/core/src/net/sf/openrocket/gui/dialogs/SwingWorkerDialog.java @@ -14,9 +14,11 @@ import javax.swing.JPanel; import javax.swing.JProgressBar; import javax.swing.SwingWorker; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import net.miginfocom.swing.MigLayout; import net.sf.openrocket.l10n.Translator; -import net.sf.openrocket.logging.LogHelper; import net.sf.openrocket.logging.Markers; import net.sf.openrocket.startup.Application; import net.sf.openrocket.util.MathUtil; @@ -31,7 +33,7 @@ import net.sf.openrocket.util.MathUtil; * @author Sampo Niskanen */ public class SwingWorkerDialog extends JDialog implements PropertyChangeListener { - private static final LogHelper log = Application.getLogger(); + private static final Logger log = LoggerFactory.getLogger(SwingWorkerDialog.class); private static final Translator trans = Application.getTranslator(); /** Number of milliseconds to wait at a time between checking worker status */ diff --git a/core/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/ThrustCurveMotorSelectionPanel.java b/core/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/ThrustCurveMotorSelectionPanel.java index 93882b59e..5c59249b8 100644 --- a/core/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/ThrustCurveMotorSelectionPanel.java +++ b/core/src/net/sf/openrocket/gui/dialogs/motor/thrustcurve/ThrustCurveMotorSelectionPanel.java @@ -53,7 +53,6 @@ import net.sf.openrocket.gui.util.GUIUtil; import net.sf.openrocket.gui.util.Icons; import net.sf.openrocket.gui.util.SwingPreferences; import net.sf.openrocket.l10n.Translator; -import net.sf.openrocket.logging.LogHelper; import net.sf.openrocket.logging.Markers; import net.sf.openrocket.motor.Motor; import net.sf.openrocket.motor.ThrustCurveMotor; @@ -72,9 +71,11 @@ import org.jfree.chart.plot.XYPlot; import org.jfree.chart.title.TextTitle; import org.jfree.data.xy.XYSeries; import org.jfree.data.xy.XYSeriesCollection; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class ThrustCurveMotorSelectionPanel extends JPanel implements MotorSelector { - private static final LogHelper log = Application.getLogger(); + private static final Logger log = LoggerFactory.getLogger(ThrustCurveMotorSelectionPanel.class); private static final Translator trans = Application.getTranslator(); private static final double MOTOR_SIMILARITY_THRESHOLD = 0.95; diff --git a/core/src/net/sf/openrocket/gui/dialogs/optimization/GeneralOptimizationDialog.java b/core/src/net/sf/openrocket/gui/dialogs/optimization/GeneralOptimizationDialog.java index 1c844fda5..b5362f619 100644 --- a/core/src/net/sf/openrocket/gui/dialogs/optimization/GeneralOptimizationDialog.java +++ b/core/src/net/sf/openrocket/gui/dialogs/optimization/GeneralOptimizationDialog.java @@ -51,6 +51,9 @@ import javax.swing.table.TableColumnModel; import javax.swing.tree.DefaultMutableTreeNode; import javax.swing.tree.TreePath; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import net.miginfocom.swing.MigLayout; import net.sf.openrocket.document.OpenRocketDocument; import net.sf.openrocket.document.Simulation; @@ -69,7 +72,6 @@ import net.sf.openrocket.gui.util.FileHelper; import net.sf.openrocket.gui.util.GUIUtil; import net.sf.openrocket.gui.util.SwingPreferences; import net.sf.openrocket.l10n.Translator; -import net.sf.openrocket.logging.LogHelper; import net.sf.openrocket.logging.Markers; import net.sf.openrocket.optimization.general.OptimizationException; import net.sf.openrocket.optimization.general.Point; @@ -104,7 +106,7 @@ import com.itextpdf.text.Font; * @author Sampo Niskanen */ public class GeneralOptimizationDialog extends JDialog { - private static final LogHelper log = Application.getLogger(); + private static final Logger log = LoggerFactory.getLogger(GeneralOptimizationDialog.class); private static final Translator trans = Application.getTranslator(); private static final Collator collator = Collator.getInstance(); @@ -1106,19 +1108,19 @@ public class GeneralOptimizationDialog extends JDialog { private void addModifier(SimulationModifier mod) { if (!selectedModifiers.contains(mod)) { - log.user(1, "Adding simulation modifier " + mod); + log.info(Markers.USER_MARKER, "Adding simulation modifier " + mod); selectedModifiers.add(mod); Collections.sort(selectedModifiers, new SimulationModifierComparator()); selectedModifierTableModel.fireTableDataChanged(); availableModifierTree.repaint(); } else { - log.user(1, "Attempting to add an already existing simulation modifier " + mod); + log.info(Markers.USER_MARKER, "Attempting to add an already existing simulation modifier " + mod); } } private void removeModifier(SimulationModifier mod) { - log.user(1, "Removing simulation modifier " + mod); + log.info(Markers.USER_MARKER, "Removing simulation modifier " + mod); selectedModifiers.remove(mod); selectedModifierTableModel.fireTableDataChanged(); availableModifierTree.repaint(); diff --git a/core/src/net/sf/openrocket/gui/dialogs/preferences/PreferencesDialog.java b/core/src/net/sf/openrocket/gui/dialogs/preferences/PreferencesDialog.java index 9ae8217b7..6485d1d9b 100644 --- a/core/src/net/sf/openrocket/gui/dialogs/preferences/PreferencesDialog.java +++ b/core/src/net/sf/openrocket/gui/dialogs/preferences/PreferencesDialog.java @@ -29,6 +29,9 @@ import javax.swing.Timer; import javax.swing.event.DocumentEvent; import javax.swing.event.DocumentListener; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import net.miginfocom.swing.MigLayout; import net.sf.openrocket.communication.UpdateInfo; import net.sf.openrocket.communication.UpdateInfoRetriever; @@ -41,7 +44,6 @@ import net.sf.openrocket.gui.util.SwingPreferences; import net.sf.openrocket.gui.util.SimpleFileFilter; import net.sf.openrocket.l10n.L10N; import net.sf.openrocket.l10n.Translator; -import net.sf.openrocket.logging.LogHelper; import net.sf.openrocket.logging.Markers; import net.sf.openrocket.startup.Application; import net.sf.openrocket.startup.Preferences; @@ -53,7 +55,7 @@ import net.sf.openrocket.util.Utils; public class PreferencesDialog extends JDialog { - private static final LogHelper log = Application.getLogger(); + private static final Logger log = LoggerFactory.getLogger(PreferencesDialog.class); private final List unitSelectors = new ArrayList(); diff --git a/core/src/net/sf/openrocket/gui/figure3d/RocketFigure3d.java b/core/src/net/sf/openrocket/gui/figure3d/RocketFigure3d.java index 2d2557e7c..527648e10 100644 --- a/core/src/net/sf/openrocket/gui/figure3d/RocketFigure3d.java +++ b/core/src/net/sf/openrocket/gui/figure3d/RocketFigure3d.java @@ -31,14 +31,15 @@ import javax.swing.JPopupMenu; import javax.swing.SwingUtilities; import javax.swing.event.MouseInputAdapter; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import net.sf.openrocket.gui.figureelements.CGCaret; import net.sf.openrocket.gui.figureelements.CPCaret; import net.sf.openrocket.gui.figureelements.FigureElement; import net.sf.openrocket.gui.main.Splash; -import net.sf.openrocket.logging.LogHelper; import net.sf.openrocket.rocketcomponent.Configuration; import net.sf.openrocket.rocketcomponent.RocketComponent; -import net.sf.openrocket.startup.Application; import net.sf.openrocket.util.Coordinate; import net.sf.openrocket.util.MathUtil; @@ -49,7 +50,7 @@ import com.jogamp.opengl.util.awt.Overlay; */ public class RocketFigure3d extends JPanel implements GLEventListener { private static final long serialVersionUID = 1L; - private static final LogHelper log = Application.getLogger(); + private static final Logger log = LoggerFactory.getLogger(RocketFigure3d.class); static { //this allows the GL canvas and things like the motor selection diff --git a/core/src/net/sf/openrocket/gui/help/tours/SlideShowDialog.java b/core/src/net/sf/openrocket/gui/help/tours/SlideShowDialog.java index d7c68f449..89c0dd979 100644 --- a/core/src/net/sf/openrocket/gui/help/tours/SlideShowDialog.java +++ b/core/src/net/sf/openrocket/gui/help/tours/SlideShowDialog.java @@ -14,10 +14,12 @@ import javax.swing.JPanel; import javax.swing.JRootPane; import javax.swing.KeyStroke; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import net.miginfocom.swing.MigLayout; import net.sf.openrocket.gui.util.GUIUtil; import net.sf.openrocket.l10n.Translator; -import net.sf.openrocket.logging.LogHelper; import net.sf.openrocket.logging.Markers; import net.sf.openrocket.startup.Application; import net.sf.openrocket.util.BugException; @@ -25,7 +27,7 @@ import net.sf.openrocket.util.Chars; public class SlideShowDialog extends JDialog { - private static final LogHelper log = Application.getLogger(); + private static final Logger log = LoggerFactory.getLogger(SlideShowDialog.class); private static final Translator trans = Application.getTranslator(); private SlideShowComponent slideShowComponent; diff --git a/core/src/net/sf/openrocket/gui/main/BasicFrame.java b/core/src/net/sf/openrocket/gui/main/BasicFrame.java index 0841fef40..b94e6cbfe 100644 --- a/core/src/net/sf/openrocket/gui/main/BasicFrame.java +++ b/core/src/net/sf/openrocket/gui/main/BasicFrame.java @@ -37,7 +37,6 @@ import net.sf.openrocket.gui.util.OpenFileWorker; import net.sf.openrocket.gui.util.SaveFileWorker; import net.sf.openrocket.gui.util.SwingPreferences; import net.sf.openrocket.l10n.Translator; -import net.sf.openrocket.logging.LogHelper; import net.sf.openrocket.logging.Markers; import net.sf.openrocket.rocketcomponent.ComponentChangeEvent; import net.sf.openrocket.rocketcomponent.ComponentChangeListener; @@ -81,6 +80,10 @@ import javax.swing.event.TreeSelectionListener; import javax.swing.tree.DefaultTreeSelectionModel; import javax.swing.tree.TreePath; import javax.swing.tree.TreeSelectionModel; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import java.awt.Dimension; import java.awt.Font; import java.awt.Toolkit; @@ -109,7 +112,7 @@ import java.util.List; import java.util.concurrent.ExecutionException; public class BasicFrame extends JFrame { - private static final LogHelper log = Application.getLogger(); + private static final Logger log = LoggerFactory.getLogger(BasicFrame.class); /** * The RocketLoader instance used for loading all rocket designs. diff --git a/core/src/net/sf/openrocket/gui/main/ComponentAddButtons.java b/core/src/net/sf/openrocket/gui/main/ComponentAddButtons.java index 5f955eba7..126745089 100644 --- a/core/src/net/sf/openrocket/gui/main/ComponentAddButtons.java +++ b/core/src/net/sf/openrocket/gui/main/ComponentAddButtons.java @@ -25,13 +25,15 @@ import javax.swing.event.TreeSelectionListener; import javax.swing.tree.TreePath; import javax.swing.tree.TreeSelectionModel; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import net.miginfocom.swing.MigLayout; import net.sf.openrocket.document.OpenRocketDocument; import net.sf.openrocket.gui.components.StyledLabel; import net.sf.openrocket.gui.configdialog.ComponentConfigDialog; import net.sf.openrocket.gui.main.componenttree.ComponentTreeModel; import net.sf.openrocket.l10n.Translator; -import net.sf.openrocket.logging.LogHelper; import net.sf.openrocket.logging.Markers; import net.sf.openrocket.rocketcomponent.BodyComponent; import net.sf.openrocket.rocketcomponent.BodyTube; @@ -67,7 +69,7 @@ import net.sf.openrocket.util.Reflection; */ public class ComponentAddButtons extends JPanel implements Scrollable { - private static final LogHelper log = Application.getLogger(); + private static final Logger log = LoggerFactory.getLogger(ComponentAddButtons.class); private static final Translator trans = Application.getTranslator(); private static final int ROWS = 3; diff --git a/core/src/net/sf/openrocket/gui/main/SwingExceptionHandler.java b/core/src/net/sf/openrocket/gui/main/SwingExceptionHandler.java index 2a1f1a90c..359b190cf 100644 --- a/core/src/net/sf/openrocket/gui/main/SwingExceptionHandler.java +++ b/core/src/net/sf/openrocket/gui/main/SwingExceptionHandler.java @@ -3,8 +3,10 @@ package net.sf.openrocket.gui.main; import javax.swing.JOptionPane; import javax.swing.SwingUtilities; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import net.sf.openrocket.gui.dialogs.BugReportDialog; -import net.sf.openrocket.logging.LogHelper; import net.sf.openrocket.logging.Markers; import net.sf.openrocket.logging.TraceException; import net.sf.openrocket.startup.Application; @@ -13,7 +15,7 @@ import net.sf.openrocket.startup.ExceptionHandler; public class SwingExceptionHandler implements Thread.UncaughtExceptionHandler, ExceptionHandler { - private static final LogHelper log = Application.getLogger(); + private static final Logger log = LoggerFactory.getLogger(SwingExceptionHandler.class); private static final int MEMORY_RESERVE = 512 * 1024; @@ -98,7 +100,7 @@ public class SwingExceptionHandler implements Thread.UncaughtExceptionHandler, E */ @Override public void handleErrorCondition(String message) { - log.error(1, message, new TraceException()); + log.error(message, new TraceException()); handleErrorCondition(new InternalException(message)); } @@ -115,7 +117,7 @@ public class SwingExceptionHandler implements Thread.UncaughtExceptionHandler, E */ @Override public void handleErrorCondition(String message, Throwable exception) { - log.error(1, message, exception); + log.error(message, exception); handleErrorCondition(new InternalException(message, exception)); } @@ -133,7 +135,7 @@ public class SwingExceptionHandler implements Thread.UncaughtExceptionHandler, E public void handleErrorCondition(final Throwable exception) { try { if (!(exception instanceof InternalException)) { - log.error(1, "Error occurred", exception); + log.error("Error occurred", exception); } final Thread thread = Thread.currentThread(); diff --git a/core/src/net/sf/openrocket/gui/main/UndoRedoAction.java b/core/src/net/sf/openrocket/gui/main/UndoRedoAction.java index eb50ec4d9..cb3fae7a9 100644 --- a/core/src/net/sf/openrocket/gui/main/UndoRedoAction.java +++ b/core/src/net/sf/openrocket/gui/main/UndoRedoAction.java @@ -4,11 +4,13 @@ import java.awt.event.ActionEvent; import javax.swing.AbstractAction; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import net.sf.openrocket.document.OpenRocketDocument; import net.sf.openrocket.document.UndoRedoListener; import net.sf.openrocket.gui.util.Icons; import net.sf.openrocket.l10n.Translator; -import net.sf.openrocket.logging.LogHelper; import net.sf.openrocket.logging.Markers; import net.sf.openrocket.startup.Application; import net.sf.openrocket.util.BugException; @@ -32,7 +34,7 @@ public class UndoRedoAction extends AbstractAction implements UndoRedoListener { return redo; } - private static final LogHelper log = Application.getLogger(); + private static final Logger log = LoggerFactory.getLogger(UndoRedoAction.class); private static final Translator trans = Application.getTranslator(); private static final int UNDO = 1; diff --git a/core/src/net/sf/openrocket/gui/main/componenttree/ComponentTreeTransferHandler.java b/core/src/net/sf/openrocket/gui/main/componenttree/ComponentTreeTransferHandler.java index bc3a5d462..9484ce549 100644 --- a/core/src/net/sf/openrocket/gui/main/componenttree/ComponentTreeTransferHandler.java +++ b/core/src/net/sf/openrocket/gui/main/componenttree/ComponentTreeTransferHandler.java @@ -13,8 +13,10 @@ import javax.swing.TransferHandler; import javax.swing.tree.TreeModel; import javax.swing.tree.TreePath; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import net.sf.openrocket.document.OpenRocketDocument; -import net.sf.openrocket.logging.LogHelper; import net.sf.openrocket.logging.Markers; import net.sf.openrocket.rocketcomponent.Rocket; import net.sf.openrocket.rocketcomponent.RocketComponent; @@ -29,7 +31,7 @@ import net.sf.openrocket.util.BugException; */ public class ComponentTreeTransferHandler extends TransferHandler { - private static final LogHelper log = Application.getLogger(); + private static final Logger log = LoggerFactory.getLogger(ComponentTreeTransferHandler.class); private final OpenRocketDocument document; diff --git a/core/src/net/sf/openrocket/gui/preset/ComponentPresetEditor.java b/core/src/net/sf/openrocket/gui/preset/ComponentPresetEditor.java index a3b777595..971dd4a51 100644 --- a/core/src/net/sf/openrocket/gui/preset/ComponentPresetEditor.java +++ b/core/src/net/sf/openrocket/gui/preset/ComponentPresetEditor.java @@ -6,7 +6,6 @@ import net.sf.openrocket.gui.util.Icons; import net.sf.openrocket.gui.util.SwingPreferences; import net.sf.openrocket.l10n.ResourceBundleTranslator; import net.sf.openrocket.l10n.Translator; -import net.sf.openrocket.logging.LogHelper; import net.sf.openrocket.logging.Markers; import net.sf.openrocket.material.Material; import net.sf.openrocket.preset.ComponentPreset; @@ -34,6 +33,10 @@ import javax.swing.JTable; import javax.swing.SwingUtilities; import javax.swing.table.DefaultTableModel; import javax.xml.bind.JAXBException; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import java.awt.Window; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; @@ -54,7 +57,7 @@ public class ComponentPresetEditor extends JPanel implements PresetResultListene /** * The logger. */ - private static final LogHelper log = Application.getLogger(); + private static final Logger log = LoggerFactory.getLogger(ComponentPresetEditor.class); /** * The I18N translator. diff --git a/core/src/net/sf/openrocket/gui/util/FileHelper.java b/core/src/net/sf/openrocket/gui/util/FileHelper.java index df155cba1..aab125ffc 100644 --- a/core/src/net/sf/openrocket/gui/util/FileHelper.java +++ b/core/src/net/sf/openrocket/gui/util/FileHelper.java @@ -2,13 +2,16 @@ package net.sf.openrocket.gui.util; import net.sf.openrocket.l10n.L10N; import net.sf.openrocket.l10n.Translator; -import net.sf.openrocket.logging.LogHelper; import net.sf.openrocket.logging.Markers; import net.sf.openrocket.startup.Application; import javax.imageio.ImageIO; import javax.swing.*; import javax.swing.filechooser.FileFilter; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import java.awt.*; import java.io.File; import java.io.IOException; @@ -23,7 +26,7 @@ import java.util.Locale; * @author Sampo Niskanen */ public final class FileHelper { - private static final LogHelper log = Application.getLogger(); + private static final Logger log = LoggerFactory.getLogger(FileHelper.class); private static final Translator trans = Application.getTranslator(); @@ -95,7 +98,7 @@ public final class FileHelper { public static File ensureExtension(File original, String extension) { if (original.getName().indexOf('.') < 0) { - log.debug(1, "File name does not contain extension, adding '" + extension + "'"); + log.debug("File name does not contain extension, adding '" + extension + "'"); String name = original.getAbsolutePath(); name = name + "." + extension; return new File(name); @@ -116,7 +119,7 @@ public final class FileHelper { public static File forceExtension(File original, String extension) { if (!original.getName().toLowerCase(Locale.ENGLISH).endsWith(extension.toLowerCase(Locale.ENGLISH))) { - log.debug(1, "File name does not contain extension, adding '" + extension + "'"); + log.debug("File name does not contain extension, adding '" + extension + "'"); String name = original.getAbsolutePath(); if (extension.startsWith(".")) { name = name + extension; @@ -141,15 +144,15 @@ public final class FileHelper { */ public static boolean confirmWrite(File file, Component parent) { if (file.exists()) { - log.user(1, "File " + file + " exists, confirming overwrite from user"); + log.info(Markers.USER_MARKER, "File " + file + " exists, confirming overwrite from user"); int result = JOptionPane.showConfirmDialog(parent, L10N.replace(trans.get("error.fileExists.desc"), "{filename}", file.getName()), trans.get("error.fileExists.title"), JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE); if (result != JOptionPane.YES_OPTION) { - log.user(1, "User decided not to overwrite the file"); + log.info(Markers.USER_MARKER, "User decided not to overwrite the file"); return false; } - log.user(1, "User decided to overwrite the file"); + log.info(Markers.USER_MARKER, "User decided to overwrite the file"); } return true; } @@ -163,7 +166,7 @@ public final class FileHelper { */ public static void errorWriting(IOException e, Component parent) { - log.warn(1, "Error writing to file", e); + log.warn("Error writing to file", e); JOptionPane.showMessageDialog(parent, new Object[] { trans.get("error.writing.desc"), diff --git a/core/src/net/sf/openrocket/gui/util/GUIUtil.java b/core/src/net/sf/openrocket/gui/util/GUIUtil.java index c145a8494..623423564 100644 --- a/core/src/net/sf/openrocket/gui/util/GUIUtil.java +++ b/core/src/net/sf/openrocket/gui/util/GUIUtil.java @@ -71,8 +71,10 @@ import javax.swing.tree.DefaultTreeSelectionModel; import javax.swing.tree.TreeModel; import javax.swing.tree.TreeSelectionModel; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import net.sf.openrocket.gui.Resettable; -import net.sf.openrocket.logging.LogHelper; import net.sf.openrocket.logging.Markers; import net.sf.openrocket.startup.Application; import net.sf.openrocket.util.BugException; @@ -80,7 +82,7 @@ import net.sf.openrocket.util.Invalidatable; import net.sf.openrocket.util.MemoryManagement; public class GUIUtil { - private static final LogHelper log = Application.getLogger(); + private static final Logger log = LoggerFactory.getLogger(GUIUtil.class); private static final KeyStroke ESCAPE = KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0); private static final String CLOSE_ACTION_KEY = "escape:WINDOW_CLOSING"; diff --git a/core/src/net/sf/openrocket/optimization/rocketoptimization/RocketOptimizationFunction.java b/core/src/net/sf/openrocket/optimization/rocketoptimization/RocketOptimizationFunction.java index 35ab874ce..cfaed6580 100644 --- a/core/src/net/sf/openrocket/optimization/rocketoptimization/RocketOptimizationFunction.java +++ b/core/src/net/sf/openrocket/optimization/rocketoptimization/RocketOptimizationFunction.java @@ -4,13 +4,14 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import net.sf.openrocket.document.Simulation; -import net.sf.openrocket.logging.LogHelper; import net.sf.openrocket.optimization.general.Function; import net.sf.openrocket.optimization.general.OptimizationException; import net.sf.openrocket.optimization.general.Point; import net.sf.openrocket.rocketcomponent.Rocket; -import net.sf.openrocket.startup.Application; import net.sf.openrocket.unit.UnitGroup; import net.sf.openrocket.unit.Value; import net.sf.openrocket.util.Pair; @@ -22,7 +23,7 @@ import net.sf.openrocket.util.Pair; * @author Sampo Niskanen */ public class RocketOptimizationFunction implements Function { - private static final LogHelper log = Application.getLogger(); + private static final Logger log = LoggerFactory.getLogger(RocketOptimizationFunction.class); private static final double OUTSIDE_DOMAIN_SCALE = 1.0e200; diff --git a/core/src/net/sf/openrocket/optimization/rocketoptimization/modifiers/GenericModifier.java b/core/src/net/sf/openrocket/optimization/rocketoptimization/modifiers/GenericModifier.java index 110a93960..555c5f90a 100644 --- a/core/src/net/sf/openrocket/optimization/rocketoptimization/modifiers/GenericModifier.java +++ b/core/src/net/sf/openrocket/optimization/rocketoptimization/modifiers/GenericModifier.java @@ -2,10 +2,11 @@ package net.sf.openrocket.optimization.rocketoptimization.modifiers; import java.util.Locale; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import net.sf.openrocket.document.Simulation; -import net.sf.openrocket.logging.LogHelper; import net.sf.openrocket.optimization.general.OptimizationException; -import net.sf.openrocket.startup.Application; import net.sf.openrocket.unit.UnitGroup; import net.sf.openrocket.util.BugException; import net.sf.openrocket.util.MathUtil; @@ -19,7 +20,7 @@ import net.sf.openrocket.util.Reflection.Method; * @author Sampo Niskanen */ public abstract class GenericModifier extends AbstractSimulationModifier { - private static final LogHelper log = Application.getLogger(); + private static final Logger log = LoggerFactory.getLogger(GenericModifier.class); private final double multiplier; diff --git a/core/src/net/sf/openrocket/rocketcomponent/Rocket.java b/core/src/net/sf/openrocket/rocketcomponent/Rocket.java index 11e447ce6..94c74a95f 100644 --- a/core/src/net/sf/openrocket/rocketcomponent/Rocket.java +++ b/core/src/net/sf/openrocket/rocketcomponent/Rocket.java @@ -9,8 +9,10 @@ import java.util.LinkedList; import java.util.List; import java.util.UUID; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import net.sf.openrocket.l10n.Translator; -import net.sf.openrocket.logging.LogHelper; import net.sf.openrocket.motor.Motor; import net.sf.openrocket.startup.Application; import net.sf.openrocket.util.ArrayList; @@ -32,7 +34,7 @@ import net.sf.openrocket.util.UniqueID; */ public class Rocket extends RocketComponent { - private static final LogHelper log = Application.getLogger(); + private static final Logger log = LoggerFactory.getLogger(Rocket.class); private static final Translator trans = Application.getTranslator(); public static final double DEFAULT_REFERENCE_LENGTH = 0.01; diff --git a/core/src/net/sf/openrocket/simulation/BasicEventSimulationEngine.java b/core/src/net/sf/openrocket/simulation/BasicEventSimulationEngine.java index 528990a2d..ae41e2dd1 100644 --- a/core/src/net/sf/openrocket/simulation/BasicEventSimulationEngine.java +++ b/core/src/net/sf/openrocket/simulation/BasicEventSimulationEngine.java @@ -4,10 +4,12 @@ import java.util.HashSet; import java.util.Iterator; import java.util.Set; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import net.sf.openrocket.aerodynamics.FlightConditions; import net.sf.openrocket.aerodynamics.Warning; import net.sf.openrocket.l10n.Translator; -import net.sf.openrocket.logging.LogHelper; import net.sf.openrocket.motor.Motor; import net.sf.openrocket.motor.MotorId; import net.sf.openrocket.motor.MotorInstance; @@ -33,7 +35,7 @@ import net.sf.openrocket.util.Quaternion; public class BasicEventSimulationEngine implements SimulationEngine { private static final Translator trans = Application.getTranslator(); - private static final LogHelper log = Application.getLogger(); + private static final Logger log = LoggerFactory.getLogger(BasicEventSimulationEngine.class); // TODO: MEDIUM: Allow selecting steppers private SimulationStepper flightStepper = new RK4SimulationStepper(); diff --git a/core/src/net/sf/openrocket/simulation/RK4SimulationStepper.java b/core/src/net/sf/openrocket/simulation/RK4SimulationStepper.java index 85e1697da..f60f5ee88 100644 --- a/core/src/net/sf/openrocket/simulation/RK4SimulationStepper.java +++ b/core/src/net/sf/openrocket/simulation/RK4SimulationStepper.java @@ -3,11 +3,13 @@ package net.sf.openrocket.simulation; import java.util.Arrays; import java.util.Random; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import net.sf.openrocket.aerodynamics.AerodynamicForces; import net.sf.openrocket.aerodynamics.FlightConditions; import net.sf.openrocket.aerodynamics.WarningSet; import net.sf.openrocket.l10n.Translator; -import net.sf.openrocket.logging.LogHelper; import net.sf.openrocket.models.atmosphere.AtmosphericConditions; import net.sf.openrocket.simulation.exception.SimulationCalculationException; import net.sf.openrocket.simulation.exception.SimulationException; @@ -22,7 +24,7 @@ import net.sf.openrocket.util.WorldCoordinate; public class RK4SimulationStepper extends AbstractSimulationStepper { - private static final LogHelper log = Application.getLogger(); + private static final Logger log = LoggerFactory.getLogger(RK4SimulationStepper.class); private static final Translator trans = Application.getTranslator(); diff --git a/core/src/net/sf/openrocket/simulation/customexpression/CustomExpression.java b/core/src/net/sf/openrocket/simulation/customexpression/CustomExpression.java index 9ce136786..7b71468da 100644 --- a/core/src/net/sf/openrocket/simulation/customexpression/CustomExpression.java +++ b/core/src/net/sf/openrocket/simulation/customexpression/CustomExpression.java @@ -3,12 +3,13 @@ package net.sf.openrocket.simulation.customexpression; import java.util.List; import java.util.regex.*; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import net.sf.openrocket.document.OpenRocketDocument; -import net.sf.openrocket.logging.LogHelper; import net.sf.openrocket.logging.Markers; import net.sf.openrocket.simulation.FlightDataType; import net.sf.openrocket.simulation.SimulationStatus; -import net.sf.openrocket.startup.Application; import net.sf.openrocket.unit.FixedUnitGroup; import net.sf.openrocket.unit.UnitGroup; import net.sf.openrocket.util.ArrayList; @@ -26,7 +27,7 @@ import de.congrace.exp4j.Variable; */ public class CustomExpression implements Cloneable{ - private static final LogHelper log = Application.getLogger(); + private static final Logger log = LoggerFactory.getLogger(CustomExpression.class); private OpenRocketDocument doc; private String name, symbol, unit; diff --git a/core/src/net/sf/openrocket/simulation/customexpression/IndexExpression.java b/core/src/net/sf/openrocket/simulation/customexpression/IndexExpression.java index 10c01961f..aa58747f0 100644 --- a/core/src/net/sf/openrocket/simulation/customexpression/IndexExpression.java +++ b/core/src/net/sf/openrocket/simulation/customexpression/IndexExpression.java @@ -2,21 +2,22 @@ package net.sf.openrocket.simulation.customexpression; import java.util.List; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import de.congrace.exp4j.Calculable; import de.congrace.exp4j.Variable; import net.sf.openrocket.document.OpenRocketDocument; -import net.sf.openrocket.logging.LogHelper; import net.sf.openrocket.logging.Markers; import net.sf.openrocket.simulation.customexpression.CustomExpression; import net.sf.openrocket.simulation.FlightDataType; import net.sf.openrocket.simulation.SimulationStatus; -import net.sf.openrocket.startup.Application; import net.sf.openrocket.util.LinearInterpolator; public class IndexExpression extends CustomExpression { FlightDataType type; - private static final LogHelper log = Application.getLogger(); + private static final Logger log = LoggerFactory.getLogger(IndexExpression.class); public IndexExpression(OpenRocketDocument doc, String indexText, String typeText){ super(doc); diff --git a/core/src/net/sf/openrocket/simulation/customexpression/RangeExpression.java b/core/src/net/sf/openrocket/simulation/customexpression/RangeExpression.java index e5e543a0b..c2bfa66f6 100644 --- a/core/src/net/sf/openrocket/simulation/customexpression/RangeExpression.java +++ b/core/src/net/sf/openrocket/simulation/customexpression/RangeExpression.java @@ -6,23 +6,24 @@ package net.sf.openrocket.simulation.customexpression; import java.util.List; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import de.congrace.exp4j.Calculable; import de.congrace.exp4j.ExpressionBuilder; import de.congrace.exp4j.Variable; import net.sf.openrocket.document.OpenRocketDocument; -import net.sf.openrocket.logging.LogHelper; import net.sf.openrocket.logging.Markers; import net.sf.openrocket.simulation.customexpression.CustomExpression; import net.sf.openrocket.simulation.FlightDataType; import net.sf.openrocket.simulation.SimulationStatus; -import net.sf.openrocket.startup.Application; import net.sf.openrocket.util.ArrayUtils; import net.sf.openrocket.util.LinearInterpolator; import net.sf.openrocket.util.MathUtil; import net.sf.openrocket.util.StringUtil; public class RangeExpression extends CustomExpression { - private static final LogHelper log = Application.getLogger(); + private static final Logger log = LoggerFactory.getLogger(RangeExpression.class); private ExpressionBuilder startBuilder, endBuilder; diff --git a/core/src/net/sf/openrocket/util/AbstractChangeSource.java b/core/src/net/sf/openrocket/util/AbstractChangeSource.java index 57664aed3..8d88d9731 100644 --- a/core/src/net/sf/openrocket/util/AbstractChangeSource.java +++ b/core/src/net/sf/openrocket/util/AbstractChangeSource.java @@ -4,8 +4,8 @@ import java.util.EventListener; import java.util.EventObject; import java.util.List; -import net.sf.openrocket.logging.LogHelper; -import net.sf.openrocket.startup.Application; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Abstract implementation of a ChangeSource. @@ -13,7 +13,7 @@ import net.sf.openrocket.startup.Application; * @author Sampo Niskanen */ public abstract class AbstractChangeSource implements ChangeSource { - private static final LogHelper log = Application.getLogger(); + private static final Logger log = LoggerFactory.getLogger(AbstractChangeSource.class); private final List listeners = new ArrayList(); @@ -23,13 +23,13 @@ public abstract class AbstractChangeSource implements ChangeSource { @Override public final void addChangeListener(EventListener listener) { listeners.add(listener); - log.verbose(1, "Adding change listeners, listener count is now " + listeners.size()); + log.trace("Adding change listeners, listener count is now " + listeners.size()); } @Override public final void removeChangeListener(EventListener listener) { listeners.remove(listener); - log.verbose(1, "Removing change listeners, listener count is now " + listeners.size()); + log.trace("Removing change listeners, listener count is now " + listeners.size()); } diff --git a/core/src/net/sf/openrocket/util/Invalidator.java b/core/src/net/sf/openrocket/util/Invalidator.java index 9e40c1029..4c2ae2459 100644 --- a/core/src/net/sf/openrocket/util/Invalidator.java +++ b/core/src/net/sf/openrocket/util/Invalidator.java @@ -1,6 +1,8 @@ package net.sf.openrocket.util; -import net.sf.openrocket.logging.LogHelper; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import net.sf.openrocket.logging.TraceException; import net.sf.openrocket.startup.Application; @@ -12,7 +14,7 @@ import net.sf.openrocket.startup.Application; public class Invalidator implements Invalidatable { private static final boolean USE_CHECKS = Application.useSafetyChecks(); - private static final LogHelper log = Application.getLogger(); + private static final Logger log = LoggerFactory.getLogger(Invalidator.class); private final Object monitorable; private TraceException invalidated = null; @@ -42,7 +44,7 @@ public class Invalidator implements Invalidatable { if (throwException) { throw new BugException(monitorable + ": This object has been invalidated", invalidated); } else { - log.warn(1, monitorable + ": This object has been invalidated", + log.warn(monitorable + ": This object has been invalidated", new TraceException("Usage was attempted here", invalidated)); } return false; @@ -64,7 +66,7 @@ public class Invalidator implements Invalidatable { public void invalidate() { if (USE_CHECKS) { if (invalidated != null) { - log.warn(1, monitorable + ": This object has already been invalidated, ignoring", invalidated); + log.warn(monitorable + ": This object has already been invalidated, ignoring", invalidated); } invalidated = new TraceException("Invalidation occurred here"); } diff --git a/core/src/net/sf/openrocket/util/ListenerList.java b/core/src/net/sf/openrocket/util/ListenerList.java index b4f4c02b7..e315944c5 100644 --- a/core/src/net/sf/openrocket/util/ListenerList.java +++ b/core/src/net/sf/openrocket/util/ListenerList.java @@ -2,9 +2,10 @@ package net.sf.openrocket.util; import java.util.Iterator; -import net.sf.openrocket.logging.LogHelper; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import net.sf.openrocket.logging.TraceException; -import net.sf.openrocket.startup.Application; /** * A list of listeners of a specific type. This class contains various utility, @@ -19,7 +20,7 @@ import net.sf.openrocket.startup.Application; * @param the type of the listeners. */ public class ListenerList implements Invalidatable, Iterable { - private static final LogHelper log = Application.getLogger(); + private static final Logger log = LoggerFactory.getLogger(ListenerList.class); private final ArrayList> listeners = new ArrayList>(); private final TraceException instantiationLocation; @@ -49,7 +50,7 @@ public class ListenerList implements Invalidatable, Iterable { ListenerData data = new ListenerData(listener); if (listeners.contains(data)) { - log.warn(1, "Attempting to add duplicate listener " + listener); + log.warn("Attempting to add duplicate listener " + listener); return false; } listeners.add(data); @@ -71,11 +72,11 @@ public class ListenerList implements Invalidatable, Iterable { while (iterator.hasNext()) { if (iterator.next().listener == listener) { iterator.remove(); - log.verbose(1, "Removing listener " + listener); + log.trace("Removing listener " + listener); return true; } } - log.info(1, "Attempting to remove non-existant listener " + listener); + log.info("Attempting to remove non-existant listener " + listener); return false; } @@ -134,7 +135,7 @@ public class ListenerList implements Invalidatable, Iterable { if (error) { throw new BugException(this + ": this ListenerList has been invalidated", invalidated); } else { - log.warn(1, this + ": this ListenerList has been invalidated", + log.warn(this + ": this ListenerList has been invalidated", new TraceException("ListenerList was attempted to be used here", invalidated)); } } diff --git a/core/src/net/sf/openrocket/util/MathUtil.java b/core/src/net/sf/openrocket/util/MathUtil.java index 09a316899..982d1b86f 100644 --- a/core/src/net/sf/openrocket/util/MathUtil.java +++ b/core/src/net/sf/openrocket/util/MathUtil.java @@ -6,11 +6,11 @@ import java.util.Collections; import java.util.Comparator; import java.util.List; -import net.sf.openrocket.logging.LogHelper; -import net.sf.openrocket.startup.Application; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class MathUtil { - private static final LogHelper log = Application.getLogger(); + private static final Logger log = LoggerFactory.getLogger(MathUtil.class); public static final double EPSILON = 0.00000001; // 10mm^3 in m^3 @@ -219,7 +219,7 @@ public class MathUtil { public static double safeSqrt(double d) { if (d < 0) { if (d < 0.01) { - log.warn(1, "Attempting to compute sqrt(" + d + ")"); + log.warn("Attempting to compute sqrt(" + d + ")"); } return 0; } diff --git a/core/src/net/sf/openrocket/utils/LogSpeedTest.java b/core/src/net/sf/openrocket/utils/LogSpeedTest.java deleted file mode 100644 index 4ca2f9a4c..000000000 --- a/core/src/net/sf/openrocket/utils/LogSpeedTest.java +++ /dev/null @@ -1,35 +0,0 @@ -package net.sf.openrocket.utils; - -import net.sf.openrocket.logging.DelegatorLogger; -import net.sf.openrocket.logging.LogHelper; -import net.sf.openrocket.logging.LogLevel; - -public class LogSpeedTest { - private static LogHelper log; - - private static final int COUNT = 1000000; - - public static void main(String[] args) { - - System.setProperty("openrocket.log.tracelevel", "user"); - log = new DelegatorLogger(); - - for (LogLevel l : LogLevel.values()) { - for (int i = 0; i < 3; i++) { - long t0 = System.currentTimeMillis(); - test(l); - long t1 = System.currentTimeMillis(); - System.out.println("Level " + l + ": " + (t1 - t0) + " ms for " + COUNT + " lines"); - } - } - - } - - - private static void test(LogLevel level) { - for (int i = 0; i < COUNT; i++) { - log.log(level, "Message " + i); - } - } - -}