From dd7a68d46c94972e519c8b7de964ac0ac82cf3b8 Mon Sep 17 00:00:00 2001 From: "minkee.lee" Date: Thu, 20 Aug 2015 11:44:50 +0900 Subject: [PATCH] ui: fixed nine patch button dispose. - (W/A) Nine patch image resources will be disposed by ImageResources's dispose function call. Change-Id: I32bacdba9099c9bd4e1df1065d68402e6cce0921 Signed-off-by: minkee.lee --- .../ui/renewal/widgets/ButtonResourceInfo.java | 7 ------- .../manager/ui/renewal/widgets/ImageButton.java | 5 ----- .../ui/renewal/widgets/NinePatchButton.java | 5 ----- .../ui/renewal/widgets/NinePatchResourceInfo.java | 24 ---------------------- 4 files changed, 41 deletions(-) diff --git a/src/org/tizen/emulator/manager/ui/renewal/widgets/ButtonResourceInfo.java b/src/org/tizen/emulator/manager/ui/renewal/widgets/ButtonResourceInfo.java index a2d8830..646dd17 100644 --- a/src/org/tizen/emulator/manager/ui/renewal/widgets/ButtonResourceInfo.java +++ b/src/org/tizen/emulator/manager/ui/renewal/widgets/ButtonResourceInfo.java @@ -99,11 +99,4 @@ public class ButtonResourceInfo { public NinePatchResourceInfo getDisableImages() { return map.get(disableState); } - - public void dispose() { - for (WSTATE key : map.keySet()) { - NinePatchResourceInfo resource = map.get(key); - resource.dispose(); - } - } } diff --git a/src/org/tizen/emulator/manager/ui/renewal/widgets/ImageButton.java b/src/org/tizen/emulator/manager/ui/renewal/widgets/ImageButton.java index 6354640..cec7560 100644 --- a/src/org/tizen/emulator/manager/ui/renewal/widgets/ImageButton.java +++ b/src/org/tizen/emulator/manager/ui/renewal/widgets/ImageButton.java @@ -312,10 +312,6 @@ public class ImageButton extends Canvas { return new Point(width, height); } - public void disposeWidget() { - - } - private final DisposeListener disposeListener = new DisposeListener() { @Override @@ -326,7 +322,6 @@ public class ImageButton extends Canvas { WidgetHelper.tryDispose(images.get(i), colors.get(i), fontColors.get(i), fonts.get(i)); } WidgetHelper.tryDispose(nomalImage, hoverImage, pushImage, disableImage); - disposeWidget(); } }; diff --git a/src/org/tizen/emulator/manager/ui/renewal/widgets/NinePatchButton.java b/src/org/tizen/emulator/manager/ui/renewal/widgets/NinePatchButton.java index 133aa2d..11031b9 100644 --- a/src/org/tizen/emulator/manager/ui/renewal/widgets/NinePatchButton.java +++ b/src/org/tizen/emulator/manager/ui/renewal/widgets/NinePatchButton.java @@ -101,9 +101,4 @@ public abstract class NinePatchButton extends ImageButton { Rectangle rect = image.getBounds(); gc.drawImage(image, rect.x, rect.y); } - - @Override - public void disposeWidget() { - getButtonResourceInfo().dispose(); - } } diff --git a/src/org/tizen/emulator/manager/ui/renewal/widgets/NinePatchResourceInfo.java b/src/org/tizen/emulator/manager/ui/renewal/widgets/NinePatchResourceInfo.java index 5272492..b0a1b4b 100644 --- a/src/org/tizen/emulator/manager/ui/renewal/widgets/NinePatchResourceInfo.java +++ b/src/org/tizen/emulator/manager/ui/renewal/widgets/NinePatchResourceInfo.java @@ -33,8 +33,6 @@ package org.tizen.emulator.manager.ui.renewal.widgets; import java.util.HashMap; import java.util.Map; -import org.eclipse.swt.graphics.Color; -import org.eclipse.swt.graphics.Image; import org.tizen.emulator.manager.renewal.resources.ColorResources; import org.tizen.emulator.manager.renewal.resources.ImageResources; @@ -103,26 +101,4 @@ public class NinePatchResourceInfo { public ColorResources getBackground() { return background; } - - public void dispose() { - if (map != null) { - for (String key : map.keySet()) { - ImageResources ir = map.get(key); - if (ir != null) { - Image obj = ir.getImageObject(); - if (obj != null) { - obj.dispose(); - } - } - } - } - - if (background != null) { - Color obj = background.getColorObject(); - if (obj != null) { - obj.dispose(); - } - } - } - } -- 2.7.4