diff options
16 files changed, 37 insertions, 37 deletions
diff --git a/lttng/org.eclipse.linuxtools.lttng.core/META-INF/MANIFEST.MF b/lttng/org.eclipse.linuxtools.lttng.core/META-INF/MANIFEST.MF index dd546bd597..333edce7bd 100644 --- a/lttng/org.eclipse.linuxtools.lttng.core/META-INF/MANIFEST.MF +++ b/lttng/org.eclipse.linuxtools.lttng.core/META-INF/MANIFEST.MF @@ -12,7 +12,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.7.0", org.eclipse.linuxtools.tmf.core;bundle-version="0.4.0", org.eclipse.linuxtools.lttng.jni;bundle-version="0.4.0", org.eclipse.rse.core;bundle-version="3.2.0", - org.eclipse.tm.tcf.core;bundle-version="0.4.0", + org.eclipse.tcf.core;bundle-version="1.0.0", org.eclipse.core.resources;bundle-version="3.7.100" Export-Package: org.eclipse.linuxtools.internal.lttng.core;x-friends:="org.eclipse.linuxtools.lttng.ui,org.eclipse.linuxtools.lttng.ui.tests", org.eclipse.linuxtools.internal.lttng.core.control;x-friends:="org.eclipse.linuxtools.lttng.ui,org.eclipse.linuxtools.lttng.ui.tests", diff --git a/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/internal/lttng/core/tracecontrol/model/TraceResource.java b/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/internal/lttng/core/tracecontrol/model/TraceResource.java index d2f407f2f1..180198d500 100644 --- a/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/internal/lttng/core/tracecontrol/model/TraceResource.java +++ b/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/internal/lttng/core/tracecontrol/model/TraceResource.java @@ -22,8 +22,8 @@ import org.eclipse.linuxtools.internal.lttng.core.tracecontrol.model.config.Trac import org.eclipse.linuxtools.internal.lttng.core.tracecontrol.service.ILttControllerService; import org.eclipse.rse.core.subsystems.AbstractResource; import org.eclipse.rse.core.subsystems.ISubSystem; -import org.eclipse.tm.tcf.protocol.IToken; -import org.eclipse.tm.tcf.util.TCFTask; +import org.eclipse.tcf.protocol.IToken; +import org.eclipse.tcf.util.TCFTask; /** * <b><u>ProviderResource</u></b> diff --git a/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/internal/lttng/core/tracecontrol/service/ILttControllerService.java b/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/internal/lttng/core/tracecontrol/service/ILttControllerService.java index dd45889216..7484887657 100644 --- a/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/internal/lttng/core/tracecontrol/service/ILttControllerService.java +++ b/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/internal/lttng/core/tracecontrol/service/ILttControllerService.java @@ -14,8 +14,8 @@ package org.eclipse.linuxtools.internal.lttng.core.tracecontrol.service; import org.eclipse.linuxtools.internal.lttng.core.LttngConstants; -import org.eclipse.tm.tcf.protocol.IService; -import org.eclipse.tm.tcf.protocol.IToken; +import org.eclipse.tcf.protocol.IService; +import org.eclipse.tcf.protocol.IToken; public interface ILttControllerService extends IService { diff --git a/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/internal/lttng/core/tracecontrol/service/LttControllerServiceProxy.java b/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/internal/lttng/core/tracecontrol/service/LttControllerServiceProxy.java index c73ab4c7cb..fe4e1d1582 100644 --- a/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/internal/lttng/core/tracecontrol/service/LttControllerServiceProxy.java +++ b/lttng/org.eclipse.linuxtools.lttng.core/src/org/eclipse/linuxtools/internal/lttng/core/tracecontrol/service/LttControllerServiceProxy.java @@ -14,10 +14,10 @@ package org.eclipse.linuxtools.internal.lttng.core.tracecontrol.service; import org.eclipse.linuxtools.internal.lttng.core.LttngConstants; -import org.eclipse.tm.tcf.core.Command; -import org.eclipse.tm.tcf.core.ErrorReport; -import org.eclipse.tm.tcf.protocol.IChannel; -import org.eclipse.tm.tcf.protocol.IToken; +import org.eclipse.tcf.core.Command; +import org.eclipse.tcf.core.ErrorReport; +import org.eclipse.tcf.protocol.IChannel; +import org.eclipse.tcf.protocol.IToken; /** * <b><u>LttControllerServiceProxy</u></b> diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/META-INF/MANIFEST.MF b/lttng/org.eclipse.linuxtools.lttng.ui/META-INF/MANIFEST.MF index b5b5c92c3a..d8c95ff51e 100644 --- a/lttng/org.eclipse.linuxtools.lttng.ui/META-INF/MANIFEST.MF +++ b/lttng/org.eclipse.linuxtools.lttng.ui/META-INF/MANIFEST.MF @@ -15,7 +15,8 @@ Require-Bundle: org.eclipse.ui;bundle-version="3.7.0", org.eclipse.core.runtime;bundle-version="3.7.0", org.eclipse.linuxtools.tmf.core;bundle-version="0.4.0", org.eclipse.linuxtools.tmf.ui;bundle-version="0.4.0", - org.eclipse.tm.tcf.core;bundle-version="0.4.0", + org.eclipse.tcf.core;bundle-version="1.0.0", + org.eclipse.tcf.te.runtime;bundle-version="1.0.0", org.eclipse.rse.core;bundle-version="3.2.0", org.eclipse.rse.services;bundle-version="3.2.100", org.eclipse.rse.subsystems.files.core;bundle-version="3.2.100", diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/actions/ConfigureMarkers.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/actions/ConfigureMarkers.java index d6d922b3c2..996a68c652 100644 --- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/actions/ConfigureMarkers.java +++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/actions/ConfigureMarkers.java @@ -33,8 +33,8 @@ import org.eclipse.rse.core.subsystems.ISubSystem; import org.eclipse.rse.services.clientserver.messages.SystemMessageException; import org.eclipse.rse.ui.SystemBasePlugin; import org.eclipse.swt.widgets.Shell; -import org.eclipse.tm.tcf.protocol.IToken; -import org.eclipse.tm.tcf.util.TCFTask; +import org.eclipse.tcf.protocol.IToken; +import org.eclipse.tcf.util.TCFTask; import org.eclipse.ui.IObjectActionDelegate; import org.eclipse.ui.IViewActionDelegate; import org.eclipse.ui.IViewPart; diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/actions/ConfigureTrace.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/actions/ConfigureTrace.java index 06bc44f608..42c648eb14 100644 --- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/actions/ConfigureTrace.java +++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/actions/ConfigureTrace.java @@ -38,8 +38,8 @@ import org.eclipse.rse.core.model.SystemStartHere; import org.eclipse.rse.services.clientserver.messages.SystemMessageException; import org.eclipse.rse.ui.SystemBasePlugin; import org.eclipse.swt.widgets.Shell; -import org.eclipse.tm.tcf.protocol.IToken; -import org.eclipse.tm.tcf.util.TCFTask; +import org.eclipse.tcf.protocol.IToken; +import org.eclipse.tcf.util.TCFTask; import org.eclipse.ui.IObjectActionDelegate; import org.eclipse.ui.IViewActionDelegate; import org.eclipse.ui.IViewPart; diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/actions/CreateNewTrace.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/actions/CreateNewTrace.java index 99c1af2687..016725a2f1 100644 --- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/actions/CreateNewTrace.java +++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/actions/CreateNewTrace.java @@ -38,8 +38,8 @@ import org.eclipse.rse.core.model.SystemStartHere; import org.eclipse.rse.services.clientserver.messages.SystemMessageException; import org.eclipse.rse.ui.SystemBasePlugin; import org.eclipse.swt.widgets.Shell; -import org.eclipse.tm.tcf.protocol.IToken; -import org.eclipse.tm.tcf.util.TCFTask; +import org.eclipse.tcf.protocol.IToken; +import org.eclipse.tcf.util.TCFTask; import org.eclipse.ui.IObjectActionDelegate; import org.eclipse.ui.IViewActionDelegate; import org.eclipse.ui.IViewPart; diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/actions/PauseTrace.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/actions/PauseTrace.java index 0f3c02cef3..c73ae287af 100644 --- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/actions/PauseTrace.java +++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/actions/PauseTrace.java @@ -34,8 +34,8 @@ import org.eclipse.rse.core.model.SystemStartHere; import org.eclipse.rse.services.clientserver.messages.SystemMessageException; import org.eclipse.rse.ui.SystemBasePlugin; import org.eclipse.swt.widgets.Shell; -import org.eclipse.tm.tcf.protocol.IToken; -import org.eclipse.tm.tcf.util.TCFTask; +import org.eclipse.tcf.protocol.IToken; +import org.eclipse.tcf.util.TCFTask; import org.eclipse.ui.IObjectActionDelegate; import org.eclipse.ui.IViewActionDelegate; import org.eclipse.ui.IViewPart; diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/actions/StartTrace.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/actions/StartTrace.java index 99c8ab3e69..6d5a063601 100644 --- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/actions/StartTrace.java +++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/actions/StartTrace.java @@ -39,8 +39,8 @@ import org.eclipse.rse.core.model.SystemStartHere; import org.eclipse.rse.services.clientserver.messages.SystemMessageException; import org.eclipse.rse.ui.SystemBasePlugin; import org.eclipse.swt.widgets.Shell; -import org.eclipse.tm.tcf.protocol.IToken; -import org.eclipse.tm.tcf.util.TCFTask; +import org.eclipse.tcf.protocol.IToken; +import org.eclipse.tcf.util.TCFTask; import org.eclipse.ui.IObjectActionDelegate; import org.eclipse.ui.IViewActionDelegate; import org.eclipse.ui.IViewPart; diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/actions/StopTrace.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/actions/StopTrace.java index b51165b955..e74247389a 100644 --- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/actions/StopTrace.java +++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/actions/StopTrace.java @@ -36,8 +36,8 @@ import org.eclipse.rse.core.model.SystemStartHere; import org.eclipse.rse.services.clientserver.messages.SystemMessageException; import org.eclipse.rse.ui.SystemBasePlugin; import org.eclipse.swt.widgets.Shell; -import org.eclipse.tm.tcf.protocol.IToken; -import org.eclipse.tm.tcf.util.TCFTask; +import org.eclipse.tcf.protocol.IToken; +import org.eclipse.tcf.util.TCFTask; import org.eclipse.ui.IObjectActionDelegate; import org.eclipse.ui.IViewActionDelegate; import org.eclipse.ui.IViewPart; diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/connectorservice/TraceConnectorService.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/connectorservice/TraceConnectorService.java index c4608e79a3..3adc174223 100644 --- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/connectorservice/TraceConnectorService.java +++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/connectorservice/TraceConnectorService.java @@ -32,13 +32,12 @@ import org.eclipse.rse.core.subsystems.CommunicationsEvent; import org.eclipse.rse.core.subsystems.ISubSystem; import org.eclipse.rse.ui.SystemBasePlugin; import org.eclipse.rse.ui.subsystems.StandardConnectorService; -import org.eclipse.tm.tcf.core.AbstractPeer; -import org.eclipse.tm.tcf.protocol.IChannel; -import org.eclipse.tm.tcf.protocol.IChannel.IEventListener; -import org.eclipse.tm.tcf.protocol.IPeer; -import org.eclipse.tm.tcf.protocol.IService; -import org.eclipse.tm.tcf.protocol.Protocol; -import org.eclipse.tm.tcf.services.ILocator; +import org.eclipse.tcf.core.AbstractPeer; +import org.eclipse.tcf.protocol.IChannel; +import org.eclipse.tcf.protocol.IPeer; +import org.eclipse.tcf.protocol.IService; +import org.eclipse.tcf.protocol.Protocol; +import org.eclipse.tcf.services.ILocator; /** * <b><u>TraceConnectorService</u></b> @@ -276,7 +275,7 @@ public class TraceConnectorService extends StandardConnectorService { } } - final IEventListener listener = new IEventListener() { + final IChannel.IEventListener listener = new IChannel.IEventListener() { @Override public void event(String name, byte[] data) { diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/dialogs/ConfigureMarkersDialog.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/dialogs/ConfigureMarkersDialog.java index 035a8f6248..8612dadcfd 100644 --- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/dialogs/ConfigureMarkersDialog.java +++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/dialogs/ConfigureMarkersDialog.java @@ -41,8 +41,8 @@ import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Table; import org.eclipse.swt.widgets.TableColumn; import org.eclipse.swt.widgets.TableItem; -import org.eclipse.tm.tcf.protocol.IToken; -import org.eclipse.tm.tcf.util.TCFTask; +import org.eclipse.tcf.protocol.IToken; +import org.eclipse.tcf.util.TCFTask; /** * <b><u>ConfigureMarkersDialog</u></b> diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/subsystems/TraceSubSystem.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/subsystems/TraceSubSystem.java index 854d7b840d..01f7d32774 100644 --- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/subsystems/TraceSubSystem.java +++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/subsystems/TraceSubSystem.java @@ -53,8 +53,8 @@ import org.eclipse.rse.services.clientserver.NamePatternMatcher; import org.eclipse.rse.services.clientserver.messages.SystemMessageException; import org.eclipse.rse.ui.SystemBasePlugin; import org.eclipse.swt.widgets.Display; -import org.eclipse.tm.tcf.protocol.IToken; -import org.eclipse.tm.tcf.util.TCFTask; +import org.eclipse.tcf.protocol.IToken; +import org.eclipse.tcf.util.TCFTask; /** * <b><u>TraceSubSystem</u></b> diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/utility/DownloadProxy.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/utility/DownloadProxy.java index c31483364d..0d29fb8b83 100644 --- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/utility/DownloadProxy.java +++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/utility/DownloadProxy.java @@ -21,7 +21,7 @@ import org.eclipse.linuxtools.internal.lttng.core.tracecontrol.model.TraceResour import org.eclipse.linuxtools.internal.lttng.core.tracecontrol.model.config.TraceConfig; import org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.subsystems.TraceSubSystem; import org.eclipse.rse.ui.SystemBasePlugin; -import org.eclipse.tm.tcf.protocol.JSON; +import org.eclipse.tcf.protocol.JSON; /** * <b><u>DownloadProxy</u></b> diff --git a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/wizards/ConfigureTraceWizard.java b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/wizards/ConfigureTraceWizard.java index 270f84f04f..6c772457fc 100644 --- a/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/wizards/ConfigureTraceWizard.java +++ b/lttng/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/internal/lttng/ui/tracecontrol/wizards/ConfigureTraceWizard.java @@ -27,8 +27,8 @@ import org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.TraceControlConstan import org.eclipse.linuxtools.internal.lttng.ui.tracecontrol.subsystems.TraceSubSystem;
import org.eclipse.rse.services.clientserver.messages.SystemMessageException;
import org.eclipse.rse.ui.SystemBasePlugin;
-import org.eclipse.tm.tcf.protocol.IToken;
-import org.eclipse.tm.tcf.util.TCFTask;
+import org.eclipse.tcf.protocol.IToken;
+import org.eclipse.tcf.util.TCFTask;
import org.eclipse.ui.INewWizard;
import org.eclipse.ui.IWorkbench;
|