use newer ScriptRuntime.getDefaultInterpreterInstall(natureId, environment)
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/console/ui/TclConsoleFactory.java b/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/console/ui/TclConsoleFactory.java
index 2fa8504..65b720a 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/console/ui/TclConsoleFactory.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/console/ui/TclConsoleFactory.java
@@ -24,7 +24,6 @@
import org.eclipse.dltk.launching.IInterpreterInstall;
import org.eclipse.dltk.launching.LaunchingMessages;
import org.eclipse.dltk.launching.ScriptRuntime;
-import org.eclipse.dltk.launching.ScriptRuntime.DefaultInterpreterEntry;
import org.eclipse.dltk.tcl.console.TclConsoleConstants;
import org.eclipse.dltk.tcl.console.TclConsoleUtil;
import org.eclipse.dltk.tcl.console.TclInterpreter;
@@ -97,15 +96,12 @@
id = "default"; //$NON-NLS-1$
interpreter = new TclInterpreter();
- if (ScriptRuntime
- .getDefaultInterpreterInstall(new DefaultInterpreterEntry(
- TclNature.NATURE_ID,
- LocalEnvironment.ENVIRONMENT_ID)) == null) {
+ if (ScriptRuntime.getDefaultInterpreterInstall(
+ TclNature.NATURE_ID, LocalEnvironment.getInstance()) == null) {
showQuestion();
if (ScriptRuntime
- .getDefaultInterpreterInstall(new DefaultInterpreterEntry(
- TclNature.NATURE_ID,
- LocalEnvironment.ENVIRONMENT_ID)) == null) {
+ .getDefaultInterpreterInstall(TclNature.NATURE_ID,
+ LocalEnvironment.getInstance()) == null) {
return null;
}
}
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/debug/ui/interpreters/TclInterpreterComboBlock.java b/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/debug/ui/interpreters/TclInterpreterComboBlock.java
index 680ca1b..e8a9cf1 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/debug/ui/interpreters/TclInterpreterComboBlock.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.debug.ui/src/org/eclipse/dltk/tcl/internal/debug/ui/interpreters/TclInterpreterComboBlock.java
@@ -27,7 +27,6 @@
import org.eclipse.dltk.launching.IInterpreterInstall;
import org.eclipse.dltk.launching.InterpreterContainerHelper;
import org.eclipse.dltk.launching.ScriptRuntime;
-import org.eclipse.dltk.launching.ScriptRuntime.DefaultInterpreterEntry;
import org.eclipse.dltk.tcl.core.TclNature;
import org.eclipse.dltk.tcl.core.TclPackagesManager;
import org.eclipse.dltk.ui.DLTKPluginImages;
@@ -82,9 +81,8 @@
IInterpreterInstall install = getInterpreter();
if (install == null) {
install = ScriptRuntime
- .getDefaultInterpreterInstall(new DefaultInterpreterEntry(
- TclNature.NATURE_ID,
- LocalEnvironment.ENVIRONMENT_ID));
+ .getDefaultInterpreterInstall(TclNature.NATURE_ID,
+ LocalEnvironment.getInstance());
}
if (install != null) {
final Set<String> names = TclPackagesManager
@@ -445,10 +443,8 @@
protected void addPackage() {
IInterpreterInstall install = this.getInterpreter();
if (install == null) {
- install = ScriptRuntime
- .getDefaultInterpreterInstall(new DefaultInterpreterEntry(
- TclNature.NATURE_ID,
- LocalEnvironment.ENVIRONMENT_ID));
+ install = ScriptRuntime.getDefaultInterpreterInstall(
+ TclNature.NATURE_ID, LocalEnvironment.getInstance());
}
if (install != null) {
Set<String> packages = TclPackagesManager
diff --git a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/text/TclRequirePackageCorrectionMarkerResolution.java b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/text/TclRequirePackageCorrectionMarkerResolution.java
index c4ee653..e596792 100644
--- a/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/text/TclRequirePackageCorrectionMarkerResolution.java
+++ b/tcl/plugins/org.eclipse.dltk.tcl.ui/src/org/eclipse/dltk/tcl/internal/ui/text/TclRequirePackageCorrectionMarkerResolution.java
@@ -23,7 +23,6 @@
import org.eclipse.dltk.launching.IInterpreterInstall;
import org.eclipse.dltk.launching.InterpreterContainerHelper;
import org.eclipse.dltk.launching.ScriptRuntime;
-import org.eclipse.dltk.launching.ScriptRuntime.DefaultInterpreterEntry;
import org.eclipse.dltk.tcl.core.TclNature;
import org.eclipse.dltk.tcl.core.TclPackagesManager;
import org.eclipse.dltk.tcl.core.packages.TclModuleInfo;
@@ -67,10 +66,8 @@
public PackagesLabelProvider(IInterpreterInstall install) {
this.install = install;
if (install == null) {
- install = ScriptRuntime
- .getDefaultInterpreterInstall(new DefaultInterpreterEntry(
- TclNature.NATURE_ID,
- LocalEnvironment.ENVIRONMENT_ID));
+ install = ScriptRuntime.getDefaultInterpreterInstall(
+ TclNature.NATURE_ID, LocalEnvironment.getInstance());
}
}
