[Rubyeclipse-commit] org.rubypeople.rdt.ui/src/org/rubypeople/rdt/ui PreferenceConstants.java,1.8,1.9

[Markus B. <mba...@us...>]

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

Modified Files:
	PreferenceConstants.java 
Log Message:
added default property values for riPath and riDoc

Index: PreferenceConstants.java
===================================================================
RCS file: /cvsroot/rubyeclipse/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/ui/PreferenceConstants.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** PreferenceConstants.java	8 Aug 2005 23:26:17 -0000	1.8
--- PreferenceConstants.java	17 Aug 2005 17:40:12 -0000	1.9
***************
*** 1,5 ****
--- 1,8 ----
  package org.rubypeople.rdt.ui;
  
+ import org.eclipse.core.runtime.IPath;
  import org.eclipse.jface.preference.IPreferenceStore;
+ import org.rubypeople.rdt.internal.launching.RubyInterpreter;
+ import org.rubypeople.rdt.internal.launching.RubyRuntime;
  import org.rubypeople.rdt.internal.ui.RubyPlugin;
  
***************
*** 17,20 ****
--- 20,28 ----
  	public static final String TEMPLATES_USE_CODEFORMATTER = "templatesUSeCodeFormatter";
  
+ 	
+ 	private final static String DEFAULT_RDOC_CMD = "rdoc"; //$NON-NLS-1$	
+ 	private final static String DEFAULT_RI_CMD = "ri"; //$NON-NLS-1$	
+ 
+ 
  	/**
  	 * A named preference that controls whether folding is enabled in the Ruby
***************
*** 128,134 ****
--- 136,157 ----
  
  		store.setDefault(PreferenceConstants.EDITOR_SHOW_TEXT_HOVER_AFFORDANCE, true);
+ 					
+ 		store.setDefault( PreferenceConstants.RDOC_PATH, PreferenceConstants.getDefaultPath(PreferenceConstants.DEFAULT_RDOC_CMD)) ; 
+ 		store.setDefault( PreferenceConstants.RI_PATH, PreferenceConstants.getDefaultPath(PreferenceConstants.DEFAULT_RI_CMD)) ; 
  
  	}
  
+ 
+ 	private static String getDefaultPath(String programName) {		
+ 		RubyInterpreter interpreter = RubyRuntime.getDefault().getSelectedInterpreter();
+ 		if (interpreter == null) {
+ 			return programName ;
+ 		}
+ 		IPath path = interpreter.getInstallLocation();
+ 		path = path.uptoSegment(path.segmentCount() - 1).append(programName);
+ 		return path.toOSString();
+ 	}
+ 
+ 
  	/**
  	 * Returns the RDT-UI preference store.