From b7a80a4b69dc44dd19640c1b882a66657694b99c Mon Sep 17 00:00:00 2001 From: Lee Venable Date: Tue, 24 Sep 2013 11:23:30 -0500 Subject: [PATCH] Issue #2403 - fixed cursor memory leak. Former-commit-id: 945ee98c05afb6fb1f2d52ba07100557f1abed23 [formerly a5dcdabba20c59733afe74c966a05733c82bb736] [formerly 9141c149b09ce86245b3d813b043b38140110c2e [formerly d85cc9abd35a17f0745379ce5e3b50f9fb650efd]] [formerly e354f787c9f9e63912a79251a82e3ab01ab348b0 [formerly d85cc9abd35a17f0745379ce5e3b50f9fb650efd [formerly 724d2acb9233febf94def4a6adfd06bc73b701a8]]] Former-commit-id: e354f787c9f9e63912a79251a82e3ab01ab348b0 Former-commit-id: a45b953a23348c7d29dc7838a3543f681428ab66 [formerly 90ac5a03fa5fc3b651d9d9121f1198c5a92695b0] Former-commit-id: bc469e55da94942c3419916bafdfd5377bc52a4c --- .../viz/warngen/gui/WarngenUIManager.java | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenUIManager.java b/cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenUIManager.java index 8ce0946894..c8eb99fe4a 100644 --- a/cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenUIManager.java +++ b/cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenUIManager.java @@ -66,6 +66,7 @@ import com.vividsolutions.jts.geom.Polygon; * Mar 28, 2013 DR 15974 D. Friedman Do not track removed GIDs. * Jun 25, 2013 DR 16013 Qinglu Lin Called setUniqueFip() in handleMouseUp(). * Aug 15, 2013 DR 16418 D. Friedman Only raise dialog if editable. Don't call featureEdit if not editable. + * Sep 24, 2013 #2403 lvenable Fixed cursor memory leak. * * * @@ -94,8 +95,6 @@ public class WarngenUIManager extends InputAdapter { private final Cursor movePoint; - private final Cursor arrow; - /** The last mouse position - x */ private int lastMouseX; @@ -113,15 +112,12 @@ public class WarngenUIManager extends InputAdapter { Display display = Display.getCurrent(); - movePolygon = new Cursor(display, SWT.CURSOR_SIZEALL); - movePoint = new Cursor(display, SWT.CURSOR_HAND); - arrow = new Cursor(display, SWT.CURSOR_ARROW); + movePolygon = display.getSystemCursor(SWT.CURSOR_SIZEALL); + movePoint = display.getSystemCursor(SWT.CURSOR_HAND); } public void dispose() { warngenLayer.getResourceContainer().unregisterMouseHandler(this); - movePolygon.dispose(); - movePoint.dispose(); } /* @@ -386,8 +382,9 @@ public class WarngenUIManager extends InputAdapter { if (c2 != null) { PolygonUtil.truncate(c2, 2); if (warngenLayer.isModifiedVertexNeedsToBeUpdated()) { - int i = StormTrackUIManager.getCoordinateIndex(warngenLayer, - state.getWarningPolygon().getCoordinates(), c2); + int i = StormTrackUIManager.getCoordinateIndex( + warngenLayer, state.getWarningPolygon() + .getCoordinates(), c2); if (i != -1) { this.movePointIndex = i; } @@ -669,7 +666,7 @@ public class WarngenUIManager extends InputAdapter { public void setHandleInput(boolean handle) { handleInput = handle; if (!handle) { - getShell().setCursor(arrow); + getShell().setCursor(null); } }