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

Merge "Omaha #3549 fix frozen time sizing" into omaha_14.4.1

Browse source 
Former-commit-id: 8cb91f471b [formerly 3acfa2eda5] [formerly 8cb91f471b [formerly 3acfa2eda5] [formerly 5ab799b56f [formerly ab453bf60d663e731dcf273aeabf07472a061d90]]]
Former-commit-id: 5ab799b56f
Former-commit-id: 436259994f [formerly a606683c81]
Former-commit-id: 729971f9c8
This commit is contained in:
Lee Venable 2014-12-03 16:49:48 -06:00 • committed by Gerrit Code Review
commit ff103b19ea
1 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/dialogs/procedures/ProcedureListDlg.java
View file

@ -74,6 +74,7 @@ import com.raytheon.viz.ui.dialogs.CaveSWTDialog;
* from magically appearing, removed dead code, * from magically appearing, removed dead code,
* and other code clean up. * and other code clean up.
* 03 Jul 2014 #3348 rferrel Handle Enter event. * 03 Jul 2014 #3348 rferrel Handle Enter event.
* 03 Dec 2014 3549 njensen Fix spacing/sizing of buttonComp
* *
* </pre> * </pre>
* *
@ -135,14 +136,14 @@ public class ProcedureListDlg extends CaveSWTDialog {
*/ */
public static enum Mode { public static enum Mode {
SAVE, OPEN, DELETE SAVE, OPEN, DELETE
}; }
/** /**
* Enumeration to determine what procedures should be shown. * Enumeration to determine what procedures should be shown.
*/ */
public static enum ShowType { public static enum ShowType {
MINE, ALL_USERS, ALL MINE, ALL_USERS, ALL
}; }
protected ShowType selectedShowType = ShowType.MINE; protected ShowType selectedShowType = ShowType.MINE;
@ -389,6 +390,7 @@ public class ProcedureListDlg extends CaveSWTDialog {
enableControls(false); enableControls(false);
Job job = new Job("Populating procedures...") { Job job = new Job("Populating procedures...") {
@Override
protected org.eclipse.core.runtime.IStatus run( protected org.eclipse.core.runtime.IStatus run(
org.eclipse.core.runtime.IProgressMonitor monitor) { org.eclipse.core.runtime.IProgressMonitor monitor) {
fileTree = populateDataList(); fileTree = populateDataList();
@ -500,12 +502,11 @@ public class ProcedureListDlg extends CaveSWTDialog {
private void createButtonComp(Composite mainComp) { private void createButtonComp(Composite mainComp) {
// Add buttom comp // Add buttom comp
Composite buttonComp = new Composite(mainComp, SWT.NONE); Composite buttonComp = new Composite(mainComp, SWT.NONE);
buttonComp.setLayout(new RowLayout(SWT.VERTICAL)); buttonComp.setLayout(new GridLayout(1, false));
GridData gd = new GridData(SWT.CENTER, SWT.FILL, false, false); GridData gd = new GridData(SWT.CENTER, SWT.FILL, false, false);
gd.widthHint = 100;
buttonComp.setLayoutData(gd); buttonComp.setLayoutData(gd);
RowData rd = new RowData(80, SWT.DEFAULT); GridData rd = new GridData(80, SWT.DEFAULT);
okBtn = new Button(buttonComp, SWT.PUSH); okBtn = new Button(buttonComp, SWT.PUSH);
okBtn.setText("Ok"); okBtn.setText("Ok");
okBtn.setLayoutData(rd); okBtn.setLayoutData(rd);
@ -517,7 +518,7 @@ public class ProcedureListDlg extends CaveSWTDialog {
} }
}); });
rd = new RowData(80, SWT.DEFAULT); rd = new GridData(80, SWT.DEFAULT);
cancelBtn = new Button(buttonComp, SWT.PUSH); cancelBtn = new Button(buttonComp, SWT.PUSH);
cancelBtn.setText("Cancel"); cancelBtn.setText("Cancel");
cancelBtn.setLayoutData(rd); cancelBtn.setLayoutData(rd);
@ -529,10 +530,8 @@ public class ProcedureListDlg extends CaveSWTDialog {
}); });
if (mode == Mode.SAVE) { if (mode == Mode.SAVE) {
rd = new RowData(100, SWT.DEFAULT);
frozenChk = new Button(buttonComp, SWT.CHECK); frozenChk = new Button(buttonComp, SWT.CHECK);
frozenChk.setText("Freeze time"); frozenChk.setText("Freeze time");
frozenChk.setLayoutData(rd);
frozenChk.setSelection(frozen); frozenChk.setSelection(frozen);
frozenChk.addSelectionListener(new SelectionAdapter() { frozenChk.addSelectionListener(new SelectionAdapter() {
@Override @Override
@ -645,7 +644,7 @@ public class ProcedureListDlg extends CaveSWTDialog {
if (tmp != null) { if (tmp != null) {
// it must be a procedure tree, that is what the content // it must be a procedure tree, that is what the content
// provider uses internally // provider uses internally
LocalizationFile selectedFile = ((ProcedureTree) tmp).getFile(); LocalizationFile selectedFile = tmp.getFile();
if (selectedFile == null) { if (selectedFile == null) {
displayOpenErrorDialog(); displayOpenErrorDialog();
@ -672,8 +671,7 @@ public class ProcedureListDlg extends CaveSWTDialog {
if (tmp != null) { if (tmp != null) {
// it must be a procedure tree, that is what the content // it must be a procedure tree, that is what the content
// provider uses internally // provider uses internally
LocalizationFile selectedFile = ((ProcedureTree) tmp) LocalizationFile selectedFile = tmp.getFile();
.getFile();
setReturnValue(selectedFile); setReturnValue(selectedFile);
} }
close(); close();