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

Replace calls to verbose() with trace()

Browse Source
This commit is contained in:
bkuker 2012-10-25 14:12:49 -04:00
parent 4c84b3dad7
commit 7fb5a7ad81
9 changed files with 46 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
core/src/net/sf/openrocket/gui/adaptors/DoubleModel.java
View File

@ -75,7 +75,7 @@ public class DoubleModel implements StateChangeListener, ChangeSource, Invalidat
public void setValue(Object value) { public void setValue(Object value) {
if (firing > 0) { if (firing > 0) {
// Ignore, if called when model is sending events // 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"); " value=" + value + ", currently firing events");
return; return;
} }
@ -311,7 +311,7 @@ public class DoubleModel implements StateChangeListener, ChangeSource, Invalidat
public void setValue(int newValue) { public void setValue(int newValue) {
if (firing > 0) { if (firing > 0) {
// Ignore loops // 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"); " value=" + newValue + ", currently firing events");
return; return;
} }
@ -467,7 +467,7 @@ public class DoubleModel implements StateChangeListener, ChangeSource, Invalidat
@Override @Override
public void putValue(String key, Object value) { public void putValue(String key, Object value) {
if (firing > 0) { 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"); " key=" + key + " value=" + value + ", currently firing events");
return; return;
} }
@ -875,7 +875,7 @@ public class DoubleModel implements StateChangeListener, ChangeSource, Invalidat
} }
listeners.add(l); 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) { if (listeners.isEmpty() && source != null) {
source.removeChangeListener(this); 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 @Override
public void invalidate() { public void invalidate() {
log.verbose("Invalidating " + this); log.trace("Invalidating " + this);
invalidator.invalidate(); invalidator.invalidate();
if (!listeners.isEmpty()) { if (!listeners.isEmpty()) {

6
core/src/net/sf/openrocket/gui/adaptors/IntegerModel.java
View File

@ -35,7 +35,7 @@ public class IntegerModel implements StateChangeListener {
public void setValue(Object value) { public void setValue(Object value) {
if (firing > 0) { if (firing > 0) {
// Ignore, if called when model is sending events // 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"); " value=" + value + ", currently firing events");
return; return;
@ -194,7 +194,7 @@ public class IntegerModel implements StateChangeListener {
} }
listeners.add(l); 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()) { if (listeners.isEmpty()) {
source.removeChangeListener(this); source.removeChangeListener(this);
} }
log.verbose(this + " removing listener (total " + listeners.size() + "): " + l); log.trace(this + " removing listener (total " + listeners.size() + "): " + l);
} }

46
core/src/net/sf/openrocket/gui/figure3d/RocketFigure3d.java
View File

@ -112,34 +112,34 @@ public class RocketFigure3d extends JPanel implements GLEventListener {
try { try {
log.debug("Setting up GL capabilities..."); log.debug("Setting up GL capabilities...");
log.verbose("GL - Getting Default Profile"); log.trace("GL - Getting Default Profile");
GLProfile glp = GLProfile.getDefault(); GLProfile glp = GLProfile.getDefault();
log.verbose("GL - creating GLCapabilities"); log.trace("GL - creating GLCapabilities");
GLCapabilities caps = new GLCapabilities(glp); GLCapabilities caps = new GLCapabilities(glp);
log.verbose("GL - setSampleBuffers"); log.trace("GL - setSampleBuffers");
caps.setSampleBuffers(true); caps.setSampleBuffers(true);
log.verbose("GL - setNumSamples"); log.trace("GL - setNumSamples");
caps.setNumSamples(6); caps.setNumSamples(6);
log.verbose("GL - setStencilBits"); log.trace("GL - setStencilBits");
caps.setStencilBits(1); caps.setStencilBits(1);
log.verbose("GL - Creating Canvas"); log.trace("GL - Creating Canvas");
canvas = new GLCanvas(caps); canvas = new GLCanvas(caps);
log.verbose("GL - Registering as GLEventListener on canvas"); log.trace("GL - Registering as GLEventListener on canvas");
canvas.addGLEventListener(this); canvas.addGLEventListener(this);
log.verbose("GL - Adding canvas to this JPanel"); log.trace("GL - Adding canvas to this JPanel");
this.add(canvas, BorderLayout.CENTER); this.add(canvas, BorderLayout.CENTER);
log.verbose("GL - Setting up mouse listeners"); log.trace("GL - Setting up mouse listeners");
setupMouseListeners(); setupMouseListeners();
log.verbose("GL - Rasterizine Carets"); //reticulating splines? log.trace("GL - Rasterizine Carets"); //reticulating splines?
rasterizeCarets(); rasterizeCarets();
} catch (Throwable t) { } catch (Throwable t) {
@ -373,12 +373,12 @@ public class RocketFigure3d extends JPanel implements GLEventListener {
@Override @Override
public void dispose(GLAutoDrawable drawable) { public void dispose(GLAutoDrawable drawable) {
log.verbose("GL - dispose() called"); log.trace("GL - dispose() called");
} }
@Override @Override
public void init(GLAutoDrawable drawable) { public void init(GLAutoDrawable drawable) {
log.verbose("GL - init() called"); log.trace("GL - init() called");
rr.init(drawable); rr.init(drawable);
GL2 gl = drawable.getGL().getGL2(); GL2 gl = drawable.getGL().getGL2();
@ -404,12 +404,12 @@ public class RocketFigure3d extends JPanel implements GLEventListener {
extrasOverlay = new Overlay(drawable); extrasOverlay = new Overlay(drawable);
caretOverlay = new Overlay(drawable); caretOverlay = new Overlay(drawable);
log.verbose("GL - init() complete"); log.trace("GL - init() complete");
} }
@Override @Override
public void reshape(GLAutoDrawable drawable, int x, int y, int w, int h) { 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(); GL2 gl = drawable.getGL().getGL2();
GLU glu = new GLU(); GLU glu = new GLU();
@ -422,7 +422,7 @@ public class RocketFigure3d extends JPanel implements GLEventListener {
gl.glMatrixMode(GLMatrixFunc.GL_MODELVIEW); gl.glMatrixMode(GLMatrixFunc.GL_MODELVIEW);
redrawExtras = true; redrawExtras = true;
log.verbose("GL - reshape() complete"); log.trace("GL - reshape() complete");
} }
@SuppressWarnings("unused") @SuppressWarnings("unused")
@ -461,7 +461,7 @@ public class RocketFigure3d extends JPanel implements GLEventListener {
} }
private void setupView(GL2 gl, GLU glu) { private void setupView(GL2 gl, GLU glu) {
log.verbose("GL - setupView() called"); log.trace("GL - setupView() called");
gl.glLoadIdentity(); gl.glLoadIdentity();
gl.glLightfv(GLLightingFunc.GL_LIGHT1, GLLightingFunc.GL_POSITION, 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.glTranslated(-1, 0, 0);
gl.glMatrixMode(GLMatrixFunc.GL_MODELVIEW); 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() { private void internalRepaint() {
log.verbose("GL - internalRepaint() called"); log.trace("GL - internalRepaint() called");
super.repaint(); super.repaint();
if (canvas != null) if (canvas != null)
canvas.display(); canvas.display();
log.verbose("GL - internalRepaint() complete"); log.trace("GL - internalRepaint() complete");
} }
@Override @Override
public void repaint() { public void repaint() {
log.verbose("GL - repaint() called"); log.trace("GL - repaint() called");
redrawExtras = true; redrawExtras = true;
internalRepaint(); internalRepaint();
log.verbose("GL - repaint() complete"); log.trace("GL - repaint() complete");
} }
private Set<RocketComponent> selection = new HashSet<RocketComponent>(); private Set<RocketComponent> selection = new HashSet<RocketComponent>();
@ -554,7 +554,7 @@ public class RocketFigure3d extends JPanel implements GLEventListener {
// ///////////// Extra methods // ///////////// Extra methods
private Coordinate project(Coordinate c, GL2 gl, GLU glu) { 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[] mvmatrix = new double[16];
double[] projmatrix = new double[16]; double[] projmatrix = new double[16];
int[] viewport = new int[4]; 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, glu.gluProject(c.x, c.y, c.z, mvmatrix, 0, projmatrix, 0, viewport, 0,
out, 0); out, 0);
log.verbose("GL - peoject() complete"); log.trace("GL - peoject() complete");
return new Coordinate(out[0], out[1], out[2]); return new Coordinate(out[0], out[1], out[2]);
} }

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

@ -88,13 +88,13 @@ public class ComponentTreeTransferHandler extends TransferHandler {
} }
boolean allowed = data.destParent.isCompatible(data.child); 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 // Ensure we're not dropping a component onto a child component
RocketComponent path = data.destParent; RocketComponent path = data.destParent;
while (path != null) { while (path != null) {
if (path.equals(data.child)) { 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; allowed = false;
break; break;
} }
@ -348,7 +348,7 @@ public class ComponentTreeTransferHandler extends TransferHandler {
int correctInsertIndex = model.getIndexOfChild(correctInsertPath.getLastPathComponent(), int correctInsertIndex = model.getIndexOfChild(correctInsertPath.getLastPathComponent(),
dropPath.getLastPathComponent()) + 1; 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 + "converted path=" + ComponentTreeModel.pathToString(originalPath) + " index=" + originalIndex +
" into path=" + ComponentTreeModel.pathToString(correctInsertPath) + " into path=" + ComponentTreeModel.pathToString(correctInsertPath) +
" index=" + correctInsertIndex); " index=" + correctInsertIndex);

2
core/src/net/sf/openrocket/optimization/rocketoptimization/RocketOptimizationFunction.java
View File

@ -117,7 +117,7 @@ public class RocketOptimizationFunction implements Function {
goalValue = Double.MAX_VALUE; 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()), fireEvent(simulation, point, referenceValue, new Value(parameterValue, parameter.getUnitGroup().getDefaultUnit()),
goalValue); goalValue);

2
core/src/net/sf/openrocket/optimization/rocketoptimization/modifiers/GenericModifier.java
View File

@ -84,7 +84,7 @@ public abstract class GenericModifier<T> extends AbstractSimulationModifier {
throw new OptimizationException("BUG: getModifiedObject() returned null"); throw new OptimizationException("BUG: getModifiedObject() returned null");
} }
double siValue = toBaseValue(scaledValue) / multiplier; 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); setter.invoke(modifiable, siValue);
} }

8
core/src/net/sf/openrocket/rocketcomponent/Rocket.java
View File

@ -353,14 +353,14 @@ public class Rocket extends RocketComponent {
public void addComponentChangeListener(ComponentChangeListener l) { public void addComponentChangeListener(ComponentChangeListener l) {
checkState(); checkState();
listenerList.add(l); 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()); listenerList.size());
} }
@Override @Override
public void removeComponentChangeListener(ComponentChangeListener l) { public void removeComponentChangeListener(ComponentChangeListener l) {
listenerList.remove(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()); listenerList.size());
} }
@ -369,14 +369,14 @@ public class Rocket extends RocketComponent {
public void addChangeListener(EventListener l) { public void addChangeListener(EventListener l) {
checkState(); checkState();
listenerList.add(l); 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()); listenerList.size());
} }
@Override @Override
public void removeChangeListener(EventListener l) { public void removeChangeListener(EventListener l) {
listenerList.remove(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()); listenerList.size());
} }

4
core/src/net/sf/openrocket/simulation/BasicEventSimulationEngine.java
View File

@ -85,7 +85,7 @@ public class BasicEventSimulationEngine implements SimulationEngine {
if (nextEvent != null) { if (nextEvent != null) {
maxStepTime = MathUtil.max(nextEvent.getTime() - status.getSimulationTime(), 0.001); 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); currentStepper.step(status, maxStepTime);
} }
SimulationListenerHelper.firePostStep(status); SimulationListenerHelper.firePostStep(status);
@ -318,7 +318,7 @@ public class BasicEventSimulationEngine implements SimulationEngine {
} }
if (event.getType() != FlightEvent.Type.ALTITUDE) { if (event.getType() != FlightEvent.Type.ALTITUDE) {
log.verbose("BasicEventSimulationEngine: Handling event " + event); log.trace("BasicEventSimulationEngine: Handling event " + event);
} }
if (event.getType() == FlightEvent.Type.IGNITION) { if (event.getType() == FlightEvent.Type.IGNITION) {

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

@ -163,11 +163,11 @@ public class RK4SimulationStepper extends AbstractSimulationStepper {
double minTimeStep = status.getSimulationConditions().getTimeStep() / 20; double minTimeStep = status.getSimulationConditions().getTimeStep() / 20;
if (store.timestep < minTimeStep) { 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."); minTimeStep + " instead.");
store.timestep = minTimeStep; store.timestep = minTimeStep;
} else { } else {
log.verbose("Selected time step " + store.timestep + " (limiting factor " + limitingValue + ")"); log.trace("Selected time step " + store.timestep + " (limiting factor " + limitingValue + ")");
} }
checkNaN(store.timestep); checkNaN(store.timestep);
@ -191,7 +191,7 @@ public class RK4SimulationStepper extends AbstractSimulationStepper {
", recomputing k1 parameters"); ", recomputing k1 parameters");
k1 = computeParameters(status, store); k1 = computeParameters(status, store);
} else { } 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) + "%," + (Math.rint(1000 * (thrustDiff + 0.000001) / thrustEstimate) / 10.0) + "%," +
" estimate=" + thrustEstimate + " estimate=" + thrustEstimate +
" correct=" + store.thrustForce + " correct=" + store.thrustForce +