Removed use of java.awt.Color from RocketComponent, OpenRocketLoader. The class...

git-svn-id: https://openrocket.svn.sourceforge.net/svnroot/openrocket/trunk@232 180e2498-e6e9-4542-8430-84ac67f01cd8

diff --git a/src/net/sf/openrocket/file/openrocket/OpenRocketLoader.java b/src/net/sf/openrocket/file/openrocket/OpenRocketLoader.java
index 73f43e500bed1fdb88d48ab98dce4b9d70e04e1a..26400c0bc11cb0e198d6db2cc2a5bc18b4e288b2 100644 (file)
--- a/src/net/sf/openrocket/file/openrocket/OpenRocketLoader.java
+++ b/src/net/sf/openrocket/file/openrocket/OpenRocketLoader.java
@@ -1,6 +1,5 @@
 package net.sf.openrocket.file.openrocket;
 
-import java.awt.Color;
 import java.io.IOException;
 import java.io.InputStream;
 import java.lang.reflect.Constructor;
@@ -73,6 +72,7 @@ import net.sf.openrocket.simulation.SimulationOptions;
 import net.sf.openrocket.startup.Application;
 import net.sf.openrocket.unit.UnitGroup;
 import net.sf.openrocket.util.BugException;
+import net.sf.openrocket.util.Color;
 import net.sf.openrocket.util.Coordinate;
 import net.sf.openrocket.util.GeodeticComputationStrategy;
 import net.sf.openrocket.util.LineStyle;

diff --git a/src/net/sf/openrocket/file/openrocket/savers/RocketComponentSaver.java b/src/net/sf/openrocket/file/openrocket/savers/RocketComponentSaver.java
index ab0a00380354816c3bf577f1d1cd726ef65c01b1..44e71e4b9e8dd638409cf99d3437667905e30042 100644 (file)
--- a/src/net/sf/openrocket/file/openrocket/savers/RocketComponentSaver.java
+++ b/src/net/sf/openrocket/file/openrocket/savers/RocketComponentSaver.java
@@ -1,6 +1,5 @@
 package net.sf.openrocket.file.openrocket.savers;
 
-import java.awt.Color;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -15,6 +14,7 @@ import net.sf.openrocket.rocketcomponent.MotorMount;
 import net.sf.openrocket.rocketcomponent.Rocket;
 import net.sf.openrocket.rocketcomponent.RocketComponent;
 import net.sf.openrocket.util.BugException;
+import net.sf.openrocket.util.Color;
 import net.sf.openrocket.util.LineStyle;
 
 

diff --git a/src/net/sf/openrocket/gui/configdialog/RocketComponentConfig.java b/src/net/sf/openrocket/gui/configdialog/RocketComponentConfig.java
index f4dfa8ba63a43f72eabe37f4e119d882c8eac970..95853b0246602b28cf8708123bbd2a2711e0773c 100644 (file)
--- a/src/net/sf/openrocket/gui/configdialog/RocketComponentConfig.java
+++ b/src/net/sf/openrocket/gui/configdialog/RocketComponentConfig.java
@@ -35,6 +35,7 @@ import net.sf.openrocket.gui.components.ColorIcon;
 import net.sf.openrocket.gui.components.StyledLabel;
 import net.sf.openrocket.gui.components.StyledLabel.Style;
 import net.sf.openrocket.gui.components.UnitSelector;
+import net.sf.openrocket.gui.util.ColorConversion;
 import net.sf.openrocket.gui.util.GUIUtil;
 import net.sf.openrocket.gui.util.SwingPreferences;
 import net.sf.openrocket.l10n.Translator;
