[cdt-patch] Default format preferences for variables, registers and expr

["Mikhail Khodjaiants" <mikhailk@xxxxxxx>]

Index: ChangeLog
===================================================================
RCS file: /home/tools/org.eclipse.cdt.debug.ui/ChangeLog,v
retrieving revision 1.157
diff -u -r1.157 ChangeLog
--- ChangeLog 9 Jun 2003 15:45:35 -0000 1.157
+++ ChangeLog 9 Jun 2003 18:10:09 -0000
@@ -1,4 +1,8 @@
 2003-06-09 Mikhail Khodjaiants
+ Added default format preferences for variables, registers and expressions.
+ * CDebugPreferencePage.java
+
+2003-06-09 Mikhail Khodjaiants
  Renamed the 'refresh' method of ICVariable to 'reset'.
  * VariableFormatActionDelegate.java
 
Index: src/org/eclipse/cdt/debug/internal/ui/preferences/CDebugPreferencePage.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/preferences/CDebugPreferencePage.java,v
retrieving revision 1.9
diff -u -r1.9 CDebugPreferencePage.java
--- src/org/eclipse/cdt/debug/internal/ui/preferences/CDebugPreferencePage.java 14 May 2003 19:24:12 -0000 1.9
+++ src/org/eclipse/cdt/debug/internal/ui/preferences/CDebugPreferencePage.java 9 Jun 2003 18:10:10 -0000
@@ -30,6 +30,7 @@
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Combo;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Label;
@@ -51,11 +52,9 @@
 {
  // View setting widgets
  private Button fPathsButton;
-/*
  private Combo fVariableFormatCombo;
  private Combo fExpressionFormatCombo;
  private Combo fRegisterFormatCombo;
-*/
  // Disassembly setting widgets
  private Button fAutoDisassemblyButton;
  
@@ -65,8 +64,8 @@
  private static final int NUMBER_OF_DIGITS = 3;
 
  // Format constants
-// private static int[] fFormatIds = new int[]{ ICDIFormat.NATURAL, ICDIFormat.HEXADECIMAL, ICDIFormat.DECIMAL };
-// private static String[] fFormatLabels = new String[] { "Natural", "Hexadecimal", "Decimal" };
+ private static int[] fFormatIds = new int[]{ ICDIFormat.NATURAL, ICDIFormat.HEXADECIMAL, ICDIFormat.DECIMAL };
+ private static String[] fFormatLabels = new String[] { "Natural", "Hexadecimal", "Decimal" };
 
  private PropertyChangeListener fPropertyChangeListener;
 
@@ -155,11 +154,9 @@
   fPathsButton.setSelection( store.getBoolean( ICDebugPreferenceConstants.PREF_SHOW_FULL_PATHS ) );
   fAutoDisassemblyButton.setSelection( CDebugCorePlugin.getDefault().getPluginPreferences().getBoolean( ICDebugConstants.PREF_AUTO_DISASSEMBLY ) );
   fMaxNumberOfInstructionsText.setStringValue( new Integer( CDebugCorePlugin.getDefault().getPluginPreferences().getInt( ICDebugConstants.PREF_MAX_NUMBER_OF_INSTRUCTIONS ) ).toString() );
-/*
   fVariableFormatCombo.select( getFormatIndex( CDebugCorePlugin.getDefault().getPluginPreferences().getInt( ICDebugConstants.PREF_DEFAULT_VARIABLE_FORMAT ) ) );
   fExpressionFormatCombo.select( getFormatIndex( CDebugCorePlugin.getDefault().getPluginPreferences().getInt( ICDebugConstants.PREF_DEFAULT_EXPRESSION_FORMAT ) ) );
   fRegisterFormatCombo.select( getFormatIndex( CDebugCorePlugin.getDefault().getPluginPreferences().getInt( ICDebugConstants.PREF_DEFAULT_REGISTER_FORMAT ) ) );
-*/
  }
 
  /* (non-Javadoc)
@@ -208,13 +205,11 @@
  {
   Composite comp = createGroupComposite( parent, 1, "Opened view default settings" );
   fPathsButton = createCheckButton( comp, "Show full &paths" );
-/*
   Composite formatComposite = ControlFactory.createCompositeEx( comp, 2, 0 );
   ((GridLayout)formatComposite.getLayout()).makeColumnsEqualWidth = true;
   fVariableFormatCombo = createComboBox( formatComposite, "Default variable format:", fFormatLabels, fFormatLabels[0] );
   fExpressionFormatCombo = createComboBox( formatComposite, "Default _expression_ format:", fFormatLabels, fFormatLabels[0] );
   fRegisterFormatCombo = createComboBox( formatComposite, "Default register format:", fFormatLabels, fFormatLabels[0] );
-*/
  }
 
  /**
@@ -273,13 +268,13 @@
   * Creates a button with the given label and sets the default
   * configuration data.
   */
