[Rubyeclipse-commit] org.rubypeople.rdt.ui/src/org/rubypeople/rdt/ui RubyUI.java,1.2,1.3 PreferenceConstants.java,1.18,1.19

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

Update of /cvsroot/rubyeclipse/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/ui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13792/src/org/rubypeople/rdt/ui

Modified Files:
	RubyUI.java PreferenceConstants.java 
Log Message:
fix formatting to respect tab conversion to spaces and tab/indentation size (from our new formatter page - I was still referring to old preferences that no longer are used/exist)

Index: PreferenceConstants.java
===================================================================
RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/ui/PreferenceConstants.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** PreferenceConstants.java	21 Apr 2006 21:13:29 -0000	1.18
--- PreferenceConstants.java	5 May 2006 01:13:28 -0000	1.19
***************
*** 18,23 ****
      public static final String RDOC_PATH = "rdocDirectoryPath";
  
-     public static final String FORMAT_INDENTATION = "formatIndentation"; //$NON-NLS-1$
-     public static final String FORMAT_USE_TAB = "formatUseTab"; //$NON-NLS-1$	
      public static final String TEMPLATES_USE_CODEFORMATTER = "templatesUseCodeFormatter"; //$NON-NLS-1$	
  
--- 18,21 ----
***************
*** 500,506 ****
          store.setDefault(PreferenceConstants.APPEARANCE_ENABLE_VISIBILITY_SORT_ORDER, false);
  
-         store.setDefault(PreferenceConstants.FORMAT_INDENTATION, 2);
-         store.setDefault(PreferenceConstants.FORMAT_USE_TAB, false);
- 
          // AppearancePreferencePage
          store.setDefault(PreferenceConstants.APPEARANCE_COMPRESS_PACKAGE_NAMES, false);
--- 498,501 ----

Index: RubyUI.java
===================================================================
RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/ui/RubyUI.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** RubyUI.java	25 Mar 2006 02:37:44 -0000	1.2
--- RubyUI.java	5 May 2006 01:13:28 -0000	1.3
***************
*** 11,14 ****
--- 11,19 ----
  package org.rubypeople.rdt.ui;
  
+ import org.eclipse.jface.util.Assert;
+ import org.eclipse.ui.IEditorInput;
+ import org.rubypeople.rdt.core.IRubyElement;
+ import org.rubypeople.rdt.internal.ui.RubyPlugin;
+ 
  /**
   * Central access point for the Ruby UI plug-in (id
***************
*** 28,32 ****
  
  	private RubyUI() {
! 	// prevent instantiation of RubyUI.
  	}
  
--- 33,37 ----
  
  	private RubyUI() {
! 		// prevent instantiation of RubyUI.
  	}
  
***************
*** 35,70 ****
  	 */
  	public static final String ID_PLUGIN = "org.rubypeople.rdt.ui"; //$NON-NLS-1$
  	public static final String ID_ACTION_SET = null;
! 	
  	/**
! 	 * The view part id of the Ruby Browsing Projects view
! 	 * (value <code>"org.rubypeople.rdt.ui.ProjectsView"</code>).
  	 * 
  	 * @since 0.8.0
  	 */
! 	public static String ID_PROJECTS_VIEW= "org.rubypeople.rdt.ui.ProjectsView"; //$NON-NLS-1$
! 	
  	/**
! 	 * The view part id of the Ruby Browsing Types view
! 	 * (value <code>"org.rubypeople.rdt.ui.TypesView"</code>).
  	 * 
  	 * @since 0.8.0
  	 */
! 	public static String ID_TYPES_VIEW= "org.rubypeople.rdt.ui.TypesView"; //$NON-NLS-1$
! 	
  	/**
! 	 * The view part id of the Ruby Browsing Memberss view
! 	 * (value <code>"org.rubypeople.rdt.ui.MembersView"</code>).
  	 * 
  	 * @since 0.8.0
  	 */
! 	public static String ID_MEMBERS_VIEW= "org.rubypeople.rdt.ui.MembersView"; //$NON-NLS-1$
! 	
  	/**
! 	 * The id of the Ruby Element Creation action set
! 	 * (value <code>"org.rubypeople.rdt.ui.RubyElementCreationActionSet"</code>).
  	 * 
  	 * @since 0.8.0
  	 */
! 	public static final String ID_ELEMENT_CREATION_ACTION_SET= "org.rubypeople.rdt.ui.RubyElementCreationActionSet"; //$NON-NLS-1$
  }
\ No newline at end of file
--- 40,108 ----
  	 */
  	public static final String ID_PLUGIN = "org.rubypeople.rdt.ui"; //$NON-NLS-1$
+ 
  	public static final String ID_ACTION_SET = null;
! 
  	/**
! 	 * The view part id of the Ruby Browsing Projects view (value
! 	 * <code>"org.rubypeople.rdt.ui.ProjectsView"</code>).
  	 * 
  	 * @since 0.8.0
  	 */
! 	public static String ID_PROJECTS_VIEW = "org.rubypeople.rdt.ui.ProjectsView"; //$NON-NLS-1$
! 
  	/**
! 	 * The view part id of the Ruby Browsing Types view (value
! 	 * <code>"org.rubypeople.rdt.ui.TypesView"</code>).
  	 * 
  	 * @since 0.8.0
  	 */
! 	public static String ID_TYPES_VIEW = "org.rubypeople.rdt.ui.TypesView"; //$NON-NLS-1$
! 
  	/**
! 	 * The view part id of the Ruby Browsing Memberss view (value
! 	 * <code>"org.rubypeople.rdt.ui.MembersView"</code>).
  	 * 
  	 * @since 0.8.0
  	 */
! 	public static String ID_MEMBERS_VIEW = "org.rubypeople.rdt.ui.MembersView"; //$NON-NLS-1$
! 
  	/**
! 	 * The id of the Ruby Element Creation action set (value
! 	 * <code>"org.rubypeople.rdt.ui.RubyElementCreationActionSet"</code>).
  	 * 
  	 * @since 0.8.0
  	 */
! 	public static final String ID_ELEMENT_CREATION_ACTION_SET = "org.rubypeople.rdt.ui.RubyElementCreationActionSet"; //$NON-NLS-1$
! 
! 	/**
! 	 * Returns the Ruby element wrapped by the given editor input.
! 	 * 
! 	 * @param editorInput
! 	 *            the editor input
! 	 * @return the Ruby element wrapped by <code>editorInput</code> or
! 	 *         <code>null</code> if none
! 	 * @since 3.2
! 	 */
! 	public static IRubyElement getEditorInputRubyElement(
! 			IEditorInput editorInput) {
! 		Assert.isNotNull(editorInput);
! 		IRubyElement je = getWorkingCopyManager().getWorkingCopy(editorInput);
! 		if (je != null)
! 			return je;
! 
! 		/*
! 		 * This needs works, see
! 		 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=120340
! 		 */
! 		return (IRubyElement) editorInput.getAdapter(IRubyElement.class);
! 	}
! 
! 	/**
! 	 * Returns the working copy manager for the Ruby UI plug-in.
! 	 * 
! 	 * @return the working copy manager for the Ruby UI plug-in
! 	 */
! 	public static IWorkingCopyManager getWorkingCopyManager() {
! 		return RubyPlugin.getDefault().getWorkingCopyManager();
! 	}
  }
\ No newline at end of file