[Rubyeclipse-commit] SF.net SVN: rubyeclipse: [2642] trunk

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

Revision: 2642
          http://svn.sourceforge.net/rubyeclipse/?rev=2642&view=rev
Author:   cawilliams
Date:     2007-06-20 09:42:22 -0700 (Wed, 20 Jun 2007)

Log Message:
-----------
remove some more deprecated code

Modified Paths:
--------------
    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/RubyEnvironmentTab.java
    trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/internal/launching/RubyLaunchConfigurationAttribute.java
    trunk/org.rubypeople.rdt.launching.tests/src/org/rubypeople/rdt/internal/launching/TC_RunnerLaunching.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-06-20 16:40:00 UTC (rev 2641)
+++ trunk/org.rubypeople.rdt.debug.ui/src/org/rubypeople/rdt/internal/debug/ui/launcher/RubyArgumentsTab.java	2007-06-20 16:42:22 UTC (rev 2642)
@@ -22,6 +22,7 @@
 import org.rubypeople.rdt.internal.debug.ui.RdtDebugUiPlugin;
 import org.rubypeople.rdt.internal.launching.RubyLaunchConfigurationAttribute;
 import org.rubypeople.rdt.internal.ui.util.DirectorySelector;
+import org.rubypeople.rdt.launching.IRubyLaunchConfigurationConstants;
 
 public class RubyArgumentsTab extends AbstractLaunchConfigurationTab {
 	protected Text interpreterArgsText, programArgsText;
@@ -101,8 +102,8 @@
 		boolean useDefaultWorkDir = true;
 		try {
 			workingDirectory = configuration.getAttribute(RubyLaunchConfigurationAttribute.WORKING_DIRECTORY, "");
-			interpreterArgs = configuration.getAttribute(RubyLaunchConfigurationAttribute.INTERPRETER_ARGUMENTS, "");
-			programArgs = configuration.getAttribute(RubyLaunchConfigurationAttribute.PROGRAM_ARGUMENTS, "");
+			interpreterArgs = configuration.getAttribute(IRubyLaunchConfigurationConstants.ATTR_VM_ARGUMENTS, "");
+			programArgs = configuration.getAttribute(IRubyLaunchConfigurationConstants.ATTR_PROGRAM_ARGUMENTS, "");
 			useDefaultWorkDir = configuration.getAttribute(RubyLaunchConfigurationAttribute.USE_DEFAULT_WORKING_DIRECTORY, true);
 		} catch (CoreException e) {
 			log(e);
@@ -116,8 +117,8 @@
 
 	public void performApply(ILaunchConfigurationWorkingCopy configuration) {
 		configuration.setAttribute(RubyLaunchConfigurationAttribute.WORKING_DIRECTORY, workingDirectorySelector.getValidatedSelectionText());
-		configuration.setAttribute(RubyLaunchConfigurationAttribute.INTERPRETER_ARGUMENTS, interpreterArgsText.getText());
-		configuration.setAttribute(RubyLaunchConfigurationAttribute.PROGRAM_ARGUMENTS, programArgsText.getText());
+		configuration.setAttribute(IRubyLaunchConfigurationConstants.ATTR_VM_ARGUMENTS, interpreterArgsText.getText());
+		configuration.setAttribute(IRubyLaunchConfigurationConstants.ATTR_PROGRAM_ARGUMENTS, programArgsText.getText());
 		configuration.setAttribute(RubyLaunchConfigurationAttribute.USE_DEFAULT_WORKING_DIRECTORY, useDefaultWorkingDirectoryButton.getSelection());
 	}
 

Modified: trunk/org.rubypeople.rdt.debug.ui/src/org/rubypeople/rdt/internal/debug/ui/launcher/RubyEnvironmentTab.java
===================================================================
--- trunk/org.rubypeople.rdt.debug.ui/src/org/rubypeople/rdt/internal/debug/ui/launcher/RubyEnvironmentTab.java	2007-06-20 16:40:00 UTC (rev 2641)
+++ trunk/org.rubypeople.rdt.debug.ui/src/org/rubypeople/rdt/internal/debug/ui/launcher/RubyEnvironmentTab.java	2007-06-20 16:42:22 UTC (rev 2642)
@@ -303,7 +303,7 @@
 				loadPathStrings.add(entry.getPath().toString());
 			}
 			configuration.setAttribute(
-					RubyLaunchConfigurationAttribute.CUSTOM_LOAD_PATH,
+					IRubyLaunchConfigurationConstants.ATTR_LOADPATH,
 					loadPathStrings);
 		}
 	}

