[prev in list] [next in list] [prev in thread] [next in thread]
List: jedit-cvs
Subject: [ jEdit-commits ] SF.net SVN: jedit: [9350] plugins/GdbPlugin/trunk
From: shlomy () users ! sourceforge ! net
Date: 2007-03-29 20:59:19
Message-ID: E1HX1iJ-0007FT-KZ () sc8-pr-svn4 ! sourceforge ! net
[Download RAW message or body]
Revision: 9350
http://svn.sourceforge.net/jedit/?rev=9350&view=rev
Author: shlomy
Date: 2007-03-29 13:59:19 -0700 (Thu, 29 Mar 2007)
Log Message:
-----------
Continued refactoring - use gdb.core instead of jedit.debugger.
Modified Paths:
--------------
plugins/GdbPlugin/trunk/actions.xml
plugins/GdbPlugin/trunk/debugger/itf/DebuggerTool.java
plugins/GdbPlugin/trunk/debugger/jedit/Plugin.java
plugins/GdbPlugin/trunk/gdb/core/Debugger.java
plugins/GdbPlugin/trunk/gdb/execution/ControlView.java
Modified: plugins/GdbPlugin/trunk/actions.xml
===================================================================
--- plugins/GdbPlugin/trunk/actions.xml 2007-03-29 17:41:55 UTC (rev 9349)
+++ plugins/GdbPlugin/trunk/actions.xml 2007-03-29 20:59:19 UTC (rev 9350)
@@ -5,32 +5,32 @@
<ACTION NAME="debugger-quit" NO_REPEAT="TRUE">
<CODE>
- debugger.jedit.Plugin.quit(view);
+ gdb.core.Debugger.getInstance().quit();
</CODE>
</ACTION>
<ACTION NAME="debugger-go" NO_REPEAT="TRUE">
<CODE>
- debugger.jedit.Plugin.go(view);
+ gdb.core.Debugger.getInstance().go();
</CODE>
</ACTION>
<ACTION NAME="debugger-next" NO_REPEAT="TRUE">
<CODE>
- debugger.jedit.Plugin.next(view);
+ gdb.core.Debugger.getInstance().next();
</CODE>
</ACTION>
<ACTION NAME="debugger-step" NO_REPEAT="TRUE">
<CODE>
- debugger.jedit.Plugin.step(view);
+ gdb.core.Debugger.getInstance().step();
</CODE>
</ACTION>
<ACTION NAME="debugger-finish" NO_REPEAT="TRUE">
<CODE>
- debugger.jedit.Plugin.finishCurrentFunction(view);
+ gdb.core.Debugger.getInstance().finishCurrentFunction();
</CODE>
</ACTION>
<ACTION NAME="debugger-pause" NO_REPEAT="TRUE">
<CODE>
- debugger.jedit.Plugin.pause(view);
+ gdb.core.Debugger.getInstance().pause();
</CODE>
</ACTION>
Modified: plugins/GdbPlugin/trunk/debugger/itf/DebuggerTool.java
===================================================================
--- plugins/GdbPlugin/trunk/debugger/itf/DebuggerTool.java 2007-03-29 17:41:55 UTC \
(rev 9349)
+++ plugins/GdbPlugin/trunk/debugger/itf/DebuggerTool.java 2007-03-29 20:59:19 UTC \
(rev 9350) @@ -3,14 +3,6 @@
public interface DebuggerTool {
void setFrontEnd(JEditFrontEnd frontEnd);
- void start();
- void go();
- void next();
- void step();
- void finishCurrentFunction();
- void pause();
- void quit();
- boolean isRunning();
// Note: line counting begins at 0
IBreakpoint addBreakpoint(String file, int line);
IData getData(String name);
Modified: plugins/GdbPlugin/trunk/debugger/jedit/Plugin.java
===================================================================
--- plugins/GdbPlugin/trunk/debugger/jedit/Plugin.java 2007-03-29 17:41:55 UTC (rev \
9349)
+++ plugins/GdbPlugin/trunk/debugger/jedit/Plugin.java 2007-03-29 20:59:19 UTC (rev \
9350) @@ -59,32 +59,6 @@
removeCurrentPositionPainter();
}
- public static void next(View view) {
- if (debugger.isRunning())
- debugger.next();
- }
- public static void step(View view) {
- if (debugger.isRunning())
- debugger.step();
- }
- public static void go(View view) {
- if (! debugger.isRunning()) {
- debugger.start();
- } else
- debugger.go();
- }
- public static void finishCurrentFunction(View view) {
- if (debugger.isRunning())
- debugger.finishCurrentFunction();
- }
- public static void pause(View view) {
- if (debugger.isRunning())
- debugger.pause();
- }
- public static void quit(View view) {
- if (debugger.isRunning())
- debugger.quit();
- }
public static void toggleBreakpoint(View view)
{
Buffer buffer = view.getBuffer();
Modified: plugins/GdbPlugin/trunk/gdb/core/Debugger.java
===================================================================
--- plugins/GdbPlugin/trunk/gdb/core/Debugger.java 2007-03-29 17:41:55 UTC (rev 9349)
+++ plugins/GdbPlugin/trunk/gdb/core/Debugger.java 2007-03-29 20:59:19 UTC (rev 9350)
@@ -83,14 +83,20 @@
}
public void go() {
- commandManager.add("-exec-continue");
+ if (! isRunning())
+ start();
+ else
+ commandManager.add("-exec-continue");
}
public void pause() {
- commandManager.add("-exec-interrupt");
+ if (isRunning())
+ commandManager.add("-exec-interrupt");
}
public void quit() {
+ if (! isRunning())
+ return;
commandManager.add("-gdb-exit", new ResultHandler() {
public void handle(String msg, GdbResult res) {
if (msg.equals("exit")) {
@@ -101,15 +107,18 @@
}
public void next() {
- commandManager.add("-exec-next");
+ if (isRunning())
+ commandManager.add("-exec-next");
}
public void step() {
- commandManager.add("-exec-step");
+ if (isRunning())
+ commandManager.add("-exec-step");
}
public void finishCurrentFunction() {
- commandManager.add("-exec-finish");
+ if (isRunning())
+ commandManager.add("-exec-finish");
}
private void sessionEnded() {
Modified: plugins/GdbPlugin/trunk/gdb/execution/ControlView.java
===================================================================
--- plugins/GdbPlugin/trunk/gdb/execution/ControlView.java 2007-03-29 17:41:55 UTC \
(rev 9349)
+++ plugins/GdbPlugin/trunk/gdb/execution/ControlView.java 2007-03-29 20:59:19 UTC \
(rev 9350) @@ -1,15 +1,13 @@
package gdb.execution;
+import gdb.core.Debugger;
+
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import javax.swing.JButton;
import javax.swing.JPanel;
-import org.gjt.sp.jedit.jEdit;
-
-import debugger.jedit.Plugin;
-
@SuppressWarnings("serial")
public class ControlView extends JPanel {
@@ -18,42 +16,42 @@
add(go);
go.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent arg0) {
- Plugin.go(jEdit.getActiveView());
+ Debugger.getInstance().go();
}
});
JButton step = new JButton("Step");
add(step);
step.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent arg0) {
- Plugin.step(jEdit.getActiveView());
+ Debugger.getInstance().step();
}
});
JButton next = new JButton("Next");
add(next);
next.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent arg0) {
- Plugin.next(jEdit.getActiveView());
+ Debugger.getInstance().next();
}
});
JButton ret = new JButton("Return");
add(ret);
ret.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent arg0) {
- Plugin.finishCurrentFunction(jEdit.getActiveView());
+ Debugger.getInstance().finishCurrentFunction();
}
});
JButton pause = new JButton("Pause");
add(pause);
pause.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent arg0) {
- Plugin.pause(jEdit.getActiveView());
+ Debugger.getInstance().pause();
}
});
JButton quit = new JButton("Quit");
add(quit);
quit.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent arg0) {
- Plugin.quit(jEdit.getActiveView());
+ Debugger.getInstance().quit();
}
});
}
This was sent by the SourceForge.net collaborative development platform, the world's \
largest Open Source development site.
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
jEdit-CVS mailing list
jEdit-CVS@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jedit-cvs
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic