aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPawel Piech2012-05-18 18:42:25 (EDT)
committerEugene Tarassov2012-05-18 20:02:00 (EDT)
commit85aa44b17ef1745b10bb24517882aebc7005d25a (patch)
tree47cc6208dd3692bd08b3546e14e2a8b391482969
parent6bfd898fc51ed4880c778384f41d9b91dfad14a2 (diff)
downloadorg.eclipse.tcf-85aa44b17ef1745b10bb24517882aebc7005d25a.zip
org.eclipse.tcf-85aa44b17ef1745b10bb24517882aebc7005d25a.tar.gz
org.eclipse.tcf-85aa44b17ef1745b10bb24517882aebc7005d25a.tar.bz2
Bug 379455 - [breakpoints] Add an option to group breakpoints by their configured filter setting
Add scope icon for the brekpoints view's Group By menu.
-rw-r--r--plugins/org.eclipse.tcf.cdt.ui/icons/obj16/bp_scope.gif (renamed from plugins/org.eclipse.tcf.debug.ui/icons/bp_scope.gif)bin247 -> 247 bytes
-rw-r--r--plugins/org.eclipse.tcf.cdt.ui/plugin.xml1
-rw-r--r--plugins/org.eclipse.tcf.cdt.ui/src/org/eclipse/tcf/internal/cdt/ui/ImageCache.java13
3 files changed, 11 insertions, 3 deletions
diff --git a/plugins/org.eclipse.tcf.debug.ui/icons/bp_scope.gif b/plugins/org.eclipse.tcf.cdt.ui/icons/obj16/bp_scope.gif
index c1d23f0..c1d23f0 100644
--- a/plugins/org.eclipse.tcf.debug.ui/icons/bp_scope.gif
+++ b/plugins/org.eclipse.tcf.cdt.ui/icons/obj16/bp_scope.gif
Binary files differ
diff --git a/plugins/org.eclipse.tcf.cdt.ui/plugin.xml b/plugins/org.eclipse.tcf.cdt.ui/plugin.xml
index abaa5d2..905a9f7 100644
--- a/plugins/org.eclipse.tcf.cdt.ui/plugin.xml
+++ b/plugins/org.eclipse.tcf.cdt.ui/plugin.xml
@@ -368,6 +368,7 @@
point="org.eclipse.debug.ui.breakpointOrganizers">
<breakpointOrganizer
class="org.eclipse.tcf.internal.cdt.ui.breakpoints.BreakpointScopeOrganizer"
+ icon="icons/obj16/bp_scope.gif"
id="org.eclipse.tcf.cdt.ui.breakpointScopeGroup"
label="%breakpointScope.label">
</breakpointOrganizer>
diff --git a/plugins/org.eclipse.tcf.cdt.ui/src/org/eclipse/tcf/internal/cdt/ui/ImageCache.java b/plugins/org.eclipse.tcf.cdt.ui/src/org/eclipse/tcf/internal/cdt/ui/ImageCache.java
index 7f71861..d7a5af4 100644
--- a/plugins/org.eclipse.tcf.cdt.ui/src/org/eclipse/tcf/internal/cdt/ui/ImageCache.java
+++ b/plugins/org.eclipse.tcf.cdt.ui/src/org/eclipse/tcf/internal/cdt/ui/ImageCache.java
@@ -27,7 +27,7 @@ public class ImageCache {
IMG_TARGET_TAB = "icons/target_tab.gif";
public static final String
- IMG_BREAKPOINT_SCOPE = "icons/bp_scope.gif";
+ IMG_BREAKPOINT_SCOPE = "icons/obj16/bp_scope.gif";
private static final Map<String,ImageDescriptor> desc_cache = new HashMap<String,ImageDescriptor>();
private static final Map<ImageDescriptor,Image> image_cache = new HashMap<ImageDescriptor,Image>();
@@ -36,17 +36,24 @@ public class ImageCache {
if (name == null) return null;
ImageDescriptor descriptor = desc_cache.get(name);
if (descriptor == null) {
- Bundle bundle = Platform.getBundle("org.eclipse.tcf.debug.ui");
+ Bundle bundle = Activator.getDefault().getBundle();
if (bundle != null){
URL url = FileLocator.find(bundle, new Path(name), null);
if (url != null) descriptor = ImageDescriptor.createFromURL(url);
}
if (descriptor == null) {
- bundle = Platform.getBundle("org.eclipse.debug.ui");
+ bundle = Platform.getBundle("org.eclipse.tcf.debug.ui");
if (bundle != null){
URL url = FileLocator.find(bundle, new Path(name), null);
if (url != null) descriptor = ImageDescriptor.createFromURL(url);
}
+ if (descriptor == null) {
+ bundle = Platform.getBundle("org.eclipse.debug.ui");
+ if (bundle != null){
+ URL url = FileLocator.find(bundle, new Path(name), null);
+ if (url != null) descriptor = ImageDescriptor.createFromURL(url);
+ }
+ }
}
if (descriptor == null) {
descriptor = ImageDescriptor.getMissingImageDescriptor();