[210571] Refactored number format detail pane.

plugins/org.eclipse.dd.dsf.debug.ui/.settings/org.eclipse.core.resources.prefs

@@ -1,3 +1,3 @@
-#Fri Jul 27 14:30:56 EDT 2007
+#Tue Nov 20 14:43:47 PST 2007
 eclipse.preferences.version=1
-encoding//src/org/eclipse/dd/dsf/debug/ui/viewmodel/detailpanesupport/messages.properties=8859_1
+encoding//src/org/eclipse/dd/dsf/debug/ui/viewmodel/numberformat/detail/messages.properties=8859_1

plugins/org.eclipse.dd.dsf.debug.ui/META-INF/MANIFEST.MF

@@ -26,9 +26,9 @@ Export-Package:
  org.eclipse.dd.dsf.debug.ui.viewmodel,
  org.eclipse.dd.dsf.debug.ui.viewmodel.dm,
  org.eclipse.dd.dsf.debug.ui.viewmodel.expression,
- org.eclipse.dd.dsf.debug.ui.viewmodel.formatsupport,
  org.eclipse.dd.dsf.debug.ui.viewmodel.launch,
  org.eclipse.dd.dsf.debug.ui.viewmodel.modules,
+ org.eclipse.dd.dsf.debug.ui.viewmodel.numberformat,
  org.eclipse.dd.dsf.debug.ui.viewmodel.register,
  org.eclipse.dd.dsf.debug.ui.viewmodel.variable
 Bundle-RequiredExecutionEnvironment: J2SE-1.5

plugins/org.eclipse.dd.dsf.debug.ui/plugin.xml

@@ -211,11 +211,18 @@
    </extension>
    
 	<extension 
-	   point="org.eclipse.debug.ui.detailPaneFactories">
+	    point="org.eclipse.debug.ui.detailPaneFactories">
-       <detailFactories
+        <detailFactories
-             class="org.eclipse.dd.dsf.debug.ui.viewmodel.detailpanesupport.DetailPaneFactory"
+             class="org.eclipse.dd.dsf.debug.ui.viewmodel.numberformat.detail.NumberFormatDetailPaneFactory"
              id="org.eclipse.dd.dsf.debug.ui.viewmodel.detailPaneFactory">
-       </detailFactories>
+			<enablement>
+		        <with variable="selection">
+	        		<iterate>
+					    <instanceof value="org.eclipse.dd.dsf.debug.ui.viewmodel.numberformat.IFormattedValueVMContext"/>
+	        		</iterate>
+	      		</with>
+	      	</enablement>      
+        </detailFactories>
     </extension>
     
 </plugin>

plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/ui/DsfDebugUIPlugin.java

@@ -12,6 +12,7 @@ public class DsfDebugUIPlugin extends AbstractUIPlugin {
 	// The plug-in ID
 	public static final String PLUGIN_ID = "org.eclipse.dd.dsf.debug.ui"; //$NON-NLS-1$
 
+	
 	// The shared instance
 	private static DsfDebugUIPlugin plugin;
     
@@ -33,6 +34,7 @@ public class DsfDebugUIPlugin extends AbstractUIPlugin {
 		super.start(context);
 		plugin = this;
         fgBundleContext = context;
+
 	}
 
 	/*

plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/ui/viewmodel/detailpanesupport/Messages.java

@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Wind River 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
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     Randy Rohrbach (Wind River Systems, Inc.) - initial implementation
- *******************************************************************************/
-package org.eclipse.dd.dsf.debug.ui.viewmodel.detailpanesupport;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-public class Messages {
-    private static final String BUNDLE_NAME = "org.eclipse.dd.dsf.debug.ui.viewmodel.detailpanesupport.messages"; //$NON-NLS-1$
-
-    private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME);
-
-    private Messages() {
-    }
-
-    public static String getString(String key) {
-        try {
-            return RESOURCE_BUNDLE.getString(key);
-        } catch (MissingResourceException e) {
-            return '!' + key + '!';
-        }
-    }
-}

plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/ui/viewmodel/detailpanesupport/messages.properties

@@ -1,3 +0,0 @@
-DetailPaneFactory.0=DSF Default Detail Pane
-DetailPaneFactory.1=DSF Default Viewer
-DetailPaneFactory.2=This is the default detail pane representation for DSF assisted views

plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/ui/viewmodel/expression/ExpressionVMProvider.java

