Menu
▾
▴
[Rubyeclipse-commit] SF.net SVN: rubyeclipse: [1794] trunk
|
From: <caw...@us...> - 2007-01-18 15:50:57
|
Revision: 1794
http://svn.sourceforge.net/rubyeclipse/?rev=1794&view=rev
Author: cawilliams
Date: 2007-01-18 07:50:52 -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/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/IVMInstall2.java
trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/launching/RubyRuntime.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:48:30 UTC (rev 1793)
+++ trunk/org.rubypeople.rdt.debug.ui/src/org/rubypeople/rdt/internal/debug/ui/preferences/EditInterpreterDialog.java 2007-01-18 15:50:52 UTC (rev 1794)
@@ -65,7 +65,7 @@
}
fVMTypes= vmInstallTypes;
- fSelectedVMType= editedVM != null ? editedVM.getInterpreterInstallType() : vmInstallTypes[0];
+ fSelectedVMType= editedVM != null ? editedVM.getVMInstallType() : vmInstallTypes[0];
fEditedVM= editedVM;
}
@@ -223,7 +223,7 @@
fVMArgs.setText(vmArgs);
}
} else {
- String[] vmArgs = fEditedVM.getInterpreterArguments();
+ String[] vmArgs = fEditedVM.getVMArguments();
if (vmArgs != null) {
StringBuffer buffer = new StringBuffer();
int length= vmArgs.length;
@@ -326,15 +326,15 @@
if (vm instanceof IVMInstall2) {
IVMInstall2 vm2 = (IVMInstall2) vm;
if (argString != null && argString.length() >0) {
- vm2.setInterpreterArgs(argString);
+ vm2.setVMArgs(argString);
} else {
- vm2.setInterpreterArgs(null);
+ vm2.setVMArgs(null);
}
} else {
if (argString != null && argString.length() >0) {
- vm.setInterpreterArguments(DebugPlugin.parseArguments(argString));
+ vm.setVMArguments(DebugPlugin.parseArguments(argString));
} else {
- vm.setInterpreterArguments(null);
+ vm.setVMArguments(null);
}
}
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:48:30 UTC (rev 1793)
+++ trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/internal/launching/RubyInterpreter.java 2007-01-18 15:50:52 UTC (rev 1794)
@@ -96,17 +96,17 @@
return null;
}
- public String[] getInterpreterArguments() {
+ public String[] getVMArguments() {
// TODO Auto-generated method stub
return null;
}
- public IInterpreterInstallType getInterpreterInstallType() {
+ public IInterpreterInstallType getVMInstallType() {
// TODO Auto-generated method stub
return null;
}
- public IVMRunner getInterpreterRunner(String mode) {
+ public IVMRunner getVMRunner(String mode) {
// TODO Auto-generated method stub
return null;
}
@@ -120,7 +120,7 @@
this.installLocation = validInstallLocation;
}
- public void setInterpreterArguments(String[] vmArgs) {
+ public void setVMArguments(String[] vmArgs) {
// TODO Auto-generated method stub
}
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:48:30 UTC (rev 1793)
+++ trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/internal/launching/VMDefinitionsContainer.java 2007-01-18 15:50:52 UTC (rev 1794)
@@ -107,7 +107,7 @@
*/
public void addVM(IVMInstall vm) {
if (!fVMList.contains(vm)) {
- IInterpreterInstallType vmInstallType = vm.getInterpreterInstallType();
+ IInterpreterInstallType vmInstallType = vm.getVMInstallType();
List vmList = (List) fVMTypeToVMMap.get(vmInstallType);
if (vmList == null) {
vmList = new ArrayList(3);
@@ -313,7 +313,7 @@
element.setAttribute("vmargs", vmArgs); //$NON-NLS-1$
}
} else {
- String[] vmArgs = vm.getInterpreterArguments();
+ String[] vmArgs = vm.getVMArguments();
if (vmArgs != null && vmArgs.length > 0) {
StringBuffer buffer = new StringBuffer();
for (int i = 0; i < vmArgs.length; i++) {
@@ -532,7 +532,7 @@
public void removeVM(IVMInstall vm) {
fVMList.remove(vm);
fInvalidVMList.remove(vm);
- List list = (List) fVMTypeToVMMap.get(vm.getInterpreterInstallType());
+ List list = (List) fVMTypeToVMMap.get(vm.getVMInstallType());
if (list != null) {
list.remove(vm);
}
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:48:30 UTC (rev 1793)
+++ trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/internal/launching/VMStandin.java 2007-01-18 15:50:52 UTC (rev 1794)
@@ -36,7 +36,7 @@
return null;
}
- public IInterpreterInstallType getInterpreterInstallType() {
+ public IInterpreterInstallType getVMInstallType() {
// TODO Auto-generated method stub
return null;
}
@@ -51,7 +51,7 @@
return null;
}
- public String[] getInterpreterArguments() {
+ public String[] getVMArguments() {
// TODO Auto-generated method stub
return null;
}
@@ -76,12 +76,12 @@
}
- public IVMRunner getInterpreterRunner(String mode) {
+ public IVMRunner getVMRunner(String mode) {
// TODO Auto-generated method stub
return null;
}
- public void setInterpreterArguments(String[] vmArgs) {
+ public void setVMArguments(String[] vmArgs) {
// TODO Auto-generated method 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:48:30 UTC (rev 1793)
+++ trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/launching/AbstractInterpreter.java 2007-01-18 15:50:52 UTC (rev 1794)
@@ -114,14 +114,14 @@
* Subclasses should not override this method.
* @see IInterpreterInstall#getInterpreterInstallType()
*/
- public IInterpreterInstallType getInterpreterInstallType() {
+ public IInterpreterInstallType getVMInstallType() {
return fType;
}
/* (non-Rubydoc)
* @see IInterpreter#getInterpreterRunner(String)
*/
- public IVMRunner getInterpreterRunner(String mode) {
+ public IVMRunner getVMRunner(String mode) {
return null;
}
@@ -141,11 +141,11 @@
}
IPath[] newLocations = locations;
if (newLocations == null) {
- newLocations = getInterpreterInstallType().getDefaultLibraryLocations(getInstallLocation());
+ newLocations = getVMInstallType().getDefaultLibraryLocations(getInstallLocation());
}
IPath[] prevLocations = fSystemLibraryDescriptions;
if (prevLocations == null) {
- prevLocations = getInterpreterInstallType().getDefaultLibraryLocations(getInstallLocation());
+ prevLocations = getVMInstallType().getDefaultLibraryLocations(getInstallLocation());
}
if (newLocations.length == prevLocations.length) {
@@ -185,7 +185,7 @@
public boolean equals(Object object) {
if (object instanceof IVMInstall) {
IVMInstall vm = (IVMInstall)object;
- return getInterpreterInstallType().equals(vm.getInterpreterInstallType()) &&
+ return getVMInstallType().equals(vm.getVMInstallType()) &&
getId().equals(vm.getId());
}
return false;
@@ -196,14 +196,14 @@
* @since 2.1
*/
public int hashCode() {
- return getInterpreterInstallType().hashCode() + getId().hashCode();
+ return getVMInstallType().hashCode() + getId().hashCode();
}
/* (non-Rubydoc)
* @see org.rubypeople.rdt.launching.IInterpreter#getDefaultInterpreterArguments()
* @since 3.0
*/
- public String[] getInterpreterArguments() {
+ public String[] getVMArguments() {
String args = getInterpreterArgs();
if (args == null) {
return null;
@@ -216,9 +216,9 @@
* @see org.rubypeople.rdt.launching.IInterpreter#setDefaultInterpreterArguments(java.lang.String[])
* @since 3.0
*/
- public void setInterpreterArguments(String[] vmArgs) {
+ public void setVMArguments(String[] vmArgs) {
if (vmArgs == null) {
- setInterpreterArgs(null);
+ setVMArgs(null);
} else {
StringBuffer buf = new StringBuffer();
for (int i = 0; i < vmArgs.length; i++) {
@@ -226,7 +226,7 @@
buf.append(string);
buf.append(" "); //$NON-NLS-1$
}
- setInterpreterArgs(buf.toString().trim());
+ setVMArgs(buf.toString().trim());
}
}
@@ -240,7 +240,7 @@
/* (non-Rubydoc)
* @see org.rubypeople.rdt.launching.IInterpreter2#setInterpreterArgs(java.lang.String)
*/
- public void setInterpreterArgs(String vmArgs) {
+ public void setVMArgs(String vmArgs) {
if (fInterpreterArgs == null) {
if (vmArgs == null) {
// No change
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:48:30 UTC (rev 1793)
+++ trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/launching/IVMInstall.java 2007-01-18 15:50:52 UTC (rev 1794)
@@ -17,21 +17,35 @@
public void setName(String newName);
+ /**
+ *
+ * @return
+ * @throws IllegalCommandException
+ * @deprecated
+ */
public String getCommand() throws IllegalCommandException;
+ /**
+ *
+ * @param commandLine
+ * @param workingDirectory
+ * @return
+ * @throws CoreException
+ * @deprecated This doesn't match JDT behavior. We'll need to work on a better solution.
+ */
public Process exec(List commandLine, File workingDirectory) throws CoreException;
public IPath[] getLibraryLocations();
public String getId();
- public IInterpreterInstallType getInterpreterInstallType();
+ public IInterpreterInstallType getVMInstallType();
public void setLibraryLocations(IPath[] paths);
- public String[] getInterpreterArguments();
+ public String[] getVMArguments();
- public void setInterpreterArguments(String[] vmArgs);
+ public void setVMArguments(String[] vmArgs);
- public IVMRunner getInterpreterRunner(String mode);
+ public IVMRunner getVMRunner(String mode);
}
\ No newline at end of file
Modified: trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/launching/IVMInstall2.java
===================================================================
--- trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/launching/IVMInstall2.java 2007-01-18 15:48:30 UTC (rev 1793)
+++ trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/launching/IVMInstall2.java 2007-01-18 15:50:52 UTC (rev 1794)
@@ -6,6 +6,6 @@
public String getRubyVersion();
- public void setInterpreterArgs(String vmArgs);
+ public void setVMArgs(String vmArgs);
}
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:48:30 UTC (rev 1793)
+++ trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/launching/RubyRuntime.java 2007-01-18 15:50:52 UTC (rev 1794)
@@ -493,7 +493,7 @@
if (vm == null) {
return null;
}
- IInterpreterInstallType vmType= vm.getInterpreterInstallType();
+ IInterpreterInstallType vmType= vm.getVMInstallType();
String typeID= vmType.getId();
CompositeId id= new CompositeId(new String[] { typeID, vm.getId() });
return id.toString();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
