From 84d54fa3b7c777d90de96355b925f2f13f507721 Mon Sep 17 00:00:00 2001
From: Bernd Hufmann <bernd.hufmann@ericsson.com>
Date: Thu, 19 Oct 2023 22:02:52 -0400
Subject: [PATCH] os.linux: Move SWSLatencyAnalysis related classes to internal

They should not have been public APIs in the first place when they were
released in Trace Compass 9.1.0.

Change-Id: I528042ec3406c5d44951497aaf55c1d3e57293ae
Signed-off-by: Bernd Hufmann <bernd.hufmann@ericsson.com>
Reviewed-on: https://git.eclipse.org/r/c/tracecompass/org.eclipse.tracecompass/+/205079
Tested-by: Trace Compass Bot <tracecompass-bot@eclipse.org>
Tested-by: Matthew Khouzam <matthew.khouzam@ericsson.com>
Reviewed-by: Matthew Khouzam <matthew.khouzam@ericsson.com>
---
 .../core/tests/swslatency/SWSLatencyTest.java |  6 ++--
 .../.settings/.api_filters                    | 35 +++++++++++++++++++
 .../META-INF/MANIFEST.MF                      |  2 +-
 .../plugin.xml                                |  2 +-
 ...PriorityStatisticsDataProviderFactory.java |  2 +-
 ...readNameStatisticsDataProviderFactory.java |  2 +-
 .../os/linux/core/swslatency/Messages.java    |  4 +--
 .../core/swslatency/SWSLatencyAnalysis.java   |  4 +--
 .../os/linux/core/swslatency/SchedWS.java     |  2 +-
 .../linux/core/swslatency/messages.properties |  0
 .../linux/core/swslatency/package-info.java   |  2 +-
 .../META-INF/MANIFEST.MF                      |  4 ++-
 .../plugin.xml                                | 20 +++++------
 .../statistics/PriorityStatisticsView.java    |  2 +-
 .../statistics/PriorityStatisticsViewer.java  |  2 +-
 .../PriorityThreadNameStatisticsView.java     |  2 +-
 .../PriorityThreadNameStatisticsViewer.java   |  2 +-
 .../ui/views/swslatency/SWSDensityViewer.java |  2 +-
 .../swslatency/SWSLatencyDensityView.java     |  2 +-
 .../SWSLatencyScatterGraphViewer.java         |  2 +-
 .../swslatency/SWSLatencyScatterView.java     |  2 +-
 21 files changed, 69 insertions(+), 32 deletions(-)
 create mode 100644 analysis/org.eclipse.tracecompass.analysis.os.linux.core/.settings/.api_filters
 rename analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/{ => internal}/analysis/os/linux/core/swslatency/Messages.java (91%)
 rename analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/{ => internal}/analysis/os/linux/core/swslatency/SWSLatencyAnalysis.java (99%)
 rename analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/{ => internal}/analysis/os/linux/core/swslatency/SchedWS.java (98%)
 rename analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/{ => internal}/analysis/os/linux/core/swslatency/messages.properties (100%)
 rename analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/{ => internal}/analysis/os/linux/core/swslatency/package-info.java (87%)
 rename analysis/org.eclipse.tracecompass.analysis.os.linux.ui/src/org/eclipse/tracecompass/{ => internal}/analysis/os/linux/ui/segmentstore/statistics/PriorityStatisticsView.java (96%)
 rename analysis/org.eclipse.tracecompass.analysis.os.linux.ui/src/org/eclipse/tracecompass/{ => internal}/analysis/os/linux/ui/segmentstore/statistics/PriorityStatisticsViewer.java (93%)
 rename analysis/org.eclipse.tracecompass.analysis.os.linux.ui/src/org/eclipse/tracecompass/{ => internal}/analysis/os/linux/ui/segmentstore/statistics/PriorityThreadNameStatisticsView.java (96%)
 rename analysis/org.eclipse.tracecompass.analysis.os.linux.ui/src/org/eclipse/tracecompass/{ => internal}/analysis/os/linux/ui/segmentstore/statistics/PriorityThreadNameStatisticsViewer.java (94%)

diff --git a/analysis/org.eclipse.tracecompass.analysis.os.linux.core.tests/src/org/eclipse/tracecompass/analysis/os/linux/core/tests/swslatency/SWSLatencyTest.java b/analysis/org.eclipse.tracecompass.analysis.os.linux.core.tests/src/org/eclipse/tracecompass/analysis/os/linux/core/tests/swslatency/SWSLatencyTest.java
index 85f16ea6d3..33fbc4130f 100644
--- a/analysis/org.eclipse.tracecompass.analysis.os.linux.core.tests/src/org/eclipse/tracecompass/analysis/os/linux/core/tests/swslatency/SWSLatencyTest.java
+++ b/analysis/org.eclipse.tracecompass.analysis.os.linux.core.tests/src/org/eclipse/tracecompass/analysis/os/linux/core/tests/swslatency/SWSLatencyTest.java
@@ -22,12 +22,12 @@
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.jdt.annotation.NonNull;
-import org.eclipse.tracecompass.analysis.os.linux.core.swslatency.SWSLatencyAnalysis;
-import org.eclipse.tracecompass.analysis.os.linux.core.swslatency.SchedWS;
-import org.eclipse.tracecompass.analysis.os.linux.core.swslatency.SchedWS.InitialInfo;
 import org.eclipse.tracecompass.analysis.os.linux.core.tests.Activator;
 import org.eclipse.tracecompass.analysis.os.linux.core.tests.stubs.trace.TmfXmlKernelTraceStub;
 import org.eclipse.tracecompass.analysis.os.linux.core.trace.IKernelTrace;