@@ -11,7 +11,7 @@
 package org.eclipse.dd.dsf.debug.ui.viewmodel.expression;
 
 import org.eclipse.dd.dsf.debug.ui.viewmodel.dm.AbstractDebugDMVMProviderWithCache;
-import org.eclipse.dd.dsf.debug.ui.viewmodel.formatsupport.FormattedValuePreferenceStore;
+import org.eclipse.dd.dsf.debug.ui.viewmodel.numberformat.FormattedValuePreferenceStore;
 import org.eclipse.dd.dsf.debug.ui.viewmodel.register.RegisterGroupLayoutNode;
 import org.eclipse.dd.dsf.debug.ui.viewmodel.register.RegisterLayoutNode;
 import org.eclipse.dd.dsf.debug.ui.viewmodel.register.SyncRegisterDataAccess;

plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/ui/viewmodel/numberformat/AbstractSetFormatStyle.java

@@ -8,7 +8,7 @@
  * Contributors:
  *     Wind River Systems - initial API and implementation
  *******************************************************************************/
-package org.eclipse.dd.dsf.debug.ui.viewmodel.formatsupport;
+package org.eclipse.dd.dsf.debug.ui.viewmodel.numberformat;
 
 import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.dd.dsf.debug.service.IFormattedValues;

plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/ui/viewmodel/numberformat/FormattedValuePreferenceStore.java

@@ -8,7 +8,7 @@
  * Contributors:
  *     Wind River Systems - initial API and implementation
  *******************************************************************************/
-package org.eclipse.dd.dsf.debug.ui.viewmodel.formatsupport;
+package org.eclipse.dd.dsf.debug.ui.viewmodel.numberformat;
 
 import org.eclipse.dd.dsf.debug.service.IFormattedValues;
 import org.eclipse.dd.dsf.debug.ui.viewmodel.IDebugVMConstants;

plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/ui/viewmodel/numberformat/IFormattedValuePreferenceStore.java

@@ -8,7 +8,7 @@
  * Contributors:
  *     Wind River Systems - initial API and implementation
  *******************************************************************************/
-package org.eclipse.dd.dsf.debug.ui.viewmodel.formatsupport;
+package org.eclipse.dd.dsf.debug.ui.viewmodel.numberformat;
 
 import org.eclipse.debug.internal.ui.viewers.model.provisional.IPresentationContext;
 

plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/ui/viewmodel/numberformat/IFormattedValueVMContext.java

@@ -8,7 +8,7 @@
  * Contributors:
  *     Wind River Systems - initial API and implementation
  *******************************************************************************/
-package org.eclipse.dd.dsf.debug.ui.viewmodel.formatsupport;
+package org.eclipse.dd.dsf.debug.ui.viewmodel.numberformat;
 
 import org.eclipse.dd.dsf.ui.viewmodel.IVMContext;
 

plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/ui/viewmodel/numberformat/SetDefaultFormatBinary.java

@@ -8,7 +8,7 @@
  * Contributors:
  *     Wind River Systems - initial API and implementation
  *******************************************************************************/
-package org.eclipse.dd.dsf.debug.ui.viewmodel.formatsupport;
+package org.eclipse.dd.dsf.debug.ui.viewmodel.numberformat;
 
 import org.eclipse.dd.dsf.debug.service.IFormattedValues;
 

plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/ui/viewmodel/numberformat/SetDefaultFormatDecimal.java

@@ -8,7 +8,7 @@
  * Contributors:
  *     Wind River Systems - initial API and implementation
  *******************************************************************************/
-package org.eclipse.dd.dsf.debug.ui.viewmodel.formatsupport;
+package org.eclipse.dd.dsf.debug.ui.viewmodel.numberformat;
 
 import org.eclipse.dd.dsf.debug.service.IFormattedValues;
 

plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/ui/viewmodel/numberformat/SetDefaultFormatHex.java

@@ -8,7 +8,7 @@
  * Contributors:
  *     Wind River Systems - initial API and implementation
  *******************************************************************************/
-package org.eclipse.dd.dsf.debug.ui.viewmodel.formatsupport;
+package org.eclipse.dd.dsf.debug.ui.viewmodel.numberformat;
 
 import org.eclipse.dd.dsf.debug.service.IFormattedValues;
 

plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/ui/viewmodel/numberformat/SetDefaultFormatNatural.java

@@ -8,7 +8,7 @@
  * Contributors:
  *     Wind River Systems - initial API and implementation
  *******************************************************************************/
