Merge pull request #6 from PredixDev/feature/Release3

Release for EC slow networking bug.

Author: cliff76

build.gradle

@@ -14,6 +14,10 @@ buildscript {
 group 'com.ge.predix'
 version '1.1.2'
 
+def shortVersion = version
+def buildnumber = System.getenv("BUILD_NUMBER") ?: "unknown"
+version = shortVersion + "." + buildnumber
+
 apply plugin: 'java'
 apply plugin: "org.sonarqube"
 apply plugin: 'idea'

libs/PredixMobileJavaSDK-1.6.31.jar libs/PredixMobileJavaSDK-1.7.10.jarlibs/PredixMobileJavaSDK-1.6.31.jar renamed to libs/PredixMobileJavaSDK-1.7.10.jar

@@ -1 +1 @@
-rootProject.name = 'MFL Reference Application'
+rootProject.name = 'MFLReferenceApplication'

settings.gradle

@@ -32,14 +32,21 @@ public static boolean enableWebConsoleToJavaConsoleCapture(WebEngine engine) {
                 JSObject window = (JSObject) engine.executeScript("window");
                 ConsoleLogBridge bridge = new ConsoleLogBridge();
                 window.setMember("logBridge", bridge);
-                engine.executeScript("origlog = console.log; console.log = function(message) { if(logBridge.log) {logBridge.log('[WebView Console Log] ' + message);} else {origlog(message);} };");
+                engine.executeScript("console.log = function(message) { logBridge.log('[WebView Console Log] ' + message); };");
             });
         } catch (Exception e) {
             e.printStackTrace();
             return false;
         }
 
         return true;
+//        //Allows logs messages to be redirected to the console output window.
+//        browser.getEngine().getLoadWorker().stateProperty().addListener((observable, oldValue, newValue) -> {
+//            System.out.println("called state change " + oldValue + " other " + newValue);
+//            if (newValue == Worker.State.SUCCEEDED) {
+//
+//            }
+//        });
     }
 
     public static boolean enableFireBugInWindowDebugger(WebEngine engine) {