+import org.eclipse.tracecompass.internal.analysis.os.linux.core.swslatency.SWSLatencyAnalysis;
+import org.eclipse.tracecompass.internal.analysis.os.linux.core.swslatency.SchedWS;
+import org.eclipse.tracecompass.internal.analysis.os.linux.core.swslatency.SchedWS.InitialInfo;
 import org.eclipse.tracecompass.segmentstore.core.ISegment;
 import org.eclipse.tracecompass.segmentstore.core.ISegmentStore;
 import org.eclipse.tracecompass.tmf.core.event.TmfEvent;
diff --git a/analysis/org.eclipse.tracecompass.analysis.os.linux.core/.settings/.api_filters b/analysis/org.eclipse.tracecompass.analysis.os.linux.core/.settings/.api_filters
new file mode 100644
index 0000000000..11093782d2
--- /dev/null
+++ b/analysis/org.eclipse.tracecompass.analysis.os.linux.core/.settings/.api_filters
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<component id="org.eclipse.tracecompass.analysis.os.linux.core" version="2">
+    <resource path="META-INF/MANIFEST.MF">
+        <filter comment="SWSLatencyAnalysis should not have been public API" id="923795461">
+            <message_arguments>
+                <message_argument value="8.2.0"/>
+                <message_argument value="8.1.0"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="META-INF/MANIFEST.MF" type="org.eclipse.tracecompass.analysis.os.linux.core.swslatency.Messages">
+        <filter comment="It should not have been API" id="305324134">
+            <message_arguments>
+                <message_argument value="org.eclipse.tracecompass.analysis.os.linux.core.swslatency.Messages"/>
+                <message_argument value="org.eclipse.tracecompass.analysis.os.linux.core_8.2.0"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="META-INF/MANIFEST.MF" type="org.eclipse.tracecompass.analysis.os.linux.core.swslatency.SWSLatencyAnalysis">
+        <filter comment="It should not have been API" id="305324134">
+            <message_arguments>
+                <message_argument value="org.eclipse.tracecompass.analysis.os.linux.core.swslatency.SWSLatencyAnalysis"/>
+                <message_argument value="org.eclipse.tracecompass.analysis.os.linux.core_8.2.0"/>
+            </message_arguments>
+        </filter>
+    </resource>
+    <resource path="META-INF/MANIFEST.MF" type="org.eclipse.tracecompass.analysis.os.linux.core.swslatency.SchedWS">
+        <filter comment="It should not have been API" id="305324134">
+            <message_arguments>
+                <message_argument value="org.eclipse.tracecompass.analysis.os.linux.core.swslatency.SchedWS"/>
+                <message_argument value="org.eclipse.tracecompass.analysis.os.linux.core_8.2.0"/>
+            </message_arguments>
+        </filter>
+    </resource>
+</component>
diff --git a/analysis/org.eclipse.tracecompass.analysis.os.linux.core/META-INF/MANIFEST.MF b/analysis/org.eclipse.tracecompass.analysis.os.linux.core/META-INF/MANIFEST.MF
index 2c02b27578..05a73df854 100644
--- a/analysis/org.eclipse.tracecompass.analysis.os.linux.core/META-INF/MANIFEST.MF
+++ b/analysis/org.eclipse.tracecompass.analysis.os.linux.core/META-INF/MANIFEST.MF
@@ -36,7 +36,6 @@ Export-Package: org.eclipse.tracecompass.analysis.os.linux.core.contextswitch,
  org.eclipse.tracecompass.analysis.os.linux.core.memory,
  org.eclipse.tracecompass.analysis.os.linux.core.model,
  org.eclipse.tracecompass.analysis.os.linux.core.signals,
- org.eclipse.tracecompass.analysis.os.linux.core.swslatency,
  org.eclipse.tracecompass.analysis.os.linux.core.tid,
  org.eclipse.tracecompass.analysis.os.linux.core.trace,
  org.eclipse.tracecompass.internal.analysis.os.linux.core;x-internal:=true,
@@ -65,6 +64,7 @@ Export-Package: org.eclipse.tracecompass.analysis.os.linux.core.contextswitch,
    org.eclipse.tracecompass.analysis.callstack.core.tests",
  org.eclipse.tracecompass.internal.analysis.os.linux.core.resourcesstatus;x-friends:="org.eclipse.tracecompass.analysis.os.linux.ui",
  org.eclipse.tracecompass.internal.analysis.os.linux.core.segmentstore;x-friends:="org.eclipse.tracecompass.analysis.os.linux.ui",