-// private Combo createComboBox( Composite parent, String label, String[] items, String selection )
-// {
-//  ControlFactory.createLabel( parent, label );
-//  Combo combo = ControlFactory.createSelectCombo( parent, items, selection );
-//  combo.setLayoutData( new GridData() );
-//  return combo;
-// }
+ private Combo createComboBox( Composite parent, String label, String[] items, String selection )
+ {
+  ControlFactory.createLabel( parent, label );
+  Combo combo = ControlFactory.createSelectCombo( parent, items, selection );
+  combo.setLayoutData( new GridData() );
+  return combo;
+ }
 
  protected void createSpacer( Composite composite, int columnSpan )
  {
@@ -362,11 +357,9 @@
   store.setValue( ICDebugPreferenceConstants.PREF_SHOW_FULL_PATHS, fPathsButton.getSelection() );
   CDebugCorePlugin.getDefault().getPluginPreferences().setValue( ICDebugConstants.PREF_AUTO_DISASSEMBLY, fAutoDisassemblyButton.getSelection() );
   CDebugCorePlugin.getDefault().getPluginPreferences().setValue( ICDebugConstants.PREF_MAX_NUMBER_OF_INSTRUCTIONS, fMaxNumberOfInstructionsText.getIntValue() );
-/*
   CDebugCorePlugin.getDefault().getPluginPreferences().setValue( ICDebugConstants.PREF_DEFAULT_VARIABLE_FORMAT, getFormatId( fVariableFormatCombo.getSelectionIndex() ) );
   CDebugCorePlugin.getDefault().getPluginPreferences().setValue( ICDebugConstants.PREF_DEFAULT_EXPRESSION_FORMAT, getFormatId( fExpressionFormatCombo.getSelectionIndex() ) );
   CDebugCorePlugin.getDefault().getPluginPreferences().setValue( ICDebugConstants.PREF_DEFAULT_REGISTER_FORMAT, getFormatId( fRegisterFormatCombo.getSelectionIndex() ) );
-*/
  }
 
  /**
@@ -385,13 +378,11 @@
   fPathsButton.setSelection( store.getDefaultBoolean( ICDebugPreferenceConstants.PREF_SHOW_FULL_PATHS ) );
   fAutoDisassemblyButton.setSelection( CDebugCorePlugin.getDefault().getPluginPreferences().getDefaultBoolean( ICDebugConstants.PREF_AUTO_DISASSEMBLY ) );
   fMaxNumberOfInstructionsText.setStringValue( new Integer( CDebugCorePlugin.getDefault().getPluginPreferences().getDefaultInt( ICDebugConstants.PREF_MAX_NUMBER_OF_INSTRUCTIONS ) ).toString() );
-/*
   fVariableFormatCombo.select( getFormatIndex( CDebugCorePlugin.getDefault().getPluginPreferences().getDefaultInt( ICDebugConstants.PREF_DEFAULT_VARIABLE_FORMAT ) ) );
   fExpressionFormatCombo.select( getFormatIndex( CDebugCorePlugin.getDefault().getPluginPreferences().getDefaultInt( ICDebugConstants.PREF_DEFAULT_EXPRESSION_FORMAT ) ) );
   fRegisterFormatCombo.select( getFormatIndex( CDebugCorePlugin.getDefault().getPluginPreferences().getDefaultInt( ICDebugConstants.PREF_DEFAULT_REGISTER_FORMAT ) ) );
-*/
  }
-/* 
+ 
  private static int getFormatId( int index )
  {
   return ( index >= 0 && index < fFormatIds.length ) ? fFormatIds[index] : fFormatIds[0];
@@ -404,5 +395,4 @@
     return i;
   return -1;
  }
-*/
 }