[ jEdit-commits ] SF.net SVN: jedit: [9520] plugins/GdbPlugin/trunk

[<sh...@us...>]

Revision: 9520
          http://svn.sourceforge.net/jedit/?rev=9520&view=rev
Author:   shlomy
Date:     2007-05-09 22:53:37 -0700 (Wed, 09 May 2007)

Log Message:
-----------
Handle an empty list of launch configurations.
Also change the target class files to 1.5.

Modified Paths:
--------------
    plugins/GdbPlugin/trunk/build.xml
    plugins/GdbPlugin/trunk/gdb/core/Debugger.java
    plugins/GdbPlugin/trunk/gdb/launch/LaunchConfigurationManager.java

Modified: plugins/GdbPlugin/trunk/build.xml
===================================================================
--- plugins/GdbPlugin/trunk/build.xml	2007-05-10 02:06:56 UTC (rev 9519)
+++ plugins/GdbPlugin/trunk/build.xml	2007-05-10 05:53:37 UTC (rev 9520)
@@ -40,6 +40,7 @@
 			deprecation="on"
 			debug="yes"
 			includeJavaRuntime="yes"
+			target="1.5"
 		>
 			<classpath refid="project.class.path"/>
 		</javac>

Modified: plugins/GdbPlugin/trunk/gdb/core/Debugger.java
===================================================================
--- plugins/GdbPlugin/trunk/gdb/core/Debugger.java	2007-05-10 02:06:56 UTC (rev 9519)
+++ plugins/GdbPlugin/trunk/gdb/core/Debugger.java	2007-05-10 05:53:37 UTC (rev 9520)
@@ -133,6 +133,16 @@
 	public void start() {
 		LaunchConfiguration currentConfig =
 			LaunchConfigurationManager.getInstance().getDefault();
+		if (currentConfig == null) {
+			JOptionPane.showMessageDialog(jEdit.getActiveView(),
+					"No program is selected for debugging.\n" +
+					"Please do one of the following:\n" +
+					"- Use the GdbPlugin options to specify the default " +
+					"program for debugging ('Make default' button)\n" +
+					"- Use 'Debug ...' from the GdbPlugin menu and select " +
+					"the program you wish to debug from the list");
+			return;
+		}
 		if (programOutput != null)
 			programOutput.clear();
 		if (gdbOutput != null)

Modified: plugins/GdbPlugin/trunk/gdb/launch/LaunchConfigurationManager.java
===================================================================
--- plugins/GdbPlugin/trunk/gdb/launch/LaunchConfigurationManager.java	2007-05-10 02:06:56 UTC (rev 9519)
+++ plugins/GdbPlugin/trunk/gdb/launch/LaunchConfigurationManager.java	2007-05-10 05:53:37 UTC (rev 9520)
@@ -73,6 +73,8 @@
 	public void setDefaultIndex(int index)
 	{
 		defaultIndex = index;
+		if (index < 0 || index >= configurations.size())
+			return;
 		jEdit.setProperty(DEBUGGER_GO_LABEL,
 				jEdit.getProperty(DEBUGGER_GO_BASE_LABEL) +
 				" [" + configurations.get(index) + "]");
@@ -80,6 +82,8 @@
 	}
 	public LaunchConfiguration getDefault()
 	{
+		if (defaultIndex < 0 || defaultIndex >= configurations.size())
+			return null;
 		return configurations.get(defaultIndex);
 	}
 	public Vector<LaunchConfiguration> get()
@@ -88,17 +92,14 @@
 	}
 	public LaunchConfiguration getByIndex(int index)
 	{
+		if (index < 0 || index >= configurations.size())
+			return null;
 		return configurations.get(index);
 	}
-	public LaunchConfiguration getByName(String name)
-	{
-		for (int i = 0; i < configurations.size(); i++)
-			if (configurations.get(i).getName().equals(name))
-				return configurations.get(i);
-		return null;
-	}
 	public String getName(int index)
 	{
+		if (index < 0 || index >= configurations.size())
+			return null;
 		return configurations.get(index).getName();
 	}
 	public void save()


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.