+ org.eclipse.tracecompass.internal.analysis.os.linux.core.swslatency;x-friends:="org.eclipse.tracecompass.analysis.os.linux.core.tests,org.eclipse.tracecompass.analysis.os.linux.ui",
  org.eclipse.tracecompass.internal.analysis.os.linux.core.threadstatus;
   x-friends:="org.eclipse.tracecompass.analysis.callstack.core,
    org.eclipse.tracecompass.analysis.os.linux.core.tests,
diff --git a/analysis/org.eclipse.tracecompass.analysis.os.linux.core/plugin.xml b/analysis/org.eclipse.tracecompass.analysis.os.linux.core/plugin.xml
index d890596b64..1c26a5602a 100644
--- a/analysis/org.eclipse.tracecompass.analysis.os.linux.core/plugin.xml
+++ b/analysis/org.eclipse.tracecompass.analysis.os.linux.core/plugin.xml
@@ -89,7 +89,7 @@
          </tracetype>
       </module>
       <module
-            analysis_module="org.eclipse.tracecompass.analysis.os.linux.core.swslatency.SWSLatencyAnalysis"
+            analysis_module="org.eclipse.tracecompass.internal.analysis.os.linux.core.swslatency.SWSLatencyAnalysis"
             applies_experiment="false"
             automatic="false"
             icon="icons/swslatency.png"
diff --git a/analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/internal/analysis/os/linux/core/segmentstore/PriorityStatisticsDataProviderFactory.java b/analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/internal/analysis/os/linux/core/segmentstore/PriorityStatisticsDataProviderFactory.java
index 3452240506..60d58ce091 100644
--- a/analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/internal/analysis/os/linux/core/segmentstore/PriorityStatisticsDataProviderFactory.java
+++ b/analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/internal/analysis/os/linux/core/segmentstore/PriorityStatisticsDataProviderFactory.java
@@ -15,9 +15,9 @@
 
 import org.eclipse.jdt.annotation.Nullable;
 import org.eclipse.osgi.util.NLS;
-import org.eclipse.tracecompass.analysis.os.linux.core.swslatency.SWSLatencyAnalysis;
 import org.eclipse.tracecompass.analysis.timing.core.segmentstore.GenericSegmentStatisticsAnalysis;
 import org.eclipse.tracecompass.analysis.timing.core.segmentstore.statistics.AbstractSegmentStatisticsAnalysis;
+import org.eclipse.tracecompass.internal.analysis.os.linux.core.swslatency.SWSLatencyAnalysis;
 import org.eclipse.tracecompass.internal.analysis.timing.core.segmentstore.AbstractSegmentStoreStatisticsDataProviderFactory;
 import org.eclipse.tracecompass.segmentstore.core.ISegment;
 import org.eclipse.tracecompass.tmf.core.analysis.IAnalysisModule;
diff --git a/analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/internal/analysis/os/linux/core/segmentstore/PriorityThreadNameStatisticsDataProviderFactory.java b/analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/internal/analysis/os/linux/core/segmentstore/PriorityThreadNameStatisticsDataProviderFactory.java
index 4e60e60a5a..1b251b65e8 100644
--- a/analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/internal/analysis/os/linux/core/segmentstore/PriorityThreadNameStatisticsDataProviderFactory.java
+++ b/analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/internal/analysis/os/linux/core/segmentstore/PriorityThreadNameStatisticsDataProviderFactory.java
@@ -15,9 +15,9 @@
 
 import org.eclipse.jdt.annotation.Nullable;
 import org.eclipse.osgi.util.NLS;
-import org.eclipse.tracecompass.analysis.os.linux.core.swslatency.SWSLatencyAnalysis;
 import org.eclipse.tracecompass.analysis.timing.core.segmentstore.GenericSegmentStatisticsAnalysis;
 import org.eclipse.tracecompass.analysis.timing.core.segmentstore.statistics.AbstractSegmentStatisticsAnalysis;
+import org.eclipse.tracecompass.internal.analysis.os.linux.core.swslatency.SWSLatencyAnalysis;
 import org.eclipse.tracecompass.internal.analysis.timing.core.segmentstore.AbstractSegmentStoreStatisticsDataProviderFactory;
 import org.eclipse.tracecompass.segmentstore.core.ISegment;
 import org.eclipse.tracecompass.segmentstore.core.segment.interfaces.INamedSegment;
diff --git a/analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/analysis/os/linux/core/swslatency/Messages.java b/analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/internal/analysis/os/linux/core/swslatency/Messages.java
similarity index 91%
rename from analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/analysis/os/linux/core/swslatency/Messages.java
rename to analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/internal/analysis/os/linux/core/swslatency/Messages.java
index 8d0cab5890..2c0ac59615 100644
--- a/analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/analysis/os/linux/core/swslatency/Messages.java
+++ b/analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/internal/analysis/os/linux/core/swslatency/Messages.java
@@ -9,7 +9,7 @@
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package org.eclipse.tracecompass.analysis.os.linux.core.swslatency;
+package org.eclipse.tracecompass.internal.analysis.os.linux.core.swslatency;
 
 import org.apache.commons.lang3.StringUtils;
 import org.eclipse.jdt.annotation.Nullable;
