Menu
▾
▴
[Rubyeclipse-commit] SF.net SVN: rubyeclipse: [1792] trunk
|
From: <caw...@us...> - 2007-01-18 15:43:50
|
Revision: 1792
http://svn.sourceforge.net/rubyeclipse/?rev=1792&view=rev
Author: cawilliams
Date: 2007-01-18 07:43:49 -0800 (Thu, 18 Jan 2007)
Log Message:
-----------
doing some renaming back to what JDT uses - it's easier
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/launcher/RubyEnvironmentTab.java
trunk/org.rubypeople.rdt.debug.ui/src/org/rubypeople/rdt/internal/debug/ui/preferences/EditInterpreterDialog.java
trunk/org.rubypeople.rdt.debug.ui/src/org/rubypeople/rdt/internal/debug/ui/preferences/RubyInterpreterLabelProvider.java
trunk/org.rubypeople.rdt.debug.ui/src/org/rubypeople/rdt/internal/debug/ui/preferences/RubyInterpreterPreferencePage.java
trunk/org.rubypeople.rdt.debug.ui/src/org/rubypeople/rdt/internal/debug/ui/rubyvms/IAddVMDialogRequestor.java
trunk/org.rubypeople.rdt.debug.ui.tests/src/org/rubypeople/rdt/internal/debug/ui/launcher/TC_RubyApplicationShortcut.java
trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/internal/launching/DebuggerRunner.java
trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/internal/launching/InterpreterRunner.java
trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/internal/launching/InterpreterRunnerConfiguration.java
trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/internal/launching/RubyContainerInitializer.java
trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/internal/launching/RubyInterpreter.java
trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/internal/launching/RubyVMContainer.java
trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/internal/launching/VMDefinitionsContainer.java
trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/internal/launching/VMStandin.java
trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/launching/AbstractInterpreter.java
trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/launching/IInterpreterInstallChangedListener.java
trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/launching/IInterpreterInstallType.java
trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/launching/RubyRuntime.java
trunk/org.rubypeople.rdt.launching.tests/src/org/rubypeople/rdt/internal/launching/TC_RubyInterpreter.java
trunk/org.rubypeople.rdt.launching.tests/src/org/rubypeople/rdt/internal/launching/TC_RubyRuntime.java
trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/infoviews/RIView.java
trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/rdocexport/RDocUtility.java
trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/text/ruby/hover/RiDocHoverProvider.java
trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/ui/PreferenceConstants.java
Removed Paths:
-------------
trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/launching/IInterpreter.java
trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/launching/IInterpreter2.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-01-18 15:41:21 UTC (rev 1791)
+++ trunk/org.rubypeople.rdt.debug.core.tests/src/org/rubypeople/rdt/debug/core/tests/FTC_DebuggerLaunch.java 2007-01-18 15:43:49 UTC (rev 1792)
@@ -18,7 +18,7 @@
import org.rubypeople.rdt.internal.debug.core.RubyLineBreakpoint;
import org.rubypeople.rdt.internal.launching.RubyInterpreter;
import org.rubypeople.rdt.internal.launching.RubyLaunchConfigurationAttribute;
-import org.rubypeople.rdt.launching.IInterpreter;
+import org.rubypeople.rdt.launching.IVMInstall;
import org.rubypeople.rdt.launching.RubyRuntime;
/*
@@ -36,7 +36,7 @@
// to be set accordingly
String rubyInterpreterPath = FTC_ClassicDebuggerCommunicationTest.RUBY_INTERPRETER ;
System.out.println("Using interpreter: " + rubyInterpreterPath) ;
- IInterpreter rubyInterpreter = new RubyInterpreter("RubyInterpreter", new File(rubyInterpreterPath));
+ IVMInstall rubyInterpreter = new RubyInterpreter("RubyInterpreter", new File(rubyInterpreterPath));
RubyRuntime.getDefault().addInstalledInterpreter(rubyInterpreter) ;
}
Modified: trunk/org.rubypeople.rdt.debug.ui/src/org/rubypeople/rdt/internal/debug/ui/launcher/RubyEnvironmentTab.java
===================================================================
--- trunk/org.rubypeople.rdt.debug.ui/src/org/rubypeople/rdt/internal/debug/ui/launcher/RubyEnvironmentTab.java 2007-01-18 15:41:21 UTC (rev 1791)
+++ trunk/org.rubypeople.rdt.debug.ui/src/org/rubypeople/rdt/internal/debug/ui/launcher/RubyEnvironmentTab.java 2007-01-18 15:43:49 UTC (rev 1792)
@@ -38,7 +38,7 @@
import org.rubypeople.rdt.internal.debug.ui.rubyvms.RubyVMMessages;
import org.rubypeople.rdt.internal.launching.RubyLaunchConfigurationAttribute;
import org.rubypeople.rdt.internal.ui.RubyPluginImages;
-import org.rubypeople.rdt.launching.IInterpreter;
+import org.rubypeople.rdt.launching.IVMInstall;
import org.rubypeople.rdt.launching.RubyRuntime;
public class RubyEnvironmentTab extends AbstractLaunchConfigurationTab {
@@ -170,7 +170,7 @@
return false;
}
- public void vmAdded(IInterpreter vm) {
+ public void vmAdded(IVMInstall vm) {
RubyRuntime.getDefault().addInstalledInterpreter(vm);
fCombo.add(vm.getName());
fCombo.select(fCombo.indexOf(vm.getName()));
@@ -194,7 +194,7 @@
}
public void setDefaults(ILaunchConfigurationWorkingCopy configuration) {
- IInterpreter defaultInterpreter = RubyRuntime.getDefault()
+ IVMInstall defaultInterpreter = RubyRuntime.getDefault()
.getSelectedInterpreter();
if (defaultInterpreter != null) {
configuration.setAttribute(
@@ -261,13 +261,13 @@
.size()];
for (int interpreterIndex = 0; interpreterIndex < installedInterpretersWorkingCopy
.size(); interpreterIndex++) {
- IInterpreter interpreter = (IInterpreter) installedInterpretersWorkingCopy
+ IVMInstall interpreter = (IVMInstall) installedInterpretersWorkingCopy
.get(interpreterIndex);
interpreterNames[interpreterIndex] = interpreter.getName();
}
interpreterCombo.setItems(interpreterNames);
- IInterpreter selectedInterpreter = RubyRuntime.getDefault()
+ IVMInstall selectedInterpreter = RubyRuntime.getDefault()
.getSelectedInterpreter();
if (selectedInterpreter != null)
interpreterCombo.select(interpreterCombo
Modified: trunk/org.rubypeople.rdt.debug.ui/src/org/rubypeople/rdt/internal/debug/ui/preferences/EditInterpreterDialog.java
===================================================================
--- trunk/org.rubypeople.rdt.debug.ui/src/org/rubypeople/rdt/internal/debug/ui/preferences/EditInterpreterDialog.java 2007-01-18 15:41:21 UTC (rev 1791)
+++ trunk/org.rubypeople.rdt.debug.ui/src/org/rubypeople/rdt/internal/debug/ui/preferences/EditInterpreterDialog.java 2007-01-18 15:43:49 UTC (rev 1792)
@@ -31,15 +31,15 @@
import org.rubypeople.rdt.internal.ui.wizards.dialogfields.IStringButtonAdapter;
import org.rubypeople.rdt.internal.ui.wizards.dialogfields.StringButtonDialogField;
import org.rubypeople.rdt.internal.ui.wizards.dialogfields.StringDialogField;
-import org.rubypeople.rdt.launching.IInterpreter;
-import org.rubypeople.rdt.launching.IInterpreter2;
+import org.rubypeople.rdt.launching.IVMInstall;
+import org.rubypeople.rdt.launching.IVMInstall2;
import org.rubypeople.rdt.launching.IInterpreterInstallType;
public class EditInterpreterDialog extends StatusDialog {
protected IStatus[] allStatus = new IStatus[2];
- protected IInterpreter fEditedVM;
+ protected IVMInstall fEditedVM;
private StringButtonDialogField fJRERoot;
private StringDialogField fVMName;
@@ -55,7 +55,7 @@
private IAddVMDialogRequestor fRequestor;
- public EditInterpreterDialog(IAddVMDialogRequestor requestor, Shell shell, IInterpreterInstallType[] vmInstallTypes, IInterpreter editedVM) {
+ public EditInterpreterDialog(IAddVMDialogRequestor requestor, Shell shell, IInterpreterInstallType[] vmInstallTypes, IVMInstall editedVM) {
super(shell);
setShellStyle(getShellStyle() | SWT.RESIZE);
fRequestor= requestor;
@@ -102,7 +102,7 @@
private void doOkPressed() {
if (fEditedVM == null) {
- IInterpreter vm= new VMStandin(fSelectedVMType, createUniqueId(fSelectedVMType));
+ IVMInstall vm= new VMStandin(fSelectedVMType, createUniqueId(fSelectedVMType));
setFieldValuesToVM(vm);
fRequestor.vmAdded(vm);
} else {
@@ -216,8 +216,8 @@
fVMName.setText(fEditedVM.getName());
fJRERoot.setText(fEditedVM.getInstallLocation().getAbsolutePath());
// fLibraryBlock.initializeFrom(fEditedVM, fSelectedVMType);
- if (fEditedVM instanceof IInterpreter2) {
- IInterpreter2 vm2 = (IInterpreter2) fEditedVM;
+ if (fEditedVM instanceof IVMInstall2) {
+ IVMInstall2 vm2 = (IVMInstall2) fEditedVM;
String vmArgs = vm2.getVMArgs();
if (vmArgs != null) {
fVMArgs.setText(vmArgs);
@@ -313,7 +313,7 @@
return names;
}
- protected void setFieldValuesToVM(IInterpreter vm) {
+ protected void setFieldValuesToVM(IVMInstall vm) {
File dir = new File(fJRERoot.getText());
try {
vm.setInstallLocation(dir.getCanonicalFile());
@@ -323,8 +323,8 @@
vm.setName(fVMName.getText());
String argString = fVMArgs.getText().trim();
- if (vm instanceof IInterpreter2) {
- IInterpreter2 vm2 = (IInterpreter2) vm;
+ if (vm instanceof IVMInstall2) {
+ IVMInstall2 vm2 = (IVMInstall2) vm;
if (argString != null && argString.length() >0) {
vm2.setInterpreterArgs(argString);
} else {
Modified: trunk/org.rubypeople.rdt.debug.ui/src/org/rubypeople/rdt/internal/debug/ui/preferences/RubyInterpreterLabelProvider.java
===================================================================
--- trunk/org.rubypeople.rdt.debug.ui/src/org/rubypeople/rdt/internal/debug/ui/preferences/RubyInterpreterLabelProvider.java 2007-01-18 15:41:21 UTC (rev 1791)
+++ trunk/org.rubypeople.rdt.debug.ui/src/org/rubypeople/rdt/internal/debug/ui/preferences/RubyInterpreterLabelProvider.java 2007-01-18 15:43:49 UTC (rev 1792)
@@ -5,7 +5,7 @@
import org.eclipse.jface.viewers.ILabelProviderListener;
import org.eclipse.jface.viewers.ITableLabelProvider;
import org.eclipse.swt.graphics.Image;
-import org.rubypeople.rdt.launching.IInterpreter;
+import org.rubypeople.rdt.launching.IVMInstall;
public class RubyInterpreterLabelProvider implements ITableLabelProvider {
@@ -18,7 +18,7 @@
}
public String getColumnText(Object element, int columnIndex) {
- IInterpreter interpreter = (IInterpreter) element;
+ IVMInstall interpreter = (IVMInstall) element;
switch (columnIndex) {
case 0 :
return interpreter.getName();
Modified: trunk/org.rubypeople.rdt.debug.ui/src/org/rubypeople/rdt/internal/debug/ui/preferences/RubyInterpreterPreferencePage.java
===================================================================
--- trunk/org.rubypeople.rdt.debug.ui/src/org/rubypeople/rdt/internal/debug/ui/preferences/RubyInterpreterPreferencePage.java 2007-01-18 15:41:21 UTC (rev 1791)
+++ trunk/org.rubypeople.rdt.debug.ui/src/org/rubypeople/rdt/internal/debug/ui/preferences/RubyInterpreterPreferencePage.java 2007-01-18 15:43:49 UTC (rev 1792)
@@ -29,7 +29,7 @@
import org.rubypeople.rdt.internal.debug.ui.RdtDebugUiMessages;
import org.rubypeople.rdt.internal.debug.ui.rubyvms.IAddVMDialogRequestor;
import org.rubypeople.rdt.internal.debug.ui.rubyvms.RubyVMMessages;
-import org.rubypeople.rdt.launching.IInterpreter;
+import org.rubypeople.rdt.launching.IVMInstall;
import org.rubypeople.rdt.launching.RubyRuntime;
public class RubyInterpreterPreferencePage extends PreferencePage implements IWorkbenchPreferencePage, IAddVMDialogRequestor {
@@ -57,7 +57,7 @@
createButtonGroup(composite);
fVMList.setInput(RubyRuntime.getDefault().getInstalledInterpreters());
- IInterpreter selectedInterpreter = RubyRuntime.getDefault().getSelectedInterpreter();
+ IVMInstall selectedInterpreter = RubyRuntime.getDefault().getSelectedInterpreter();
if (selectedInterpreter != null)
fVMList.setChecked(selectedInterpreter, true);
@@ -187,7 +187,7 @@
protected void editInterpreter() {
IStructuredSelection selection= (IStructuredSelection)fVMList.getSelection();
- IInterpreter vm= (IInterpreter)selection.getFirstElement();
+ IVMInstall vm= (IVMInstall)selection.getFirstElement();
if (vm == null) {
return;
}
@@ -204,9 +204,9 @@
// }
}
- protected IInterpreter getSelectedInterpreter() {
+ protected IVMInstall getSelectedInterpreter() {
IStructuredSelection selection = (IStructuredSelection) fVMList.getSelection();
- return (IInterpreter) selection.getFirstElement();
+ return (IVMInstall) selection.getFirstElement();
}
public boolean performOk() {
@@ -218,14 +218,14 @@
Object[] checkedElements = fVMList.getCheckedElements();
if (checkedElements.length > 0)
- RubyRuntime.getDefault().setSelectedInterpreter((IInterpreter) checkedElements[0]);
+ RubyRuntime.getDefault().setSelectedInterpreter((IVMInstall) checkedElements[0]);
return super.performOk();
}
public boolean isDuplicateName(String name) {
for (int i= 0; i < fVMs.size(); i++) {
- IInterpreter vm = (IInterpreter)fVMs.get(i);
+ IVMInstall vm = (IVMInstall)fVMs.get(i);
if (vm.getName().equals(name)) {
return true;
}
@@ -233,7 +233,7 @@
return false;
}
- public void vmAdded(IInterpreter vm) {
+ public void vmAdded(IVMInstall vm) {
fVMs.add(vm);
fVMList.refresh();
}
Modified: trunk/org.rubypeople.rdt.debug.ui/src/org/rubypeople/rdt/internal/debug/ui/rubyvms/IAddVMDialogRequestor.java
===================================================================
--- trunk/org.rubypeople.rdt.debug.ui/src/org/rubypeople/rdt/internal/debug/ui/rubyvms/IAddVMDialogRequestor.java 2007-01-18 15:41:21 UTC (rev 1791)
+++ trunk/org.rubypeople.rdt.debug.ui/src/org/rubypeople/rdt/internal/debug/ui/rubyvms/IAddVMDialogRequestor.java 2007-01-18 15:43:49 UTC (rev 1792)
@@ -10,7 +10,7 @@
*******************************************************************************/
package org.rubypeople.rdt.internal.debug.ui.rubyvms;
-import org.rubypeople.rdt.launching.IInterpreter;
+import org.rubypeople.rdt.launching.IVMInstall;
/**
* This interface is implemented by clients of the <code>AddVMDialog</code>.
@@ -31,6 +31,6 @@
*
* @param vm the added vm
*/
- public void vmAdded(IInterpreter vm);
+ public void vmAdded(IVMInstall vm);
}
Modified: trunk/org.rubypeople.rdt.debug.ui.tests/src/org/rubypeople/rdt/internal/debug/ui/launcher/TC_RubyApplicationShortcut.java
===================================================================
--- trunk/org.rubypeople.rdt.debug.ui.tests/src/org/rubypeople/rdt/internal/debug/ui/launcher/TC_RubyApplicationShortcut.java 2007-01-18 15:41:21 UTC (rev 1791)
+++ trunk/org.rubypeople.rdt.debug.ui.tests/src/org/rubypeople/rdt/internal/debug/ui/launcher/TC_RubyApplicationShortcut.java 2007-01-18 15:43:49 UTC (rev 1792)
@@ -24,7 +24,7 @@
import org.rubypeople.rdt.internal.debug.ui.RubySourceLocator;
import org.rubypeople.rdt.internal.launching.RubyInterpreter;
import org.rubypeople.rdt.internal.launching.RubyLaunchConfigurationAttribute;
-import org.rubypeople.rdt.launching.IInterpreter;
+import org.rubypeople.rdt.launching.IVMInstall;
import org.rubypeople.rdt.launching.RubyRuntime;
import org.rubypeople.rdt.ui.IRubyConstants;
@@ -76,8 +76,8 @@
Assert.assertEquals("All configurations deleted.", 0, this.getLaunchConfigurations().length);
ShamApplicationLaunchConfigurationDelegate.resetLaunches();
- IInterpreter interpreterOne = new RubyInterpreter("InterpreterOne", new File("C:/RubyInstallRootOne"));
- RubyRuntime.getDefault().setInstalledInterpreters(Arrays.asList(new IInterpreter[] { interpreterOne}));
+ IVMInstall interpreterOne = new RubyInterpreter("InterpreterOne", new File("C:/RubyInstallRootOne"));
+ RubyRuntime.getDefault().setInstalledInterpreters(Arrays.asList(new IVMInstall[] { interpreterOne}));
super.setUp();
}
@@ -90,7 +90,7 @@
public void testNoInterpreterInstalled() throws Exception {
- RubyRuntime.getDefault().setInstalledInterpreters(Arrays.asList(new IInterpreter[] { }));
+ RubyRuntime.getDefault().setInstalledInterpreters(Arrays.asList(new IVMInstall[] { }));
ISelection selection = new StructuredSelection(rubyFile);
shortcut.launch(selection, ILaunchManager.RUN_MODE);
Modified: trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/internal/launching/DebuggerRunner.java
===================================================================
--- trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/internal/launching/DebuggerRunner.java 2007-01-18 15:41:21 UTC (rev 1791)
+++ trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/internal/launching/DebuggerRunner.java 2007-01-18 15:43:49 UTC (rev 1792)
@@ -14,7 +14,7 @@
import org.rubypeople.rdt.internal.debug.core.RdtDebugCorePlugin;
import org.rubypeople.rdt.internal.debug.core.RubyDebuggerProxy;
import org.rubypeople.rdt.internal.debug.core.model.RubyDebugTarget;
-import org.rubypeople.rdt.launching.IInterpreter;
+import org.rubypeople.rdt.launching.IVMInstall;
public class DebuggerRunner extends InterpreterRunner {
@@ -84,7 +84,7 @@
return RdtLaunchingPlugin.getDefault().getPluginPreferences().getBoolean(PreferenceConstants.VERBOSE_DEBUGGER);
}
- protected IInterpreter convertInterpreter(IInterpreter rubyInterpreter) {
+ protected IVMInstall convertInterpreter(IVMInstall rubyInterpreter) {
if (isUseRubyDebug()) {
IPath rdebugLocation = new Path(rubyInterpreter.getInstallLocation().getAbsolutePath()).removeLastSegments(1);
rdebugLocation = rdebugLocation.append("rdebug");
Modified: trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/internal/launching/InterpreterRunner.java
===================================================================
--- trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/internal/launching/InterpreterRunner.java 2007-01-18 15:41:21 UTC (rev 1791)
+++ trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/internal/launching/InterpreterRunner.java 2007-01-18 15:43:49 UTC (rev 1792)
@@ -10,7 +10,7 @@
import org.eclipse.debug.core.DebugPlugin;
import org.eclipse.debug.core.ILaunch;
import org.eclipse.debug.core.model.IProcess;
-import org.rubypeople.rdt.launching.IInterpreter;
+import org.rubypeople.rdt.launching.IVMInstall;
public class InterpreterRunner {
@@ -20,7 +20,7 @@
List commandLine = renderCommandLine(configuration);
File workingDirectory = configuration.getAbsoluteWorkingDirectory();
- IInterpreter interpreter = convertInterpreter(configuration.getInterpreter());
+ IVMInstall interpreter = convertInterpreter(configuration.getInterpreter());
Process nativeRubyProcess = interpreter.exec(commandLine, workingDirectory);
Map defaultAttributes = new HashMap();
defaultAttributes.put(IProcess.ATTR_PROCESS_TYPE, "ruby");
@@ -29,7 +29,7 @@
return process ;
}
- protected IInterpreter convertInterpreter(IInterpreter rubyInterpreter) {
+ protected IVMInstall convertInterpreter(IVMInstall rubyInterpreter) {
return rubyInterpreter;
}
@@ -37,7 +37,7 @@
StringBuffer buffer = new StringBuffer();
try {
- IInterpreter interpreter = configuration.getInterpreter();
+ IVMInstall interpreter = configuration.getInterpreter();
buffer.append("Ruby ");
buffer.append(interpreter.getCommand());
buffer.append(" : ");
Modified: trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/internal/launching/InterpreterRunnerConfiguration.java
===================================================================
--- trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/internal/launching/InterpreterRunnerConfiguration.java 2007-01-18 15:41:21 UTC (rev 1791)
+++ trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/internal/launching/InterpreterRunnerConfiguration.java 2007-01-18 15:43:49 UTC (rev 1792)
@@ -12,7 +12,7 @@
import org.rubypeople.rdt.core.ILoadpathEntry;
import org.rubypeople.rdt.core.RubyModelException;
import org.rubypeople.rdt.internal.core.RubyProject;
-import org.rubypeople.rdt.launching.IInterpreter;
+import org.rubypeople.rdt.launching.IVMInstall;
import org.rubypeople.rdt.launching.RubyRuntime;
public class InterpreterRunnerConfiguration {
@@ -93,7 +93,7 @@
return "";
}
- public IInterpreter getInterpreter() {
+ public IVMInstall getInterpreter() {
String selectedInterpreter = null;
try {
selectedInterpreter = configuration.getAttribute(RubyLaunchConfigurationAttribute.SELECTED_INTERPRETER, "");
Modified: trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/internal/launching/RubyContainerInitializer.java
===================================================================
--- trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/internal/launching/RubyContainerInitializer.java 2007-01-18 15:41:21 UTC (rev 1791)
+++ trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/internal/launching/RubyContainerInitializer.java 2007-01-18 15:43:49 UTC (rev 1792)
@@ -6,7 +6,7 @@
import org.rubypeople.rdt.core.IRubyProject;
import org.rubypeople.rdt.core.LoadpathContainerInitializer;
import org.rubypeople.rdt.core.RubyCore;
-import org.rubypeople.rdt.launching.IInterpreter;
+import org.rubypeople.rdt.launching.IVMInstall;
import org.rubypeople.rdt.launching.IInterpreterInstallType;
import org.rubypeople.rdt.launching.RubyRuntime;
@@ -18,7 +18,7 @@
int size = containerPath.segmentCount();
if (size > 0) {
if (containerPath.segment(0).equals(RubyRuntime.RUBY_CONTAINER)) {
- IInterpreter vm = resolveInterpreter(containerPath);
+ IVMInstall vm = resolveInterpreter(containerPath);
RubyVMContainer container = null;
if (vm != null) {
container = new RubyVMContainer(vm, containerPath);
@@ -35,8 +35,8 @@
* Returns the VM install associated with the container path, or
* <code>null</code> if it does not exist.
*/
- public static IInterpreter resolveInterpreter(IPath containerPath) {
- IInterpreter vm = null;
+ public static IVMInstall resolveInterpreter(IPath containerPath) {
+ IVMInstall vm = null;
if (containerPath.segmentCount() > 1) {
// specific Ruby VM
String vmTypeId = getInterpreterTypeId(containerPath);
Modified: trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/internal/launching/RubyInterpreter.java
===================================================================
--- trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/internal/launching/RubyInterpreter.java 2007-01-18 15:41:21 UTC (rev 1791)
+++ trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/internal/launching/RubyInterpreter.java 2007-01-18 15:43:49 UTC (rev 1792)
@@ -10,11 +10,11 @@
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
-import org.rubypeople.rdt.launching.IInterpreter;
+import org.rubypeople.rdt.launching.IVMInstall;
import org.rubypeople.rdt.launching.IInterpreterInstallType;
import org.rubypeople.rdt.launching.IVMRunner;
-public class RubyInterpreter implements IInterpreter {
+public class RubyInterpreter implements IVMInstall {
public static final String END_OF_OPTIONS_DELIMITER = "--";
protected File installLocation;
@@ -83,7 +83,7 @@
public boolean equals(Object other) {
if (other instanceof RubyInterpreter) {
- IInterpreter otherInterpreter = (IInterpreter) other;
+ IVMInstall otherInterpreter = (IVMInstall) other;
if (name.equals(otherInterpreter.getName()))
return installLocation.equals(otherInterpreter.getInstallLocation());
}
Modified: trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/internal/launching/RubyVMContainer.java
===================================================================
--- trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/internal/launching/RubyVMContainer.java 2007-01-18 15:41:21 UTC (rev 1791)
+++ trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/internal/launching/RubyVMContainer.java 2007-01-18 15:43:49 UTC (rev 1792)
@@ -9,7 +9,7 @@
import org.rubypeople.rdt.core.ILoadpathContainer;
import org.rubypeople.rdt.core.ILoadpathEntry;
import org.rubypeople.rdt.core.RubyCore;
-import org.rubypeople.rdt.launching.IInterpreter;
+import org.rubypeople.rdt.launching.IVMInstall;
import org.rubypeople.rdt.launching.IInterpreterInstallChangedListener;
import org.rubypeople.rdt.launching.PropertyChangeEvent;
import org.rubypeople.rdt.launching.RubyRuntime;
@@ -17,10 +17,10 @@
public class RubyVMContainer implements ILoadpathContainer {
private static Map fgLoadpathEntries;
- private IInterpreter fInterpreter;
+ private IVMInstall fInterpreter;
private IPath fPath;
- public RubyVMContainer(IInterpreter interpreter, IPath path) {
+ public RubyVMContainer(IVMInstall interpreter, IPath path) {
fInterpreter = interpreter;
fPath = path;
}
@@ -39,12 +39,12 @@
* @param vm
* @return loadpath entries
*/
- private static ILoadpathEntry[] getLoadpathEntries(IInterpreter vm) {
+ private static ILoadpathEntry[] getLoadpathEntries(IVMInstall vm) {
if (fgLoadpathEntries == null) {
fgLoadpathEntries = new HashMap(10);
// add a listener to clear cached value when a VM changes or is removed
IInterpreterInstallChangedListener listener = new IInterpreterInstallChangedListener() {
- public void defaultInterpreterInstallChanged(IInterpreter previous, IInterpreter current) {
+ public void defaultInterpreterInstallChanged(IVMInstall previous, IVMInstall current) {
}
public void interpreterChanged(PropertyChangeEvent event) {
@@ -53,10 +53,10 @@
}
}
- public void interpreterAdded(IInterpreter newVm) {
+ public void interpreterAdded(IVMInstall newVm) {
}
- public void interpreterRemoved(IInterpreter removedVm) {
+ public void interpreterRemoved(IVMInstall removedVm) {
fgLoadpathEntries.remove(removedVm);
}
};
@@ -76,7 +76,7 @@
* @param vm
* @return loadpath entries
*/
- private static ILoadpathEntry[] computeLoadpathEntries(IInterpreter vm) {
+ private static ILoadpathEntry[] computeLoadpathEntries(IVMInstall vm) {
IPath[] libs = vm.getLibraryLocations();
List entries = new ArrayList(libs.length);
for (int i = 0; i < libs.length; i++) {
Modified: trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/internal/launching/VMDefinitionsContainer.java
===================================================================
--- trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/internal/launching/VMDefinitionsContainer.java 2007-01-18 15:41:21 UTC (rev 1791)
+++ trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/internal/launching/VMDefinitionsContainer.java 2007-01-18 15:43:49 UTC (rev 1792)
@@ -29,8 +29,8 @@
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.Path;
-import org.rubypeople.rdt.launching.IInterpreter;
-import org.rubypeople.rdt.launching.IInterpreter2;
+import org.rubypeople.rdt.launching.IVMInstall;
+import org.rubypeople.rdt.launching.IVMInstall2;
import org.rubypeople.rdt.launching.IInterpreterInstallType;
import org.rubypeople.rdt.launching.RubyRuntime;
import org.w3c.dom.Document;
@@ -105,7 +105,7 @@
*
* @param vm the VM to be added to this container
*/
- public void addVM(IInterpreter vm) {
+ public void addVM(IVMInstall vm) {
if (!fVMList.contains(vm)) {
IInterpreterInstallType vmInstallType = vm.getInterpreterInstallType();
List vmList = (List) fVMTypeToVMMap.get(vmInstallType);
@@ -135,7 +135,7 @@
public void addVMList(List vmList) {
Iterator iterator = vmList.iterator();
while (iterator.hasNext()) {
- IInterpreter vm = (IInterpreter) iterator.next();
+ IVMInstall vm = (IVMInstall) iterator.next();
addVM(vm);
}
}
@@ -274,7 +274,7 @@
List vmList = (List) getVMTypeToVMMap().get(vmType);
Iterator vmIterator = vmList.iterator();
while (vmIterator.hasNext()) {
- IInterpreter vm = (IInterpreter) vmIterator.next();
+ IVMInstall vm = (IVMInstall) vmIterator.next();
Element vmElement = vmAsElement(doc, vm);
element.appendChild(vmElement);
}
@@ -285,7 +285,7 @@
/**
* Create and return a node for the specified VM in the specified Document.
*/
- private Element vmAsElement(Document doc, IInterpreter vm) {
+ private Element vmAsElement(Document doc, IVMInstall vm) {
// Create the node for the VM and set its 'id' & 'name' attributes
Element element= doc.createElement("vm"); //$NON-NLS-1$
@@ -307,8 +307,8 @@
element.appendChild(libLocationElement);
}
- if (vm instanceof IInterpreter2) {
- String vmArgs = ((IInterpreter2)vm).getVMArgs();
+ if (vm instanceof IVMInstall2) {
+ String vmArgs = ((IVMInstall2)vm).getVMArgs();
if (vmArgs != null && vmArgs.length() > 0) {
element.setAttribute("vmargs", vmArgs); //$NON-NLS-1$
}
@@ -507,7 +507,7 @@
* Set the LibraryLocations on the specified VM, by extracting the subordinate
* nodes from the specified 'lirbaryLocations' node.
*/
- private static void setLibraryLocations(IInterpreter vm, Element libLocationsElement) {
+ private static void setLibraryLocations(IVMInstall vm, Element libLocationsElement) {
NodeList list = libLocationsElement.getChildNodes();
int length = list.getLength();
List locations = new ArrayList(length);
@@ -529,7 +529,7 @@
*
* @param vm vm intall
*/
- public void removeVM(IInterpreter vm) {
+ public void removeVM(IVMInstall vm) {
fVMList.remove(vm);
fInvalidVMList.remove(vm);
List list = (List) fVMTypeToVMMap.get(vm.getInterpreterInstallType());
Modified: trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/internal/launching/VMStandin.java
===================================================================
--- trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/internal/launching/VMStandin.java 2007-01-18 15:41:21 UTC (rev 1791)
+++ trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/internal/launching/VMStandin.java 2007-01-18 15:43:49 UTC (rev 1792)
@@ -5,11 +5,11 @@
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
-import org.rubypeople.rdt.launching.IInterpreter;
+import org.rubypeople.rdt.launching.IVMInstall;
import org.rubypeople.rdt.launching.IInterpreterInstallType;
import org.rubypeople.rdt.launching.IVMRunner;
-public class VMStandin implements IInterpreter {
+public class VMStandin implements IVMInstall {
public VMStandin(IInterpreterInstallType vmType, String id) {
// TODO Auto-generated constructor stub
Modified: trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/launching/AbstractInterpreter.java
===================================================================
--- trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/launching/AbstractInterpreter.java 2007-01-18 15:41:21 UTC (rev 1791)
+++ trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/launching/AbstractInterpreter.java 2007-01-18 15:43:49 UTC (rev 1792)
@@ -25,7 +25,7 @@
* Clients implementing Interpreter installs must subclass this class.
* </p>
*/
-public abstract class AbstractInterpreter implements IInterpreter, IInterpreter2 {
+public abstract class AbstractInterpreter implements IVMInstall, IVMInstall2 {
private IInterpreterInstallType fType;
private String fId;
@@ -183,8 +183,8 @@
* @since 2.1
*/
public boolean equals(Object object) {
- if (object instanceof IInterpreter) {
- IInterpreter vm = (IInterpreter)object;
+ if (object instanceof IVMInstall) {
+ IVMInstall vm = (IVMInstall)object;
return getInterpreterInstallType().equals(vm.getInterpreterInstallType()) &&
getId().equals(vm.getId());
}
Deleted: trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/launching/IInterpreter.java
===================================================================
--- trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/launching/IInterpreter.java 2007-01-18 15:41:21 UTC (rev 1791)
+++ trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/launching/IInterpreter.java 2007-01-18 15:43:49 UTC (rev 1792)
@@ -1,37 +0,0 @@
-package org.rubypeople.rdt.launching;
-
-import java.io.File;
-import java.util.List;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.rubypeople.rdt.internal.launching.IllegalCommandException;
-
-public interface IInterpreter {
-
- public File getInstallLocation();
-
- public void setInstallLocation(File validInstallLocation);
-
- public String getName();
-
- public void setName(String newName);
-
- public String getCommand() throws IllegalCommandException;
-
- public Process exec(List commandLine, File workingDirectory) throws CoreException;
-
- public IPath[] getLibraryLocations();
-
- public String getId();
-
- public IInterpreterInstallType getInterpreterInstallType();
-
- public void setLibraryLocations(IPath[] paths);
-
- public String[] getInterpreterArguments();
-
- public void setInterpreterArguments(String[] vmArgs);
-
- public IVMRunner getInterpreterRunner(String mode);
-}
\ No newline at end of file
Deleted: trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/launching/IInterpreter2.java
===================================================================
--- trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/launching/IInterpreter2.java 2007-01-18 15:41:21 UTC (rev 1791)
+++ trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/launching/IInterpreter2.java 2007-01-18 15:43:49 UTC (rev 1792)
@@ -1,11 +0,0 @@
-package org.rubypeople.rdt.launching;
-
-public interface IInterpreter2 {
-
- public String getVMArgs();
-
- public String getRubyVersion();
-
- public void setInterpreterArgs(String vmArgs);
-
-}
Modified: trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/launching/IInterpreterInstallChangedListener.java
===================================================================
--- trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/launching/IInterpreterInstallChangedListener.java 2007-01-18 15:41:21 UTC (rev 1791)
+++ trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/launching/IInterpreterInstallChangedListener.java 2007-01-18 15:43:49 UTC (rev 1792)
@@ -32,11 +32,11 @@
public static final String PROPERTY_VM_ARGUMENTS = RdtLaunchingPlugin.getUniqueIdentifier() + ".PROPERTY_VM_ARGUMENTS"; //$NON-NLS-1$
- public void defaultInterpreterInstallChanged(IInterpreter previous, IInterpreter current);
+ public void defaultInterpreterInstallChanged(IVMInstall previous, IVMInstall current);
public void interpreterChanged(PropertyChangeEvent event);
- public void interpreterAdded(IInterpreter newVm);
+ public void interpreterAdded(IVMInstall newVm);
- public void interpreterRemoved(IInterpreter removedVm);
+ public void interpreterRemoved(IVMInstall removedVm);
}
Modified: trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/launching/IInterpreterInstallType.java
===================================================================
--- trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/launching/IInterpreterInstallType.java 2007-01-18 15:41:21 UTC (rev 1791)
+++ trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/launching/IInterpreterInstallType.java 2007-01-18 15:43:49 UTC (rev 1792)
@@ -7,15 +7,15 @@
public interface IInterpreterInstallType {
- IInterpreter findInterpreterInstallByName(String vmName);
+ IVMInstall findInterpreterInstallByName(String vmName);
String getId();
- IInterpreter[] getInterpreterInstalls();
+ IVMInstall[] getInterpreterInstalls();
IStatus validateInstallLocation(File installLocation);
- IInterpreter findInterpreterInstall(String id);
+ IVMInstall findInterpreterInstall(String id);
IPath[] getDefaultLibraryLocations(File installLocation);
Modified: trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/launching/RubyRuntime.java
===================================================================
--- trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/launching/RubyRuntime.java 2007-01-18 15:41:21 UTC (rev 1791)
+++ trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/launching/RubyRuntime.java 2007-01-18 15:43:49 UTC (rev 1792)
@@ -103,8 +103,8 @@
*/
private static Set<String> fgContributedVMs = new HashSet<String>();
- protected List<IInterpreter> installedInterpreters;
- protected IInterpreter selectedInterpreter;
+ protected List<IVMInstall> installedInterpreters;
+ protected IVMInstall selectedInterpreter;
private static ListenerList fgVMListeners = new ListenerList(5);
protected RubyRuntime() {
@@ -122,26 +122,26 @@
fgVMListeners.remove(listener);
}
- public IInterpreter getSelectedInterpreter() {
+ public IVMInstall getSelectedInterpreter() {
if (selectedInterpreter == null) {
loadRuntimeConfiguration();
}
return selectedInterpreter;
}
- public IInterpreter getInterpreter(String name) {
+ public IVMInstall getInterpreter(String name) {
Iterator interpreters = getInstalledInterpreters().iterator();
while(interpreters.hasNext()) {
- IInterpreter each = (IInterpreter) interpreters.next();
+ IVMInstall each = (IVMInstall) interpreters.next();
if (each.getName().equals(name))
return each;
}
return getSelectedInterpreter();
}
- public void setSelectedInterpreter(IInterpreter anInterpreter) {
+ public void setSelectedInterpreter(IVMInstall anInterpreter) {
if (selectedInterpreter == anInterpreter) return;
- IInterpreter oldInterpreter = selectedInterpreter;
+ IVMInstall oldInterpreter = selectedInterpreter;
selectedInterpreter = anInterpreter;
saveRuntimeConfiguration();
Object[] listeners = fgVMListeners.getListeners();
@@ -151,7 +151,7 @@
}
}
- public void addInstalledInterpreter(IInterpreter anInterpreter) {
+ public void addInstalledInterpreter(IVMInstall anInterpreter) {
getInstalledInterpreters().add(anInterpreter);
if (getInstalledInterpreters().size() == 1)
setSelectedInterpreter(getInstalledInterpreters().get(0));
@@ -159,13 +159,13 @@
saveRuntimeConfiguration();
}
- public List<IInterpreter> getInstalledInterpreters() {
+ public List<IVMInstall> getInstalledInterpreters() {
if (installedInterpreters == null)
loadRuntimeConfiguration();
return installedInterpreters;
}
- public void setInstalledInterpreters(List<IInterpreter> newInstalledInterpreters) {
+ public void setInstalledInterpreters(List<IVMInstall> newInstalledInterpreters) {
installedInterpreters = newInstalledInterpreters;
if (installedInterpreters.size() > 0)
setSelectedInterpreter(installedInterpreters.get(0));
@@ -188,7 +188,7 @@
}
protected void loadRuntimeConfiguration() {
- installedInterpreters = new ArrayList<IInterpreter>();
+ installedInterpreters = new ArrayList<IVMInstall>();
try {
XMLReader reader = SAXParserFactory.newInstance().newSAXParser().getXMLReader();
reader.setContentHandler(getRuntimeConfigurationContentHandler());
@@ -213,7 +213,7 @@
protected void writeXML(Writer writer) {
try {
writer.write("<?xml version=\"1.0\" encoding=\"UTF-8\"?><runtimeconfig>");
- Iterator<IInterpreter> interpretersIterator = installedInterpreters.iterator();
+ Iterator<IVMInstall> interpretersIterator = installedInterpreters.iterator();
while (interpretersIterator.hasNext()) {
writer.write("<");
writer.write(TAG_INTERPRETER);
@@ -221,7 +221,7 @@
writer.write(ATTR_NAME);
writer.write("=\"");
- IInterpreter entry = interpretersIterator.next();
+ IVMInstall entry = interpretersIterator.next();
writer.write(entry.getName());
writer.write("\" ");
writer.write(ATTR_PATH);
@@ -254,7 +254,7 @@
if (TAG_INTERPRETER.equals(qName)) {
String interpreterName = atts.getValue(ATTR_NAME);
File installLocation = new File(atts.getValue(ATTR_PATH));
- IInterpreter interpreter = new RubyInterpreter(interpreterName, installLocation);
+ IVMInstall interpreter = new RubyInterpreter(interpreterName, installLocation);
installedInterpreters.add(interpreter);
if (atts.getValue(ATTR_SELECTED) != null)
selectedInterpreter = interpreter;
@@ -306,7 +306,7 @@
return fgInterpreterTypes;
}
- public static IInterpreter getDefaultInterpreterInstall() {
+ public static IVMInstall getDefaultInterpreterInstall() {
// TODO Auto-generated method stub
return null;
}
@@ -339,7 +339,7 @@
if (defId != null) {
Iterator iterator = vmDefs.getValidVMList().iterator();
while (iterator.hasNext()) {
- IInterpreter vm = (IInterpreter) iterator.next();
+ IVMInstall vm = (IVMInstall) iterator.next();
if (getCompositeIdFromVM(vm).equals(defId)) {
validDef = true;
break;
@@ -351,7 +351,7 @@
setPref = true;
List list = vmDefs.getValidVMList();
if (!list.isEmpty()) {
- IInterpreter vm = (IInterpreter) list.get(0);
+ IVMInstall vm = (IVMInstall) list.get(0);
vmDefs.setDefaultVMInstallCompositeID(getCompositeIdFromVM(vm));
}
}
@@ -380,7 +380,7 @@
IInterpreterInstallType[] installTypes = getInterpreterInstallTypes();
for (int i = 0; i < installTypes.length; i++) {
IInterpreterInstallType type = installTypes[i];
- IInterpreter[] installs = type.getInterpreterInstalls();
+ IVMInstall[] installs = type.getInterpreterInstalls();
for (int j = 0; j < installs.length; j++) {
fireInterpreterAdded(installs[j]);
}
@@ -489,7 +489,7 @@
*
* @since 2.1
*/
- public static String getCompositeIdFromVM(IInterpreter vm) {
+ public static String getCompositeIdFromVM(IVMInstall vm) {
if (vm == null) {
return null;
}
@@ -525,7 +525,7 @@
abort(MessageFormat.format("vmInstall {0} contributed by {1} references undefined VM install type {2}", //$NON-NLS-1$
(Object[]) new String[]{id, element.getContributor().getName(), vmType}), null);
}
- IInterpreter install = installType.findInterpreterInstall(id);
+ IVMInstall install = installType.findInterpreterInstall(id);
if (install == null) {
// only load/create if first time we've seen this VM install
String name = element.getAttribute("name"); //$NON-NLS-1$
@@ -627,7 +627,7 @@
throw new CoreException(new Status(IStatus.ERROR, RdtLaunchingPlugin.getUniqueIdentifier(), code, message, exception));
}
- private static void fireInterpreterAdded(IInterpreter interpreter) {
+ private static void fireInterpreterAdded(IVMInstall interpreter) {
// TODO Actually notify IInterpreterInstallChangedListeners
}
Modified: trunk/org.rubypeople.rdt.launching.tests/src/org/rubypeople/rdt/internal/launching/TC_RubyInterpreter.java
===================================================================
--- trunk/org.rubypeople.rdt.launching.tests/src/org/rubypeople/rdt/internal/launching/TC_RubyInterpreter.java 2007-01-18 15:41:21 UTC (rev 1791)
+++ trunk/org.rubypeople.rdt.launching.tests/src/org/rubypeople/rdt/internal/launching/TC_RubyInterpreter.java 2007-01-18 15:43:49 UTC (rev 1792)
@@ -9,7 +9,7 @@
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IStatus;
-import org.rubypeople.rdt.launching.IInterpreter;
+import org.rubypeople.rdt.launching.IVMInstall;
public class TC_RubyInterpreter extends TestCase {
@@ -17,11 +17,11 @@
private static final File WORKING_DIR = new File("/testDir");
public void testEquals() {
- IInterpreter interpreterOne = new RubyInterpreter("InterpreterOne", new File("/InterpreterOnePath"));
- IInterpreter similarInterpreterOne = new RubyInterpreter("InterpreterOne", new File("/InterpreterOnePath"));
+ IVMInstall interpreterOne = new RubyInterpreter("InterpreterOne", new File("/InterpreterOnePath"));
+ IVMInstall similarInterpreterOne = new RubyInterpreter("InterpreterOne", new File("/InterpreterOnePath"));
assertTrue("Interpreters should be equal.", interpreterOne.equals(similarInterpreterOne));
- IInterpreter interpreterTwo = new RubyInterpreter("InterpreterTwo", new File("/InterpreterTwoPath"));
+ IVMInstall interpreterTwo = new RubyInterpreter("InterpreterTwo", new File("/InterpreterTwoPath"));
assertTrue("Interpreters should not be equal.", !interpreterOne.equals(interpreterTwo));
}
Modified: trunk/org.rubypeople.rdt.launching.tests/src/org/rubypeople/rdt/internal/launching/TC_RubyRuntime.java
===================================================================
--- trunk/org.rubypeople.rdt.launching.tests/src/org/rubypeople/rdt/internal/launching/TC_RubyRuntime.java 2007-01-18 15:41:21 UTC (rev 1791)
+++ trunk/org.rubypeople.rdt.launching.tests/src/org/rubypeople/rdt/internal/launching/TC_RubyRuntime.java 2007-01-18 15:43:49 UTC (rev 1792)
@@ -30,7 +30,7 @@
import org.eclipse.core.runtime.QualifiedName;
import org.eclipse.core.runtime.content.IContentDescription;
import org.eclipse.core.runtime.jobs.ISchedulingRule;
-import org.rubypeople.rdt.launching.IInterpreter;
+import org.rubypeople.rdt.launching.IVMInstall;
import org.rubypeople.rdt.launching.RubyRuntime;
public class TC_RubyRuntime extends TestCase {
@@ -42,8 +42,8 @@
public void testGetInstalledInterpreters() {
ShamRubyRuntime runtime = new ShamRubyRuntime();
- IInterpreter interpreterOne = new RubyInterpreter("InterpreterOne", new File("C:/RubyInstallRootOne"));
- IInterpreter interpreterTwo = new RubyInterpreter("InterpreterTwo", new File("C:/RubyInstallRootTwo"));
+ IVMInstall interpreterOne = new RubyInterpreter("InterpreterOne", new File("C:/RubyInstallRootOne"));
+ IVMInstall interpreterTwo = new RubyInterpreter("InterpreterTwo", new File("C:/RubyInstallRootTwo"));
assertTrue("Runtime should contain all interpreters.", runtime.getInstalledInterpreters().containsAll(Arrays.asList(new Object[] { interpreterOne, interpreterTwo })));
assertTrue("interpreterTwo should be selected interpreter.", runtime.getSelectedInterpreter().equals(interpreterTwo));
@@ -52,12 +52,12 @@
ShamRubyRuntime runtime = new ShamRubyRuntime();
- IInterpreter interpreterOne = new RubyInterpreter("InterpreterOne", new File("C:\\RubyInstallRootOne"));
- runtime.setInstalledInterpreters(Arrays.asList(new IInterpreter[] { interpreterOne }));
+ IVMInstall interpreterOne = new RubyInterpreter("InterpreterOne", new File("C:\\RubyInstallRootOne"));
+ runtime.setInstalledInterpreters(Arrays.asList(new IVMInstall[] { interpreterOne }));
assertEquals("XML should indicate only one interpreter with it being the selected.", "<?xml version=\"1.0\" encoding=\"UTF-8\"?><runtimeconfig><interpreter name=\"InterpreterOne\" path=\"C:\\RubyInstallRootOne\" selected=\"true\"/></runtimeconfig>", runtimeConfigurationWriter.toString());
RubyInterpreter interpreterTwo = new RubyInterpreter("InterpreterTwo", new File("C:\\RubyInstallRootTwo"));
- runtime.setInstalledInterpreters(Arrays.asList(new IInterpreter[] { interpreterOne, interpreterTwo }));
+ runtime.setInstalledInterpreters(Arrays.asList(new IVMInstall[] { interpreterOne, interpreterTwo }));
assertEquals("XML should indicate both interpreters with the first one being selected.", "<?xml version=\"1.0\" encoding=\"UTF-8\"?><runtimeconfig><interpreter name=\"InterpreterOne\" path=\"C:\\RubyInstallRootOne\" selected=\"true\"/><interpreter name=\"InterpreterTwo\" path=\"C:\\RubyInstallRootTwo\"/></runtimeconfig>", runtimeConfigurationWriter.toString());
runtime.setSelectedInterpreter(interpreterTwo);
@@ -74,7 +74,7 @@
protected Writer getRuntimeConfigurationWriter() {
return runtimeConfigurationWriter;
}
- public void setInstalledInterpreters(List<IInterpreter> newInstalledInterpreters) {
+ public void setInstalledInterpreters(List<IVMInstall> newInstalledInterpreters) {
super.setInstalledInterpreters(newInstalledInterpreters);
}
Modified: trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/infoviews/RIView.java
===================================================================
--- trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/infoviews/RIView.java 2007-01-18 15:41:21 UTC (rev 1791)
+++ trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/infoviews/RIView.java 2007-01-18 15:43:49 UTC (rev 1792)
@@ -44,7 +44,7 @@
import org.rubypeople.rdt.internal.ui.RubyPluginImages;
import org.rubypeople.rdt.internal.ui.rdocexport.RDocUtility;
import org.rubypeople.rdt.internal.ui.rdocexport.RdocListener;
-import org.rubypeople.rdt.launching.IInterpreter;
+import org.rubypeople.rdt.launching.IVMInstall;
import org.rubypeople.rdt.launching.IInterpreterInstallChangedListener;
import org.rubypeople.rdt.launching.PropertyChangeEvent;
import org.rubypeople.rdt.launching.RubyRuntime;
@@ -138,18 +138,18 @@
form.setWeights(new int[]{1, 3});
runtimeListener = new IInterpreterInstallChangedListener() {
- public void defaultInterpreterInstallChanged(IInterpreter previous,
- IInterpreter current) {
+ public void defaultInterpreterInstallChanged(IVMInstall previous,
+ IVMInstall current) {
updatePage();
}
- public void interpreterAdded(IInterpreter newVm) {
+ public void interpreterAdded(IVMInstall newVm) {
}
public void interpreterChanged(PropertyChangeEvent event) {
}
- public void interpreterRemoved(IInterpreter removedVm) {
+ public void interpreterRemoved(IVMInstall removedVm) {
}
};
RubyRuntime.addInterpreterInstallChangedListener(runtimeListener);
@@ -183,7 +183,7 @@
}
private void updatePage() {
- IInterpreter interpreter = RubyRuntime.getDefault().getSelectedInterpreter();
+ IVMInstall interpreter = RubyRuntime.getDefault().getSelectedInterpreter();
if (interpreter != null) {
initSearchList();
if( riFound ){
Modified: trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/rdocexport/RDocUtility.java
===================================================================
--- trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/rdocexport/RDocUtility.java 2007-01-18 15:41:21 UTC (rev 1791)
+++ trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/rdocexport/RDocUtility.java 2007-01-18 15:43:49 UTC (rev 1792)
@@ -20,7 +20,7 @@
import org.rubypeople.rdt.internal.ui.RubyPlugin;
import org.rubypeople.rdt.internal.ui.RubyUIMessages;
import org.rubypeople.rdt.internal.ui.dialogs.StatusInfo;
-import org.rubypeople.rdt.launching.IInterpreter;
+import org.rubypeople.rdt.launching.IVMInstall;
import org.rubypeople.rdt.launching.RubyRuntime;
import org.rubypeople.rdt.ui.PreferenceConstants;
@@ -85,7 +85,7 @@
public final void invoke() {
log("Generating RDoc for " + resource.getName());
- IInterpreter interpreter = RubyRuntime.getDefault().getSelectedInterpreter();
+ IVMInstall interpreter = RubyRuntime.getDefault().getSelectedInterpreter();
if (interpreter == null) {
MessageDialog.openInformation(RubyPlugin.getActiveWorkbenchShell(), RdtLaunchingMessages.RdtLaunchingPlugin_noInterpreterSelectedTitle, RdtLaunchingMessages.RdtLaunchingPlugin_noInterpreterSelected);
return ;
Modified: trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/text/ruby/hover/RiDocHoverProvider.java
===================================================================
--- trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/text/ruby/hover/RiDocHoverProvider.java 2007-01-18 15:41:21 UTC (rev 1791)
+++ trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/text/ruby/hover/RiDocHoverProvider.java 2007-01-18 15:43:49 UTC (rev 1792)
@@ -14,7 +14,7 @@
import org.eclipse.jface.text.ITextViewer;
import org.eclipse.ui.IEditorInput;
import org.rubypeople.rdt.internal.ui.RubyPlugin;
-import org.rubypeople.rdt.launching.IInterpreter;
+import org.rubypeople.rdt.launching.IVMInstall;
import org.rubypeople.rdt.launching.RubyRuntime;
import org.rubypeople.rdt.ui.PreferenceConstants;
import org.rubypeople.rdt.ui.extensions.ITextHoverProvider;
@@ -34,7 +34,7 @@
try {
String symbol = textViewer.getDocument().get(hoverRegion.getOffset(), hoverRegion.getLength());
args.add(symbol);
- IInterpreter selectedInterpreter = RubyRuntime.getDefault().getSelectedInterpreter();
+ IVMInstall selectedInterpreter = RubyRuntime.getDefault().getSelectedInterpreter();
if (selectedInterpreter == null) return null;
Process p = selectedInterpreter.exec(args, null);
br = new BufferedReader(new InputStreamReader(p.getInputStream()));
Modified: trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/ui/PreferenceConstants.java
===================================================================
--- trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/ui/PreferenceConstants.java 2007-01-18 15:41:21 UTC (rev 1791)
+++ trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/ui/PreferenceConstants.java 2007-01-18 15:43:49 UTC (rev 1792)
@@ -7,7 +7,7 @@
import org.eclipse.swt.graphics.RGB;
import org.rubypeople.rdt.internal.ui.RubyPlugin;
import org.rubypeople.rdt.internal.ui.preferences.formatter.ProfileManager;
-import org.rubypeople.rdt.launching.IInterpreter;
+import org.rubypeople.rdt.launching.IVMInstall;
import org.rubypeople.rdt.launching.RubyRuntime;
public class PreferenceConstants {
@@ -653,7 +653,7 @@
}
private static String getDefaultPath(String programName) {
- IInterpreter interpreter = RubyRuntime.getDefault().getSelectedInterpreter();
+ IVMInstall interpreter = RubyRuntime.getDefault().getSelectedInterpreter();
if (interpreter == null) { return programName; }
File path = interpreter.getInstallLocation();
return path.getParent() + File.separator + programName;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
