[Rubyeclipse-commit] SF.net SVN: rubyeclipse: [2038] trunk/org.rubypeople.rdt.debug.ui/src/org/ rubypeople/rdt/internal/debug/ui/launcher/RubyArgumentsTab.java

[<caw...@us...>]

Revision: 2038
          http://svn.sourceforge.net/rubyeclipse/?rev=2038&view=rev
Author:   cawilliams
Date:     2007-02-26 05:26:59 -0800 (Mon, 26 Feb 2007)

Log Message:
-----------
fix broken test - we are getting null pointers ont he useDefaultWorkingDirectory button in tests, so I made a method to get the selection, and return null if the button is never created (as in tests)

Modified Paths:
--------------
    trunk/org.rubypeople.rdt.debug.ui/src/org/rubypeople/rdt/internal/debug/ui/launcher/RubyArgumentsTab.java

Modified: trunk/org.rubypeople.rdt.debug.ui/src/org/rubypeople/rdt/internal/debug/ui/launcher/RubyArgumentsTab.java
===================================================================
--- trunk/org.rubypeople.rdt.debug.ui/src/org/rubypeople/rdt/internal/debug/ui/launcher/RubyArgumentsTab.java	2007-02-26 13:08:18 UTC (rev 2037)
+++ trunk/org.rubypeople.rdt.debug.ui/src/org/rubypeople/rdt/internal/debug/ui/launcher/RubyArgumentsTab.java	2007-02-26 13:26:59 UTC (rev 2038)
@@ -139,7 +139,7 @@
 	public boolean isValid(ILaunchConfiguration launchConfig) {
 		try {
 			String workingDirectory = launchConfig.getAttribute(RubyLaunchConfigurationAttribute.WORKING_DIRECTORY, "");
-			if (!useDefaultWorkingDirectoryButton.getSelection() && workingDirectory.length() == 0) {
+			if (!useDefaultWorkingDirectoryButton() && workingDirectory.length() == 0) {
 				setErrorMessage(RdtDebugUiMessages.LaunchConfigurationTab_RubyArguments_working_dir_error_message);
 				return false;
 			}
@@ -151,6 +151,11 @@
 		return true;
 	}
 	
+	private boolean useDefaultWorkingDirectoryButton() {
+		if (useDefaultWorkingDirectoryButton == null) return false;
+		return useDefaultWorkingDirectoryButton.getSelection();
+	}
+
 	protected void log(Throwable t) {
 		RdtDebugUiPlugin.log(t);
 	}


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