From 080600d9018f188e488a634be6e25bf91d3f692b Mon Sep 17 00:00:00 2001 From: Marc-Andre Laperle Date: Tue, 14 May 2013 18:36:41 -0400 Subject: [PATCH] Remove UI dependencies in tmf.core. Change-Id: I6b031a39e519b6347c8ae1dede967aad4eb069e3 Signed-off-by: Marc-Andre Laperle Reviewed-on: https://git.eclipse.org/r/12844 Tested-by: Hudson CI IP-Clean: Bernd Hufmann Tested-by: Bernd Hufmann Reviewed-by: Bernd Hufmann --- .../property/BaseEventPropertySource.java | 6 +-- .../KernelProviderPropertySource.java | 4 +- .../property/TargetNodePropertySource.java | 4 +- .../property/TraceChannelPropertySource.java | 4 +- .../property/TraceDomainPropertySource.java | 4 +- .../property/TraceEventPropertySource.java | 6 +-- .../TraceProbeEventPropertySource.java | 4 +- .../property/TraceSessionPropertySource.java | 4 +- .../property/UstProviderPropertySource.java | 4 +- .../META-INF/MANIFEST.MF | 2 - .../tmf/core/ctfadaptor/CtfTmfEvent.java | 14 +------ .../linuxtools/tmf/core/event/TmfEvent.java | 22 +++------- .../linuxtools/internal/tmf/ui/Activator.java | 12 +++++- .../project/model/TmfExperimentElement.java | 2 +- .../ui/project/model/TmfExperimentFolder.java | 2 +- .../tmf/ui/project/model/TmfTraceElement.java | 2 +- .../tmf/ui/project/model/TmfTraceFolder.java | 2 +- .../ReadOnlyTextPropertyDescriptor.java | 4 +- .../events/TmfEventAdapterFactory.java | 41 +++++++++++++++++++ .../events}/TmfEventPropertySource.java | 11 +++-- 20 files changed, 92 insertions(+), 62 deletions(-) rename {org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/util => org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/properties}/ReadOnlyTextPropertyDescriptor.java (93%) create mode 100644 org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/events/TmfEventAdapterFactory.java rename {org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event => org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/events}/TmfEventPropertySource.java (96%) diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/BaseEventPropertySource.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/BaseEventPropertySource.java index 1021bf8041..f31007d9e4 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/BaseEventPropertySource.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/BaseEventPropertySource.java @@ -7,8 +7,8 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Bernd Hufmann - Initial API and implementation - * Bernd Hufmann - Updated for support of LTTng Tools 2.1 + * Bernd Hufmann - Initial API and implementation + * Bernd Hufmann - Updated for support of LTTng Tools 2.1 **********************************************************************/ package org.eclipse.linuxtools.internal.lttng2.ui.views.control.property; @@ -18,7 +18,7 @@ import java.util.List; import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceLogLevel; import org.eclipse.linuxtools.internal.lttng2.ui.views.control.messages.Messages; import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.BaseEventComponent; -import org.eclipse.linuxtools.tmf.core.util.ReadOnlyTextPropertyDescriptor; +import org.eclipse.linuxtools.tmf.ui.properties.ReadOnlyTextPropertyDescriptor; import org.eclipse.ui.views.properties.IPropertyDescriptor; /** diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/KernelProviderPropertySource.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/KernelProviderPropertySource.java index d093967456..8a9d2ba763 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/KernelProviderPropertySource.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/KernelProviderPropertySource.java @@ -7,13 +7,13 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Bernd Hufmann - Initial API and implementation + * Bernd Hufmann - Initial API and implementation **********************************************************************/ package org.eclipse.linuxtools.internal.lttng2.ui.views.control.property; import org.eclipse.linuxtools.internal.lttng2.ui.views.control.messages.Messages; import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.KernelProviderComponent; -import org.eclipse.linuxtools.tmf.core.util.ReadOnlyTextPropertyDescriptor; +import org.eclipse.linuxtools.tmf.ui.properties.ReadOnlyTextPropertyDescriptor; import org.eclipse.ui.views.properties.IPropertyDescriptor; /** diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/TargetNodePropertySource.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/TargetNodePropertySource.java index a4c586d86e..96c67d5e12 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/TargetNodePropertySource.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/TargetNodePropertySource.java @@ -7,13 +7,13 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Bernd Hufmann - Initial API and implementation + * Bernd Hufmann - Initial API and implementation **********************************************************************/ package org.eclipse.linuxtools.internal.lttng2.ui.views.control.property; import org.eclipse.linuxtools.internal.lttng2.ui.views.control.messages.Messages; import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TargetNodeComponent; -import org.eclipse.linuxtools.tmf.core.util.ReadOnlyTextPropertyDescriptor; +import org.eclipse.linuxtools.tmf.ui.properties.ReadOnlyTextPropertyDescriptor; import org.eclipse.ui.views.properties.IPropertyDescriptor; /** diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/TraceChannelPropertySource.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/TraceChannelPropertySource.java index f6eb24ca0d..544c7fa221 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/TraceChannelPropertySource.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/TraceChannelPropertySource.java @@ -7,13 +7,13 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Bernd Hufmann - Initial API and implementation + * Bernd Hufmann - Initial API and implementation **********************************************************************/ package org.eclipse.linuxtools.internal.lttng2.ui.views.control.property; import org.eclipse.linuxtools.internal.lttng2.ui.views.control.messages.Messages; import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceChannelComponent; -import org.eclipse.linuxtools.tmf.core.util.ReadOnlyTextPropertyDescriptor; +import org.eclipse.linuxtools.tmf.ui.properties.ReadOnlyTextPropertyDescriptor; import org.eclipse.ui.views.properties.IPropertyDescriptor; /** diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/TraceDomainPropertySource.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/TraceDomainPropertySource.java index 8e5de7f7a7..b0ad41e240 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/TraceDomainPropertySource.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/TraceDomainPropertySource.java @@ -7,13 +7,13 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Bernd Hufmann - Initial API and implementation + * Bernd Hufmann - Initial API and implementation **********************************************************************/ package org.eclipse.linuxtools.internal.lttng2.ui.views.control.property; import org.eclipse.linuxtools.internal.lttng2.ui.views.control.messages.Messages; import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceDomainComponent; -import org.eclipse.linuxtools.tmf.core.util.ReadOnlyTextPropertyDescriptor; +import org.eclipse.linuxtools.tmf.ui.properties.ReadOnlyTextPropertyDescriptor; import org.eclipse.ui.views.properties.IPropertyDescriptor; /** diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/TraceEventPropertySource.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/TraceEventPropertySource.java index 51f3d14e2c..de98bf2ee2 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/TraceEventPropertySource.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/TraceEventPropertySource.java @@ -7,8 +7,8 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Bernd Hufmann - Initial API and implementation - * Bernd Hufmann - Updated for support of LTTng Tools 2.1 + * Bernd Hufmann - Initial API and implementation + * Bernd Hufmann - Updated for support of LTTng Tools 2.1 **********************************************************************/ package org.eclipse.linuxtools.internal.lttng2.ui.views.control.property; @@ -18,7 +18,7 @@ import java.util.List; import org.eclipse.linuxtools.internal.lttng2.core.control.model.TraceLogLevel; import org.eclipse.linuxtools.internal.lttng2.ui.views.control.messages.Messages; import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceEventComponent; -import org.eclipse.linuxtools.tmf.core.util.ReadOnlyTextPropertyDescriptor; +import org.eclipse.linuxtools.tmf.ui.properties.ReadOnlyTextPropertyDescriptor; import org.eclipse.ui.views.properties.IPropertyDescriptor; /** diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/TraceProbeEventPropertySource.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/TraceProbeEventPropertySource.java index 4f07ff9c70..6811199711 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/TraceProbeEventPropertySource.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/TraceProbeEventPropertySource.java @@ -7,7 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Bernd Hufmann - Initial API and implementation + * Bernd Hufmann - Initial API and implementation **********************************************************************/ package org.eclipse.linuxtools.internal.lttng2.ui.views.control.property; @@ -18,7 +18,7 @@ import java.util.List; import org.eclipse.linuxtools.internal.lttng2.ui.views.control.messages.Messages; import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceEventComponent; import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceProbeEventComponent; -import org.eclipse.linuxtools.tmf.core.util.ReadOnlyTextPropertyDescriptor; +import org.eclipse.linuxtools.tmf.ui.properties.ReadOnlyTextPropertyDescriptor; import org.eclipse.ui.views.properties.IPropertyDescriptor; /** diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/TraceSessionPropertySource.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/TraceSessionPropertySource.java index ef6cab6325..96c7e8f26d 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/TraceSessionPropertySource.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/TraceSessionPropertySource.java @@ -7,13 +7,13 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Bernd Hufmann - Initial API and implementation + * Bernd Hufmann - Initial API and implementation **********************************************************************/ package org.eclipse.linuxtools.internal.lttng2.ui.views.control.property; import org.eclipse.linuxtools.internal.lttng2.ui.views.control.messages.Messages; import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.TraceSessionComponent; -import org.eclipse.linuxtools.tmf.core.util.ReadOnlyTextPropertyDescriptor; +import org.eclipse.linuxtools.tmf.ui.properties.ReadOnlyTextPropertyDescriptor; import org.eclipse.ui.views.properties.IPropertyDescriptor; /** diff --git a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/UstProviderPropertySource.java b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/UstProviderPropertySource.java index 1bb4f518b7..2024346a85 100644 --- a/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/UstProviderPropertySource.java +++ b/org.eclipse.linuxtools.lttng2.ui/src/org/eclipse/linuxtools/internal/lttng2/ui/views/control/property/UstProviderPropertySource.java @@ -7,13 +7,13 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Bernd Hufmann - Initial API and implementation + * Bernd Hufmann - Initial API and implementation **********************************************************************/ package org.eclipse.linuxtools.internal.lttng2.ui.views.control.property; import org.eclipse.linuxtools.internal.lttng2.ui.views.control.messages.Messages; import org.eclipse.linuxtools.internal.lttng2.ui.views.control.model.impl.UstProviderComponent; -import org.eclipse.linuxtools.tmf.core.util.ReadOnlyTextPropertyDescriptor; +import org.eclipse.linuxtools.tmf.ui.properties.ReadOnlyTextPropertyDescriptor; import org.eclipse.ui.views.properties.IPropertyDescriptor; /** diff --git a/org.eclipse.linuxtools.tmf.core/META-INF/MANIFEST.MF b/org.eclipse.linuxtools.tmf.core/META-INF/MANIFEST.MF index 6e60aff4bb..270c4fa4a1 100644 --- a/org.eclipse.linuxtools.tmf.core/META-INF/MANIFEST.MF +++ b/org.eclipse.linuxtools.tmf.core/META-INF/MANIFEST.MF @@ -10,8 +10,6 @@ Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Require-Bundle: org.eclipse.core.runtime, org.eclipse.core.resources, - org.eclipse.jface, - org.eclipse.ui.views, org.eclipse.linuxtools.ctf.core;bundle-version="2.0.0" Export-Package: org.eclipse.linuxtools.internal.tmf.core;x-friends:="org.eclipse.linuxtools.tmf.core.tests", org.eclipse.linuxtools.internal.tmf.core.component;x-friends:="org.eclipse.linuxtools.tmf.core.tests", diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/ctfadaptor/CtfTmfEvent.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/ctfadaptor/CtfTmfEvent.java index 1b3a609d62..ae002a0cc9 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/ctfadaptor/CtfTmfEvent.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/ctfadaptor/CtfTmfEvent.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011-2013 Ericsson + * Copyright (c) 2011, 2013 Ericsson * * All rights reserved. This program and the accompanying materials are made * available under the terms of the Eclipse Public License v1.0 which @@ -23,11 +23,9 @@ import org.eclipse.linuxtools.tmf.core.event.ITmfEventField; import org.eclipse.linuxtools.tmf.core.event.ITmfEventType; import org.eclipse.linuxtools.tmf.core.event.TmfEvent; import org.eclipse.linuxtools.tmf.core.event.TmfEventField; -import org.eclipse.linuxtools.tmf.core.event.TmfEventPropertySource; import org.eclipse.linuxtools.tmf.core.event.lookup.ITmfModelLookup; import org.eclipse.linuxtools.tmf.core.event.lookup.ITmfSourceLookup; import org.eclipse.linuxtools.tmf.core.trace.ITmfContext; -import org.eclipse.ui.views.properties.IPropertySource; /** * A wrapper class around CTF's Event Definition/Declaration that maps all @@ -211,14 +209,4 @@ public final class CtfTmfEvent extends TmfEvent return getCustomAttribute(CtfConstants.MODEL_URI_KEY); } - /** - * @since 2.0 - */ - @Override - public Object getAdapter(Class adapter) { - if (adapter == IPropertySource.class) { - return new TmfEventPropertySource(this); - } - return null; - } } diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfEvent.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfEvent.java index 7f1cb30def..0a1763a864 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfEvent.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfEvent.java @@ -7,17 +7,17 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Francois Chouinard - Initial API and implementation - * Francois Chouinard - Updated as per TMF Event Model 1.0 - * Alexandre Montplaisir - Made immutable + * Francois Chouinard - Initial API and implementation + * Francois Chouinard - Updated as per TMF Event Model 1.0 + * Alexandre Montplaisir - Made immutable *******************************************************************************/ package org.eclipse.linuxtools.tmf.core.event; +import org.eclipse.core.runtime.PlatformObject; import org.eclipse.linuxtools.tmf.core.timestamp.ITmfTimestamp; import org.eclipse.linuxtools.tmf.core.trace.ITmfContext; import org.eclipse.linuxtools.tmf.core.trace.ITmfTrace; -import org.eclipse.ui.views.properties.IPropertySource; /** * A basic implementation of ITmfEvent. @@ -29,8 +29,8 @@ import org.eclipse.ui.views.properties.IPropertySource; * @see ITmfEventType * @see ITmfEventField * @see ITmfTrace -*/ -public class TmfEvent implements ITmfEvent { + */ +public class TmfEvent extends PlatformObject implements ITmfEvent { // ------------------------------------------------------------------------ // Attributes @@ -246,14 +246,4 @@ public class TmfEvent implements ITmfEvent { + "]"; } - /** - * @since 2.0 - */ - @Override - public Object getAdapter(Class adapter) { - if (adapter == IPropertySource.class) { - return new TmfEventPropertySource(this); - } - return null; - } } diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/Activator.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/Activator.java index 559906c3b3..6b290faff6 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/Activator.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/Activator.java @@ -7,17 +7,20 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Francois Chouinard - Initial API and implementation + * Francois Chouinard - Initial API and implementation *******************************************************************************/ package org.eclipse.linuxtools.internal.tmf.ui; import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.Platform; import org.eclipse.core.runtime.Status; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.resource.ImageRegistry; +import org.eclipse.linuxtools.tmf.core.event.ITmfEvent; import org.eclipse.linuxtools.tmf.ui.project.model.TmfTraceElement; import org.eclipse.linuxtools.tmf.ui.properties.TmfTimePreferences; +import org.eclipse.linuxtools.tmf.ui.viewers.events.TmfEventAdapterFactory; import org.eclipse.swt.graphics.Image; import org.eclipse.ui.plugin.AbstractUIPlugin; import org.osgi.framework.BundleContext; @@ -41,6 +44,8 @@ public class Activator extends AbstractUIPlugin { */ private static Activator plugin; + private TmfEventAdapterFactory fTmfEventAdapterFactory; + // ------------------------------------------------------------------------ // Constructors // ------------------------------------------------------------------------ @@ -75,12 +80,17 @@ public class Activator extends AbstractUIPlugin { TmfUiTracer.init(); TmfTraceElement.init(); TmfTimePreferences.init(); + + fTmfEventAdapterFactory = new TmfEventAdapterFactory(); + Platform.getAdapterManager().registerAdapters(fTmfEventAdapterFactory, ITmfEvent.class); } @Override public void stop(BundleContext context) throws Exception { TmfUiTracer.stop(); plugin = null; + + Platform.getAdapterManager().unregisterAdapters(fTmfEventAdapterFactory); super.stop(context); } diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/model/TmfExperimentElement.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/model/TmfExperimentElement.java index 8b44a94531..5e8074a9ba 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/model/TmfExperimentElement.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/model/TmfExperimentElement.java @@ -32,7 +32,7 @@ import org.eclipse.core.runtime.QualifiedName; import org.eclipse.linuxtools.internal.tmf.ui.Activator; import org.eclipse.linuxtools.tmf.core.TmfCommonConstants; import org.eclipse.linuxtools.tmf.core.trace.TmfExperiment; -import org.eclipse.linuxtools.tmf.core.util.ReadOnlyTextPropertyDescriptor; +import org.eclipse.linuxtools.tmf.ui.properties.ReadOnlyTextPropertyDescriptor; import org.eclipse.ui.IEditorReference; import org.eclipse.ui.IWorkbench; import org.eclipse.ui.IWorkbenchPage; diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/model/TmfExperimentFolder.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/model/TmfExperimentFolder.java index ce7388ef31..6498ef257a 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/model/TmfExperimentFolder.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/model/TmfExperimentFolder.java @@ -15,7 +15,7 @@ package org.eclipse.linuxtools.tmf.ui.project.model; import java.util.Arrays; import org.eclipse.core.resources.IFolder; -import org.eclipse.linuxtools.tmf.core.util.ReadOnlyTextPropertyDescriptor; +import org.eclipse.linuxtools.tmf.ui.properties.ReadOnlyTextPropertyDescriptor; import org.eclipse.ui.views.properties.IPropertyDescriptor; import org.eclipse.ui.views.properties.IPropertySource2; diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/model/TmfTraceElement.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/model/TmfTraceElement.java index 3652939e1c..2a81f93472 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/model/TmfTraceElement.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/model/TmfTraceElement.java @@ -39,8 +39,8 @@ import org.eclipse.linuxtools.tmf.core.TmfCommonConstants; import org.eclipse.linuxtools.tmf.core.event.ITmfEvent; import org.eclipse.linuxtools.tmf.core.trace.ITmfTrace; import org.eclipse.linuxtools.tmf.core.trace.TmfTrace; -import org.eclipse.linuxtools.tmf.core.util.ReadOnlyTextPropertyDescriptor; import org.eclipse.linuxtools.tmf.ui.editors.TmfEventsEditor; +import org.eclipse.linuxtools.tmf.ui.properties.ReadOnlyTextPropertyDescriptor; import org.eclipse.ui.IActionFilter; import org.eclipse.ui.IEditorReference; import org.eclipse.ui.IWorkbench; diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/model/TmfTraceFolder.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/model/TmfTraceFolder.java index 946f30dd79..4b68b71122 100644 --- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/model/TmfTraceFolder.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/model/TmfTraceFolder.java @@ -17,7 +17,7 @@ import java.util.Arrays; import java.util.List; import org.eclipse.core.resources.IFolder; -import org.eclipse.linuxtools.tmf.core.util.ReadOnlyTextPropertyDescriptor; +import org.eclipse.linuxtools.tmf.ui.properties.ReadOnlyTextPropertyDescriptor; import org.eclipse.ui.views.properties.IPropertyDescriptor; import org.eclipse.ui.views.properties.IPropertySource2; diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/util/ReadOnlyTextPropertyDescriptor.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/properties/ReadOnlyTextPropertyDescriptor.java similarity index 93% rename from org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/util/ReadOnlyTextPropertyDescriptor.java rename to org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/properties/ReadOnlyTextPropertyDescriptor.java index 83f745bf48..79dbbfaeb1 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/util/ReadOnlyTextPropertyDescriptor.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/properties/ReadOnlyTextPropertyDescriptor.java @@ -7,10 +7,10 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Alexandre Montplaisir - Initial API and implementation + * Alexandre Montplaisir - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.tmf.core.util; +package org.eclipse.linuxtools.tmf.ui.properties; import org.eclipse.jface.viewers.CellEditor; import org.eclipse.jface.viewers.TextCellEditor; diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/events/TmfEventAdapterFactory.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/events/TmfEventAdapterFactory.java new file mode 100644 index 0000000000..05157b7b53 --- /dev/null +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/events/TmfEventAdapterFactory.java @@ -0,0 +1,41 @@ +/******************************************************************************* + * Copyright (c) 2013 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: + * Marc-Andre Laperle - Initial API and implementation + *******************************************************************************/ +package org.eclipse.linuxtools.tmf.ui.viewers.events; + +import org.eclipse.core.runtime.IAdapterFactory; +import org.eclipse.linuxtools.tmf.core.event.ITmfEvent; +import org.eclipse.ui.views.properties.IPropertySource; + +/** + * Implements basic UI support for TMF events. + * + * @since 2.0 + */ +public class TmfEventAdapterFactory implements IAdapterFactory { + + private static Class[] PROPERTIES = new Class[] { + IPropertySource.class + }; + + @Override + public Class[] getAdapterList() { + return PROPERTIES; + } + + @Override + public Object getAdapter(Object element, Class key) { + ITmfEvent tmfEvent = (ITmfEvent) element; + if (IPropertySource.class.equals(key)) { + return new TmfEventPropertySource(tmfEvent); + } + return null; + } +} diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfEventPropertySource.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/events/TmfEventPropertySource.java similarity index 96% rename from org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfEventPropertySource.java rename to org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/events/TmfEventPropertySource.java index 539d10d836..7a66fbcc6b 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfEventPropertySource.java +++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/viewers/events/TmfEventPropertySource.java @@ -7,19 +7,22 @@ * http://www.eclipse.org/legal/epl-v10.html * * Contributors: - * Patrick Tasse - Initial API and implementation - * Bernd Hufmann - Added call site and model URI properties + * Patrick Tasse - Initial API and implementation + * Bernd Hufmann - Added call site and model URI properties *******************************************************************************/ -package org.eclipse.linuxtools.tmf.core.event; +package org.eclipse.linuxtools.tmf.ui.viewers.events; import java.util.ArrayList; import java.util.List; +import org.eclipse.linuxtools.tmf.core.event.ITmfCustomAttributes; +import org.eclipse.linuxtools.tmf.core.event.ITmfEvent; +import org.eclipse.linuxtools.tmf.core.event.ITmfEventField; import org.eclipse.linuxtools.tmf.core.event.lookup.ITmfModelLookup; import org.eclipse.linuxtools.tmf.core.event.lookup.ITmfSourceLookup; import org.eclipse.linuxtools.tmf.core.timestamp.ITmfTimestamp; -import org.eclipse.linuxtools.tmf.core.util.ReadOnlyTextPropertyDescriptor; +import org.eclipse.linuxtools.tmf.ui.properties.ReadOnlyTextPropertyDescriptor; import org.eclipse.ui.views.properties.IPropertyDescriptor; import org.eclipse.ui.views.properties.IPropertySource; -- 2.34.1