[SCM] master: Create and use PrintDebugInfoStackOptions in stack sub-window.

[cagney@sourceware.org]

The branch, master has been updated
       via  a41c8b2d53e4cfe4173f75b717d0c9ced0449982 (commit)
      from  a17e35990190cdddc6e0a0447cb02774b661a659 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email.

- Log -----------------------------------------------------------------
commit a41c8b2d53e4cfe4173f75b717d0c9ced0449982
Author: Andrew Cagney <cagney@redhat.com>
Date:   Tue Jun 10 18:15:10 2008 -0400

    Create and use PrintDebugInfoStackOptions in stack sub-window.
    
    frysk-gui/frysk/gui/monitor/ChangeLog
    2008-06-10  Andrew Cagney  <cagney@redhat.com>
    
    	* eventviewer/Event.java: Use PrintDebugInfoStackOptions and
    	setPrintParameters.
    
    frysk-gui/frysk/gui/srcwin/ChangeLog
    2008-06-10  Andrew Cagney  <cagney@redhat.com>
    
    	* CurrentStackView.java (STACK_OPTIONS): New.  Pass to
    	Frame.toPrint.

-----------------------------------------------------------------------

Summary of changes:
 frysk-gui/frysk/gui/monitor/ChangeLog              |    5 +++++
 frysk-gui/frysk/gui/monitor/eventviewer/Event.java |    6 +++---
 frysk-gui/frysk/gui/srcwin/ChangeLog               |    5 +++++
 frysk-gui/frysk/gui/srcwin/CurrentStackView.java   |   18 ++++++++++++------
 4 files changed, 25 insertions(+), 9 deletions(-)

First 500 lines of diff:
diff --git a/frysk-gui/frysk/gui/monitor/ChangeLog b/frysk-gui/frysk/gui/monitor/ChangeLog
index a857f69..5b5d90a 100644
--- a/frysk-gui/frysk/gui/monitor/ChangeLog
+++ b/frysk-gui/frysk/gui/monitor/ChangeLog
@@ -1,3 +1,8 @@
+2008-06-10  Andrew Cagney  <cagney@redhat.com>
+
+	* eventviewer/Event.java: Use PrintDebugInfoStackOptions and
+	setPrintParameters.
+
 2008-04-10  Sami Wagiaalla  <swagiaal@redhat.com>
 
 	* GuiProc.java: updated isOwned() to allow all processes
diff --git a/frysk-gui/frysk/gui/monitor/eventviewer/Event.java b/frysk-gui/frysk/gui/monitor/eventviewer/Event.java
index ad1cf86..824364c 100644
--- a/frysk-gui/frysk/gui/monitor/eventviewer/Event.java
+++ b/frysk-gui/frysk/gui/monitor/eventviewer/Event.java
@@ -48,7 +48,7 @@ import org.gnu.gdk.GdkCairo;
 
 import frysk.debuginfo.DebugInfoFrame;
 import frysk.debuginfo.DebugInfoStackFactory;
-import frysk.debuginfo.PrintStackOptions;
+import frysk.debuginfo.PrintDebugInfoStackOptions;
 import frysk.gui.monitor.GuiObject;
 import frysk.gui.monitor.GuiTask;
 import frysk.gui.monitor.WindowManager;
@@ -225,8 +225,8 @@ public class Event extends GuiObject
      stringWriter.write(this.getName() + ": " + this.getToolTip() + "\n");
     
     if(frame != null){
-	PrintStackOptions options = new PrintStackOptions();
-	options.setPrintParams(true);
+	PrintDebugInfoStackOptions options = new PrintDebugInfoStackOptions();
+	options.setPrintParameters(true);
 	options.setNumberOfFrames(20);
 	DebugInfoStackFactory.printStackTrace(new PrintWriter(stringWriter),frame,options);
 	
diff --git a/frysk-gui/frysk/gui/srcwin/ChangeLog b/frysk-gui/frysk/gui/srcwin/ChangeLog
index 57fe952..1c0eb0d 100644
--- a/frysk-gui/frysk/gui/srcwin/ChangeLog
+++ b/frysk-gui/frysk/gui/srcwin/ChangeLog
@@ -1,3 +1,8 @@
+2008-06-10  Andrew Cagney  <cagney@redhat.com>
+
+	* CurrentStackView.java (STACK_OPTIONS): New.  Pass to
+	Frame.toPrint.
+
 2008-05-15  Tim Moore  <timoore@redhat.com>
 
 	* SourceBuffer.java (disassemblerFrame): Use lib.dwfl.Disassembler.
diff --git a/frysk-gui/frysk/gui/srcwin/CurrentStackView.java b/frysk-gui/frysk/gui/srcwin/CurrentStackView.java
index 45ac270..737a1a3 100644
--- a/frysk-gui/frysk/gui/srcwin/CurrentStackView.java
+++ b/frysk-gui/frysk/gui/srcwin/CurrentStackView.java
@@ -1,6 +1,6 @@
 // This file is part of the program FRYSK.
 //
-// Copyright 2005, 2007, Red Hat Inc.
+// Copyright 2005, 2007, 2008, Red Hat Inc.
 //
 // FRYSK is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
@@ -37,9 +37,9 @@
 // version and license this file solely under the GPL without
 // exception.
 
-
 package frysk.gui.srcwin;
 
+import frysk.debuginfo.PrintDebugInfoStackOptions;
 import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.util.Iterator;
@@ -80,6 +80,13 @@ public class CurrentStackView
 														new DataColumnString(),
 														new DataColumnObject() };
 
+    private static final PrintDebugInfoStackOptions STACK_OPTIONS;
+    static {
+	STACK_OPTIONS = new PrintDebugInfoStackOptions();
+	STACK_OPTIONS.setPrintParameters(true);
+    }
+
+
   private static DebugInfoFrame currentFrame;
 
   private LinkedList observers;
@@ -119,8 +126,7 @@ public class CurrentStackView
 	this.getSelection().addListener(this);
   }
 
-  public void refreshProc (DebugInfoFrame[] frames, int current)
-  {
+  public void refreshProc (DebugInfoFrame[] frames, int current) {
     TreeIter iter = null;
     TreePath path = ((TreeRowReference) this.stackArray[current]).getPath();
 
@@ -184,7 +190,7 @@ public class CurrentStackView
 
 	    StringWriter stringWriter = new StringWriter();
 	    stringWriter.write("# " + (++level) + " ");
-	    frame.toPrint(new PrintWriter(stringWriter),true,true);
+	    frame.toPrint(new PrintWriter(stringWriter), STACK_OPTIONS);
 	    row = stringWriter.toString();
 	    
 	    if (hasInlinedCode)
@@ -288,7 +294,7 @@ public class CurrentStackView
 
 		StringWriter stringWriter = new StringWriter();
 		stringWriter.write(row = "# " + (++level) + " ");
-		frame.toPrint(new PrintWriter(stringWriter),true,true);
+		frame.toPrint(new PrintWriter(stringWriter), STACK_OPTIONS);
 		row = stringWriter.toString();
 		
 		if (hasInlinedCode)


hooks/post-receive
--
frysk system monitor/debugger