[E-p-i-c-commits] org.epic.debug/src/org/epic/debug/ui/action ShowVarAddressActionDelegate.java, 1.2, 1.3 HighlightVarUpdatesActionDelegate.java, 1.2, 1.3 ShowPerlInternalVariableActionDelegate.java, 1.4, 1.5 VariablesViewActionDelegate.java, 1.1, 1.2 ShowGlobalVariableActionDelegate.java, 1.4, 1.5 ShowLocalVariableActionDelegate.java, 1.4, 1.5

[Jan P. <jp...@us...>]

Update of /cvsroot/e-p-i-c/org.epic.debug/src/org/epic/debug/ui/action
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv12034/src/org/epic/debug/ui/action

Modified Files:
	ShowVarAddressActionDelegate.java 
	HighlightVarUpdatesActionDelegate.java 
	ShowPerlInternalVariableActionDelegate.java 
	VariablesViewActionDelegate.java 
	ShowGlobalVariableActionDelegate.java 
	ShowLocalVariableActionDelegate.java 
Log Message:
Implemented feature request [ 2045001 ] Persistent Variables view options.

Index: ShowVarAddressActionDelegate.java
===================================================================
RCS file: /cvsroot/e-p-i-c/org.epic.debug/src/org/epic/debug/ui/action/ShowVarAddressActionDelegate.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ShowVarAddressActionDelegate.java	27 May 2007 14:30:34 -0000	1.2
+++ ShowVarAddressActionDelegate.java	10 Aug 2008 13:37:12 -0000	1.3
@@ -1,18 +1,26 @@
 package org.epic.debug.ui.action;
 
 import org.eclipse.jface.action.IAction;
+import org.epic.perleditor.preferences.PreferenceConstants;
 
 public class ShowVarAddressActionDelegate extends VariablesViewActionDelegate
 {
+    private static String KEY = PreferenceConstants.DEBUG_SHOW_VARS_ADDRESS;
     private static IAction action;
 
     public void init(IAction action)
     {
+        super.init(action);
         ShowVarAddressActionDelegate.action = action;
     }
+    
+    protected String getPreferenceKey()
+    {
+        return KEY;
+    }
 
     public static boolean getPreferenceValue()
     {
-        return action == null ? false : action.isChecked();
+        return action == null ? getPreferenceValue(KEY) : action.isChecked();
     }
 }
\ No newline at end of file

Index: ShowLocalVariableActionDelegate.java
===================================================================
RCS file: /cvsroot/e-p-i-c/org.epic.debug/src/org/epic/debug/ui/action/ShowLocalVariableActionDelegate.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- ShowLocalVariableActionDelegate.java	27 May 2007 14:30:34 -0000	1.4
+++ ShowLocalVariableActionDelegate.java	10 Aug 2008 13:37:12 -0000	1.5
@@ -1,18 +1,26 @@
 package org.epic.debug.ui.action;
 
 import org.eclipse.jface.action.IAction;
+import org.epic.perleditor.preferences.PreferenceConstants;
 
 public class ShowLocalVariableActionDelegate extends VariablesViewActionDelegate
 {
+    private static String KEY = PreferenceConstants.DEBUG_SHOW_LOCAL_VARS;
     private static IAction action;
 
     public void init(IAction action)
     {
+        super.init(action);
         ShowLocalVariableActionDelegate.action = action;
     }
 
+    protected String getPreferenceKey()
+    {
+        return KEY;
+    }
+
     public static boolean getPreferenceValue()
     {
-        return action == null ? true : action.isChecked();
+        return action == null ? getPreferenceValue(KEY) : action.isChecked();
     }
 }
\ No newline at end of file

Index: HighlightVarUpdatesActionDelegate.java
===================================================================
RCS file: /cvsroot/e-p-i-c/org.epic.debug/src/org/epic/debug/ui/action/HighlightVarUpdatesActionDelegate.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- HighlightVarUpdatesActionDelegate.java	27 May 2007 14:30:34 -0000	1.2
+++ HighlightVarUpdatesActionDelegate.java	10 Aug 2008 13:37:12 -0000	1.3
@@ -1,18 +1,26 @@
 package org.epic.debug.ui.action;
 
 import org.eclipse.jface.action.IAction;
+import org.epic.perleditor.preferences.PreferenceConstants;
 
 public class HighlightVarUpdatesActionDelegate extends VariablesViewActionDelegate
 {
+    private static String KEY = PreferenceConstants.DEBUG_HIGHLIGHT_UPDATED_VARS;
     private static IAction action;
 
     public void init(IAction action)
     {
+        super.init(action);
         HighlightVarUpdatesActionDelegate.action = action;
     }
+    
+    protected String getPreferenceKey()
+    {
+        return KEY;
+    }
 
     public static boolean getPreferenceValue()
     {
-        return action == null ? false : action.isChecked();
+        return action == null ? getPreferenceValue(KEY) : action.isChecked();
     }
 }
