Menu
▾
▴
[Rubyeclipse-commit] SF.net SVN: rubyeclipse: [1796] trunk
|
From: <caw...@us...> - 2007-01-18 15:54:41
|
Revision: 1796
http://svn.sourceforge.net/rubyeclipse/?rev=1796&view=rev
Author: cawilliams
Date: 2007-01-18 07:54:37 -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.ui/src/org/rubypeople/rdt/internal/debug/ui/preferences/EditInterpreterDialog.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/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/IVMInstall.java
trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/launching/RubyRuntime.java
Added Paths:
-----------
trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/launching/IVMInstallType.java
Removed Paths:
-------------
trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/launching/IInterpreterInstallType.java
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:52:20 UTC (rev 1795)
+++ trunk/org.rubypeople.rdt.debug.ui/src/org/rubypeople/rdt/internal/debug/ui/preferences/EditInterpreterDialog.java 2007-01-18 15:54:37 UTC (rev 1796)
@@ -33,7 +33,7 @@
import org.rubypeople.rdt.internal.ui.wizards.dialogfields.StringDialogField;
import org.rubypeople.rdt.launching.IVMInstall;
import org.rubypeople.rdt.launching.IVMInstall2;
-import org.rubypeople.rdt.launching.IInterpreterInstallType;
+import org.rubypeople.rdt.launching.IVMInstallType;
public class EditInterpreterDialog extends StatusDialog {
@@ -45,8 +45,8 @@
private StringDialogField fVMArgs;
- private IInterpreterInstallType fSelectedVMType;
- private IInterpreterInstallType[] fVMTypes;
+ private IVMInstallType fSelectedVMType;
+ private IVMInstallType[] fVMTypes;
private ComboDialogField fVMTypeCombo;
private IStatus[] fStati;
@@ -55,7 +55,7 @@
private IAddVMDialogRequestor fRequestor;
- public EditInterpreterDialog(IAddVMDialogRequestor requestor, Shell shell, IInterpreterInstallType[] vmInstallTypes, IVMInstall editedVM) {
+ public EditInterpreterDialog(IAddVMDialogRequestor requestor, Shell shell, IVMInstallType[] vmInstallTypes, IVMInstall editedVM) {
super(shell);
setShellStyle(getShellStyle() | SWT.RESIZE);
fRequestor= requestor;
@@ -116,7 +116,7 @@
selectVMType();
}
- private String createUniqueId(IInterpreterInstallType vmType) {
+ private String createUniqueId(IVMInstallType vmType) {
String id= null;
do {
id= String.valueOf(System.currentTimeMillis());
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:52:20 UTC (rev 1795)
+++ trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/internal/launching/RubyContainerInitializer.java 2007-01-18 15:54:37 UTC (rev 1796)
@@ -7,7 +7,7 @@
import org.rubypeople.rdt.core.LoadpathContainerInitializer;
import org.rubypeople.rdt.core.RubyCore;
import org.rubypeople.rdt.launching.IVMInstall;
-import org.rubypeople.rdt.launching.IInterpreterInstallType;
+import org.rubypeople.rdt.launching.IVMInstallType;
import org.rubypeople.rdt.launching.RubyRuntime;
public class RubyContainerInitializer extends LoadpathContainerInitializer {
@@ -41,7 +41,7 @@
// specific Ruby VM
String vmTypeId = getInterpreterTypeId(containerPath);
String vmName = getInterpreterName(containerPath);
- IInterpreterInstallType vmType = RubyRuntime
+ IVMInstallType vmType = RubyRuntime
.getInterpreterInstallType(vmTypeId);
if (vmType != null) {
vm = vmType.findVMInstallByName(vmName);
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:52:20 UTC (rev 1795)
+++ trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/internal/launching/RubyInterpreter.java 2007-01-18 15:54:37 UTC (rev 1796)
@@ -11,7 +11,7 @@
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
import org.rubypeople.rdt.launching.IVMInstall;
-import org.rubypeople.rdt.launching.IInterpreterInstallType;
+import org.rubypeople.rdt.launching.IVMInstallType;
import org.rubypeople.rdt.launching.IVMRunner;
public class RubyInterpreter implements IVMInstall {
@@ -101,7 +101,7 @@
return null;
}
- public IInterpreterInstallType getVMInstallType() {
+ public IVMInstallType getVMInstallType() {
// TODO Auto-generated method stub
return null;
}
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:52:20 UTC (rev 1795)
+++ trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/internal/launching/VMDefinitionsContainer.java 2007-01-18 15:54:37 UTC (rev 1796)
@@ -31,7 +31,7 @@
import org.eclipse.core.runtime.Path;
import org.rubypeople.rdt.launching.IVMInstall;
import org.rubypeople.rdt.launching.IVMInstall2;
-import org.rubypeople.rdt.launching.IInterpreterInstallType;
+import org.rubypeople.rdt.launching.IVMInstallType;
import org.rubypeople.rdt.launching.RubyRuntime;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -107,7 +107,7 @@
*/
public void addVM(IVMInstall vm) {
if (!fVMList.contains(vm)) {
- IInterpreterInstallType vmInstallType = vm.getVMInstallType();
+ IVMInstallType vmInstallType = vm.getVMInstallType();
List vmList = (List) fVMTypeToVMMap.get(vmInstallType);
if (vmList == null) {
vmList = new ArrayList(3);
@@ -252,7 +252,7 @@
Set vmInstallTypeSet = getVMTypeToVMMap().keySet();
Iterator keyIterator = vmInstallTypeSet.iterator();
while (keyIterator.hasNext()) {
- IInterpreterInstallType vmInstallType = (IInterpreterInstallType) keyIterator.next();
+ IVMInstallType vmInstallType = (IVMInstallType) keyIterator.next();
Element vmTypeElement = vmTypeAsElement(doc, vmInstallType);
config.appendChild(vmTypeElement);
}
@@ -264,7 +264,7 @@
/**
* Create and return a node for the specified VM install type in the specified Document.
*/
- private Element vmTypeAsElement(Document doc, IInterpreterInstallType vmType) {
+ private Element vmTypeAsElement(Document doc, IVMInstallType vmType) {
// Create a node for the vm type and set its 'id' attribute
Element element= doc.createElement("vmType"); //$NON-NLS-1$
@@ -422,7 +422,7 @@
// Retrieve the 'id' attribute and the corresponding VM type object
String id = vmTypeElement.getAttribute("id"); //$NON-NLS-1$
- IInterpreterInstallType vmType= RubyRuntime.getInterpreterInstallType(id);
+ IVMInstallType vmType= RubyRuntime.getInterpreterInstallType(id);
if (vmType != null) {
// For each VM child node, populate the container with a subordinate node
@@ -446,7 +446,7 @@
* Parse the specified VM node, create a VMStandin for it, and add this to the
* specified container.
*/
- private static void populateVMForType(IInterpreterInstallType vmType, Element vmElement, VMDefinitionsContainer container) {
+ private static void populateVMForType(IVMInstallType vmType, Element vmElement, VMDefinitionsContainer container) {
String id= vmElement.getAttribute("id"); //$NON-NLS-1$
if (id != null) {
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:52:20 UTC (rev 1795)
+++ trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/internal/launching/VMStandin.java 2007-01-18 15:54:37 UTC (rev 1796)
@@ -6,12 +6,12 @@
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
import org.rubypeople.rdt.launching.IVMInstall;
-import org.rubypeople.rdt.launching.IInterpreterInstallType;
+import org.rubypeople.rdt.launching.IVMInstallType;
import org.rubypeople.rdt.launching.IVMRunner;
public class VMStandin implements IVMInstall {
- public VMStandin(IInterpreterInstallType vmType, String id) {
+ public VMStandin(IVMInstallType vmType, String id) {
// TODO Auto-generated constructor stub
}
@@ -36,7 +36,7 @@
return null;
}
- public IInterpreterInstallType getVMInstallType() {
+ public IVMInstallType getVMInstallType() {
// TODO Auto-generated method stub
return null;
}
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:52:20 UTC (rev 1795)
+++ trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/launching/AbstractInterpreter.java 2007-01-18 15:54:37 UTC (rev 1796)
@@ -27,7 +27,7 @@
*/
public abstract class AbstractInterpreter implements IVMInstall, IVMInstall2 {
- private IInterpreterInstallType fType;
+ private IVMInstallType fType;
private String fId;
private String fName;
private File fInstallLocation;
@@ -49,7 +49,7 @@
* @throws IllegalArgumentException if any of the required
* parameters are <code>null</code>.
*/
- public AbstractInterpreter(IInterpreterInstallType type, String id) {
+ public AbstractInterpreter(IVMInstallType type, String id) {
if (type == null)
throw new IllegalArgumentException(RdtLaunchingMessages.vmInstall_assert_typeNotNull);
if (id == null)
@@ -114,7 +114,7 @@
* Subclasses should not override this method.
* @see IInterpreterInstall#getInterpreterInstallType()
*/
- public IInterpreterInstallType getVMInstallType() {
+ public IVMInstallType getVMInstallType() {
return fType;
}
Deleted: 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:52:20 UTC (rev 1795)
+++ trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/launching/IInterpreterInstallType.java 2007-01-18 15:54:37 UTC (rev 1796)
@@ -1,24 +0,0 @@
-package org.rubypeople.rdt.launching;
-
-import java.io.File;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-
-public interface IInterpreterInstallType {
-
- IVMInstall findVMInstallByName(String vmName);
-
- String getId();
-
- IVMInstall[] getVMInstalls();
-
- IStatus validateInstallLocation(File installLocation);
-
- IVMInstall findVMInstall(String id);
-
- IPath[] getDefaultLibraryLocations(File installLocation);
-
- String getName();
-
-}
Modified: trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/launching/IVMInstall.java
===================================================================
--- trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/launching/IVMInstall.java 2007-01-18 15:52:20 UTC (rev 1795)
+++ trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/launching/IVMInstall.java 2007-01-18 15:54:37 UTC (rev 1796)
@@ -39,7 +39,7 @@
public String getId();
- public IInterpreterInstallType getVMInstallType();
+ public IVMInstallType getVMInstallType();
public void setLibraryLocations(IPath[] paths);
Added: trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/launching/IVMInstallType.java
===================================================================
--- trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/launching/IVMInstallType.java (rev 0)
+++ trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/launching/IVMInstallType.java 2007-01-18 15:54:37 UTC (rev 1796)
@@ -0,0 +1,24 @@
+package org.rubypeople.rdt.launching;
+
+import java.io.File;
+
+import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.IStatus;
+
+public interface IVMInstallType {
+
+ IVMInstall findVMInstallByName(String vmName);
+
+ String getId();
+
+ IVMInstall[] getVMInstalls();
+
+ IStatus validateInstallLocation(File installLocation);
+
+ IVMInstall findVMInstall(String id);
+
+ IPath[] getDefaultLibraryLocations(File installLocation);
+
+ String getName();
+
+}
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:52:20 UTC (rev 1795)
+++ trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/launching/RubyRuntime.java 2007-01-18 15:54:37 UTC (rev 1796)
@@ -90,7 +90,7 @@
*/
public static final String EXTENSION_POINT_VM_INSTALLS = "vmInstalls"; //$NON-NLS-1$
- private static IInterpreterInstallType[] fgInterpreterTypes= null;
+ private static IVMInstallType[] fgInterpreterTypes= null;
protected static RubyRuntime runtime;
private static Object fgVMLock = new Object();
@@ -284,8 +284,8 @@
* @return The VM install type for the given id, or <code>null</code> if no
* VM install type with the given id is registered.
*/
- public static IInterpreterInstallType getInterpreterInstallType(String id) {
- IInterpreterInstallType[] vmTypes= getInterpreterInstallTypes();
+ public static IVMInstallType getInterpreterInstallType(String id) {
+ IVMInstallType[] vmTypes= getInterpreterInstallTypes();
for (int i= 0; i < vmTypes.length; i++) {
if (vmTypes[i].getId().equals(id)) {
return vmTypes[i];
@@ -301,7 +301,7 @@
*
* @return the list of registered VM types
*/
- public static IInterpreterInstallType[] getInterpreterInstallTypes() {
+ public static IVMInstallType[] getInterpreterInstallTypes() {
initializeInterpreters();
return fgInterpreterTypes;
}
@@ -377,9 +377,9 @@
}
if (vmDefs != null) {
// notify of initial VMs for backwards compatibility
- IInterpreterInstallType[] installTypes = getInterpreterInstallTypes();
+ IVMInstallType[] installTypes = getInterpreterInstallTypes();
for (int i = 0; i < installTypes.length; i++) {
- IInterpreterInstallType type = installTypes[i];
+ IVMInstallType type = installTypes[i];
IVMInstall[] installs = type.getVMInstalls();
for (int j = 0; j < installs.length; j++) {
fireInterpreterAdded(installs[j]);
@@ -410,11 +410,11 @@
IExtensionPoint extensionPoint= Platform.getExtensionRegistry().getExtensionPoint(RdtLaunchingPlugin.PLUGIN_ID, "vmInstallTypes"); //$NON-NLS-1$
IConfigurationElement[] configs= extensionPoint.getConfigurationElements();
MultiStatus status= new MultiStatus(RdtLaunchingPlugin.getUniqueIdentifier(), IStatus.OK, RdtLaunchingMessages.RubyRuntime_exceptionOccurred, null);
- fgInterpreterTypes= new IInterpreterInstallType[configs.length];
+ fgInterpreterTypes= new IVMInstallType[configs.length];
for (int i= 0; i < configs.length; i++) {
try {
- IInterpreterInstallType vmType= (IInterpreterInstallType)configs[i].createExecutableExtension("class"); //$NON-NLS-1$
+ IVMInstallType vmType= (IVMInstallType)configs[i].createExecutableExtension("class"); //$NON-NLS-1$
fgInterpreterTypes[i]= vmType;
} catch (CoreException e) {
status.add(e.getStatus());
@@ -424,12 +424,12 @@
//only happens on a CoreException
RdtLaunchingPlugin.log(status);
//cleanup null entries in fgVMTypes
- List<IInterpreterInstallType> temp= new ArrayList<IInterpreterInstallType>(fgInterpreterTypes.length);
+ List<IVMInstallType> temp= new ArrayList<IVMInstallType>(fgInterpreterTypes.length);
for (int i = 0; i < fgInterpreterTypes.length; i++) {
if(fgInterpreterTypes[i] != null) {
temp.add(fgInterpreterTypes[i]);
}
- fgInterpreterTypes= new IInterpreterInstallType[temp.size()];
+ fgInterpreterTypes= new IVMInstallType[temp.size()];
fgInterpreterTypes= temp.toArray(fgInterpreterTypes);
}
}
@@ -493,7 +493,7 @@
if (vm == null) {
return null;
}
- IInterpreterInstallType vmType= vm.getVMInstallType();
+ IVMInstallType vmType= vm.getVMInstallType();
String typeID= vmType.getId();
CompositeId id= new CompositeId(new String[] { typeID, vm.getId() });
return id.toString();
@@ -520,7 +520,7 @@
abort(MessageFormat.format("Missing required id attribute for vmInstall contributed by {0}", //$NON-NLS-1$
(Object[]) new String[]{element.getContributor().getName()}), null);
}
- IInterpreterInstallType installType = getInterpreterInstallType(vmType);
+ IVMInstallType installType = getInterpreterInstallType(vmType);
if (installType == null) {
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);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
