hongshaorou/openrocket
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Replace LogHelper with SLF4J Logger anywhere it is possible without an

Browse Source 
error.
This commit is contained in:
bkuker 2012-10-25 13:46:13 -04:00
parent ee3aae6c8b
commit d58c089673
64 changed files with 259 additions and 131 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/src/net/sf/openrocket/aerodynamics/AbstractAerodynamicCalculator.java
View File

@ -2,12 +2,13 @@ package net.sf.openrocket.aerodynamics;
import java.util.Map;
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 org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
* An abstract aerodynamic calculator implementation, that offers basic implementation
@ -17,7 +18,7 @@ import net.sf.openrocket.util.Coordinate;
*/
public abstract class AbstractAerodynamicCalculator implements AerodynamicCalculator {
private static final LogHelper log = Application.getLogger();
private static final Logger log = LoggerFactory.getLogger(AbstractAerodynamicCalculator.class);
/** Number of divisions used when calculating worst CP. */
public static final int DIVISIONS = 360;

7
core/src/net/sf/openrocket/communication/UpdateInfoRetriever.java
View File

@ -9,14 +9,17 @@ import java.net.HttpURLConnection;
import java.util.ArrayList;
import java.util.Locale;
import net.sf.openrocket.logging.LogHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import net.sf.openrocket.startup.Application;
import net.sf.openrocket.util.BuildProperties;
import net.sf.openrocket.util.ComparablePair;
import net.sf.openrocket.util.LimitedInputStream;
public class UpdateInfoRetriever {
private static final LogHelper log = Application.getLogger();
private static final Logger log = LoggerFactory.getLogger(UpdateInfoRetriever.class);
private UpdateInfoFetcher fetcher = null;

8
core/src/net/sf/openrocket/database/ComponentPresetDatabase.java
View File

@ -5,14 +5,16 @@ import java.util.Collections;
import java.util.List;
import java.util.Set;
import net.sf.openrocket.logging.LogHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import net.sf.openrocket.preset.ComponentPreset;
import net.sf.openrocket.startup.Application;
public abstract class ComponentPresetDatabase extends Database<ComponentPreset> implements ComponentPresetDao {
private static final LogHelper logger = Application.getLogger();
private static final Logger logger = LoggerFactory.getLogger(ComponentPresetDatabase.class);
private volatile boolean startedLoading = false;
private volatile boolean endedLoading = false;
private final boolean asynchronous;

6
core/src/net/sf/openrocket/database/Database.java
View File

@ -15,10 +15,12 @@ import java.util.List;
import java.util.jar.JarEntry;
import java.util.jar.JarFile;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import net.sf.openrocket.file.Loader;
import net.sf.openrocket.file.iterator.DirectoryIterator;
import net.sf.openrocket.file.iterator.FileIterator;
import net.sf.openrocket.logging.LogHelper;
import net.sf.openrocket.startup.Application;
import net.sf.openrocket.util.JarUtil;
import net.sf.openrocket.util.Pair;
@ -33,7 +35,7 @@ import net.sf.openrocket.util.Pair;
* @author Sampo Niskanen <sampo.niskanen@iki.fi>
*/
public class Database<T extends Comparable<T>> extends AbstractSet<T> {
private static final LogHelper log = Application.getLogger();
private static final Logger log = LoggerFactory.getLogger(Database.class);
protected final List<T> list = new ArrayList<T>();
private final ArrayList<DatabaseListener<T>> listeners =

6
core/src/net/sf/openrocket/database/Databases.java
View File

@ -1,7 +1,9 @@
package net.sf.openrocket.database;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import net.sf.openrocket.l10n.Translator;
import net.sf.openrocket.logging.LogHelper;
import net.sf.openrocket.material.Material;
import net.sf.openrocket.material.Material.Type;
import net.sf.openrocket.material.MaterialStorage;
@ -15,7 +17,7 @@ import net.sf.openrocket.util.MathUtil;
* @author Sampo Niskanen <sampo.niskanen@iki.fi>
*/
public class Databases {
private static final LogHelper log = Application.getLogger();
private static final Logger log = LoggerFactory.getLogger(Databases.class);
private static final Translator trans = Application.getTranslator();

6
core/src/net/sf/openrocket/database/ThrustCurveMotorSetDatabase.java
View File

@ -4,7 +4,9 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import net.sf.openrocket.logging.LogHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import net.sf.openrocket.motor.Motor;
import net.sf.openrocket.motor.ThrustCurveMotor;
import net.sf.openrocket.startup.Application;
@ -17,7 +19,7 @@ import net.sf.openrocket.startup.Application;
*/
public abstract class ThrustCurveMotorSetDatabase implements MotorDatabase {
private static final LogHelper logger = Application.getLogger();
private static final Logger logger = LoggerFactory.getLogger(ThrustCurveMotorSetDatabase.class);
protected List<ThrustCurveMotorSet> motorSets;

6
core/src/net/sf/openrocket/document/Simulation.java
View File

@ -4,10 +4,12 @@ import java.util.EventListener;
import java.util.EventObject;
import java.util.List;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import net.sf.openrocket.aerodynamics.AerodynamicCalculator;
import net.sf.openrocket.aerodynamics.BarrowmanCalculator;
import net.sf.openrocket.aerodynamics.WarningSet;
import net.sf.openrocket.logging.LogHelper;
import net.sf.openrocket.masscalc.BasicMassCalculator;
import net.sf.openrocket.masscalc.MassCalculator;
import net.sf.openrocket.rocketcomponent.Configuration;
@ -38,7 +40,7 @@ import net.sf.openrocket.util.StateChangeListener;
* @author Sampo Niskanen <sampo.niskanen@iki.fi>
*/
public class Simulation implements ChangeSource, Cloneable {
private static final LogHelper log = Application.getLogger();
private static final Logger log = LoggerFactory.getLogger(Simulation.class);
public static enum Status {
/** Up-to-date */

6
core/src/net/sf/openrocket/file/iterator/DirectoryIterator.java
View File

@ -8,7 +8,9 @@ import java.io.IOException;
import java.io.InputStream;
import java.net.URL;
import net.sf.openrocket.logging.LogHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import net.sf.openrocket.startup.Application;
import net.sf.openrocket.util.JarUtil;
import net.sf.openrocket.util.Pair;
@ -21,7 +23,7 @@ import net.sf.openrocket.util.Pair;
*/
public class DirectoryIterator extends FileIterator {
private static final LogHelper logger = Application.getLogger();
private static final Logger logger = LoggerFactory.getLogger(DirectoryIterator.class);
private final FileFilter filter;
private final File[] files;

6
core/src/net/sf/openrocket/file/iterator/FileIterator.java
View File

@ -5,7 +5,9 @@ import java.io.InputStream;
import java.util.Iterator;
import java.util.NoSuchElementException;
import net.sf.openrocket.logging.LogHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import net.sf.openrocket.startup.Application;
import net.sf.openrocket.util.Pair;
@ -20,7 +22,7 @@ import net.sf.openrocket.util.Pair;
* @author Sampo Niskanen <sampo.niskanen@iki.fi>
*/
public abstract class FileIterator implements Iterator<Pair<String, InputStream>> {
private static final LogHelper logger = Application.getLogger();
private static final Logger logger = LoggerFactory.getLogger(FileIterator.class);
private Pair<String, InputStream> next = null;
private int fileCount = 0;

6
core/src/net/sf/openrocket/file/iterator/ZipDirectoryIterator.java
View File

@ -8,7 +8,9 @@ import java.util.Enumeration;
import java.util.zip.ZipEntry;
import java.util.zip.ZipFile;
import net.sf.openrocket.logging.LogHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import net.sf.openrocket.startup.Application;
import net.sf.openrocket.util.Pair;
@ -22,7 +24,7 @@ import net.sf.openrocket.util.Pair;
*/
public class ZipDirectoryIterator extends FileIterator {
private static final LogHelper logger = Application.getLogger();
private static final Logger logger = LoggerFactory.getLogger(ZipDirectoryIterator.class);
private final File zipFileName;
private final String directory;

6
core/src/net/sf/openrocket/file/motor/MotorLoaderHelper.java
View File

@ -9,10 +9,12 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import net.sf.openrocket.file.iterator.DirectoryIterator;
import net.sf.openrocket.file.iterator.FileIterator;
import net.sf.openrocket.gui.util.SimpleFileFilter;
import net.sf.openrocket.logging.LogHelper;
import net.sf.openrocket.motor.Motor;
import net.sf.openrocket.motor.ThrustCurveMotor;
import net.sf.openrocket.startup.Application;
@ -20,7 +22,7 @@ import net.sf.openrocket.util.Pair;
public final class MotorLoaderHelper {
private static final LogHelper log = Application.getLogger();
private static final Logger log = LoggerFactory.getLogger(MotorLoaderHelper.class);
private MotorLoaderHelper() {
// Prevent construction

5
core/src/net/sf/openrocket/file/motor/RockSimMotorLoader.java
View File

@ -13,7 +13,6 @@ import net.sf.openrocket.file.simplesax.ElementHandler;
import net.sf.openrocket.file.simplesax.NullElementHandler;
import net.sf.openrocket.file.simplesax.PlainTextHandler;
import net.sf.openrocket.file.simplesax.SimpleSAX;
import net.sf.openrocket.logging.LogHelper;
import net.sf.openrocket.motor.Manufacturer;
import net.sf.openrocket.motor.Motor;
import net.sf.openrocket.motor.MotorDigest;
@ -22,12 +21,14 @@ import net.sf.openrocket.motor.ThrustCurveMotor;
import net.sf.openrocket.startup.Application;
import net.sf.openrocket.util.Coordinate;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
public class RockSimMotorLoader extends AbstractMotorLoader {
private static final LogHelper log = Application.getLogger();
private static final Logger log = LoggerFactory.getLogger(RockSimMotorLoader.class);
public static final String CHARSET_NAME = "UTF-8";

6
core/src/net/sf/openrocket/file/motor/ZipFileMotorLoader.java
View File

@ -7,8 +7,10 @@ import java.util.List;
import java.util.zip.ZipEntry;
import java.util.zip.ZipInputStream;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import net.sf.openrocket.file.UnknownFileTypeException;
import net.sf.openrocket.logging.LogHelper;
import net.sf.openrocket.motor.Motor;
import net.sf.openrocket.startup.Application;
import net.sf.openrocket.util.UncloseableInputStream;
@ -19,7 +21,7 @@ import net.sf.openrocket.util.UncloseableInputStream;
* @author Sampo Niskanen <sampo.niskanen@iki.fi>
*/
public class ZipFileMotorLoader implements MotorLoader {
private static final LogHelper log = Application.getLogger();
private static final Logger log = LoggerFactory.getLogger(ZipFileMotorLoader.class);
private final MotorLoader loader;

7
core/src/net/sf/openrocket/file/openrocket/OpenRocketSaver.java
View File

@ -11,12 +11,14 @@ import java.util.List;
import java.util.Locale;
import java.util.zip.GZIPOutputStream;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import net.sf.openrocket.aerodynamics.Warning;
import net.sf.openrocket.document.OpenRocketDocument;
import net.sf.openrocket.document.Simulation;
import net.sf.openrocket.document.StorageOptions;
import net.sf.openrocket.file.RocketSaver;
import net.sf.openrocket.logging.LogHelper;
import net.sf.openrocket.rocketcomponent.FinSet;
import net.sf.openrocket.rocketcomponent.MotorMount;
import net.sf.openrocket.rocketcomponent.RecoveryDevice;
@ -38,8 +40,7 @@ import net.sf.openrocket.util.Reflection;
import net.sf.openrocket.util.TextUtil;
public class OpenRocketSaver extends RocketSaver {
private static final LogHelper log = Application.getLogger();
private static final Logger log = LoggerFactory.getLogger(OpenRocketSaver.class);
/**
* Divisor used in converting an integer version to the point-represented version.

4
core/src/net/sf/openrocket/file/openrocket/importt/OpenRocketLoader.java
View File

@ -83,6 +83,8 @@ import net.sf.openrocket.util.GeodeticComputationStrategy;
import net.sf.openrocket.util.LineStyle;
import net.sf.openrocket.util.Reflection;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
@ -98,7 +100,7 @@ import org.xml.sax.SAXException;
* @author Sampo Niskanen <sampo.niskanen@iki.fi>
*/
public class OpenRocketLoader extends AbstractRocketLoader {
private static final LogHelper log = Application.getLogger();
private static final Logger log = LoggerFactory.getLogger(OpenRocketLoader.class);
@Override

9
core/src/net/sf/openrocket/file/rocksim/export/RocksimSaver.java
View File

@ -4,7 +4,6 @@ import net.sf.openrocket.document.OpenRocketDocument;
import net.sf.openrocket.document.StorageOptions;
import net.sf.openrocket.file.RocketSaver;
import net.sf.openrocket.file.rocksim.RocksimCommonConstants;
import net.sf.openrocket.logging.LogHelper;
import net.sf.openrocket.masscalc.BasicMassCalculator;
import net.sf.openrocket.masscalc.MassCalculator;
import net.sf.openrocket.rocketcomponent.Configuration;
@ -14,6 +13,10 @@ import net.sf.openrocket.startup.Application;
import javax.xml.bind.JAXBContext;
import javax.xml.bind.Marshaller;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.BufferedWriter;
import java.io.IOException;
import java.io.OutputStream;
@ -28,8 +31,8 @@ public class RocksimSaver extends RocketSaver {
/**
* The logger.
*/
private static final LogHelper log = Application.getLogger();
private static final Logger log = LoggerFactory.getLogger(RocksimSaver.class);
/**
* This method marshals an OpenRocketDocument (OR design) to Rocksim-compliant XML.
*

6
core/src/net/sf/openrocket/gui/components/URLLabel.java
View File

@ -12,7 +12,9 @@ import java.net.URISyntaxException;
import java.util.HashMap;
import java.util.Map;
import net.sf.openrocket.logging.LogHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import net.sf.openrocket.startup.Application;
import net.sf.openrocket.util.BugException;
@ -23,7 +25,7 @@ import net.sf.openrocket.util.BugException;
* @author Sampo Niskanen <sampo.niskanen@iki.fi>
*/
public class URLLabel extends SelectableLabel {
private static final LogHelper log = Application.getLogger();
private static final Logger log = LoggerFactory.getLogger(URLLabel.class);
/**
* Create a label showing the url it will direct to.

6
core/src/net/sf/openrocket/gui/customexpression/CustomExpressionDialog.java
View File

@ -6,17 +6,19 @@ import javax.swing.BorderFactory;
import javax.swing.JDialog;
import javax.swing.JPanel;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import net.sf.openrocket.document.OpenRocketDocument;
import net.sf.openrocket.document.Simulation;
import net.sf.openrocket.gui.util.GUIUtil;
import net.sf.openrocket.l10n.Translator;
import net.sf.openrocket.logging.LogHelper;
import net.sf.openrocket.rocketcomponent.Rocket;
import net.sf.openrocket.startup.Application;
public class CustomExpressionDialog extends JDialog {
private static final Translator trans = Application.getTranslator();
private static final LogHelper log = Application.getLogger();
private static final Logger log = LoggerFactory.getLogger(CustomExpressionDialog.class);
private final Window parentWindow;
private final OpenRocketDocument doc;

6
core/src/net/sf/openrocket/gui/customexpression/ExpressionBuilderDialog.java
View File

@ -18,12 +18,14 @@ import javax.swing.JTextField;
import javax.swing.SwingConstants;
import javax.swing.SwingUtilities;
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;
import net.sf.openrocket.gui.util.Icons;
import net.sf.openrocket.l10n.Translator;
import net.sf.openrocket.logging.LogHelper;
import net.sf.openrocket.rocketcomponent.Rocket;
import net.sf.openrocket.simulation.customexpression.CustomExpression;
import net.sf.openrocket.startup.Application;
@ -37,7 +39,7 @@ import net.sf.openrocket.startup.Application;
public class ExpressionBuilderDialog extends JDialog {
private static final Translator trans = Application.getTranslator();
private static final LogHelper log = Application.getLogger();
private static final Logger log = LoggerFactory.getLogger(ExpressionBuilderDialog.class);
private static final ImageIcon GreenIcon = Icons.loadImageIcon("pix/spheres/green-16x16.png", "OK");
private static final ImageIcon RedIcon = Icons.loadImageIcon("pix/spheres/red-16x16.png", "Bad");

6
core/src/net/sf/openrocket/gui/customexpression/VariableSelector.java
View File

@ -22,11 +22,13 @@ import javax.swing.event.ListSelectionEvent;
import javax.swing.event.ListSelectionListener;
import javax.swing.table.JTableHeader;
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;
import net.sf.openrocket.l10n.Translator;
import net.sf.openrocket.logging.LogHelper;
import net.sf.openrocket.rocketcomponent.Rocket;
import net.sf.openrocket.startup.Application;
@ -39,7 +41,7 @@ import net.sf.openrocket.startup.Application;
public class VariableSelector extends JDialog {
private static final Translator trans = Application.getTranslator();
private static final LogHelper log = Application.getLogger();
private static final Logger log = LoggerFactory.getLogger(VariableSelector.class);
private final JTable table;
private final VariableTableModel tableModel;

6
core/src/net/sf/openrocket/gui/dialogs/PrintDialog.java
View File

@ -27,6 +27,9 @@ import javax.swing.event.TreeSelectionListener;
import javax.swing.tree.TreeNode;
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.gui.print.PrintController;
@ -39,7 +42,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.rocketcomponent.Rocket;
import net.sf.openrocket.startup.Application;
@ -48,7 +50,7 @@ import net.sf.openrocket.startup.Application;
*/
public class PrintDialog extends JDialog implements TreeSelectionListener {
private static final LogHelper log = Application.getLogger();
private static final Logger log = LoggerFactory.getLogger(PrintDialog.class);
private static final Translator trans = Application.getTranslator();
private final Desktop desktop;

5
core/src/net/sf/openrocket/gui/dialogs/optimization/OptimizationPlotDialog.java
View File

@ -20,7 +20,6 @@ import net.miginfocom.swing.MigLayout;
import net.sf.openrocket.gui.components.StyledLabel;
import net.sf.openrocket.gui.util.GUIUtil;
import net.sf.openrocket.l10n.Translator;
import net.sf.openrocket.logging.LogHelper;
import net.sf.openrocket.optimization.general.Point;
import net.sf.openrocket.optimization.rocketoptimization.OptimizableParameter;
import net.sf.openrocket.optimization.rocketoptimization.SimulationModifier;
@ -51,6 +50,8 @@ import org.jfree.data.xy.XYSeries;
import org.jfree.data.xy.XYSeriesCollection;
import org.jfree.ui.RectangleEdge;
import org.jfree.ui.TextAnchor;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
* A class that plots the path of an optimization.
@ -58,7 +59,7 @@ import org.jfree.ui.TextAnchor;
* @author Sampo Niskanen <sampo.niskanen@iki.fi>
*/
public class OptimizationPlotDialog extends JDialog {
private static final LogHelper log = Application.getLogger();
private static final Logger log = LoggerFactory.getLogger(OptimizationPlotDialog.class);
private static final Translator trans = Application.getTranslator();

6
core/src/net/sf/openrocket/gui/dialogs/optimization/OptimizationWorker.java
View File

@ -6,8 +6,10 @@ import java.util.concurrent.LinkedBlockingQueue;
import javax.swing.SwingUtilities;
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.FunctionOptimizer;
import net.sf.openrocket.optimization.general.OptimizationController;
import net.sf.openrocket.optimization.general.OptimizationException;
@ -46,7 +48,7 @@ public abstract class OptimizationWorker extends Thread implements OptimizationC
* Nothing of this is documented, of course...
*/
private static final LogHelper log = Application.getLogger();
private static final Logger log = LoggerFactory.getLogger(OptimizationWorker.class);
/** Notify listeners every this many milliseconds */
private static final long PURGE_TIMEOUT = 500;

6
core/src/net/sf/openrocket/gui/figure3d/ComponentRenderer.java
View File

@ -14,7 +14,9 @@ import javax.media.opengl.glu.GLUtessellator;
import javax.media.opengl.glu.GLUtessellatorCallback;
import javax.media.opengl.glu.GLUtessellatorCallbackAdapter;
import net.sf.openrocket.logging.LogHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import net.sf.openrocket.rocketcomponent.BodyTube;
import net.sf.openrocket.rocketcomponent.EllipticalFinSet;
import net.sf.openrocket.rocketcomponent.FinSet;
@ -30,7 +32,7 @@ import net.sf.openrocket.util.Coordinate;
* @author Bill Kuker <bkuker@billkuker.com>
*/
public class ComponentRenderer {
private static final LogHelper log = Application.getLogger();
private static final Logger log = LoggerFactory.getLogger(ComponentRenderer.class);
private int LOD = 80;

6
core/src/net/sf/openrocket/gui/help/tours/SlideShowLinkListener.java
View File

@ -9,13 +9,15 @@ import javax.swing.event.HyperlinkEvent;
import javax.swing.event.HyperlinkEvent.EventType;
import javax.swing.event.HyperlinkListener;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import net.sf.openrocket.l10n.Translator;
import net.sf.openrocket.logging.LogHelper;
import net.sf.openrocket.startup.Application;
public class SlideShowLinkListener implements HyperlinkListener {
private static final LogHelper log = Application.getLogger();
private static final Logger log = LoggerFactory.getLogger(SlideShowLinkListener.class);
private static final Translator trans = Application.getTranslator();
private final Window parent;

6
core/src/net/sf/openrocket/gui/main/SimulationPanel.java
View File

@ -23,6 +23,9 @@ import javax.swing.ListSelectionModel;
import javax.swing.SwingUtilities;
import javax.swing.table.DefaultTableCellRenderer;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import net.miginfocom.swing.MigLayout;
import net.sf.openrocket.aerodynamics.Warning;
import net.sf.openrocket.aerodynamics.WarningSet;
@ -36,7 +39,6 @@ import net.sf.openrocket.gui.adaptors.ColumnTableModel;
import net.sf.openrocket.gui.components.StyledLabel;
import net.sf.openrocket.gui.util.Icons;
import net.sf.openrocket.l10n.Translator;
import net.sf.openrocket.logging.LogHelper;
import net.sf.openrocket.rocketcomponent.ComponentChangeEvent;
import net.sf.openrocket.rocketcomponent.ComponentChangeListener;
import net.sf.openrocket.simulation.FlightData;
@ -45,7 +47,7 @@ import net.sf.openrocket.startup.Preferences;
import net.sf.openrocket.unit.UnitGroup;
public class SimulationPanel extends JPanel {
private static final LogHelper log = Application.getLogger();
private static final Logger log = LoggerFactory.getLogger(SimulationPanel.class);
private static final Translator trans = Application.getTranslator();

6
core/src/net/sf/openrocket/gui/main/SimulationRunDialog.java
View File

@ -23,6 +23,9 @@ import javax.swing.JOptionPane;
import javax.swing.JPanel;
import javax.swing.JProgressBar;
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;
@ -30,7 +33,6 @@ import net.sf.openrocket.gui.dialogs.DetailDialog;
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.rocketcomponent.Configuration;
import net.sf.openrocket.rocketcomponent.MotorMount;
import net.sf.openrocket.rocketcomponent.MotorMount.IgnitionEvent;
@ -50,7 +52,7 @@ import net.sf.openrocket.util.MathUtil;
public class SimulationRunDialog extends JDialog {
private static final LogHelper log = Application.getLogger();
private static final Logger log = LoggerFactory.getLogger(SimulationRunDialog.class);
private static final Translator trans = Application.getTranslator();

6
core/src/net/sf/openrocket/gui/preset/PresetEditorDialog.java
View File

@ -44,12 +44,14 @@ import javax.swing.border.EmptyBorder;
import javax.swing.filechooser.FileNameExtensionFilter;
import javax.swing.text.JTextComponent;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import net.miginfocom.swing.MigLayout;
import net.sf.openrocket.gui.SpinnerEditor;
import net.sf.openrocket.gui.adaptors.DoubleModel;
import net.sf.openrocket.gui.components.UnitSelector;
import net.sf.openrocket.l10n.Translator;
import net.sf.openrocket.logging.LogHelper;
import net.sf.openrocket.material.Material;
import net.sf.openrocket.motor.Manufacturer;
import net.sf.openrocket.preset.ComponentPreset;
@ -69,7 +71,7 @@ public class PresetEditorDialog extends JDialog implements ItemListener {
private static Translator trans = Application.getTranslator();
private static LogHelper log = Application.getLogger();
private static final Logger log = LoggerFactory.getLogger(PresetEditorDialog.class);
private static final String NON_NEGATIVE_INTEGER_FIELD = "(\\d){0,10}";

6
core/src/net/sf/openrocket/gui/print/DesignReport.java
View File

@ -7,12 +7,14 @@ import java.awt.Graphics2D;
import java.text.DecimalFormat;
import java.util.List;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import net.sf.openrocket.document.OpenRocketDocument;
import net.sf.openrocket.document.Simulation;
import net.sf.openrocket.gui.figureelements.FigureElement;
import net.sf.openrocket.gui.figureelements.RocketInfo;
import net.sf.openrocket.gui.scalefigure.RocketPanel;
import net.sf.openrocket.logging.LogHelper;
import net.sf.openrocket.masscalc.BasicMassCalculator;
import net.sf.openrocket.masscalc.MassCalculator;
import net.sf.openrocket.masscalc.MassCalculator.MassCalcType;
@ -78,7 +80,7 @@ public class DesignReport {
/**
* The logger.
*/
private static final LogHelper log = Application.getLogger();
private static final Logger log = LoggerFactory.getLogger(DesignReport.class);
public static final double SCALE_FUDGE_FACTOR = 0.4d;
/**

6
core/src/net/sf/openrocket/gui/print/PaperSize.java
View File

@ -5,7 +5,9 @@ import java.io.FileReader;
import java.io.IOException;
import java.util.Locale;
import net.sf.openrocket.logging.LogHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import net.sf.openrocket.startup.Application;
import com.itextpdf.text.PageSize;
@ -39,7 +41,7 @@ public enum PaperSize {
//////////////////////////
private static final LogHelper log = Application.getLogger();
private static final Logger log = LoggerFactory.getLogger(PaperSize.class);
private static PaperSize defaultSize = null;
/**

6
core/src/net/sf/openrocket/gui/print/PrintUtilities.java
View File

@ -12,7 +12,9 @@ import java.awt.print.Printable;
import javax.swing.RepaintManager;
import net.sf.openrocket.logging.LogHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import net.sf.openrocket.startup.Application;
import com.itextpdf.text.Chunk;
@ -29,7 +31,7 @@ public class PrintUtilities implements Printable {
/**
* The logger.
*/
private static final LogHelper log = Application.getLogger();
private static final Logger log = LoggerFactory.getLogger(PrintUtilities.class);
public static final int NORMAL_FONT_SIZE = Font.DEFAULTSIZE - 3;
public static final int SMALL_FONT_SIZE = NORMAL_FONT_SIZE - 3;

6
core/src/net/sf/openrocket/gui/print/visitor/CenteringRingStrategy.java
View File

@ -8,7 +8,6 @@ import net.sf.openrocket.gui.print.AbstractPrintable;
import net.sf.openrocket.gui.print.ITextHelper;
import net.sf.openrocket.gui.print.PrintUnit;
import net.sf.openrocket.gui.print.PrintableCenteringRing;
import net.sf.openrocket.logging.LogHelper;
import net.sf.openrocket.rocketcomponent.CenteringRing;
import net.sf.openrocket.rocketcomponent.InnerTube;
import net.sf.openrocket.rocketcomponent.RocketComponent;
@ -19,6 +18,9 @@ import java.awt.image.BufferedImage;
import java.util.List;
import java.util.Set;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
* A strategy for printing a centering ring to iText.
*/
@ -27,7 +29,7 @@ public class CenteringRingStrategy {
/**
* The logger.
*/
private static final LogHelper log = Application.getLogger();
private static final Logger log = LoggerFactory.getLogger(CenteringRingStrategy.class);
/**
* The iText document.

6
core/src/net/sf/openrocket/gui/print/visitor/FinMarkingGuideStrategy.java
View File

@ -7,13 +7,15 @@ import com.itextpdf.text.pdf.PdfContentByte;
import com.itextpdf.text.pdf.PdfWriter;
import net.sf.openrocket.gui.print.FinMarkingGuide;
import net.sf.openrocket.gui.print.ITextHelper;
import net.sf.openrocket.logging.LogHelper;
import net.sf.openrocket.rocketcomponent.Rocket;
import net.sf.openrocket.startup.Application;
import java.awt.*;
import java.awt.image.BufferedImage;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
* A strategy for drawing a fin marking guide. As currently implemented, each body tube with a finset will have
* a marking guide. If a tube has multiple fin sets, they are combined onto one marking guide. Launch lugs are supported
@ -24,7 +26,7 @@ public class FinMarkingGuideStrategy {
/**
* The logger.
*/
private static final LogHelper log = Application.getLogger();
private static final Logger log = LoggerFactory.getLogger(FinMarkingGuideStrategy.class);
/**
* The iText document.

6
core/src/net/sf/openrocket/gui/print/visitor/FinSetPrintStrategy.java
View File

@ -10,7 +10,6 @@ import com.itextpdf.text.pdf.PdfWriter;
import net.sf.openrocket.gui.print.ITextHelper;
import net.sf.openrocket.gui.print.PrintUnit;
import net.sf.openrocket.gui.print.PrintableFinSet;
import net.sf.openrocket.logging.LogHelper;
import net.sf.openrocket.rocketcomponent.FinSet;
import net.sf.openrocket.rocketcomponent.RocketComponent;
import net.sf.openrocket.startup.Application;
@ -19,6 +18,9 @@ import java.awt.image.BufferedImage;
import java.util.List;
import java.util.Set;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
* A strategy for drawing fin templates.
*/
@ -27,7 +29,7 @@ public class FinSetPrintStrategy {
/**
* The logger.
*/
private static final LogHelper log = Application.getLogger();
private static final Logger log = LoggerFactory.getLogger(FinSetPrintStrategy.class);
/**
* The iText document.

6
core/src/net/sf/openrocket/gui/print/visitor/PageFitPrintStrategy.java
View File

@ -8,7 +8,6 @@ import com.itextpdf.text.pdf.PdfContentByte;
import com.itextpdf.text.pdf.PdfWriter;
import net.sf.openrocket.gui.print.PrintUnit;
import net.sf.openrocket.gui.print.PrintableComponent;
import net.sf.openrocket.logging.LogHelper;
import net.sf.openrocket.rocketcomponent.RocketComponent;
import net.sf.openrocket.startup.Application;
@ -18,6 +17,9 @@ import java.util.Collections;
import java.util.ListIterator;
import java.util.Set;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
* A strategy for drawing multiple rocket components onto as few pages as possible.
*
@ -28,7 +30,7 @@ public class PageFitPrintStrategy {
/**
* The logger.
*/
private static final LogHelper log = Application.getLogger();
private static final Logger log = LoggerFactory.getLogger(PageFitPrintStrategy.class);
/**
* The iText document.

6
core/src/net/sf/openrocket/gui/print/visitor/PartsDetailVisitorStrategy.java
View File

@ -8,11 +8,13 @@ import java.util.Set;
import javax.swing.ImageIcon;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import net.sf.openrocket.gui.main.ComponentIcons;
import net.sf.openrocket.gui.print.ITextHelper;
import net.sf.openrocket.gui.print.PrintUtilities;
import net.sf.openrocket.gui.print.PrintableFinSet;
import net.sf.openrocket.logging.LogHelper;
import net.sf.openrocket.material.Material;
import net.sf.openrocket.preset.ComponentPreset;
import net.sf.openrocket.rocketcomponent.BodyComponent;
@ -60,7 +62,7 @@ public class PartsDetailVisitorStrategy {
/**
* The logger.
*/
private static final LogHelper log = Application.getLogger();
private static final Logger log = LoggerFactory.getLogger(PartsDetailVisitorStrategy.class);
/**
* The number of columns in the table.

6
core/src/net/sf/openrocket/gui/print/visitor/TransitionStrategy.java
View File

@ -9,7 +9,6 @@ import net.sf.openrocket.gui.print.ITextHelper;
import net.sf.openrocket.gui.print.PrintUnit;
import net.sf.openrocket.gui.print.PrintableNoseCone;
import net.sf.openrocket.gui.print.PrintableTransition;
import net.sf.openrocket.logging.LogHelper;
import net.sf.openrocket.rocketcomponent.NoseCone;
import net.sf.openrocket.rocketcomponent.RocketComponent;
import net.sf.openrocket.rocketcomponent.Transition;
@ -19,6 +18,9 @@ import java.awt.image.BufferedImage;
import java.util.List;
import java.util.Set;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
* A strategy for drawing transition/shroud/nose cone templates.
*/
@ -27,7 +29,7 @@ public class TransitionStrategy {
/**
* The logger.
*/
private static final LogHelper log = Application.getLogger();
private static final Logger log = LoggerFactory.getLogger(TransitionStrategy.class);
/**
* The iText document.

6
core/src/net/sf/openrocket/gui/util/Icons.java
View File

@ -8,14 +8,16 @@ import java.util.Map;
import javax.swing.Icon;
import javax.swing.ImageIcon;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import net.sf.openrocket.document.Simulation;
import net.sf.openrocket.l10n.Translator;
import net.sf.openrocket.logging.LogHelper;
import net.sf.openrocket.startup.Application;
public class Icons {
private static final LogHelper log = Application.getLogger();
private static final Logger log = LoggerFactory.getLogger(Icons.class);
private static final Translator trans = Application.getTranslator();
static {

6
core/src/net/sf/openrocket/gui/util/OpenFileWorker.java
View File

@ -10,10 +10,12 @@ import java.io.InterruptedIOException;
import javax.swing.SwingWorker;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import net.sf.openrocket.document.OpenRocketDocument;
import net.sf.openrocket.file.DatabaseMotorFinder;
import net.sf.openrocket.file.RocketLoader;
import net.sf.openrocket.logging.LogHelper;
import net.sf.openrocket.startup.Application;
import net.sf.openrocket.util.MathUtil;
@ -24,7 +26,7 @@ import net.sf.openrocket.util.MathUtil;
* @author Sampo Niskanen <sampo.niskanen@iki.fi>
*/
public class OpenFileWorker extends SwingWorker<OpenRocketDocument, Void> {
private static final LogHelper log = Application.getLogger();
private static final Logger log = LoggerFactory.getLogger(OpenFileWorker.class);
private final File file;
private final InputStream stream;

6
core/src/net/sf/openrocket/gui/util/SwingPreferences.java
View File

@ -14,9 +14,11 @@ import java.util.Set;
import java.util.prefs.BackingStoreException;
import java.util.prefs.Preferences;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import net.sf.openrocket.arch.SystemInfo;
import net.sf.openrocket.document.Simulation;
import net.sf.openrocket.logging.LogHelper;
import net.sf.openrocket.material.Material;
import net.sf.openrocket.preset.ComponentPreset;
import net.sf.openrocket.rocketcomponent.Rocket;
@ -30,7 +32,7 @@ import net.sf.openrocket.util.BuildProperties;
public class SwingPreferences extends net.sf.openrocket.startup.Preferences {
private static final LogHelper log = Application.getLogger();
private static final Logger log = LoggerFactory.getLogger(SwingPreferences.class);
private static final String SPLIT_CHARACTER = "|";

6
core/src/net/sf/openrocket/masscalc/AbstractMassCalculator.java
View File

@ -1,6 +1,8 @@
package net.sf.openrocket.masscalc;
import net.sf.openrocket.logging.LogHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import net.sf.openrocket.rocketcomponent.Configuration;
import net.sf.openrocket.startup.Application;
@ -10,7 +12,7 @@ import net.sf.openrocket.startup.Application;
* @author Sampo Niskanen <sampo.niskanen@iki.fi>
*/
public abstract class AbstractMassCalculator implements MassCalculator {
private static final LogHelper log = Application.getLogger();
private static final Logger log = LoggerFactory.getLogger(AbstractMassCalculator.class);
private int rocketMassModID = -1;
private int rocketTreeModID = -1;

6
core/src/net/sf/openrocket/motor/ThrustCurveMotor.java
View File

@ -4,7 +4,9 @@ import java.text.Collator;
import java.util.Arrays;
import java.util.Locale;
import net.sf.openrocket.logging.LogHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import net.sf.openrocket.models.atmosphere.AtmosphericConditions;
import net.sf.openrocket.startup.Application;
import net.sf.openrocket.util.ArrayUtils;
@ -15,7 +17,7 @@ import net.sf.openrocket.util.MathUtil;
public class ThrustCurveMotor implements Motor, Comparable<ThrustCurveMotor> {
private static final LogHelper log = Application.getLogger();
private static final Logger log = LoggerFactory.getLogger(ThrustCurveMotor.class);
public static final double MAX_THRUST = 10e6;

6
core/src/net/sf/openrocket/optimization/general/multidim/MultidirectionalSearchOptimizer.java
View File

@ -5,7 +5,9 @@ import java.util.Collections;
import java.util.LinkedList;
import java.util.List;
import net.sf.openrocket.logging.LogHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import net.sf.openrocket.optimization.general.FunctionCache;
import net.sf.openrocket.optimization.general.FunctionOptimizer;
import net.sf.openrocket.optimization.general.OptimizationController;
@ -25,7 +27,7 @@ import net.sf.openrocket.util.Statistics;
* The optimization can be aborted by interrupting the current thread.
*/
public class MultidirectionalSearchOptimizer implements FunctionOptimizer, Statistics {
private static final LogHelper log = Application.getLogger();
private static final Logger log = LoggerFactory.getLogger(MultidirectionalSearchOptimizer.class);
private List<Point> simplex = new ArrayList<Point>();

6
core/src/net/sf/openrocket/optimization/general/onedim/GoldenSectionSearchOptimizer.java
View File

@ -1,6 +1,8 @@
package net.sf.openrocket.optimization.general.onedim;
import net.sf.openrocket.logging.LogHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import net.sf.openrocket.optimization.general.FunctionCache;
import net.sf.openrocket.optimization.general.FunctionOptimizer;
import net.sf.openrocket.optimization.general.OptimizationController;
@ -21,7 +23,7 @@ import net.sf.openrocket.util.Statistics;
* The optimization can be aborted by interrupting the current thread.
*/
public class GoldenSectionSearchOptimizer implements FunctionOptimizer, Statistics {
private static final LogHelper log = Application.getLogger();
private static final Logger log = LoggerFactory.getLogger(GoldenSectionSearchOptimizer.class);
private static final double ALPHA = (Math.sqrt(5) - 1) / 2.0;

6
core/src/net/sf/openrocket/optimization/rocketoptimization/parameters/SimulationBasedParameter.java
View File

@ -2,8 +2,10 @@ package net.sf.openrocket.optimization.rocketoptimization.parameters;
import java.util.Arrays;
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.optimization.rocketoptimization.OptimizableParameter;
import net.sf.openrocket.simulation.FlightData;
@ -24,7 +26,7 @@ import net.sf.openrocket.startup.Application;
*/
public abstract class SimulationBasedParameter implements OptimizableParameter {
private static final LogHelper log = Application.getLogger();
private static final Logger log = LoggerFactory.getLogger(SimulationBasedParameter.class);
@Override
public double computeValue(Simulation simulation) throws OptimizationException, InterruptedException {

6
core/src/net/sf/openrocket/optimization/rocketoptimization/parameters/StabilityParameter.java
View File

@ -1,11 +1,13 @@
package net.sf.openrocket.optimization.rocketoptimization.parameters;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import net.sf.openrocket.aerodynamics.AerodynamicCalculator;
import net.sf.openrocket.aerodynamics.BarrowmanCalculator;
import net.sf.openrocket.aerodynamics.FlightConditions;
import net.sf.openrocket.document.Simulation;
import net.sf.openrocket.l10n.Translator;
import net.sf.openrocket.logging.LogHelper;
import net.sf.openrocket.masscalc.BasicMassCalculator;
import net.sf.openrocket.masscalc.MassCalculator;
import net.sf.openrocket.masscalc.MassCalculator.MassCalcType;
@ -26,7 +28,7 @@ import net.sf.openrocket.util.MathUtil;
*/
public class StabilityParameter implements OptimizableParameter {
private static final LogHelper log = Application.getLogger();
private static final Logger log = LoggerFactory.getLogger(StabilityParameter.class);
private static final Translator trans = Application.getTranslator();

6
core/src/net/sf/openrocket/preset/xml/OpenRocketComponentLoader.java
View File

@ -8,8 +8,10 @@ import java.util.List;
import javax.xml.bind.JAXBException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import net.sf.openrocket.file.Loader;
import net.sf.openrocket.logging.LogHelper;
import net.sf.openrocket.preset.ComponentPreset;
import net.sf.openrocket.preset.InvalidComponentPresetException;
import net.sf.openrocket.startup.Application;
@ -17,7 +19,7 @@ import net.sf.openrocket.util.BugException;
public class OpenRocketComponentLoader implements Loader<ComponentPreset> {
private static final LogHelper log = Application.getLogger();
private static final Logger log = LoggerFactory.getLogger(OpenRocketComponentLoader.class);
@Override
public Collection<ComponentPreset> load(InputStream stream, String filename) {

7
core/src/net/sf/openrocket/preset/xml/OpenRocketComponentSaver.java
View File

@ -9,6 +9,10 @@ import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBException;
import javax.xml.bind.Marshaller;
import javax.xml.bind.Unmarshaller;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.BufferedWriter;
import java.io.File;
import java.io.FileOutputStream;
@ -26,6 +30,7 @@ import java.util.List;
*/
public class OpenRocketComponentSaver {
private static final Logger log = LoggerFactory.getLogger(OpenRocketComponentSaver.class);
/**
* The JAXBContext. JAXBContext is thread-safe.
*/
@ -36,7 +41,7 @@ public class OpenRocketComponentSaver {
context = JAXBContext.newInstance(OpenRocketComponentDTO.class);
}
catch (JAXBException jaxb) {
Application.getLogger().error("Unable to create JAXBContext for loading of *.orc files.", jaxb);
log.error("Unable to create JAXBContext for loading of *.orc files.", jaxb);
}
}

6
core/src/net/sf/openrocket/rocketcomponent/FreeformFinSet.java
View File

@ -4,8 +4,10 @@ import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import net.sf.openrocket.l10n.Translator;
import net.sf.openrocket.logging.LogHelper;
import net.sf.openrocket.startup.Application;
import net.sf.openrocket.util.ArrayList;
import net.sf.openrocket.util.BugException;
@ -13,7 +15,7 @@ import net.sf.openrocket.util.Coordinate;
public class FreeformFinSet extends FinSet {
private static final LogHelper log = Application.getLogger();
private static final Logger log = LoggerFactory.getLogger(FreeformFinSet.class);
private static final Translator trans = Application.getTranslator();
private ArrayList<Coordinate> points = new ArrayList<Coordinate>();

6
core/src/net/sf/openrocket/rocketcomponent/RocketComponent.java
View File

@ -6,8 +6,10 @@ import java.util.Iterator;
import java.util.List;
import java.util.NoSuchElementException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import net.sf.openrocket.l10n.Translator;
import net.sf.openrocket.logging.LogHelper;
import net.sf.openrocket.preset.ComponentPreset;
import net.sf.openrocket.startup.Application;
import net.sf.openrocket.util.ArrayList;
@ -24,7 +26,7 @@ import net.sf.openrocket.util.UniqueID;
public abstract class RocketComponent implements ChangeSource, Cloneable, Iterable<RocketComponent> {
private static final LogHelper log = Application.getLogger();
private static final Logger log = LoggerFactory.getLogger(RocketComponent.class);
private static final Translator trans = Application.getTranslator();
/*

6
core/src/net/sf/openrocket/simulation/FlightData.java
View File

@ -3,8 +3,10 @@ package net.sf.openrocket.simulation;
import java.util.ArrayList;
import java.util.List;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import net.sf.openrocket.aerodynamics.WarningSet;
import net.sf.openrocket.logging.LogHelper;
import net.sf.openrocket.startup.Application;
import net.sf.openrocket.util.MathUtil;
import net.sf.openrocket.util.Mutable;
@ -23,7 +25,7 @@ import net.sf.openrocket.util.Mutable;
* @author Sampo Niskanen <sampo.niskanen@iki.fi>
*/
public class FlightData {
private static final LogHelper log = Application.getLogger();
private static final Logger log = LoggerFactory.getLogger(FlightData.class);
/**
* An immutable FlightData object with NaN data.

6
core/src/net/sf/openrocket/simulation/FlightDataType.java
View File

@ -4,8 +4,10 @@ import java.util.HashMap;
import java.util.Locale;
import java.util.Map;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import net.sf.openrocket.l10n.Translator;
import net.sf.openrocket.logging.LogHelper;
import net.sf.openrocket.startup.Application;
import net.sf.openrocket.unit.UnitGroup;
import net.sf.openrocket.util.StringUtil;
@ -25,7 +27,7 @@ import net.sf.openrocket.util.StringUtil;
*/
public class FlightDataType implements Comparable<FlightDataType> {
private static final Translator trans = Application.getTranslator();
private static final LogHelper log = Application.getLogger();
private static final Logger log = LoggerFactory.getLogger(FlightDataType.class);
/** Priority of custom-created variables */
private static final int DEFAULT_PRIORITY = 999;

6
core/src/net/sf/openrocket/simulation/SimulationOptions.java
View File

@ -7,8 +7,10 @@ import java.util.List;
import java.util.Random;
import java.util.Set;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import net.sf.openrocket.aerodynamics.BarrowmanCalculator;
import net.sf.openrocket.logging.LogHelper;
import net.sf.openrocket.masscalc.BasicMassCalculator;
import net.sf.openrocket.models.atmosphere.AtmosphericModel;
import net.sf.openrocket.models.atmosphere.ExtendedISAModel;
@ -34,7 +36,7 @@ import net.sf.openrocket.util.WorldCoordinate;
*/
public class SimulationOptions implements ChangeSource, Cloneable {
private static final LogHelper log = Application.getLogger();
private static final Logger log = LoggerFactory.getLogger(SimulationOptions.class);
public static final double MAX_LAUNCH_ROD_ANGLE = Math.PI / 3;

6
core/src/net/sf/openrocket/simulation/customexpression/CustomExpressionSimulationListener.java
View File

@ -3,7 +3,9 @@ package net.sf.openrocket.simulation.customexpression;
import java.util.ArrayList;
import java.util.List;
import net.sf.openrocket.logging.LogHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import net.sf.openrocket.simulation.FlightDataBranch;
import net.sf.openrocket.simulation.SimulationStatus;
import net.sf.openrocket.simulation.exception.SimulationException;
@ -12,7 +14,7 @@ import net.sf.openrocket.startup.Application;
public class CustomExpressionSimulationListener extends AbstractSimulationListener {
private static final LogHelper log = Application.getLogger();
private static final Logger log = LoggerFactory.getLogger(CustomExpressionSimulationListener.class);
private final List<CustomExpression> expressions;
public CustomExpressionSimulationListener(List<CustomExpression> expressions) {

6
core/src/net/sf/openrocket/simulation/customexpression/Functions.java
View File

@ -5,8 +5,10 @@ import java.util.List;
import java.util.SortedMap;
import java.util.TreeMap;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import net.sf.openrocket.l10n.Translator;
import net.sf.openrocket.logging.LogHelper;
import net.sf.openrocket.startup.Application;
import net.sf.openrocket.util.ArrayUtils;
@ -20,7 +22,7 @@ import de.congrace.exp4j.Variable;
public class Functions {
private static Functions instance = null;
private static final LogHelper log = Application.getLogger();
private static final Logger log = LoggerFactory.getLogger(Functions.class);
private static final Translator trans = Application.getTranslator();
private List<CustomFunction> allFunctions = new ArrayList<CustomFunction>();

6
core/src/net/sf/openrocket/simulation/listeners/SimulationListenerHelper.java
View File

@ -1,10 +1,12 @@
package net.sf.openrocket.simulation.listeners;
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.Warning;
import net.sf.openrocket.logging.LogHelper;
import net.sf.openrocket.models.atmosphere.AtmosphericConditions;
import net.sf.openrocket.motor.MotorId;
import net.sf.openrocket.motor.MotorInstance;
@ -26,7 +28,7 @@ import net.sf.openrocket.util.MathUtil;
*/
public class SimulationListenerHelper {
private static final LogHelper log = Application.getLogger();
private static final Logger log = LoggerFactory.getLogger(SimulationListenerHelper.class);
//////// SimulationListener methods ////////

6
core/src/net/sf/openrocket/startup/ConcurrentComponentPresetDatabaseLoader.java
View File

@ -9,19 +9,21 @@ import java.util.concurrent.Executors;
import java.util.concurrent.ThreadFactory;
import java.util.concurrent.TimeUnit;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import net.sf.openrocket.database.ComponentPresetDatabase;
import net.sf.openrocket.file.iterator.DirectoryIterator;
import net.sf.openrocket.file.iterator.FileIterator;
import net.sf.openrocket.gui.util.SimpleFileFilter;
import net.sf.openrocket.gui.util.SwingPreferences;
import net.sf.openrocket.logging.LogHelper;
import net.sf.openrocket.preset.ComponentPreset;
import net.sf.openrocket.preset.xml.OpenRocketComponentLoader;
import net.sf.openrocket.util.Pair;
public class ConcurrentComponentPresetDatabaseLoader {
private static final LogHelper log = Application.getLogger();
private static final Logger log = LoggerFactory.getLogger(ConcurrentComponentPresetDatabaseLoader.class);
private static final String SYSTEM_PRESET_DIR = "datafiles/presets";
private final CountDownLatch latch = new CountDownLatch(1);

6
core/src/net/sf/openrocket/startup/ConcurrentLoadingThrustCurveMotorSetDatabase.java
View File

@ -11,6 +11,9 @@ import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import net.sf.openrocket.database.ThrustCurveMotorSet;
import net.sf.openrocket.database.ThrustCurveMotorSetDatabase;
import net.sf.openrocket.file.iterator.DirectoryIterator;
@ -18,7 +21,6 @@ import net.sf.openrocket.file.iterator.FileIterator;
import net.sf.openrocket.file.motor.MotorLoaderHelper;
import net.sf.openrocket.gui.util.SimpleFileFilter;
import net.sf.openrocket.gui.util.SwingPreferences;
import net.sf.openrocket.logging.LogHelper;
import net.sf.openrocket.motor.Motor;
import net.sf.openrocket.motor.ThrustCurveMotor;
import net.sf.openrocket.util.BugException;
@ -45,7 +47,7 @@ import net.sf.openrocket.util.Pair;
*/
public class ConcurrentLoadingThrustCurveMotorSetDatabase extends ThrustCurveMotorSetDatabase {
private static final LogHelper log = Application.getLogger();
private static final Logger log = LoggerFactory.getLogger(ConcurrentLoadingThrustCurveMotorSetDatabase.class);
private final String thrustCurveDirectory;
/** Block motor loading for this many milliseconds */

7
core/src/net/sf/openrocket/startup/OSXStartup.java
View File

@ -3,13 +3,14 @@ package net.sf.openrocket.startup;
import java.awt.Image;
import java.awt.Toolkit;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import net.sf.openrocket.arch.SystemInfo;
import net.sf.openrocket.arch.SystemInfo.Platform;
import net.sf.openrocket.gui.dialogs.AboutDialog;
import net.sf.openrocket.gui.dialogs.preferences.PreferencesDialog;
import net.sf.openrocket.gui.main.BasicFrame;
import net.sf.openrocket.logging.LogHelper;
import com.apple.eawt.AboutHandler;
import com.apple.eawt.PreferencesHandler;
import com.apple.eawt.QuitHandler;
@ -26,7 +27,7 @@ import com.apple.eawt.AppEvent.QuitEvent;
*
*/
final class OSXStartup {
private static final LogHelper log = Application.getLogger();
private static final Logger log = LoggerFactory.getLogger(OSXStartup.class);
// The name in the app menu
private static final String APP_NAME = "OpenRocket";

6
core/src/net/sf/openrocket/util/Coordinate.java
View File

@ -2,7 +2,9 @@ package net.sf.openrocket.util;
import java.io.Serializable;
import net.sf.openrocket.logging.LogHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import net.sf.openrocket.startup.Application;
/**
@ -13,7 +15,7 @@ import net.sf.openrocket.startup.Application;
* @author Sampo Niskanen <sampo.niskanen@iki.fi>
*/
public final class Coordinate implements Cloneable, Serializable {
private static final LogHelper log = Application.getLogger();
private static final Logger log = LoggerFactory.getLogger(Coordinate.class);
// Defined for backwards compatibility after adding clone().
static final long serialVersionUID = 585574649794259293L;

6
core/src/net/sf/openrocket/util/ExpressionParser.java
View File

@ -2,13 +2,15 @@ package net.sf.openrocket.util;
import java.text.DecimalFormatSymbols;
import net.sf.openrocket.logging.LogHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import net.sf.openrocket.startup.Application;
import de.congrace.exp4j.Calculable;
import de.congrace.exp4j.ExpressionBuilder;
public class ExpressionParser {
private static final LogHelper log = Application.getLogger();
private static final Logger log = LoggerFactory.getLogger(ExpressionParser.class);
private static final char DECIMAL_SEPARATOR;
private static final char MINUS_SIGN;

6
core/src/net/sf/openrocket/util/MemoryManagement.java
View File

@ -6,7 +6,9 @@ import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
import net.sf.openrocket.logging.LogHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import net.sf.openrocket.startup.Application;
/**
@ -20,7 +22,7 @@ import net.sf.openrocket.startup.Application;
* @author Sampo Niskanen <sampo.niskanen@iki.fi>
*/
public final class MemoryManagement {
private static final LogHelper log = Application.getLogger();
private static final Logger log = LoggerFactory.getLogger(MemoryManagement.class);
/** Purge cleared references every this many calls to {@link #collectable(Object)} */
private static final int PURGE_CALL_COUNT = 1000;

6
core/src/net/sf/openrocket/util/Quaternion.java
View File

@ -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.startup.Application;
/**
@ -9,7 +11,7 @@ import net.sf.openrocket.startup.Application;
* @author Sampo Niskanen <sampo.niskanen@iki.fi>
*/
public class Quaternion {
private static final LogHelper log = Application.getLogger();
private static final Logger log = LoggerFactory.getLogger(Quaternion.class);
//////// Debug section

6
core/src/net/sf/openrocket/util/SafetyMutex.java
View File

@ -2,7 +2,9 @@ package net.sf.openrocket.util;
import java.util.LinkedList;
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;
@ -18,7 +20,7 @@ import net.sf.openrocket.startup.Application;
*/
public abstract class SafetyMutex {
private static final boolean USE_CHECKS = Application.useSafetyChecks();
private static final LogHelper log = Application.getLogger();
private static final Logger log = LoggerFactory.getLogger(SafetyMutex.class);
/**