From: <sh...@us...> - 2007-03-29 21:18:31
|
Revision: 9352 http://svn.sourceforge.net/jedit/?rev=9352&view=rev Author: shlomy Date: 2007-03-29 14:18:30 -0700 (Thu, 29 Mar 2007) Log Message: ----------- Clean up of DebuggerDB and move to gdb.breakpoint as BreakpointList. Modified Paths: -------------- plugins/GdbPlugin/trunk/debugger/jedit/Plugin.java plugins/GdbPlugin/trunk/gdb/breakpoints/Breakpoint.java plugins/GdbPlugin/trunk/gdb/breakpoints/BreakpointView.java plugins/GdbPlugin/trunk/gdb/core/Debugger.java Added Paths: ----------- plugins/GdbPlugin/trunk/gdb/breakpoints/BreakpointList.java Removed Paths: ------------- plugins/GdbPlugin/trunk/debugger/core/DebuggerDB.java Deleted: plugins/GdbPlugin/trunk/debugger/core/DebuggerDB.java =================================================================== --- plugins/GdbPlugin/trunk/debugger/core/DebuggerDB.java 2007-03-29 21:09:08 UTC (rev 9351) +++ plugins/GdbPlugin/trunk/debugger/core/DebuggerDB.java 2007-03-29 21:18:30 UTC (rev 9352) @@ -1,77 +0,0 @@ -package debugger.core; - -import gdb.breakpoints.Breakpoint; - -import java.util.HashSet; -import java.util.Vector; - -import debugger.itf.IBreakpoint; - -public class DebuggerDB { - static private DebuggerDB instance = null; - Vector<Breakpoint> breakpoints = new Vector<Breakpoint>(); - String currentFile = ""; - int currentLine = 0; - Vector<BreakpointListListener> breakpointListeners = - new Vector<BreakpointListListener>(); - - public interface BreakpointListListener { - void breakpointAdded(Breakpoint bp); - void breakpointRemoved(Breakpoint bp); - } - - private DebuggerDB() { - } - static public DebuggerDB getInstance() { - if (instance == null) - instance = new DebuggerDB(); - return instance; - } - public Vector<Breakpoint> getBreakpoints() { - return breakpoints; - } - public HashSet<Integer> getBreakpointLines(String file) { - HashSet<Integer> lines = new HashSet<Integer>(); - for (int i = 0; i < breakpoints.size(); i++) { - IBreakpoint b = breakpoints.get(i); - if (b.getFile().equals(file)) - lines.add(b.getLine()); - } - return lines; - } - public void addBreakpointListListener(BreakpointListListener l) { - breakpointListeners.add(l); - } - public void removeBreakpointListListener(BreakpointListListener l) { - breakpointListeners.remove(l); - } - public void addBreakpoint(Breakpoint b) { - breakpoints.add(b); - for (int i = 0; i < breakpointListeners.size(); i++) - breakpointListeners.get(i).breakpointAdded(b); - } - public void removeBreakpoint(Breakpoint b) { - breakpoints.remove(b); - for (int i = 0; i < breakpointListeners.size(); i++) - breakpointListeners.get(i).breakpointRemoved(b); - } - public Vector<IBreakpoint> getBreakpoints(String file, int line) { - Vector<IBreakpoint> brkpts = new Vector<IBreakpoint>(); - for (int i = 0; i < breakpoints.size(); i++) { - IBreakpoint b = breakpoints.get(i); - if (b.getFile().equals(file) && b.getLine() == line) - brkpts.add(b); - } - return brkpts; - } - public void setCurrentLocation(String file, int line) { - currentFile = file; - currentLine = line; - } - public String getCurrentFile() { - return currentFile; - } - public int getCurrentLine() { - return currentLine; - } -} Modified: plugins/GdbPlugin/trunk/debugger/jedit/Plugin.java =================================================================== --- plugins/GdbPlugin/trunk/debugger/jedit/Plugin.java 2007-03-29 21:09:08 UTC (rev 9351) +++ plugins/GdbPlugin/trunk/debugger/jedit/Plugin.java 2007-03-29 21:18:30 UTC (rev 9352) @@ -19,6 +19,7 @@ package debugger.jedit; import gdb.breakpoints.Breakpoint; +import gdb.breakpoints.BreakpointList; import gdb.core.Debugger; import java.util.Enumeration; @@ -31,7 +32,6 @@ import org.gjt.sp.jedit.io.VFSManager; import org.gjt.sp.jedit.textarea.JEditTextArea; -import debugger.core.DebuggerDB; import debugger.itf.DebuggerTool; import debugger.itf.IBreakpoint; import debugger.itf.JEditFrontEnd; @@ -46,7 +46,7 @@ public void stop() { // Remove all debugger painters - Vector<Breakpoint> breakpoints = DebuggerDB.getInstance().getBreakpoints(); + Vector<Breakpoint> breakpoints = BreakpointList.getInstance().getBreakpoints(); Enumeration<Breakpoint> bpEnum = breakpoints.elements(); while (bpEnum.hasMoreElements()) { Breakpoint bp = (Breakpoint) bpEnum.nextElement(); @@ -60,7 +60,7 @@ Buffer buffer = view.getBuffer(); JEditTextArea ta = view.getTextArea(); int line = ta.getCaretLine() + 1; - Vector<IBreakpoint> breakpoints = DebuggerDB.getInstance().getBreakpoints(buffer.getPath(), line); + Vector<IBreakpoint> breakpoints = BreakpointList.getInstance().getBreakpoints(buffer.getPath(), line); if (breakpoints.isEmpty()) setBreakpoint(view); else @@ -76,7 +76,7 @@ Buffer buffer = view.getBuffer(); JEditTextArea ta = view.getTextArea(); int line = ta.getCaretLine() + 1; - Vector<IBreakpoint> breakpoints = DebuggerDB.getInstance().getBreakpoints(buffer.getPath(), line); + Vector<IBreakpoint> breakpoints = BreakpointList.getInstance().getBreakpoints(buffer.getPath(), line); if (breakpoints.isEmpty()) return; for (int i = 0; i < breakpoints.size(); i++) { @@ -123,7 +123,6 @@ jumpTo(file, line, isCurrent); } public void setCurrentLocation(String file, int line) { - DebuggerDB.getInstance().setCurrentLocation(file, line); goTo(file, line, true); } Modified: plugins/GdbPlugin/trunk/gdb/breakpoints/Breakpoint.java =================================================================== --- plugins/GdbPlugin/trunk/gdb/breakpoints/Breakpoint.java 2007-03-29 21:09:08 UTC (rev 9351) +++ plugins/GdbPlugin/trunk/gdb/breakpoints/Breakpoint.java 2007-03-29 21:18:30 UTC (rev 9352) @@ -3,7 +3,6 @@ import org.gjt.sp.jedit.Buffer; import org.gjt.sp.jedit.View; -import debugger.core.DebuggerDB; import debugger.itf.DebuggerTool; import debugger.itf.IBreakpoint; @@ -23,7 +22,7 @@ this.buffer = buffer; addPainter(); enabled = true; - DebuggerDB.getInstance().addBreakpoint(this); + BreakpointList.getInstance().addBreakpoint(this); } public IBreakpoint getBreakpoint() { return breakpoint; @@ -57,7 +56,7 @@ breakpoint = debugger.addBreakpoint(getFile(), getLine()); if (breakpoint == null) { // Couldn't re-enable, remove completely - DebuggerDB.getInstance().removeBreakpoint(this); + BreakpointList.getInstance().removeBreakpoint(this); removePainter(); return; } @@ -74,7 +73,7 @@ return enabled; } public void remove() { - DebuggerDB.getInstance().removeBreakpoint(this); + BreakpointList.getInstance().removeBreakpoint(this); if (breakpoint != null) { breakpoint.remove(); breakpoint = null; Added: plugins/GdbPlugin/trunk/gdb/breakpoints/BreakpointList.java =================================================================== --- plugins/GdbPlugin/trunk/gdb/breakpoints/BreakpointList.java (rev 0) +++ plugins/GdbPlugin/trunk/gdb/breakpoints/BreakpointList.java 2007-03-29 21:18:30 UTC (rev 9352) @@ -0,0 +1,64 @@ +package gdb.breakpoints; + + +import java.util.HashSet; +import java.util.Vector; + +import debugger.itf.IBreakpoint; + +public class BreakpointList { + static private BreakpointList instance = null; + Vector<Breakpoint> breakpoints = new Vector<Breakpoint>(); + Vector<BreakpointListListener> breakpointListeners = + new Vector<BreakpointListListener>(); + + public interface BreakpointListListener { + void breakpointAdded(Breakpoint bp); + void breakpointRemoved(Breakpoint bp); + } + + private BreakpointList() { + } + static public BreakpointList getInstance() { + if (instance == null) + instance = new BreakpointList(); + return instance; + } + public Vector<Breakpoint> getBreakpoints() { + return breakpoints; + } + public HashSet<Integer> getBreakpointLines(String file) { + HashSet<Integer> lines = new HashSet<Integer>(); + for (int i = 0; i < breakpoints.size(); i++) { + IBreakpoint b = breakpoints.get(i); + if (b.getFile().equals(file)) + lines.add(b.getLine()); + } + return lines; + } + public void addBreakpointListListener(BreakpointListListener l) { + breakpointListeners.add(l); + } + public void removeBreakpointListListener(BreakpointListListener l) { + breakpointListeners.remove(l); + } + public void addBreakpoint(Breakpoint b) { + breakpoints.add(b); + for (int i = 0; i < breakpointListeners.size(); i++) + breakpointListeners.get(i).breakpointAdded(b); + } + public void removeBreakpoint(Breakpoint b) { + breakpoints.remove(b); + for (int i = 0; i < breakpointListeners.size(); i++) + breakpointListeners.get(i).breakpointRemoved(b); + } + public Vector<IBreakpoint> getBreakpoints(String file, int line) { + Vector<IBreakpoint> brkpts = new Vector<IBreakpoint>(); + for (int i = 0; i < breakpoints.size(); i++) { + IBreakpoint b = breakpoints.get(i); + if (b.getFile().equals(file) && b.getLine() == line) + brkpts.add(b); + } + return brkpts; + } +} Modified: plugins/GdbPlugin/trunk/gdb/breakpoints/BreakpointView.java =================================================================== --- plugins/GdbPlugin/trunk/gdb/breakpoints/BreakpointView.java 2007-03-29 21:09:08 UTC (rev 9351) +++ plugins/GdbPlugin/trunk/gdb/breakpoints/BreakpointView.java 2007-03-29 21:18:30 UTC (rev 9352) @@ -1,5 +1,7 @@ package gdb.breakpoints; +import gdb.breakpoints.BreakpointList.BreakpointListListener; + import java.awt.BorderLayout; import java.awt.Component; import java.awt.event.MouseAdapter; @@ -16,8 +18,6 @@ import javax.swing.border.Border; import javax.swing.border.EmptyBorder; -import debugger.core.DebuggerDB; -import debugger.core.DebuggerDB.BreakpointListListener; @SuppressWarnings("serial") public class BreakpointView extends JPanel { @@ -45,13 +45,13 @@ add(new JScrollPane(list)); model = new DefaultListModel(); list.setModel(model); - Vector<Breakpoint> brks = DebuggerDB.getInstance().getBreakpoints(); + Vector<Breakpoint> brks = BreakpointList.getInstance().getBreakpoints(); for (int i = 0; i < brks.size(); i++) { Breakpoint bp = (Breakpoint)brks.get(i); model.addElement(new BreakpointCheckBox(bp)); } - DebuggerDB.getInstance().addBreakpointListListener(new BreakpointListListener() { + BreakpointList.getInstance().addBreakpointListListener(new BreakpointListListener() { public void breakpointAdded(Breakpoint bp) { model.addElement(new BreakpointCheckBox(bp)); } Modified: plugins/GdbPlugin/trunk/gdb/core/Debugger.java =================================================================== --- plugins/GdbPlugin/trunk/gdb/core/Debugger.java 2007-03-29 21:09:08 UTC (rev 9351) +++ plugins/GdbPlugin/trunk/gdb/core/Debugger.java 2007-03-29 21:18:30 UTC (rev 9352) @@ -1,6 +1,7 @@ package gdb.core; import gdb.breakpoints.Breakpoint; +import gdb.breakpoints.BreakpointList; import gdb.breakpoints.BreakpointView; import gdb.breakpoints.GdbBreakpoint; import gdb.context.StackTrace; @@ -27,7 +28,6 @@ import org.gjt.sp.jedit.View; import org.gjt.sp.jedit.jEdit; -import debugger.core.DebuggerDB; import debugger.itf.DebuggerTool; import debugger.itf.IBreakpoint; import debugger.itf.IData; @@ -163,7 +163,7 @@ // First set up the arguments commandManager.add("-exec-arguments " + args); // Now set up the breakpoints - Vector<Breakpoint> bps = DebuggerDB.getInstance().getBreakpoints(); + Vector<Breakpoint> bps = BreakpointList.getInstance().getBreakpoints(); for (int i = 0; i < bps.size(); i++) { Breakpoint b = bps.get(i); GdbBreakpoint gbp = (GdbBreakpoint)b.getBreakpoint(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |