From eeff806b38531e9d07bdcdc9cca78f3242f6d10b Mon Sep 17 00:00:00 2001 From: Bernd Hufmann Date: Tue, 22 Mar 2016 07:29:09 -0400 Subject: [PATCH] analysis: Bug 489573: Internalize Resources view implementation Change-Id: I35fc6e359b2727b19ad77e5788bb9e7c0f1dfb51 Signed-off-by: Bernd Hufmann Reviewed-on: https://git.eclipse.org/r/69008 Reviewed-by: Hudson CI Reviewed-by: Matthew Khouzam Tested-by: Matthew Khouzam --- .../ui/tests/view/resources/AggregateIteratorTest.java | 2 +- .../META-INF/MANIFEST.MF | 7 +++++-- .../plugin.xml | 2 +- .../linux/ui/views/resources/AggregateEventIterator.java | 6 +++--- .../linux/ui/views/resources/AggregateResourcesEntry.java | 2 +- .../os/linux/ui/views/resources/CachingIterator.java | 2 +- .../os/linux/ui/views/resources/ResourcesEntry.java | 3 +-- .../ui/views/resources/ResourcesPresentationProvider.java | 4 ++-- .../os/linux/ui/views/resources/ResourcesView.java | 4 ++-- .../ui/swtbot/tests/ImportAndReadKernelSmokeTest.java | 2 +- .../kernel/ui/swtbot/tests/KernelPerspectiveChecker.java | 2 +- .../lttng2/kernel/ui/views/PerspectiveFactory.java | 2 +- 12 files changed, 20 insertions(+), 18 deletions(-) rename analysis/org.eclipse.tracecompass.analysis.os.linux.ui/src/org/eclipse/tracecompass/{ => internal}/analysis/os/linux/ui/views/resources/AggregateEventIterator.java (92%) rename analysis/org.eclipse.tracecompass.analysis.os.linux.ui/src/org/eclipse/tracecompass/{ => internal}/analysis/os/linux/ui/views/resources/AggregateResourcesEntry.java (97%) rename analysis/org.eclipse.tracecompass.analysis.os.linux.ui/src/org/eclipse/tracecompass/{ => internal}/analysis/os/linux/ui/views/resources/CachingIterator.java (97%) rename analysis/org.eclipse.tracecompass.analysis.os.linux.ui/src/org/eclipse/tracecompass/{ => internal}/analysis/os/linux/ui/views/resources/ResourcesEntry.java (97%) rename analysis/org.eclipse.tracecompass.analysis.os.linux.ui/src/org/eclipse/tracecompass/{ => internal}/analysis/os/linux/ui/views/resources/ResourcesPresentationProvider.java (99%) rename analysis/org.eclipse.tracecompass.analysis.os.linux.ui/src/org/eclipse/tracecompass/{ => internal}/analysis/os/linux/ui/views/resources/ResourcesView.java (99%) diff --git a/analysis/org.eclipse.tracecompass.analysis.os.linux.ui.tests/src/org/eclipse/tracecompass/analysis/os/linux/ui/tests/view/resources/AggregateIteratorTest.java b/analysis/org.eclipse.tracecompass.analysis.os.linux.ui.tests/src/org/eclipse/tracecompass/analysis/os/linux/ui/tests/view/resources/AggregateIteratorTest.java index 97b0ef0d74..3bed8c17ba 100644 --- a/analysis/org.eclipse.tracecompass.analysis.os.linux.ui.tests/src/org/eclipse/tracecompass/analysis/os/linux/ui/tests/view/resources/AggregateIteratorTest.java +++ b/analysis/org.eclipse.tracecompass.analysis.os.linux.ui.tests/src/org/eclipse/tracecompass/analysis/os/linux/ui/tests/view/resources/AggregateIteratorTest.java @@ -18,7 +18,7 @@ import java.util.List; import org.eclipse.jdt.annotation.NonNull; import org.eclipse.jdt.annotation.NonNullByDefault; -import org.eclipse.tracecompass.analysis.os.linux.ui.views.resources.AggregateEventIterator; +import org.eclipse.tracecompass.internal.analysis.os.linux.ui.views.resources.AggregateEventIterator; import org.eclipse.tracecompass.tmf.ui.widgets.timegraph.model.ITimeEvent; import org.eclipse.tracecompass.tmf.ui.widgets.timegraph.model.ITimeGraphEntry; import org.eclipse.tracecompass.tmf.ui.widgets.timegraph.model.NullTimeEvent; diff --git a/analysis/org.eclipse.tracecompass.analysis.os.linux.ui/META-INF/MANIFEST.MF b/analysis/org.eclipse.tracecompass.analysis.os.linux.ui/META-INF/MANIFEST.MF index 2d3907dfbb..d7b1547389 100644 --- a/analysis/org.eclipse.tracecompass.analysis.os.linux.ui/META-INF/MANIFEST.MF +++ b/analysis/org.eclipse.tracecompass.analysis.os.linux.ui/META-INF/MANIFEST.MF @@ -24,7 +24,6 @@ Import-Package: com.google.common.base, com.google.common.collect, org.swtchart Export-Package: org.eclipse.tracecompass.analysis.os.linux.ui.views.controlflow, - org.eclipse.tracecompass.analysis.os.linux.ui.views.resources, org.eclipse.tracecompass.internal.analysis.os.linux.ui;x-friends:="org.eclipse.tracecompass.analysis.os.linux.ui.swtbot.tests", org.eclipse.tracecompass.internal.analysis.os.linux.ui.actions;x-internal:=true, org.eclipse.tracecompass.internal.analysis.os.linux.ui.views.controlflow;x-friends:="org.eclipse.tracecompass.analysis.os.linux.ui.swtbot.tests,org.eclipse.tracecompass.analysis.os.linux.ui.tests", @@ -33,4 +32,8 @@ Export-Package: org.eclipse.tracecompass.analysis.os.linux.ui.views.controlflow, org.eclipse.tracecompass.internal.analysis.os.linux.ui.views.cpuusage;x-internal:=true, org.eclipse.tracecompass.internal.analysis.os.linux.ui.views.latency;x-friends:="org.eclipse.tracecompass.analysis.os.linux.ui.swtbot.tests", org.eclipse.tracecompass.internal.analysis.os.linux.ui.views.latency.statistics;x-friends:="org.eclipse.tracecompass.analysis.os.linux.ui.swtbot.tests", - org.eclipse.tracecompass.internal.analysis.os.linux.ui.views.resources;x-friends:="org.eclipse.tracecompass.analysis.os.linux.ui.swtbot.tests" + org.eclipse.tracecompass.internal.analysis.os.linux.ui.views.resources; + x-friends:="org.eclipse.tracecompass.analysis.os.linux.ui.swtbot.tests, + org.eclipse.tracecompass.analysis.os.linux.ui.tests, + org.eclipse.tracecompass.lttng2.kernel.ui.swtbot.tests, + org.eclipse.tracecompass.lttng2.kernel.ui" diff --git a/analysis/org.eclipse.tracecompass.analysis.os.linux.ui/plugin.xml b/analysis/org.eclipse.tracecompass.analysis.os.linux.ui/plugin.xml index 00275929c6..d650f818b7 100644 --- a/analysis/org.eclipse.tracecompass.analysis.os.linux.ui/plugin.xml +++ b/analysis/org.eclipse.tracecompass.analysis.os.linux.ui/plugin.xml @@ -15,7 +15,7 @@ { - private final List<@NonNull CachingIterator> fIterators = new ArrayList<>(); + private final List fIterators = new ArrayList<>(); private final Comparator fComparator; @@ -81,7 +81,7 @@ public class AggregateEventIterator implements Iterator<@NonNull ITimeEvent> { @Override public @NonNull ITimeEvent next() { - final List<@NonNull CachingIterator> iterators = fIterators; + final List iterators = fIterators; if (iterators.isEmpty()) { throw new NoSuchElementException("Aggregate iterator is empty"); //$NON-NLS-1$ } diff --git a/analysis/org.eclipse.tracecompass.analysis.os.linux.ui/src/org/eclipse/tracecompass/analysis/os/linux/ui/views/resources/AggregateResourcesEntry.java b/analysis/org.eclipse.tracecompass.analysis.os.linux.ui/src/org/eclipse/tracecompass/internal/analysis/os/linux/ui/views/resources/AggregateResourcesEntry.java similarity index 97% rename from analysis/org.eclipse.tracecompass.analysis.os.linux.ui/src/org/eclipse/tracecompass/analysis/os/linux/ui/views/resources/AggregateResourcesEntry.java rename to analysis/org.eclipse.tracecompass.analysis.os.linux.ui/src/org/eclipse/tracecompass/internal/analysis/os/linux/ui/views/resources/AggregateResourcesEntry.java index eb41383827..15ef08682b 100644 --- a/analysis/org.eclipse.tracecompass.analysis.os.linux.ui/src/org/eclipse/tracecompass/analysis/os/linux/ui/views/resources/AggregateResourcesEntry.java +++ b/analysis/org.eclipse.tracecompass.analysis.os.linux.ui/src/org/eclipse/tracecompass/internal/analysis/os/linux/ui/views/resources/AggregateResourcesEntry.java @@ -7,7 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html *******************************************************************************/ -package org.eclipse.tracecompass.analysis.os.linux.ui.views.resources; +package org.eclipse.tracecompass.internal.analysis.os.linux.ui.views.resources; import java.util.ArrayList; import java.util.Comparator; diff --git a/analysis/org.eclipse.tracecompass.analysis.os.linux.ui/src/org/eclipse/tracecompass/analysis/os/linux/ui/views/resources/CachingIterator.java b/analysis/org.eclipse.tracecompass.analysis.os.linux.ui/src/org/eclipse/tracecompass/internal/analysis/os/linux/ui/views/resources/CachingIterator.java similarity index 97% rename from analysis/org.eclipse.tracecompass.analysis.os.linux.ui/src/org/eclipse/tracecompass/analysis/os/linux/ui/views/resources/CachingIterator.java rename to analysis/org.eclipse.tracecompass.analysis.os.linux.ui/src/org/eclipse/tracecompass/internal/analysis/os/linux/ui/views/resources/CachingIterator.java index 46c4b6b1d5..658ca5c4e2 100644 --- a/analysis/org.eclipse.tracecompass.analysis.os.linux.ui/src/org/eclipse/tracecompass/analysis/os/linux/ui/views/resources/CachingIterator.java +++ b/analysis/org.eclipse.tracecompass.analysis.os.linux.ui/src/org/eclipse/tracecompass/internal/analysis/os/linux/ui/views/resources/CachingIterator.java @@ -7,7 +7,7 @@ * http://www.eclipse.org/legal/epl-v10.html *******************************************************************************/ -package org.eclipse.tracecompass.analysis.os.linux.ui.views.resources; +package org.eclipse.tracecompass.internal.analysis.os.linux.ui.views.resources; import java.util.Comparator; import java.util.Iterator; diff --git a/analysis/org.eclipse.tracecompass.analysis.os.linux.ui/src/org/eclipse/tracecompass/analysis/os/linux/ui/views/resources/ResourcesEntry.java b/analysis/org.eclipse.tracecompass.analysis.os.linux.ui/src/org/eclipse/tracecompass/internal/analysis/os/linux/ui/views/resources/ResourcesEntry.java similarity index 97% rename from analysis/org.eclipse.tracecompass.analysis.os.linux.ui/src/org/eclipse/tracecompass/analysis/os/linux/ui/views/resources/ResourcesEntry.java rename to analysis/org.eclipse.tracecompass.analysis.os.linux.ui/src/org/eclipse/tracecompass/internal/analysis/os/linux/ui/views/resources/ResourcesEntry.java index 8e1a128926..4b563552f6 100644 --- a/analysis/org.eclipse.tracecompass.analysis.os.linux.ui/src/org/eclipse/tracecompass/analysis/os/linux/ui/views/resources/ResourcesEntry.java +++ b/analysis/org.eclipse.tracecompass.analysis.os.linux.ui/src/org/eclipse/tracecompass/internal/analysis/os/linux/ui/views/resources/ResourcesEntry.java @@ -11,12 +11,11 @@ * Geneviève Bastien - Move code to provide base classes for time graph view *******************************************************************************/ -package org.eclipse.tracecompass.analysis.os.linux.ui.views.resources; +package org.eclipse.tracecompass.internal.analysis.os.linux.ui.views.resources; import java.util.Iterator; import org.eclipse.jdt.annotation.NonNull; -import org.eclipse.tracecompass.internal.analysis.os.linux.ui.views.resources.SoftIrqLabelProvider; import org.eclipse.tracecompass.tmf.core.trace.ITmfTrace; import org.eclipse.tracecompass.tmf.ui.widgets.timegraph.model.ITimeEvent; import org.eclipse.tracecompass.tmf.ui.widgets.timegraph.model.ITimeGraphEntry; diff --git a/analysis/org.eclipse.tracecompass.analysis.os.linux.ui/src/org/eclipse/tracecompass/analysis/os/linux/ui/views/resources/ResourcesPresentationProvider.java b/analysis/org.eclipse.tracecompass.analysis.os.linux.ui/src/org/eclipse/tracecompass/internal/analysis/os/linux/ui/views/resources/ResourcesPresentationProvider.java similarity index 99% rename from analysis/org.eclipse.tracecompass.analysis.os.linux.ui/src/org/eclipse/tracecompass/analysis/os/linux/ui/views/resources/ResourcesPresentationProvider.java rename to analysis/org.eclipse.tracecompass.analysis.os.linux.ui/src/org/eclipse/tracecompass/internal/analysis/os/linux/ui/views/resources/ResourcesPresentationProvider.java index cf3ab585e1..2fb537db10 100644 --- a/analysis/org.eclipse.tracecompass.analysis.os.linux.ui/src/org/eclipse/tracecompass/analysis/os/linux/ui/views/resources/ResourcesPresentationProvider.java +++ b/analysis/org.eclipse.tracecompass.analysis.os.linux.ui/src/org/eclipse/tracecompass/internal/analysis/os/linux/ui/views/resources/ResourcesPresentationProvider.java @@ -11,7 +11,7 @@ * Geneviève Bastien - Move code to provide base classes for time graph view *******************************************************************************/ -package org.eclipse.tracecompass.analysis.os.linux.ui.views.resources; +package org.eclipse.tracecompass.internal.analysis.os.linux.ui.views.resources; import java.util.LinkedHashMap; import java.util.List; @@ -26,10 +26,10 @@ import org.eclipse.tracecompass.analysis.os.linux.core.kernel.KernelAnalysisModu import org.eclipse.tracecompass.analysis.os.linux.core.kernel.StateValues; import org.eclipse.tracecompass.analysis.os.linux.core.trace.IKernelAnalysisEventLayout; import org.eclipse.tracecompass.analysis.os.linux.core.trace.IKernelTrace; -import org.eclipse.tracecompass.analysis.os.linux.ui.views.resources.ResourcesEntry.Type; import org.eclipse.tracecompass.internal.analysis.os.linux.core.kernel.Attributes; import org.eclipse.tracecompass.internal.analysis.os.linux.ui.Activator; import org.eclipse.tracecompass.internal.analysis.os.linux.ui.Messages; +import org.eclipse.tracecompass.internal.analysis.os.linux.ui.views.resources.ResourcesEntry.Type; import org.eclipse.tracecompass.statesystem.core.ITmfStateSystem; import org.eclipse.tracecompass.statesystem.core.exceptions.AttributeNotFoundException; import org.eclipse.tracecompass.statesystem.core.exceptions.StateSystemDisposedException; diff --git a/analysis/org.eclipse.tracecompass.analysis.os.linux.ui/src/org/eclipse/tracecompass/analysis/os/linux/ui/views/resources/ResourcesView.java b/analysis/org.eclipse.tracecompass.analysis.os.linux.ui/src/org/eclipse/tracecompass/internal/analysis/os/linux/ui/views/resources/ResourcesView.java similarity index 99% rename from analysis/org.eclipse.tracecompass.analysis.os.linux.ui/src/org/eclipse/tracecompass/analysis/os/linux/ui/views/resources/ResourcesView.java rename to analysis/org.eclipse.tracecompass.analysis.os.linux.ui/src/org/eclipse/tracecompass/internal/analysis/os/linux/ui/views/resources/ResourcesView.java index fe4edbd3cd..b33a600637 100644 --- a/analysis/org.eclipse.tracecompass.analysis.os.linux.ui/src/org/eclipse/tracecompass/analysis/os/linux/ui/views/resources/ResourcesView.java +++ b/analysis/org.eclipse.tracecompass.analysis.os.linux.ui/src/org/eclipse/tracecompass/internal/analysis/os/linux/ui/views/resources/ResourcesView.java @@ -11,7 +11,7 @@ * Geneviève Bastien - Move code to provide base classes for time graph views *******************************************************************************/ -package org.eclipse.tracecompass.analysis.os.linux.ui.views.resources; +package org.eclipse.tracecompass.internal.analysis.os.linux.ui.views.resources; import java.util.ArrayList; import java.util.Collections; @@ -30,11 +30,11 @@ import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.tracecompass.analysis.os.linux.core.kernel.KernelAnalysisModule; import org.eclipse.tracecompass.analysis.os.linux.core.signals.TmfCpuSelectedSignal; -import org.eclipse.tracecompass.analysis.os.linux.ui.views.resources.ResourcesEntry.Type; import org.eclipse.tracecompass.internal.analysis.os.linux.core.kernel.Attributes; import org.eclipse.tracecompass.internal.analysis.os.linux.ui.Messages; import org.eclipse.tracecompass.internal.analysis.os.linux.ui.actions.FollowCpuAction; import org.eclipse.tracecompass.internal.analysis.os.linux.ui.actions.UnfollowCpuAction; +import org.eclipse.tracecompass.internal.analysis.os.linux.ui.views.resources.ResourcesEntry.Type; import org.eclipse.tracecompass.statesystem.core.ITmfStateSystem; import org.eclipse.tracecompass.statesystem.core.exceptions.AttributeNotFoundException; import org.eclipse.tracecompass.statesystem.core.interval.ITmfStateInterval; diff --git a/lttng/org.eclipse.tracecompass.lttng2.kernel.ui.swtbot.tests/src/org/eclipse/tracecompass/lttng2/kernel/ui/swtbot/tests/ImportAndReadKernelSmokeTest.java b/lttng/org.eclipse.tracecompass.lttng2.kernel.ui.swtbot.tests/src/org/eclipse/tracecompass/lttng2/kernel/ui/swtbot/tests/ImportAndReadKernelSmokeTest.java index ad9cb896f9..b9858daca6 100644 --- a/lttng/org.eclipse.tracecompass.lttng2.kernel.ui.swtbot.tests/src/org/eclipse/tracecompass/lttng2/kernel/ui/swtbot/tests/ImportAndReadKernelSmokeTest.java +++ b/lttng/org.eclipse.tracecompass.lttng2.kernel.ui.swtbot.tests/src/org/eclipse/tracecompass/lttng2/kernel/ui/swtbot/tests/ImportAndReadKernelSmokeTest.java @@ -28,7 +28,7 @@ import org.eclipse.swtbot.swt.finder.junit.SWTBotJunit4ClassRunner; import org.eclipse.swtbot.swt.finder.results.VoidResult; import org.eclipse.swtbot.swt.finder.widgets.SWTBotToolbarButton; import org.eclipse.tracecompass.analysis.os.linux.ui.views.controlflow.ControlFlowView; -import org.eclipse.tracecompass.analysis.os.linux.ui.views.resources.ResourcesView; +import org.eclipse.tracecompass.internal.analysis.os.linux.ui.views.resources.ResourcesView; import org.eclipse.tracecompass.tmf.core.event.ITmfEvent; import org.eclipse.tracecompass.tmf.core.signal.TmfSelectionRangeUpdatedSignal; import org.eclipse.tracecompass.tmf.core.trace.ITmfContext; diff --git a/lttng/org.eclipse.tracecompass.lttng2.kernel.ui.swtbot.tests/src/org/eclipse/tracecompass/lttng2/kernel/ui/swtbot/tests/KernelPerspectiveChecker.java b/lttng/org.eclipse.tracecompass.lttng2.kernel.ui.swtbot.tests/src/org/eclipse/tracecompass/lttng2/kernel/ui/swtbot/tests/KernelPerspectiveChecker.java index 192c1b98c4..82fba6fb19 100644 --- a/lttng/org.eclipse.tracecompass.lttng2.kernel.ui.swtbot.tests/src/org/eclipse/tracecompass/lttng2/kernel/ui/swtbot/tests/KernelPerspectiveChecker.java +++ b/lttng/org.eclipse.tracecompass.lttng2.kernel.ui.swtbot.tests/src/org/eclipse/tracecompass/lttng2/kernel/ui/swtbot/tests/KernelPerspectiveChecker.java @@ -16,7 +16,7 @@ import java.util.ArrayList; import java.util.Arrays; import org.eclipse.tracecompass.analysis.os.linux.ui.views.controlflow.ControlFlowView; -import org.eclipse.tracecompass.analysis.os.linux.ui.views.resources.ResourcesView; +import org.eclipse.tracecompass.internal.analysis.os.linux.ui.views.resources.ResourcesView; import org.eclipse.tracecompass.internal.lttng2.control.ui.views.ControlView; import org.eclipse.tracecompass.internal.lttng2.kernel.ui.views.PerspectiveFactory; import org.eclipse.tracecompass.tmf.ui.swtbot.tests.shared.AbstractPerspectiveChecker; diff --git a/lttng/org.eclipse.tracecompass.lttng2.kernel.ui/src/org/eclipse/tracecompass/internal/lttng2/kernel/ui/views/PerspectiveFactory.java b/lttng/org.eclipse.tracecompass.lttng2.kernel.ui/src/org/eclipse/tracecompass/internal/lttng2/kernel/ui/views/PerspectiveFactory.java index 92688afd70..934920cc5b 100644 --- a/lttng/org.eclipse.tracecompass.lttng2.kernel.ui/src/org/eclipse/tracecompass/internal/lttng2/kernel/ui/views/PerspectiveFactory.java +++ b/lttng/org.eclipse.tracecompass.lttng2.kernel.ui/src/org/eclipse/tracecompass/internal/lttng2/kernel/ui/views/PerspectiveFactory.java @@ -13,7 +13,7 @@ package org.eclipse.tracecompass.internal.lttng2.kernel.ui.views; import org.eclipse.tracecompass.analysis.os.linux.ui.views.controlflow.ControlFlowView; -import org.eclipse.tracecompass.analysis.os.linux.ui.views.resources.ResourcesView; +import org.eclipse.tracecompass.internal.analysis.os.linux.ui.views.resources.ResourcesView; import org.eclipse.tracecompass.internal.lttng2.control.ui.views.ControlView; import org.eclipse.tracecompass.tmf.ui.project.wizards.NewTmfProjectWizard; import org.eclipse.tracecompass.tmf.ui.views.histogram.HistogramView; -- 2.34.1