From 1afb98c715ecfc1661e1b5bd31651b5d1ee13cc6 Mon Sep 17 00:00:00 2001 From: Bill Kuker Date: Mon, 23 Jan 2012 19:46:38 +0000 Subject: [PATCH] Use shared colors --- .../motorsim/visual/openRocket/RocketSimTable.java | 5 ++--- .../rocketry/motorsim/visual/SummaryPanel.java | 11 +++++------ 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/gpl/com/billkuker/rocketry/motorsim/visual/openRocket/RocketSimTable.java b/gpl/com/billkuker/rocketry/motorsim/visual/openRocket/RocketSimTable.java index 0eb73d5..b267a46 100644 --- a/gpl/com/billkuker/rocketry/motorsim/visual/openRocket/RocketSimTable.java +++ b/gpl/com/billkuker/rocketry/motorsim/visual/openRocket/RocketSimTable.java @@ -37,6 +37,7 @@ import net.sf.openrocket.unit.UnitGroup; import org.jscience.physics.amount.Amount; import com.billkuker.rocketry.motorsim.Burn; +import com.billkuker.rocketry.motorsim.Colors; import com.billkuker.rocketry.motorsim.Motor; import com.billkuker.rocketry.motorsim.RocketScience; import com.billkuker.rocketry.motorsim.RocketScience.UnitPreference; @@ -46,8 +47,6 @@ public class RocketSimTable extends JPanel implements BurnWatcher, RocketScience.UnitPreferenceListener { static final long serialVersionUID = 1L; - private static final Color RED = new Color(196, 0, 0); - static { Application.setBaseTranslator(new ResourceBundleTranslator( "l10n.messages")); @@ -162,7 +161,7 @@ public class RocketSimTable extends JPanel implements BurnWatcher, isSelected, hasFocus, row, column); Entry e = entries.get(row); if (e.ready && e.s.getSimulatedWarnings().size() > 0) { - c.setBackground(RED); + c.setBackground(Colors.RED); c.setForeground(Color.WHITE); StringBuilder sb = new StringBuilder(); sb.append(""); diff --git a/gui/com/billkuker/rocketry/motorsim/visual/SummaryPanel.java b/gui/com/billkuker/rocketry/motorsim/visual/SummaryPanel.java index b78d217..24a9c9d 100644 --- a/gui/com/billkuker/rocketry/motorsim/visual/SummaryPanel.java +++ b/gui/com/billkuker/rocketry/motorsim/visual/SummaryPanel.java @@ -16,13 +16,12 @@ import org.jscience.physics.amount.Amount; import com.billkuker.rocketry.motorsim.Burn; import com.billkuker.rocketry.motorsim.BurnSummary; +import com.billkuker.rocketry.motorsim.Colors; import com.billkuker.rocketry.motorsim.RocketScience; public class SummaryPanel extends JPanel implements Burn.BurnProgressListener, RocketScience.UnitPreferenceListener { private static final long serialVersionUID = 1L; - private static final Color RED = new Color(196, 0, 0); - private static final Color GREEN = new Color(0, 196, 0); - private static final Color ORANGE = new Color(160, 96, 0); + private final Burn burn; private final JProgressBar bar = new JProgressBar(); private BurnSummary bs; @@ -100,11 +99,11 @@ public class SummaryPanel extends JPanel implements Burn.BurnProgressListener, R } else { double d = bi.getSaftyFactor(); if (d >= 1.5) { - saftyColor = GREEN; + saftyColor = Colors.GREEN; } else if (d > 1) { - saftyColor = ORANGE; + saftyColor = Colors.ORANGE; } else { - saftyColor = RED; + saftyColor = Colors.RED; } JLabel l = new JLabel(new DecimalFormat("##########.##") .format(bi.getSaftyFactor())); -- 2.39.2