From 7fb5a7ad81e874178bed467ed8f9c919b5e7e86b Mon Sep 17 00:00:00 2001 From: bkuker Date: Thu, 25 Oct 2012 14:12:49 -0400 Subject: [PATCH] Replace calls to verbose() with trace() --- .../openrocket/gui/adaptors/DoubleModel.java | 12 ++--- .../openrocket/gui/adaptors/IntegerModel.java | 6 +-- .../gui/figure3d/RocketFigure3d.java | 46 +++++++++---------- .../ComponentTreeTransferHandler.java | 6 +-- .../RocketOptimizationFunction.java | 2 +- .../modifiers/GenericModifier.java | 2 +- .../sf/openrocket/rocketcomponent/Rocket.java | 8 ++-- .../BasicEventSimulationEngine.java | 4 +- .../simulation/RK4SimulationStepper.java | 6 +-- 9 files changed, 46 insertions(+), 46 deletions(-) diff --git a/core/src/net/sf/openrocket/gui/adaptors/DoubleModel.java b/core/src/net/sf/openrocket/gui/adaptors/DoubleModel.java index 3216f0a7d..15d125cdd 100644 --- a/core/src/net/sf/openrocket/gui/adaptors/DoubleModel.java +++ b/core/src/net/sf/openrocket/gui/adaptors/DoubleModel.java @@ -75,7 +75,7 @@ public class DoubleModel implements StateChangeListener, ChangeSource, Invalidat public void setValue(Object value) { if (firing > 0) { // Ignore, if called when model is sending events - log.verbose("Ignoring call to SpinnerModel setValue for " + DoubleModel.this.toString() + + log.trace("Ignoring call to SpinnerModel setValue for " + DoubleModel.this.toString() + " value=" + value + ", currently firing events"); return; } @@ -311,7 +311,7 @@ public class DoubleModel implements StateChangeListener, ChangeSource, Invalidat public void setValue(int newValue) { if (firing > 0) { // Ignore loops - log.verbose("Ignoring call to SliderModel setValue for " + DoubleModel.this.toString() + + log.trace("Ignoring call to SliderModel setValue for " + DoubleModel.this.toString() + " value=" + newValue + ", currently firing events"); return; } @@ -467,7 +467,7 @@ public class DoubleModel implements StateChangeListener, ChangeSource, Invalidat @Override public void putValue(String key, Object value) { if (firing > 0) { - log.verbose("Ignoring call to ActionModel putValue for " + DoubleModel.this.toString() + + log.trace("Ignoring call to ActionModel putValue for " + DoubleModel.this.toString() + " key=" + key + " value=" + value + ", currently firing events"); return; } @@ -875,7 +875,7 @@ public class DoubleModel implements StateChangeListener, ChangeSource, Invalidat } listeners.add(l); - log.verbose(this + " adding listener (total " + listeners.size() + "): " + l); + log.trace(this + " adding listener (total " + listeners.size() + "): " + l); } /** @@ -891,7 +891,7 @@ public class DoubleModel implements StateChangeListener, ChangeSource, Invalidat if (listeners.isEmpty() && source != null) { source.removeChangeListener(this); } - log.verbose(this + " removing listener (total " + listeners.size() + "): " + l); + log.trace(this + " removing listener (total " + listeners.size() + "): " + l); } @@ -902,7 +902,7 @@ public class DoubleModel implements StateChangeListener, ChangeSource, Invalidat */ @Override public void invalidate() { - log.verbose("Invalidating " + this); + log.trace("Invalidating " + this); invalidator.invalidate(); if (!listeners.isEmpty()) { diff --git a/core/src/net/sf/openrocket/gui/adaptors/IntegerModel.java b/core/src/net/sf/openrocket/gui/adaptors/IntegerModel.java index e948918af..43cf44df6 100644 --- a/core/src/net/sf/openrocket/gui/adaptors/IntegerModel.java +++ b/core/src/net/sf/openrocket/gui/adaptors/IntegerModel.java @@ -35,7 +35,7 @@ public class IntegerModel implements StateChangeListener { public void setValue(Object value) { if (firing > 0) { // Ignore, if called when model is sending events - log.verbose("Ignoring call to SpinnerModel setValue for " + IntegerModel.this.toString() + + log.trace("Ignoring call to SpinnerModel setValue for " + IntegerModel.this.toString() + " value=" + value + ", currently firing events"); return; @@ -194,7 +194,7 @@ public class IntegerModel implements StateChangeListener { } listeners.add(l); - log.verbose(this + " adding listener (total " + listeners.size() + "): " + l); + log.trace(this + " adding listener (total " + listeners.size() + "): " + l); } /** @@ -207,7 +207,7 @@ public class IntegerModel implements StateChangeListener { if (listeners.isEmpty()) { source.removeChangeListener(this); } - log.verbose(this + " removing listener (total " + listeners.size() + "): " + l); + log.trace(this + " removing listener (total " + listeners.size() + "): " + l); } diff --git a/core/src/net/sf/openrocket/gui/figure3d/RocketFigure3d.java b/core/src/net/sf/openrocket/gui/figure3d/RocketFigure3d.java index 3cae27189..2d2557e7c 100644 --- a/core/src/net/sf/openrocket/gui/figure3d/RocketFigure3d.java +++ b/core/src/net/sf/openrocket/gui/figure3d/RocketFigure3d.java @@ -112,34 +112,34 @@ public class RocketFigure3d extends JPanel implements GLEventListener { try { log.debug("Setting up GL capabilities..."); - log.verbose("GL - Getting Default Profile"); + log.trace("GL - Getting Default Profile"); GLProfile glp = GLProfile.getDefault(); - log.verbose("GL - creating GLCapabilities"); + log.trace("GL - creating GLCapabilities"); GLCapabilities caps = new GLCapabilities(glp); - log.verbose("GL - setSampleBuffers"); + log.trace("GL - setSampleBuffers"); caps.setSampleBuffers(true); - log.verbose("GL - setNumSamples"); + log.trace("GL - setNumSamples"); caps.setNumSamples(6); - log.verbose("GL - setStencilBits"); + log.trace("GL - setStencilBits"); caps.setStencilBits(1); - log.verbose("GL - Creating Canvas"); + log.trace("GL - Creating Canvas"); canvas = new GLCanvas(caps); - log.verbose("GL - Registering as GLEventListener on canvas"); + log.trace("GL - Registering as GLEventListener on canvas"); canvas.addGLEventListener(this); - log.verbose("GL - Adding canvas to this JPanel"); + log.trace("GL - Adding canvas to this JPanel"); this.add(canvas, BorderLayout.CENTER); - log.verbose("GL - Setting up mouse listeners"); + log.trace("GL - Setting up mouse listeners"); setupMouseListeners(); - log.verbose("GL - Rasterizine Carets"); //reticulating splines? + log.trace("GL - Rasterizine Carets"); //reticulating splines? rasterizeCarets(); } catch (Throwable t) { @@ -373,12 +373,12 @@ public class RocketFigure3d extends JPanel implements GLEventListener { @Override public void dispose(GLAutoDrawable drawable) { - log.verbose("GL - dispose() called"); + log.trace("GL - dispose() called"); } @Override public void init(GLAutoDrawable drawable) { - log.verbose("GL - init() called"); + log.trace("GL - init() called"); rr.init(drawable); GL2 gl = drawable.getGL().getGL2(); @@ -404,12 +404,12 @@ public class RocketFigure3d extends JPanel implements GLEventListener { extrasOverlay = new Overlay(drawable); caretOverlay = new Overlay(drawable); - log.verbose("GL - init() complete"); + log.trace("GL - init() complete"); } @Override public void reshape(GLAutoDrawable drawable, int x, int y, int w, int h) { - log.verbose("GL - reshape() called"); + log.trace("GL - reshape() called"); GL2 gl = drawable.getGL().getGL2(); GLU glu = new GLU(); @@ -422,7 +422,7 @@ public class RocketFigure3d extends JPanel implements GLEventListener { gl.glMatrixMode(GLMatrixFunc.GL_MODELVIEW); redrawExtras = true; - log.verbose("GL - reshape() complete"); + log.trace("GL - reshape() complete"); } @SuppressWarnings("unused") @@ -461,7 +461,7 @@ public class RocketFigure3d extends JPanel implements GLEventListener { } private void setupView(GL2 gl, GLU glu) { - log.verbose("GL - setupView() called"); + log.trace("GL - setupView() called"); gl.glLoadIdentity(); gl.glLightfv(GLLightingFunc.GL_LIGHT1, GLLightingFunc.GL_POSITION, @@ -498,7 +498,7 @@ public class RocketFigure3d extends JPanel implements GLEventListener { gl.glTranslated(-1, 0, 0); gl.glMatrixMode(GLMatrixFunc.GL_MODELVIEW); - log.verbose("GL - setupView() complete"); + log.trace("GL - setupView() complete"); } /** @@ -511,19 +511,19 @@ public class RocketFigure3d extends JPanel implements GLEventListener { } private void internalRepaint() { - log.verbose("GL - internalRepaint() called"); + log.trace("GL - internalRepaint() called"); super.repaint(); if (canvas != null) canvas.display(); - log.verbose("GL - internalRepaint() complete"); + log.trace("GL - internalRepaint() complete"); } @Override public void repaint() { - log.verbose("GL - repaint() called"); + log.trace("GL - repaint() called"); redrawExtras = true; internalRepaint(); - log.verbose("GL - repaint() complete"); + log.trace("GL - repaint() complete"); } private Set selection = new HashSet(); @@ -554,7 +554,7 @@ public class RocketFigure3d extends JPanel implements GLEventListener { // ///////////// Extra methods private Coordinate project(Coordinate c, GL2 gl, GLU glu) { - log.verbose("GL - project() called"); + log.trace("GL - project() called"); double[] mvmatrix = new double[16]; double[] projmatrix = new double[16]; int[] viewport = new int[4]; @@ -567,7 +567,7 @@ public class RocketFigure3d extends JPanel implements GLEventListener { glu.gluProject(c.x, c.y, c.z, mvmatrix, 0, projmatrix, 0, viewport, 0, out, 0); - log.verbose("GL - peoject() complete"); + log.trace("GL - peoject() complete"); return new Coordinate(out[0], out[1], out[2]); } 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 ff4ae578c..f454a17da 100644 --- a/core/src/net/sf/openrocket/gui/main/componenttree/ComponentTreeTransferHandler.java +++ b/core/src/net/sf/openrocket/gui/main/componenttree/ComponentTreeTransferHandler.java @@ -88,13 +88,13 @@ public class ComponentTreeTransferHandler extends TransferHandler { } boolean allowed = data.destParent.isCompatible(data.child); - log.verbose("Checking validity of drag-drop " + data.toString() + " allowed:" + allowed); + log.trace("Checking validity of drag-drop " + data.toString() + " allowed:" + allowed); // Ensure we're not dropping a component onto a child component RocketComponent path = data.destParent; while (path != null) { if (path.equals(data.child)) { - log.verbose("Drop would cause cycle in tree, disallowing."); + log.trace("Drop would cause cycle in tree, disallowing."); allowed = false; break; } @@ -348,7 +348,7 @@ public class ComponentTreeTransferHandler extends TransferHandler { int correctInsertIndex = model.getIndexOfChild(correctInsertPath.getLastPathComponent(), dropPath.getLastPathComponent()) + 1; - log.verbose("Working around Sun JRE bug 6560955: " + + log.trace("Working around Sun JRE bug 6560955: " + "converted path=" + ComponentTreeModel.pathToString(originalPath) + " index=" + originalIndex + " into path=" + ComponentTreeModel.pathToString(correctInsertPath) + " index=" + correctInsertIndex); diff --git a/core/src/net/sf/openrocket/optimization/rocketoptimization/RocketOptimizationFunction.java b/core/src/net/sf/openrocket/optimization/rocketoptimization/RocketOptimizationFunction.java index 2f224269f..35ab874ce 100644 --- a/core/src/net/sf/openrocket/optimization/rocketoptimization/RocketOptimizationFunction.java +++ b/core/src/net/sf/openrocket/optimization/rocketoptimization/RocketOptimizationFunction.java @@ -117,7 +117,7 @@ public class RocketOptimizationFunction implements Function { goalValue = Double.MAX_VALUE; } - log.verbose("Parameter value at point " + point + " is " + parameterValue + ", goal function value=" + goalValue); + log.trace("Parameter value at point " + point + " is " + parameterValue + ", goal function value=" + goalValue); fireEvent(simulation, point, referenceValue, new Value(parameterValue, parameter.getUnitGroup().getDefaultUnit()), goalValue); 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 b5e2eaee4..110a93960 100644 --- a/core/src/net/sf/openrocket/optimization/rocketoptimization/modifiers/GenericModifier.java +++ b/core/src/net/sf/openrocket/optimization/rocketoptimization/modifiers/GenericModifier.java @@ -84,7 +84,7 @@ public abstract class GenericModifier extends AbstractSimulationModifier { throw new OptimizationException("BUG: getModifiedObject() returned null"); } double siValue = toBaseValue(scaledValue) / multiplier; - log.verbose("Setting setter=" + setter + " modifiable=" + modifiable + " siValue=" + siValue + "scaledValue=" + scaledValue); + log.trace("Setting setter=" + setter + " modifiable=" + modifiable + " siValue=" + siValue + "scaledValue=" + scaledValue); setter.invoke(modifiable, siValue); } diff --git a/core/src/net/sf/openrocket/rocketcomponent/Rocket.java b/core/src/net/sf/openrocket/rocketcomponent/Rocket.java index d493ca493..11e447ce6 100644 --- a/core/src/net/sf/openrocket/rocketcomponent/Rocket.java +++ b/core/src/net/sf/openrocket/rocketcomponent/Rocket.java @@ -353,14 +353,14 @@ public class Rocket extends RocketComponent { public void addComponentChangeListener(ComponentChangeListener l) { checkState(); listenerList.add(l); - log.verbose("Added ComponentChangeListener " + l + ", current number of listeners is " + + log.trace("Added ComponentChangeListener " + l + ", current number of listeners is " + listenerList.size()); } @Override public void removeComponentChangeListener(ComponentChangeListener l) { listenerList.remove(l); - log.verbose("Removed ComponentChangeListener " + l + ", current number of listeners is " + + log.trace("Removed ComponentChangeListener " + l + ", current number of listeners is " + listenerList.size()); } @@ -369,14 +369,14 @@ public class Rocket extends RocketComponent { public void addChangeListener(EventListener l) { checkState(); listenerList.add(l); - log.verbose("Added ChangeListener " + l + ", current number of listeners is " + + log.trace("Added ChangeListener " + l + ", current number of listeners is " + listenerList.size()); } @Override public void removeChangeListener(EventListener l) { listenerList.remove(l); - log.verbose("Removed ChangeListener " + l + ", current number of listeners is " + + log.trace("Removed ChangeListener " + l + ", current number of listeners is " + listenerList.size()); } diff --git a/core/src/net/sf/openrocket/simulation/BasicEventSimulationEngine.java b/core/src/net/sf/openrocket/simulation/BasicEventSimulationEngine.java index 538e85c9d..528990a2d 100644 --- a/core/src/net/sf/openrocket/simulation/BasicEventSimulationEngine.java +++ b/core/src/net/sf/openrocket/simulation/BasicEventSimulationEngine.java @@ -85,7 +85,7 @@ public class BasicEventSimulationEngine implements SimulationEngine { if (nextEvent != null) { maxStepTime = MathUtil.max(nextEvent.getTime() - status.getSimulationTime(), 0.001); } - log.verbose("BasicEventSimulationEngine: Taking simulation step at t=" + status.getSimulationTime()); + log.trace("BasicEventSimulationEngine: Taking simulation step at t=" + status.getSimulationTime()); currentStepper.step(status, maxStepTime); } SimulationListenerHelper.firePostStep(status); @@ -318,7 +318,7 @@ public class BasicEventSimulationEngine implements SimulationEngine { } if (event.getType() != FlightEvent.Type.ALTITUDE) { - log.verbose("BasicEventSimulationEngine: Handling event " + event); + log.trace("BasicEventSimulationEngine: Handling event " + event); } if (event.getType() == FlightEvent.Type.IGNITION) { diff --git a/core/src/net/sf/openrocket/simulation/RK4SimulationStepper.java b/core/src/net/sf/openrocket/simulation/RK4SimulationStepper.java index fdc4ba626..85e1697da 100644 --- a/core/src/net/sf/openrocket/simulation/RK4SimulationStepper.java +++ b/core/src/net/sf/openrocket/simulation/RK4SimulationStepper.java @@ -163,11 +163,11 @@ public class RK4SimulationStepper extends AbstractSimulationStepper { double minTimeStep = status.getSimulationConditions().getTimeStep() / 20; if (store.timestep < minTimeStep) { - log.verbose("Too small time step " + store.timestep + " (limiting factor " + limitingValue + "), using " + + log.trace("Too small time step " + store.timestep + " (limiting factor " + limitingValue + "), using " + minTimeStep + " instead."); store.timestep = minTimeStep; } else { - log.verbose("Selected time step " + store.timestep + " (limiting factor " + limitingValue + ")"); + log.trace("Selected time step " + store.timestep + " (limiting factor " + limitingValue + ")"); } checkNaN(store.timestep); @@ -191,7 +191,7 @@ public class RK4SimulationStepper extends AbstractSimulationStepper { ", recomputing k1 parameters"); k1 = computeParameters(status, store); } else { - log.verbose("Thrust estimate differs from correct value by " + + log.trace("Thrust estimate differs from correct value by " + (Math.rint(1000 * (thrustDiff + 0.000001) / thrustEstimate) / 10.0) + "%," + " estimate=" + thrustEstimate + " correct=" + store.thrustForce +