From f7f3b737d4bf94579b42066b8f0dfd982fe8c97e Mon Sep 17 00:00:00 2001
From: Craig Earls <enderw88@gmail.com>
Date: Fri, 12 Dec 2014 23:32:22 -0700
Subject: [PATCH] Added MassComponentType enum to allow categorizing mass
 components

This is only the data model. MassComponentType added as an Enum.  MassComponentConfig dialog updated to combobox to select.
---
 core/resources/l10n/messages.properties       |  7 ++++
 .../rocketcomponent/MassComponent.java        | 37 +++++++++++++++++++
 .../gui/configdialog/MassComponentConfig.java | 15 ++++++++
 3 files changed, 59 insertions(+)

diff --git a/core/resources/l10n/messages.properties b/core/resources/l10n/messages.properties
index 6f4be16fb..ce9deb0c6 100644
--- a/core/resources/l10n/messages.properties
+++ b/core/resources/l10n/messages.properties
@@ -921,6 +921,7 @@ MassComponentCfg.tab.ttip.Radialpos = Radial position configuration
 MassComponentCfg.lbl.Radialdistance = Radial distance:
 MassComponentCfg.lbl.Radialdirection = Radial direction:
 MassComponentCfg.but.Reset = Reset
+MassComponentCfg.lbl.type = Object type
 
 ! MotorConfig
 MotorCfg.checkbox.compmotormount = This component is a motor mount
@@ -1328,6 +1329,12 @@ TrapezoidFinSet.TrapezoidFinSet = Trapezoidal fin set
 FreeformFinSet.FreeformFinSet = Freeform fin set
 !MassComponent
 MassComponent.MassComponent = Mass component
+MassComponent.Altimeter = Altimeter
+MassComponent.FlightComputer = Flight computer
+MassComponent.DeploymentCharge = Deployment charge
+MassComponent.Tracker = Tracker
+MassComponent.Payload = Payload
+MassComponent.RecoveryHardware = Recovery hardware
 ! Parachute
 Parachute.Parachute = Parachute
 ! ShockCord
diff --git a/core/src/net/sf/openrocket/rocketcomponent/MassComponent.java b/core/src/net/sf/openrocket/rocketcomponent/MassComponent.java
index 81e5a63d8..ef0c11d94 100644
--- a/core/src/net/sf/openrocket/rocketcomponent/MassComponent.java
+++ b/core/src/net/sf/openrocket/rocketcomponent/MassComponent.java
@@ -15,6 +15,28 @@ public class MassComponent extends MassObject {
 	
 	private double mass = 0;
 	
+	public enum MassComponentType {
+		MASSCOMPONENT(Application.getTranslator().get("MassComponent.MassComponent")),
+		ALTIMETER(Application.getTranslator().get("MassComponent.Altimeter")),
+		FLIGHTCOMPUTER(Application.getTranslator().get("MassComponent.FlightComputer")),
+		DEPLOYMENTCHARGE(Application.getTranslator().get("MassComponent.DeploymentCharge")),
+		TRACKER(Application.getTranslator().get("MassComponent.Tracker")),
+		PAYLOAD(Application.getTranslator().get("MassComponent.Payload")),
+		RECOVERYHARDWARE(Application.getTranslator().get("MassComponent.RecoveryHardware"));
+		
+		private String title;
+		
+		MassComponentType(String title) {
+			this.title = title;
+		}
+		
+		@Override
+		public String toString() {
+			return title;
+		}
+	}
+	
+	private MassComponentType massComponentType = MassComponentType.MASSCOMPONENT;
 	
 	public MassComponent() {
 		super();
@@ -67,6 +89,21 @@ public class MassComponent extends MassObject {
 		return trans.get("MassComponent.MassComponent");
 	}
 	
+	public final MassComponent.MassComponentType getMassComponentType() {
+		mutex.verify();
+		return this.massComponentType;
+	}
+	
+	public void setMassComponentType(MassComponent.MassComponentType compType) {
+		mutex.verify();
+		if (this.massComponentType == compType) {
+			return;
+		}
+		checkState();
+		this.massComponentType = compType;
+		fireComponentChangeEvent(ComponentChangeEvent.BOTH_CHANGE);
+	}
+	
 	@Override
 	public boolean allowsChildren() {
 		return false;
diff --git a/swing/src/net/sf/openrocket/gui/configdialog/MassComponentConfig.java b/swing/src/net/sf/openrocket/gui/configdialog/MassComponentConfig.java
index cf70d463f..68cc4b6e0 100644
--- a/swing/src/net/sf/openrocket/gui/configdialog/MassComponentConfig.java
+++ b/swing/src/net/sf/openrocket/gui/configdialog/MassComponentConfig.java
@@ -32,7 +32,21 @@ public class MassComponentConfig extends RocketComponentConfig {
 		
 		JPanel panel = new JPanel(new MigLayout("gap rel unrel", "[][65lp::][30lp::]", ""));
 		
+		//// Mass component type
+		panel.add(new JLabel(trans.get("MassComponentCfg.lbl.type")));
+		@SuppressWarnings("unchecked")
+		JComboBox typecombo = new JComboBox(
+				new EnumModel<MassComponent.MassComponentType>(component, "MassComponentType",
+						new MassComponent.MassComponentType[] {
+								MassComponent.MassComponentType.MASSCOMPONENT,
+								MassComponent.MassComponentType.ALTIMETER,
+								MassComponent.MassComponentType.FLIGHTCOMPUTER,
+								MassComponent.MassComponentType.DEPLOYMENTCHARGE,
+								MassComponent.MassComponentType.TRACKER,
+								MassComponent.MassComponentType.PAYLOAD,
+								MassComponent.MassComponentType.RECOVERYHARDWARE}));
 		
+		panel.add(typecombo, "spanx, growx, wrap");
 		
 		////  Mass
 		panel.add(new JLabel(trans.get("MassComponentCfg.lbl.Mass")));
@@ -116,6 +130,7 @@ public class MassComponentConfig extends RocketComponentConfig {
 				new DoubleModel(component.getParent(), "Length"))),
 				"w 100lp, wrap");
 		
+		
 		//// General and General properties
 		tabbedPane.insertTab(trans.get("MassComponentCfg.tab.General"), null, panel,
 				trans.get("MassComponentCfg.tab.ttip.General"), 0);