From 8d74f0dc4bd847ec5c6ce4fb4cf41656090516fe Mon Sep 17 00:00:00 2001 From: Pawel Piech Date: Fri, 18 Apr 2008 18:41:48 +0000 Subject: [PATCH] [227643] Switched to use ILabelUpdate.getColumnIds() instead of IPresentationContext.getColumns(). --- .../provisional/ui/viewmodel/launch/StackFramesVMNode.java | 2 +- .../provisional/ui/viewmodel/modules/ModulesVMNode.java | 2 +- .../ui/viewmodel/register/RegisterBitFieldVMNode.java | 2 +- .../ui/viewmodel/register/RegisterGroupVMNode.java | 2 +- .../provisional/ui/viewmodel/register/RegisterVMNode.java | 2 +- .../provisional/ui/viewmodel/variable/VariableVMNode.java | 4 ++-- .../src/org/eclipse/dd/dsf/ui/viewmodel/AbstractVMNode.java | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/internal/provisional/ui/viewmodel/launch/StackFramesVMNode.java b/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/internal/provisional/ui/viewmodel/launch/StackFramesVMNode.java index aa89b9e9cbd..046b2830e2f 100644 --- a/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/internal/provisional/ui/viewmodel/launch/StackFramesVMNode.java +++ b/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/internal/provisional/ui/viewmodel/launch/StackFramesVMNode.java @@ -200,7 +200,7 @@ public class StackFramesVMNode extends AbstractDMVMNode * If columns are configured, call the protected methods to * fill in column values. */ - String[] localColumns = update.getPresentationContext().getColumns(); + String[] localColumns = update.getColumnIds(); if (localColumns == null) localColumns = new String[] { null }; for (int i = 0; i < localColumns.length; i++) { diff --git a/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/internal/provisional/ui/viewmodel/modules/ModulesVMNode.java b/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/internal/provisional/ui/viewmodel/modules/ModulesVMNode.java index 2714b2d606b..cdcef5106ba 100644 --- a/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/internal/provisional/ui/viewmodel/modules/ModulesVMNode.java +++ b/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/internal/provisional/ui/viewmodel/modules/ModulesVMNode.java @@ -109,7 +109,7 @@ public class ModulesVMNode extends AbstractDMVMNode * If columns are configured, call the protected methods to * fill in column values. */ - String[] localColumns = update.getPresentationContext().getColumns(); + String[] localColumns = update.getColumnIds(); if (localColumns == null) localColumns = new String[] { null }; for (int i = 0; i < localColumns.length; i++) { diff --git a/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/internal/provisional/ui/viewmodel/register/RegisterBitFieldVMNode.java b/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/internal/provisional/ui/viewmodel/register/RegisterBitFieldVMNode.java index 9abb624b0a6..794f05b64ac 100644 --- a/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/internal/provisional/ui/viewmodel/register/RegisterBitFieldVMNode.java +++ b/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/internal/provisional/ui/viewmodel/register/RegisterBitFieldVMNode.java @@ -299,7 +299,7 @@ public class RegisterBitFieldVMNode extends AbstractExpressionVMNode * which need data extraction they need to be added in both "for" * loops. */ - String[] localColumns = update.getPresentationContext().getColumns(); + String[] localColumns = update.getColumnIds(); if (localColumns == null) localColumns = new String[] { IDebugVMConstants.COLUMN_ID__NAME }; boolean weAreExtractingFormattedData = false; diff --git a/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/internal/provisional/ui/viewmodel/register/RegisterGroupVMNode.java b/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/internal/provisional/ui/viewmodel/register/RegisterGroupVMNode.java index 6c93c0ad4cd..0aaef9ffd5a 100644 --- a/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/internal/provisional/ui/viewmodel/register/RegisterGroupVMNode.java +++ b/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/internal/provisional/ui/viewmodel/register/RegisterGroupVMNode.java @@ -196,7 +196,7 @@ public class RegisterGroupVMNode extends AbstractExpressionVMNode * If columns are configured, call the protected methods to * fill in column values. */ - String[] localColumns = update.getPresentationContext().getColumns(); + String[] localColumns = update.getColumnIds(); if (localColumns == null) localColumns = new String[] { null }; for (int i = 0; i < localColumns.length; i++) { diff --git a/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/internal/provisional/ui/viewmodel/register/RegisterVMNode.java b/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/internal/provisional/ui/viewmodel/register/RegisterVMNode.java index 22d0980ac67..e89abf4a8d3 100644 --- a/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/internal/provisional/ui/viewmodel/register/RegisterVMNode.java +++ b/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/internal/provisional/ui/viewmodel/register/RegisterVMNode.java @@ -301,7 +301,7 @@ public class RegisterVMNode extends AbstractExpressionVMNode * which need data extraction they need to be added in both "for" * loops. */ - String[] localColumns = update.getPresentationContext().getColumns(); + String[] localColumns = update.getColumnIds(); if (localColumns == null) localColumns = new String[] { IDebugVMConstants.COLUMN_ID__NAME }; boolean weAreExtractingFormattedData = false; diff --git a/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/internal/provisional/ui/viewmodel/variable/VariableVMNode.java b/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/internal/provisional/ui/viewmodel/variable/VariableVMNode.java index 160194a26a1..c106b6f146a 100644 --- a/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/internal/provisional/ui/viewmodel/variable/VariableVMNode.java +++ b/plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/internal/provisional/ui/viewmodel/variable/VariableVMNode.java @@ -238,7 +238,7 @@ public class VariableVMNode extends AbstractExpressionVMNode * one or more variables at that given instance in time are not evaluatable. They * may be out of scope and will come back into scope later. */ - String[] localColumns = update.getPresentationContext().getColumns(); + String[] localColumns = update.getColumnIds(); if (localColumns == null) localColumns = new String[] { IDebugVMConstants.COLUMN_ID__NAME }; @@ -266,7 +266,7 @@ public class VariableVMNode extends AbstractExpressionVMNode // processing flag so we know we have further work to do. If there are more columns // which need data extraction they need to be added in both "for" loops. - String[] localColumns = update.getPresentationContext().getColumns(); + String[] localColumns = update.getColumnIds(); if (localColumns == null) localColumns = new String[] { IDebugVMConstants.COLUMN_ID__NAME }; diff --git a/plugins/org.eclipse.dd.dsf.ui/src/org/eclipse/dd/dsf/ui/viewmodel/AbstractVMNode.java b/plugins/org.eclipse.dd.dsf.ui/src/org/eclipse/dd/dsf/ui/viewmodel/AbstractVMNode.java index cb7ed0723ea..f52dc404d36 100644 --- a/plugins/org.eclipse.dd.dsf.ui/src/org/eclipse/dd/dsf/ui/viewmodel/AbstractVMNode.java +++ b/plugins/org.eclipse.dd.dsf.ui/src/org/eclipse/dd/dsf/ui/viewmodel/AbstractVMNode.java @@ -89,7 +89,7 @@ abstract public class AbstractVMNode implements IVMNode { ((IChildrenCountUpdate)update).setChildCount(0); } else if (update instanceof ILabelUpdate) { ILabelUpdate labelUpdate = (ILabelUpdate)update; - String[] columns = labelUpdate.getPresentationContext().getColumns(); + String[] columns = labelUpdate.getColumnIds(); for (int i = 0; i < (columns != null ? columns.length : 1); i++) { labelUpdate.setLabel("...", i); //$NON-NLS-1$ }