action to open console for any available interpreter
diff --git a/plugins/org.eclipse.dltk.javascript.debug.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.dltk.javascript.debug.ui/META-INF/MANIFEST.MF
index 65baf62..fce3d83 100644
--- a/plugins/org.eclipse.dltk.javascript.debug.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.dltk.javascript.debug.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.dltk.javascript.debug.ui;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 2.0.0.qualifier
Bundle-Vendor: %pluginProvider
Bundle-Localization: plugin
Require-Bundle: org.eclipse.debug.ui,
diff --git a/plugins/org.eclipse.dltk.javascript.debug.ui/src/org/eclipse/dltk/javascript/internal/console/ui/JavaScriptConsoleFactory.java b/plugins/org.eclipse.dltk.javascript.debug.ui/src/org/eclipse/dltk/javascript/internal/console/ui/JavaScriptConsoleFactory.java
index 7f5e2dd..2f51044 100644
--- a/plugins/org.eclipse.dltk.javascript.debug.ui/src/org/eclipse/dltk/javascript/internal/console/ui/JavaScriptConsoleFactory.java
+++ b/plugins/org.eclipse.dltk.javascript.debug.ui/src/org/eclipse/dltk/javascript/internal/console/ui/JavaScriptConsoleFactory.java
@@ -3,18 +3,17 @@
import org.eclipse.debug.core.ILaunch;
import org.eclipse.dltk.console.IScriptInterpreter;
import org.eclipse.dltk.console.ScriptConsolePrompt;
+import org.eclipse.dltk.console.ui.IScriptConsole;
import org.eclipse.dltk.console.ui.IScriptConsoleFactory;
import org.eclipse.dltk.console.ui.ScriptConsole;
import org.eclipse.dltk.console.ui.ScriptConsoleFactoryBase;
import org.eclipse.dltk.javascript.console.JavaScriptConsoleConstants;
-import org.eclipse.dltk.javascript.console.JavaScriptConsoleUtil;
import org.eclipse.dltk.javascript.console.JavaScriptInterpreter;
import org.eclipse.dltk.javascript.internal.debug.ui.JavaScriptDebugUIPlugin;
import org.eclipse.jface.preference.IPreferenceStore;
-
-public class JavaScriptConsoleFactory extends ScriptConsoleFactoryBase implements
- IScriptConsoleFactory {
+public class JavaScriptConsoleFactory extends ScriptConsoleFactoryBase
+ implements IScriptConsoleFactory {
protected IPreferenceStore getPreferenceStore() {
return JavaScriptDebugUIPlugin.getDefault().getPreferenceStore();
}
@@ -26,19 +25,22 @@
.getString(JavaScriptConsoleConstants.PREF_CONTINUE_PROMPT));
}
- protected JavaScriptConsole makeConsole(JavaScriptInterpreter interpreter, String id) {
+ protected JavaScriptConsole makeConsole(JavaScriptInterpreter interpreter,
+ String id) {
JavaScriptConsole console = new JavaScriptConsole(interpreter, id);
console.setPrompt(makeInvitation());
return console;
}
- private JavaScriptConsole createConsoleInstance(IScriptInterpreter interpreter, String id) {
+ private JavaScriptConsole createConsoleInstance(
+ IScriptInterpreter interpreter, String id) {
if (interpreter == null) {
try {
id = "default";
interpreter = new JavaScriptInterpreter();
-// JavaScriptConsoleUtil
-// .runDefaultTclInterpreter((JavaScriptInterpreter) interpreter);
+ // JavaScriptConsoleUtil
+ // .runDefaultTclInterpreter((JavaScriptInterpreter)
+ // interpreter);
} catch (Exception e) {
return null;
}
@@ -54,7 +56,13 @@
public JavaScriptConsoleFactory() {
}
- public void openConsole(IScriptInterpreter interpreter, String id, ILaunch launch) {
- registerAndOpenConsole(createConsoleInstance(interpreter, id));
+ /**
+ * @since 2.0
+ */
+ public IScriptConsole openConsole(IScriptInterpreter interpreter,
+ String id, ILaunch launch) {
+ final JavaScriptConsole console = createConsoleInstance(interpreter, id);
+ registerAndOpenConsole(console);
+ return console;
}
}
diff --git a/plugins/org.eclipse.dltk.javascript.debug.ui/src/org/eclipse/dltk/javascript/internal/console/ui/actions/PasteJavaScriptTextToConsoleAction.java b/plugins/org.eclipse.dltk.javascript.debug.ui/src/org/eclipse/dltk/javascript/internal/console/ui/actions/PasteJavaScriptTextToConsoleAction.java
index 39e7a62..d5e16a7 100644
--- a/plugins/org.eclipse.dltk.javascript.debug.ui/src/org/eclipse/dltk/javascript/internal/console/ui/actions/PasteJavaScriptTextToConsoleAction.java
+++ b/plugins/org.eclipse.dltk.javascript.debug.ui/src/org/eclipse/dltk/javascript/internal/console/ui/actions/PasteJavaScriptTextToConsoleAction.java
@@ -1,6 +1,6 @@
package org.eclipse.dltk.javascript.internal.console.ui.actions;
-import org.eclipse.dltk.console.ui.ScriptConsole;
+import org.eclipse.dltk.console.ui.IScriptConsole;
import org.eclipse.dltk.console.ui.ScriptConsoleManager;
import org.eclipse.dltk.javascript.internal.console.ui.JavaScriptConsole;
import org.eclipse.jface.action.IAction;
@@ -12,8 +12,8 @@
import org.eclipse.ui.texteditor.IDocumentProvider;
import org.eclipse.ui.texteditor.ITextEditor;
-
-public class PasteJavaScriptTextToConsoleAction implements IEditorActionDelegate {
+public class PasteJavaScriptTextToConsoleAction implements
+ IEditorActionDelegate {
private ISelection selection;
@@ -35,7 +35,7 @@
public void run(IAction action) {
ScriptConsoleManager manager = ScriptConsoleManager.getInstance();
- ScriptConsole console = manager
+ IScriptConsole console = manager
.getActiveScriptConsole(JavaScriptConsole.CONSOLE_TYPE);
if (console == null) {
@@ -44,8 +44,8 @@
if (selection instanceof ITextSelection) {
String text = ((ITextSelection) selection).getText();
- console.getInput().insertText(text);
- }
+ console.insertText(text);
+ }
}
public void selectionChanged(IAction action, ISelection selection) {