-package org.eclipse.dd.dsf.debug.ui.viewmodel.formatsupport;
+package org.eclipse.dd.dsf.debug.ui.viewmodel.numberformat;
 
 import org.eclipse.dd.dsf.debug.service.IFormattedValues;
 

plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/ui/viewmodel/numberformat/SetDefaultFormatOctal.java

@@ -8,7 +8,7 @@
  * Contributors:
  *     Wind River Systems - initial API and implementation
  *******************************************************************************/
-package org.eclipse.dd.dsf.debug.ui.viewmodel.formatsupport;
+package org.eclipse.dd.dsf.debug.ui.viewmodel.numberformat;
 
 import org.eclipse.dd.dsf.debug.service.IFormattedValues;
 

plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/ui/viewmodel/numberformat/detail/MessagesForNumberFormatDetail.java

@@ -0,0 +1,18 @@
+package org.eclipse.dd.dsf.debug.ui.viewmodel.numberformat.detail;
+
+import org.eclipse.osgi.util.NLS;
+
+class MessagesForNumberFormatDetail extends NLS {
+    private static final String BUNDLE_NAME = "org.eclipse.dd.dsf.debug.ui.viewmodel.numberformat.detail.messages"; //$NON-NLS-1$
+
+    public static String NumberFormatDetailPane_name;
+    public static String NumberFormatDetailPane_description;
+    
+    static {
+        // initialize resource bundle
+        NLS.initializeMessages(BUNDLE_NAME, MessagesForNumberFormatDetail.class);
+    }
+
+    private MessagesForNumberFormatDetail() {
+    }
+}

plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/ui/viewmodel/numberformat/detail/NumberFormatDetailPane.java

@@ -9,7 +9,7 @@
  *     IBM Corporation - initial API and implementation
  *     Randy Rohrbach (Wind River Systems, Inc.) - extended implementation
  *******************************************************************************/
-package org.eclipse.dd.dsf.debug.ui.viewmodel.detailpanesupport;
+package org.eclipse.dd.dsf.debug.ui.viewmodel.numberformat.detail;
 
 import java.text.MessageFormat;
 import java.util.ArrayList;
@@ -110,8 +110,7 @@ import org.eclipse.ui.texteditor.ITextEditorActionConstants;
 import org.eclipse.ui.texteditor.IUpdate;
 import org.eclipse.ui.texteditor.IWorkbenchActionDefinitionIds;
 