@@ -377,13 +378,15 @@ public class RocketComponentConfig extends JPanel {
                colorButton.addActionListener(new ActionListener() {
                        @Override
                        public void actionPerformed(ActionEvent e) {
-                               Color c = component.getColor();
+                               net.sf.openrocket.util.Color c = component.getColor();
                                if (c == null) {
-                                       c = ((SwingPreferences) Application.getPreferences()).getDefaultColor(component.getClass());
+                                       c = Application.getPreferences().getDefaultColor(component.getClass());
                                }
                                
                                //// Choose color
-                               c = JColorChooser.showDialog(tabbedPane, trans.get("RocketCompCfg.lbl.Choosecolor"), c);
+                               Color awtColor = ColorConversion.toAwtColor(c); 
+                               awtColor = JColorChooser.showDialog(tabbedPane, trans.get("RocketCompCfg.lbl.Choosecolor"), awtColor);
+                               c = ColorConversion.fromAwtColor(awtColor);
                                if (c != null) {
                                        component.setColor(c);
                                }
@@ -439,11 +442,11 @@ public class RocketComponentConfig extends JPanel {
        
        
        private Color getColor() {
-               Color c = component.getColor();
+               net.sf.openrocket.util.Color c = component.getColor();
                if (c == null) {
-                       c = ((SwingPreferences) Application.getPreferences()).getDefaultColor(component.getClass());
+                       c = Application.getPreferences().getDefaultColor(component.getClass());
                }
-               return c;
+               return ColorConversion.toAwtColor(c);
        }
        
        

diff --git a/src/net/sf/openrocket/gui/scalefigure/RocketFigure.java b/src/net/sf/openrocket/gui/scalefigure/RocketFigure.java
index 62b6ded5de5832bcb28818ea9f1de4489fba1172..8045f4541f8b9e5299cf4f7a09b92664537ff4fb 100644 (file)
--- a/src/net/sf/openrocket/gui/scalefigure/RocketFigure.java
+++ b/src/net/sf/openrocket/gui/scalefigure/RocketFigure.java
@@ -21,6 +21,7 @@ import java.util.LinkedHashSet;
 
 import net.sf.openrocket.gui.figureelements.FigureElement;
 import net.sf.openrocket.gui.main.ExceptionHandler;
+import net.sf.openrocket.gui.util.ColorConversion;
 import net.sf.openrocket.gui.util.SwingPreferences;
 import net.sf.openrocket.motor.Motor;
 import net.sf.openrocket.rocketcomponent.Configuration;
@@ -310,11 +311,11 @@ public class RocketFigure extends AbstractScaleFigure {
                        }
                        
                        // Set component color and line style
-                       Color color = c.getColor();
+                       net.sf.openrocket.util.Color color = c.getColor();
                        if (color == null) {
-                               color = ((SwingPreferences) Application.getPreferences()).getDefaultColor(c.getClass());
+                               color = Application.getPreferences().getDefaultColor(c.getClass());
                        }
-                       g2.setColor(color);
+                       g2.setColor(ColorConversion.toAwtColor(color));
                        
                        LineStyle style = c.getLineStyle();
                        if (style == null)

diff --git a/src/net/sf/openrocket/gui/util/SwingPreferences.java b/src/net/sf/openrocket/gui/util/SwingPreferences.java
index 951ce919b04f49f3ce6bd9ac26f982fa3eb89bf9..c1847a18599eb9a7281de91cae86c59a3083f69b 100644 (file)
--- a/src/net/sf/openrocket/gui/util/SwingPreferences.java
+++ b/src/net/sf/openrocket/gui/util/SwingPreferences.java
@@ -89,17 +89,6 @@ public class SwingPreferences extends net.sf.openrocket.startup.Preferences {
        }
        
 
-       private static final HashMap<Class<?>, String> DEFAULT_COLORS =
-                       new HashMap<Class<?>, String>();
-       static {
-               DEFAULT_COLORS.put(BodyComponent.class, "0,0,240");
-               DEFAULT_COLORS.put(FinSet.class, "0,0,200");
-               DEFAULT_COLORS.put(LaunchLug.class, "0,0,180");
-               DEFAULT_COLORS.put(InternalComponent.class, "170,0,100");
-               DEFAULT_COLORS.put(MassObject.class, "0,0,0");
-               DEFAULT_COLORS.put(RecoveryDevice.class, "255,0,0");
-       }
-       
 
        
        //////////////////////
@@ -315,25 +304,6 @@ public class SwingPreferences extends net.sf.openrocket.startup.Preferences {
                return new Color(0, 0, 0, 100);
        }
        
-       public Color getDefaultColor(Class<? extends RocketComponent> c) {
-               String color = get("componentColors", c, DEFAULT_COLORS);
-               if (color == null)
-                       return Color.BLACK;
-               
-               net.sf.openrocket.util.Color clr = parseColor(color);
-               if (clr != null) {
-                       return ColorConversion.toAwtColor(clr);
-               } else {
-                       return Color.BLACK;
-               }
-       }
-       
-       public final void setDefaultColor(Class<? extends RocketComponent> c, Color color) {
-               if (color == null)
-                       return;
-               putString("componentColors", c.getSimpleName(), stringifyColor(ColorConversion.fromAwtColor(color)));
-       }
-
        
        
        public static int getMaxThreadCount() {

diff --git a/src/net/sf/openrocket/rocketcomponent/RocketComponent.java b/src/net/sf/openrocket/rocketcomponent/RocketComponent.java
index fee3593f40d394e761c4631183869e88832d274f..a5c8c66a2bc101f35f0d2f06179fcf273b4ce08b 100644 (file)
--- a/src/net/sf/openrocket/rocketcomponent/RocketComponent.java
+++ b/src/net/sf/openrocket/rocketcomponent/RocketComponent.java
@@ -1,6 +1,5 @@
 package net.sf.openrocket.rocketcomponent;
 
-import java.awt.Color;
 import java.util.ArrayDeque;
 import java.util.Collection;
 import java.util.Deque;
@@ -16,6 +15,7 @@ import net.sf.openrocket.startup.Application;
 import net.sf.openrocket.util.ArrayList;
 import net.sf.openrocket.util.BugException;
 import net.sf.openrocket.util.ChangeSource;
+import net.sf.openrocket.util.Color;
 import net.sf.openrocket.util.Coordinate;
 import net.sf.openrocket.util.Invalidator;
 import net.sf.openrocket.util.LineStyle;

diff --git a/src/net/sf/openrocket/startup/Preferences.java b/src/net/sf/openrocket/startup/Preferences.java
index 77b13f41036d167dd3b777549fd86ed62fdd9971..e728d396f0c0f405bef140319b165945714c260c 100644 (file)
--- a/src/net/sf/openrocket/startup/Preferences.java
+++ b/src/net/sf/openrocket/startup/Preferences.java
@@ -6,7 +6,12 @@ import java.util.Map;
 import net.sf.openrocket.database.Databases;\r
 import net.sf.openrocket.l10n.Translator;\r
 import net.sf.openrocket.material.Material;\r
+import net.sf.openrocket.rocketcomponent.BodyComponent;\r
+import net.sf.openrocket.rocketcomponent.FinSet;\r
+import net.sf.openrocket.rocketcomponent.InternalComponent;\r
+import net.sf.openrocket.rocketcomponent.LaunchLug;\r
 import net.sf.openrocket.rocketcomponent.MassObject;\r
+import net.sf.openrocket.rocketcomponent.RecoveryDevice;\r
 import net.sf.openrocket.rocketcomponent.RocketComponent;\r
 import net.sf.openrocket.util.BugException;\r
 import net.sf.openrocket.util.BuildProperties;\r
@@ -168,6 +173,26 @@ public abstract class Preferences {
                }\r
        }\r
 \r
+       public Color getDefaultColor(Class<? extends RocketComponent> c) {\r
+               String color = get("componentColors", c, DEFAULT_COLORS);\r
+               if (color == null)\r
+                       return Color.BLACK;\r
+               \r
+               Color clr = parseColor(color);\r
+               if (clr != null) {\r
+                       return clr;\r
+               } else {\r
+                       return Color.BLACK;\r
+               }\r
+       }\r
+       \r
+       public final void setDefaultColor(Class<? extends RocketComponent> c, Color color) {\r
+               if (color == null)\r
+                       return;\r
+               putString("componentColors", c.getSimpleName(), stringifyColor(color));\r
+       }\r
+\r
+\r
        /**\r
         * Retrieve a Line style for the given component.\r
         * @param c\r
@@ -361,6 +386,17 @@ public abstract class Preferences {
                                Databases.findMaterial(Material.Type.BULK, trans.get("Databases.materials.Cardboard"), 680, false);\r
        }\r
        \r
+       private static final HashMap<Class<?>, String> DEFAULT_COLORS =\r
+                       new HashMap<Class<?>, String>();\r
+       static {\r
+               DEFAULT_COLORS.put(BodyComponent.class, "0,0,240");\r
+               DEFAULT_COLORS.put(FinSet.class, "0,0,200");\r
+               DEFAULT_COLORS.put(LaunchLug.class, "0,0,180");\r
+               DEFAULT_COLORS.put(InternalComponent.class, "170,0,100");\r
+               DEFAULT_COLORS.put(MassObject.class, "0,0,0");\r
+               DEFAULT_COLORS.put(RecoveryDevice.class, "255,0,0");\r
+       }\r
+       \r
 \r
 \r
 }\r

diff --git a/src/net/sf/openrocket/util/TestRockets.java b/src/net/sf/openrocket/util/TestRockets.java
index 467d19dfbbd984e86885f2071aebc3505693717c..0dfc56291ded7ae1f940ab9a243f35e1d537115f 100644 (file)
--- a/src/net/sf/openrocket/util/TestRockets.java
+++ b/src/net/sf/openrocket/util/TestRockets.java
@@ -1,6 +1,5 @@
 package net.sf.openrocket.util;
 
-import java.awt.Color;
 import java.util.Random;
 
 import net.sf.openrocket.material.Material;

diff --git a/test/net/sf/openrocket/rocketcomponent/ComponentCompareTest.java b/test/net/sf/openrocket/rocketcomponent/ComponentCompareTest.java
index 11acf71aedeab5bf0f14378ea94d7efd2387e479..46c8f21d2f7f93ac1e892f7c5fc3a82bcf0bfb3e 100644 (file)
--- a/test/net/sf/openrocket/rocketcomponent/ComponentCompareTest.java
+++ b/test/net/sf/openrocket/rocketcomponent/ComponentCompareTest.java
@@ -5,6 +5,7 @@ import static org.junit.Assert.*;
 import java.awt.Color;
 import java.util.Iterator;
 
+import net.sf.openrocket.gui.util.ColorConversion;
 import net.sf.openrocket.util.Coordinate;
 
 import org.junit.Test;
@@ -37,7 +38,7 @@ public class ComponentCompareTest {
                ComponentCompare.assertDeepSimilarity(r1, r2, false);
                
                
-               r1.setColor(Color.YELLOW);
+               r1.setColor(ColorConversion.fromAwtColor(Color.YELLOW));
                try {
                        ComponentCompare.assertEquality(r1, r2);
                        fail();

diff --git a/test/net/sf/openrocket/rocketcomponent/FinSetTest.java b/test/net/sf/openrocket/rocketcomponent/FinSetTest.java
index 3e1a8d61ca9b989eb172a6057c60565c8fee6330..abec65ceecd216f1da0179315b22338bdc0b5050 100644 (file)
--- a/test/net/sf/openrocket/rocketcomponent/FinSetTest.java
+++ b/test/net/sf/openrocket/rocketcomponent/FinSetTest.java
@@ -6,6 +6,7 @@ import static org.junit.Assert.assertTrue;
 
 import java.awt.Color;
 
+import net.sf.openrocket.gui.util.ColorConversion;
 import net.sf.openrocket.material.Material;
 import net.sf.openrocket.material.Material.Type;
 import net.sf.openrocket.rocketcomponent.ExternalComponent.Finish;
@@ -35,7 +36,7 @@ public class FinSetTest extends BaseTestCase {
                fin.setBaseRotation(1.1);
                fin.setCantAngle(0.001);
                fin.setCGOverridden(true);
-               fin.setColor(Color.YELLOW);
+               fin.setColor(ColorConversion.fromAwtColor(Color.YELLOW));
                fin.setComment("cmt");
                fin.setCrossSection(CrossSection.ROUNDED);
                fin.setFinCount(5);