Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWilliam Chen2012-05-14 05:41:21 +0000
committerWilliam Chen2012-05-14 05:41:21 +0000
commitc30f63c097b6aadb85ec892f9518bcc4ff2d0874 (patch)
tree834d0f858221af4300ad89920d3356534bfd3be6 /target_explorer/plugins/org.eclipse.tcf.te.ui
parentc4bc14d4cdf1a5ebdc02d68f67f41650b9bd9015 (diff)
downloadorg.eclipse.tcf-c30f63c097b6aadb85ec892f9518bcc4ff2d0874.tar.gz
org.eclipse.tcf-c30f63c097b6aadb85ec892f9518bcc4ff2d0874.tar.xz
org.eclipse.tcf-c30f63c097b6aadb85ec892f9518bcc4ff2d0874.zip
Target Explorer: Display the pending node while expanding the tree node.
Diffstat (limited to 'target_explorer/plugins/org.eclipse.tcf.te.ui')
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.ui/src/org/eclipse/tcf/te/ui/trees/TreeViewerComparator.java3
-rw-r--r--target_explorer/plugins/org.eclipse.tcf.te.ui/src/org/eclipse/tcf/te/ui/trees/TreeViewerSorter.java3
2 files changed, 6 insertions, 0 deletions
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui/src/org/eclipse/tcf/te/ui/trees/TreeViewerComparator.java b/target_explorer/plugins/org.eclipse.tcf.te.ui/src/org/eclipse/tcf/te/ui/trees/TreeViewerComparator.java
index a6c5d23d5..a9222536b 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.ui/src/org/eclipse/tcf/te/ui/trees/TreeViewerComparator.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.ui/src/org/eclipse/tcf/te/ui/trees/TreeViewerComparator.java
@@ -40,6 +40,9 @@ public class TreeViewerComparator extends ViewerComparator {
@SuppressWarnings({ "rawtypes", "unchecked" })
@Override
public int compare(Viewer viewer, Object e1, Object e2) {
+ if(e1 instanceof Pending || e2 instanceof Pending) {
+ return (e1 instanceof Pending) ? (e2 instanceof Pending ? 0 : 1) : -1;
+ }
Tree tree = ((TreeViewer) viewer).getTree();
int inverter = tree.getSortDirection() == SWT.DOWN ? -1 : 1;
TreeColumn treeColumn = tree.getSortColumn();
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui/src/org/eclipse/tcf/te/ui/trees/TreeViewerSorter.java b/target_explorer/plugins/org.eclipse.tcf.te.ui/src/org/eclipse/tcf/te/ui/trees/TreeViewerSorter.java
index b10acdc37..9e633eb7b 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.ui/src/org/eclipse/tcf/te/ui/trees/TreeViewerSorter.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.ui/src/org/eclipse/tcf/te/ui/trees/TreeViewerSorter.java
@@ -32,6 +32,9 @@ public class TreeViewerSorter extends TreePathViewerSorter {
*/
@Override
public int compare(Viewer viewer, Object e1, Object e2) {
+ if(e1 instanceof Pending || e2 instanceof Pending) {
+ return (e1 instanceof Pending) ? (e2 instanceof Pending ? 0 : 1) : -1;
+ }
if (viewer != null && viewer.getControl() != null && !viewer.getControl().isDisposed()) {
return doCompare(viewer, e1, e2, doGetSortColumnLabel(viewer), doGetSortColumnIndex(viewer) , doDetermineInverter(viewer));
}

Back to the top