Menu
▾
▴
[Rubyeclipse-commit] SF.net SVN: rubyeclipse: [1799] trunk
|
From: <caw...@us...> - 2007-01-18 16:03:46
|
Revision: 1799
http://svn.sourceforge.net/rubyeclipse/?rev=1799&view=rev
Author: cawilliams
Date: 2007-01-18 08:03:38 -0800 (Thu, 18 Jan 2007)
Log Message:
-----------
Strip off Rdt prefix on our plugin name (makes it easier when we're dealing with modifying JDT code, and Rdt is sort of redundant)
Modified Paths:
--------------
trunk/org.rubypeople.rdt.debug.core.tests/src/org/rubypeople/rdt/debug/core/tests/FTC_ClassicDebuggerCommunicationTest.java
trunk/org.rubypeople.rdt.debug.core.tests/src/org/rubypeople/rdt/debug/core/tests/FTC_RubyDebugCommunicationTest.java
trunk/org.rubypeople.rdt.launching/plugin.xml
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/RubyApplicationLaunchConfigurationDelegate.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/RubyLaunchConfigurationAttribute.java
trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/internal/launching/VMDefinitionsContainer.java
trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/launching/AbstractInterpreter.java
trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/launching/IVMInstallChangedListener.java
trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/launching/RubyRuntime.java
trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/preferences/DebuggerPreferencePage.java
Added Paths:
-----------
trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/internal/launching/LaunchingPlugin.java
Removed Paths:
-------------
trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/internal/launching/RdtLaunchingPlugin.java
Modified: trunk/org.rubypeople.rdt.debug.core.tests/src/org/rubypeople/rdt/debug/core/tests/FTC_ClassicDebuggerCommunicationTest.java
===================================================================
--- trunk/org.rubypeople.rdt.debug.core.tests/src/org/rubypeople/rdt/debug/core/tests/FTC_ClassicDebuggerCommunicationTest.java 2007-01-18 15:56:16 UTC (rev 1798)
+++ trunk/org.rubypeople.rdt.debug.core.tests/src/org/rubypeople/rdt/debug/core/tests/FTC_ClassicDebuggerCommunicationTest.java 2007-01-18 16:03:38 UTC (rev 1799)
@@ -7,7 +7,7 @@
import org.rubypeople.rdt.internal.debug.core.model.RubyVariable;
import org.rubypeople.rdt.internal.debug.core.model.ThreadInfo;
import org.rubypeople.rdt.internal.debug.core.parsing.LoadResultReader;
-import org.rubypeople.rdt.internal.launching.RdtLaunchingPlugin;
+import org.rubypeople.rdt.internal.launching.LaunchingPlugin;
public class FTC_ClassicDebuggerCommunicationTest extends
FTC_AbstractDebuggerCommunicationTest {
@@ -82,9 +82,9 @@
private String createIncludeDir() {
String includeDir;
- if (RdtLaunchingPlugin.getDefault() != null) {
+ if (LaunchingPlugin.getDefault() != null) {
// being run as JUnit Plug-in Test, Eclipse is running
- includeDir = RubyCore.getOSDirectory(RdtLaunchingPlugin.getDefault()) + "ruby" ;
+ includeDir = RubyCore.getOSDirectory(LaunchingPlugin.getDefault()) + "ruby" ;
}
else {
// being run as "pure" JUnit Test without Eclipse running
Modified: trunk/org.rubypeople.rdt.debug.core.tests/src/org/rubypeople/rdt/debug/core/tests/FTC_RubyDebugCommunicationTest.java
===================================================================
--- trunk/org.rubypeople.rdt.debug.core.tests/src/org/rubypeople/rdt/debug/core/tests/FTC_RubyDebugCommunicationTest.java 2007-01-18 15:56:16 UTC (rev 1798)
+++ trunk/org.rubypeople.rdt.debug.core.tests/src/org/rubypeople/rdt/debug/core/tests/FTC_RubyDebugCommunicationTest.java 2007-01-18 16:03:38 UTC (rev 1799)
@@ -3,7 +3,7 @@
import org.rubypeople.rdt.core.RubyCore;
import org.rubypeople.rdt.internal.debug.core.SuspensionPoint;
import org.rubypeople.rdt.internal.launching.DebuggerRunner;
-import org.rubypeople.rdt.internal.launching.RdtLaunchingPlugin;
+import org.rubypeople.rdt.internal.launching.LaunchingPlugin;
public class FTC_RubyDebugCommunicationTest extends FTC_ClassicDebuggerCommunicationTest {
@@ -86,7 +86,7 @@
if (RubyCore.getPlugin() != null) {
result = DebuggerRunner.getDirectoryOfRubyDebuggerFile();
} else {
- result = RdtLaunchingPlugin.class.getResource(".").getPath() + "/../../../../../../ruby";
+ result = LaunchingPlugin.class.getResource(".").getPath() + "/../../../../../../ruby";
}
return result;
}
Modified: trunk/org.rubypeople.rdt.launching/plugin.xml
===================================================================
--- trunk/org.rubypeople.rdt.launching/plugin.xml 2007-01-18 15:56:16 UTC (rev 1798)
+++ trunk/org.rubypeople.rdt.launching/plugin.xml 2007-01-18 16:03:38 UTC (rev 1799)
@@ -5,7 +5,7 @@
name="%Plugin.name"
version="0.0.0"
provider-name="RubyPeople, Inc."
- class="org.rubypeople.rdt.internal.launching.RdtLaunchingPlugin">
+ class="org.rubypeople.rdt.internal.launching.LaunchingPlugin">
<runtime>
<library name="launching.jar">
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:56:16 UTC (rev 1798)
+++ trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/internal/launching/DebuggerRunner.java 2007-01-18 16:03:38 UTC (rev 1799)
@@ -34,11 +34,11 @@
proxy.start();
launch.addDebugTarget(debugTarget);
} catch (Exception e) {
- RdtLaunchingPlugin.log(new Status(IStatus.ERROR, RdtLaunchingPlugin.PLUGIN_ID, IStatus.ERROR, e.getMessage(), e));
+ LaunchingPlugin.log(new Status(IStatus.ERROR, LaunchingPlugin.PLUGIN_ID, IStatus.ERROR, e.getMessage(), e));
debugTarget.terminate();
}
} else {
- RdtLaunchingPlugin.log(new Status(IStatus.ERROR, RdtLaunchingPlugin.PLUGIN_ID, IStatus.ERROR, RdtLaunchingMessages.RdtLaunchingPlugin_processTerminatedBecauseNoDebuggerConnection, null));
+ LaunchingPlugin.log(new Status(IStatus.ERROR, LaunchingPlugin.PLUGIN_ID, IStatus.ERROR, RdtLaunchingMessages.RdtLaunchingPlugin_processTerminatedBecauseNoDebuggerConnection, null));
debugTarget.terminate();
}
return process;
@@ -68,20 +68,20 @@
commandLine.add("-reclipseDebug");
}
commandLine.add("-I");
- commandLine.add(RdtLaunchingPlugin.osDependentPath(DebuggerRunner.getDirectoryOfRubyDebuggerFile().replace('/', File.separatorChar)));
+ commandLine.add(LaunchingPlugin.osDependentPath(DebuggerRunner.getDirectoryOfRubyDebuggerFile().replace('/', File.separatorChar)));
}
}
public static String getDirectoryOfRubyDebuggerFile() {
- return RubyCore.getOSDirectory(RdtLaunchingPlugin.getDefault()) + "ruby";
+ return RubyCore.getOSDirectory(LaunchingPlugin.getDefault()) + "ruby";
}
public boolean isUseRubyDebug() {
- return RdtLaunchingPlugin.getDefault().getPluginPreferences().getBoolean(PreferenceConstants.USE_RUBY_DEBUG);
+ return LaunchingPlugin.getDefault().getPluginPreferences().getBoolean(PreferenceConstants.USE_RUBY_DEBUG);
}
public boolean isDebuggerVerbose() {
- return RdtLaunchingPlugin.getDefault().getPluginPreferences().getBoolean(PreferenceConstants.VERBOSE_DEBUGGER);
+ return LaunchingPlugin.getDefault().getPluginPreferences().getBoolean(PreferenceConstants.VERBOSE_DEBUGGER);
}
protected IVMInstall convertInterpreter(IVMInstall rubyInterpreter) {
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:56:16 UTC (rev 1798)
+++ trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/internal/launching/InterpreterRunner.java 2007-01-18 16:03:38 UTC (rev 1799)
@@ -25,7 +25,7 @@
Map defaultAttributes = new HashMap();
defaultAttributes.put(IProcess.ATTR_PROCESS_TYPE, "ruby");
IProcess process = DebugPlugin.newProcess(launch, nativeRubyProcess, renderLabel(configuration), defaultAttributes);
- process.setAttribute(RdtLaunchingPlugin.PLUGIN_ID + ".launcher.cmdline", commandLine.toString());
+ process.setAttribute(LaunchingPlugin.PLUGIN_ID + ".launcher.cmdline", commandLine.toString());
return process ;
}
@@ -56,7 +56,7 @@
commandLine.addAll(configuration.renderLoadPath());
commandLine.addAll(ArgumentSplitter.split(configuration.getInterpreterArguments()));
commandLine.add(RubyInterpreter.END_OF_OPTIONS_DELIMITER);
- commandLine.add(RdtLaunchingPlugin.osDependentPath(configuration.getAbsoluteFileName()));
+ commandLine.add(LaunchingPlugin.osDependentPath(configuration.getAbsoluteFileName()));
commandLine.addAll(ArgumentSplitter.split(configuration.getProgramArguments()));
return commandLine;
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:56:16 UTC (rev 1798)
+++ trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/internal/launching/InterpreterRunnerConfiguration.java 2007-01-18 16:03:38 UTC (rev 1799)
@@ -53,12 +53,12 @@
try {
projectName = configuration.getAttribute(RubyLaunchConfigurationAttribute.PROJECT_NAME, "");
} catch(CoreException e) {
- RdtLaunchingPlugin.log(e);
+ LaunchingPlugin.log(e);
}
RubyProject rubyProject = new RubyProject();
if (projectName.length() > 0 ) {
- IProject project = RdtLaunchingPlugin.getWorkspace().getRoot().getProject(projectName);
+ IProject project = LaunchingPlugin.getWorkspace().getRoot().getProject(projectName);
rubyProject.setProject(project);
}
@@ -70,7 +70,7 @@
try {
file = configuration.getAttribute(RubyLaunchConfigurationAttribute.WORKING_DIRECTORY, "");
} catch(CoreException e) {
- RdtLaunchingPlugin.log(e);
+ LaunchingPlugin.log(e);
}
// it is valid not to specify a working directroy by returning null
// whereas new File("") would specify an invalid directory
@@ -111,7 +111,7 @@
private void addToLoadPath(List<String> loadPath, String pathDirectory) {
loadPath.add("-I");
- loadPath.add(RdtLaunchingPlugin.osDependentPath(pathDirectory));
+ loadPath.add(LaunchingPlugin.osDependentPath(pathDirectory));
}
protected List<String> renderLoadPath() {
Added: trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/internal/launching/LaunchingPlugin.java
===================================================================
--- trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/internal/launching/LaunchingPlugin.java (rev 0)
+++ trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/internal/launching/LaunchingPlugin.java 2007-01-18 16:03:38 UTC (rev 1799)
@@ -0,0 +1,149 @@
+package org.rubypeople.rdt.internal.launching;
+
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.IOException;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.FactoryConfigurationError;
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.transform.OutputKeys;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamResult;
+
+import org.eclipse.core.resources.IWorkspace;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Platform;
+import org.eclipse.core.runtime.Plugin;
+import org.eclipse.core.runtime.Status;
+import org.osgi.framework.BundleContext;
+import org.rubypeople.rdt.core.RubyCore;
+import org.w3c.dom.Document;
+import org.xml.sax.helpers.DefaultHandler;
+
+public class LaunchingPlugin extends Plugin {
+ public static final String PLUGIN_ID = "org.rubypeople.rdt.launching"; //$NON-NLS-1$
+ public static String osDependentPath(String aPath) {
+ if (Platform.getOS().equals(Platform.OS_WIN32)) {
+ if (aPath.startsWith(File.separator)) {
+ aPath = aPath.substring(1) ;
+ }
+ }
+
+ return aPath;
+ }
+ protected static LaunchingPlugin plugin;
+ private static DocumentBuilder fgXMLParser;
+
+ public LaunchingPlugin() {
+ super();
+ plugin = this;
+ }
+
+ public static Plugin getDefault() {
+ return plugin;
+ }
+
+ public static IWorkspace getWorkspace() {
+ return RubyCore.getWorkspace();
+ }
+
+ public static void log(IStatus status) {
+ getDefault().getLog().log(status);
+ }
+
+ public static void log(Throwable e) {
+ log(new Status(IStatus.ERROR, PLUGIN_ID, IStatus.ERROR, RdtLaunchingMessages.RdtLaunchingPlugin_internalErrorOccurred, e));
+ }
+
+ public static void debug(String message) {
+ if (getDefault().isDebugging()) {
+ System.out.println(message);
+ }
+ }
+ @Override
+ public void stop(BundleContext arg0) throws Exception {
+ super.stop(arg0);
+ savePluginPreferences() ;
+ }
+
+ public static String getUniqueIdentifier() {
+ return PLUGIN_ID;
+ }
+
+ /**
+ * Returns a Document that can be used to build a DOM tree
+ * @return the Document
+ * @throws ParserConfigurationException if an exception occurs creating the document builder
+ */
+ public static Document getDocument() throws ParserConfigurationException {
+ DocumentBuilderFactory dfactory= DocumentBuilderFactory.newInstance();
+ DocumentBuilder docBuilder= dfactory.newDocumentBuilder();
+ Document doc= docBuilder.newDocument();
+ return doc;
+ }
+
+ /**
+ * Serializes a XML document into a string - encoded in UTF8 format,
+ * with platform line separators.
+ *
+ * @param doc document to serialize
+ * @return the document as a string
+ */
+ public static String serializeDocument(Document doc) throws IOException, TransformerException {
+ ByteArrayOutputStream s= new ByteArrayOutputStream();
+
+ TransformerFactory factory= TransformerFactory.newInstance();
+ Transformer transformer= factory.newTransformer();
+ transformer.setOutputProperty(OutputKeys.METHOD, "xml"); //$NON-NLS-1$
+ transformer.setOutputProperty(OutputKeys.INDENT, "yes"); //$NON-NLS-1$
+
+ DOMSource source= new DOMSource(doc);
+ StreamResult outputTarget= new StreamResult(s);
+ transformer.transform(source, outputTarget);
+
+ return s.toString("UTF8"); //$NON-NLS-1$
+ }
+
+ public static void log(String message) {
+ log(new Status(IStatus.ERROR, getUniqueIdentifier(), IStatus.ERROR, message, null));
+ }
+
+ /**
+ * Returns a shared XML parser.
+ *
+ * @return an XML parser
+ * @throws CoreException if unable to create a parser
+ * @since 3.0
+ */
+ public static DocumentBuilder getParser() throws CoreException {
+ if (fgXMLParser == null) {
+ try {
+ fgXMLParser = DocumentBuilderFactory.newInstance().newDocumentBuilder();
+ fgXMLParser.setErrorHandler(new DefaultHandler());
+ } catch (ParserConfigurationException e) {
+ abort(RdtLaunchingMessages.LaunchingPlugin_33, e);
+ } catch (FactoryConfigurationError e) {
+ abort(RdtLaunchingMessages.LaunchingPlugin_34, e);
+ }
+ }
+ return fgXMLParser;
+ }
+
+ /**
+ * Throws an exception with the given message and underlying exception.
+ *
+ * @param message error message
+ * @param exception underlying exception or <code>null</code> if none
+ * @throws CoreException
+ */
+ protected static void abort(String message, Throwable exception) throws CoreException {
+ IStatus status = new Status(IStatus.ERROR, LaunchingPlugin.getUniqueIdentifier(), 0, message, exception);
+ throw new CoreException(status);
+ }
+}
Property changes on: trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/internal/launching/LaunchingPlugin.java
___________________________________________________________________
Name: svn:eol-style
+ native
Deleted: trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/internal/launching/RdtLaunchingPlugin.java
===================================================================
--- trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/internal/launching/RdtLaunchingPlugin.java 2007-01-18 15:56:16 UTC (rev 1798)
+++ trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/internal/launching/RdtLaunchingPlugin.java 2007-01-18 16:03:38 UTC (rev 1799)
@@ -1,149 +0,0 @@
-package org.rubypeople.rdt.internal.launching;
-
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.IOException;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.FactoryConfigurationError;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.transform.OutputKeys;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerException;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
-
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.core.runtime.Status;
-import org.osgi.framework.BundleContext;
-import org.rubypeople.rdt.core.RubyCore;
-import org.w3c.dom.Document;
-import org.xml.sax.helpers.DefaultHandler;
-
-public class RdtLaunchingPlugin extends Plugin {
- public static final String PLUGIN_ID = "org.rubypeople.rdt.launching"; //$NON-NLS-1$
- public static String osDependentPath(String aPath) {
- if (Platform.getOS().equals(Platform.OS_WIN32)) {
- if (aPath.startsWith(File.separator)) {
- aPath = aPath.substring(1) ;
- }
- }
-
- return aPath;
- }
- protected static RdtLaunchingPlugin plugin;
- private static DocumentBuilder fgXMLParser;
-
- public RdtLaunchingPlugin() {
- super();
- plugin = this;
- }
-
- public static Plugin getDefault() {
- return plugin;
- }
-
- public static IWorkspace getWorkspace() {
- return RubyCore.getWorkspace();
- }
-
- public static void log(IStatus status) {
- getDefault().getLog().log(status);
- }
-
- public static void log(Throwable e) {
- log(new Status(IStatus.ERROR, PLUGIN_ID, IStatus.ERROR, RdtLaunchingMessages.RdtLaunchingPlugin_internalErrorOccurred, e));
- }
-
- public static void debug(String message) {
- if (getDefault().isDebugging()) {
- System.out.println(message);
- }
- }
- @Override
- public void stop(BundleContext arg0) throws Exception {
- super.stop(arg0);
- savePluginPreferences() ;
- }
-
- public static String getUniqueIdentifier() {
- return PLUGIN_ID;
- }
-
- /**
- * Returns a Document that can be used to build a DOM tree
- * @return the Document
- * @throws ParserConfigurationException if an exception occurs creating the document builder
- */
- public static Document getDocument() throws ParserConfigurationException {
- DocumentBuilderFactory dfactory= DocumentBuilderFactory.newInstance();
- DocumentBuilder docBuilder= dfactory.newDocumentBuilder();
- Document doc= docBuilder.newDocument();
- return doc;
- }
-
- /**
- * Serializes a XML document into a string - encoded in UTF8 format,
- * with platform line separators.
- *
- * @param doc document to serialize
- * @return the document as a string
- */
- public static String serializeDocument(Document doc) throws IOException, TransformerException {
- ByteArrayOutputStream s= new ByteArrayOutputStream();
-
- TransformerFactory factory= TransformerFactory.newInstance();
- Transformer transformer= factory.newTransformer();
- transformer.setOutputProperty(OutputKeys.METHOD, "xml"); //$NON-NLS-1$
- transformer.setOutputProperty(OutputKeys.INDENT, "yes"); //$NON-NLS-1$
-
- DOMSource source= new DOMSource(doc);
- StreamResult outputTarget= new StreamResult(s);
- transformer.transform(source, outputTarget);
-
- return s.toString("UTF8"); //$NON-NLS-1$
- }
-
- public static void log(String message) {
- log(new Status(IStatus.ERROR, getUniqueIdentifier(), IStatus.ERROR, message, null));
- }
-
- /**
- * Returns a shared XML parser.
- *
- * @return an XML parser
- * @throws CoreException if unable to create a parser
- * @since 3.0
- */
- public static DocumentBuilder getParser() throws CoreException {
- if (fgXMLParser == null) {
- try {
- fgXMLParser = DocumentBuilderFactory.newInstance().newDocumentBuilder();
- fgXMLParser.setErrorHandler(new DefaultHandler());
- } catch (ParserConfigurationException e) {
- abort(RdtLaunchingMessages.LaunchingPlugin_33, e);
- } catch (FactoryConfigurationError e) {
- abort(RdtLaunchingMessages.LaunchingPlugin_34, e);
- }
- }
- return fgXMLParser;
- }
-
- /**
- * Throws an exception with the given message and underlying exception.
- *
- * @param message error message
- * @param exception underlying exception or <code>null</code> if none
- * @throws CoreException
- */
- protected static void abort(String message, Throwable exception) throws CoreException {
- IStatus status = new Status(IStatus.ERROR, RdtLaunchingPlugin.getUniqueIdentifier(), 0, message, exception);
- throw new CoreException(status);
- }
-}
Modified: trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/internal/launching/RubyApplicationLaunchConfigurationDelegate.java
===================================================================
--- trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/internal/launching/RubyApplicationLaunchConfigurationDelegate.java 2007-01-18 15:56:16 UTC (rev 1798)
+++ trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/internal/launching/RubyApplicationLaunchConfigurationDelegate.java 2007-01-18 16:03:38 UTC (rev 1799)
@@ -22,7 +22,7 @@
*/
public void launch(ILaunchConfiguration configuration, String mode, ILaunch launch, IProgressMonitor monitor) throws CoreException {
if (RubyRuntime.getDefault().getSelectedInterpreter() == null) {
- throw new CoreException(new Status(IStatus.ERROR, RdtLaunchingPlugin.PLUGIN_ID, IStatus.OK, RdtLaunchingMessages.RdtLaunchingPlugin_noInterpreterSelected, null));
+ throw new CoreException(new Status(IStatus.ERROR, LaunchingPlugin.PLUGIN_ID, IStatus.OK, RdtLaunchingMessages.RdtLaunchingPlugin_noInterpreterSelected, null));
}
if (mode.equals("debug")) {
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:56:16 UTC (rev 1798)
+++ trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/internal/launching/RubyInterpreter.java 2007-01-18 16:03:38 UTC (rev 1799)
@@ -63,19 +63,19 @@
public Process exec(List args, File workingDirectory) throws CoreException {
try {
- RdtLaunchingPlugin.debug("Launching: " + args) ;
- RdtLaunchingPlugin.debug("Working Dir: " + workingDirectory) ;
+ LaunchingPlugin.debug("Launching: " + args) ;
+ LaunchingPlugin.debug("Working Dir: " + workingDirectory) ;
List rubyCmd = new ArrayList();
rubyCmd.add(this.getCommand());
rubyCmd.addAll(args);
return commandExecutor.exec((String[]) rubyCmd.toArray(new String[] {}), workingDirectory);
} catch (IOException e) {
- IStatus errorStatus = new Status(IStatus.ERROR, RdtLaunchingPlugin.PLUGIN_ID, IStatus.OK,
+ IStatus errorStatus = new Status(IStatus.ERROR, LaunchingPlugin.PLUGIN_ID, IStatus.OK,
"Unable to execute interpreter: " + args + workingDirectory, e);
throw new CoreException(errorStatus) ;
}
catch (IllegalCommandException e) {
- IStatus errorStatus = new Status(IStatus.ERROR, RdtLaunchingPlugin.PLUGIN_ID, IStatus.OK, e.getMessage(), e);
+ IStatus errorStatus = new Status(IStatus.ERROR, LaunchingPlugin.PLUGIN_ID, IStatus.OK, e.getMessage(), e);
throw new CoreException(errorStatus) ;
}
Modified: trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/internal/launching/RubyLaunchConfigurationAttribute.java
===================================================================
--- trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/internal/launching/RubyLaunchConfigurationAttribute.java 2007-01-18 15:56:16 UTC (rev 1798)
+++ trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/internal/launching/RubyLaunchConfigurationAttribute.java 2007-01-18 16:03:38 UTC (rev 1799)
@@ -5,14 +5,14 @@
public interface RubyLaunchConfigurationAttribute {
static final String RUBY_LAUNCH_CONFIGURATION_TYPE = "org.rubypeople.rdt.launching.LaunchConfigurationTypeRubyApplication";
- static final String CUSTOM_LOAD_PATH = RdtLaunchingPlugin.PLUGIN_ID + ".CUSTOM_LOAD_PATH";
- static final String FILE_NAME = RdtLaunchingPlugin.PLUGIN_ID + ".FILE_NAME";
- static final String INTERPRETER_ARGUMENTS = RdtLaunchingPlugin.PLUGIN_ID + ".INTERPRETER_ARGUMENTS";
- static final String MODULE_NAME = RdtLaunchingPlugin.PLUGIN_ID + ".MODULE_NAME";
- static final String PROGRAM_ARGUMENTS = RdtLaunchingPlugin.PLUGIN_ID + ".PROGRAM_ARGUMENTS";
- static final String PROJECT_NAME = RdtLaunchingPlugin.PLUGIN_ID + ".PROJECT_NAME";
- static final String SELECTED_INTERPRETER = RdtLaunchingPlugin.PLUGIN_ID + ".SELECTED_INTERPRETER";
- static final String WORKING_DIRECTORY = RdtLaunchingPlugin.PLUGIN_ID + ".WORKING_DIRECTORY";
- static final String USE_DEFAULT_LOAD_PATH = RdtLaunchingPlugin.PLUGIN_ID + ".USE_DEFAULT_LOAD_PATH";
- static final String USE_DEFAULT_WORKING_DIRECTORY = RdtLaunchingPlugin.PLUGIN_ID + ".USE_DEFAULT_WORKING_DIRECTORY";
+ static final String CUSTOM_LOAD_PATH = LaunchingPlugin.PLUGIN_ID + ".CUSTOM_LOAD_PATH";
+ static final String FILE_NAME = LaunchingPlugin.PLUGIN_ID + ".FILE_NAME";
+ static final String INTERPRETER_ARGUMENTS = LaunchingPlugin.PLUGIN_ID + ".INTERPRETER_ARGUMENTS";
+ static final String MODULE_NAME = LaunchingPlugin.PLUGIN_ID + ".MODULE_NAME";
+ static final String PROGRAM_ARGUMENTS = LaunchingPlugin.PLUGIN_ID + ".PROGRAM_ARGUMENTS";
+ static final String PROJECT_NAME = LaunchingPlugin.PLUGIN_ID + ".PROJECT_NAME";
+ static final String SELECTED_INTERPRETER = LaunchingPlugin.PLUGIN_ID + ".SELECTED_INTERPRETER";
+ static final String WORKING_DIRECTORY = LaunchingPlugin.PLUGIN_ID + ".WORKING_DIRECTORY";
+ static final String USE_DEFAULT_LOAD_PATH = LaunchingPlugin.PLUGIN_ID + ".USE_DEFAULT_LOAD_PATH";
+ static final String USE_DEFAULT_WORKING_DIRECTORY = LaunchingPlugin.PLUGIN_ID + ".USE_DEFAULT_WORKING_DIRECTORY";
}
\ No newline at end of file
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:56:16 UTC (rev 1798)
+++ trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/internal/launching/VMDefinitionsContainer.java 2007-01-18 16:03:38 UTC (rev 1799)
@@ -234,7 +234,7 @@
public String getAsXML() throws ParserConfigurationException, IOException, TransformerException {
// Create the Document and the top-level node
- Document doc = RdtLaunchingPlugin.getDocument();
+ Document doc = LaunchingPlugin.getDocument();
Element config = doc.createElement("vmSettings"); //$NON-NLS-1$
doc.appendChild(config);
@@ -258,7 +258,7 @@
}
// Serialize the Document and return the resulting String
- return RdtLaunchingPlugin.serializeDocument(doc);
+ return LaunchingPlugin.serializeDocument(doc);
}
/**
@@ -438,7 +438,7 @@
}
}
} else {
- RdtLaunchingPlugin.log(RdtLaunchingMessages.RubyRuntime_VM_type_element_with_unknown_id_1);
+ LaunchingPlugin.log(RdtLaunchingMessages.RubyRuntime_VM_type_element_with_unknown_id_1);
}
}
@@ -490,7 +490,7 @@
vmStandin.setVMArgs(vmArgs);
}
} else {
- RdtLaunchingPlugin.log(RdtLaunchingMessages.RubyRuntime_VM_element_specified_with_no_id_attribute_2);
+ LaunchingPlugin.log(RdtLaunchingMessages.RubyRuntime_VM_element_specified_with_no_id_attribute_2);
}
}
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:56:16 UTC (rev 1798)
+++ trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/launching/AbstractInterpreter.java 2007-01-18 16:03:38 UTC (rev 1799)
@@ -18,7 +18,7 @@
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
import org.rubypeople.rdt.internal.launching.RdtLaunchingMessages;
-import org.rubypeople.rdt.internal.launching.RdtLaunchingPlugin;
+import org.rubypeople.rdt.internal.launching.LaunchingPlugin;
/**
* Abstract implementation of a Interpreter install.
* <p>
@@ -277,7 +277,7 @@
* @since 3.2
*/
protected void abort(String message, Throwable exception, int code) throws CoreException {
- throw new CoreException(new Status(IStatus.ERROR, RdtLaunchingPlugin
+ throw new CoreException(new Status(IStatus.ERROR, LaunchingPlugin
.getUniqueIdentifier(), code, message, exception));
}
Modified: trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/launching/IVMInstallChangedListener.java
===================================================================
--- trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/launching/IVMInstallChangedListener.java 2007-01-18 15:56:16 UTC (rev 1798)
+++ trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/launching/IVMInstallChangedListener.java 2007-01-18 16:03:38 UTC (rev 1799)
@@ -1,6 +1,6 @@
package org.rubypeople.rdt.launching;
-import org.rubypeople.rdt.internal.launching.RdtLaunchingPlugin;
+import org.rubypeople.rdt.internal.launching.LaunchingPlugin;
public interface IVMInstallChangedListener {
@@ -9,19 +9,19 @@
* Property constant indicating the name associated
* with a VM install has changed.
*/
- public static final String PROPERTY_NAME = RdtLaunchingPlugin.getUniqueIdentifier() + ".PROPERTY_NAME"; //$NON-NLS-1$
+ public static final String PROPERTY_NAME = LaunchingPlugin.getUniqueIdentifier() + ".PROPERTY_NAME"; //$NON-NLS-1$
/**
* Property constant indicating the install location of
* a VM install has changed.
*/
- public static final String PROPERTY_INSTALL_LOCATION = RdtLaunchingPlugin.getUniqueIdentifier() + ".PROPERTY_INSTALL_LOCATION"; //$NON-NLS-1$
+ public static final String PROPERTY_INSTALL_LOCATION = LaunchingPlugin.getUniqueIdentifier() + ".PROPERTY_INSTALL_LOCATION"; //$NON-NLS-1$
/**
* Property constant indicating the library locations associated
* with a VM install have changed.
*/
- public static final String PROPERTY_LIBRARY_LOCATIONS = RdtLaunchingPlugin.getUniqueIdentifier() + ".PROPERTY_LIBRARY_LOCATIONS"; //$NON-NLS-1$
+ public static final String PROPERTY_LIBRARY_LOCATIONS = LaunchingPlugin.getUniqueIdentifier() + ".PROPERTY_LIBRARY_LOCATIONS"; //$NON-NLS-1$
/**
* Property constant indicating the VM arguments associated
@@ -29,7 +29,7 @@
*
* @since 0.9.0
*/
- public static final String PROPERTY_VM_ARGUMENTS = RdtLaunchingPlugin.getUniqueIdentifier() + ".PROPERTY_VM_ARGUMENTS"; //$NON-NLS-1$
+ public static final String PROPERTY_VM_ARGUMENTS = LaunchingPlugin.getUniqueIdentifier() + ".PROPERTY_VM_ARGUMENTS"; //$NON-NLS-1$
public void defaultVMInstallChanged(IVMInstall previous, IVMInstall current);
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:56:16 UTC (rev 1798)
+++ trunk/org.rubypeople.rdt.launching/src/org/rubypeople/rdt/launching/RubyRuntime.java 2007-01-18 16:03:38 UTC (rev 1799)
@@ -37,7 +37,7 @@
import org.rubypeople.rdt.internal.launching.CompositeId;
import org.rubypeople.rdt.internal.launching.ListenerList;
import org.rubypeople.rdt.internal.launching.RdtLaunchingMessages;
-import org.rubypeople.rdt.internal.launching.RdtLaunchingPlugin;
+import org.rubypeople.rdt.internal.launching.LaunchingPlugin;
import org.rubypeople.rdt.internal.launching.RubyInterpreter;
import org.rubypeople.rdt.internal.launching.VMDefinitionsContainer;
import org.rubypeople.rdt.internal.launching.VMStandin;
@@ -73,14 +73,14 @@
* </ol>
* @since 0.9.0
*/
- public static final String RUBY_CONTAINER = RdtLaunchingPlugin.getUniqueIdentifier() + "RUBY_CONTAINER"; //$NON-NLS-1$
+ public static final String RUBY_CONTAINER = LaunchingPlugin.getUniqueIdentifier() + "RUBY_CONTAINER"; //$NON-NLS-1$
/**
* Preference key for the String of XML that defines all installed VMs.
*
* @since 0.9.0
*/
- public static final String PREF_VM_XML = RdtLaunchingPlugin.getUniqueIdentifier() + ".PREF_VM_XML"; //$NON-NLS-1$
+ public static final String PREF_VM_XML = LaunchingPlugin.getUniqueIdentifier() + ".PREF_VM_XML"; //$NON-NLS-1$
/**
* Simple identifier constant (value <code>"vmInstalls"</code>) for the
@@ -198,7 +198,7 @@
}
reader.parse(new InputSource(fileReader));
} catch(Exception e) {
- RdtLaunchingPlugin.log(e);
+ LaunchingPlugin.log(e);
}
}
@@ -239,7 +239,7 @@
writer.write("</runtimeconfig>");
writer.flush();
} catch(IOException e) {
- RdtLaunchingPlugin.log(e);
+ LaunchingPlugin.log(e);
}
}
@@ -269,7 +269,7 @@
}
protected File getRuntimeConfigurationFile() {
- IPath stateLocation = RdtLaunchingPlugin.getDefault().getStateLocation();
+ IPath stateLocation = LaunchingPlugin.getDefault().getStateLocation();
IPath fileLocation = stateLocation.append("runtimeConfiguration.xml");
return new File(fileLocation.toOSString());
}
@@ -368,7 +368,7 @@
} catch (IOException e) {
- RdtLaunchingPlugin.log(e);
+ LaunchingPlugin.log(e);
}
} finally {
fgInitializingVMs = false;
@@ -390,13 +390,13 @@
if (setPref) {
try {
String xml = vmDefs.getAsXML();
- RdtLaunchingPlugin.getDefault().getPluginPreferences().setValue(PREF_VM_XML, xml);
+ LaunchingPlugin.getDefault().getPluginPreferences().setValue(PREF_VM_XML, xml);
} catch (ParserConfigurationException e) {
- RdtLaunchingPlugin.log(e);
+ LaunchingPlugin.log(e);
} catch (IOException e) {
- RdtLaunchingPlugin.log(e);
+ LaunchingPlugin.log(e);
} catch (TransformerException e) {
- RdtLaunchingPlugin.log(e);
+ LaunchingPlugin.log(e);
}
}
@@ -407,9 +407,9 @@
* Initializes vm type extensions.
*/
private static void initializeVMTypeExtensions() {
- IExtensionPoint extensionPoint= Platform.getExtensionRegistry().getExtensionPoint(RdtLaunchingPlugin.PLUGIN_ID, "vmInstallTypes"); //$NON-NLS-1$
+ IExtensionPoint extensionPoint= Platform.getExtensionRegistry().getExtensionPoint(LaunchingPlugin.PLUGIN_ID, "vmInstallTypes"); //$NON-NLS-1$
IConfigurationElement[] configs= extensionPoint.getConfigurationElements();
- MultiStatus status= new MultiStatus(RdtLaunchingPlugin.getUniqueIdentifier(), IStatus.OK, RdtLaunchingMessages.RubyRuntime_exceptionOccurred, null);
+ MultiStatus status= new MultiStatus(LaunchingPlugin.getUniqueIdentifier(), IStatus.OK, RdtLaunchingMessages.RubyRuntime_exceptionOccurred, null);
fgInterpreterTypes= new IVMInstallType[configs.length];
for (int i= 0; i < configs.length; i++) {
@@ -422,7 +422,7 @@
}
if (!status.isOK()) {
//only happens on a CoreException
- RdtLaunchingPlugin.log(status);
+ LaunchingPlugin.log(status);
//cleanup null entries in fgVMTypes
List<IVMInstallType> temp= new ArrayList<IVMInstallType>(fgInterpreterTypes.length);
for (int i = 0; i < fgInterpreterTypes.length; i++) {
@@ -454,11 +454,11 @@
VMDefinitionsContainer.parseXMLIntoContainer(inputStream, vmDefs);
return false;
} catch (IOException ioe) {
- RdtLaunchingPlugin.log(ioe);
+ LaunchingPlugin.log(ioe);
}
} else {
// Otherwise, look for the old file that previously held the VM definitions
- IPath stateLocation= RdtLaunchingPlugin.getDefault().getStateLocation();
+ IPath stateLocation= LaunchingPlugin.getDefault().getStateLocation();
IPath stateFile= stateLocation.append("vmConfiguration.xml"); //$NON-NLS-1$
File file = new File(stateFile.toOSString());
@@ -479,7 +479,7 @@
* @since 0.9.0
*/
public static Preferences getPreferences() {
- return RdtLaunchingPlugin.getDefault().getPluginPreferences();
+ return LaunchingPlugin.getDefault().getPluginPreferences();
}
/**
@@ -504,7 +504,7 @@
* @since 3.2
*/
private static void addVMExtensions(VMDefinitionsContainer vmDefs) {
- IExtensionPoint extensionPoint = Platform.getExtensionRegistry().getExtensionPoint(RdtLaunchingPlugin.PLUGIN_ID, RubyRuntime.EXTENSION_POINT_VM_INSTALLS);
+ IExtensionPoint extensionPoint = Platform.getExtensionRegistry().getExtensionPoint(LaunchingPlugin.PLUGIN_ID, RubyRuntime.EXTENSION_POINT_VM_INSTALLS);
IConfigurationElement[] configs= extensionPoint.getConfigurationElements();
for (int i = 0; i < configs.length; i++) {
IConfigurationElement element = configs[i];
@@ -586,7 +586,7 @@
(Object[]) new String[]{element.getName(), element.getContributor().getName()}), null);
}
} catch (CoreException e) {
- RdtLaunchingPlugin.log(e);
+ LaunchingPlugin.log(e);
}
}
}
@@ -624,7 +624,7 @@
* error, or <code>null</code> if none
*/
private static void abort(String message, int code, Throwable exception) throws CoreException {
- throw new CoreException(new Status(IStatus.ERROR, RdtLaunchingPlugin.getUniqueIdentifier(), code, message, exception));
+ throw new CoreException(new Status(IStatus.ERROR, LaunchingPlugin.getUniqueIdentifier(), code, message, exception));
}
private static void fireInterpreterAdded(IVMInstall interpreter) {
Modified: trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/preferences/DebuggerPreferencePage.java
===================================================================
--- trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/preferences/DebuggerPreferencePage.java 2007-01-18 15:56:16 UTC (rev 1798)
+++ trunk/org.rubypeople.rdt.ui/src/org/rubypeople/rdt/internal/ui/preferences/DebuggerPreferencePage.java 2007-01-18 16:03:38 UTC (rev 1799)
@@ -16,14 +16,14 @@
import org.eclipse.swt.widgets.Label;
import org.eclipse.ui.IWorkbench;
import org.eclipse.ui.IWorkbenchPreferencePage;
-import org.rubypeople.rdt.internal.launching.RdtLaunchingPlugin;
+import org.rubypeople.rdt.internal.launching.LaunchingPlugin;
import org.rubypeople.rdt.internal.ui.text.PreferencesAdapter;
public class DebuggerPreferencePage extends FieldEditorPreferencePage implements IWorkbenchPreferencePage {
public DebuggerPreferencePage() {
super(GRID);
- Preferences launchingPreferences = RdtLaunchingPlugin.getDefault().getPluginPreferences();
+ Preferences launchingPreferences = LaunchingPlugin.getDefault().getPluginPreferences();
setPreferenceStore(new PreferencesAdapter(launchingPreferences));
setDescription(PreferencesMessages.DebuggerPreferencePage_description_label);
}
@@ -36,7 +36,7 @@
protected Control createContents(Composite parent) {
Control result = super.createContents(parent);
Label label = new Label(parent, SWT.WRAP);
- URL entry = RdtLaunchingPlugin.getDefault().getBundle().getEntry("/");
+ URL entry = LaunchingPlugin.getDefault().getBundle().getEntry("/");
String installLocation;
try {
installLocation = FileLocator.resolve(entry).toString();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
