Finished coding need to test.

pom.xml

@@ -5,7 +5,7 @@
 
 	<groupId>com.bwssystems.HABridge</groupId>
 	<artifactId>ha-bridge</artifactId>
-	<version>1.0.2</version>
+	<version>1.0.3</version>
 	<packaging>jar</packaging>
 
 	<name>HA Bridge</name>

src/main/java/com/bwssystems/HABridge/BridgeSettings.java

@@ -12,6 +12,7 @@ public class BridgeSettings {
 	private boolean upnpstrict;
 	private boolean traceupnp;
 	private boolean vtwocompatibility;
+	private boolean devmode;
 	
 	public String getUpnpConfigAddress() {
 		return upnpconfigaddress;
@@ -82,6 +83,12 @@ public class BridgeSettings {
 		this.vtwocompatibility = vtwocompatibility;
 	}
 	
+	public boolean isDevMode() {
+		return devmode;
+	}
+	public void setDevMode(boolean devmode) {
+		this.devmode = devmode;
+	}
 	public Boolean isValidVera() {
 		if(this.veraaddress.contains(Configuration.DEFAULT_VERA_ADDRESS))
 			return false;

src/main/java/com/bwssystems/HABridge/HABridge.java

@@ -42,7 +42,7 @@ public class HABridge {
         String addressString;
         BridgeSettings bridgeSettings;
 
-        log.info("HA Bridge (v1.0.2) starting setup....");
+        log.info("HA Bridge (v1.0.3) starting setup....");
         //get ip address for upnp requests
         try {
 			address = InetAddress.getLocalHost();
@@ -63,6 +63,7 @@ public class HABridge {
         bridgeSettings.setUpnpStrict(Boolean.parseBoolean(System.getProperty("upnp.strict", "true")));
         bridgeSettings.setTraceupnp(Boolean.parseBoolean(System.getProperty("trace.upnp", "false")));
         bridgeSettings.setVtwocompatibility(Boolean.parseBoolean(System.getProperty("vtwo.compatibility", "false")));
+        bridgeSettings.setDevMode(Boolean.parseBoolean(System.getProperty("dev.mode", "false")));
 
         // sparkjava config directive to set ip address for the web server to listen on
         // ipAddress("0.0.0.0"); // not used

src/main/java/com/bwssystems/harmony/DevModeResponse.java

@@ -0,0 +1,69 @@
+package com.bwssystems.harmony;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+
+import java.util.List;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import net.whistlingfish.harmony.config.Activity;
+import net.whistlingfish.harmony.config.Device;
+import net.whistlingfish.harmony.config.HarmonyConfig;
+
+public class DevModeResponse {
+    final Logger log = LoggerFactory.getLogger(DevModeResponse.class);
+
+	private final static String powerOff = "PowerOff";
+	private HarmonyConfig harmonyConfig;
+	private Activity currentActivity;
+
+	public DevModeResponse() {
+		super();
+		harmonyConfig = HarmonyConfig.parse(dataReader("/config.data"));
+		this.currentActivity = harmonyConfig.getActivityByName(powerOff);
+	}
+	
+	public Activity getCurrentActivity() {
+		return currentActivity;
+	}
+	
+	public void setCurrentActivity(Activity currentActivity) {
+		this.currentActivity = currentActivity;
+	}
+	
+	public List<Activity> getActivities() {
+		return harmonyConfig.getActivities();
+	}
+	
+	public List<Device> getDevices() {
+		return harmonyConfig.getDevices();
+	}
+
+	public HarmonyConfig getConfig() {
+		return harmonyConfig;
+	}
+
+	private String dataReader(String filePath) {
+
+		String content = null;
+		try {
+			InputStream input = getClass().getResourceAsStream(filePath);
+			OutputStream out = new ByteArrayOutputStream();
+			int read;
+			byte[] bytes = new byte[1024];
+
+			while ((read = input.read(bytes)) != -1) {
+				out.write(bytes, 0, read);
+			}
+			content = out.toString();
+		} catch (IOException e) {
+			log.error("Error reading the file: " + filePath + " message: " + e.getMessage(), e);
+		}
+		return content;
+	}
+
+}

src/main/java/com/bwssystems/harmony/HarmonyHandler.java

@@ -14,30 +14,50 @@ public class HarmonyHandler {
     private static final Logger log = LoggerFactory.getLogger(HarmonyHandler.class);
     private HarmonyClient harmonyClient;
     private Boolean noopCalls;
+    private Boolean devMode;
+    private DevModeResponse devResponse;
 
-    public HarmonyHandler(HarmonyClient theClient, Boolean noopCallsSetting) {
+    public HarmonyHandler(HarmonyClient theClient, Boolean noopCallsSetting, DevModeResponse devResponseSetting) {
 		super();
 		noopCalls = noopCallsSetting;
+		devMode = Boolean.TRUE;
+		devResponse = null;
+		if(devResponseSetting == null)
+			devMode = Boolean.FALSE;
+		else
+			devResponse = devResponseSetting;
 		harmonyClient = theClient;
 	}
 
     public List<Activity> getActivities() {
 		log.debug("Harmony api activities list requested.");
-		return harmonyClient.getConfig().getActivities();
+        if(devMode)
+        	return devResponse.getActivities();
+
+       	return harmonyClient.getConfig().getActivities();
     }
 
 	public List<Device> getDevices() {
 		log.debug("Harmony api device list requested.");
-		return harmonyClient.getConfig().getDevices();
+        if(devMode)
+        	return devResponse.getDevices();
+
+       	return harmonyClient.getConfig().getDevices();
 	}
 
 	public HarmonyConfig getConfig() {
 		log.debug("Harmony api config requested.");
+        if(devMode)
+        	return devResponse.getConfig();
+
 		return harmonyClient.getConfig();
 	}
 
 	public Activity getCurrentActivity() {
 		log.debug("Harmony api current sctivity requested.");
+        if(devMode)
+        	return devResponse.getCurrentActivity();
+        
 		return harmonyClient.getCurrentActivity();
 	}
 
@@ -45,10 +65,17 @@ public class HarmonyHandler {
 		log.debug("Harmony api start activity requested for: " + anActivity.getName() + " noop mode: " + noopCalls);
 		if (anActivity.isValid()) {
 			try {
-				if (!noopCalls)
-					harmonyClient.startActivity(Integer.parseInt(anActivity.getName()));
-				else
+				if (noopCalls || devMode) {
+            		if(devMode)
+            		{
+            			if(anActivity != null)
+            				devResponse.setCurrentActivity(devResponse.getConfig().getActivityByName(anActivity.getName()));
+            		}
+
 					log.info("noop mode: Harmony api start activity requested for: " + anActivity.getName());
+				}
+				else
+					harmonyClient.startActivity(Integer.parseInt(anActivity.getName()));
 			} catch (IllegalArgumentException e) {
 				try {
 					if (!noopCalls)
@@ -70,10 +97,12 @@ public class HarmonyHandler {
 		log.debug("Harmony api press a button requested for device: " + aDeviceButton.getDevice() + " and a for button: " + aDeviceButton.getButton() + " noop mode: " + noopCalls);
 		if (aDeviceButton.isValid()) {
 			try {
-				if (!noopCalls)
-					harmonyClient.pressButton(Integer.parseInt(aDeviceButton.getDevice()), aDeviceButton.getButton());
-				else
+				if (noopCalls || devMode) {
 					log.info("noop mode: Harmony api press a button requested for device: " + aDeviceButton.getDevice() + " and a for button: " + aDeviceButton.getButton());
+				}
+            	else
+					harmonyClient.pressButton(Integer.parseInt(aDeviceButton.getDevice()), aDeviceButton.getButton());
+				
 			} catch (IllegalArgumentException e) {
 				try {
 					if (!noopCalls)

src/main/java/com/bwssystems/harmony/HarmonyServer.java

@@ -21,6 +21,7 @@ public class HarmonyServer {
     private HarmonyClient harmonyClient;
     
     private HarmonyHandler myHarmony;
+    private DevModeResponse devResponse;
     
     private Logger log = LoggerFactory.getLogger(HarmonyServer.class);
 
@@ -42,16 +43,29 @@ public class HarmonyServer {
   	}
 
 	private void execute(BridgeSettings mySettings) throws Exception {
-		log.info("setup initiated....");
-		harmonyClient.addListener(new ActivityChangeListener() {
-			@Override
-			public void activityStarted(Activity activity) {
-				log.info(format("activity changed: [%d] %s", activity.getId(), activity.getLabel()));
-			}
-		});
-		harmonyClient.connect(mySettings.getHarmonyAddress(), mySettings.getHarmonyUser(), mySettings.getHarmonyPwd());
         Boolean noopCalls = Boolean.parseBoolean(System.getProperty("noop.calls", "false"));
-        myHarmony = new HarmonyHandler(harmonyClient, noopCalls);
+        String modeString = "";
+        if(mySettings.isDevMode())
+        	modeString = " (development mode)";
+        if(noopCalls)
+        	modeString = " (no op calls to harmony)";
+		log.info("setup initiated " + modeString + "....");
+        if(mySettings.isDevMode())
+        {
+        	harmonyClient = null;
+        	devResponse = new DevModeResponse();
+        }
+        else {
+        	devResponse = null;
+			harmonyClient.addListener(new ActivityChangeListener() {
+				@Override
+				public void activityStarted(Activity activity) {
+					log.info(format("activity changed: [%d] %s", activity.getId(), activity.getLabel()));
+				}
+			});
+			harmonyClient.connect(mySettings.getHarmonyAddress(), mySettings.getHarmonyUser(), mySettings.getHarmonyPwd());
+        }
+        myHarmony = new HarmonyHandler(harmonyClient, noopCalls, devResponse);
 	}
 
 	public HarmonyHandler getMyHarmony() {

src/main/resources/public/index.html

@@ -36,7 +36,7 @@
 						<ul class="dropdown-menu" aria-labelledby="dropdownMenu1">
 							<li><a href="http://www.bwssystems.com" target="_blank">Developed by BWS Systems</a></li>
 							<li><a href="http://www.amazon.com/echo" target="_blank">Amazon Echo</a></li>
-							<li><a href="">HA Bridge Version 1.0.2</a></li>
+							<li><a href="">HA Bridge Version 1.0.3</a></li>
 						</ul>
 					</li>
 				</ul>

src/main/resources/public/views/harmonydevice.html

@@ -37,23 +37,21 @@
 					<td>{{harmonydevice.id}}</td>
 					<td>
 						<select name="device-ctrlon" id="device-ctrlon" ng-model="devicectrlon">
-							<option ng-repeat="ctrlon in harmonydevice.controlGroup" value="{{ctrlon.function}}">{{ctrlon.name}}</option>
-						</select>
-						<select name="device-funcon" id="device-funcon" ng-model="devicefuncon">
-							<option ng-repeat="funcon in devicectrlon" value="{{funcon.name}}">{{funcon.name}}</option>
+							<optgroup ng-repeat="ctrlon in harmonydevice.controlGroup" label="{{ctrlon.name}}">
+								<option ng-repeat="funcon in ctrlon.function">{{funcon.name}}</option>
+							</optgroup >
 						</select>
 					</td>
 					<td>
 						<select name="device-ctrloff" id="device-ctrloff" ng-model="devicectrloff">
-							<option ng-repeat="ctrloff in harmonydevice.controlGroup" value="{{ctrloff.function}}">{{ctrloff.name}}</option>
-						</select>
-						<select name="device-funcoff" id="device-funcoff" ng-model="devicefuncoff">
-							<option ng-repeat="funcoff in devicectrloff" value="{{funcoff.label}}">{{funcoff.label}}</option>
+							<optgroup ng-repeat="ctrloff in harmonydevice.controlGroup" label="{{ctrloff.name}}">
+								<option ng-repeat="funcoff in ctrloff.function">{{funcoff.name}}</option>
+							</optgroup >
 						</select>
 					</td>
 					<td>
 						<button class="btn btn-success" type="submit"
-							ng-click="buildButtonUrls(harmonydevice, devicefuncon, devicefuncoff)">Generate
+							ng-click="buildButtonUrls(harmonydevice, devicectrlon, devicectrloff)">Generate
 							Button URLs</button>
 					</td>
 				</tr>