Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEugene Tarassov2015-04-29 22:35:17 -0400
committerEugene Tarassov2015-04-29 22:35:17 -0400
commitd57a570757a9b6ae3ecc8c96701b53745546def7 (patch)
treec863a428a0554c0e7e9930fd0c47a18f7e0f7c0e
parente997c6b1f7752aae52b5ae65a297ec1944f51f76 (diff)
downloadorg.eclipse.tcf-d57a570757a9b6ae3ecc8c96701b53745546def7.tar.gz
org.eclipse.tcf-d57a570757a9b6ae3ecc8c96701b53745546def7.tar.xz
org.eclipse.tcf-d57a570757a9b6ae3ecc8c96701b53745546def7.zip
TCF Debugger: changed org.eclipse.tm.terminal dependencies to be package-based instead of bundle-base to fix build errors
-rw-r--r--plugins/org.eclipse.tcf.debug.ui/META-INF/MANIFEST.MF7
-rw-r--r--plugins/org.eclipse.tcf.debug.ui/src/org/eclipse/tcf/internal/debug/ui/model/TCFConsole.java7
2 files changed, 9 insertions, 5 deletions
diff --git a/plugins/org.eclipse.tcf.debug.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.tcf.debug.ui/META-INF/MANIFEST.MF
index c02a50e26..4749723ca 100644
--- a/plugins/org.eclipse.tcf.debug.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.tcf.debug.ui/META-INF/MANIFEST.MF
@@ -22,13 +22,14 @@ Require-Bundle: com.jcraft.jsch;bundle-version="0.1.46",
org.eclipse.ui.ide;bundle-version="3.8.1",
org.eclipse.ui.views;bundle-version="3.6.100",
org.eclipse.ui.workbench.texteditor;bundle-version="3.8.0",
- org.eclipse.tcf.debug;bundle-version="1.3.0",
- org.eclipse.tm.terminal.control;bundle-version="4.0.0"
+ org.eclipse.tcf.debug;bundle-version="1.3.0"
Import-Package: org.eclipse.tcf.core;version="1.3.0",
org.eclipse.tcf.protocol;version="1.3.0",
org.eclipse.tcf.services;version="1.3.0",
org.eclipse.tcf.ssl;version="1.3.0",
- org.eclipse.tcf.util;version="1.3.0"
+ org.eclipse.tcf.util;version="1.3.0",
+ org.eclipse.tm.internal.terminal.control,
+ org.eclipse.tm.internal.terminal.provisional.api
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
Eclipse-LazyStart: true
diff --git a/plugins/org.eclipse.tcf.debug.ui/src/org/eclipse/tcf/internal/debug/ui/model/TCFConsole.java b/plugins/org.eclipse.tcf.debug.ui/src/org/eclipse/tcf/internal/debug/ui/model/TCFConsole.java
index 7b612923b..f62caa6b8 100644
--- a/plugins/org.eclipse.tcf.debug.ui/src/org/eclipse/tcf/internal/debug/ui/model/TCFConsole.java
+++ b/plugins/org.eclipse.tcf.debug.ui/src/org/eclipse/tcf/internal/debug/ui/model/TCFConsole.java
@@ -219,10 +219,9 @@ class TCFConsole extends AbstractConsole {
public void save(ISettingsStore store) {
}
- @Override
public void setDefaultSettings() {
}
-
+
@Override
public void load(ISettingsStore store) {
}
@@ -310,6 +309,10 @@ class TCFConsole extends AbstractConsole {
@Override
public void setTerminalTitle(String title) {
}
+
+ public ISettingsPage makeSettingsPage() {
+ return null;
+ }
}
TCFConsole(final TCFModel model, int type, String ctx_id) {

Back to the top