Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authora_mergey@yahoo.fr2014-07-04 12:39:49 +0000
committera_mergey@yahoo.fr2014-07-04 12:39:49 +0000
commitbf2f640a6fad0a98743f5c0808e9c164caede2fa (patch)
treec2b0fae90de78ec44c00740bb1cc9692778e0823
parentfd96595be9af85187aaff74f8ae2625540838a50 (diff)
downloadorg.eclipse.rap.incubator.gef-bf2f640a6fad0a98743f5c0808e9c164caede2fa.tar.gz
org.eclipse.rap.incubator.gef-bf2f640a6fad0a98743f5c0808e9c164caede2fa.tar.xz
org.eclipse.rap.incubator.gef-bf2f640a6fad0a98743f5c0808e9c164caede2fa.zip
Fix Graphic is disposed issue cause by statif FontManager
-rw-r--r--bundles/org.eclipse.rap.gef/src/org/eclipse/gef/ui/palette/FlyoutPaletteComposite.java15
1 files changed, 14 insertions, 1 deletions
diff --git a/bundles/org.eclipse.rap.gef/src/org/eclipse/gef/ui/palette/FlyoutPaletteComposite.java b/bundles/org.eclipse.rap.gef/src/org/eclipse/gef/ui/palette/FlyoutPaletteComposite.java
index 3682e67..76f0335 100644
--- a/bundles/org.eclipse.rap.gef/src/org/eclipse/gef/ui/palette/FlyoutPaletteComposite.java
+++ b/bundles/org.eclipse.rap.gef/src/org/eclipse/gef/ui/palette/FlyoutPaletteComposite.java
@@ -105,7 +105,12 @@ import org.eclipse.gef.ui.views.palette.PaletteView;
*/
public class FlyoutPaletteComposite extends Composite {
- private static final FontManager FONT_MGR = new FontManager();
+ // RAP [am] using static here can result in Graphic is disposed issue in RAP
+ // as Font retrieved from JFace registry are disposed at the end of the
+ // session
+ // private static final FontManager FONT_MGR = new FontManager();
+ private final FontManager FONT_MGR = new FontManager();
+ // ENDRAP
private static final String PROPERTY_PALETTE_WIDTH = "org.eclipse.gef.ui.palette.fpa.paletteWidth"; //$NON-NLS-1$
private static final String PROPERTY_STATE = "org.eclipse.gef.ui.palette.fpa.state"; //$NON-NLS-1$
@@ -237,6 +242,14 @@ public class FlyoutPaletteComposite extends Composite {
});
}
+ // RAP [am] we need to dispose FONT_MGR
+ public void dispose() {
+ FONT_MGR.dispose();
+ super.dispose();
+ }
+
+ // ENDRAP
+
private void addListenerToCtrlHierarchy(Control parent, int eventType,
Listener listener) {
parent.addListener(eventType, listener);

Back to the top