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

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

Revision: 3153
          http://rubyeclipse.svn.sourceforge.net/rubyeclipse/?rev=3153&view=rev
Author:   cawilliams
Date:     2007-09-12 10:53:31 -0700 (Wed, 12 Sep 2007)

Log Message:
-----------
try to combine constants that refer to same thing, deprecate old version.

Modified Paths:
--------------
    trunk/org.rubypeople.rdt.debug.ui/src/org/rubypeople/rdt/internal/debug/ui/RubySourceLocator.java
    trunk/org.rubypeople.rdt.debug.ui/src/org/rubypeople/rdt/internal/debug/ui/actions/ManageBreakpointRulerActionDelegate.java

Modified: trunk/org.rubypeople.rdt.debug.ui/src/org/rubypeople/rdt/internal/debug/ui/RubySourceLocator.java
===================================================================
--- trunk/org.rubypeople.rdt.debug.ui/src/org/rubypeople/rdt/internal/debug/ui/RubySourceLocator.java	2007-09-12 17:53:25 UTC (rev 3152)
+++ trunk/org.rubypeople.rdt.debug.ui/src/org/rubypeople/rdt/internal/debug/ui/RubySourceLocator.java	2007-09-12 17:53:31 UTC (rev 3153)
@@ -16,7 +16,7 @@
 import org.rubypeople.rdt.internal.debug.core.model.RubyStackFrame;
 import org.rubypeople.rdt.internal.ui.rubyeditor.ExternalRubyFileEditorInput;
 import org.rubypeople.rdt.launching.IRubyLaunchConfigurationConstants;
-import org.rubypeople.rdt.ui.IRubyConstants;
+import org.rubypeople.rdt.ui.RubyUI;
 
 /**
  * @author Administrator
@@ -74,7 +74,7 @@
 	 */
 	public String getEditorId(IEditorInput input, Object element) {
 		SourceElement sourceElement = (SourceElement) element ;
-		return sourceElement.isExternal() ? IRubyConstants.EXTERNAL_FILES_EDITOR_ID : IRubyConstants.EDITOR_ID  ;
+		return sourceElement.isExternal() ? RubyUI.ID_EXTERNAL_EDITOR : RubyUI.ID_RUBY_EDITOR;
 	}
 
 	/**

Modified: trunk/org.rubypeople.rdt.debug.ui/src/org/rubypeople/rdt/internal/debug/ui/actions/ManageBreakpointRulerActionDelegate.java
===================================================================
--- trunk/org.rubypeople.rdt.debug.ui/src/org/rubypeople/rdt/internal/debug/ui/actions/ManageBreakpointRulerActionDelegate.java	2007-09-12 17:53:25 UTC (rev 3152)
+++ trunk/org.rubypeople.rdt.debug.ui/src/org/rubypeople/rdt/internal/debug/ui/actions/ManageBreakpointRulerActionDelegate.java	2007-09-12 17:53:31 UTC (rev 3153)
@@ -11,7 +11,7 @@
 import org.eclipse.ui.IEditorPart;
 import org.eclipse.ui.texteditor.AbstractRulerActionDelegate;
 import org.eclipse.ui.texteditor.ITextEditor;
-import org.rubypeople.rdt.ui.IRubyConstants;
+import org.rubypeople.rdt.ui.RubyUI;
 
 public class ManageBreakpointRulerActionDelegate extends AbstractRulerActionDelegate
 {
@@ -21,7 +21,7 @@
 		if ( targetEditor != null )
 		{
 			String id = targetEditor.getSite().getId();
-			if ( !(id.equals( IRubyConstants.EDITOR_ID) || id.equals(IRubyConstants.EXTERNAL_FILES_EDITOR_ID))) {
+			if ( !(id.equals(RubyUI.ID_RUBY_EDITOR) || id.equals(RubyUI.ID_EXTERNAL_EDITOR))) {
 				targetEditor = null;
 			}
 		}


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