ADAP-47: added DesktopStateListener.nClose

wenjunche · wenjunche · commit 69fb5d9ec95a · 2016-03-21T22:25:51.000-04:00
diff --git a/src/main/java/com/openfin/desktop/demo/DockingDemo2.java b/src/main/java/com/openfin/desktop/demo/DockingDemo2.java
@@ -104,6 +104,10 @@ private void startOpenFinRuntime() {
                 public void onReady() {
                     onRuntimeReady();
                 }
+
+                @Override
+                public void onClose() {
+                }
                 @Override
                 public void onError(String reason) {
                     logger.error("Connection failed: " + reason);
diff --git a/src/main/java/com/openfin/desktop/demo/ExternalMessageDemo.java b/src/main/java/com/openfin/desktop/demo/ExternalMessageDemo.java
@@ -30,6 +30,11 @@ public void onReady() {
                 System.out.println("Desktop onReady");
             }
 
+            @Override
+            public void onClose() {
+                System.out.println("Connection closed");
+            }
+
             @Override
             public void onError(String reason) {
                 System.out.println("Desktop onError " + reason);
diff --git a/src/main/java/com/openfin/desktop/demo/JNLPExample.java b/src/main/java/com/openfin/desktop/demo/JNLPExample.java
@@ -29,6 +29,12 @@ public void onReady() {
             }
 
         }
+
+        @Override
+        public void onClose() {
+            java.lang.System.out.println("Connection closed");
+        }
+
         @Override
         public void onError(String reason)  {
             java.lang.System.out.println("Connection failed: " + reason);
diff --git a/src/main/java/com/openfin/desktop/demo/JUnitDemo.java b/src/main/java/com/openfin/desktop/demo/JUnitDemo.java
@@ -66,6 +66,11 @@ public void onReady() {
                 openFinConnectedLatch.countDown();
             }
 
+            @Override
+            public void onClose() {
+                printf("Connection to Runtime closed");
+            }
+
             @Override
             public void onError(String reason) {
                 printf("Connection failed: %s", reason);
diff --git a/src/main/java/com/openfin/desktop/demo/OpenFinDesktopDemo.java b/src/main/java/com/openfin/desktop/demo/OpenFinDesktopDemo.java
@@ -454,6 +454,12 @@ public void onReady() {
                     e.printStackTrace();
                 }
             }
+
+            @Override
+            public void onClose() {
+                updateMessagePanel("Connection closed");
+            }
+
             @Override
             public void onError(String reason) {
                 updateMessagePanel("Connection failed: " + reason);
diff --git a/src/main/java/com/openfin/desktop/demo/OpenFinDockingDemo.java b/src/main/java/com/openfin/desktop/demo/OpenFinDockingDemo.java
@@ -246,6 +246,11 @@ private void startOpenFinRuntime() {
                 public void onReady() {
                     onRuntimeReady();
                 }
+
+                @Override
+                public void onClose() {
+                    updateMessagePanel("Connection closed");
+                }
                 @Override
                 public void onError(String reason) {
                     updateMessagePanel("Connection failed: " + reason);
diff --git a/src/main/java/com/openfin/desktop/demo/OpenFinWindowTest.java b/src/main/java/com/openfin/desktop/demo/OpenFinWindowTest.java
@@ -76,6 +76,11 @@ public void onReady() {
                 openFinDisconnectedLatch = new CountDownLatch(1);
             }
 
+            @Override
+            public void onClose() {
+                printf("Connection to Runtime is closed");
+            }
+
             @Override
             public void onError(String reason) {
                 printf("Connection failed: %s", reason);
diff --git a/src/main/java/com/openfin/desktop/demo/WindowEmbedDemo.java b/src/main/java/com/openfin/desktop/demo/WindowEmbedDemo.java
@@ -204,6 +204,11 @@ private void runStartAction() {
                 public void onReady() {
                     setMainButtonsEnabled(true);
                 }
+
+                @Override
+                public void onClose() {
+                }
+
                 @Override
                 public void onError(String reason) {
 
diff --git a/src/test/java/com/openfin/desktop/TestUtils.java b/src/test/java/com/openfin/desktop/TestUtils.java
@@ -57,6 +57,11 @@ public void onReady() {
                 connectionClosing = false;
                 connectedLatch.countDown();
             }
+            @Override
+            public void onClose() {
+                logger.debug("Connection closed");
+                disconnectedLatch.countDown();
+            }
 
             @Override
             public void onError(String reason) {
@@ -65,7 +70,6 @@ public void onError(String reason) {
                 } else {
                     logger.debug("Connection closed");
                 }
-                disconnectedLatch.countDown();
             }
 
             @Override

Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,12 @@ public void onReady() {`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`}`
	`32`	`+`
	`33`	`+ @Override`
	`34`	`+ public void onClose() {`
	`35`	`+ java.lang.System.out.println("Connection closed");`
	`36`	`+ }`
	`37`	`+`
`32`	`38`	`@Override`
`33`	`39`	`public void onError(String reason) {`
`34`	`40`	`java.lang.System.out.println("Connection failed: " + reason);`
Original file line number	Diff line number	Diff line change
`@@ -454,6 +454,12 @@ public void onReady() {`
`454`	`454`	`e.printStackTrace();`
`455`	`455`	`}`
`456`	`456`	`}`
	`457`	`+`
	`458`	`+ @Override`
	`459`	`+ public void onClose() {`
	`460`	`+ updateMessagePanel("Connection closed");`
	`461`	`+ }`
	`462`	`+`
`457`	`463`	`@Override`
`458`	`464`	`public void onError(String reason) {`
`459`	`465`	`updateMessagePanel("Connection failed: " + reason);`
Original file line number	Diff line number	Diff line change
`@@ -57,6 +57,11 @@ public void onReady() {`
`57`	`57`	`connectionClosing = false;`
`58`	`58`	`connectedLatch.countDown();`
`59`	`59`	`}`
	`60`	`+ @Override`
	`61`	`+ public void onClose() {`
	`62`	`+ logger.debug("Connection closed");`
	`63`	`+ disconnectedLatch.countDown();`
	`64`	`+ }`
`60`	`65`
`61`	`66`	`@Override`
`62`	`67`	`public void onError(String reason) {`
`@@ -65,7 +70,6 @@ public void onError(String reason) {`
`65`	`70`	`} else {`
`66`	`71`	`logger.debug("Connection closed");`
`67`	`72`	`}`
`68`		`- disconnectedLatch.countDown();`
`69`	`73`	`}`
`70`	`74`
`71`	`75`	`@Override`