Added shared colors class

diff --git a/gui/com/billkuker/rocketry/motorsim/Colors.java b/gui/com/billkuker/rocketry/motorsim/Colors.java
new file mode 100644 (file)
index 0000000..9c0d142
--- /dev/null
+++ b/gui/com/billkuker/rocketry/motorsim/Colors.java
@@ -0,0 +1,11 @@
+package com.billkuker.rocketry.motorsim;\r
+\r
+import java.awt.Color;\r
+\r
+public final class Colors {\r
+       public static final Color RED = new Color(196, 0, 0);\r
+       public static final Color GREEN = new Color(0, 196, 0);\r
+       public static final Color ORANGE = new Color(160, 96, 0);\r
+       \r
+       private Colors(){}\r
+}\r

diff --git a/gui/com/billkuker/rocketry/motorsim/visual/BurnPanel.java b/gui/com/billkuker/rocketry/motorsim/visual/BurnPanel.java
index e586d69522d5ab152dbcf59827d3336164ec74b6..619944641350f28629e76a12cb911dfa6f7cd53b 100644 (file)
--- a/gui/com/billkuker/rocketry/motorsim/visual/BurnPanel.java
+++ b/gui/com/billkuker/rocketry/motorsim/visual/BurnPanel.java
@@ -22,6 +22,7 @@ import org.jscience.physics.amount.Amount;
 \r
 import com.billkuker.rocketry.motorsim.Burn;\r
 import com.billkuker.rocketry.motorsim.BurnSummary;\r
+import com.billkuker.rocketry.motorsim.Colors;\r
 \r
 public class BurnPanel extends JPanel {\r
        private static final long serialVersionUID = 1L;\r
@@ -32,10 +33,6 @@ public class BurnPanel extends JPanel {
        GrainPanel grain;\r
        Amount<Duration> displayedTime = Amount.valueOf(0, SI.SECOND);\r
        \r
-       private static final Color RED = new Color(196, 0, 0);\r
-       private static final Color GREEN = new Color(0, 196, 0);\r
-       private static final Color ORANGE = new Color(160, 96, 0);\r
-       \r
        public BurnPanel(Burn b){\r
                super( new BorderLayout() );\r
                burn = b;\r
@@ -107,11 +104,11 @@ public class BurnPanel extends JPanel {
                                } else {\r
                                        double d = bi.getSaftyFactor();\r
                                        if ( d >= 1.5 ){\r
-                                               saftyColor = GREEN;\r
+                                               saftyColor = Colors.GREEN;\r
                                        } else if ( d > 1 ){\r
-                                               saftyColor = ORANGE;\r
+                                               saftyColor =  Colors.ORANGE;\r
                                        } else {\r
-                                               saftyColor = RED;\r
+                                               saftyColor =  Colors.RED;\r
                                        }\r
                                }\r
                                Amount<Pressure> burst = b.getMotor().getChamber().getBurstPressure();\r
@@ -123,7 +120,7 @@ public class BurnPanel extends JPanel {
                                thrust.addRangeMarker(bi.maxThrust(), "Max", Color.BLACK);\r
                                thrust.addRangeMarker(bi.averageThrust(), "Average", Color.BLACK);\r
                                pressure.addRangeMarker(bi.maxPressure(), "Max", Color.BLACK);\r
-                               burnRate.addDomainMarker(bi.maxPressure(), "Max", RED);\r
+                               burnRate.addDomainMarker(bi.maxPressure(), "Max",  Colors.RED);\r
                                \r
 \r
                        }\r