From 1b5ad3d908fe0967df5cc8394c98a4ef8cea64cc Mon Sep 17 00:00:00 2001 From: Francois Chouinard Date: Fri, 23 Mar 2012 13:31:35 -0400 Subject: [PATCH] Expose more tmf.ui.signal --- .../META-INF/MANIFEST.MF | 2 +- .../tmf/ui/editors/TmfEventsEditor.java | 6 +-- .../tmf/ui/signal/TmfTraceClosedSignal.java | 38 ++++++++++++++ .../tmf/ui/signal/TmfTraceOpenedSignal.java | 52 +++++++++++++++++++ .../signal/TmfTraceParserUpdatedSignal.java | 38 ++++++++++++++ .../tmf/ui/views/timechart/TimeChartView.java | 4 +- 6 files changed, 134 insertions(+), 6 deletions(-) create mode 100644 org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/signal/TmfTraceClosedSignal.java create mode 100644 org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/signal/TmfTraceOpenedSignal.java create mode 100644 org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/signal/TmfTraceParserUpdatedSignal.java diff --git a/org.eclipse.linuxtools.tmf.ui/META-INF/MANIFEST.MF b/org.eclipse.linuxtools.tmf.ui/META-INF/MANIFEST.MF index c3a88c0879..159a30a193 100644 --- a/org.eclipse.linuxtools.tmf.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.linuxtools.tmf.ui/META-INF/MANIFEST.MF @@ -18,10 +18,10 @@ Require-Bundle: org.eclipse.ui;bundle-version="3.7.0", org.eclipse.ui.navigator.resources;bundle-version="3.4.300", org.eclipse.core.expressions Export-Package: org.eclipse.linuxtools.internal.tmf.ui;x-friends:="org.eclipse.linuxtools.tmf.ui.tests", - org.eclipse.linuxtools.internal.tmf.ui.commands, org.eclipse.linuxtools.tmf.ui.editors, org.eclipse.linuxtools.tmf.ui.project.model, org.eclipse.linuxtools.tmf.ui.project.wizards, + org.eclipse.linuxtools.tmf.ui.signal, org.eclipse.linuxtools.tmf.ui.viewers, org.eclipse.linuxtools.tmf.ui.viewers.events, org.eclipse.linuxtools.tmf.ui.viewers.timeAnalysis, diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/editors/TmfEventsEditor.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/editors/TmfEventsEditor.java index 17f4cd0f7b..f2f583ca72 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/editors/TmfEventsEditor.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/editors/TmfEventsEditor.java @@ -34,9 +34,6 @@ import org.eclipse.linuxtools.internal.tmf.ui.parsers.custom.CustomEventsTable; import org.eclipse.linuxtools.internal.tmf.ui.parsers.custom.CustomTxtTrace; import org.eclipse.linuxtools.internal.tmf.ui.parsers.custom.CustomXmlTrace; import org.eclipse.linuxtools.internal.tmf.ui.project.handlers.Messages; -import org.eclipse.linuxtools.internal.tmf.ui.signal.TmfTraceClosedSignal; -import org.eclipse.linuxtools.internal.tmf.ui.signal.TmfTraceOpenedSignal; -import org.eclipse.linuxtools.internal.tmf.ui.signal.TmfTraceParserUpdatedSignal; import org.eclipse.linuxtools.tmf.core.event.TmfEvent; import org.eclipse.linuxtools.tmf.core.experiment.TmfExperiment; import org.eclipse.linuxtools.tmf.core.signal.TmfSignalHandler; @@ -50,6 +47,9 @@ import org.eclipse.linuxtools.tmf.ui.project.model.TmfNavigatorContentProvider; import org.eclipse.linuxtools.tmf.ui.project.model.TmfProjectElement; import org.eclipse.linuxtools.tmf.ui.project.model.TmfProjectRegistry; import org.eclipse.linuxtools.tmf.ui.project.model.TmfTraceElement; +import org.eclipse.linuxtools.tmf.ui.signal.TmfTraceClosedSignal; +import org.eclipse.linuxtools.tmf.ui.signal.TmfTraceOpenedSignal; +import org.eclipse.linuxtools.tmf.ui.signal.TmfTraceParserUpdatedSignal; import org.eclipse.linuxtools.tmf.ui.viewers.events.TmfEventsTable; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Display; diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/signal/TmfTraceClosedSignal.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/signal/TmfTraceClosedSignal.java new file mode 100644 index 0000000000..e97b960107 --- /dev/null +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/signal/TmfTraceClosedSignal.java @@ -0,0 +1,38 @@ +/******************************************************************************* + * Copyright (c) 2010 Ericsson + * + * All rights reserved. This program and the accompanying materials are + * made available under the terms of the Eclipse Public License v1.0 which + * accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Patrick Tasse - Initial API and implementation + *******************************************************************************/ + +package org.eclipse.linuxtools.tmf.ui.signal; + +import org.eclipse.linuxtools.tmf.core.signal.TmfSignal; +import org.eclipse.linuxtools.tmf.core.trace.ITmfTrace; + +/** + * TmfTraceClosedSignal + */ +public class TmfTraceClosedSignal extends TmfSignal { + + private final ITmfTrace fTrace; + + public TmfTraceClosedSignal(Object source, ITmfTrace trace) { + super(source); + fTrace = trace; + } + + public ITmfTrace getTrace() { + return fTrace; + } + + @Override + public String toString() { + return "[TmfTraceClosedSignal (" + fTrace.getName() + ")]"; //$NON-NLS-1$ //$NON-NLS-2$ + } +} diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/signal/TmfTraceOpenedSignal.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/signal/TmfTraceOpenedSignal.java new file mode 100644 index 0000000000..1ea6f8a1b2 --- /dev/null +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/signal/TmfTraceOpenedSignal.java @@ -0,0 +1,52 @@ +/******************************************************************************* + * Copyright (c) 2010 Ericsson + * + * All rights reserved. This program and the accompanying materials are + * made available under the terms of the Eclipse Public License v1.0 which + * accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Patrick Tasse - Initial API and implementation + *******************************************************************************/ + +package org.eclipse.linuxtools.tmf.ui.signal; + +import org.eclipse.core.resources.IFile; +import org.eclipse.linuxtools.tmf.core.signal.TmfSignal; +import org.eclipse.linuxtools.tmf.core.trace.ITmfTrace; +import org.eclipse.linuxtools.tmf.ui.viewers.events.ITmfEventsFilterProvider; + +/** + * TmfTraceOpenedSignal + */ +public class TmfTraceOpenedSignal extends TmfSignal { + + private final ITmfTrace fTrace; + private final IFile fBookmarksFile; + private final ITmfEventsFilterProvider fEventsFilterProvider; + + public TmfTraceOpenedSignal(Object source, ITmfTrace trace, IFile bookmarksFile, ITmfEventsFilterProvider eventsFilterProvider) { + super(source); + fTrace = trace; + fBookmarksFile = bookmarksFile; + fEventsFilterProvider = eventsFilterProvider; + } + + public ITmfTrace getTrace() { + return fTrace; + } + + public IFile getBookmarksFile() { + return fBookmarksFile; + } + + public ITmfEventsFilterProvider getEventsFilterProvider() { + return fEventsFilterProvider; + } + + @Override + public String toString() { + return "[TmfTraceOpenedSignal (" + fTrace.getName() + ")]"; //$NON-NLS-1$ //$NON-NLS-2$ + } +} diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/signal/TmfTraceParserUpdatedSignal.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/signal/TmfTraceParserUpdatedSignal.java new file mode 100644 index 0000000000..081869e8d8 --- /dev/null +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/signal/TmfTraceParserUpdatedSignal.java @@ -0,0 +1,38 @@ +/******************************************************************************* + * Copyright (c) 2010 Ericsson + * + * All rights reserved. This program and the accompanying materials are + * made available under the terms of the Eclipse Public License v1.0 which + * accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Patrick Tasse - Initial API and implementation + *******************************************************************************/ + +package org.eclipse.linuxtools.tmf.ui.signal; + +import org.eclipse.core.resources.IResource; +import org.eclipse.linuxtools.tmf.core.signal.TmfSignal; + +/** + * TmfTraceParserUpdatedSignal + */ +public class TmfTraceParserUpdatedSignal extends TmfSignal { + + private final IResource fTraceResource; + + public TmfTraceParserUpdatedSignal(Object source, IResource traceResource) { + super(source); + fTraceResource = traceResource; + } + + public IResource getTraceResource() { + return fTraceResource; + } + + @Override + public String toString() { + return "[TmfTraceParserUpdatedSignal (" + fTraceResource.getName() + ")]"; //$NON-NLS-1$ //$NON-NLS-2$ + } +} diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/timechart/TimeChartView.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/timechart/TimeChartView.java index 6abf27c8d4..e105915b0f 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/timechart/TimeChartView.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/views/timechart/TimeChartView.java @@ -24,8 +24,6 @@ import org.eclipse.core.resources.IResourceChangeEvent; import org.eclipse.core.resources.IResourceChangeListener; import org.eclipse.core.resources.IResourceDelta; import org.eclipse.core.resources.ResourcesPlugin; -import org.eclipse.linuxtools.internal.tmf.ui.signal.TmfTraceClosedSignal; -import org.eclipse.linuxtools.internal.tmf.ui.signal.TmfTraceOpenedSignal; import org.eclipse.linuxtools.tmf.core.event.ITmfEvent; import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp; import org.eclipse.linuxtools.tmf.core.filter.ITmfFilter; @@ -36,6 +34,8 @@ import org.eclipse.linuxtools.tmf.core.signal.TmfTraceUpdatedSignal; import org.eclipse.linuxtools.tmf.core.trace.ITmfContext; import org.eclipse.linuxtools.tmf.core.trace.ITmfTrace; import org.eclipse.linuxtools.tmf.ui.editors.ITmfTraceEditor; +import org.eclipse.linuxtools.tmf.ui.signal.TmfTraceClosedSignal; +import org.eclipse.linuxtools.tmf.ui.signal.TmfTraceOpenedSignal; import org.eclipse.linuxtools.tmf.ui.viewers.TmfViewerFactory; import org.eclipse.linuxtools.tmf.ui.viewers.events.ITmfEventsFilterListener; import org.eclipse.linuxtools.tmf.ui.viewers.events.ITmfEventsFilterProvider; -- 2.34.1