-@SuppressWarnings("restriction")
+public class NumberFormatDetailPane implements IDetailPane, IAdaptable, IPropertyChangeListener {
-public class DetailPane implements IDetailPane, IAdaptable, IPropertyChangeListener {
 
     /**
      * The <code>IWorkbenchPartSite</code> that the details area (and the 
@@ -258,9 +257,7 @@ public class DetailPane implements IDetailPane, IAdaptable, IPropertyChangeListe
      * The ID, name and description of this pane are stored in constants so that the class
      * does not have to be instantiated to access them.
      */
-    public static final String ID = DetailMessages.DefaultDetailPane_0;
+    public static final String ID = "NumberFormatPane";
-    public static final String NAME = DetailMessages.DefaultDetailPane_1;
-    public static final String DESCRIPTION = DetailMessages.DefaultDetailPane_57;
     
     /**
      * Data structure for the position label value.
@@ -304,12 +301,11 @@ public class DetailPane implements IDetailPane, IAdaptable, IPropertyChangeListe
         /* (non-Javadoc)
          * @see org.eclipse.core.runtime.jobs.Job#run(org.eclipse.core.runtime.IProgressMonitor)
          */
-        @SuppressWarnings("unchecked")
         @Override
         protected IStatus run(IProgressMonitor monitor) {
             String message = null;
             fMonitor = monitor;
-            Iterator<Object> iterator = fElements.iterator();
+            Iterator<?> iterator = fElements.iterator();
             while (iterator.hasNext()) {
                 if (monitor.isCanceled()) {
                     break;
@@ -821,21 +817,21 @@ public class DetailPane implements IDetailPane, IAdaptable, IPropertyChangeListe
      * @see org.eclipse.debug.ui.IDetailPane#getDescription()
      */
     public String getDescription() {
-        return DetailPaneFactory.DSF_DETAIL_PANE_DESC;
+        return MessagesForNumberFormatDetail.NumberFormatDetailPane_description;
     }
 
     /* (non-Javadoc)
      * @see org.eclipse.debug.ui.IDetailPane#getID()
      */
     public String getID() {
-        return DetailPaneFactory.DSF_DETAIL_PANE_ID;
+        return ID;
     }
 
     /* (non-Javadoc)
      * @see org.eclipse.debug.ui.IDetailPane#getName()
      */
     public String getName() {
-        return DetailPaneFactory.DSF_DETAIL_PANE_NAME;
+        return MessagesForNumberFormatDetail.NumberFormatDetailPane_name;
     }
     
     /* (non-Javadoc)

plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/ui/viewmodel/numberformat/detail/NumberFormatDetailPaneFactory.java

@@ -8,7 +8,7 @@
  * Contributors:
  *     Randy Rohrbach (Wind River Systems, Inc.) - initial implementation
  *******************************************************************************/
-package org.eclipse.dd.dsf.debug.ui.viewmodel.detailpanesupport;
+package org.eclipse.dd.dsf.debug.ui.viewmodel.numberformat.detail;
 
 import java.util.HashSet;
 import java.util.Set;
@@ -21,18 +21,13 @@ import org.eclipse.jface.viewers.IStructuredSelection;
  *  This provides a simple Detail Pane Factory for the core debug views for DSF.
  */
 
-@SuppressWarnings("restriction")
+public class NumberFormatDetailPaneFactory implements IDetailPaneFactory {
-public class DetailPaneFactory implements IDetailPaneFactory {
-
-    public static final String DSF_DETAIL_PANE_ID   = Messages.getString("DetailPaneFactory.0"); //$NON-NLS-1$
-    public static final String DSF_DETAIL_PANE_NAME = Messages.getString("DetailPaneFactory.1"); //$NON-NLS-1$
-    public static final String DSF_DETAIL_PANE_DESC = Messages.getString("DetailPaneFactory.2");  //$NON-NLS-1$
 
     /* (non-Javadoc)
      * @see org.eclipse.debug.internal.ui.views.variables.IDetailsFactory#createDetailsArea(java.lang.String)
      */
     public IDetailPane createDetailPane(String id) {
-        return new DetailPane();
+        return new NumberFormatDetailPane();
     }
 
     /* (non-Javadoc)
@@ -41,7 +36,7 @@ public class DetailPaneFactory implements IDetailPaneFactory {
     @SuppressWarnings("unchecked")
     public Set getDetailPaneTypes(IStructuredSelection selection) {
         Set<String> possibleIDs = new HashSet<String>(1);
-        possibleIDs.add(DSF_DETAIL_PANE_ID);
+        possibleIDs.add(NumberFormatDetailPane.ID);
         return possibleIDs;
     }
     
@@ -49,15 +44,15 @@ public class DetailPaneFactory implements IDetailPaneFactory {
      * @see org.eclipse.debug.ui.IDetailPaneFactory#getDefaultDetailPane(java.util.Set, org.eclipse.jface.viewers.IStructuredSelection)
      */
     public String getDefaultDetailPane(IStructuredSelection selection) {
-        return DSF_DETAIL_PANE_ID;
+        return NumberFormatDetailPane.ID;
     }
 
     /* (non-Javadoc)
      * @see org.eclipse.debug.internal.ui.views.variables.IDetailsFactory#getName(java.lang.String)
      */
     public String getDetailPaneName(String id) {
-        if (id.equals(DSF_DETAIL_PANE_ID)){
+        if (id.equals(NumberFormatDetailPane.ID)){
-            return DSF_DETAIL_PANE_NAME;
+            return MessagesForNumberFormatDetail.NumberFormatDetailPane_name;
         }
         return null;
     }
@@ -66,8 +61,8 @@ public class DetailPaneFactory implements IDetailPaneFactory {
      * @see org.eclipse.debug.internal.ui.views.variables.IDetailsFactory#getDescription(java.lang.String)
      */
     public String getDetailPaneDescription(String id) {
-        if (id.equals(DSF_DETAIL_PANE_ID)){
+        if (id.equals(NumberFormatDetailPane.ID)){
-            return DSF_DETAIL_PANE_DESC;
+            return MessagesForNumberFormatDetail.NumberFormatDetailPane_description;
         }
         return null;
     }

plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/ui/viewmodel/numberformat/detail/TextViewerAction.java

@@ -9,7 +9,7 @@
  *     IBM Corporation - initial API and implementation
  *     Randy Rohrbach (Wind River Systems, Inc.) - extended implementation
  *******************************************************************************/
-package org.eclipse.dd.dsf.debug.ui.viewmodel.detailpanesupport;
+package org.eclipse.dd.dsf.debug.ui.viewmodel.numberformat.detail;
 
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.text.ITextOperationTarget;

plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/ui/viewmodel/numberformat/detail/messages.properties

@@ -0,0 +1,2 @@
+NumberFormatDetailPane_name=Number Formats Viewer
+NumberFormatDetailPane_description=Detail viewer showing selected variable in all available formats.

plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/ui/viewmodel/register/RegisterBitFieldLayoutCellModifier.java

@@ -14,7 +14,7 @@ import org.eclipse.dd.dsf.debug.service.IRegisters.IBitFieldDMData;
 import org.eclipse.dd.dsf.debug.service.IRegisters.IMnemonic;
 import org.eclipse.dd.dsf.debug.ui.viewmodel.IDebugVMConstants;
 import org.eclipse.dd.dsf.debug.ui.viewmodel.expression.WatchExpressionCellModifier;
-import org.eclipse.dd.dsf.debug.ui.viewmodel.formatsupport.IFormattedValuePreferenceStore;
+import org.eclipse.dd.dsf.debug.ui.viewmodel.numberformat.IFormattedValuePreferenceStore;
 import org.eclipse.dd.dsf.ui.viewmodel.IVMContext;
 import org.eclipse.dd.dsf.ui.viewmodel.dm.AbstractDMVMLayoutNode;
 import org.eclipse.debug.internal.ui.viewers.model.provisional.IPresentationContext;

plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/ui/viewmodel/register/RegisterBitFieldLayoutNode.java

@@ -33,8 +33,8 @@ import org.eclipse.dd.dsf.debug.service.IRunControl.ISuspendedDMEvent;
 import org.eclipse.dd.dsf.debug.ui.DsfDebugUIPlugin;
 import org.eclipse.dd.dsf.debug.ui.viewmodel.IDebugVMConstants;
 import org.eclipse.dd.dsf.debug.ui.viewmodel.expression.AbstractExpressionLayoutNode;
-import org.eclipse.dd.dsf.debug.ui.viewmodel.formatsupport.IFormattedValuePreferenceStore;
+import org.eclipse.dd.dsf.debug.ui.viewmodel.numberformat.IFormattedValuePreferenceStore;
-import org.eclipse.dd.dsf.debug.ui.viewmodel.formatsupport.IFormattedValueVMContext;
+import org.eclipse.dd.dsf.debug.ui.viewmodel.numberformat.IFormattedValueVMContext;
 import org.eclipse.dd.dsf.debug.ui.viewmodel.register.RegisterBitFieldLayoutCellModifier.BitFieldEditorStyle;
 import org.eclipse.dd.dsf.service.DsfSession;
 import org.eclipse.dd.dsf.service.IDsfService;

plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/ui/viewmodel/register/RegisterLayoutNode.java

@@ -30,8 +30,8 @@ import org.eclipse.dd.dsf.debug.service.IRegisters.IRegisterGroupDMContext;
 import org.eclipse.dd.dsf.debug.ui.DsfDebugUIPlugin;
 import org.eclipse.dd.dsf.debug.ui.viewmodel.IDebugVMConstants;
 import org.eclipse.dd.dsf.debug.ui.viewmodel.expression.AbstractExpressionLayoutNode;
-import org.eclipse.dd.dsf.debug.ui.viewmodel.formatsupport.IFormattedValuePreferenceStore;
+import org.eclipse.dd.dsf.debug.ui.viewmodel.numberformat.IFormattedValuePreferenceStore;
-import org.eclipse.dd.dsf.debug.ui.viewmodel.formatsupport.IFormattedValueVMContext;
+import org.eclipse.dd.dsf.debug.ui.viewmodel.numberformat.IFormattedValueVMContext;
 import org.eclipse.dd.dsf.service.DsfSession;
 import org.eclipse.dd.dsf.service.IDsfService;
 import org.eclipse.dd.dsf.ui.viewmodel.AbstractVMProvider;

plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/ui/viewmodel/register/RegisterLayoutValueCellModifier.java

@@ -17,7 +17,7 @@ import org.eclipse.dd.dsf.debug.service.IRegisters.IRegisterDMContext;
 import org.eclipse.dd.dsf.debug.service.IRegisters.IRegisterDMData;
 import org.eclipse.dd.dsf.debug.ui.viewmodel.IDebugVMConstants;
 import org.eclipse.dd.dsf.debug.ui.viewmodel.expression.WatchExpressionCellModifier;
-import org.eclipse.dd.dsf.debug.ui.viewmodel.formatsupport.IFormattedValuePreferenceStore;
+import org.eclipse.dd.dsf.debug.ui.viewmodel.numberformat.IFormattedValuePreferenceStore;
 import org.eclipse.dd.dsf.ui.viewmodel.IVMContext;
 import org.eclipse.dd.dsf.ui.viewmodel.dm.AbstractDMVMLayoutNode;
 import org.eclipse.debug.internal.ui.viewers.model.provisional.IPresentationContext;

plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/ui/viewmodel/register/RegisterVMProvider.java

@@ -11,7 +11,7 @@
 package org.eclipse.dd.dsf.debug.ui.viewmodel.register;
 
 import org.eclipse.dd.dsf.debug.ui.viewmodel.dm.AbstractDebugDMVMProviderWithCache;
-import org.eclipse.dd.dsf.debug.ui.viewmodel.formatsupport.FormattedValuePreferenceStore;
+import org.eclipse.dd.dsf.debug.ui.viewmodel.numberformat.FormattedValuePreferenceStore;
 import org.eclipse.dd.dsf.service.DsfSession;
 import org.eclipse.dd.dsf.ui.viewmodel.AbstractVMAdapter;
 import org.eclipse.dd.dsf.ui.viewmodel.IVMLayoutNode;

plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/ui/viewmodel/variable/VariableLayoutNode.java

@@ -35,8 +35,8 @@ import org.eclipse.dd.dsf.debug.service.IStack.IVariableDMData;
 import org.eclipse.dd.dsf.debug.ui.DsfDebugUIPlugin;
 import org.eclipse.dd.dsf.debug.ui.viewmodel.IDebugVMConstants;
 import org.eclipse.dd.dsf.debug.ui.viewmodel.expression.AbstractExpressionLayoutNode;
-import org.eclipse.dd.dsf.debug.ui.viewmodel.formatsupport.IFormattedValuePreferenceStore;
+import org.eclipse.dd.dsf.debug.ui.viewmodel.numberformat.IFormattedValuePreferenceStore;
-import org.eclipse.dd.dsf.debug.ui.viewmodel.formatsupport.IFormattedValueVMContext;
+import org.eclipse.dd.dsf.debug.ui.viewmodel.numberformat.IFormattedValueVMContext;
 import org.eclipse.dd.dsf.service.DsfSession;
 import org.eclipse.dd.dsf.service.IDsfService;
 import org.eclipse.dd.dsf.ui.viewmodel.AbstractVMProvider;

plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/ui/viewmodel/variable/VariableLayoutValueCellModifier.java

@@ -11,7 +11,7 @@ import org.eclipse.dd.dsf.debug.service.IFormattedValues;
 import org.eclipse.dd.dsf.debug.service.IExpressions.IExpressionDMContext;
 import org.eclipse.dd.dsf.debug.ui.viewmodel.IDebugVMConstants;
 import org.eclipse.dd.dsf.debug.ui.viewmodel.expression.WatchExpressionCellModifier;
-import org.eclipse.dd.dsf.debug.ui.viewmodel.formatsupport.IFormattedValuePreferenceStore;
+import org.eclipse.dd.dsf.debug.ui.viewmodel.numberformat.IFormattedValuePreferenceStore;
 import org.eclipse.dd.dsf.ui.viewmodel.IVMContext;
 import org.eclipse.debug.internal.ui.viewers.model.provisional.IPresentationContext;
 

plugins/org.eclipse.dd.dsf.debug.ui/src/org/eclipse/dd/dsf/debug/ui/viewmodel/variable/VariableVMProvider.java

@@ -9,7 +9,7 @@
 package org.eclipse.dd.dsf.debug.ui.viewmodel.variable;
 
 import org.eclipse.dd.dsf.debug.ui.viewmodel.dm.AbstractDebugDMVMProviderWithCache;
-import org.eclipse.dd.dsf.debug.ui.viewmodel.formatsupport.FormattedValuePreferenceStore;
+import org.eclipse.dd.dsf.debug.ui.viewmodel.numberformat.FormattedValuePreferenceStore;
 import org.eclipse.dd.dsf.service.DsfSession;
 import org.eclipse.dd.dsf.ui.viewmodel.AbstractVMAdapter;
 import org.eclipse.dd.dsf.ui.viewmodel.IVMLayoutNode;