From: Bill Kuker <bkuker@billkuker.com>
Date: Mon, 8 Nov 2010 12:49:10 +0000 (+0000)
Subject: Added shared colors class
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=a09d8b0f2988cb24f833c80a8096cf088356620d;p=sw%2Fmotorsim

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
index 0000000..9c0d142
--- /dev/null
+++ b/gui/com/billkuker/rocketry/motorsim/Colors.java
@@ -0,0 +1,11 @@
+package com.billkuker.rocketry.motorsim;
+
+import java.awt.Color;
+
+public final class Colors {
+	public static final Color RED = new Color(196, 0, 0);
+	public static final Color GREEN = new Color(0, 196, 0);
+	public static final Color ORANGE = new Color(160, 96, 0);
+	
+	private Colors(){}
+}
diff --git a/gui/com/billkuker/rocketry/motorsim/visual/BurnPanel.java b/gui/com/billkuker/rocketry/motorsim/visual/BurnPanel.java
index e586d69..6199446 100644
--- 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;
 
 import com.billkuker.rocketry.motorsim.Burn;
 import com.billkuker.rocketry.motorsim.BurnSummary;
+import com.billkuker.rocketry.motorsim.Colors;
 
 public class BurnPanel extends JPanel {
 	private static final long serialVersionUID = 1L;
@@ -32,10 +33,6 @@ public class BurnPanel extends JPanel {
 	GrainPanel grain;
 	Amount<Duration> displayedTime = Amount.valueOf(0, SI.SECOND);
 	
-	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);
-	
 	public BurnPanel(Burn b){
 		super( new BorderLayout() );
 		burn = b;
@@ -107,11 +104,11 @@ public class BurnPanel extends JPanel {
 				} 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;
 					}
 				}
 				Amount<Pressure> burst = b.getMotor().getChamber().getBurstPressure();
@@ -123,7 +120,7 @@ public class BurnPanel extends JPanel {
 				thrust.addRangeMarker(bi.maxThrust(), "Max", Color.BLACK);
 				thrust.addRangeMarker(bi.averageThrust(), "Average", Color.BLACK);
 				pressure.addRangeMarker(bi.maxPressure(), "Max", Color.BLACK);
-				burnRate.addDomainMarker(bi.maxPressure(), "Max", RED);
+				burnRate.addDomainMarker(bi.maxPressure(), "Max",  Colors.RED);
 				
 
 			}