xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Issue #244 Bug Fix.

Browse source 
Change-Id: Ic144fc7354f12aec2c5dd76997b38977c8b2986c

Former-commit-id: be9fe19d9a [formerly be9fe19d9a [formerly 3ecb104c403decb5889cf9d97d3a1dd2b9114b85]]
Former-commit-id: d17ef23899
Former-commit-id: 6c8db0d6a4
This commit is contained in:
Roger Ferrel 2012-03-08 17:16:48 -06:00
parent 31c8dddd6c
commit c692a2da94
3 changed files with 14 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
cave/com.raytheon.uf.viz.collaboration.ui/src/com/raytheon/uf/viz/collaboration/data/CollaborationGroup.java
View file

@ -89,5 +89,6 @@ public class CollaborationGroup extends CollaborationNode {
groupNode.removeChildren();
}
}
children.clear();
}
}

20
cave/com.raytheon.uf.viz.collaboration.ui/src/com/raytheon/uf/viz/collaboration/ui/CollaborationGroupView.java
View file

@ -323,10 +323,10 @@ public class CollaborationGroupView extends ViewPart {
}
private void createCollaborationSession() {
CollaborationDataManager dataManager = CollaborationDataManager
CollaborationDataManager manager = CollaborationDataManager
.getInstance();
SessionManager manager = dataManager.getSessionManager();
if (manager == null) {
SessionManager sessionManager = manager.getSessionManager();
if (sessionManager == null) {
System.err.println("Unable to get session manager");
return;
}
@ -346,8 +346,8 @@ public class CollaborationGroupView extends ViewPart {
String sessionId = null;
try {
sessionId = dataManager.createCollaborationSession(
result.getName(), result.getSubject());
sessionId = manager.createCollaborationSession(result.getName(),
result.getSubject());
} catch (Exception e) {
e.printStackTrace();
} finally {
@ -541,7 +541,7 @@ public class CollaborationGroupView extends ViewPart {
activeSessionGroup.setSessionRoot(true);
topLevel.addChild(activeSessionGroup);
populateActiveSessions(activeSessionGroup);
populateActiveSessions();
// TODO get from server.
for (String g : new String[] { "Mybuddy1", "buddy1" }) {
@ -582,12 +582,12 @@ public class CollaborationGroupView extends ViewPart {
}
private void refreshActiveSessions() {
activeSessionGroup.removeChildren();
populateActiveSessions(activeSessionGroup);
populateActiveSessions();
usersTreeViewer.refresh(activeSessionGroup, true);
}
private void populateActiveSessions(SessionGroup sessionGroup) {
private void populateActiveSessions() {
activeSessionGroup.removeChildren();
Collection<IVenueInfo> venuList = CollaborationDataManager
.getInstance().getSessionManager().getVenueInfo();
for (IVenueInfo venu : venuList) {
@ -598,7 +598,7 @@ public class CollaborationGroupView extends ViewPart {
if (venu.getParticipantCount() > 0) {
// TODO add current participants of the venu here.
}
sessionGroup.addChild(gp);
activeSessionGroup.addChild(gp);
}
}

6
cave/com.raytheon.uf.viz.collaboration.ui/src/com/raytheon/uf/viz/collaboration/ui/login/LoginDialog.java
View file

@ -104,14 +104,14 @@ public class LoginDialog extends CaveSWTDialogBase {
| GridData.HORIZONTAL_ALIGN_FILL));
// TODO Get user name based on linux log in name and the virtual sever
// from configuration then combine to make this label
userTF.setText("rferrel");
// userTF.setText("rferrel");
label = new Label(body, SWT.NONE);
label.setText("Sever");
label.setText("Server");
serverTF = new Text(body, SWT.BORDER);
serverTF.setLayoutData(new GridData(GridData.GRAB_HORIZONTAL
| GridData.HORIZONTAL_ALIGN_FILL));
serverTF.setText("awipscm.omaha.us.ray.com");
// serverTF.setText("awipscm.omaha.us.ray.com");
label = new Label(body, SWT.NONE);
label.setText("Password: ");