From 03986e7dde4cae44fd5d15e497104b50950a6ea1 Mon Sep 17 00:00:00 2001 From: Pawel Piech Date: Wed, 11 Mar 2009 20:55:47 +0000 Subject: [PATCH] [225650] - [view model] Convert debug views' view model implementation to use IElementPropertyProvider. --- .../cdt/examples/dsf/timers/TimersVMNode.java | 13 +++++-------- .../cdt/examples/dsf/timers/TriggersVMNode.java | 15 ++++++--------- 2 files changed, 11 insertions(+), 17 deletions(-) diff --git a/dsf/org.eclipse.cdt.examples.dsf/src/org/eclipse/cdt/examples/dsf/timers/TimersVMNode.java b/dsf/org.eclipse.cdt.examples.dsf/src/org/eclipse/cdt/examples/dsf/timers/TimersVMNode.java index bba6d1f1ed3..aa67b4309d4 100644 --- a/dsf/org.eclipse.cdt.examples.dsf/src/org/eclipse/cdt/examples/dsf/timers/TimersVMNode.java +++ b/dsf/org.eclipse.cdt.examples.dsf/src/org/eclipse/cdt/examples/dsf/timers/TimersVMNode.java @@ -10,7 +10,6 @@ *******************************************************************************/ package org.eclipse.cdt.examples.dsf.timers; -import java.text.MessageFormat; import java.util.concurrent.RejectedExecutionException; import org.eclipse.cdt.dsf.concurrent.ConfinedToDsfExecutor; @@ -26,7 +25,7 @@ import org.eclipse.cdt.dsf.ui.viewmodel.properties.LabelAttribute; import org.eclipse.cdt.dsf.ui.viewmodel.properties.LabelColumnInfo; import org.eclipse.cdt.dsf.ui.viewmodel.properties.LabelImage; import org.eclipse.cdt.dsf.ui.viewmodel.properties.LabelText; -import org.eclipse.cdt.dsf.ui.viewmodel.properties.PropertyBasedLabelProvider; +import org.eclipse.cdt.dsf.ui.viewmodel.properties.PropertiesBasedLabelProvider; import org.eclipse.cdt.examples.dsf.DsfExamplesPlugin; import org.eclipse.cdt.examples.dsf.timers.TimerService.TimerDMContext; import org.eclipse.debug.internal.ui.viewers.model.provisional.IChildrenUpdate; @@ -50,14 +49,13 @@ class TimersVMNode extends AbstractDMVMNode private static final String PROP_TIMER_VALUE = "alarmTriggerValue"; // Create and configure the label provider. - private static final PropertyBasedLabelProvider fgLabelProvider; + private static final PropertiesBasedLabelProvider fgLabelProvider; static { - fgLabelProvider = new PropertyBasedLabelProvider(); + fgLabelProvider = new PropertiesBasedLabelProvider(); LabelColumnInfo idCol = new LabelColumnInfo( new LabelAttribute[] { - new LabelText(new MessageFormat("Timer #{0}"), - new String[] { PROP_TIMER_NUMBER }), + new LabelText("Timer #{0}", new String[] { PROP_TIMER_NUMBER }), new LabelImage(DsfExamplesPlugin.getDefault().getImageRegistry(). getDescriptor(DsfExamplesPlugin.IMG_ALARM)) }); @@ -65,8 +63,7 @@ class TimersVMNode extends AbstractDMVMNode LabelColumnInfo valueCol = new LabelColumnInfo( new LabelAttribute[] { - new LabelText(new MessageFormat("{0}"), - new String[] { PROP_TIMER_VALUE }) + new LabelText("{0}", new String[] { PROP_TIMER_VALUE }) }); fgLabelProvider.setColumnInfo(TimersViewColumnPresentation.COL_VALUE, valueCol); diff --git a/dsf/org.eclipse.cdt.examples.dsf/src/org/eclipse/cdt/examples/dsf/timers/TriggersVMNode.java b/dsf/org.eclipse.cdt.examples.dsf/src/org/eclipse/cdt/examples/dsf/timers/TriggersVMNode.java index 4b6cef7d88a..307877527c1 100644 --- a/dsf/org.eclipse.cdt.examples.dsf/src/org/eclipse/cdt/examples/dsf/timers/TriggersVMNode.java +++ b/dsf/org.eclipse.cdt.examples.dsf/src/org/eclipse/cdt/examples/dsf/timers/TriggersVMNode.java @@ -10,7 +10,6 @@ *******************************************************************************/ package org.eclipse.cdt.examples.dsf.timers; -import java.text.MessageFormat; import java.util.concurrent.RejectedExecutionException; import org.eclipse.cdt.dsf.concurrent.ConfinedToDsfExecutor; @@ -26,7 +25,7 @@ import org.eclipse.cdt.dsf.ui.viewmodel.properties.LabelAttribute; import org.eclipse.cdt.dsf.ui.viewmodel.properties.LabelColumnInfo; import org.eclipse.cdt.dsf.ui.viewmodel.properties.LabelImage; import org.eclipse.cdt.dsf.ui.viewmodel.properties.LabelText; -import org.eclipse.cdt.dsf.ui.viewmodel.properties.PropertyBasedLabelProvider; +import org.eclipse.cdt.dsf.ui.viewmodel.properties.PropertiesBasedLabelProvider; import org.eclipse.cdt.examples.dsf.DsfExamplesPlugin; import org.eclipse.cdt.examples.dsf.timers.AlarmService.TriggerDMContext; import org.eclipse.debug.internal.ui.viewers.model.provisional.IChildrenUpdate; @@ -55,23 +54,21 @@ class TriggersVMNode extends AbstractDMVMNode private static final String PROP_TRIGGER_VALUE = "alarmTriggerValue"; // Create and configure the label provider. - private static final PropertyBasedLabelProvider fgLabelProvider; + private static final PropertiesBasedLabelProvider fgLabelProvider; static { - fgLabelProvider = new PropertyBasedLabelProvider(); + fgLabelProvider = new PropertiesBasedLabelProvider(); LabelColumnInfo idCol = new LabelColumnInfo( new LabelAttribute[] { - new LabelText(new MessageFormat("Trigger #{0}"), - new String[] { PROP_TRIGGER_NUMBER }), + new LabelText("Trigger #{0}", new String[] { PROP_TRIGGER_NUMBER }), new LabelImage(DsfExamplesPlugin.getDefault().getImageRegistry(). getDescriptor(DsfExamplesPlugin.IMG_ALARM)) }); fgLabelProvider.setColumnInfo(TimersViewColumnPresentation.COL_ID, idCol); LabelColumnInfo valueCol = new LabelColumnInfo( - new LabelAttribute[] { - new LabelText(new MessageFormat("{0}"), - new String[] { PROP_TRIGGER_VALUE }) + new LabelAttribute[] { + new LabelText("{0}", new String[] { PROP_TRIGGER_VALUE }) }); fgLabelProvider.setColumnInfo(TimersViewColumnPresentation.COL_VALUE, valueCol);