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

Issue #1818 - Added an isDisposed check to the Attributes Dialog open action

Browse source 
Change-Id: Icb0c6fd5112cc11b796aaa74c8afc9b10760f2dc

Former-commit-id: 86e0184414 [formerly 593cb668bf] [formerly 7118f04843 [formerly c0e79f8fa9cfd55a86d48130fa7ff448ae5231b0]]
Former-commit-id: 7118f04843
Former-commit-id: c682fb2e9a
This commit is contained in:
Mike Duff 2013-03-24 12:21:51 -05:00
parent a2e5e18810
commit fcb46897e3
1 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java
View file

@ -116,7 +116,9 @@ import com.raytheon.viz.ui.dialogs.ICloseCallback;
* Feb 10, 2013 1584 mpduff Add performance logging.
* Feb 28, 2013 1729 dhladky Adjusted the way in which the dialog load thread rejoins the main GUI thread.
* Mar 01, 2013 13228 gzhang Adding field rowName for VGB in County
* Mar 24, 2013 1818 mpduff Fixed Attributes dialog on multiple opens, needed an isDisposed check.
* </pre>
*
* @author lvenable
* @version 1.0
*/
@ -255,8 +257,9 @@ public class FfmpBasinTableDlg extends CaveSWTDialog implements
private FFMPTableDataLoader dataRetrieveThread = null;
private boolean groupLabelFlag = true;
private String rowName="";// DR 13228
private String rowName = "";// DR 13228
/**
* Statistics load event.
*/
@ -1084,7 +1087,8 @@ public class FfmpBasinTableDlg extends CaveSWTDialog implements
// Loop over enum from config singleton to create menu items
for (ThreshColNames colName : ThreshColNames.values()) {
if (ffmpConfig.isColorCell(colName) && (colName != ThreshColNames.GUID)) {// DR 14907
if (ffmpConfig.isColorCell(colName)
&& (colName != ThreshColNames.GUID)) {// DR 14907
// only add a menu item if colorCell is true
MenuItem mi = new MenuItem(popupMenu, SWT.NONE);
mi.setText(colName.name());
@ -1304,7 +1308,7 @@ public class FfmpBasinTableDlg extends CaveSWTDialog implements
}
private void displayAttributesDlg() {
if (attributeDlg == null) {
if (attributeDlg == null || attributeDlg.isDisposed()) {
attrData = ffmpTable.getVisibleColumns();
attributeDlg = new AttributesDlg(shell, resource, attrData, this);
}
@ -1770,7 +1774,7 @@ public class FfmpBasinTableDlg extends CaveSWTDialog implements
|| allOnlySmallBasinsMI.getSelection()) {
groupLbl.setText(name);
}
rowName=name;// DR 13228
rowName = name;// DR 13228
shell.setCursor(getDisplay().getSystemCursor(SWT.CURSOR_WAIT));
fireScreenRecenterEvent(pfaf, 1);
}
@ -2089,7 +2093,7 @@ public class FfmpBasinTableDlg extends CaveSWTDialog implements
public void updateLoadingLabel(FFMPLoaderStatus status) {
this.loadStatus = status;
if (dataLoadComp == null) {
return;
}
@ -2192,7 +2196,7 @@ public class FfmpBasinTableDlg extends CaveSWTDialog implements
if (!this.isDisposed()) {
VizApp.runAsync(new Runnable() {
VizApp.runAsync(new Runnable() {
@Override
public void run() {
processUpdate(fupdateData);
@ -2243,9 +2247,9 @@ public class FfmpBasinTableDlg extends CaveSWTDialog implements
groupLbl.setText("");
}
}
// DR 13228
public String getRowName(){
return this.rowName;
public String getRowName() {
return this.rowName;
}
}