Fixed the ServiceProfiles of the full-code templates in versions 2.0.0 and...

Fixed the ServiceProfiles of the full-code templates in versions 2.0.0 and above (NPE when registering them)

wizard/org.universaal.tools.wizardplugin/files/2.0.0/templates/actuator/SCalleeProvidedService.java

@@ -67,7 +67,7 @@ public class SCalleeProvidedService extends DeviceService {
 		MergedRestriction r = MergedRestriction.getFixedValueRestriction(
 				DeviceService.PROP_CONTROLS, new SwitchController(
 						CPublisher.DEVICE_OWN_URI));
-		profiles[0].getTheService().addInstanceLevelRestriction(r,
+		getOnOffActuatorStatus.addInstanceLevelRestriction(r,
 				new String[] { DeviceService.PROP_CONTROLS });
 		profiles[0] = getOnOffActuatorStatus.getProfile();
 
@@ -81,7 +81,7 @@ public class SCalleeProvidedService extends DeviceService {
 				TypeMapper.getDatatypeURI(Boolean.class), 1, 1, new String[] {
 						DeviceService.PROP_CONTROLS,
 						SwitchController.PROP_HAS_VALUE });
-		profiles[1].getTheService().addInstanceLevelRestriction(r,
+		setOnOffActuatorStatus.addInstanceLevelRestriction(r,
 			new String[] { DeviceService.PROP_CONTROLS });
 		profiles[1] = setOnOffActuatorStatus.getProfile();
 
@@ -90,5 +90,9 @@ public class SCalleeProvidedService extends DeviceService {
 	protected SCalleeProvidedService(String uri) {
 		super(uri);
 	}
+	
+        public String getClassURI() {
+    		return MY_URI;
+        }
 
 }

wizard/org.universaal.tools.wizardplugin/files/2.0.0/templates/full/SCalleeProvidedService.java

@@ -70,7 +70,7 @@ public class SCalleeProvidedService extends DeviceService {
 		MergedRestriction r = MergedRestriction.getFixedValueRestriction(
 				DeviceService.PROP_CONTROLS, new SwitchController(
 						CPublisher.DEVICE_OWN_URI));
-		profiles[0].getTheService().addInstanceLevelRestriction(r,
+		getOnOffActuatorStatus.addInstanceLevelRestriction(r,
 				new String[] { DeviceService.PROP_CONTROLS });
 		profiles[0] = getOnOffActuatorStatus.getProfile();
 
@@ -84,7 +84,7 @@ public class SCalleeProvidedService extends DeviceService {
 				TypeMapper.getDatatypeURI(Boolean.class), 1, 1, new String[] {
 						DeviceService.PROP_CONTROLS,
 						SwitchController.PROP_HAS_VALUE });
-		profiles[1].getTheService().addInstanceLevelRestriction(r,
+		setOnOffActuatorStatus.addInstanceLevelRestriction(r,
 			new String[] { DeviceService.PROP_CONTROLS });
 		profiles[1] = setOnOffActuatorStatus.getProfile();
 
@@ -98,5 +98,9 @@ public class SCalleeProvidedService extends DeviceService {
 	protected SCalleeProvidedService(String uri) {
 		super(uri);
 	}
+	
+        public String getClassURI() {
+    		return MY_URI;
+        }
 
 }

wizard/org.universaal.tools.wizardplugin/files/2.0.0/templates/nogui/SCalleeProvidedService.java

@@ -67,7 +67,7 @@ public class SCalleeProvidedService extends DeviceService {
 		MergedRestriction r = MergedRestriction.getFixedValueRestriction(
 				DeviceService.PROP_CONTROLS, new SwitchController(
 						CPublisher.DEVICE_OWN_URI));
-		profiles[0].getTheService().addInstanceLevelRestriction(r,
+		getOnOffActuatorStatus.addInstanceLevelRestriction(r,
 				new String[] { DeviceService.PROP_CONTROLS });
 		profiles[0] = getOnOffActuatorStatus.getProfile();
 
@@ -81,7 +81,7 @@ public class SCalleeProvidedService extends DeviceService {
 				TypeMapper.getDatatypeURI(Boolean.class), 1, 1, new String[] {
 						DeviceService.PROP_CONTROLS,
 						SwitchController.PROP_HAS_VALUE });
-		profiles[1].getTheService().addInstanceLevelRestriction(r,
+		setOnOffActuatorStatus.addInstanceLevelRestriction(r,
 			new String[] { DeviceService.PROP_CONTROLS });
 		profiles[1] = setOnOffActuatorStatus.getProfile();
 
@@ -90,5 +90,9 @@ public class SCalleeProvidedService extends DeviceService {
 	protected SCalleeProvidedService(String uri) {
 		super(uri);
 	}
+	
+        public String getClassURI() {
+    		return MY_URI;
+        }
 
 }

wizard/org.universaal.tools.wizardplugin/files/3.0.0/templates/actuator/SCalleeProvidedService.java

@@ -67,7 +67,7 @@ public class SCalleeProvidedService extends DeviceService {
 		MergedRestriction r = MergedRestriction.getFixedValueRestriction(
 				DeviceService.PROP_CONTROLS, new SwitchController(
 						CPublisher.DEVICE_OWN_URI));
-		profiles[0].getTheService().addInstanceLevelRestriction(r,
+		getOnOffActuatorStatus.addInstanceLevelRestriction(r,
 				new String[] { DeviceService.PROP_CONTROLS });
 		profiles[0] = getOnOffActuatorStatus.getProfile();
 
@@ -81,7 +81,7 @@ public class SCalleeProvidedService extends DeviceService {
 				TypeMapper.getDatatypeURI(Boolean.class), 1, 1, new String[] {
 						DeviceService.PROP_CONTROLS,
 						SwitchController.PROP_HAS_VALUE });
-		profiles[1].getTheService().addInstanceLevelRestriction(r,
+		setOnOffActuatorStatus.addInstanceLevelRestriction(r,
 			new String[] { DeviceService.PROP_CONTROLS });
 		profiles[1] = setOnOffActuatorStatus.getProfile();
 
@@ -90,5 +90,9 @@ public class SCalleeProvidedService extends DeviceService {
 	protected SCalleeProvidedService(String uri) {
 		super(uri);
 	}
+	
+        public String getClassURI() {
+    		return MY_URI;
+        }
 
 }

wizard/org.universaal.tools.wizardplugin/files/3.0.0/templates/full/SCalleeProvidedService.java

@@ -70,7 +70,7 @@ public class SCalleeProvidedService extends DeviceService {
 		MergedRestriction r = MergedRestriction.getFixedValueRestriction(
 				DeviceService.PROP_CONTROLS, new SwitchController(
 						CPublisher.DEVICE_OWN_URI));
-		profiles[0].getTheService().addInstanceLevelRestriction(r,
+		getOnOffActuatorStatus.addInstanceLevelRestriction(r,
 				new String[] { DeviceService.PROP_CONTROLS });
 		profiles[0] = getOnOffActuatorStatus.getProfile();
 
@@ -84,7 +84,7 @@ public class SCalleeProvidedService extends DeviceService {
 				TypeMapper.getDatatypeURI(Boolean.class), 1, 1, new String[] {
 						DeviceService.PROP_CONTROLS,
 						SwitchController.PROP_HAS_VALUE });
-		profiles[1].getTheService().addInstanceLevelRestriction(r,
+		setOnOffActuatorStatus.addInstanceLevelRestriction(r,
 			new String[] { DeviceService.PROP_CONTROLS });
 		profiles[1] = setOnOffActuatorStatus.getProfile();
 
@@ -98,5 +98,9 @@ public class SCalleeProvidedService extends DeviceService {
 	protected SCalleeProvidedService(String uri) {
 		super(uri);
 	}
+	
+        public String getClassURI() {
+    		return MY_URI;
+        }
 
 }

wizard/org.universaal.tools.wizardplugin/files/3.0.0/templates/nogui/SCalleeProvidedService.java

@@ -67,7 +67,7 @@ public class SCalleeProvidedService extends DeviceService {
 		MergedRestriction r = MergedRestriction.getFixedValueRestriction(
 				DeviceService.PROP_CONTROLS, new SwitchController(
 						CPublisher.DEVICE_OWN_URI));
-		profiles[0].getTheService().addInstanceLevelRestriction(r,
+		getOnOffActuatorStatus.addInstanceLevelRestriction(r,
 				new String[] { DeviceService.PROP_CONTROLS });
 		profiles[0] = getOnOffActuatorStatus.getProfile();
 
@@ -81,7 +81,7 @@ public class SCalleeProvidedService extends DeviceService {
 				TypeMapper.getDatatypeURI(Boolean.class), 1, 1, new String[] {
 						DeviceService.PROP_CONTROLS,
 						SwitchController.PROP_HAS_VALUE });
-		profiles[1].getTheService().addInstanceLevelRestriction(r,
+		setOnOffActuatorStatus.addInstanceLevelRestriction(r,
 			new String[] { DeviceService.PROP_CONTROLS });
 		profiles[1] = setOnOffActuatorStatus.getProfile();
 
@@ -90,5 +90,9 @@ public class SCalleeProvidedService extends DeviceService {
 	protected SCalleeProvidedService(String uri) {
 		super(uri);
 	}
+	
+        public String getClassURI() {
+    		return MY_URI;
+        }
 
 }