ADAP-23: keep up with adapter version 4.40.2.7

Wenjun Che · Wenjun Che · commit b02fb5af7d87 · 2015-06-22T11:40:04.000-04:00
diff --git a/pom.xml b/pom.xml
@@ -20,7 +20,7 @@
         <dependency>
             <groupId>co.openfin</groupId>
             <artifactId>openfin-desktop-java-adapter</artifactId>
-            <version>3.0.1.5</version>
+            <version>4.40.2.7</version>
         </dependency>
         <dependency>
             <groupId>tablelayout</groupId>
diff --git a/src/main/java/com/openfin/desktop/demo/OpenFinDesktopDemo.java b/src/main/java/com/openfin/desktop/demo/OpenFinDesktopDemo.java
@@ -289,7 +289,11 @@ protected JScrollPane layoutStatusPanel() {
 
     private void closeWebSocket() {
         if (controller != null && controller.isConnected()) {
-            controller.disconnect();
+            try {
+                controller.disconnect();
+            } catch (DesktopException e) {
+                e.printStackTrace();
+            }
         }
     }
 
@@ -376,7 +380,7 @@ public void run() {
     }
 
 
-    private void createAdminApplication() {
+    private void createAdminApplication() throws DesktopException {
         updateMessagePanel("Creating InterAppBus");
         bus = controller.getInterApplicationBus();
         openfinSystem = new System(controller);
@@ -396,6 +400,7 @@ public void eventReceived(com.openfin.desktop.ActionEvent actionEvent) {
                     updateMessagePanel("startup app closed");
                 }
             }, null);
+
         }
 
         openfinSystem.addEventListener("desktop-icon-clicked", new EventListener() {
@@ -423,8 +428,12 @@ private void runStartAction() {
         final DesktopStateListener listener = new DesktopStateListener() {
             @Override
             public void onReady() {
-                updateMessagePanel("Connection authorized.");
-                createAdminApplication();
+                try {
+                    updateMessagePanel("Connection authorized.");
+                    createAdminApplication();
+                } catch (DesktopException e) {
+                    e.printStackTrace();
+                }
             }
             @Override
             public void onError(String reason) {
diff --git a/src/main/java/com/openfin/desktop/demo/WindowEmbedDemo.java b/src/main/java/com/openfin/desktop/demo/WindowEmbedDemo.java
@@ -207,8 +207,26 @@ public void onOutgoingMessage(String message) {
         }
     }
 
+    private boolean trayIconAdded = false;
+    private Application startupHtml5app;
+
     private void embedStartupApp() {
         try {
+            if (startupHtml5app == null) {
+                startupHtml5app = Application.wrap(this.startupUuid, this.controller);
+            }
+            if (!trayIconAdded) {
+                startupHtml5app.setTrayIcon("http://icons.iconarchive.com/icons/marcus-roberto/google-play/512/Google-Search-icon.png", new EventListener() {
+                    public void eventReceived(ActionEvent actionEvent) {
+                        java.lang.System.out.println("Tray icon clicked");
+                    }
+                }, null);
+                trayIconAdded = true;
+            } else {
+                startupHtml5app.removeTrayIcon(null);
+                trayIconAdded = false;
+            }
+
             Window html5Wnd = Window.wrap(startupUuid, startupUuid, controller);
             long parentHWndId = Native.getComponentID(this.embedCanvas);
             System.out.println("Canvas HWND " + Long.toHexString(parentHWndId));
