Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEugene Tarassov2013-04-14 12:27:03 -0400
committerEugene Tarassov2013-04-14 12:27:03 -0400
commite883bacd28d136a553b8b179aa677113e2bd746f (patch)
tree23d9d693795125083471d11654f605c4f774e34e /plugins
parent80389121ae3c37545dd5e4c5d0cc87ddf030b3bb (diff)
downloadorg.eclipse.tcf-e883bacd28d136a553b8b179aa677113e2bd746f.tar.gz
org.eclipse.tcf-e883bacd28d136a553b8b179aa677113e2bd746f.tar.xz
org.eclipse.tcf-e883bacd28d136a553b8b179aa677113e2bd746f.zip
Bug 403803 - The context extra properties should be displayed in the breakpoints properties window
Diffstat (limited to 'plugins')
-rw-r--r--plugins/org.eclipse.tcf.cdt.ui/src/org/eclipse/tcf/internal/cdt/ui/breakpoints/TCFThreadFilterEditor.java12
-rw-r--r--plugins/org.eclipse.tcf.debug.ui/src/org/eclipse/tcf/internal/debug/ui/commands/MemoryMapWidget.java2
-rw-r--r--plugins/org.eclipse.tcf.debug.ui/src/org/eclipse/tcf/internal/debug/ui/launch/ContextListControl.java15
-rw-r--r--plugins/org.eclipse.tcf.debug.ui/src/org/eclipse/tcf/internal/debug/ui/launch/TCFPathMapTab.java4
4 files changed, 22 insertions, 11 deletions
diff --git a/plugins/org.eclipse.tcf.cdt.ui/src/org/eclipse/tcf/internal/cdt/ui/breakpoints/TCFThreadFilterEditor.java b/plugins/org.eclipse.tcf.cdt.ui/src/org/eclipse/tcf/internal/cdt/ui/breakpoints/TCFThreadFilterEditor.java
index 182ffe8b5..9e8ab1ce8 100644
--- a/plugins/org.eclipse.tcf.cdt.ui/src/org/eclipse/tcf/internal/cdt/ui/breakpoints/TCFThreadFilterEditor.java
+++ b/plugins/org.eclipse.tcf.cdt.ui/src/org/eclipse/tcf/internal/cdt/ui/breakpoints/TCFThreadFilterEditor.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2004, 2012 QNX Software Systems and others.
+ * Copyright (c) 2004, 2013 QNX Software Systems and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -88,20 +88,21 @@ public class TCFThreadFilterEditor {
private final String fScopeId;
private final String fSessionId;
private final String fBpGroup;
+ private final Object fAdditionalInfo;
Context(IRunControl.RunControlContext ctx, Context parent) {
this(ctx, parent.fSessionId);
}
Context(IRunControl.RunControlContext ctx, String sessionId) {
- String name = ctx.getName() != null ? ctx.getName() : ctx.getID();
- fName = name;
+ fName = ctx.getName();
fSessionId = sessionId;
fScopeId = sessionId != null ? sessionId + '/' + ctx.getID() : ctx.getID();
fId = ctx.getID();
fParentId = ctx.getParentID();
fIsContainer = !ctx.hasState();
fBpGroup = ctx.getBPGroup();
+ fAdditionalInfo = ctx.getProperties().get("AdditionalInfo");
}
@@ -301,7 +302,10 @@ public class TCFThreadFilterEditor {
public String getText(Object element) {
if (element instanceof Context) {
Context ctx = (Context) element;
- return ctx.fName;
+ String s = ctx.fName;
+ if (s == null) s = ctx.fId;
+ if (ctx.fAdditionalInfo != null) s += ctx.fAdditionalInfo.toString();
+ return s;
}
if (element instanceof ILaunch) {
ILaunchConfiguration config = ((ILaunch) element).getLaunchConfiguration();
diff --git a/plugins/org.eclipse.tcf.debug.ui/src/org/eclipse/tcf/internal/debug/ui/commands/MemoryMapWidget.java b/plugins/org.eclipse.tcf.debug.ui/src/org/eclipse/tcf/internal/debug/ui/commands/MemoryMapWidget.java
index 25475cda1..93abdc5d9 100644
--- a/plugins/org.eclipse.tcf.debug.ui/src/org/eclipse/tcf/internal/debug/ui/commands/MemoryMapWidget.java
+++ b/plugins/org.eclipse.tcf.debug.ui/src/org/eclipse/tcf/internal/debug/ui/commands/MemoryMapWidget.java
@@ -319,7 +319,7 @@ public class MemoryMapWidget {
}
}
}
-
+
protected final TableViewer getViewer() {
return table_viewer;
}
diff --git a/plugins/org.eclipse.tcf.debug.ui/src/org/eclipse/tcf/internal/debug/ui/launch/ContextListControl.java b/plugins/org.eclipse.tcf.debug.ui/src/org/eclipse/tcf/internal/debug/ui/launch/ContextListControl.java
index ee93d532b..5707cf369 100644
--- a/plugins/org.eclipse.tcf.debug.ui/src/org/eclipse/tcf/internal/debug/ui/launch/ContextListControl.java
+++ b/plugins/org.eclipse.tcf.debug.ui/src/org/eclipse/tcf/internal/debug/ui/launch/ContextListControl.java
@@ -89,6 +89,7 @@ public class ContextListControl {
static class ContextInfo {
String name;
String id;
+ Object additional_info;
boolean is_attached;
boolean is_container;
boolean has_state;
@@ -442,6 +443,7 @@ public class ContextListControl {
info.parent = parent;
info.id = context.getID();
info.name = context.getName();
+ info.additional_info = context.getProperties().get("AdditionalInfo");
info.is_container = context.isContainer();
info.has_state = context.hasState();
info.is_attached = true;
@@ -615,11 +617,16 @@ public class ContextListControl {
bf.append(s);
}
}
- else if (info.name != null) {
- bf.append(info.name);
- }
else {
- bf.append(info.id);
+ if (info.name != null) {
+ bf.append(info.name);
+ }
+ else {
+ bf.append(info.id);
+ }
+ if (info.additional_info != null) {
+ bf.append(info.additional_info.toString());
+ }
}
item.setText(bf.toString());
item.setForeground(display.getSystemColor(SWT.COLOR_LIST_FOREGROUND));
diff --git a/plugins/org.eclipse.tcf.debug.ui/src/org/eclipse/tcf/internal/debug/ui/launch/TCFPathMapTab.java b/plugins/org.eclipse.tcf.debug.ui/src/org/eclipse/tcf/internal/debug/ui/launch/TCFPathMapTab.java
index 31d0eba9b..3ea2e2a27 100644
--- a/plugins/org.eclipse.tcf.debug.ui/src/org/eclipse/tcf/internal/debug/ui/launch/TCFPathMapTab.java
+++ b/plugins/org.eclipse.tcf.debug.ui/src/org/eclipse/tcf/internal/debug/ui/launch/TCFPathMapTab.java
@@ -181,11 +181,11 @@ public class TCFPathMapTab extends AbstractLaunchConfigurationTab {
}
});
}
-
+
protected String getColumnText(int column) {
return column_ids[column];
}
-
+
protected int getColumnWidth(int column) {
return column_size[column];
}

Back to the top