Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlain Magloire2004-05-28 13:10:18 -0400
committerAlain Magloire2004-05-28 13:10:18 -0400
commita677717aa3aa795a029526f53e99d2de51eed44f (patch)
treecca772d31405a23600789c52c6957315dc37ab1a
parent7a38ea6afbc67479bedae1382c51acd2a3caa9a2 (diff)
downloadorg.eclipse.cdt-a677717aa3aa795a029526f53e99d2de51eed44f.tar.gz
org.eclipse.cdt-a677717aa3aa795a029526f53e99d2de51eed44f.tar.xz
org.eclipse.cdt-a677717aa3aa795a029526f53e99d2de51eed44f.zip
Reverse part of a patch from TF concerning
memory images. We need to look at this closer. For now it seem to break some icons. * src/org/eclipse/cdt/internal/ui/CPluginImages.java
-rw-r--r--core/org.eclipse.cdt.ui/ChangeLog8
-rw-r--r--core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CPluginImages.java23
2 files changed, 20 insertions, 11 deletions
diff --git a/core/org.eclipse.cdt.ui/ChangeLog b/core/org.eclipse.cdt.ui/ChangeLog
index d6ec8302bb..962c238d4f 100644
--- a/core/org.eclipse.cdt.ui/ChangeLog
+++ b/core/org.eclipse.cdt.ui/ChangeLog
@@ -1,5 +1,13 @@
2004-05-27 Alain Magloire
+ Reverse part of a patch from TF concerning
+ memory images. We need to look at this closer.
+ For now it seem to break some icons.
+
+ * src/org/eclipse/cdt/internal/ui/CPluginImages.java
+
+2004-05-27 Alain Magloire
+
Patch from Thomas Fletcher
- Restore bracket matching behaviour in the editor and use parent
class code for setting up the editor's OverviewRuler.
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CPluginImages.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CPluginImages.java
index c78866ec9d..afe436a989 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CPluginImages.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/CPluginImages.java
@@ -262,18 +262,19 @@ public class CPluginImages {
* Sets all available image descriptors for the given action.
*/
public static void setImageDescriptors(IAction action, String type, String relPath) {
-//Use the managed version so that we ensure that there is no resource handle leaks
-//Let the widget itself manage the disabled/hover attribution. This was a huge leak
-// relPath= relPath.substring(NAME_PREFIX_LENGTH);
-// action.setDisabledImageDescriptor(create(T + "d" + type, relPath)); //$NON-NLS-1$
-// action.setHoverImageDescriptor(create(T + "c" + type, relPath)); //$NON-NLS-1$
-// action.setImageDescriptor(create(T + "e" + type, relPath)); //$NON-NLS-1$
+ relPath= relPath.substring(NAME_PREFIX_LENGTH);
+ action.setDisabledImageDescriptor(create(T + "d" + type, relPath)); //$NON-NLS-1$
+ action.setHoverImageDescriptor(create(T + "c" + type, relPath)); //$NON-NLS-1$
+ action.setImageDescriptor(create(T + "e" + type, relPath)); //$NON-NLS-1$
- ImageDescriptor desc = getImageRegistry().getDescriptor(relPath);
- if(desc == null) {
- desc = createManaged(T + "c" + type, relPath);
- }
- action.setImageDescriptor(desc);
+ // We are still not sure about this, let see TF results first.
+ // Use the managed version so that we ensure that there is no resource handle leaks
+ // Let the widget itself manage the disabled/hover attribution. This was a huge leak
+ //ImageDescriptor desc = getImageRegistry().getDescriptor(relPath);
+ //if(desc == null) {
+ // desc = createManaged(T + "c" + type, relPath);
+ //}
+ //action.setImageDescriptor(desc);
}
/**

Back to the top