Omaha #3281 collaboration views persist between perspectives

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

Change-Id: I62651d9d5fe52defe3f4f37ee97b4d824cb974e3

Former-commit-id: 6499fee089 [formerly 27f7b754a3] [formerly 21fca2e662] [formerly 21fca2e662 [formerly 9aa5a87c4b]] [formerly 6499fee089 [formerly 27f7b754a3] [formerly 21fca2e662] [formerly 21fca2e662 [formerly 9aa5a87c4b]] [formerly fd95df3bc0 [formerly 21fca2e662 [formerly 9aa5a87c4b] [formerly fd95df3bc0 [formerly b84f7571415871f2983b913cf816ed227b24bbac]]]]]
Former-commit-id: fd95df3bc0
Former-commit-id: 2159e083f7 [formerly 1f176ef9b9] [formerly 74c62e0bf9] [formerly 8261597e48d1fdd1136a39b27f021c5ea4b50bbf [formerly 432bcaa1164a2f10b560fb73e9f366e8663ada6d] [formerly 74c62e0bf9 [formerly 795fa49ced]]]
Former-commit-id: 51f9d5ac21f9aab3d67bac967e200ba43fb51a3d [formerly c5974f5b42889bc8aca6c62470535a1217c6644d] [formerly a8e31ffa21 [formerly 5560b12a5a]]
Former-commit-id: a8e31ffa21
Former-commit-id: ad5e56f89a
This commit is contained in:
Brian Clements 2014-06-20 08:50:55 -05:00
parent e1e9c56159
commit 133179813e
2 changed files with 23 additions and 1 deletions

View file

@ -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">

View file

@ -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;
}
}