Modified: trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/internal/launching/RubyLaunchConfigurationAttribute.java
===================================================================
--- trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/internal/launching/RubyLaunchConfigurationAttribute.java	2007-06-20 16:40:00 UTC (rev 2641)
+++ trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/internal/launching/RubyLaunchConfigurationAttribute.java	2007-06-20 16:42:22 UTC (rev 2642)
@@ -10,26 +10,6 @@
 public interface RubyLaunchConfigurationAttribute {
 
 	/**
-	 * @deprecated Please use <code>IRubyLaunchConfigurationConstants.ATTR_LOADPATH</code>
-	 */
-	static final String CUSTOM_LOAD_PATH = IRubyLaunchConfigurationConstants.ATTR_LOADPATH;
-	
-	/**
-	 * @deprecated Please use <code>IRubyLaunchConfigurationConstants.ATTR_FILE_NAME</code>
-	 */
-	static final String FILE_NAME = IRubyLaunchConfigurationConstants.ATTR_FILE_NAME;
-	
-	/**
-	 * @deprecated Please use <code>IRubyLaunchConfigurationConstants.ATTR_VM_ARGUMENTS</code>
-	 */
-	static final String INTERPRETER_ARGUMENTS = IRubyLaunchConfigurationConstants.ATTR_VM_ARGUMENTS;
-	
-	/**
-	 * @deprecated Please use <code>IRubyLaunchConfigurationConstants.ATTR_PROGRAM_ARGUMENTS</code>
-	 */
-	static final String PROGRAM_ARGUMENTS = IRubyLaunchConfigurationConstants.ATTR_PROGRAM_ARGUMENTS;
-	
-	/**
 	 * @deprecated Please use <code>IRubyLaunchConfigurationConstants.ATTR_PROJECT_NAME</code>
 	 */
 	static final String PROJECT_NAME = IRubyLaunchConfigurationConstants.ATTR_PROJECT_NAME;

Modified: trunk/org.rubypeople.rdt.launching.tests/src/org/rubypeople/rdt/internal/launching/TC_RunnerLaunching.java
===================================================================
--- trunk/org.rubypeople.rdt.launching.tests/src/org/rubypeople/rdt/internal/launching/TC_RunnerLaunching.java	2007-06-20 16:40:00 UTC (rev 2641)
+++ trunk/org.rubypeople.rdt.launching.tests/src/org/rubypeople/rdt/internal/launching/TC_RunnerLaunching.java	2007-06-20 16:42:22 UTC (rev 2642)
@@ -174,7 +174,7 @@
 				return RUBY_LIB_DIR + File.separator + RUBY_FILE_NAME;
 			} else if (attributeName.equals(RubyLaunchConfigurationAttribute.WORKING_DIRECTORY)) {
 				return '/' + PROJECT_NAME;
-			} else if (attributeName.equals(RubyLaunchConfigurationAttribute.PROGRAM_ARGUMENTS)) {
+			} else if (attributeName.equals(IRubyLaunchConfigurationConstants.ATTR_PROGRAM_ARGUMENTS)) {
 				return PROGRAM_ARGUMENTS;
 			} else if (attributeName.equals(IRubyLaunchConfigurationConstants.ATTR_VM_ARGUMENTS)) {
 				return INTERPRETER_ARGUMENTS;


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