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

Merge "Issue #1578 Slav's fix for disposed cursors in MonitoringAreaConfigDlg." into development

Browse source 
Former-commit-id: 362b851388 [formerly 4958257a3994d0507b256921cf459fe7f1556c97]
Former-commit-id: e4d4743ef7
This commit is contained in:
Lee Venable 2013-02-07 13:05:13 -06:00 • committed by Gerrit Code Review
commit 21792d44f9
1 changed files with 21 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/MonitoringAreaConfigDlg.java
View file

@ -26,7 +26,6 @@ import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.SelectionAdapter;
import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.graphics.Cursor;
import org.eclipse.swt.graphics.Font;
import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.layout.GridData;
@ -70,6 +69,7 @@ import com.raytheon.viz.ui.dialogs.ICloseCallback;
* Apr 29, 2011 DR#8986 zhao Read in "Counties" instead of "Forecast Zones"
* Feb 22, 2012 14413 zhao modified to reduce calls to database
* Nov 16, 2012 1297 skorolev Changes for non-blocking dialog.
* Feb 06, 2013 1578 skorolev Fixed a cursor problem for checkboxes.
*
* </pre>
*
@ -166,12 +166,6 @@ public abstract class MonitoringAreaConfigDlg extends CaveSWTDialog implements
/** The current site. **/
protected String currentSite = null;
/** Wait Cursor **/
private Cursor waitCursor = null;
/** Arrow Cursor **/
private Cursor arrowCursor = null;
/** monitor area zones **/
private java.util.List<String> maZones = null;
@ -232,8 +226,6 @@ public abstract class MonitoringAreaConfigDlg extends CaveSWTDialog implements
setText(title);
this.appName = appName;
currentSite = LocalizationManager.getInstance().getCurrentSite();
waitCursor = new Cursor(parent.getDisplay(), SWT.CURSOR_WAIT);
arrowCursor = new Cursor(parent.getDisplay(), SWT.CURSOR_ARROW);
}
/**
@ -367,11 +359,14 @@ public abstract class MonitoringAreaConfigDlg extends CaveSWTDialog implements
zoneRdo.addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent event) {
shell.setCursor(waitCursor);
getShell().setCursor(
getDisplay().getSystemCursor(SWT.CURSOR_WAIT));
mode = Mode.Zone;
changeZoneStationControls();
populateLeftLists();
shell.setCursor(arrowCursor);
if (!getShell().isDisposed()) {
getShell().setCursor(null);
}
}
});
@ -380,11 +375,14 @@ public abstract class MonitoringAreaConfigDlg extends CaveSWTDialog implements
stationRdo.addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent event) {
shell.setCursor(waitCursor);
getShell().setCursor(
getDisplay().getSystemCursor(SWT.CURSOR_WAIT));
mode = Mode.Station;
changeZoneStationControls();
populateLeftLists();
shell.setCursor(arrowCursor);
if (!getShell().isDisposed()) {
getShell().setCursor(null);
}
}
});
@ -567,9 +565,12 @@ public abstract class MonitoringAreaConfigDlg extends CaveSWTDialog implements
maRdo.addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent event) {
shell.setCursor(waitCursor);
getShell().setCursor(
getDisplay().getSystemCursor(SWT.CURSOR_WAIT));
populateMaRegionalList();
shell.setCursor(arrowCursor);
if (!getShell().isDisposed()) {
getShell().setCursor(null);
}
}
});
@ -583,9 +584,12 @@ public abstract class MonitoringAreaConfigDlg extends CaveSWTDialog implements
regionalRdo.addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent event) {
shell.setCursor(waitCursor);
getShell().setCursor(
getDisplay().getSystemCursor(SWT.CURSOR_WAIT));
populateMaRegionalList();
shell.setCursor(arrowCursor);
if (!getShell().isDisposed()) {
getShell().setCursor(null);
}
}
});
@ -1373,8 +1377,6 @@ public abstract class MonitoringAreaConfigDlg extends CaveSWTDialog implements
*/
@Override
protected void disposed() {
waitCursor.dispose();
arrowCursor.dispose();
controlFont.dispose();
}
}