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

Issue #2375 - update notification config dialog

Browse source 
Peer review comments.

Change-Id: Idf4fa753df71ed5cd482ceb22f5b8851fbb1a716

Former-commit-id: 945ceae14a [formerly 046d98b5e7] [formerly dd361ff1f1 [formerly ec7e3683dd59401ff7365fb3095e5b695c2ba9ee]]
Former-commit-id: dd361ff1f1
Former-commit-id: b0f3cc6b34
This commit is contained in:
Mike Duff 2013-09-16 12:29:02 -05:00
parent 46166e94ec
commit 6f6dcf604b
4 changed files with 74 additions and 81 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/common/ui/TableComp.java
View file

@ -56,6 +56,7 @@ import com.raytheon.uf.viz.datadelivery.utils.DataDeliveryUtils;
* Aug 30, 2012 1120 jpiatt Added clickSort flag.
* Jan 07, 2013 1437 bgonzale updateSortDirection method now returns direction.
* Apr 10, 2013 1891 djohnson Fix sorting.
* Sep 16, 2013 2375 mpduff Fix sorting.
*
* </pre>
*
@ -247,37 +248,27 @@ public abstract class TableComp extends Composite implements
* @return SortDirection returns the determined sort direction.
*/
public SortDirection updateSortDirection(TableColumn tc,
ISortTable tableData,
boolean clickSort) {
ISortTable tableData, boolean clickSort) {
SortDirection sortDirection = SortDirection.ASCENDING;
if (!configChange) {
if (sortedColumn != null
&& tc.getText().equals(sortedColumn.getText())) {
if (sortedColumn != null && tc.getText().equals(sortedColumn.getText())) {
if (sortDirectionMap.containsKey(sortedColumn.getText())) {
sortDirection = sortDirectionMap.get(sortedColumn.getText());
if (sortDirectionMap.containsKey(sortedColumn.getText())) {
sortDirection = sortDirectionMap
.get(sortedColumn.getText());
if (clickSort) {
sortDirection = sortDirection.reverse();
}
}
sortDirectionMap.put(sortedColumn.getText(), sortDirection);
tableData.setSortDirection(sortDirection);
} else {
if (sortDirectionMap.containsKey(tc.getText())) {
tableData.setSortDirection(sortDirectionMap.get(tc
.getText()));
} else {
sortDirectionMap.put(sortedColumn.getText(), sortDirection);
tableData.setSortDirection(sortDirection);
if (clickSort) {
sortDirection = sortDirection.reverse();
}
}
sortDirectionMap.put(sortedColumn.getText(), sortDirection);
tableData.setSortDirection(sortDirection);
tableData.setSortColumn(sortedColumn.getText());
} else {
sortDirectionMap.put(sortedColumn.getText(), sortDirection);
}
sortedColumn = tc;
tableData.setSortDirection(sortDirection);
tableData.setSortColumn(sortedColumn.getText());
return sortDirection;
}

81
cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/notification/NotificationConfigDlg.java
View file

@ -65,6 +65,7 @@ import com.raytheon.viz.ui.widgets.duallist.IUpdate;
* Aug 13, 2012 430 jpiatt Modifications for sort asc & desc.
* Oct 22, 2012 1284 mpduff Code Cleanup.
* Aug 30, 2013 2314 mpduff Fixed sorting ambiguity.
* Sep 16, 2013 2375 mpduff Add apply button.
*
* </pre>
*
@ -152,7 +153,6 @@ public class NotificationConfigDlg extends CaveSWTDialog implements IUpdate {
shell.setLayoutData(gd);
readConfigFile();
createStartupGroup();
createDisplayGroup();
createBottomButtons();
loadLists();
@ -180,22 +180,24 @@ public class NotificationConfigDlg extends CaveSWTDialog implements IUpdate {
}
/**
* Create the group used on startup.
* Create the group used for immediate display.
*/
private void createStartupGroup() {
GridData gd = new GridData(SWT.FILL, SWT.DEFAULT, true, false);
private void createDisplayGroup() {
int pageSet = 0;
int i = 0;
GridData gd = new GridData(SWT.FILL, SWT.DEFAULT, true, true);
GridLayout gl = new GridLayout(1, false);
// Number of messages to load on startup
Group startupGroup = new Group(shell, SWT.NONE);
startupGroup.setLayout(gl);
startupGroup.setLayoutData(gd);
startupGroup.setText(" Initial Startup Configuration ");
startupGroup
.setToolTipText("Items which are loaded when the table is opened");
Group displayGroup = new Group(shell, SWT.NONE);
displayGroup.setLayout(gl);
displayGroup.setLayoutData(gd);
displayGroup.setText(" Display Configuration Settings ");
displayGroup
.setToolTipText("Items which refresh the table after clicking OK");
// Load all messages check box
allMsgChk = new Button(startupGroup, SWT.CHECK);
allMsgChk = new Button(displayGroup, SWT.CHECK);
allMsgChk.setText("Load All Messages");
allMsgChk.setToolTipText("Load all available messages");
allMsgChk.addSelectionListener(new SelectionAdapter() {
@ -207,7 +209,7 @@ public class NotificationConfigDlg extends CaveSWTDialog implements IUpdate {
gd = new GridData(SWT.DEFAULT, SWT.CENTER, true, false);
gl = new GridLayout(3, false);
Composite msgComp = new Composite(startupGroup, SWT.NONE);
Composite msgComp = new Composite(displayGroup, SWT.NONE);
msgComp.setLayout(gl);
msgComp.setLayoutData(gd);
@ -243,6 +245,10 @@ public class NotificationConfigDlg extends CaveSWTDialog implements IUpdate {
hourRdo.setSelection(true);
hourRdo.setToolTipText("Display last number of hours");
Label sep = new Label(displayGroup, SWT.SEPARATOR | SWT.SHADOW_OUT
| SWT.HORIZONTAL);
sep.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, true));
MessageLoadXML msgLoad = xml.getMessageLoad();
if (msgLoad != null && msgLoad.isLoadAllMessages()) {
allMsgChk.setSelection(true);
@ -260,7 +266,7 @@ public class NotificationConfigDlg extends CaveSWTDialog implements IUpdate {
// Initial Sort Combo Box
gd = new GridData(SWT.LEFT, SWT.DEFAULT, true, false);
gl = new GridLayout(3, false);
Composite sortComp = new Composite(startupGroup, SWT.NONE);
Composite sortComp = new Composite(displayGroup, SWT.NONE);
sortComp.setLayout(gl);
sortComp.setLayoutData(gd);
@ -291,24 +297,9 @@ public class NotificationConfigDlg extends CaveSWTDialog implements IUpdate {
sortDescRdo.setSelection(!sortAsc);
sortAscRdo.setSelection(sortAsc);
}
/**
* Create the group used for immediate display.
*/
private void createDisplayGroup() {
int pageSet = 0;
int i = 0;
GridData gd = new GridData(SWT.FILL, SWT.DEFAULT, true, true);
GridLayout gl = new GridLayout(1, false);
Group displayGroup = new Group(shell, SWT.NONE);
displayGroup.setLayout(gl);
displayGroup.setLayoutData(gd);
displayGroup.setText(" Display Configuration Settings ");
displayGroup
.setToolTipText("Items which refresh the table after clicking OK");
Label sep2 = new Label(displayGroup, SWT.SEPARATOR | SWT.SHADOW_OUT
| SWT.HORIZONTAL);
sep2.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, true));
// Pagination Combo Box
gd = new GridData(SWT.LEFT, SWT.DEFAULT, true, false);
@ -317,8 +308,8 @@ public class NotificationConfigDlg extends CaveSWTDialog implements IUpdate {
rowComp.setLayout(gl);
rowComp.setLayoutData(gd);
Label label = new Label(rowComp, SWT.NONE);
label.setText("Rows Per Page:");
Label rowsPerPageLabel = new Label(rowComp, SWT.NONE);
rowsPerPageLabel.setText("Rows Per Page:");
// Select rows per page combo box
pageSet = xml.getPaginationSetting();
@ -339,6 +330,10 @@ public class NotificationConfigDlg extends CaveSWTDialog implements IUpdate {
rowNumCbo.select(i);
Label sep3 = new Label(displayGroup, SWT.SEPARATOR | SWT.SHADOW_OUT
| SWT.HORIZONTAL);
sep3.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, true));
// Priority settings
gd = new GridData(SWT.LEFT, SWT.DEFAULT, true, false);
gl = new GridLayout(3, true);
@ -403,6 +398,10 @@ public class NotificationConfigDlg extends CaveSWTDialog implements IUpdate {
numNameRdo.setSelection(true);
}
Label sep4 = new Label(displayGroup, SWT.SEPARATOR | SWT.SHADOW_OUT
| SWT.HORIZONTAL);
sep4.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, true));
// Column settings
gd = new GridData(SWT.CENTER, SWT.CENTER, true, true);
gl = new GridLayout(1, false);
@ -448,6 +447,17 @@ public class NotificationConfigDlg extends CaveSWTDialog implements IUpdate {
// OK button
int buttonWidth = 75;
GridData btnData = new GridData(buttonWidth, SWT.DEFAULT);
Button applyBtn = new Button(bottomComp, SWT.PUSH);
applyBtn.setText("Apply");
applyBtn.setLayoutData(btnData);
applyBtn.addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent event) {
handleOK();
}
});
btnData = new GridData(buttonWidth, SWT.DEFAULT);
Button okBtn = new Button(bottomComp, SWT.PUSH);
okBtn.setText("OK");
okBtn.setLayoutData(btnData);
@ -455,10 +465,12 @@ public class NotificationConfigDlg extends CaveSWTDialog implements IUpdate {
@Override
public void widgetSelected(SelectionEvent event) {
handleOK();
close();
}
});
// Cancel button
btnData = new GridData(buttonWidth, SWT.DEFAULT);
Button closeBtn = new Button(bottomComp, SWT.PUSH);
closeBtn.setText("Cancel");
closeBtn.setLayoutData(btnData);
@ -542,7 +554,6 @@ public class NotificationConfigDlg extends CaveSWTDialog implements IUpdate {
configManager.setConfigXml(xml);
callback.tableChanged();
close();
}
private void updateColumnXMl(NotificationConfigXML xml, String columnName,

5
cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/notification/NotificationRowData.java
View file

@ -39,6 +39,7 @@ import com.raytheon.uf.viz.datadelivery.utils.DataDeliveryUtils.TABLE_TYPE;
* Feb 3, 2012 mpduff Initial creation
* Jun 07, 2012 687 lvenable Table data refactor.
* Aug 30, 2013 2314 mpduff Fix formatting.
* Sep 16, 2013 2375 mpduff Change date sort order.
*
* </pre>
*
@ -260,9 +261,9 @@ public class NotificationRowData implements ITableData<NotificationRowData> {
}
if (d1.before(d2)) {
return 1;
} else if (d1.after(d2)) {
return -1;
} else if (d1.after(d2)) {
return 1;
} else {
return 0;
}

32
cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/notification/NotificationTableComp.java
View file

@ -78,6 +78,7 @@ import com.raytheon.uf.viz.datadelivery.utils.NotificationHandler;
* Jan 22, 2013 1520 mpduff Update javadoc.
* Apr 25, 2013 1820 mpduff Get the column list every time.
* Aug 30, 2013 2314 mpduff Sort the table data on load.
* Sep 16, 2013 2375 mpduff Removed initial sorting.
* </pre>
*
* @author lvenable
@ -1027,31 +1028,20 @@ public class NotificationTableComp extends TableComp implements ITableFind {
tc.setResizable(false);
}
if (!initialized) {
// Find which column is configured to be the sort column
boolean sortCol = column.isSortColumn();
if (sortCol) {
sortedColumn = tc;
}
// Check if any columns set to descending
boolean sortAsc = column.isSortAsc();
if (!sortAsc) {
sortDir = SortDirection.ASCENDING;
}
sortDirectionMap.put(colName, sortDir);
} else {
if (tc.getText().equals(sortedColumnName)) {
sortedColumn = tc;
sortDirectionMap.put(tc.getText(), sortedDirectionName);
}
// Find which column is configured to be the sort column
if (column.isSortColumn()) {
sortedColumn = tc;
}
// Check if any columns set to descending
sortDir = SortDirection.DESCENDING;
if (column.isSortAsc()) {
sortDir = SortDirection.ASCENDING;
}
sortDirectionMap.put(colName, sortDir);
}
}
}
/**