ADAP-126: update adapter to 7.0.1

wenjunche · wenjunche · commit 85463edfefe1 · 2018-03-20T13:59:08.000-04:00
diff --git a/RELEASENOTES-ADAPTER.md b/RELEASENOTES-ADAPTER.md
@@ -1,8 +1,9 @@
 
-# Version 6.0.2.2-SNAPSHOT
+# Version 7.0.1-SNAPSHOT
 
 ## New Features
 * Improved thread safety with concurrent collection classes.
+* Added error message to DesktopStateListener.onClose (breaking change)
 
 ## Bug Fixes
 * Fixed an issue with passing arguments in System.launchExternalProcess
diff --git a/pom.xml b/pom.xml
@@ -58,7 +58,7 @@
         <dependency>
             <groupId>co.openfin</groupId>
             <artifactId>openfin-desktop-java-adapter</artifactId>
-            <version>6.0.2.2-SNAPSHOT</version>
+            <version>7.0.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>co.openfin</groupId>
diff --git a/src/main/java/com/openfin/desktop/demo/DockingDemo2.java b/src/main/java/com/openfin/desktop/demo/DockingDemo2.java
@@ -106,7 +106,7 @@ public void onReady() {
                 }
 
                 @Override
-                public void onClose() {
+                public void onClose(String error) {
                 }
                 @Override
                 public void onError(String reason) {
diff --git a/src/main/java/com/openfin/desktop/demo/ExternalMessageDemo.java b/src/main/java/com/openfin/desktop/demo/ExternalMessageDemo.java
@@ -31,7 +31,7 @@ public void onReady() {
             }
 
             @Override
-            public void onClose() {
+            public void onClose(String error) {
                 System.out.println("Connection closed");
             }
 
diff --git a/src/main/java/com/openfin/desktop/demo/FxDemo.java b/src/main/java/com/openfin/desktop/demo/FxDemo.java
@@ -227,7 +227,7 @@ public void onReady() {
     }
 
     @Override
-    public void onClose() {
+    public void onClose(String error) {
         logger.info("Disconnected from OpenFin Runtime");
         btnStart.setDisable(false);
         btnStop.setDisable(true);
diff --git a/src/main/java/com/openfin/desktop/demo/JNLPExample.java b/src/main/java/com/openfin/desktop/demo/JNLPExample.java
@@ -31,7 +31,7 @@ public void onReady() {
         }
 
         @Override
-        public void onClose() {
+        public void onClose(String error) {
             java.lang.System.out.println("Connection closed");
         }
 
diff --git a/src/main/java/com/openfin/desktop/demo/JUnitDemo.java b/src/main/java/com/openfin/desktop/demo/JUnitDemo.java
@@ -67,7 +67,7 @@ public void onReady() {
             }
 
             @Override
-            public void onClose() {
+            public void onClose(String error) {
                 printf("Connection to Runtime closed");
             }
 
diff --git a/src/main/java/com/openfin/desktop/demo/NoGui.java b/src/main/java/com/openfin/desktop/demo/NoGui.java
@@ -57,7 +57,7 @@ public void onError(Ack ack) {
                 }
 
                 @Override
-                public void onClose() {
+                public void onClose(String error) {
                     System.out.println("Main.onClose");
                 }
 
diff --git a/src/main/java/com/openfin/desktop/demo/OpenFinDesktopDemo.java b/src/main/java/com/openfin/desktop/demo/OpenFinDesktopDemo.java
@@ -500,8 +500,8 @@ public void onReady() {
             }
 
             @Override
-            public void onClose() {
-                updateMessagePanel("Connection closed");
+            public void onClose(String error) {
+                updateMessagePanel(String.format("Connection closed %s", error));
                 resetUI();
             }
 
diff --git a/src/main/java/com/openfin/desktop/demo/OpenFinDockingDemo.java b/src/main/java/com/openfin/desktop/demo/OpenFinDockingDemo.java
@@ -245,8 +245,8 @@ public void onReady() {
                 }
 
                 @Override
-                public void onClose() {
-                    updateMessagePanel("Connection closed");
+                public void onClose(String error) {
+                    updateMessagePanel(String.format("Connection closed %s", error));
                 }
                 @Override
                 public void onError(String reason) {
diff --git a/src/main/java/com/openfin/desktop/demo/OpenFinWindowTest.java b/src/main/java/com/openfin/desktop/demo/OpenFinWindowTest.java
@@ -77,7 +77,7 @@ public void onReady() {
             }
 
             @Override
-            public void onClose() {
+            public void onClose(String error) {
                 printf("Connection to Runtime is closed");
             }
 
diff --git a/src/main/java/com/openfin/desktop/demo/PubSubTest.java b/src/main/java/com/openfin/desktop/demo/PubSubTest.java
@@ -164,7 +164,7 @@ public void run() {
         }
 
         @Override
-        public void onClose() {
+        public void onClose(String error) {
             logger.info("onClose");
         }
 
@@ -246,7 +246,7 @@ void launch() {
         }
 
         @Override
-        public void onClose() {
+        public void onClose(String error) {
 
         }
 
diff --git a/src/main/java/com/openfin/desktop/demo/TVBEmbedDemo.java b/src/main/java/com/openfin/desktop/demo/TVBEmbedDemo.java
@@ -216,7 +216,7 @@ public void run() {
                 }
 
                 @Override
-                public void onClose() {
+                public void onClose(String error) {
                 }
 
                 @Override
diff --git a/src/main/java/com/openfin/desktop/demo/WindowEmbedDemo.java b/src/main/java/com/openfin/desktop/demo/WindowEmbedDemo.java
@@ -216,7 +216,7 @@ public void onReady() {
                 }
 
                 @Override
-                public void onClose() {
+                public void onClose(String error) {
                 }
 
                 @Override
diff --git a/src/test/java/com/openfin/desktop/TestExample.java b/src/test/java/com/openfin/desktop/TestExample.java
@@ -33,7 +33,7 @@ public void onReady() {
                 publishMessages();
             }
             @Override
-            public void onClose() {
+            public void onClose(String error) {
             }
 
             @Override
diff --git a/src/test/java/com/openfin/desktop/TestUtils.java b/src/test/java/com/openfin/desktop/TestUtils.java
@@ -61,7 +61,7 @@ public void onReady() {
                 connectedLatch.countDown();
             }
             @Override
-            public void onClose() {
+            public void onClose(String error) {
                 logger.debug("Connection closed");
                 disconnectedLatch.countDown();
             }
@@ -123,7 +123,7 @@ public void onReady() {
                 connectedLatch.countDown();
             }
             @Override
-            public void onClose() {
+            public void onClose(String error) {
                 logger.debug("Connection closed");
                 disconnectedLatch.countDown();
                 connectedLatch.countDown();  // interrupt connectedLatch.await

Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,7 @@ public void onReady() {`
`106`	`106`	`}`
`107`	`107`
`108`	`108`	`@Override`
`109`		`- public void onClose() {`
	`109`	`+ public void onClose(String error) {`
`110`	`110`	`}`
`111`	`111`	`@Override`
`112`	`112`	`public void onError(String reason) {`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ public void onReady() {`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`@Override`
`34`		`- public void onClose() {`
	`34`	`+ public void onClose(String error) {`
`35`	`35`	`System.out.println("Connection closed");`
`36`	`36`	`}`
`37`	`37`
Original file line number	Diff line number	Diff line change
`@@ -227,7 +227,7 @@ public void onReady() {`
`227`	`227`	`}`
`228`	`228`
`229`	`229`	`@Override`
`230`		`- public void onClose() {`
	`230`	`+ public void onClose(String error) {`
`231`	`231`	`logger.info("Disconnected from OpenFin Runtime");`
`232`	`232`	`btnStart.setDisable(false);`
`233`	`233`	`btnStop.setDisable(true);`
Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ public void onReady() {`
`67`	`67`	`}`
`68`	`68`
`69`	`69`	`@Override`
`70`		`- public void onClose() {`
	`70`	`+ public void onClose(String error) {`
`71`	`71`	`printf("Connection to Runtime closed");`
`72`	`72`	`}`
`73`	`73`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ public void onError(Ack ack) {`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`@Override`
`60`		`- public void onClose() {`
	`60`	`+ public void onClose(String error) {`
`61`	`61`	`System.out.println("Main.onClose");`
`62`	`62`	`}`
`63`	`63`
Original file line number	Diff line number	Diff line change
`@@ -500,8 +500,8 @@ public void onReady() {`
`500`	`500`	`}`
`501`	`501`
`502`	`502`	`@Override`
`503`		`- public void onClose() {`
`504`		`- updateMessagePanel("Connection closed");`
	`503`	`+ public void onClose(String error) {`
	`504`	`+ updateMessagePanel(String.format("Connection closed %s", error));`
`505`	`505`	`resetUI();`
`506`	`506`	`}`
`507`	`507`
Original file line number	Diff line number	Diff line change
`@@ -245,8 +245,8 @@ public void onReady() {`
`245`	`245`	`}`
`246`	`246`
`247`	`247`	`@Override`
`248`		`- public void onClose() {`
`249`		`- updateMessagePanel("Connection closed");`
	`248`	`+ public void onClose(String error) {`
	`249`	`+ updateMessagePanel(String.format("Connection closed %s", error));`
`250`	`250`	`}`
`251`	`251`	`@Override`
`252`	`252`	`public void onError(String reason) {`