1 files changed, 10 insertions, 38 deletions

diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/types/MachineState.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/types/MachineState.java
index 1a6e35b3..0bfe22e9 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/types/MachineState.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home/src/main/java/org/eclipse/om2m/sdt/home/types/MachineState.java
@@ -7,49 +7,21 @@
  *******************************************************************************/
 package org.eclipse.om2m.sdt.home.types;
 
-import java.util.Arrays;
-import java.util.List;
-
-import org.eclipse.om2m.sdt.Identifiers;
-import org.eclipse.om2m.sdt.datapoints.ClonedEnum;
 import org.eclipse.om2m.sdt.datapoints.EnumDataPoint;
 
-public class MachineState extends ClonedEnum {
+public abstract class MachineState extends EnumDataPoint<MachineState.Values> {
 	
-//	1	idle	Machine is ready to operate
-//	2	active	Machine is operating its functions
-//	3	reserved	Reservation is made by user
-//	4	paused	Operation is paused by user
-//	5	cancelled	Operation is cancelled by user
-//	6	stopped	Operation is stopped/aborted by some other reasons
-//	7	complete	Operation is complete
-//	8	error	Error has occurred 
-//	9	diagnostic	Machine reports diagnostic information to the server
-//	10	test	Particular functions run for test
-
-	static public final int idle 		= 1;
-	static public final int active		= 2;
-	static public final int reserved 	= 3;
-	static public final int paused	 	= 4;
-	static public final int cancelled 	= 5;
-	static public final int stopped 	= 6;
-	static public final int complete	= 7;
-	static public final int error		= 8;
-	static public final int diagnostic	= 9;
-	static public final int test 		= 10;
+	static public enum Values {
+		idle, preActive, active, reserved, stopped, error, diagnostic, test, maintenance, clear, charging
+	}
 	
-	static private List<Integer> values = Arrays.asList(
-			idle, active, reserved, paused, cancelled, 
-			stopped, complete, error, diagnostic, test
-	);
-
-	public MachineState(EnumDataPoint<Integer> dp) {
-		this(DatapointType.currentMachineState, dp);
+	public MachineState() {
+		this(DatapointType.currentMachineState);
 	}
-
-	public MachineState(Identifiers name, EnumDataPoint<Integer> dp) {
-		super(name, HomeDataType.MachineState, dp);
-		setValidValues(values);
+	
+	public MachineState(DatapointType dt) {
+		super(dt, HomeDataType.MachineState);
+		setValidValues(Values.values());
 	}
 
 }