From e3366401ec9c870e49931c9576e6a12e0793855d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Genevi=C3=A8ve=20Bastien?= Date: Wed, 5 Feb 2014 14:22:04 -0500 Subject: [PATCH] TMF: Changed the LTTng kernel analysis module to use the output extension MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit The analysis module itself has moved to the .core plugin and the views are associated to it via the analysis output extension point. Change-Id: Ic92478e6a67be0888c112e90769199fd4dd8c547 Signed-off-by: Geneviève Bastien Reviewed-on: https://git.eclipse.org/r/21582 Tested-by: Hudson CI Reviewed-by: Marc-Andre Laperle IP-Clean: Marc-Andre Laperle Tested-by: Marc-Andre Laperle --- .../META-INF/MANIFEST.MF | 1 + .../build.properties | 5 ++- .../plugin.properties | 4 ++- .../plugin.xml | 16 +++++++++ .../analysis/LttngKernelAnalysisModule.java | 10 ++---- .../lttng2/kernel/core/analysis/Messages.java | 36 +++++++++++++++++++ .../kernel/core/analysis/messages.properties | 13 +++++++ .../META-INF/MANIFEST.MF | 3 +- .../plugin.properties | 2 -- .../plugin.xml | 23 +++++++----- .../internal/lttng2/kernel/ui/Messages.java | 2 -- .../lttng2/kernel/ui/messages.properties | 2 -- .../ControlFlowPresentationProvider.java | 2 +- .../ui/views/controlflow/ControlFlowView.java | 2 +- .../ResourcesPresentationProvider.java | 2 +- .../ui/views/resources/ResourcesView.java | 2 +- 16 files changed, 94 insertions(+), 31 deletions(-) create mode 100644 org.eclipse.linuxtools.lttng2.kernel.core/plugin.xml rename {org.eclipse.linuxtools.lttng2.kernel.ui/src/org/eclipse/linuxtools/lttng2/kernel/ui => org.eclipse.linuxtools.lttng2.kernel.core/src/org/eclipse/linuxtools/lttng2/kernel/core}/analysis/LttngKernelAnalysisModule.java (81%) create mode 100644 org.eclipse.linuxtools.lttng2.kernel.core/src/org/eclipse/linuxtools/lttng2/kernel/core/analysis/Messages.java create mode 100644 org.eclipse.linuxtools.lttng2.kernel.core/src/org/eclipse/linuxtools/lttng2/kernel/core/analysis/messages.properties diff --git a/org.eclipse.linuxtools.lttng2.kernel.core/META-INF/MANIFEST.MF b/org.eclipse.linuxtools.lttng2.kernel.core/META-INF/MANIFEST.MF index 7effe4d465..ccb2254449 100644 --- a/org.eclipse.linuxtools.lttng2.kernel.core/META-INF/MANIFEST.MF +++ b/org.eclipse.linuxtools.lttng2.kernel.core/META-INF/MANIFEST.MF @@ -14,5 +14,6 @@ Require-Bundle: org.eclipse.core.runtime, org.eclipse.linuxtools.tmf.core;bundle-version="3.0.0" Export-Package: org.eclipse.linuxtools.internal.lttng2.kernel.core;x-friends:="org.eclipse.linuxtools.lttng2.kernel.ui,org.eclipse.linuxtools.lttng2.kernel.core.tests", org.eclipse.linuxtools.internal.lttng2.kernel.core.stateprovider;x-friends:="org.eclipse.linuxtools.lttng2.kernel.ui,org.eclipse.linuxtools.lttng2.kernel.core.tests", + org.eclipse.linuxtools.lttng2.kernel.core.analysis, org.eclipse.linuxtools.lttng2.kernel.core.event.matching, org.eclipse.linuxtools.lttng2.kernel.core.trace diff --git a/org.eclipse.linuxtools.lttng2.kernel.core/build.properties b/org.eclipse.linuxtools.lttng2.kernel.core/build.properties index ddfbe617f6..08ffd17f77 100644 --- a/org.eclipse.linuxtools.lttng2.kernel.core/build.properties +++ b/org.eclipse.linuxtools.lttng2.kernel.core/build.properties @@ -15,5 +15,8 @@ output.. = bin/ bin.includes = META-INF/,\ .,\ about.html,\ - plugin.properties + plugin.properties,\ + plugin.xml src.includes = about.html +additional.bundles = org.eclipse.jdt.annotation +jars.extra.classpath = platform:/plugin/org.eclipse.jdt.annotation diff --git a/org.eclipse.linuxtools.lttng2.kernel.core/plugin.properties b/org.eclipse.linuxtools.lttng2.kernel.core/plugin.properties index 3321510d8f..1b3c83845f 100644 --- a/org.eclipse.linuxtools.lttng2.kernel.core/plugin.properties +++ b/org.eclipse.linuxtools.lttng2.kernel.core/plugin.properties @@ -12,4 +12,6 @@ #Properties file for org.eclipse.linuxtools.lttng2.kernel.core Bundle-Vendor = Eclipse Linux Tools -Bundle-Name = Linux Tools LTTng Kernel Analysis Core Plug-in \ No newline at end of file +Bundle-Name = Linux Tools LTTng Kernel Analysis Core Plug-in + +analysis.lttngkernel = LTTng Kernel Analysis diff --git a/org.eclipse.linuxtools.lttng2.kernel.core/plugin.xml b/org.eclipse.linuxtools.lttng2.kernel.core/plugin.xml new file mode 100644 index 0000000000..cf7aefb756 --- /dev/null +++ b/org.eclipse.linuxtools.lttng2.kernel.core/plugin.xml @@ -0,0 +1,16 @@ + + + + + + + + + + diff --git a/org.eclipse.linuxtools.lttng2.kernel.ui/src/org/eclipse/linuxtools/lttng2/kernel/ui/analysis/LttngKernelAnalysisModule.java b/org.eclipse.linuxtools.lttng2.kernel.core/src/org/eclipse/linuxtools/lttng2/kernel/core/analysis/LttngKernelAnalysisModule.java similarity index 81% rename from org.eclipse.linuxtools.lttng2.kernel.ui/src/org/eclipse/linuxtools/lttng2/kernel/ui/analysis/LttngKernelAnalysisModule.java rename to org.eclipse.linuxtools.lttng2.kernel.core/src/org/eclipse/linuxtools/lttng2/kernel/core/analysis/LttngKernelAnalysisModule.java index 354b054ca3..5fdc13ff86 100644 --- a/org.eclipse.linuxtools.lttng2.kernel.ui/src/org/eclipse/linuxtools/lttng2/kernel/ui/analysis/LttngKernelAnalysisModule.java +++ b/org.eclipse.linuxtools.lttng2.kernel.core/src/org/eclipse/linuxtools/lttng2/kernel/core/analysis/LttngKernelAnalysisModule.java @@ -10,19 +10,15 @@ * Geneviève Bastien - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.lttng2.kernel.ui.analysis; +package org.eclipse.linuxtools.lttng2.kernel.core.analysis; import org.eclipse.jdt.annotation.NonNull; import org.eclipse.linuxtools.internal.lttng2.kernel.core.stateprovider.LttngKernelStateProvider; -import org.eclipse.linuxtools.internal.lttng2.kernel.ui.Messages; -import org.eclipse.linuxtools.internal.lttng2.kernel.ui.views.controlflow.ControlFlowView; -import org.eclipse.linuxtools.internal.lttng2.kernel.ui.views.resources.ResourcesView; import org.eclipse.linuxtools.lttng2.kernel.core.trace.LttngKernelTrace; import org.eclipse.linuxtools.tmf.core.exceptions.TmfAnalysisException; import org.eclipse.linuxtools.tmf.core.statesystem.ITmfStateProvider; import org.eclipse.linuxtools.tmf.core.statesystem.TmfStateSystemAnalysisModule; import org.eclipse.linuxtools.tmf.core.trace.ITmfTrace; -import org.eclipse.linuxtools.tmf.ui.analysis.TmfAnalysisViewOutput; /** * State System Module for lttng kernel traces @@ -46,8 +42,6 @@ public class LttngKernelAnalysisModule extends TmfStateSystemAnalysisModule { */ public LttngKernelAnalysisModule() { super(); - this.registerOutput(new TmfAnalysisViewOutput(ControlFlowView.ID)); - this.registerOutput(new TmfAnalysisViewOutput(ResourcesView.ID)); } @Override @@ -78,7 +72,7 @@ public class LttngKernelAnalysisModule extends TmfStateSystemAnalysisModule { @Override protected String getFullHelpText() { - return Messages.LttngKernelAnalysis_Help; + return Messages.LttngKernelAnalysisModule_Help; } } diff --git a/org.eclipse.linuxtools.lttng2.kernel.core/src/org/eclipse/linuxtools/lttng2/kernel/core/analysis/Messages.java b/org.eclipse.linuxtools.lttng2.kernel.core/src/org/eclipse/linuxtools/lttng2/kernel/core/analysis/Messages.java new file mode 100644 index 0000000000..01696e2d84 --- /dev/null +++ b/org.eclipse.linuxtools.lttng2.kernel.core/src/org/eclipse/linuxtools/lttng2/kernel/core/analysis/Messages.java @@ -0,0 +1,36 @@ +/******************************************************************************* + * Copyright (c) 2014 École Polytechnique de Montréal + * + * 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: + * Geneviève Bastien - Initial API and implementation + *******************************************************************************/ + +package org.eclipse.linuxtools.lttng2.kernel.core.analysis; + +import org.eclipse.osgi.util.NLS; + +/** + * Externalized message strings from the LTTng Kernel Analysis + * + * @author Geneviève Bastien + * @since 3.0 + */ +@SuppressWarnings("javadoc") +public class Messages extends NLS { + private static final String BUNDLE_NAME = "org.eclipse.linuxtools.lttng2.kernel.core.analysis.messages"; //$NON-NLS-1$ + + public static String LttngKernelAnalysisModule_Help; + + static { + // initialize resource bundle + NLS.initializeMessages(BUNDLE_NAME, Messages.class); + } + + private Messages() { + } +} diff --git a/org.eclipse.linuxtools.lttng2.kernel.core/src/org/eclipse/linuxtools/lttng2/kernel/core/analysis/messages.properties b/org.eclipse.linuxtools.lttng2.kernel.core/src/org/eclipse/linuxtools/lttng2/kernel/core/analysis/messages.properties new file mode 100644 index 0000000000..6933aa637e --- /dev/null +++ b/org.eclipse.linuxtools.lttng2.kernel.core/src/org/eclipse/linuxtools/lttng2/kernel/core/analysis/messages.properties @@ -0,0 +1,13 @@ +############################################################################### +# Copyright (c) 2014 École Polytechnique de Montréal +# +# 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: +# Geneviève Bastien - Initial API and implementation +############################################################################### + +LttngKernelAnalysisModule_Help=Builds the LTTng2 kernel state system to populate the Control Flow view and the Resources View diff --git a/org.eclipse.linuxtools.lttng2.kernel.ui/META-INF/MANIFEST.MF b/org.eclipse.linuxtools.lttng2.kernel.ui/META-INF/MANIFEST.MF index 3271f9c8c4..4811b27833 100644 --- a/org.eclipse.linuxtools.lttng2.kernel.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.linuxtools.lttng2.kernel.ui/META-INF/MANIFEST.MF @@ -21,5 +21,4 @@ Export-Package: org.eclipse.linuxtools.internal.lttng2.kernel.ui;x-friends:="org org.eclipse.linuxtools.internal.lttng2.kernel.ui.viewers.events;x-internal:=true, org.eclipse.linuxtools.internal.lttng2.kernel.ui.views;x-internal:=true, org.eclipse.linuxtools.internal.lttng2.kernel.ui.views.controlflow;x-friends:="org.eclipse.linuxtools.lttng2.kernel.ui.swtbot.tests", - org.eclipse.linuxtools.internal.lttng2.kernel.ui.views.resources;x-friends:="org.eclipse.linuxtools.lttng2.kernel.ui.swtbot.tests", - org.eclipse.linuxtools.lttng2.kernel.ui.analysis + org.eclipse.linuxtools.internal.lttng2.kernel.ui.views.resources;x-friends:="org.eclipse.linuxtools.lttng2.kernel.ui.swtbot.tests" diff --git a/org.eclipse.linuxtools.lttng2.kernel.ui/plugin.properties b/org.eclipse.linuxtools.lttng2.kernel.ui/plugin.properties index bb75d70b7f..9172f4976e 100644 --- a/org.eclipse.linuxtools.lttng2.kernel.ui/plugin.properties +++ b/org.eclipse.linuxtools.lttng2.kernel.ui/plugin.properties @@ -20,5 +20,3 @@ controlflow.view.name = Control Flow resources.view.name = Resources tracetype.type.kernel = LTTng Kernel Trace - -analysis.lttngkernel = LTTng Kernel Analysis diff --git a/org.eclipse.linuxtools.lttng2.kernel.ui/plugin.xml b/org.eclipse.linuxtools.lttng2.kernel.ui/plugin.xml index 54650a56d6..c28e2bc8ee 100644 --- a/org.eclipse.linuxtools.lttng2.kernel.ui/plugin.xml +++ b/org.eclipse.linuxtools.lttng2.kernel.ui/plugin.xml @@ -64,14 +64,19 @@ - - - - + + + + + + + + diff --git a/org.eclipse.linuxtools.lttng2.kernel.ui/src/org/eclipse/linuxtools/internal/lttng2/kernel/ui/Messages.java b/org.eclipse.linuxtools.lttng2.kernel.ui/src/org/eclipse/linuxtools/internal/lttng2/kernel/ui/Messages.java index f851aa73e4..7200352850 100644 --- a/org.eclipse.linuxtools.lttng2.kernel.ui/src/org/eclipse/linuxtools/internal/lttng2/kernel/ui/Messages.java +++ b/org.eclipse.linuxtools.lttng2.kernel.ui/src/org/eclipse/linuxtools/internal/lttng2/kernel/ui/Messages.java @@ -49,8 +49,6 @@ public class Messages extends NLS { public static String ResourcesView_attributeProcessName; public static String ResourcesView_attributeSyscallName; - public static String LttngKernelAnalysis_Help; - static { // initialize resource bundle NLS.initializeMessages(BUNDLE_NAME, Messages.class); diff --git a/org.eclipse.linuxtools.lttng2.kernel.ui/src/org/eclipse/linuxtools/internal/lttng2/kernel/ui/messages.properties b/org.eclipse.linuxtools.lttng2.kernel.ui/src/org/eclipse/linuxtools/internal/lttng2/kernel/ui/messages.properties index cfa70d2424..29e75b8991 100644 --- a/org.eclipse.linuxtools.lttng2.kernel.ui/src/org/eclipse/linuxtools/internal/lttng2/kernel/ui/messages.properties +++ b/org.eclipse.linuxtools.lttng2.kernel.ui/src/org/eclipse/linuxtools/internal/lttng2/kernel/ui/messages.properties @@ -41,5 +41,3 @@ ResourcesView_attributeHoverTime=> Hover Time ResourcesView_attributeTidName=> TID ResourcesView_attributeProcessName=> Process ResourcesView_attributeSyscallName=> System Call - -LttngKernelAnalysis_Help=Builds the LTTng2 kernel state system to populate the Control Flow view and the Resources View diff --git a/org.eclipse.linuxtools.lttng2.kernel.ui/src/org/eclipse/linuxtools/internal/lttng2/kernel/ui/views/controlflow/ControlFlowPresentationProvider.java b/org.eclipse.linuxtools.lttng2.kernel.ui/src/org/eclipse/linuxtools/internal/lttng2/kernel/ui/views/controlflow/ControlFlowPresentationProvider.java index 3ff54d2834..34554e6f87 100644 --- a/org.eclipse.linuxtools.lttng2.kernel.ui/src/org/eclipse/linuxtools/internal/lttng2/kernel/ui/views/controlflow/ControlFlowPresentationProvider.java +++ b/org.eclipse.linuxtools.lttng2.kernel.ui/src/org/eclipse/linuxtools/internal/lttng2/kernel/ui/views/controlflow/ControlFlowPresentationProvider.java @@ -21,7 +21,7 @@ import org.eclipse.linuxtools.internal.lttng2.kernel.core.Attributes; import org.eclipse.linuxtools.internal.lttng2.kernel.core.StateValues; import org.eclipse.linuxtools.internal.lttng2.kernel.ui.Activator; import org.eclipse.linuxtools.internal.lttng2.kernel.ui.Messages; -import org.eclipse.linuxtools.lttng2.kernel.ui.analysis.LttngKernelAnalysisModule; +import org.eclipse.linuxtools.lttng2.kernel.core.analysis.LttngKernelAnalysisModule; import org.eclipse.linuxtools.tmf.core.exceptions.AttributeNotFoundException; import org.eclipse.linuxtools.tmf.core.exceptions.StateSystemDisposedException; import org.eclipse.linuxtools.tmf.core.exceptions.StateValueTypeException; diff --git a/org.eclipse.linuxtools.lttng2.kernel.ui/src/org/eclipse/linuxtools/internal/lttng2/kernel/ui/views/controlflow/ControlFlowView.java b/org.eclipse.linuxtools.lttng2.kernel.ui/src/org/eclipse/linuxtools/internal/lttng2/kernel/ui/views/controlflow/ControlFlowView.java index 2e0145d64a..76507e106e 100644 --- a/org.eclipse.linuxtools.lttng2.kernel.ui/src/org/eclipse/linuxtools/internal/lttng2/kernel/ui/views/controlflow/ControlFlowView.java +++ b/org.eclipse.linuxtools.lttng2.kernel.ui/src/org/eclipse/linuxtools/internal/lttng2/kernel/ui/views/controlflow/ControlFlowView.java @@ -26,7 +26,7 @@ import org.eclipse.jface.dialogs.IDialogSettings; import org.eclipse.linuxtools.internal.lttng2.kernel.core.Attributes; import org.eclipse.linuxtools.internal.lttng2.kernel.ui.Activator; import org.eclipse.linuxtools.internal.lttng2.kernel.ui.Messages; -import org.eclipse.linuxtools.lttng2.kernel.ui.analysis.LttngKernelAnalysisModule; +import org.eclipse.linuxtools.lttng2.kernel.core.analysis.LttngKernelAnalysisModule; import org.eclipse.linuxtools.tmf.core.exceptions.AttributeNotFoundException; import org.eclipse.linuxtools.tmf.core.exceptions.StateSystemDisposedException; import org.eclipse.linuxtools.tmf.core.exceptions.StateValueTypeException; diff --git a/org.eclipse.linuxtools.lttng2.kernel.ui/src/org/eclipse/linuxtools/internal/lttng2/kernel/ui/views/resources/ResourcesPresentationProvider.java b/org.eclipse.linuxtools.lttng2.kernel.ui/src/org/eclipse/linuxtools/internal/lttng2/kernel/ui/views/resources/ResourcesPresentationProvider.java index a6f4199f7f..5cb10e30cb 100644 --- a/org.eclipse.linuxtools.lttng2.kernel.ui/src/org/eclipse/linuxtools/internal/lttng2/kernel/ui/views/resources/ResourcesPresentationProvider.java +++ b/org.eclipse.linuxtools.lttng2.kernel.ui/src/org/eclipse/linuxtools/internal/lttng2/kernel/ui/views/resources/ResourcesPresentationProvider.java @@ -22,7 +22,7 @@ import org.eclipse.linuxtools.internal.lttng2.kernel.core.StateValues; import org.eclipse.linuxtools.internal.lttng2.kernel.ui.Activator; import org.eclipse.linuxtools.internal.lttng2.kernel.ui.Messages; import org.eclipse.linuxtools.internal.lttng2.kernel.ui.views.resources.ResourcesEntry.Type; -import org.eclipse.linuxtools.lttng2.kernel.ui.analysis.LttngKernelAnalysisModule; +import org.eclipse.linuxtools.lttng2.kernel.core.analysis.LttngKernelAnalysisModule; import org.eclipse.linuxtools.tmf.core.exceptions.AttributeNotFoundException; import org.eclipse.linuxtools.tmf.core.exceptions.StateSystemDisposedException; import org.eclipse.linuxtools.tmf.core.exceptions.StateValueTypeException; diff --git a/org.eclipse.linuxtools.lttng2.kernel.ui/src/org/eclipse/linuxtools/internal/lttng2/kernel/ui/views/resources/ResourcesView.java b/org.eclipse.linuxtools.lttng2.kernel.ui/src/org/eclipse/linuxtools/internal/lttng2/kernel/ui/views/resources/ResourcesView.java index 5a501439b3..03746bad9d 100644 --- a/org.eclipse.linuxtools.lttng2.kernel.ui/src/org/eclipse/linuxtools/internal/lttng2/kernel/ui/views/resources/ResourcesView.java +++ b/org.eclipse.linuxtools.lttng2.kernel.ui/src/org/eclipse/linuxtools/internal/lttng2/kernel/ui/views/resources/ResourcesView.java @@ -23,7 +23,7 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.linuxtools.internal.lttng2.kernel.core.Attributes; import org.eclipse.linuxtools.internal.lttng2.kernel.ui.Messages; import org.eclipse.linuxtools.internal.lttng2.kernel.ui.views.resources.ResourcesEntry.Type; -import org.eclipse.linuxtools.lttng2.kernel.ui.analysis.LttngKernelAnalysisModule; +import org.eclipse.linuxtools.lttng2.kernel.core.analysis.LttngKernelAnalysisModule; import org.eclipse.linuxtools.tmf.core.exceptions.AttributeNotFoundException; import org.eclipse.linuxtools.tmf.core.exceptions.StateSystemDisposedException; import org.eclipse.linuxtools.tmf.core.exceptions.StateValueTypeException; -- 2.34.1