\ No newline at end of file

Index: ShowPerlInternalVariableActionDelegate.java
===================================================================
RCS file: /cvsroot/e-p-i-c/org.epic.debug/src/org/epic/debug/ui/action/ShowPerlInternalVariableActionDelegate.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- ShowPerlInternalVariableActionDelegate.java	27 May 2007 14:30:34 -0000	1.4
+++ ShowPerlInternalVariableActionDelegate.java	10 Aug 2008 13:37:12 -0000	1.5
@@ -1,18 +1,26 @@
 package org.epic.debug.ui.action;
 
 import org.eclipse.jface.action.IAction;
+import org.epic.perleditor.preferences.PreferenceConstants;
 
 public class ShowPerlInternalVariableActionDelegate extends VariablesViewActionDelegate
 {
+    private static String KEY = PreferenceConstants.DEBUG_SHOW_INTERNAL_VARS;
     private static IAction action;
 
     public void init(IAction action)
     {
+        super.init(action);
         ShowPerlInternalVariableActionDelegate.action = action;
     }
+    
+    protected String getPreferenceKey()
+    {
+        return KEY;
+    }
 
     public static boolean getPreferenceValue()
     {
-        return action == null ? false : action.isChecked();
+        return action == null ? getPreferenceValue(KEY) : action.isChecked();
     }
 }
\ No newline at end of file

Index: ShowGlobalVariableActionDelegate.java
===================================================================
RCS file: /cvsroot/e-p-i-c/org.epic.debug/src/org/epic/debug/ui/action/ShowGlobalVariableActionDelegate.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- ShowGlobalVariableActionDelegate.java	27 May 2007 14:30:34 -0000	1.4
+++ ShowGlobalVariableActionDelegate.java	10 Aug 2008 13:37:12 -0000	1.5
@@ -1,18 +1,26 @@
 package org.epic.debug.ui.action;
 
 import org.eclipse.jface.action.IAction;
+import org.epic.perleditor.preferences.PreferenceConstants;
 
 public class ShowGlobalVariableActionDelegate extends VariablesViewActionDelegate
 {
+    private static String KEY = PreferenceConstants.DEBUG_SHOW_GLOBAL_VARS;
     private static IAction action;
 
     public void init(IAction action)
     {
+        super.init(action);
         ShowGlobalVariableActionDelegate.action = action;
     }
+    
+    protected String getPreferenceKey()
+    {
+        return KEY;
+    }
 
     public static boolean getPreferenceValue()
     {
-        return action == null ? false : action.isChecked();
+        return action == null ? getPreferenceValue(KEY) : action.isChecked();
     }
 }
\ No newline at end of file

Index: VariablesViewActionDelegate.java
===================================================================
RCS file: /cvsroot/e-p-i-c/org.epic.debug/src/org/epic/debug/ui/action/VariablesViewActionDelegate.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- VariablesViewActionDelegate.java	27 May 2007 14:30:34 -0000	1.1
+++ VariablesViewActionDelegate.java	10 Aug 2008 13:37:12 -0000	1.2
@@ -4,12 +4,14 @@
 import org.eclipse.debug.core.DebugPlugin;
 import org.eclipse.debug.core.model.*;
 import org.eclipse.jface.action.IAction;
+import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.swt.widgets.Event;
 import org.eclipse.ui.*;
 import org.epic.debug.DebugTarget;
 import org.epic.debug.PerlDebugPlugin;
 import org.epic.debug.db.StackFrame;
+import org.epic.perleditor.PerlEditorPlugin;
 
 abstract class VariablesViewActionDelegate
     implements IViewActionDelegate, IActionDelegate2
@@ -32,13 +34,28 @@
 
     public void init(IAction action)
     {
+        action.setChecked(getPreferenceValue(getPreferenceKey()));
     }
 
     public void runWithEvent(IAction action, Event event)
     {
+        getPreferenceStore().setValue(
+            getPreferenceKey(), action.isChecked());
+
         updateVariablesView();
     }
-
+    
+    /**
+     * Key under which the checked/unchecked state of the option
+     * is stored in the preferences.
+     */
+    protected abstract String getPreferenceKey();
+    
+    protected final static boolean getPreferenceValue(String key)
+    {
+        return getPreferenceStore().getBoolean(key);
+    }
+    
     protected final void updateVariablesView()
     {
         IDebugTarget[] targets =
@@ -63,4 +80,10 @@
             }
         }
     }
+    
+    private static IPreferenceStore getPreferenceStore()
+    {
+        return
+            PerlEditorPlugin.getDefault().getPreferenceStore();
+    }
 }