1 files changed, 18 insertions, 15 deletions

diff --git a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.mocked.devices/src/main/java/org/eclipse/om2m/sdt/home/mocked/modules/MockedTemperature.java b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.mocked.devices/src/main/java/org/eclipse/om2m/sdt/home/mocked/modules/MockedTemperature.java
index 8af969bf..f223d1b9 100644
--- a/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.mocked.devices/src/main/java/org/eclipse/om2m/sdt/home/mocked/modules/MockedTemperature.java
+++ b/org.eclipse.om2m.sdt/org.eclipse.om2m.sdt.home.mocked.devices/src/main/java/org/eclipse/om2m/sdt/home/mocked/modules/MockedTemperature.java
@@ -7,8 +7,6 @@
  *******************************************************************************/
 package org.eclipse.om2m.sdt.home.mocked.modules;
 
-import java.nio.charset.Charset;
-
 import org.eclipse.om2m.sdt.Domain;
 import org.eclipse.om2m.sdt.datapoints.FloatDataPoint;
 import org.eclipse.om2m.sdt.datapoints.StringDataPoint;
@@ -19,21 +17,26 @@ import org.eclipse.om2m.sdt.home.types.DatapointType;
 public class MockedTemperature extends Temperature {
 
 	public MockedTemperature(String name, Domain domain, FloatDataPoint currentTemperature) {
+		this(name, domain, true, currentTemperature);
+	}
+
+	public MockedTemperature(String name, Domain domain, final boolean b, FloatDataPoint currentTemperature) {
 		super(name, domain, currentTemperature);
 		
-		setStepValue(new FloatDataPoint(DatapointType.stepValue) {
-			@Override
-			public Float doGetValue() throws DataPointException {
-				return (float) 1;
-			}
-		});
-		
-		setUnit(new StringDataPoint(DatapointType.unit) {
-			@Override
-			protected String doGetValue() throws DataPointException {
-				return "°C";
-			}
-		});
+		if (b) {
+			setStepValue(new FloatDataPoint(DatapointType.stepValue) {
+				@Override
+				public Float doGetValue() throws DataPointException {
+					return null;//(float) 1;
+				}
+			});
+			setUnit(new StringDataPoint(DatapointType.unit) {
+				@Override
+				protected String doGetValue() throws DataPointException {
+					return null;// "°C";
+				}
+			});
+		}
 	}
 
 }