From c13ca2f81b282dcf703e4853f76468e934dfed42 Mon Sep 17 00:00:00 2001 From: Matt Nash Date: Mon, 11 Jun 2012 15:34:49 -0500 Subject: [PATCH] issue #693 always allow to invite users after opening create session dialog Former-commit-id: 179f2d7ffeb822504c1762898ca376ccfce79366 [formerly 9f2d97fa68f14d1364528aced1511db5cee84471] [formerly 179f2d7ffeb822504c1762898ca376ccfce79366 [formerly 9f2d97fa68f14d1364528aced1511db5cee84471] [formerly b78d86bf0416f7a45a7860f30af0ce0272233f64 [formerly 204c35530bbe8c7e39749d70331ceb93c4d4a790]]] Former-commit-id: b78d86bf0416f7a45a7860f30af0ce0272233f64 Former-commit-id: 4b5af450d159d65401c0ea3858b7b28cce937f80 [formerly 03ee9d8a9041dd071d2e9da4aec31b6d10fa8b8d] Former-commit-id: 3e54a2fd18956aa44a99ff018eb6c4309a66c215 --- .../ui/CollaborationGroupView.java | 2 +- .../collaboration/ui/CreateSessionDialog.java | 83 +++++++++---------- 2 files changed, 40 insertions(+), 45 deletions(-) diff --git a/cave/com.raytheon.uf.viz.collaboration.ui/src/com/raytheon/uf/viz/collaboration/ui/CollaborationGroupView.java b/cave/com.raytheon.uf.viz.collaboration.ui/src/com/raytheon/uf/viz/collaboration/ui/CollaborationGroupView.java index 8b0c37855b..90a651ff63 100644 --- a/cave/com.raytheon.uf.viz.collaboration.ui/src/com/raytheon/uf/viz/collaboration/ui/CollaborationGroupView.java +++ b/cave/com.raytheon.uf.viz.collaboration.ui/src/com/raytheon/uf/viz/collaboration/ui/CollaborationGroupView.java @@ -1064,7 +1064,7 @@ public class CollaborationGroupView extends CaveFloatingView implements } CreateSessionDialog dialog = new CreateSessionDialog(Display - .getCurrent().getActiveShell(), getSelectedUsers().size() > 0); + .getCurrent().getActiveShell()); dialog.open(); CreateSessionData result = (CreateSessionData) dialog.getReturnValue(); diff --git a/cave/com.raytheon.uf.viz.collaboration.ui/src/com/raytheon/uf/viz/collaboration/ui/CreateSessionDialog.java b/cave/com.raytheon.uf.viz.collaboration.ui/src/com/raytheon/uf/viz/collaboration/ui/CreateSessionDialog.java index e32b2e9040..da1a3fd9ed 100644 --- a/cave/com.raytheon.uf.viz.collaboration.ui/src/com/raytheon/uf/viz/collaboration/ui/CreateSessionDialog.java +++ b/cave/com.raytheon.uf.viz.collaboration.ui/src/com/raytheon/uf/viz/collaboration/ui/CreateSessionDialog.java @@ -76,15 +76,12 @@ public class CreateSessionDialog extends CaveSWTDialog { private Button inviteUsers; - private boolean showInvite; - private StyledText inviteMessageTF; private Label inviteLabel; - public CreateSessionDialog(Shell parentShell, boolean showInvite) { + public CreateSessionDialog(Shell parentShell) { super(parentShell); - this.showInvite = showInvite; setText("Create Session"); } @@ -122,49 +119,47 @@ public class CreateSessionDialog extends CaveSWTDialog { sharedSessionDisplay.setLayoutData(gd); sharedSessionDisplay.setText("Create Shared Display Session"); - if (showInvite) { - inviteUsers = new Button(body, SWT.CHECK); - inviteUsers.setSelection(true); - gd = new GridData(SWT.DEFAULT, SWT.DEFAULT, false, false); - gd.horizontalSpan = 2; - inviteUsers.setLayoutData(gd); - inviteUsers.setText("Invite Selected Users"); - // inviteUsers.setSelection(true); - inviteUsers.setVisible(true); - // label = new Label(body, SWT.NONE); - // label.setText(""); - // label.setVisible(showInvite); - inviteLabel = new Label(body, SWT.NONE); - inviteLabel.setText("Message: "); - inviteLabel.setToolTipText("Message to send to invited users"); - inviteMessageTF = new StyledText(body, SWT.BORDER | SWT.MULTI - | SWT.WRAP | SWT.V_SCROLL); - inviteMessageTF.setLayoutData(new GridData(GridData.FILL_BOTH)); - inviteMessageTF.pack(); - inviteMessageTF.setToolTipText("Message to send to invited users"); - Point p = inviteMessageTF.getSize(); - gd = (GridData) inviteMessageTF.getLayoutData(); - gd.heightHint = p.y * 3; - inviteUsers.addSelectionListener(new SelectionListener() { + inviteUsers = new Button(body, SWT.CHECK); + inviteUsers.setSelection(true); + gd = new GridData(SWT.DEFAULT, SWT.DEFAULT, false, false); + gd.horizontalSpan = 2; + inviteUsers.setLayoutData(gd); + inviteUsers.setText("Invite Selected Users"); + // inviteUsers.setSelection(true); + inviteUsers.setVisible(true); + // label = new Label(body, SWT.NONE); + // label.setText(""); + // label.setVisible(showInvite); + inviteLabel = new Label(body, SWT.NONE); + inviteLabel.setText("Message: "); + inviteLabel.setToolTipText("Message to send to invited users"); + inviteMessageTF = new StyledText(body, SWT.BORDER | SWT.MULTI + | SWT.WRAP | SWT.V_SCROLL); + inviteMessageTF.setLayoutData(new GridData(GridData.FILL_BOTH)); + inviteMessageTF.pack(); + inviteMessageTF.setToolTipText("Message to send to invited users"); + Point p = inviteMessageTF.getSize(); + gd = (GridData) inviteMessageTF.getLayoutData(); + gd.heightHint = p.y * 3; + inviteUsers.addSelectionListener(new SelectionListener() { - @Override - public void widgetSelected(SelectionEvent e) { - boolean selected = ((Button) e.widget).getSelection(); - inviteLabel.setVisible(selected); - inviteMessageTF.setVisible(selected); - } + @Override + public void widgetSelected(SelectionEvent e) { + boolean selected = ((Button) e.widget).getSelection(); + inviteLabel.setVisible(selected); + inviteMessageTF.setVisible(selected); + } - @Override - public void widgetDefaultSelected(SelectionEvent e) { - boolean selected = ((Button) e.widget).getSelection(); - inviteLabel.setVisible(selected); - inviteMessageTF.setVisible(selected); + @Override + public void widgetDefaultSelected(SelectionEvent e) { + boolean selected = ((Button) e.widget).getSelection(); + inviteLabel.setVisible(selected); + inviteMessageTF.setVisible(selected); - } - }); - inviteLabel.setVisible(true); - inviteMessageTF.setVisible(true); - } + } + }); + inviteLabel.setVisible(true); + inviteMessageTF.setVisible(true); return body; }