Menu
▾
▴
rubyeclipse-commit — Every CVS commit creates a post to this list.
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
(41) |
Apr
(9) |
May
|
Jun
|
Jul
(39) |
Aug
(38) |
Sep
(135) |
Oct
(220) |
Nov
(75) |
Dec
(74) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(44) |
Feb
(160) |
Mar
(49) |
Apr
(69) |
May
(40) |
Jun
(52) |
Jul
(47) |
Aug
(51) |
Sep
(19) |
Oct
(22) |
Nov
(36) |
Dec
(76) |
| 2007 |
Jan
(154) |
Feb
(165) |
Mar
(186) |
Apr
(143) |
May
(175) |
Jun
(133) |
Jul
(203) |
Aug
(177) |
Sep
(136) |
Oct
|
Nov
|
Dec
|
|
From: David C. <dc...@us...> - 2005-10-09 22:13:10
|
Update of /cvsroot/rubyeclipse/org.rubypeople.rdt.core.tests/src/org/rubypeople/rdt/internal/core/ast In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21652/src/org/rubypeople/rdt/internal/core/ast Modified Files: DumpAst.java Log Message: Upgraded to JRuby head. More work on Updating the Symbol Index for class names. Index: DumpAst.java =================================================================== RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.core.tests/src/org/rubypeople/rdt/internal/core/ast/DumpAst.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** DumpAst.java 1 Oct 2005 23:10:58 -0000 1.2 --- DumpAst.java 9 Oct 2005 22:13:01 -0000 1.3 *************** *** 5,8 **** --- 5,9 ---- import java.lang.reflect.Method; import java.lang.reflect.Proxy; + import java.util.Iterator; import org.jruby.ast.Node; *************** *** 13,21 **** public class DumpAst { private static class DumpingInvocationHandler implements InvocationHandler { public Object invoke(Object proxy, Method method, Object[] args) throws Throwable { Node node = (Node) args[0]; ! System.out.println("Start: " + node.getClass().getName()); return null; --- 14,24 ---- public class DumpAst { + private static final String RUBY_CODE = "class Alpha::Beta::Gamma::Delta; end"; + private static class DumpingInvocationHandler implements InvocationHandler { public Object invoke(Object proxy, Method method, Object[] args) throws Throwable { Node node = (Node) args[0]; ! System.out.println(node); return null; *************** *** 24,28 **** public static void main(String[] args) throws Exception { ! new DumpAst().dump("require 'x'; class Foo; end"); } --- 27,31 ---- public static void main(String[] args) throws Exception { ! new DumpAst().dump(RUBY_CODE); } *************** *** 34,38 **** NodeVisitor dumpVisitor = (NodeVisitor) Proxy.newProxyInstance(getClass().getClassLoader(), new Class[] {NodeVisitor.class}, new DumpingInvocationHandler()); ! rootNode.accept(dumpVisitor); } --- 37,51 ---- NodeVisitor dumpVisitor = (NodeVisitor) Proxy.newProxyInstance(getClass().getClassLoader(), new Class[] {NodeVisitor.class}, new DumpingInvocationHandler()); ! dumpNode(rootNode, dumpVisitor, 0); ! } ! ! private void dumpNode(Node node, NodeVisitor visitor, int depth) { ! System.out.print(" ".substring(0,depth*2)); ! node.accept(visitor); ! for (Iterator iter = node.childNodes().iterator(); iter.hasNext();) { ! Node childNode = (Node) iter.next(); ! dumpNode(childNode, visitor, depth + 1); ! } ! } |
|
From: David C. <dc...@us...> - 2005-10-09 22:13:10
|
Update of /cvsroot/rubyeclipse/org.rubypeople.rdt.core.tests/src/org/rubypeople/rdt/internal/core/builder In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21652/src/org/rubypeople/rdt/internal/core/builder Modified Files: IndexUpdater_UT.java TC_RdtCompiler.java Log Message: Upgraded to JRuby head. More work on Updating the Symbol Index for class names. Index: TC_RdtCompiler.java =================================================================== RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.core.tests/src/org/rubypeople/rdt/internal/core/builder/TC_RdtCompiler.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** TC_RdtCompiler.java 1 Oct 2005 23:10:58 -0000 1.2 --- TC_RdtCompiler.java 9 Oct 2005 22:13:01 -0000 1.3 *************** *** 1,4 **** --- 1,7 ---- package org.rubypeople.rdt.internal.core.builder; + import java.util.ArrayList; + import java.util.List; + import junit.framework.TestCase; *************** *** 24,31 **** file.setContents(FILE_CONTENTS); ! rootNode = new Node() { ! public void accept(NodeVisitor visitor) { } }; markerManager = new ShamMarkerManager(); --- 27,37 ---- file.setContents(FILE_CONTENTS); ! rootNode = new Node(null) { public void accept(NodeVisitor visitor) { } + + public List childNodes() { + return new ArrayList(); + } }; markerManager = new ShamMarkerManager(); Index: IndexUpdater_UT.java =================================================================== RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.core.tests/src/org/rubypeople/rdt/internal/core/builder/IndexUpdater_UT.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** IndexUpdater_UT.java 1 Oct 2005 23:00:54 -0000 1.1 --- IndexUpdater_UT.java 9 Oct 2005 22:13:01 -0000 1.2 *************** *** 1,9 **** --- 1,13 ---- package org.rubypeople.rdt.internal.core.builder; + import java.io.InputStreamReader; + import junit.framework.TestCase; import org.eclipse.core.resources.IFile; + import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IPath; import org.jruby.ast.ClassNode; + import org.jruby.ast.Colon2Node; import org.jruby.ast.Node; import org.jruby.ast.TrueNode; *************** *** 11,14 **** --- 15,19 ---- import org.rubypeople.eclipse.shams.resources.ShamFile; import org.rubypeople.rdt.internal.core.parser.RdtPosition; + import org.rubypeople.rdt.internal.core.parser.RubyParser; import org.rubypeople.rdt.internal.core.symbols.ClassSymbol; import org.rubypeople.rdt.internal.core.symbols.SymbolIndex; *************** *** 38,42 **** public void testSimple() { ! Node node = new ClassNode(POSITION_1, TEST_CLASS_NAME, null, null); updater.update(file, node); --- 43,48 ---- public void testSimple() { ! Colon2Node nameNode = new Colon2Node(POSITION_1, null, TEST_CLASS_NAME); ! Node node = new ClassNode(POSITION_1, nameNode, null, null); updater.update(file, node); *************** *** 44,47 **** --- 50,96 ---- symbolIndex.assertAdded(new ClassSymbol(TEST_CLASS_NAME), file, POSITION_1); } + + public void testWithTree() throws Exception { + Node node = parseCode("if x\nclass Foo\nend\n end\n"); + + updater.update(file,node); + + symbolIndex.assertFlushed(file.getFullPath()); + symbolIndex.assertAdded(new ClassSymbol("Foo"), file, new RdtPosition(1, 2, 10, 18)); + } + + public void testTreeWithScopedClass() throws Exception { + Node node = parseCode("if x\nclass Foo::Bar\nend\n end\n"); + + updater.update(file,node); + + symbolIndex.assertFlushed(file.getFullPath()); + symbolIndex.assertAdded(new ClassSymbol("Foo::Bar"), file, new RdtPosition(1, 2, 10, 23)); + } + + public void testTreeWithDeeplyScopedClass() throws Exception { + Node node = parseCode("if x\nclass X::Foo::Bar\nend\n end\n"); + + updater.update(file,node); + + symbolIndex.assertFlushed(file.getFullPath()); + symbolIndex.assertAdded(new ClassSymbol("X::Foo::Bar"), file, new RdtPosition(1, 2, 10, 26)); + } + + public void testTreeWithNesting() throws Exception { + Node node = parseCode("if x\nmodule Foo\nclass Bar\nend\n end\nend\n"); + + updater.update(file,node); + + symbolIndex.assertFlushed(file.getFullPath()); + symbolIndex.assertAdded(new ClassSymbol("Foo::Bar"), file, new RdtPosition(2, 3, 21, 29)); + } + + + private Node parseCode(String code) throws CoreException { + file.setContents(code); + InputStreamReader reader = new InputStreamReader(file.getContents()); + return new RubyParser().parse(file, reader); + } private static class MockSymbolIndex extends SymbolIndex { |
|
From: David C. <dc...@us...> - 2005-10-09 22:13:03
|
Update of /cvsroot/rubyeclipse/org.epic.regexp/src/org/epic/regexp/views In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21630/src/org/epic/regexp/views Modified Files: RegExpView.java Log Message: Upgraded to JRuby head. More work on Updating the Symbol Index for class names. Index: RegExpView.java =================================================================== RCS file: /cvsroot/rubyeclipse/org.epic.regexp/src/org/epic/regexp/views/RegExpView.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** RegExpView.java 2 Mar 2005 01:55:09 -0000 1.3 --- RegExpView.java 9 Oct 2005 22:12:57 -0000 1.4 *************** *** 44,49 **** class DebugInfo { - private RE re; - private List subexpressions = new ArrayList(); --- 44,47 ---- *************** *** 212,217 **** private int debugPosition = 0; - private static final String SHORTCUTS_RESOURCE_BUNDLE = "org.epic.regexp.shortcuts"; - /** * The constructor. --- 210,213 ---- |
|
From: Markus B. <mba...@us...> - 2005-10-09 21:22:34
|
Update of /cvsroot/rubyeclipse/org.rubypeople.rdt.launching/ruby In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1181/ruby Modified Files: eclipseDebug.rb Log Message: fixed port 1098 replaced by variable port Index: eclipseDebug.rb =================================================================== RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.launching/ruby/eclipseDebug.rb,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** eclipseDebug.rb 6 Oct 2005 23:29:45 -0000 1.15 --- eclipseDebug.rb 9 Oct 2005 21:22:28 -0000 1.16 *************** *** 7,11 **** # eclipse. If you change this, you must also change the corresponding port in # org.rubypeople.rdt.internal.debug.core.RubyDebuggerProxy ! ECLIPSE_LISTEN_PORT = 1098 # ECLIPSE_VERBOSE prints tihe communication between eclipse and ruby debugger --- 7,11 ---- # eclipse. If you change this, you must also change the corresponding port in # org.rubypeople.rdt.internal.debug.core.RubyDebuggerProxy ! ECLIPSE_LISTEN_PORT = (defined? $EclipseListenPort) ? $EclipseListenPort : 1098 # ECLIPSE_VERBOSE prints tihe communication between eclipse and ruby debugger |
|
From: Markus B. <mba...@us...> - 2005-10-09 21:22:33
|
Update of /cvsroot/rubyeclipse/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/internal/launching In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1181/src/org/rubypeople/rdt/internal/launching Modified Files: DebuggerRunner.java Log Message: fixed port 1098 replaced by variable port Index: DebuggerRunner.java =================================================================== RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/internal/launching/DebuggerRunner.java,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** DebuggerRunner.java 25 Sep 2005 17:57:01 -0000 1.19 --- DebuggerRunner.java 9 Oct 2005 21:22:28 -0000 1.20 *************** *** 16,22 **** public class DebuggerRunner extends InterpreterRunner { public IProcess run(InterpreterRunnerConfiguration configuration, ILaunch launch) throws CoreException { IProcess process = super.run(configuration, launch); ! RubyDebugTarget debugTarget = new RubyDebugTarget(launch, process); RubyDebuggerProxy proxy = new RubyDebuggerProxy(debugTarget) ; if (proxy.checkConnection()) { --- 16,24 ---- public class DebuggerRunner extends InterpreterRunner { + private RubyDebugTarget debugTarget ; public IProcess run(InterpreterRunnerConfiguration configuration, ILaunch launch) throws CoreException { + debugTarget = new RubyDebugTarget(launch); IProcess process = super.run(configuration, launch); ! debugTarget.setProcess(process) ; RubyDebuggerProxy proxy = new RubyDebuggerProxy(debugTarget) ; if (proxy.checkConnection()) { *************** *** 32,35 **** --- 34,41 ---- protected void addDebugCommandLineArgument(List commandLine) { + if (!debugTarget.isUsingDefaultPort()) { + commandLine.add("-r" + debugTarget.getDebugParameterFile().getAbsolutePath()); + } + if (RdtDebugCorePlugin.isRubyDebuggerVerbose()) { commandLine.add("-reclipseDebugVerbose"); |
|
From: Markus B. <mba...@us...> - 2005-10-09 21:22:29
|
Update of /cvsroot/rubyeclipse/org.rubypeople.rdt In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1144 Modified Files: Changelog.txt Log Message: fixed port 1098 replaced by variable port Index: Changelog.txt =================================================================== RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt/Changelog.txt,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** Changelog.txt 6 Oct 2005 23:30:01 -0000 1.15 --- Changelog.txt 9 Oct 2005 21:22:23 -0000 1.16 *************** *** 1,3 **** --- 1,6 ---- Changes since 0.6.0: + * Multiple debugger session possible because a free port will be used for the debugger communication. The port is written to a + temporary file and conveyed to the ruby process with "-r<tmpFile>". The fixed port used in the past (1098) is still the default + port in the case that a temporary file can not be created * Catchpoints: * The default was to halt at every type of StandardError, the new default is *not* to halt when exceptions are raised |
Update of /cvsroot/rubyeclipse/org.rubypeople.rdt.debug.core.tests/src/org/rubypeople/rdt/debug/core/tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1082/src/org/rubypeople/rdt/debug/core/tests Modified Files: TC_DebuggerCommunicationTest.java TestRubyDebugTarget.java TS_Debug.java Added Files: FTC_DebuggerLaunch.java Log Message: fixed port 1098 replaced by variable port Index: TestRubyDebugTarget.java =================================================================== RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.debug.core.tests/src/org/rubypeople/rdt/debug/core/tests/TestRubyDebugTarget.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** TestRubyDebugTarget.java 19 Dec 2002 21:15:17 -0000 1.1 --- TestRubyDebugTarget.java 9 Oct 2005 21:22:19 -0000 1.2 *************** *** 129,131 **** --- 129,136 ---- } + + public int getPort() { + return -1; + } + } Index: TC_DebuggerCommunicationTest.java =================================================================== RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.debug.core.tests/src/org/rubypeople/rdt/debug/core/tests/TC_DebuggerCommunicationTest.java,v retrieving revision 1.38 retrieving revision 1.39 diff -C2 -d -r1.38 -r1.39 *** TC_DebuggerCommunicationTest.java 6 Oct 2005 23:29:56 -0000 1.38 --- TC_DebuggerCommunicationTest.java 9 Oct 2005 21:22:19 -0000 1.39 *************** *** 88,92 **** return tmpDir; } ! private static String RUBY_INTERPRETER; static { RUBY_INTERPRETER = System.getProperty("rdt.rubyInterpreter"); --- 88,92 ---- return tmpDir; } ! public static String RUBY_INTERPRETER; static { RUBY_INTERPRETER = System.getProperty("rdt.rubyInterpreter"); Index: TS_Debug.java =================================================================== RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.debug.core.tests/src/org/rubypeople/rdt/debug/core/tests/TS_Debug.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** TS_Debug.java 20 Mar 2003 22:17:09 -0000 1.4 --- TS_Debug.java 9 Oct 2005 21:22:19 -0000 1.5 *************** *** 11,14 **** --- 11,15 ---- suite.addTestSuite(TC_DebuggerProxyTest.class) ; suite.addTestSuite(TC_ReadStrategyTest.class) ; + suite.addTestSuite(FTC_DebuggerLaunch.class) ; return suite; } --- NEW FILE: FTC_DebuggerLaunch.java --- package org.rubypeople.rdt.debug.core.tests; import java.io.ByteArrayInputStream; import junit.framework.Assert; import junit.framework.TestCase; import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.Path; import org.eclipse.debug.core.DebugPlugin; import org.eclipse.debug.core.ILaunch; import org.eclipse.debug.core.ILaunchConfiguration; import org.eclipse.debug.core.ILaunchConfigurationType; import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy; import org.eclipse.debug.core.model.IProcess; import org.rubypeople.eclipse.testutils.ResourceTools; import org.rubypeople.rdt.internal.debug.core.RubyLineBreakpoint; import org.rubypeople.rdt.internal.launching.RubyInterpreter; import org.rubypeople.rdt.internal.launching.RubyLaunchConfigurationAttribute; import org.rubypeople.rdt.internal.launching.RubyRuntime; /* * */ public class FTC_DebuggerLaunch extends TestCase { public void setUp() { this.createInterpreter() ; } protected void createInterpreter() { RubyInterpreter rubyInterpreter = new RubyInterpreter("RubyInterpreter", new Path(TC_DebuggerCommunicationTest.RUBY_INTERPRETER)); RubyRuntime.getDefault().addInstalledInterpreter(rubyInterpreter) ; } protected void log(String label, ILaunch launch) throws Exception { System.out.println("Infos about " + label + ":"); IProcess process = launch.getProcesses()[0]; if (process.isTerminated()) { System.out.println("Process has finished with exit-value: " + process.getExitValue()); } else { System.out.println("Process still running."); } String error = process.getStreamsProxy().getErrorStreamMonitor().getContents(); if (error != null && error.length() > 0) { System.out.println("Process stderr: " + error); } String stdout = process.getStreamsProxy().getOutputStreamMonitor().getContents(); if (stdout != null && stdout.length() > 0) { System.out.println("Process stdout: " + stdout); } } public void testTwoSessions() throws Exception { ILaunchConfigurationType lcT = DebugPlugin.getDefault().getLaunchManager().getLaunchConfigurationType(RubyLaunchConfigurationAttribute.RUBY_LAUNCH_CONFIGURATION_TYPE) ; ILaunchConfigurationWorkingCopy wc = lcT.newInstance(null, "TestLaunchConfiguration") ; IProject project = ResourceTools.createProject("FTCDebuggerLaunchMultipleSessions") ; IFile rubyFile = project.getFile("run.rb"); rubyFile.create(new ByteArrayInputStream("puts 'a'\nputs 'b'".getBytes()), true, new NullProgressMonitor()) ; wc.setAttribute(RubyLaunchConfigurationAttribute.PROJECT_NAME, rubyFile.getProject().getName()); wc.setAttribute(RubyLaunchConfigurationAttribute.FILE_NAME, rubyFile.getProjectRelativePath().toString()); //wc.setAttribute(RubyLaunchConfigurationAttribute.WORKING_DIRECTORY, RubyApplicationShortcut.getDefaultWorkingDirectory(rubyFile.getProject())); wc.setAttribute(RubyLaunchConfigurationAttribute.SELECTED_INTERPRETER, RubyRuntime.getDefault().getSelectedInterpreter().getName()); ILaunchConfiguration lc = wc.doSave() ; DebugPlugin.getDefault().getBreakpointManager().addBreakpoint(new RubyLineBreakpoint(rubyFile, 1)) ; ILaunch launch = lc.launch("debug", new NullProgressMonitor()) ; Thread.sleep(5000) ; this.log("1. launch", launch) ; // getDebugTarget returns null if connection between ruby debugger and RubyDebuggerProxy (RubyLoop) could not // be established Assert.assertNotNull(launch.getDebugTarget()) ; Assert.assertTrue(launch.getDebugTarget().getThreads()[0].isSuspended()) ; // the breakpoint we have set for the first launch has disappeard at this point through // a ResourceChanged Event DebugPlugin.getDefault().getBreakpointManager().addBreakpoint(new RubyLineBreakpoint(rubyFile, 1)) ; ILaunch secondlaunch = lc.launch("debug", new NullProgressMonitor()) ; Thread.sleep(5000) ; this.log("2. launch", secondlaunch) ; Assert.assertNotNull(secondlaunch.getDebugTarget()) ; Assert.assertFalse(secondlaunch.getProcesses()[0].isTerminated()) ; Assert.assertTrue(secondlaunch.getDebugTarget().getThreads()[0].isSuspended()) ; } } |
|
From: Markus B. <mba...@us...> - 2005-10-09 21:22:24
|
Update of /cvsroot/rubyeclipse/org.rubypeople.rdt.debug.core.tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1082 Modified Files: plugin.xml Log Message: fixed port 1098 replaced by variable port Index: plugin.xml =================================================================== RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.debug.core.tests/plugin.xml,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** plugin.xml 16 Sep 2005 20:53:53 -0000 1.9 --- plugin.xml 9 Oct 2005 21:22:19 -0000 1.10 *************** *** 23,26 **** --- 23,27 ---- <import plugin="org.eclipse.core.runtime"/> <import plugin="org.rubypeople.rdt.core"/> + <import plugin="org.rubypeople.eclipse.testutils"/> </requires> |
|
From: Markus B. <mba...@us...> - 2005-10-09 21:22:17
|
Update of /cvsroot/rubyeclipse/org.rubypeople.rdt.debug.core/src/org/rubypeople/rdt/internal/debug/core In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1010/src/org/rubypeople/rdt/internal/debug/core Modified Files: RdtDebugCorePlugin.java RubyDebuggerProxy.java Log Message: fixed port 1098 replaced by variable port Index: RubyDebuggerProxy.java =================================================================== RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.debug.core/src/org/rubypeople/rdt/internal/debug/core/RubyDebuggerProxy.java,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** RubyDebuggerProxy.java 6 Oct 2005 23:29:49 -0000 1.18 --- RubyDebuggerProxy.java 9 Oct 2005 21:22:08 -0000 1.19 *************** *** 40,44 **** public RubyDebuggerProxy(IRubyDebugTarget debugTarget) { this.debugTarget = debugTarget; ! debugTarget.setRubyDebuggerProxy(this); } --- 40,44 ---- public RubyDebuggerProxy(IRubyDebugTarget debugTarget) { this.debugTarget = debugTarget; ! debugTarget.setRubyDebuggerProxy(this); } *************** *** 74,78 **** for (int i = 0; i < tryCount; i++) { try { ! socket = new Socket("localhost", 1098); return socket; } catch (IOException e) { --- 74,78 ---- for (int i = 0; i < tryCount; i++) { try { ! socket = new Socket("localhost", debugTarget.getPort()); return socket; } catch (IOException e) { Index: RdtDebugCorePlugin.java =================================================================== RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.debug.core/src/org/rubypeople/rdt/internal/debug/core/RdtDebugCorePlugin.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** RdtDebugCorePlugin.java 2 Mar 2005 00:54:35 -0000 1.6 --- RdtDebugCorePlugin.java 9 Oct 2005 21:22:08 -0000 1.7 *************** *** 42,45 **** --- 42,49 ---- RdtDebugCorePlugin.log(status); } + + public static void log(String message, Throwable e) { + log(new Status(IStatus.ERROR, PLUGIN_ID, IStatus.ERROR, message, e)); + } public static void log(IStatus status) { |
|
From: Markus B. <mba...@us...> - 2005-10-09 21:22:15
|
Update of /cvsroot/rubyeclipse/org.rubypeople.rdt.debug.core/src/org/rubypeople/rdt/internal/debug/core/model In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1010/src/org/rubypeople/rdt/internal/debug/core/model Modified Files: IRubyDebugTarget.java RubyDebugTarget.java Log Message: fixed port 1098 replaced by variable port Index: RubyDebugTarget.java =================================================================== RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.debug.core/src/org/rubypeople/rdt/internal/debug/core/model/RubyDebugTarget.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** RubyDebugTarget.java 3 Oct 2005 07:16:25 -0000 1.10 --- RubyDebugTarget.java 9 Oct 2005 21:22:08 -0000 1.11 *************** *** 1,4 **** --- 1,9 ---- package org.rubypeople.rdt.internal.debug.core.model; + import java.io.File; + import java.io.FileWriter; + import java.io.IOException; + import java.io.PrintWriter; + import org.eclipse.core.resources.IMarkerDelta; import org.eclipse.core.runtime.IStatus; *************** *** 14,17 **** --- 19,23 ---- import org.eclipse.debug.core.model.IProcess; import org.eclipse.debug.core.model.IThread; + import org.rubypeople.rdt.core.SocketUtil; import org.rubypeople.rdt.internal.debug.core.RdtDebugCorePlugin; import org.rubypeople.rdt.internal.debug.core.RubyDebuggerProxy; *************** *** 24,28 **** public class RubyDebugTarget extends PlatformObject implements IRubyDebugTarget { ! private IProcess process; private boolean isTerminated; --- 30,34 ---- public class RubyDebugTarget extends PlatformObject implements IRubyDebugTarget { ! private static int DEFAULT_PORT = 1098 ; private IProcess process; private boolean isTerminated; *************** *** 30,34 **** --- 36,46 ---- private RubyThread[] threads; private RubyDebuggerProxy rubyDebuggerProxy; + private int port = -1 ; + private File debugParameterFile; + public RubyDebugTarget(ILaunch launch) { + this(launch, null) ; + } + public RubyDebugTarget(ILaunch launch, IProcess process) { this.launch = launch; *************** *** 37,41 **** IBreakpointManager manager= DebugPlugin.getDefault().getBreakpointManager(); manager.addBreakpointListener(this); - } --- 49,52 ---- *************** *** 137,141 **** // launch is one of the listeners DebugPlugin.getDefault().fireDebugEventSet(new DebugEvent[] {new DebugEvent(this, DebugEvent.TERMINATE)}); ! } --- 148,159 ---- // launch is one of the listeners DebugPlugin.getDefault().fireDebugEventSet(new DebugEvent[] {new DebugEvent(this, DebugEvent.TERMINATE)}); ! ! // delete the debugParameteFile if it could be created ! if (debugParameterFile.exists()) { ! boolean deleted = debugParameterFile.delete() ; ! if (!deleted) { ! RdtDebugCorePlugin.debug("Could not delete debugParameteFile:" + debugParameterFile.toURI()) ; ! } ! } } *************** *** 217,220 **** this.rubyDebuggerProxy = rubyDebuggerProxy; } ! } --- 235,284 ---- this.rubyDebuggerProxy = rubyDebuggerProxy; } ! ! public File getDebugParameterFile() { ! if (debugParameterFile == null) { ! try { ! debugParameterFile = File.createTempFile("eclipseDebug",".rb") ; ! } catch (IOException e) { ! RdtDebugCorePlugin.log("Could not create debugParameterFile", e) ; ! } ! } ! return debugParameterFile ; ! } ! ! public boolean addDebugParameter(String line) { ! try { ! FileWriter writer = new FileWriter(this.getDebugParameterFile()); ! new PrintWriter(writer).println(line); ! writer.flush(); ! writer.close(); ! return true; ! } catch (IOException ex) { ! RdtDebugCorePlugin.log(ex); ! return false; ! } ! } ! ! public int getPort() { ! if (port == -1) { ! port = SocketUtil.findFreePort() ; ! // port can still be -1, if findFreePort fails ! if (port != -1) { ! // see eclipseDebug.rb for how $EclipseListenPort is used from ruby side ! if (!addDebugParameter("$EclipseListenPort=" + port)) { ! port = -1 ; ! } ! } ! // if we couldn't find a free port a write the free port to the file, use the default ! if (port == -1) { ! port = DEFAULT_PORT ; ! } ! RdtDebugCorePlugin.debug("Using port: " + port) ; ! } ! return port ; ! } ! ! public boolean isUsingDefaultPort() { ! return this.getPort() == DEFAULT_PORT ; ! } } Index: IRubyDebugTarget.java =================================================================== RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.debug.core/src/org/rubypeople/rdt/internal/debug/core/model/IRubyDebugTarget.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** IRubyDebugTarget.java 20 Mar 2004 15:37:09 -0000 1.3 --- IRubyDebugTarget.java 9 Oct 2005 21:22:08 -0000 1.4 *************** *** 11,14 **** --- 11,15 ---- public void terminate() ; public void setRubyDebuggerProxy(RubyDebuggerProxy rubyDebuggerProxy) ; + public int getPort() ; |
|
From: Markus B. <mba...@us...> - 2005-10-09 21:16:50
|
Update of /cvsroot/rubyeclipse/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/internal/launching In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31965/src/org/rubypeople/rdt/internal/launching Modified Files: InterpreterRunner.java Log Message: removed unused local variable Index: InterpreterRunner.java =================================================================== RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/internal/launching/InterpreterRunner.java,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** InterpreterRunner.java 25 Sep 2005 17:57:01 -0000 1.16 --- InterpreterRunner.java 9 Oct 2005 21:16:45 -0000 1.17 *************** *** 49,54 **** private List renderCommandLine(InterpreterRunnerConfiguration configuration) { List commandLine = new ArrayList(); ! RubyInterpreter interpreter = configuration.getInterpreter(); ! addDebugCommandLineArgument(commandLine); commandLine.addAll(configuration.renderLoadPath()); --- 49,53 ---- private List renderCommandLine(InterpreterRunnerConfiguration configuration) { List commandLine = new ArrayList(); ! addDebugCommandLineArgument(commandLine); commandLine.addAll(configuration.renderLoadPath()); |
|
From: Markus B. <mba...@us...> - 2005-10-09 21:16:09
|
Update of /cvsroot/rubyeclipse/org.rubypeople.rdt.testunit/src/org/rubypeople/rdt/testunit/launcher In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31732/src/org/rubypeople/rdt/testunit/launcher Modified Files: TestUnitRunnerConfiguration.java Log Message: moved SocketUtil from org.rubypeople.rdt.testunit to org.rubypeople.rdt.core because it is needed from org.rubypeople.rdt.debug.core, too Index: TestUnitRunnerConfiguration.java =================================================================== RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.testunit/src/org/rubypeople/rdt/testunit/launcher/TestUnitRunnerConfiguration.java,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** TestUnitRunnerConfiguration.java 4 Oct 2005 22:53:19 -0000 1.16 --- TestUnitRunnerConfiguration.java 9 Oct 2005 21:16:04 -0000 1.17 *************** *** 9,12 **** --- 9,13 ---- import org.eclipse.debug.core.ILaunchConfiguration; import org.rubypeople.rdt.core.RubyCore; + import org.rubypeople.rdt.core.SocketUtil; import org.rubypeople.rdt.internal.launching.InterpreterRunnerConfiguration; import org.rubypeople.rdt.testunit.TestunitPlugin; |
|
From: Markus B. <mba...@us...> - 2005-10-09 21:15:30
|
Update of /cvsroot/rubyeclipse/org.rubypeople.rdt.testunit/src/org/rubypeople/rdt/testunit/launcher In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31473/src/org/rubypeople/rdt/testunit/launcher Modified Files: TestUnitLaunchShortcut.java Log Message: removed unused local variable Index: TestUnitLaunchShortcut.java =================================================================== RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.testunit/src/org/rubypeople/rdt/testunit/launcher/TestUnitLaunchShortcut.java,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** TestUnitLaunchShortcut.java 4 Oct 2005 22:53:19 -0000 1.13 --- TestUnitLaunchShortcut.java 9 Oct 2005 21:15:24 -0000 1.14 *************** *** 53,57 **** config.launch(mode, null); } ! IRubyElement[] classes = TestSearchEngine.findTests((IFile) rubyElement.getUnderlyingResource()); } --- 53,57 ---- config.launch(mode, null); } ! TestSearchEngine.findTests((IFile) rubyElement.getUnderlyingResource()); } |
|
From: Markus B. <mba...@us...> - 2005-10-09 21:14:53
|
Update of /cvsroot/rubyeclipse/org.rubypeople.rdt.debug.core/src/org/rubypeople/rdt/internal/debug/core In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31226/src/org/rubypeople/rdt/internal/debug/core Modified Files: DebuggerNotFoundException.java Log Message: removed warning by creation of a serialVersionUID Index: DebuggerNotFoundException.java =================================================================== RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.debug.core/src/org/rubypeople/rdt/internal/debug/core/DebuggerNotFoundException.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** DebuggerNotFoundException.java 14 Nov 2004 13:04:54 -0000 1.1 --- DebuggerNotFoundException.java 9 Oct 2005 21:14:47 -0000 1.2 *************** *** 3,6 **** --- 3,9 ---- public class DebuggerNotFoundException extends RuntimeException { + + private static final long serialVersionUID = -7048656572730937337L; + public DebuggerNotFoundException() { super("Could not connect to debugger.") ; |
|
From: Markus B. <mba...@us...> - 2005-10-09 21:14:42
|
Update of /cvsroot/rubyeclipse/org.rubypeople.rdt.core/src/org/rubypeople/rdt/core In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31151/src/org/rubypeople/rdt/core Added Files: SocketUtil.java Log Message: moved from org.rubypeople.rdt.testunit to org.rubypeople.rdt.core because it is needed from org.rubypeople.rdt.debug.core, too --- NEW FILE: SocketUtil.java --- /******************************************************************************* * Copyright (c) 2000, 2003 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Common Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/cpl-v10.html * * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ package org.rubypeople.rdt.core; import java.io.IOException; import java.net.ServerSocket; /** * Utility class to find a port to debug on. */ public class SocketUtil { /** * Returns a free port number on localhost, or -1 if unable to find a free port. * * @return a free port number on localhost, or -1 if unable to find a free port * @since 3.0 */ public static int findFreePort() { ServerSocket socket= null; try { socket= new ServerSocket(0); return socket.getLocalPort(); } catch (IOException e) { } finally { if (socket != null) { try { socket.close(); } catch (IOException e) { } } } return -1; } } |
|
From: Markus B. <mba...@us...> - 2005-10-09 21:14:38
|
Update of /cvsroot/rubyeclipse/org.rubypeople.rdt.testunit/src/org/rubypeople/rdt/testunit/launcher In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31125/src/org/rubypeople/rdt/testunit/launcher Removed Files: SocketUtil.java Log Message: moved from org.rubypeople.rdt.testunit to org.rubypeople.rdt.core because it is needed from org.rubypeople.rdt.debug.core, too --- SocketUtil.java DELETED --- |
|
From: Markus B. <mba...@us...> - 2005-10-09 21:12:56
|
Update of /cvsroot/rubyeclipse/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/internal/launching In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30469/src/org/rubypeople/rdt/internal/launching Modified Files: IllegalCommandException.java Log Message: removed warning by creation of a serialVersionUID Index: IllegalCommandException.java =================================================================== RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/internal/launching/IllegalCommandException.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** IllegalCommandException.java 5 Mar 2005 15:13:34 -0000 1.1 --- IllegalCommandException.java 9 Oct 2005 21:12:50 -0000 1.2 *************** *** 4,7 **** --- 4,9 ---- public class IllegalCommandException extends Exception { + private static final long serialVersionUID = -2008164300669142287L; + public IllegalCommandException(String arg0) { super(arg0); |
|
From: Markus B. <mba...@us...> - 2005-10-09 21:12:53
|
Update of /cvsroot/rubyeclipse/org.rubypeople.rdt.debug.core/src/org/rubypeople/rdt/internal/debug/core/parsing In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30425/src/org/rubypeople/rdt/internal/debug/core/parsing Modified Files: XmlStreamReaderException.java Log Message: removed warning by creation of a serialVersionUID Index: XmlStreamReaderException.java =================================================================== RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.debug.core/src/org/rubypeople/rdt/internal/debug/core/parsing/XmlStreamReaderException.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** XmlStreamReaderException.java 20 Mar 2004 15:37:04 -0000 1.3 --- XmlStreamReaderException.java 9 Oct 2005 21:12:47 -0000 1.4 *************** *** 3,6 **** --- 3,8 ---- public class XmlStreamReaderException extends Exception { + private static final long serialVersionUID = 2416062087800939179L; + public XmlStreamReaderException() { super(); |
|
From: Markus B. <mba...@us...> - 2005-10-09 21:12:52
|
Update of /cvsroot/rubyeclipse/org.rubypeople.rdt.debug.core/src/org/rubypeople/rdt/internal/debug/core/model In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30425/src/org/rubypeople/rdt/internal/debug/core/model Modified Files: RubyProcessingException.java Log Message: removed warning by creation of a serialVersionUID Index: RubyProcessingException.java =================================================================== RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.debug.core/src/org/rubypeople/rdt/internal/debug/core/model/RubyProcessingException.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** RubyProcessingException.java 20 Mar 2004 15:37:09 -0000 1.3 --- RubyProcessingException.java 9 Oct 2005 21:12:47 -0000 1.4 *************** *** 4,7 **** --- 4,8 ---- public class RubyProcessingException extends Exception { + private static final long serialVersionUID = -1651883905005341856L; private String rubyExceptionType ; public RubyProcessingException(String type, String message) { |
|
From: Markus B. <mba...@us...> - 2005-10-06 23:41:53
|
Update of /cvsroot/rubyeclipse/org.rubypeople.rdt.debug.ui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24329 Modified Files: plugin.xml Log Message: label for ModifyCatchpoint changed Index: plugin.xml =================================================================== RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.debug.ui/plugin.xml,v retrieving revision 1.45 retrieving revision 1.46 diff -C2 -d -r1.45 -r1.46 *** plugin.xml 6 Oct 2005 23:30:58 -0000 1.45 --- plugin.xml 6 Oct 2005 23:41:45 -0000 1.46 *************** *** 304,308 **** <action definitionId="org.rubypeople.rdt.debug.ui.commands.ModifyCatchpoint" ! label="modifyCatchpoint.label" icon="icons/full/elcl16/exc_catch.gif" helpContextId="add_exception_action_context" --- 304,308 ---- <action definitionId="org.rubypeople.rdt.debug.ui.commands.ModifyCatchpoint" ! label="%modifyCatchpoint.label" icon="icons/full/elcl16/exc_catch.gif" helpContextId="add_exception_action_context" |
|
From: Markus B. <mba...@us...> - 2005-10-06 23:31:07
|
Update of /cvsroot/rubyeclipse/org.rubypeople.rdt.debug.ui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21716 Modified Files: plugin.xml plugin.properties Log Message: RubyExceptionBreakpoints / catchpoints functionality added Index: plugin.properties =================================================================== RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.debug.ui/plugin.properties,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** plugin.properties 28 Jul 2005 11:57:16 -0000 1.16 --- plugin.properties 6 Oct 2005 23:30:58 -0000 1.17 *************** *** 25,26 **** --- 25,29 ---- cheatsheet.webservices.desc=Ruby Development Tools (RDT) Introduction + modifyCatchpoint.label=Ruby Exception Breakpoint + modifyCatchpoint.tooltip=Define a ruby exception breakpoint + Index: plugin.xml =================================================================== RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.debug.ui/plugin.xml,v retrieving revision 1.44 retrieving revision 1.45 diff -C2 -d -r1.44 -r1.45 *** plugin.xml 2 Oct 2005 17:41:53 -0000 1.44 --- plugin.xml 6 Oct 2005 23:30:58 -0000 1.45 *************** *** 1,345 **** <?xml version="1.0" encoding="UTF-8"?> <?eclipse version="3.0"?> ! <plugin ! id="org.rubypeople.rdt.debug.ui" ! name="%Plugin.name" ! version="0.6.0" ! provider-name="RubyPeople, Inc." ! class="org.rubypeople.rdt.internal.debug.ui.RdtDebugUiPlugin"> ! ! <runtime> ! <library name="rdtdebugui.jar"> ! <export name="*"/> ! </library> ! </runtime> ! ! <requires> ! <import plugin="org.eclipse.core.resources"/> ! <import plugin="org.eclipse.ui"/> ! <import plugin="org.eclipse.debug.core"/> ! <import plugin="org.eclipse.debug.ui"/> ! <import plugin="org.rubypeople.rdt.launching"/> ! <import plugin="org.rubypeople.rdt.ui"/> ! <import plugin="org.rubypeople.rdt.core"/> ! <import plugin="org.rubypeople.rdt.debug.core"/> ! <import plugin="org.eclipse.ui.workbench"/> ! <import plugin="org.eclipse.ui.workbench.texteditor"/> ! <import plugin="org.eclipse.jface.text"/> ! <import plugin="org.eclipse.ui.editors"/> ! <import plugin="org.eclipse.ui.ide"/> ! <import plugin="org.eclipse.ui.cheatsheets"/> ! <import plugin="org.eclipse.core.runtime"/> ! <import plugin="org.eclipse.ui.console"/> ! </requires> ! ! <extension ! point="org.eclipse.ui.preferencePages"> ! <page ! name="%PreferencePage.RubyInterpreter.name" ! category="org.rubypeople.rdt.ui.preferences.PreferencePageRubyBase" ! class="org.rubypeople.rdt.internal.debug.ui.preferences.RubyInterpreterPreferencePage" ! id="org.rubypeople.rdt.debug.ui.preferences.PreferencePageRubyInterpreter"> ! </page> ! </extension> ! <extension ! point="org.eclipse.ui.preferencePages"> ! <page ! name="%PreferencePage.EvaluationExpressions.name" ! category="org.rubypeople.rdt.ui.preferences.PreferencePageRubyBase" ! class="org.rubypeople.rdt.internal.debug.ui.preferences.EvaluationExpressionsPreferencePage" ! id="org.rubypeople.rdt.debug.ui.preferences.PreferencePageEvaluationExpressions"> ! </page> ! </extension> ! <extension ! point="org.eclipse.debug.ui.launchConfigurationTypeImages"> ! <launchConfigurationTypeImage ! icon="icons/full/ctool16/run_ruby.gif" ! configTypeID="org.rubypeople.rdt.launching.LaunchConfigurationTypeRubyApplication" ! id="org.rubypeople.rdt.debug.ui.LaunchConfigurationTypeImageRubyApplication"> ! </launchConfigurationTypeImage> ! </extension> ! <extension ! point="org.eclipse.debug.ui.launchConfigurationTabGroups"> ! <launchConfigurationTabGroup ! type="org.rubypeople.rdt.launching.LaunchConfigurationTypeRubyApplication" ! class="org.rubypeople.rdt.internal.debug.ui.launcher.RubyApplicationTabGroup" ! id="org.rubypeople.rdt.debug.ui.LaunchConfigurationTabGroupRubyApplication"> ! </launchConfigurationTabGroup> ! </extension> ! <extension ! point="org.eclipse.ui.editorActions"> ! <editorContribution ! targetID="org.rubypeople.rdt.ui.EditorRubyFile" ! id="org.rubypeople.rdt.debug.ui.EditorRubyFile.BreakpointRulerActions"> ! <action ! label="%Dummy.label" ! class="org.rubypeople.rdt.internal.debug.ui.actions.ManageBreakpointRulerActionDelegate" ! actionID="RulerDoubleClick" ! id="org.rubypeople.rdt.debug.ui.EditorRubyFile.ManageBreakpointRulerAction"> ! </action> ! </editorContribution> ! </extension> ! <extension ! point="org.eclipse.debug.ui.debugModelPresentations"> ! <debugModelPresentation ! class="org.rubypeople.rdt.internal.debug.ui.DebugModelPresentation" ! id="org.rubypeople.rdt.debug"> ! </debugModelPresentation> ! </extension> ! <extension ! point="org.eclipse.ui.popupMenus"> ! <viewerContribution ! targetID="org.rubypeople.rdt.ui.rubyeditor.rulerContextMenu" ! id="org.rubypeople.rdt.debug.ui.RubyRulerPopupActions"> ! <action ! label="Add Breakpoint" ! class="org.rubypeople.rdt.internal.debug.ui.actions.ManageBreakpointRulerActionDelegate" ! menubarPath="debug" ! id="ManageBreakpointRulerActionDelegate"> ! </action> ! </viewerContribution> ! </extension> ! <extension ! point="org.eclipse.debug.core.sourceLocators"> ! <sourceLocator ! name="RubySourceLocator" ! class="org.rubypeople.rdt.internal.debug.ui.RubySourceLocator" ! id="org.rubypeople.rdt.debug.ui.rubySourceLocator"> ! </sourceLocator> ! </extension> ! <extension ! point="org.eclipse.ui.viewActions"> ! <viewContribution ! targetID="org.eclipse.debug.ui.VariableView" ! id="org.eclipse.jdt.ui.debug.VariableViewActions"> ! <action ! label="%showStaticVariables" ! style="toggle" ! class="org.rubypeople.rdt.internal.debug.ui.actions.ShowStaticVariablesAction" ! state="false" ! tooltip="showStaticAction.tooltip" ! menubarPath="rubyActions" ! id="org.rubypeople.rdt.ui.variableViewActions.ShowStatic"> ! </action> ! <action ! label="%showConstants" ! style="toggle" ! class="org.rubypeople.rdt.internal.debug.ui.actions.ShowConstantsAction" ! state="false" ! tooltip="showConstantAction.tooltip" ! menubarPath="rubyActions" ! id="org.rubypeople.rdt.ui.variableViewActions.ShowConstants"> ! </action> ! </viewContribution> ! </extension> ! <extension ! point="org.eclipse.ui.contexts"> ! <context ! name="Debugging Ruby" ! description="Debugging Ruby programs" ! id="org.rubypeople.rdt.debug.ui.debugging" ! parentId="org.eclipse.debug.ui.debugging"> ! </context> ! </extension> ! <extension ! point="org.eclipse.debug.ui.debugModelContextBindings"> ! <modelContextBinding ! debugModelId="org.rubypeople.rdt.debug" ! contextId="org.rubypeople.rdt.debug.ui.debugging"> ! </modelContextBinding> ! </extension> ! <extension ! point="org.eclipse.ui.popupMenus"> ! <viewerContribution ! targetID="org.rubypeople.rdt.ui.rubyeditor.contextMenu" ! id="org.rubypeople.rdt.debug.ui.RubyEditorPopupActions"> ! <action ! label="%Inspect.label" ! class="org.rubypeople.rdt.internal.debug.ui.actions.InspectAction" ! menubarPath="additions" ! enablesFor="+" ! id="org.rubypeople.rdt.debug.ui.cuPopup.Inspect"> ! <enablement> ! <systemProperty ! name="org.rubypeople.rdt.debug.ui.debuggerActive" ! value="true"> ! </systemProperty> ! </enablement> ! </action> ! </viewerContribution> ! <viewerContribution ! targetID="org.eclipse.jdt.debug.ui.DisplayView" ! id="org.rubypeople.rdt.debug.DisplayEvaluationActions"> ! <visibility> ! <systemProperty ! name="org.rubypeople.rdt.debug.ui.debuggerActive" ! value="true"> ! </systemProperty> ! </visibility> ! <action ! label="%RubyInspect.label" ! helpContextId="inspect_action_context" ! class="org.rubypeople.rdt.internal.debug.ui.actions.InspectAction" ! menubarPath="evaluationGroup" ! enablesFor="+" ! id="org.rubypeople.rdt.debug.ui.displayView.Inspect"> ! <enablement> ! <and> ! <or> ! <systemProperty ! name="org.rubypeople.rdt.debug.ui.debuggerActive" ! value="true"> ! </systemProperty> ! </or> ! <objectClass ! name="org.eclipse.jface.text.ITextSelection"> ! </objectClass> ! </and> ! </enablement> ! </action> ! </viewerContribution> ! <viewerContribution ! targetID="org.eclipse.debug.ui.VariableView" ! id="org.rubypeople.rdt.ui.debug.VariableViewActions"> ! <action ! label="%InspectHashKey.label" ! helpContextId="inspect_action_context" ! class="org.rubypeople.rdt.internal.debug.ui.actions.InspectHashKeyAction" ! menubarPath="rdtActions" ! enablesFor="+" ! id="org.rubypeople.rdt.ui.variableViewActions.InspectAction"> ! <enablement> ! <and> ! <objectClass ! name="org.rubypeople.rdt.internal.debug.core.model.RubyVariable"> ! </objectClass> ! <objectState ! name="isHashValue" ! value="true"> ! </objectState> ! </and> ! </enablement> ! </action> ! </viewerContribution> ! </extension> ! <extension ! point="org.eclipse.debug.ui.consoleLineTrackers"> ! <consoleLineTracker ! class="org.rubypeople.rdt.internal.debug.ui.console.RubyConsoleTracker" ! processType="ruby" ! id="org.rubypeople.rdt.debug.ui.RubyConsoleTracker"> ! </consoleLineTracker> ! </extension> ! <extension ! point="org.eclipse.debug.ui.launchShortcuts"> ! <shortcut ! label="%RubyApplicationShortcut.label" ! icon="icons/full/ctool16/run_ruby.gif" ! class="org.rubypeople.rdt.internal.debug.ui.launcher.RubyApplicationShortcut" ! modes="run, debug" ! id="org.rubypeople.rdt.debug.ui.RubyShortcut"> ! <contextualLaunch> ! <enablement> ! <with ! variable="selection"> ! <count ! value="1"> ! </count> ! <iterate> ! <or> ! <test ! value="*.rb" ! property="org.eclipse.debug.ui.matchesPattern"> ! </test> ! <test ! value="*.rbx" ! property="org.eclipse.debug.ui.matchesPattern"> ! </test> ! <test property="org.eclipse.debug.ui.matchesContentType" value="org.eclipse.ant.core.antBuildFile"/> ! </or> ! </iterate> ! </with> ! </enablement> ! <contextLabel ! label="%LaunchShortcut.Ruby.label" ! mode="run"> ! </contextLabel> ! <contextLabel ! label="%LaunchShortcut.Ruby.label" ! mode="debug"> ! </contextLabel> ! </contextualLaunch> ! <perspective ! id="org.rubypeople.rdt.ui.PerspectiveRuby"> ! </perspective> ! </shortcut> ! <shortcut ! label="%LaunchShortcut.Ruby.label" ! icon="icons/full/ctool16/run_ruby.gif" ! class="org.rubypeople.rdt.internal.debug.ui.launcher.RubyApplicationShortcut" ! modes="run, debug" ! id="org.rubypeople.rdt.debug.ui.applicationshortcut.ruby"> ! <perspective ! id="org.eclipse.debug.ui.DebugPerspective"> ! </perspective> ! </shortcut> ! </extension> ! <extension ! point="org.eclipse.ui.commands"> ! <command ! name="%ContextualRunRubyApplication.label" ! description="%ContextualRunRubyApplication.label" ! categoryId="org.eclipse.debug.ui.category.run" ! id="org.rubypeople.rdt.debug.ui.RubyShortcut.run"> ! </command> ! <command ! name="%ContextualDebugRubyApplication.label" ! description="%ContextualDebugRubyApplication.label" ! categoryId="org.eclipse.debug.ui.category.run" ! id="org.rubypeople.rdt.debug.ui.RubyShortcut.debug"> ! </command> ! </extension> ! <extension point="org.eclipse.ui.bindings"> ! <key ! sequence="M3+M2+D R" ! commandId="org.rubypeople.rdt.debug.ui.RubyShortcut.debug" ! schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/> ! <key ! sequence="M3+M2+X R" ! commandId="org.rubypeople.rdt.debug.ui.RubyShortcut.run" ! schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/> ! </extension> ! ! <extension ! point="org.eclipse.ui.cheatsheets.cheatSheetContent"> ! <category ! name="Ruby" ! id="org.rubypeople.rdt.cheatsheet.category"> ! </category> ! <cheatsheet ! name="%cheatsheet.webservices.name" ! category="org.rubypeople.rdt.cheatsheet.category" ! contentFile="$nl$/cheatsheets/WebServices.xml" ! id="org.rubypeople.rdt.cheatsheets.webservices"> ! <description>%cheatsheet.webservices.desc</description> ! </cheatsheet> ! </extension> ! ! <extension point="org.rubypeople.rdt.ui.editorPopupExtender"> ! <rubyEditorPopupMenuExtension class="org.rubypeople.rdt.internal.debug.ui.RubyEditorPopupMenuExtension"> ! <enablement> ! <systemProperty name="org.rubypeople.rdt.debug.ui.debuggerActive" value="true"/> ! </enablement> ! </rubyEditorPopupMenuExtension> ! </extension> ! <extension ! point="org.eclipse.ui.commands"> ! <command ! name="Inspect Template" ! id="org.rubypeople.rdt.debug.ui.TemplateInspectCommand"/> ! </extension> ! <extension point="org.eclipse.core.runtime.preferences"> ! <initializer class="org.rubypeople.rdt.internal.debug.ui.DebugUiPreferenceInitializer"/> </extension> </plugin> \ No newline at end of file --- 1,315 ---- <?xml version="1.0" encoding="UTF-8"?> <?eclipse version="3.0"?> ! <plugin id="org.rubypeople.rdt.debug.ui" name="%Plugin.name" version="0.6.0" ! provider-name="RubyPeople, Inc." ! class="org.rubypeople.rdt.internal.debug.ui.RdtDebugUiPlugin"> ! ! <runtime> ! <library name="rdtdebugui.jar"> ! <export name="*"/> ! </library> ! </runtime> ! ! <requires> ! <import plugin="org.eclipse.core.resources"/> ! <import plugin="org.eclipse.ui"/> ! <import plugin="org.eclipse.debug.core"/> ! <import plugin="org.eclipse.debug.ui"/> ! <import plugin="org.rubypeople.rdt.launching"/> ! <import plugin="org.rubypeople.rdt.ui"/> ! <import plugin="org.rubypeople.rdt.core"/> ! <import plugin="org.rubypeople.rdt.debug.core"/> ! <import plugin="org.eclipse.ui.workbench"/> ! <import plugin="org.eclipse.ui.workbench.texteditor"/> ! <import plugin="org.eclipse.jface.text"/> ! <import plugin="org.eclipse.ui.editors"/> ! <import plugin="org.eclipse.ui.ide"/> ! <import plugin="org.eclipse.ui.cheatsheets"/> ! <import plugin="org.eclipse.core.runtime"/> ! <import plugin="org.eclipse.ui.console"/> ! </requires> ! ! <extension point="org.eclipse.ui.preferencePages"> ! <page name="%PreferencePage.RubyInterpreter.name" ! category="org.rubypeople.rdt.ui.preferences.PreferencePageRubyBase" ! class="org.rubypeople.rdt.internal.debug.ui.preferences.RubyInterpreterPreferencePage" ! id="org.rubypeople.rdt.debug.ui.preferences.PreferencePageRubyInterpreter"> ! </page> ! </extension> ! <extension point="org.eclipse.ui.preferencePages"> ! <page name="%PreferencePage.EvaluationExpressions.name" ! category="org.rubypeople.rdt.ui.preferences.PreferencePageRubyBase" ! class="org.rubypeople.rdt.internal.debug.ui.preferences.EvaluationExpressionsPreferencePage" ! id="org.rubypeople.rdt.debug.ui.preferences.PreferencePageEvaluationExpressions"> ! </page> ! </extension> ! <extension point="org.eclipse.debug.ui.launchConfigurationTypeImages"> ! <launchConfigurationTypeImage icon="icons/full/ctool16/run_ruby.gif" ! configTypeID="org.rubypeople.rdt.launching.LaunchConfigurationTypeRubyApplication" ! id="org.rubypeople.rdt.debug.ui.LaunchConfigurationTypeImageRubyApplication"> ! </launchConfigurationTypeImage> ! </extension> ! <extension point="org.eclipse.debug.ui.launchConfigurationTabGroups"> ! <launchConfigurationTabGroup ! type="org.rubypeople.rdt.launching.LaunchConfigurationTypeRubyApplication" ! class="org.rubypeople.rdt.internal.debug.ui.launcher.RubyApplicationTabGroup" ! id="org.rubypeople.rdt.debug.ui.LaunchConfigurationTabGroupRubyApplication"> ! </launchConfigurationTabGroup> ! </extension> ! <extension point="org.eclipse.ui.editorActions"> ! <editorContribution targetID="org.rubypeople.rdt.ui.EditorRubyFile" ! id="org.rubypeople.rdt.debug.ui.EditorRubyFile.BreakpointRulerActions"> ! <action label="%Dummy.label" ! class="org.rubypeople.rdt.internal.debug.ui.actions.ManageBreakpointRulerActionDelegate" ! actionID="RulerDoubleClick" ! id="org.rubypeople.rdt.debug.ui.EditorRubyFile.ManageBreakpointRulerAction"> ! </action> ! </editorContribution> ! </extension> ! <extension point="org.eclipse.debug.ui.debugModelPresentations"> ! <debugModelPresentation ! class="org.rubypeople.rdt.internal.debug.ui.DebugModelPresentation" ! id="org.rubypeople.rdt.debug"> ! </debugModelPresentation> ! </extension> ! <extension point="org.eclipse.ui.popupMenus"> ! <viewerContribution ! targetID="org.rubypeople.rdt.ui.rubyeditor.rulerContextMenu" ! id="org.rubypeople.rdt.debug.ui.RubyRulerPopupActions"> ! <action label="Add Breakpoint" ! class="org.rubypeople.rdt.internal.debug.ui.actions.ManageBreakpointRulerActionDelegate" ! menubarPath="debug" id="ManageBreakpointRulerActionDelegate"> ! </action> ! </viewerContribution> ! </extension> ! <extension point="org.eclipse.debug.core.sourceLocators"> ! <sourceLocator name="RubySourceLocator" ! class="org.rubypeople.rdt.internal.debug.ui.RubySourceLocator" ! id="org.rubypeople.rdt.debug.ui.rubySourceLocator"> ! </sourceLocator> ! </extension> ! <extension point="org.eclipse.ui.viewActions"> ! <viewContribution targetID="org.eclipse.debug.ui.VariableView" ! id="org.eclipse.jdt.ui.debug.VariableViewActions"> ! <action label="%showStaticVariables" style="toggle" ! class="org.rubypeople.rdt.internal.debug.ui.actions.ShowStaticVariablesAction" ! state="false" tooltip="showStaticAction.tooltip" ! menubarPath="rubyActions" ! id="org.rubypeople.rdt.ui.variableViewActions.ShowStatic"> ! </action> ! <action label="%showConstants" style="toggle" ! class="org.rubypeople.rdt.internal.debug.ui.actions.ShowConstantsAction" ! state="false" tooltip="showConstantAction.tooltip" ! menubarPath="rubyActions" ! id="org.rubypeople.rdt.ui.variableViewActions.ShowConstants"> ! </action> ! </viewContribution> ! <viewContribution ! id="org.eclipse.jdt.debug.ui.BreakpointViewActions" ! targetID="org.eclipse.debug.ui.BreakpointView"> ! <action ! class="org.rubypeople.rdt.internal.debug.ui.actions.ModifyCatchpointAction" ! disabledIcon="icons/full/elcl16/exc_catch.gif" ! hoverIcon="icons/full/elcl16/exc_catch.gif" ! icon="icons/full/elcl16/exc_catch.gif" ! id="org.rubypeople.rdt.debug.ui.actions.ModifyCatchpoint" ! label="%modifyCatchpoint.label" ! style="push" ! toolbarPath="rdtExceptions" ! tooltip="%modifyCatchpoint.tooltip"/> ! </viewContribution> ! </extension> ! <extension point="org.eclipse.ui.contexts"> ! <context name="Debugging Ruby" description="Debugging Ruby programs" ! id="org.rubypeople.rdt.debug.ui.debugging" ! parentId="org.eclipse.debug.ui.debugging"> ! </context> ! </extension> ! <extension point="org.eclipse.debug.ui.debugModelContextBindings"> ! <modelContextBinding debugModelId="org.rubypeople.rdt.debug" ! contextId="org.rubypeople.rdt.debug.ui.debugging"> ! </modelContextBinding> ! </extension> ! <extension point="org.eclipse.ui.popupMenus"> ! <viewerContribution ! targetID="org.rubypeople.rdt.ui.rubyeditor.contextMenu" ! id="org.rubypeople.rdt.debug.ui.RubyEditorPopupActions"> ! <action label="%Inspect.label" ! class="org.rubypeople.rdt.internal.debug.ui.actions.InspectAction" ! menubarPath="additions" enablesFor="+" ! id="org.rubypeople.rdt.debug.ui.cuPopup.Inspect"> ! <enablement> ! <systemProperty ! name="org.rubypeople.rdt.debug.ui.debuggerActive" ! value="true"> ! </systemProperty> ! </enablement> ! </action> ! </viewerContribution> ! <viewerContribution targetID="org.eclipse.jdt.debug.ui.DisplayView" ! id="org.rubypeople.rdt.debug.DisplayEvaluationActions"> ! <visibility> ! <systemProperty name="org.rubypeople.rdt.debug.ui.debuggerActive" ! value="true"> ! </systemProperty> ! </visibility> ! <action label="%RubyInspect.label" ! helpContextId="inspect_action_context" ! class="org.rubypeople.rdt.internal.debug.ui.actions.InspectAction" ! menubarPath="evaluationGroup" enablesFor="+" ! id="org.rubypeople.rdt.debug.ui.displayView.Inspect"> ! <enablement> ! <and> ! <or> ! <systemProperty ! name="org.rubypeople.rdt.debug.ui.debuggerActive" ! value="true"> ! </systemProperty> ! </or> ! <objectClass ! name="org.eclipse.jface.text.ITextSelection"> ! </objectClass> ! </and> ! </enablement> ! </action> ! </viewerContribution> ! <viewerContribution targetID="org.eclipse.debug.ui.VariableView" ! id="org.rubypeople.rdt.ui.debug.VariableViewActions"> ! <action label="%InspectHashKey.label" ! helpContextId="inspect_action_context" ! class="org.rubypeople.rdt.internal.debug.ui.actions.InspectHashKeyAction" ! menubarPath="rdtActions" enablesFor="+" ! id="org.rubypeople.rdt.ui.variableViewActions.InspectAction"> ! <enablement> ! <and> ! <objectClass ! name="org.rubypeople.rdt.internal.debug.core.model.RubyVariable"> ! </objectClass> ! <objectState name="isHashValue" value="true"> ! </objectState> ! </and> ! </enablement> ! </action> ! </viewerContribution> ! </extension> ! <extension point="org.eclipse.debug.ui.consoleLineTrackers"> ! <consoleLineTracker ! class="org.rubypeople.rdt.internal.debug.ui.console.RubyConsoleTracker" ! processType="ruby" ! id="org.rubypeople.rdt.debug.ui.RubyConsoleTracker"> ! </consoleLineTracker> ! </extension> ! <extension point="org.eclipse.debug.ui.launchShortcuts"> ! <shortcut label="%RubyApplicationShortcut.label" ! icon="icons/full/ctool16/run_ruby.gif" ! class="org.rubypeople.rdt.internal.debug.ui.launcher.RubyApplicationShortcut" ! modes="run, debug" id="org.rubypeople.rdt.debug.ui.RubyShortcut"> ! <contextualLaunch> ! <enablement> ! <with variable="selection"> ! <count value="1"> ! </count> ! <iterate> ! <or> ! <test value="*.rb" ! property="org.eclipse.debug.ui.matchesPattern"> ! </test> ! <test value="*.rbx" ! property="org.eclipse.debug.ui.matchesPattern"> ! </test> ! <test ! property="org.eclipse.debug.ui.matchesContentType" ! value="org.eclipse.ant.core.antBuildFile"/> ! </or> ! </iterate> ! </with> ! </enablement> ! <contextLabel label="%LaunchShortcut.Ruby.label" mode="run"> ! </contextLabel> ! <contextLabel label="%LaunchShortcut.Ruby.label" mode="debug"> ! </contextLabel> ! </contextualLaunch> ! <perspective id="org.rubypeople.rdt.ui.PerspectiveRuby"> ! </perspective> ! </shortcut> ! <shortcut label="%LaunchShortcut.Ruby.label" ! icon="icons/full/ctool16/run_ruby.gif" ! class="org.rubypeople.rdt.internal.debug.ui.launcher.RubyApplicationShortcut" ! modes="run, debug" ! id="org.rubypeople.rdt.debug.ui.applicationshortcut.ruby"> ! <perspective id="org.eclipse.debug.ui.DebugPerspective"> ! </perspective> ! </shortcut> ! </extension> ! <extension point="org.eclipse.ui.commands"> ! <command name="%ContextualRunRubyApplication.label" ! description="%ContextualRunRubyApplication.label" ! categoryId="org.eclipse.debug.ui.category.run" ! id="org.rubypeople.rdt.debug.ui.RubyShortcut.run"> ! </command> ! <command name="%ContextualDebugRubyApplication.label" ! description="%ContextualDebugRubyApplication.label" ! categoryId="org.eclipse.debug.ui.category.run" ! id="org.rubypeople.rdt.debug.ui.RubyShortcut.debug"> ! </command> ! <command ! categoryId="org.eclipse.debug.ui.category.run" ! id="org.rubypeople.rdt.debug.ui.commands.ModifyCatchpoint" ! name="org.rubypeople.rdt.debug.ui.ModifyCatchpoint"/> ! </extension> ! <extension point="org.eclipse.ui.bindings"> ! <key sequence="M3+M2+D R" ! commandId="org.rubypeople.rdt.debug.ui.RubyShortcut.debug" ! schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/> ! <key sequence="M3+M2+X R" ! commandId="org.rubypeople.rdt.debug.ui.RubyShortcut.run" ! schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/> ! </extension> ! ! <extension point="org.eclipse.ui.cheatsheets.cheatSheetContent"> ! <category name="Ruby" id="org.rubypeople.rdt.cheatsheet.category"> ! </category> ! <cheatsheet name="%cheatsheet.webservices.name" ! category="org.rubypeople.rdt.cheatsheet.category" ! contentFile="$nl$/cheatsheets/WebServices.xml" ! id="org.rubypeople.rdt.cheatsheets.webservices"> ! <description>%cheatsheet.webservices.desc</description> ! </cheatsheet> ! </extension> ! ! <extension point="org.rubypeople.rdt.ui.editorPopupExtender"> ! <rubyEditorPopupMenuExtension ! class="org.rubypeople.rdt.internal.debug.ui.RubyEditorPopupMenuExtension"> ! <enablement> ! <systemProperty name="org.rubypeople.rdt.debug.ui.debuggerActive" ! value="true"/> ! </enablement> ! </rubyEditorPopupMenuExtension> ! </extension> ! <extension point="org.eclipse.ui.commands"> ! <command name="Inspect Template" ! id="org.rubypeople.rdt.debug.ui.TemplateInspectCommand"/> ! </extension> ! <extension point="org.eclipse.core.runtime.preferences"> ! <initializer ! class="org.rubypeople.rdt.internal.debug.ui.DebugUiPreferenceInitializer"/> ! </extension> ! <extension point="org.eclipse.ui.actionSets"> ! <actionSet ! description="Extends the breakpoint view" ! id="org.rubypeople.rdt.debug.ui.RDTDebugActionSet" ! label="Ruby Debug" ! visible="true"> ! <action ! definitionId="org.rubypeople.rdt.debug.ui.commands.ModifyCatchpoint" ! label="modifyCatchpoint.label" ! icon="icons/full/elcl16/exc_catch.gif" ! helpContextId="add_exception_action_context" ! class="org.rubypeople.rdt.internal.debug.ui.actions.ModifyCatchpointAction" ! menubarPath="org.eclipse.ui.run/breakpointGroup" ! id="org.rubypeople.rdt.debug.ui.actions.ModifyCatchpoint"> ! </action> ! </actionSet> </extension> </plugin> \ No newline at end of file |
|
From: Markus B. <mba...@us...> - 2005-10-06 23:31:06
|
Update of /cvsroot/rubyeclipse/org.rubypeople.rdt.debug.ui/src/org/rubypeople/rdt/internal/debug/ui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21716/src/org/rubypeople/rdt/internal/debug/ui Modified Files: DebugModelPresentation.java RdtDebugUiMessages.properties Added Files: ModifyCatchpointDialog.java Log Message: RubyExceptionBreakpoints / catchpoints functionality added Index: DebugModelPresentation.java =================================================================== RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.debug.ui/src/org/rubypeople/rdt/internal/debug/ui/DebugModelPresentation.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** DebugModelPresentation.java 3 Jan 2005 18:06:35 -0000 1.8 --- DebugModelPresentation.java 6 Oct 2005 23:30:57 -0000 1.9 *************** *** 17,20 **** --- 17,21 ---- import org.eclipse.swt.graphics.Image; import org.eclipse.ui.IEditorInput; + import org.rubypeople.rdt.internal.debug.core.RubyExceptionBreakpoint; import org.rubypeople.rdt.internal.debug.core.RubyLineBreakpoint; import org.rubypeople.rdt.internal.debug.core.model.RubyThread; *************** *** 31,38 **** return breakpoint.getMarker().getResource().getName() + ":" + breakpoint.getLineNumber(); } catch (CoreException e) { ! e.printStackTrace(); return "--"; } } if (item instanceof RubyVariable) { RubyVariable variable = (RubyVariable) item ; --- 32,52 ---- return breakpoint.getMarker().getResource().getName() + ":" + breakpoint.getLineNumber(); } catch (CoreException e) { ! DebugUIPlugin.log(e) ; return "--"; } } + if (item instanceof RubyExceptionBreakpoint) { + RubyExceptionBreakpoint exceptionBreakpoint = (RubyExceptionBreakpoint) item ; + try { + if (exceptionBreakpoint.getException() == null || exceptionBreakpoint.getException().length() ==0) { + return "No Catchpoint defined" ; + } + else { + return "Suspend on exception: " + exceptionBreakpoint.getException() ; + } + } catch (CoreException e) { + DebugUIPlugin.log(e) ; + } + } if (item instanceof RubyVariable) { RubyVariable variable = (RubyVariable) item ; Index: RdtDebugUiMessages.properties =================================================================== RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.debug.ui/src/org/rubypeople/rdt/internal/debug/ui/RdtDebugUiMessages.properties,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** RdtDebugUiMessages.properties 7 Mar 2005 20:52:44 -0000 1.11 --- RdtDebugUiMessages.properties 6 Oct 2005 23:30:57 -0000 1.12 *************** *** 114,115 **** --- 114,118 ---- EvaluationExpressionsPreferencePage.export.error.canNotWrite= Export failed.\n{0} cannot be modified. EvaluationExpressionsPreferencePage.export.error.fileNotFound= Export failed:\n{0} + + ModifyCatchpointDialog.title=Define Catchpoint + ModifyCatchpointDialog.message=Enter the name of a ruby exception. The debugger halts when an exception of this type or a subclass is raised. --- NEW FILE: ModifyCatchpointDialog.java --- /* * Author: Markus Barchfeld * * Copyright (c) 2005 RubyPeople. * * This file is part of the Ruby Development Tools (RDT) plugin for eclipse. RDT is * subject to the "Common Public License (CPL) v 1.0". You may not use RDT except in * compliance with the License. For further information see org.rubypeople.rdt/rdt.license. */ package org.rubypeople.rdt.internal.debug.ui; import org.eclipse.swt.SWT; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Text; import org.eclipse.ui.dialogs.SelectionStatusDialog; public class ModifyCatchpointDialog extends SelectionStatusDialog { private String exception ; private Text exceptionTypeField ; public ModifyCatchpointDialog(Shell parent) { super(parent) ; } protected void computeResult() { exception = exceptionTypeField.getText() ; } protected Control createDialogArea(Composite parent) { Composite dialogArea = (Composite) super.createDialogArea(parent); GridLayout layout = new GridLayout(); layout.numColumns = 1; dialogArea.setLayout(layout); dialogArea.setLayoutData(new GridData(GridData.FILL_VERTICAL)); //GridData.FILL_HORIZONTAL // A label Label label = new Label(dialogArea, SWT.WRAP); if (this.getMessage() != null) { label.setText(getMessage()); } label.setFont(dialogArea.getFont()); GridData labelData = new GridData(GridData.FILL_HORIZONTAL); labelData.widthHint = 200; label.setLayoutData(labelData); // A text field exceptionTypeField = new Text(dialogArea, SWT.BORDER); GridData data = new GridData(GridData.FILL_HORIZONTAL); //data.widthHint = 200; exceptionTypeField.setLayoutData(data); return dialogArea ; } public String getException() { return exception ; } } |
|
From: Markus B. <mba...@us...> - 2005-10-06 23:31:06
|
Update of /cvsroot/rubyeclipse/org.rubypeople.rdt.debug.ui/icons/full/elcl16 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21716/icons/full/elcl16 Added Files: exc_catch.gif Log Message: RubyExceptionBreakpoints / catchpoints functionality added --- NEW FILE: exc_catch.gif --- (This appears to be a binary file; contents omitted.) |
|
From: Markus B. <mba...@us...> - 2005-10-06 23:31:06
|
Update of /cvsroot/rubyeclipse/org.rubypeople.rdt.debug.ui/src/org/rubypeople/rdt/internal/debug/ui/actions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21716/src/org/rubypeople/rdt/internal/debug/ui/actions Added Files: ModifyCatchpointAction.java Log Message: RubyExceptionBreakpoints / catchpoints functionality added --- NEW FILE: ModifyCatchpointAction.java --- /* * Author: Markus Barchfeld * * Copyright (c) 2005 RubyPeople. * * This file is part of the Ruby Development Tools (RDT) plugin for eclipse. RDT is * subject to the "Common Public License (CPL) v 1.0". You may not use RDT except in * compliance with the License. For further information see org.rubypeople.rdt/rdt.license. */ package org.rubypeople.rdt.internal.debug.ui.actions ; import org.eclipse.core.runtime.CoreException; import org.eclipse.debug.core.DebugPlugin; import org.eclipse.debug.core.model.IBreakpoint; import org.eclipse.jface.action.IAction; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.window.Window; import org.eclipse.ui.IViewActionDelegate; import org.eclipse.ui.IViewPart; import org.eclipse.ui.IWorkbenchWindow; import org.eclipse.ui.IWorkbenchWindowActionDelegate; import org.rubypeople.rdt.internal.debug.core.RdtDebugCorePlugin; import org.rubypeople.rdt.internal.debug.core.RubyExceptionBreakpoint; import org.rubypeople.rdt.internal.debug.ui.ModifyCatchpointDialog; import org.rubypeople.rdt.internal.debug.ui.RdtDebugUiMessages; import org.rubypeople.rdt.internal.debug.ui.RdtDebugUiPlugin; public class ModifyCatchpointAction implements IViewActionDelegate, IWorkbenchWindowActionDelegate { private RubyExceptionBreakpoint findRubyExceptionBreakpoint(IBreakpoint[] breakpoints) { for (int i = 0; i < breakpoints.length; i++) { if (breakpoints[i] instanceof RubyExceptionBreakpoint) { return (RubyExceptionBreakpoint) breakpoints[i] ; } } return null ; } /* * (non-Javadoc) * * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction) */ public void run(IAction action) { final ModifyCatchpointDialog dialog = new ModifyCatchpointDialog(RdtDebugUiPlugin.getActiveWorkbenchWindow().getShell()) ; dialog.setTitle(RdtDebugUiMessages.getString("ModifyCatchpointDialog.title")); //$NON-NLS-1$ dialog.setMessage(RdtDebugUiMessages.getString("ModifyCatchpointDialog.message")); //$NON-NLS-1$ int result = dialog.open(); if (result == Window.CANCEL) { return ; } IBreakpoint[] breakpoints = DebugPlugin.getDefault().getBreakpointManager().getBreakpoints("org.rubypeople.rdt.debug"); RubyExceptionBreakpoint existingBreakpoint = this.findRubyExceptionBreakpoint(breakpoints) ; try { if (existingBreakpoint == null) { IBreakpoint breakpoint = new RubyExceptionBreakpoint(dialog.getException()); DebugPlugin.getDefault().getBreakpointManager().addBreakpoint(breakpoint) ; } else { existingBreakpoint.setException(dialog.getException()) ; DebugPlugin.getDefault().getBreakpointManager().fireBreakpointChanged(existingBreakpoint) ; } } catch (CoreException e) { RdtDebugCorePlugin.log(e) ; } } /* * (non-Javadoc) * * @see org.eclipse.ui.IViewActionDelegate#init(org.eclipse.ui.IViewPart) */ public void init(IViewPart view) { } /* * (non-Javadoc) * * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, * org.eclipse.jface.viewers.ISelection) */ public void selectionChanged(IAction action, ISelection selection) { } /* * (non-Javadoc) * * @see org.eclipse.ui.IWorkbenchWindowActionDelegate#dispose() */ public void dispose() { } /* * (non-Javadoc) * * @see org.eclipse.ui.IWorkbenchWindowActionDelegate#init(org.eclipse.ui.IWorkbenchWindow) */ public void init(IWorkbenchWindow window) { } } |
|
From: Markus B. <mba...@us...> - 2005-10-06 23:30:08
|
Update of /cvsroot/rubyeclipse/org.rubypeople.rdt In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21453 Modified Files: Changelog.txt Log Message: RubyExceptionBreakpoints / catchpoints functionality added Index: Changelog.txt =================================================================== RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt/Changelog.txt,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** Changelog.txt 4 Oct 2005 22:53:24 -0000 1.14 --- Changelog.txt 6 Oct 2005 23:30:01 -0000 1.15 *************** *** 1,3 **** --- 1,8 ---- Changes since 0.6.0: + * Catchpoints: + * The default was to halt at every type of StandardError, the new default is *not* to halt when exceptions are raised + * There is a menu entry in the debug perspective and a toolbar button in the breakpoint view which starts the Catchpoint dialog + * The catchpoint dialog allows to add a ruby exception breakpoint + * There can be at most one exception breakpoint; the breakpoint can be enabled, disabled and removed in the breakpoint view Changes merged from SRB 0.6.1: |
