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

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

Revision: 3152
          http://rubyeclipse.svn.sourceforge.net/rubyeclipse/?rev=3152&view=rev
Author:   cawilliams
Date:     2007-09-12 10:53:25 -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.ui/src/org/rubypeople/rdt/internal/ui/RubyFileMatcher.java
    trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/rubyeditor/RubyOutlinePage.java
    trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/typehierarchy/TypeHierarchyViewPart.java
    trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/ui/IRubyConstants.java
    trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/ui/RubyUI.java

Modified: trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/RubyFileMatcher.java
===================================================================
--- trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/RubyFileMatcher.java	2007-09-12 17:46:42 UTC (rev 3151)
+++ trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/RubyFileMatcher.java	2007-09-12 17:53:25 UTC (rev 3152)
@@ -30,7 +30,7 @@
 import org.eclipse.ui.IFileEditorMapping;
 import org.eclipse.ui.IPropertyListener;
 import org.eclipse.ui.internal.WorkbenchPlugin;
-import org.rubypeople.rdt.ui.IRubyConstants;
+import org.rubypeople.rdt.ui.RubyUI;
 
 /**
  * RubyViewerFilter uses the Editor mappings for recognising and filtering files
@@ -105,7 +105,7 @@
 			IEditorDescriptor[] editors = mapping.getEditors();
 			for (int j = 0; j < editors.length; j++) {
 				IEditorDescriptor descriptor = editors[j];
-				if (descriptor.getId().equals(IRubyConstants.EDITOR_ID)) {
+				if (descriptor.getId().equals(RubyUI.ID_RUBY_EDITOR)) {
 					// a mapping can also use a filename instead of a suffix
 					if (mapping.getExtension() != null
 							&& mapping.getExtension().length() != 0) {

Modified: trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/rubyeditor/RubyOutlinePage.java
===================================================================
--- trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/rubyeditor/RubyOutlinePage.java	2007-09-12 17:46:42 UTC (rev 3151)
+++ trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/rubyeditor/RubyOutlinePage.java	2007-09-12 17:53:25 UTC (rev 3152)
@@ -96,6 +96,7 @@
 import org.rubypeople.rdt.ui.IRubyConstants;
 import org.rubypeople.rdt.ui.PreferenceConstants;
 import org.rubypeople.rdt.ui.RubyElementSorter;
+import org.rubypeople.rdt.ui.RubyUI;
 import org.rubypeople.rdt.ui.actions.CustomFiltersActionGroup;
 import org.rubypeople.rdt.ui.actions.MemberFilterActionGroup;
 import org.rubypeople.rdt.ui.actions.OpenViewActionGroup;
@@ -1161,7 +1162,7 @@
         if (key == IShowInTargetList.class) {
             return new IShowInTargetList() {
                 public String[] getShowInTargetIds() {
-                    return new String[] { IRubyConstants.RUBY_RESOURCES_VIEW_ID };
+                    return new String[] { RubyUI.ID_RUBY_EXPLORER };
                 }
 
             };

Modified: trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/typehierarchy/TypeHierarchyViewPart.java
===================================================================
--- trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/typehierarchy/TypeHierarchyViewPart.java	2007-09-12 17:46:42 UTC (rev 3151)
+++ trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/typehierarchy/TypeHierarchyViewPart.java	2007-09-12 17:53:25 UTC (rev 3152)
@@ -593,7 +593,7 @@
 		if (key == IShowInTargetList.class) {
 			return new IShowInTargetList() {
 				public String[] getShowInTargetIds() {
-					return new String[] { RubyUI.ID_RUBY_RESOURCE_VIEW, IPageLayout.ID_RES_NAV  };
+					return new String[] { RubyUI.ID_RUBY_EXPLORER, IPageLayout.ID_RES_NAV  };
 				}
 
 			};

Modified: trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/ui/IRubyConstants.java
===================================================================
--- trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/ui/IRubyConstants.java	2007-09-12 17:46:42 UTC (rev 3151)
+++ trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/ui/IRubyConstants.java	2007-09-12 17:53:25 UTC (rev 3152)
@@ -10,10 +10,18 @@
  */
 public interface IRubyConstants {
 
-	public static final String RUBY_RESOURCES_VIEW_ID = RubyUI.ID_RUBY_RESOURCE_VIEW; //$NON-NLS-1$
-	public static final String EDITOR_ID = "org.rubypeople.rdt.ui.EditorRubyFile"; //$NON-NLS-1$
-	public static final String EXTERNAL_FILES_EDITOR_ID = "org.rubypeople.rdt.ui.ExternalRubyEditor"; //$NON-NLS-1$
+	/**
+	 * @deprecated Please use RubyUI.ID_RUBY_EDITOR
+	 */
+	public static final String EDITOR_ID = RubyUI.ID_RUBY_EDITOR; //$NON-NLS-1$
+	
+	/**
+	 * @deprecated Please use RubyUI.ID_EXTERNAL_EDITOR
+	 */
+	public static final String EXTERNAL_FILES_EDITOR_ID = RubyUI.ID_EXTERNAL_EDITOR; //$NON-NLS-1$
+	
 	public static final String RI_VIEW_ID = "org.rubypeople.rdt.ui.views.RIView"; //$NON-NLS-1$
+	
 	public static final String ID_NEW_CLASS_WIZARD = "org.rubypeople.rdt.ui.wizards.RubyNewClassWizard"; //$NON-NLS-1$
 
 }

Modified: trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/ui/RubyUI.java
===================================================================
--- trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/ui/RubyUI.java	2007-09-12 17:46:42 UTC (rev 3151)
+++ trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/ui/RubyUI.java	2007-09-12 17:53:25 UTC (rev 3152)
@@ -111,8 +111,6 @@
 	 */	
 	public static final String ID_PERSPECTIVE= 		"org.rubypeople.rdt.ui.PerspectiveRuby"; //$NON-NLS-1$
 
-	public static final String ID_RUBY_RESOURCE_VIEW = "org.rubypeople.rdt.ui.ViewRubyResources"; //$NON-NLS-1$
-
 	/** 
 	 * The view part id of the type hierarchy part
 	 * (value <code>"org.rubypeople.rdt.ui.TypeHierarchy"</code>).


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