@@ -23,7 +23,7 @@
  */
 public class Messages extends NLS {
 
-    private static final String BUNDLE_NAME = "org.eclipse.tracecompass.analysis.os.linux.core.swslatency.messages"; //$NON-NLS-1$
+    private static final String BUNDLE_NAME = "org.eclipse.tracecompass.internal.analysis.os.linux.core.swslatency.messages"; //$NON-NLS-1$
 
     /** Sched_Wakeup/Sched_switch TID aspect help text */
     public static @Nullable String SegmentAspectHelpText_SWSTid;
diff --git a/analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/analysis/os/linux/core/swslatency/SWSLatencyAnalysis.java b/analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/internal/analysis/os/linux/core/swslatency/SWSLatencyAnalysis.java
similarity index 99%
rename from analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/analysis/os/linux/core/swslatency/SWSLatencyAnalysis.java
rename to analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/internal/analysis/os/linux/core/swslatency/SWSLatencyAnalysis.java
index cccd84310e..5ab7c36a62 100644
--- a/analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/analysis/os/linux/core/swslatency/SWSLatencyAnalysis.java
+++ b/analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/internal/analysis/os/linux/core/swslatency/SWSLatencyAnalysis.java
@@ -9,7 +9,7 @@
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package org.eclipse.tracecompass.analysis.os.linux.core.swslatency;
+package org.eclipse.tracecompass.internal.analysis.os.linux.core.swslatency;
 
 import java.util.Collection;
 import java.util.Comparator;
@@ -124,7 +124,7 @@ public void handleData(ITmfEvent event) {
                 long startTime = event.getTimestamp().toNanos();
                 String threadName = event.getContent().getFieldValue(String.class, layout.fieldComm());
 
-                if (threadName == null || "".equals(threadName)) {
+                if (threadName == null || "".equals(threadName)) { //$NON-NLS-1$
                     threadName = "UNKNOWN"; //$NON-NLS-1$
                 }
 
diff --git a/analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/analysis/os/linux/core/swslatency/SchedWS.java b/analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/internal/analysis/os/linux/core/swslatency/SchedWS.java
similarity index 98%
rename from analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/analysis/os/linux/core/swslatency/SchedWS.java
rename to analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/internal/analysis/os/linux/core/swslatency/SchedWS.java
index c8fef91049..762292f4d0 100644
--- a/analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/analysis/os/linux/core/swslatency/SchedWS.java
+++ b/analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/internal/analysis/os/linux/core/swslatency/SchedWS.java
@@ -9,7 +9,7 @@
  * SPDX-License-Identifier: EPL-2.0
  *******************************************************************************/
 
-package org.eclipse.tracecompass.analysis.os.linux.core.swslatency;
+package org.eclipse.tracecompass.internal.analysis.os.linux.core.swslatency;
 
 import org.eclipse.tracecompass.analysis.os.linux.core.model.OsStrings;
 import org.eclipse.tracecompass.datastore.core.interval.IHTIntervalReader;
diff --git a/analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/analysis/os/linux/core/swslatency/messages.properties b/analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/internal/analysis/os/linux/core/swslatency/messages.properties
similarity index 100%
rename from analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/analysis/os/linux/core/swslatency/messages.properties
rename to analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/internal/analysis/os/linux/core/swslatency/messages.properties
diff --git a/analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/analysis/os/linux/core/swslatency/package-info.java b/analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/internal/analysis/os/linux/core/swslatency/package-info.java
similarity index 87%
rename from analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/analysis/os/linux/core/swslatency/package-info.java
rename to analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/internal/analysis/os/linux/core/swslatency/package-info.java
index 3dc3c54eeb..fc57b6ca6d 100644
--- a/analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/analysis/os/linux/core/swslatency/package-info.java
+++ b/analysis/org.eclipse.tracecompass.analysis.os.linux.core/src/org/eclipse/tracecompass/internal/analysis/os/linux/core/swslatency/package-info.java
@@ -9,4 +9,4 @@
  *******************************************************************************/
 
 @org.eclipse.jdt.annotation.NonNullByDefault
-package org.eclipse.tracecompass.analysis.os.linux.core.swslatency;
+package org.eclipse.tracecompass.internal.analysis.os.linux.core.swslatency;
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 2993bb56fd..22d0927bba 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
@@ -28,6 +28,7 @@ Import-Package: com.google.common.annotations,
 Export-Package: 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-friends:="org.eclipse.tracecompass.analysis.callstack.ui",
  org.eclipse.tracecompass.internal.analysis.os.linux.ui.perspectives;x-internal:=true,
+ org.eclipse.tracecompass.internal.analysis.os.linux.ui.segmentstore.statistics;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,
@@ -43,5 +44,6 @@ Export-Package: org.eclipse.tracecompass.internal.analysis.os.linux.ui;x-friends
   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"
+   org.eclipse.tracecompass.lttng2.kernel.ui",
+ org.eclipse.tracecompass.internal.analysis.os.linux.ui.views.swslatency;x-internal:=true
 Automatic-Module-Name: org.eclipse.tracecompass.analysis.os.linux.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 ada1e6b535..140726ccc2 100644
--- a/analysis/org.eclipse.tracecompass.analysis.os.linux.ui/plugin.xml
+++ b/analysis/org.eclipse.tracecompass.analysis.os.linux.ui/plugin.xml
@@ -31,7 +31,7 @@
       </view>
       <view
             category="org.eclipse.linuxtools.tmf.ui.views.category"
-            class="org.eclipse.tracecompass.analysis.os.linux.ui.segmentstore.statistics.PriorityThreadNameStatisticsView"
+            class="org.eclipse.tracecompass.internal.analysis.os.linux.ui.segmentstore.statistics.PriorityThreadNameStatisticsView"
             icon="icons/eview16/statistics_view.gif"
             id="org.eclipse.tracecompass.analysis.os.linux.ui.segmentstore.statistics.prioname"
             name="%view.segstore.statistics.prioname"
@@ -40,7 +40,7 @@
       <view
             allowMultiple="false"
             category="org.eclipse.linuxtools.lttng2.ui.views.category"
-            class="org.eclipse.tracecompass.analysis.os.linux.ui.segmentstore.statistics.PriorityThreadNameStatisticsView"
+            class="org.eclipse.tracecompass.internal.analysis.os.linux.ui.segmentstore.statistics.PriorityThreadNameStatisticsView"
             icon="icons/obj16/statistics_view.gif"
             id="org.eclipse.tracecompass.analysis.os.linux.ui.segmentstore.statistics.prioname:org.eclipse.tracecompass.analysis.os.linux.core.swslatency.sws"
             name="%swslatency.stats.view.name.prioname"
@@ -48,7 +48,7 @@
       </view>
       <view
             category="org.eclipse.linuxtools.tmf.ui.views.category"
-            class="org.eclipse.tracecompass.analysis.os.linux.ui.segmentstore.statistics.PriorityStatisticsView"
+            class="org.eclipse.tracecompass.internal.analysis.os.linux.ui.segmentstore.statistics.PriorityStatisticsView"
             icon="icons/eview16/statistics_view.gif"
             id="org.eclipse.tracecompass.analysis.os.linux.ui.segmentstore.statistics.priority"
             name="%view.segstore.statistics.priority"
@@ -57,7 +57,7 @@
       <view
             allowMultiple="false"
             category="org.eclipse.linuxtools.lttng2.ui.views.category"
-            class="org.eclipse.tracecompass.analysis.os.linux.ui.segmentstore.statistics.PriorityStatisticsView"
+            class="org.eclipse.tracecompass.internal.analysis.os.linux.ui.segmentstore.statistics.PriorityStatisticsView"
             icon="icons/obj16/statistics_view.gif"
             id="org.eclipse.tracecompass.analysis.os.linux.ui.segmentstore.statistics.priority:org.eclipse.tracecompass.analysis.os.linux.core.swslatency.sws"
             name="%swslatency.stats.view.name.priority"
@@ -218,42 +218,42 @@
             class="org.eclipse.tracecompass.tmf.ui.analysis.TmfAnalysisViewOutput"
             id="org.eclipse.tracecompass.analysis.timing.ui.segstore.table:org.eclipse.tracecompass.analysis.os.linux.core.swslatency.sws">
          <analysisModuleClass
-               class="org.eclipse.tracecompass.analysis.os.linux.core.swslatency.SWSLatencyAnalysis">
+               class="org.eclipse.tracecompass.internal.analysis.os.linux.core.swslatency.SWSLatencyAnalysis">
          </analysisModuleClass>
       </output>
       <output
             class="org.eclipse.tracecompass.tmf.ui.analysis.TmfAnalysisViewOutput"
             id="org.eclipse.tracecompass.internal.analysis.os.linux.ui.views.swslatency.scatter">
          <analysisModuleClass
-               class="org.eclipse.tracecompass.analysis.os.linux.core.swslatency.SWSLatencyAnalysis">
+               class="org.eclipse.tracecompass.internal.analysis.os.linux.core.swslatency.SWSLatencyAnalysis">
          </analysisModuleClass>
       </output>
       <output
             class="org.eclipse.tracecompass.tmf.ui.analysis.TmfAnalysisViewOutput"
             id="org.eclipse.tracecompass.analysis.timing.ui.segstore.statistics:org.eclipse.tracecompass.analysis.os.linux.core.swslatency.sws">
          <analysisModuleClass
-               class="org.eclipse.tracecompass.analysis.os.linux.core.swslatency.SWSLatencyAnalysis">
+               class="org.eclipse.tracecompass.internal.analysis.os.linux.core.swslatency.SWSLatencyAnalysis">
          </analysisModuleClass>
       </output>
       <output
             class="org.eclipse.tracecompass.tmf.ui.analysis.TmfAnalysisViewOutput"
             id="org.eclipse.tracecompass.analysis.os.linux.ui.segmentstore.statistics.prioname:org.eclipse.tracecompass.analysis.os.linux.core.swslatency.sws">
          <analysisModuleClass
-               class="org.eclipse.tracecompass.analysis.os.linux.core.swslatency.SWSLatencyAnalysis">
+               class="org.eclipse.tracecompass.internal.analysis.os.linux.core.swslatency.SWSLatencyAnalysis">
          </analysisModuleClass>
       </output>
       <output
             class="org.eclipse.tracecompass.tmf.ui.analysis.TmfAnalysisViewOutput"
             id="org.eclipse.tracecompass.analysis.os.linux.ui.segmentstore.statistics.priority:org.eclipse.tracecompass.analysis.os.linux.core.swslatency.sws">
          <analysisModuleClass
-               class="org.eclipse.tracecompass.analysis.os.linux.core.swslatency.SWSLatencyAnalysis">
+               class="org.eclipse.tracecompass.internal.analysis.os.linux.core.swslatency.SWSLatencyAnalysis">
          </analysisModuleClass>
       </output>
       <output
             class="org.eclipse.tracecompass.tmf.ui.analysis.TmfAnalysisViewOutput"
             id="org.eclipse.tracecompass.internal.analysis.os.linux.ui.views.swslatency.density">
          <analysisModuleClass
-               class="org.eclipse.tracecompass.analysis.os.linux.core.swslatency.SWSLatencyAnalysis">
+               class="org.eclipse.tracecompass.internal.analysis.os.linux.core.swslatency.SWSLatencyAnalysis">
          </analysisModuleClass>
       </output>
    </extension>
diff --git a/analysis/org.eclipse.tracecompass.analysis.os.linux.ui/src/org/eclipse/tracecompass/analysis/os/linux/ui/segmentstore/statistics/PriorityStatisticsView.java b/analysis/org.eclipse.tracecompass.analysis.os.linux.ui/src/org/eclipse/tracecompass/internal/analysis/os/linux/ui/segmentstore/statistics/PriorityStatisticsView.java
similarity index 96%
rename from analysis/org.eclipse.tracecompass.analysis.os.linux.ui/src/org/eclipse/tracecompass/analysis/os/linux/ui/segmentstore/statistics/PriorityStatisticsView.java
rename to analysis/org.eclipse.tracecompass.analysis.os.linux.ui/src/org/eclipse/tracecompass/internal/analysis/os/linux/ui/segmentstore/statistics/PriorityStatisticsView.java
index a8386707de..d1c4261372 100644
--- a/analysis/org.eclipse.tracecompass.analysis.os.linux.ui/src/org/eclipse/tracecompass/analysis/os/linux/ui/segmentstore/statistics/PriorityStatisticsView.java
+++ b/analysis/org.eclipse.tracecompass.analysis.os.linux.ui/src/org/eclipse/tracecompass/internal/analysis/os/linux/ui/segmentstore/statistics/PriorityStatisticsView.java
@@ -9,7 +9,7 @@
  * SPDX-License-Identifier: EPL-2.0
  **********************************************************************/
 
-package org.eclipse.tracecompass.analysis.os.linux.ui.segmentstore.statistics;
+package org.eclipse.tracecompass.internal.analysis.os.linux.ui.segmentstore.statistics;
 
 import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.jdt.annotation.Nullable;
diff --git a/analysis/org.eclipse.tracecompass.analysis.os.linux.ui/src/org/eclipse/tracecompass/analysis/os/linux/ui/segmentstore/statistics/PriorityStatisticsViewer.java b/analysis/org.eclipse.tracecompass.analysis.os.linux.ui/src/org/eclipse/tracecompass/internal/analysis/os/linux/ui/segmentstore/statistics/PriorityStatisticsViewer.java
similarity index 93%
rename from analysis/org.eclipse.tracecompass.analysis.os.linux.ui/src/org/eclipse/tracecompass/analysis/os/linux/ui/segmentstore/statistics/PriorityStatisticsViewer.java
rename to analysis/org.eclipse.tracecompass.analysis.os.linux.ui/src/org/eclipse/tracecompass/internal/analysis/os/linux/ui/segmentstore/statistics/PriorityStatisticsViewer.java
index aedcf11f86..4728b57739 100644
--- a/analysis/org.eclipse.tracecompass.analysis.os.linux.ui/src/org/eclipse/tracecompass/analysis/os/linux/ui/segmentstore/statistics/PriorityStatisticsViewer.java
+++ b/analysis/org.eclipse.tracecompass.analysis.os.linux.ui/src/org/eclipse/tracecompass/internal/analysis/os/linux/ui/segmentstore/statistics/PriorityStatisticsViewer.java
@@ -9,7 +9,7 @@
  * SPDX-License-Identifier: EPL-2.0
  **********************************************************************/
 
-package org.eclipse.tracecompass.analysis.os.linux.ui.segmentstore.statistics;
+package org.eclipse.tracecompass.internal.analysis.os.linux.ui.segmentstore.statistics;
 
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.tracecompass.analysis.timing.ui.views.segmentstore.statistics.AbstractSegmentsStatisticsViewer;
diff --git a/analysis/org.eclipse.tracecompass.analysis.os.linux.ui/src/org/eclipse/tracecompass/analysis/os/linux/ui/segmentstore/statistics/PriorityThreadNameStatisticsView.java b/analysis/org.eclipse.tracecompass.analysis.os.linux.ui/src/org/eclipse/tracecompass/internal/analysis/os/linux/ui/segmentstore/statistics/PriorityThreadNameStatisticsView.java
similarity index 96%
rename from analysis/org.eclipse.tracecompass.analysis.os.linux.ui/src/org/eclipse/tracecompass/analysis/os/linux/ui/segmentstore/statistics/PriorityThreadNameStatisticsView.java
rename to analysis/org.eclipse.tracecompass.analysis.os.linux.ui/src/org/eclipse/tracecompass/internal/analysis/os/linux/ui/segmentstore/statistics/PriorityThreadNameStatisticsView.java
index d07a0d81cf..9b90918d9b 100644
--- a/analysis/org.eclipse.tracecompass.analysis.os.linux.ui/src/org/eclipse/tracecompass/analysis/os/linux/ui/segmentstore/statistics/PriorityThreadNameStatisticsView.java
+++ b/analysis/org.eclipse.tracecompass.analysis.os.linux.ui/src/org/eclipse/tracecompass/internal/analysis/os/linux/ui/segmentstore/statistics/PriorityThreadNameStatisticsView.java
@@ -9,7 +9,7 @@
  * SPDX-License-Identifier: EPL-2.0
  **********************************************************************/
 
-package org.eclipse.tracecompass.analysis.os.linux.ui.segmentstore.statistics;
+package org.eclipse.tracecompass.internal.analysis.os.linux.ui.segmentstore.statistics;
 
 import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.jdt.annotation.Nullable;
diff --git a/analysis/org.eclipse.tracecompass.analysis.os.linux.ui/src/org/eclipse/tracecompass/analysis/os/linux/ui/segmentstore/statistics/PriorityThreadNameStatisticsViewer.java b/analysis/org.eclipse.tracecompass.analysis.os.linux.ui/src/org/eclipse/tracecompass/internal/analysis/os/linux/ui/segmentstore/statistics/PriorityThreadNameStatisticsViewer.java
similarity index 94%
rename from analysis/org.eclipse.tracecompass.analysis.os.linux.ui/src/org/eclipse/tracecompass/analysis/os/linux/ui/segmentstore/statistics/PriorityThreadNameStatisticsViewer.java
rename to analysis/org.eclipse.tracecompass.analysis.os.linux.ui/src/org/eclipse/tracecompass/internal/analysis/os/linux/ui/segmentstore/statistics/PriorityThreadNameStatisticsViewer.java
index 433b22d8df..c2a95c1416 100644
--- a/analysis/org.eclipse.tracecompass.analysis.os.linux.ui/src/org/eclipse/tracecompass/analysis/os/linux/ui/segmentstore/statistics/PriorityThreadNameStatisticsViewer.java
+++ b/analysis/org.eclipse.tracecompass.analysis.os.linux.ui/src/org/eclipse/tracecompass/internal/analysis/os/linux/ui/segmentstore/statistics/PriorityThreadNameStatisticsViewer.java
@@ -8,7 +8,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  **********************************************************************/
-package org.eclipse.tracecompass.analysis.os.linux.ui.segmentstore.statistics;
+package org.eclipse.tracecompass.internal.analysis.os.linux.ui.segmentstore.statistics;
 
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.tracecompass.analysis.timing.ui.views.segmentstore.statistics.AbstractSegmentsStatisticsViewer;
diff --git a/analysis/org.eclipse.tracecompass.analysis.os.linux.ui/src/org/eclipse/tracecompass/internal/analysis/os/linux/ui/views/swslatency/SWSDensityViewer.java b/analysis/org.eclipse.tracecompass.analysis.os.linux.ui/src/org/eclipse/tracecompass/internal/analysis/os/linux/ui/views/swslatency/SWSDensityViewer.java
index 94b26aaf91..765ee1d6a1 100644
--- a/analysis/org.eclipse.tracecompass.analysis.os.linux.ui/src/org/eclipse/tracecompass/internal/analysis/os/linux/ui/views/swslatency/SWSDensityViewer.java
+++ b/analysis/org.eclipse.tracecompass.analysis.os.linux.ui/src/org/eclipse/tracecompass/internal/analysis/os/linux/ui/views/swslatency/SWSDensityViewer.java
@@ -13,9 +13,9 @@
 
 import org.eclipse.jdt.annotation.Nullable;
 import org.eclipse.swt.widgets.Composite;
-import org.eclipse.tracecompass.analysis.os.linux.core.swslatency.SWSLatencyAnalysis;
 import org.eclipse.tracecompass.analysis.timing.core.segmentstore.ISegmentStoreProvider;
 import org.eclipse.tracecompass.analysis.timing.ui.views.segmentstore.density2.AbstractSegmentStoreDensityViewer;
+import org.eclipse.tracecompass.internal.analysis.os.linux.core.swslatency.SWSLatencyAnalysis;
 import org.eclipse.tracecompass.tmf.core.trace.ITmfTrace;
 import org.eclipse.tracecompass.tmf.core.trace.TmfTraceUtils;
 
diff --git a/analysis/org.eclipse.tracecompass.analysis.os.linux.ui/src/org/eclipse/tracecompass/internal/analysis/os/linux/ui/views/swslatency/SWSLatencyDensityView.java b/analysis/org.eclipse.tracecompass.analysis.os.linux.ui/src/org/eclipse/tracecompass/internal/analysis/os/linux/ui/views/swslatency/SWSLatencyDensityView.java
index c2839f91a8..b5e333d837 100644
--- a/analysis/org.eclipse.tracecompass.analysis.os.linux.ui/src/org/eclipse/tracecompass/internal/analysis/os/linux/ui/views/swslatency/SWSLatencyDensityView.java
+++ b/analysis/org.eclipse.tracecompass.analysis.os.linux.ui/src/org/eclipse/tracecompass/internal/analysis/os/linux/ui/views/swslatency/SWSLatencyDensityView.java
@@ -14,11 +14,11 @@
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Composite;
-import org.eclipse.tracecompass.analysis.os.linux.core.swslatency.SWSLatencyAnalysis;
 import org.eclipse.tracecompass.analysis.timing.ui.views.segmentstore.density2.AbstractSegmentStoreDensityView;
 import org.eclipse.tracecompass.analysis.timing.ui.views.segmentstore.density2.AbstractSegmentStoreDensityViewer;
 import org.eclipse.tracecompass.analysis.timing.ui.views.segmentstore.table.AbstractSegmentStoreTableViewer;
 import org.eclipse.tracecompass.analysis.timing.ui.views.segmentstore.table.SegmentStoreTableViewer;
+import org.eclipse.tracecompass.internal.analysis.os.linux.core.swslatency.SWSLatencyAnalysis;
 
 /**
  * Sched_wakeup / sched_switch Density view
diff --git a/analysis/org.eclipse.tracecompass.analysis.os.linux.ui/src/org/eclipse/tracecompass/internal/analysis/os/linux/ui/views/swslatency/SWSLatencyScatterGraphViewer.java b/analysis/org.eclipse.tracecompass.analysis.os.linux.ui/src/org/eclipse/tracecompass/internal/analysis/os/linux/ui/views/swslatency/SWSLatencyScatterGraphViewer.java
index 2acd8d5789..cec4ea4e0e 100644
--- a/analysis/org.eclipse.tracecompass.analysis.os.linux.ui/src/org/eclipse/tracecompass/internal/analysis/os/linux/ui/views/swslatency/SWSLatencyScatterGraphViewer.java
+++ b/analysis/org.eclipse.tracecompass.analysis.os.linux.ui/src/org/eclipse/tracecompass/internal/analysis/os/linux/ui/views/swslatency/SWSLatencyScatterGraphViewer.java
@@ -12,8 +12,8 @@
 package org.eclipse.tracecompass.internal.analysis.os.linux.ui.views.swslatency;
 
 import org.eclipse.swt.widgets.Composite;
-import org.eclipse.tracecompass.analysis.os.linux.core.swslatency.SWSLatencyAnalysis;
 import org.eclipse.tracecompass.analysis.timing.ui.views.segmentstore.scatter.AbstractSegmentStoreScatterChartViewer2;
+import org.eclipse.tracecompass.internal.analysis.os.linux.core.swslatency.SWSLatencyAnalysis;
 import org.eclipse.tracecompass.tmf.ui.viewers.xychart.linechart.TmfXYChartSettings;
 
 /**
diff --git a/analysis/org.eclipse.tracecompass.analysis.os.linux.ui/src/org/eclipse/tracecompass/internal/analysis/os/linux/ui/views/swslatency/SWSLatencyScatterView.java b/analysis/org.eclipse.tracecompass.analysis.os.linux.ui/src/org/eclipse/tracecompass/internal/analysis/os/linux/ui/views/swslatency/SWSLatencyScatterView.java
index 8f7bea777e..990447e56f 100644
--- a/analysis/org.eclipse.tracecompass.analysis.os.linux.ui/src/org/eclipse/tracecompass/internal/analysis/os/linux/ui/views/swslatency/SWSLatencyScatterView.java
+++ b/analysis/org.eclipse.tracecompass.analysis.os.linux.ui/src/org/eclipse/tracecompass/internal/analysis/os/linux/ui/views/swslatency/SWSLatencyScatterView.java
@@ -18,8 +18,8 @@
 import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.jdt.annotation.Nullable;
 import org.eclipse.swt.widgets.Composite;
-import org.eclipse.tracecompass.analysis.os.linux.core.swslatency.SWSLatencyAnalysis;
 import org.eclipse.tracecompass.analysis.timing.ui.views.segmentstore.scatter.AbstractSegmentStoreScatterChartTreeViewer2;
+import org.eclipse.tracecompass.internal.analysis.os.linux.core.swslatency.SWSLatencyAnalysis;
 import org.eclipse.tracecompass.tmf.ui.viewers.TmfViewer;
 import org.eclipse.tracecompass.tmf.ui.viewers.xychart.TmfXYChartViewer;
 import org.eclipse.tracecompass.tmf.ui.views.xychart.TmfChartView;