From 6499fee0893c1206c99673fcf5979de05d8d7e6e Mon Sep 17 00:00:00 2001
From: Brian Clements <brian.d.clements@raytheon.com>
Date: Fri, 20 Jun 2014 08:50:55 -0500
Subject: [PATCH] Omaha #3281 collaboration views persist between perspectives

fixed bug that prevented re-opening collaboration after views were closed

Change-Id: I62651d9d5fe52defe3f4f37ee97b4d824cb974e3

Former-commit-id: fd95df3bc0c6a64d95bf9a5c37c0baaa246469b8 [formerly 21fca2e662a1b5eb2fb3524cef5303ff01ea1276 [formerly 9aa5a87c4bd7c2d6a852f644147cececbba18879] [formerly fd95df3bc0c6a64d95bf9a5c37c0baaa246469b8 [formerly b84f7571415871f2983b913cf816ed227b24bbac]]]
Former-commit-id: 21fca2e662a1b5eb2fb3524cef5303ff01ea1276 [formerly 9aa5a87c4bd7c2d6a852f644147cececbba18879]
Former-commit-id: 21fca2e662a1b5eb2fb3524cef5303ff01ea1276
Former-commit-id: 27f7b754a3eb3641028ecf423c34a9290ec1bd25
---
 .../plugin.xml                                 | 18 ++++++++++++++++++
 .../collaboration/ui/actions/LoginAction.java  |  6 +++++-
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/cave/com.raytheon.uf.viz.collaboration.ui/plugin.xml b/cave/com.raytheon.uf.viz.collaboration.ui/plugin.xml
index f7f3f6bfed..8a1f4778b3 100644
--- a/cave/com.raytheon.uf.viz.collaboration.ui/plugin.xml
+++ b/cave/com.raytheon.uf.viz.collaboration.ui/plugin.xml
@@ -49,6 +49,9 @@
                icon="icons/messages.gif"
                name="Collaboration Session"
                restorable="false"/>
+         <stickyView
+               closable="true"
+               id="com.raytheon.uf.viz.collaboration.CollaborationSession"/>
          <view
                allowMultiple="true"
                category="com.raytheon.viz.ui"
@@ -57,6 +60,9 @@
                icon="icons/chats.gif"
                name="Private Session"
                restorable="false"/>
+        <stickyView
+               closable="true"
+               id="com.raytheon.uf.viz.collaboration.SessionView"/>       
 		<view
                allowMultiple="true"
                category="com.raytheon.viz.ui"
@@ -65,6 +71,9 @@
                icon="icons/chats.gif"
                name="Text Session"
                restorable="false"/>
+         <stickyView
+               closable="true"
+               id="com.raytheon.uf.viz.collaboration.SessionFeedView"/>      
          <view
                allowMultiple="true"
                category="com.raytheon.viz.ui"
@@ -73,6 +82,9 @@
                icon="icons/chats.gif"
                name="Chat"
                restorable="false"/>
+         <stickyView
+               closable="true"
+               id="com.raytheon.uf.viz.collaboration.PeerToPeerView"/>      
    <!-- Collaboration groups -->
          <view
                allowMultiple="false"
@@ -82,6 +94,9 @@
                icon="icons/browser.gif"
                name="Collaboration Information"
                restorable="false"/>
+         <stickyView
+               closable="true"
+               id="com.raytheon.uf.viz.collaboration.ui.CollaborationGroupView"/>
          <view
                allowMultiple="true"
                category="com.raytheon.viz.ui"
@@ -90,6 +105,9 @@
                icon="icons/log.gif"
                name="Log Browser"
                restorable="false"/>
+         <stickyView
+               closable="true"
+               id="com.raytheon.uf.viz.collaboration.ui.session.SessionMsgArchiveView"/>      
    </extension>
    <extension
          point="org.eclipse.ui.commands">
diff --git a/cave/com.raytheon.uf.viz.collaboration.ui/src/com/raytheon/uf/viz/collaboration/ui/actions/LoginAction.java b/cave/com.raytheon.uf.viz.collaboration.ui/src/com/raytheon/uf/viz/collaboration/ui/actions/LoginAction.java
index 1f7c761bcc..183d038e74 100644
--- a/cave/com.raytheon.uf.viz.collaboration.ui/src/com/raytheon/uf/viz/collaboration/ui/actions/LoginAction.java
+++ b/cave/com.raytheon.uf.viz.collaboration.ui/src/com/raytheon/uf/viz/collaboration/ui/actions/LoginAction.java
@@ -38,7 +38,8 @@ import com.raytheon.uf.viz.core.icon.IconUtil;
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
  * Jul 11, 2012            bsteffen     Initial creation
- * Apr 11, 2014 2903       bclement    added success flag
+ * Apr 11, 2014 2903       bclement     added success flag
+ * Jun 20, 2014 3281       bclement     success when already logged in
  * 
  * </pre>
  * 
@@ -66,6 +67,9 @@ public class LoginAction extends Action {
                 return;
             }
             success = new LoginDialog(shell).login();
+        } else {
+            /* already logged in, mission accomplished */
+            success = true;
         }
     }