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

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

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

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

Modified Paths:
--------------
    trunk/org.rubypeople.rdt.debug.core.tests/src/org/rubypeople/rdt/debug/core/tests/FTC_DebuggerLaunch.java
    trunk/org.rubypeople.rdt.debug.ui/src/org/rubypeople/rdt/internal/debug/ui/CodeReloader.java
    trunk/org.rubypeople.rdt.debug.ui/src/org/rubypeople/rdt/internal/debug/ui/launcher/RubyApplicationShortcut.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.core.tests/src/org/rubypeople/rdt/debug/core/tests/FTC_DebuggerLaunch.java
===================================================================
--- trunk/org.rubypeople.rdt.debug.core.tests/src/org/rubypeople/rdt/debug/core/tests/FTC_DebuggerLaunch.java	2007-06-20 16:37:38 UTC (rev 2640)
+++ trunk/org.rubypeople.rdt.debug.core.tests/src/org/rubypeople/rdt/debug/core/tests/FTC_DebuggerLaunch.java	2007-06-20 16:40:00 UTC (rev 2641)
@@ -74,7 +74,7 @@
 
 	
 	public void testTwoSessions() throws Exception {
-		ILaunchConfigurationType lcT = DebugPlugin.getDefault().getLaunchManager().getLaunchConfigurationType(RubyLaunchConfigurationAttribute.RUBY_LAUNCH_CONFIGURATION_TYPE) ;
+		ILaunchConfigurationType lcT = DebugPlugin.getDefault().getLaunchManager().getLaunchConfigurationType(IRubyLaunchConfigurationConstants.ID_RUBY_APPLICATION);
 		
 		ILaunchConfigurationWorkingCopy wc = lcT.newInstance(null, "TestLaunchConfiguration") ;
 		IProject project = ResourceTools.createProject("FTCDebuggerLaunchMultipleSessions") ;

Modified: trunk/org.rubypeople.rdt.debug.ui/src/org/rubypeople/rdt/internal/debug/ui/CodeReloader.java
===================================================================
--- trunk/org.rubypeople.rdt.debug.ui/src/org/rubypeople/rdt/internal/debug/ui/CodeReloader.java	2007-06-20 16:37:38 UTC (rev 2640)
+++ trunk/org.rubypeople.rdt.debug.ui/src/org/rubypeople/rdt/internal/debug/ui/CodeReloader.java	2007-06-20 16:40:00 UTC (rev 2641)
@@ -25,8 +25,8 @@
 import org.eclipse.ui.IWorkbenchPart;
 import org.eclipse.ui.IWorkbenchWindow;
 import org.rubypeople.rdt.internal.debug.core.model.RubyDebugTarget;
-import org.rubypeople.rdt.internal.launching.RubyLaunchConfigurationAttribute;
 import org.rubypeople.rdt.internal.ui.rubyeditor.RubyEditor;
+import org.rubypeople.rdt.launching.IRubyLaunchConfigurationConstants;
 
 public class CodeReloader implements IPartListener, IPropertyListener, IWindowListener {
 
@@ -75,7 +75,7 @@
 				if (!launch.getLaunchMode().equals(ILaunchManager.DEBUG_MODE)) {
 					continue;
 				}
-				if (!launch.getLaunchConfiguration().getType().getIdentifier().equals(RubyLaunchConfigurationAttribute.RUBY_LAUNCH_CONFIGURATION_TYPE)) {
+				if (!launch.getLaunchConfiguration().getType().getIdentifier().equals(IRubyLaunchConfigurationConstants.ID_RUBY_APPLICATION)) {
 					continue;
 				}
 				final RubyDebugTarget target = (RubyDebugTarget) launch.getDebugTarget();

Modified: trunk/org.rubypeople.rdt.debug.ui/src/org/rubypeople/rdt/internal/debug/ui/launcher/RubyApplicationShortcut.java
===================================================================
--- trunk/org.rubypeople.rdt.debug.ui/src/org/rubypeople/rdt/internal/debug/ui/launcher/RubyApplicationShortcut.java	2007-06-20 16:37:38 UTC (rev 2640)
+++ trunk/org.rubypeople.rdt.debug.ui/src/org/rubypeople/rdt/internal/debug/ui/launcher/RubyApplicationShortcut.java	2007-06-20 16:40:00 UTC (rev 2641)
@@ -142,7 +142,7 @@
 	}
 
 	protected ILaunchConfigurationType getRubyLaunchConfigType() {
-		return getLaunchManager().getLaunchConfigurationType(RubyLaunchConfigurationAttribute.RUBY_LAUNCH_CONFIGURATION_TYPE);
+		return getLaunchManager().getLaunchConfigurationType(IRubyLaunchConfigurationConstants.ID_RUBY_APPLICATION);
 	}
 
 	protected ILaunchManager getLaunchManager() {

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:37:38 UTC (rev 2640)
+++ trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/internal/launching/RubyLaunchConfigurationAttribute.java	2007-06-20 16:40:00 UTC (rev 2641)
@@ -8,11 +8,6 @@
  * 
  */
 public interface RubyLaunchConfigurationAttribute {
-	
-	/**
-	 * @deprecated Please use <code>IRubyLaunchConfigurationConstants.ID_RUBY_APPLICATION</code>
-	 */
-	static final String RUBY_LAUNCH_CONFIGURATION_TYPE = IRubyLaunchConfigurationConstants.ID_RUBY_APPLICATION;
 
 	/**
 	 * @deprecated Please use <code>IRubyLaunchConfigurationConstants.ATTR_LOADPATH</code>

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:37:38 UTC (rev 2640)
+++ trunk/org.rubypeople.rdt.launching.tests/src/org/rubypeople/rdt/internal/launching/TC_RunnerLaunching.java	2007-06-20 16:40:00 UTC (rev 2641)
@@ -105,7 +105,7 @@
 
 	public void testDebugEnabled() throws Exception {
 		// check if debugging is enabled in plugin.xml
-		ILaunchConfigurationType launchConfigurationType = getLaunchManager().getLaunchConfigurationType(RubyLaunchConfigurationAttribute.RUBY_LAUNCH_CONFIGURATION_TYPE);
+		ILaunchConfigurationType launchConfigurationType = getLaunchManager().getLaunchConfigurationType(IRubyLaunchConfigurationConstants.ID_RUBY_APPLICATION);
 		assertEquals("Ruby Application", launchConfigurationType.getName());
 		assertTrue("LaunchConfiguration supports debug", launchConfigurationType.supportsMode(ILaunchManager.DEBUG_MODE));
 	}
@@ -113,7 +113,7 @@
 	public void launch(boolean debug) throws Exception {
 		ILaunchConfiguration configuration = new ShamLaunchConfiguration();
 		ILaunch launch = new Launch(configuration, debug ? ILaunchManager.DEBUG_MODE : ILaunchManager.RUN_MODE, null);
-		ILaunchConfigurationType launchConfigurationType = getLaunchManager().getLaunchConfigurationType(RubyLaunchConfigurationAttribute.RUBY_LAUNCH_CONFIGURATION_TYPE);
+		ILaunchConfigurationType launchConfigurationType = getLaunchManager().getLaunchConfigurationType(IRubyLaunchConfigurationConstants.ID_RUBY_APPLICATION);
 		launchConfigurationType.getDelegate(debug ? "debug" : "run").launch(configuration, debug ? ILaunchManager.DEBUG_MODE : ILaunchManager.RUN_MODE, launch, null);
 
 		RubyDebugTarget debugTarget = (RubyDebugTarget) launch.getDebugTarget();


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