From 93d1d135f0740b81367fe968df073ab581567c20 Mon Sep 17 00:00:00 2001 From: Alexandre Montplaisir Date: Fri, 15 Aug 2014 14:49:13 -0400 Subject: [PATCH] pcap: Make all the packages internal The Pcap plugins are quite new and experimental, it's a bit early to commit to a final API right now. Keep them internal for the moment. Change-Id: I4d01e2a9e493e20d1cc8d5b3065f5021f2632ddf Signed-off-by: Alexandre Montplaisir Reviewed-on: https://git.eclipse.org/r/31775 Tested-by: Hudson CI Reviewed-by: Bernd Hufmann Tested-by: Bernd Hufmann Reviewed-by: Matthew Khouzam --- .../META-INF/MANIFEST.MF | 2 +- .../tests/perf/trace/PcapReadBenchmark.java | 8 +++--- .../tests/perf/trace/PcapSeekBenchmark.java | 6 ++--- .../pcap/core/tests/shared/PcapTestTrace.java | 4 +-- .../tests/file/PcapFileEndiannessTest.java | 6 ++--- .../core/tests/file/PcapFileOpenFailTest.java | 4 +-- .../core/tests/file/PcapFileOpenTest.java | 4 +-- .../core/tests/file/PcapFileReadTest.java | 10 +++---- .../pcap/core/tests/packet/BadPacketTest.java | 8 +++--- .../pcap/core/tests/packet/PacketTest.java | 12 ++++----- .../core/tests/protocol/ProtocolTest.java | 4 +-- .../ethernet2/EthernetIIPacketTest.java | 14 +++++----- .../tests/protocol/ipv4/IPv4PacketTest.java | 12 ++++----- .../tests/protocol/pcap/PcapPacketTest.java | 12 ++++----- .../tests/protocol/tcp/TCPPacketTest.java | 12 ++++----- .../tests/protocol/udp/UDPPacketTest.java | 12 ++++----- .../protocol/unknown/UnknownPacketTest.java | 10 +++---- .../core/tests/stream/StreamBuildTest.java | 8 +++--- .../META-INF/MANIFEST.MF | 26 +++++++++---------- .../pcap/core/endpoint/ProtocolEndpoint.java | 4 +-- .../core/endpoint/ProtocolEndpointPair.java | 4 +-- .../pcap/core/endpoint/package-info.java | 14 ++++++++++ .../pcap/core/filter/IPacketFilter.java | 4 +-- .../core/filter/PacketFilterByProtocol.java | 6 ++--- .../pcap/core/filter}/package-info.java | 2 +- .../pcap/core/packet/BadPacketException.java | 2 +- .../pcap/core/packet/Packet.java | 12 ++++----- .../pcap/core/packet}/package-info.java | 2 +- .../pcap/core/protocol/Protocol.java | 2 +- .../pcap/core/protocol/ProtocolValues.java | 2 +- .../ethernet2/EthernetIIEndpoint.java | 6 ++--- .../protocol/ethernet2/EthernetIIPacket.java | 18 ++++++------- .../protocol/ethernet2/EthernetIIValues.java | 2 +- .../core/protocol/ethernet2/package-info.java | 14 ++++++++++ .../pcap/core/protocol/ipv4/IPv4Endpoint.java | 4 +-- .../pcap/core/protocol/ipv4/IPv4Packet.java | 20 +++++++------- .../pcap/core/protocol/ipv4/IPv4Values.java | 2 +- .../pcap/core/protocol/ipv4/package-info.java | 14 ++++++++++ .../pcap/core/protocol/package-info.java | 14 ++++++++++ .../pcap/core/protocol/pcap/PcapEndpoint.java | 4 +-- .../pcap/core/protocol/pcap/PcapPacket.java | 22 ++++++++-------- .../pcap/core/protocol/pcap/package-info.java | 14 ++++++++++ .../pcap/core/protocol/tcp/TCPEndpoint.java | 4 +-- .../pcap/core/protocol/tcp/TCPPacket.java | 14 +++++----- .../pcap/core/protocol/tcp/TCPValues.java | 2 +- .../pcap/core/protocol/tcp/package-info.java | 14 ++++++++++ .../pcap/core/protocol/udp/UDPEndpoint.java | 4 +-- .../pcap/core/protocol/udp/UDPPacket.java | 14 +++++----- .../pcap/core/protocol/udp/package-info.java | 14 ++++++++++ .../protocol/unknown/UnknownEndpoint.java | 4 +-- .../core/protocol/unknown/UnknownPacket.java | 10 +++---- .../core/protocol/unknown/package-info.java | 14 ++++++++++ .../pcap/core/stream/PacketStream.java | 10 +++---- .../pcap/core/stream/PacketStreamBuilder.java | 22 ++++++++-------- .../pcap/core/stream/package-info.java | 14 ++++++++++ .../pcap/core/trace/BadPcapFileException.java | 2 +- .../pcap/core/trace/PcapFile.java | 10 +++---- .../pcap/core/trace/PcapFileValues.java | 2 +- .../pcap/core/trace}/package-info.java | 2 +- .../pcap/core/util/ConversionHelper.java | 4 +-- .../pcap/core/util/EthertypeHelper.java | 2 +- .../core/util/IPProtocolNumberHelper.java | 4 +-- .../pcap/core/util/LinkTypeHelper.java | 2 +- .../pcap/core/util/PcapTimestampScale.java | 2 +- .../pcap/core/util}/package-info.java | 2 +- .../pcap/core/protocol/package-info.java | 14 ---------- .../pcap/core/protocol/pcap/package-info.java | 14 ---------- .../pcap/core/protocol/tcp/package-info.java | 14 ---------- .../pcap/core/protocol/udp/package-info.java | 14 ---------- .../core/protocol/unknown/package-info.java | 14 ---------- .../pcap/core/stream/package-info.java | 14 ---------- .../pcap/core/trace/package-info.java | 14 ---------- .../pcap/core/util/package-info.java | 14 ---------- .../doc/Developer-Guide.mediawiki | 10 +++---- .../META-INF/MANIFEST.MF | 2 +- .../core/tests/shared/PcapTmfTestTrace.java | 4 +-- .../analysis/StreamListAnalysisTest.java | 8 +++--- .../core/tests/event/PcapEventFieldTest.java | 14 +++++----- .../pcap/core/tests/event/PcapEventTest.java | 10 +++---- .../pcap/core/tests/trace/PcapTraceTest.java | 4 +-- .../core/tests/stubs/PcapTmfTraceStub.java | 2 +- .../META-INF/MANIFEST.MF | 12 ++++----- .../plugin.xml | 6 ++--- .../core/analysis/StreamListAnalysis.java | 10 +++---- .../tmf/pcap/core/analysis/package-info.java | 14 ++++++++++ .../tmf/pcap/core/event/Messages.java | 7 +++-- .../tmf/pcap/core/event/PcapEvent.java | 8 +++--- .../tmf/pcap/core/event/PcapEventField.java | 4 +-- .../tmf/pcap/core/event/PcapEventType.java | 2 +- .../pcap/core/event/PcapRootEventField.java | 4 +-- .../tmf/pcap/core/event/TmfPacketStream.java | 6 ++--- .../core/event/TmfPacketStreamBuilder.java | 14 +++++----- .../tmf/pcap/core/event/messages.properties | 0 .../tmf/pcap/core/event}/package-info.java | 2 +- .../tmf/pcap/core/protocol/TmfProtocol.java | 4 +-- .../tmf/pcap/core/protocol/package-info.java | 14 ++++++++++ .../signal/TmfPacketStreamSelectedSignal.java | 4 +-- .../tmf/pcap/core/signal/package-info.java | 14 ++++++++++ .../tmf/pcap/core/trace/Messages.java | 7 +++-- .../tmf/pcap/core/trace/PcapTrace.java | 14 +++++----- .../tmf/pcap/core/trace/messages.properties | 0 .../tmf/pcap/core/trace/package-info.java | 14 ++++++++++ .../internal/tmf/pcap/core/util/Messages.java | 3 +++ .../tmf/pcap/core/util/PcapEventFactory.java | 22 ++++++++-------- .../pcap/core/util/ProtocolConversion.java | 4 +-- .../tmf/pcap/core/analysis/package-info.java | 14 ---------- .../tmf/pcap/core/event/package-info.java | 14 ---------- .../tmf/pcap/core/protocol/package-info.java | 14 ---------- .../tmf/pcap/core/signal/package-info.java | 14 ---------- .../tmf/pcap/core/trace/package-info.java | 14 ---------- .../swtbot/tests/ImportAndReadPcapTest.java | 6 ++--- .../tests/NetworkPerspectiveChecker.java | 4 +-- .../META-INF/MANIFEST.MF | 7 +++-- org.eclipse.linuxtools.tmf.pcap.ui/plugin.xml | 8 +++--- .../pcap/ui/NetworkingPerspectiveFactory.java | 4 +-- .../tmf/pcap/ui/editor/Messages.java | 7 +++-- .../tmf/pcap/ui/editor/PcapEventsTable.java | 6 ++--- .../tmf/pcap/ui/editor/messages.properties | 0 .../tmf/pcap/ui/editor/package-info.java | 14 ++++++++++ .../tmf/pcap/ui/stream/Messages.java | 7 +++-- .../tmf/pcap/ui/stream/StreamListView.java | 16 ++++++------ .../tmf/pcap/ui/stream/messages.properties | 0 .../tmf/pcap/ui/stream/package-info.java | 14 ++++++++++ .../tmf/pcap/ui/editor/package-info.java | 14 ---------- .../linuxtools/tmf/pcap/ui/package-info.java | 14 ---------- .../tmf/pcap/ui/stream/package-info.java | 14 ---------- 126 files changed, 547 insertions(+), 547 deletions(-) rename org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/{ => internal}/pcap/core/endpoint/ProtocolEndpoint.java (95%) rename org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/{ => internal}/pcap/core/endpoint/ProtocolEndpointPair.java (95%) create mode 100644 org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/internal/pcap/core/endpoint/package-info.java rename org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/{ => internal}/pcap/core/filter/IPacketFilter.java (87%) rename org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/{ => internal}/pcap/core/filter/PacketFilterByProtocol.java (87%) rename org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/{pcap/core/packet => internal/pcap/core/filter}/package-info.java (90%) rename org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/{ => internal}/pcap/core/packet/BadPacketException.java (97%) rename org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/{ => internal}/pcap/core/packet/Packet.java (95%) rename org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/{pcap/core/protocol/ipv4 => internal/pcap/core/packet}/package-info.java (90%) rename org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/{ => internal}/pcap/core/protocol/Protocol.java (98%) rename org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/{ => internal}/pcap/core/protocol/ProtocolValues.java (95%) rename org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/{ => internal}/pcap/core/protocol/ethernet2/EthernetIIEndpoint.java (93%) rename org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/{ => internal}/pcap/core/protocol/ethernet2/EthernetIIPacket.java (93%) rename org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/{ => internal}/pcap/core/protocol/ethernet2/EthernetIIValues.java (94%) create mode 100644 org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/internal/pcap/core/protocol/ethernet2/package-info.java rename org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/{ => internal}/pcap/core/protocol/ipv4/IPv4Endpoint.java (95%) rename org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/{ => internal}/pcap/core/protocol/ipv4/IPv4Packet.java (96%) rename org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/{ => internal}/pcap/core/protocol/ipv4/IPv4Values.java (93%) create mode 100644 org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/internal/pcap/core/protocol/ipv4/package-info.java create mode 100644 org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/internal/pcap/core/protocol/package-info.java rename org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/{ => internal}/pcap/core/protocol/pcap/PcapEndpoint.java (93%) rename org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/{ => internal}/pcap/core/protocol/pcap/PcapPacket.java (93%) create mode 100644 org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/internal/pcap/core/protocol/pcap/package-info.java rename org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/{ => internal}/pcap/core/protocol/tcp/TCPEndpoint.java (95%) rename org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/{ => internal}/pcap/core/protocol/tcp/TCPPacket.java (97%) rename org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/{ => internal}/pcap/core/protocol/tcp/TCPValues.java (93%) create mode 100644 org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/internal/pcap/core/protocol/tcp/package-info.java rename org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/{ => internal}/pcap/core/protocol/udp/UDPEndpoint.java (95%) rename org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/{ => internal}/pcap/core/protocol/udp/UDPPacket.java (94%) create mode 100644 org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/internal/pcap/core/protocol/udp/package-info.java rename org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/{ => internal}/pcap/core/protocol/unknown/UnknownEndpoint.java (92%) rename org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/{ => internal}/pcap/core/protocol/unknown/UnknownPacket.java (94%) create mode 100644 org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/internal/pcap/core/protocol/unknown/package-info.java rename org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/{ => internal}/pcap/core/stream/PacketStream.java (95%) rename org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/{ => internal}/pcap/core/stream/PacketStreamBuilder.java (86%) create mode 100644 org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/internal/pcap/core/stream/package-info.java rename org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/{ => internal}/pcap/core/trace/BadPcapFileException.java (96%) rename org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/{ => internal}/pcap/core/trace/PcapFile.java (97%) rename org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/{ => internal}/pcap/core/trace/PcapFileValues.java (96%) rename org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/{pcap/core/filter => internal/pcap/core/trace}/package-info.java (90%) rename org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/{ => internal}/pcap/core/util/ConversionHelper.java (97%) rename org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/{ => internal}/pcap/core/util/EthertypeHelper.java (97%) rename org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/{ => internal}/pcap/core/util/IPProtocolNumberHelper.java (95%) rename org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/{ => internal}/pcap/core/util/LinkTypeHelper.java (97%) rename org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/{ => internal}/pcap/core/util/PcapTimestampScale.java (92%) rename org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/{pcap/core/endpoint => internal/pcap/core/util}/package-info.java (91%) delete mode 100644 org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/pcap/core/protocol/package-info.java delete mode 100644 org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/pcap/core/protocol/pcap/package-info.java delete mode 100644 org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/pcap/core/protocol/tcp/package-info.java delete mode 100644 org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/pcap/core/protocol/udp/package-info.java delete mode 100644 org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/pcap/core/protocol/unknown/package-info.java delete mode 100644 org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/pcap/core/stream/package-info.java delete mode 100644 org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/pcap/core/trace/package-info.java delete mode 100644 org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/pcap/core/util/package-info.java rename org.eclipse.linuxtools.tmf.pcap.core/src/org/eclipse/linuxtools/{ => internal}/tmf/pcap/core/analysis/StreamListAnalysis.java (93%) create mode 100644 org.eclipse.linuxtools.tmf.pcap.core/src/org/eclipse/linuxtools/internal/tmf/pcap/core/analysis/package-info.java rename org.eclipse.linuxtools.tmf.pcap.core/src/org/eclipse/linuxtools/{ => internal}/tmf/pcap/core/event/Messages.java (89%) rename org.eclipse.linuxtools.tmf.pcap.core/src/org/eclipse/linuxtools/{ => internal}/tmf/pcap/core/event/PcapEvent.java (96%) rename org.eclipse.linuxtools.tmf.pcap.core/src/org/eclipse/linuxtools/{ => internal}/tmf/pcap/core/event/PcapEventField.java (93%) rename org.eclipse.linuxtools.tmf.pcap.core/src/org/eclipse/linuxtools/{ => internal}/tmf/pcap/core/event/PcapEventType.java (97%) rename org.eclipse.linuxtools.tmf.pcap.core/src/org/eclipse/linuxtools/{ => internal}/tmf/pcap/core/event/PcapRootEventField.java (96%) rename org.eclipse.linuxtools.tmf.pcap.core/src/org/eclipse/linuxtools/{ => internal}/tmf/pcap/core/event/TmfPacketStream.java (95%) rename org.eclipse.linuxtools.tmf.pcap.core/src/org/eclipse/linuxtools/{ => internal}/tmf/pcap/core/event/TmfPacketStreamBuilder.java (82%) rename org.eclipse.linuxtools.tmf.pcap.core/src/org/eclipse/linuxtools/{ => internal}/tmf/pcap/core/event/messages.properties (100%) rename {org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/pcap/core/protocol/ethernet2 => org.eclipse.linuxtools.tmf.pcap.core/src/org/eclipse/linuxtools/internal/tmf/pcap/core/event}/package-info.java (90%) rename org.eclipse.linuxtools.tmf.pcap.core/src/org/eclipse/linuxtools/{ => internal}/tmf/pcap/core/protocol/TmfProtocol.java (96%) create mode 100644 org.eclipse.linuxtools.tmf.pcap.core/src/org/eclipse/linuxtools/internal/tmf/pcap/core/protocol/package-info.java rename org.eclipse.linuxtools.tmf.pcap.core/src/org/eclipse/linuxtools/{ => internal}/tmf/pcap/core/signal/TmfPacketStreamSelectedSignal.java (92%) create mode 100644 org.eclipse.linuxtools.tmf.pcap.core/src/org/eclipse/linuxtools/internal/tmf/pcap/core/signal/package-info.java rename org.eclipse.linuxtools.tmf.pcap.core/src/org/eclipse/linuxtools/{ => internal}/tmf/pcap/core/trace/Messages.java (90%) rename org.eclipse.linuxtools.tmf.pcap.core/src/org/eclipse/linuxtools/{ => internal}/tmf/pcap/core/trace/PcapTrace.java (94%) rename org.eclipse.linuxtools.tmf.pcap.core/src/org/eclipse/linuxtools/{ => internal}/tmf/pcap/core/trace/messages.properties (100%) create mode 100644 org.eclipse.linuxtools.tmf.pcap.core/src/org/eclipse/linuxtools/internal/tmf/pcap/core/trace/package-info.java delete mode 100644 org.eclipse.linuxtools.tmf.pcap.core/src/org/eclipse/linuxtools/tmf/pcap/core/analysis/package-info.java delete mode 100644 org.eclipse.linuxtools.tmf.pcap.core/src/org/eclipse/linuxtools/tmf/pcap/core/event/package-info.java delete mode 100644 org.eclipse.linuxtools.tmf.pcap.core/src/org/eclipse/linuxtools/tmf/pcap/core/protocol/package-info.java delete mode 100644 org.eclipse.linuxtools.tmf.pcap.core/src/org/eclipse/linuxtools/tmf/pcap/core/signal/package-info.java delete mode 100644 org.eclipse.linuxtools.tmf.pcap.core/src/org/eclipse/linuxtools/tmf/pcap/core/trace/package-info.java rename org.eclipse.linuxtools.tmf.pcap.ui/src/org/eclipse/linuxtools/{ => internal}/tmf/pcap/ui/NetworkingPerspectiveFactory.java (96%) rename org.eclipse.linuxtools.tmf.pcap.ui/src/org/eclipse/linuxtools/{ => internal}/tmf/pcap/ui/editor/Messages.java (91%) rename org.eclipse.linuxtools.tmf.pcap.ui/src/org/eclipse/linuxtools/{ => internal}/tmf/pcap/ui/editor/PcapEventsTable.java (95%) rename org.eclipse.linuxtools.tmf.pcap.ui/src/org/eclipse/linuxtools/{ => internal}/tmf/pcap/ui/editor/messages.properties (100%) create mode 100644 org.eclipse.linuxtools.tmf.pcap.ui/src/org/eclipse/linuxtools/internal/tmf/pcap/ui/editor/package-info.java rename org.eclipse.linuxtools.tmf.pcap.ui/src/org/eclipse/linuxtools/{ => internal}/tmf/pcap/ui/stream/Messages.java (94%) rename org.eclipse.linuxtools.tmf.pcap.ui/src/org/eclipse/linuxtools/{ => internal}/tmf/pcap/ui/stream/StreamListView.java (96%) rename org.eclipse.linuxtools.tmf.pcap.ui/src/org/eclipse/linuxtools/{ => internal}/tmf/pcap/ui/stream/messages.properties (100%) create mode 100644 org.eclipse.linuxtools.tmf.pcap.ui/src/org/eclipse/linuxtools/internal/tmf/pcap/ui/stream/package-info.java delete mode 100644 org.eclipse.linuxtools.tmf.pcap.ui/src/org/eclipse/linuxtools/tmf/pcap/ui/editor/package-info.java delete mode 100644 org.eclipse.linuxtools.tmf.pcap.ui/src/org/eclipse/linuxtools/tmf/pcap/ui/package-info.java delete mode 100644 org.eclipse.linuxtools.tmf.pcap.ui/src/org/eclipse/linuxtools/tmf/pcap/ui/stream/package-info.java diff --git a/org.eclipse.linuxtools.pcap.core.tests/META-INF/MANIFEST.MF b/org.eclipse.linuxtools.pcap.core.tests/META-INF/MANIFEST.MF index bce1407433..59a576b788 100644 --- a/org.eclipse.linuxtools.pcap.core.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.linuxtools.pcap.core.tests/META-INF/MANIFEST.MF @@ -23,7 +23,7 @@ Export-Package: org.eclipse.linuxtools.pcap.core.tests, org.eclipse.linuxtools.pcap.core.tests.protocol.tcp;x-internal:=true, org.eclipse.linuxtools.pcap.core.tests.protocol.udp;x-internal:=true, org.eclipse.linuxtools.pcap.core.tests.protocol.unknown;x-internal:=true, - org.eclipse.linuxtools.pcap.core.tests.shared, + org.eclipse.linuxtools.pcap.core.tests.shared;x-friends:="org.eclipse.linuxtools.tmf.pcap.core.tests", org.eclipse.linuxtools.pcap.core.tests.stream;x-internal:=true Import-Package: com.google.common.collect, org.eclipse.test.performance diff --git a/org.eclipse.linuxtools.pcap.core.tests/perf/org/eclipse/linuxtools/pcap/core/tests/perf/trace/PcapReadBenchmark.java b/org.eclipse.linuxtools.pcap.core.tests/perf/org/eclipse/linuxtools/pcap/core/tests/perf/trace/PcapReadBenchmark.java index f1c4fd743d..1e98a81d91 100644 --- a/org.eclipse.linuxtools.pcap.core.tests/perf/org/eclipse/linuxtools/pcap/core/tests/perf/trace/PcapReadBenchmark.java +++ b/org.eclipse.linuxtools.pcap.core.tests/perf/org/eclipse/linuxtools/pcap/core/tests/perf/trace/PcapReadBenchmark.java @@ -17,11 +17,11 @@ import static org.junit.Assume.assumeTrue; import java.io.IOException; -import org.eclipse.linuxtools.pcap.core.packet.BadPacketException; -import org.eclipse.linuxtools.pcap.core.packet.Packet; +import org.eclipse.linuxtools.internal.pcap.core.packet.BadPacketException; +import org.eclipse.linuxtools.internal.pcap.core.packet.Packet; +import org.eclipse.linuxtools.internal.pcap.core.trace.BadPcapFileException; +import org.eclipse.linuxtools.internal.pcap.core.trace.PcapFile; import org.eclipse.linuxtools.pcap.core.tests.shared.PcapTestTrace; -import org.eclipse.linuxtools.pcap.core.trace.BadPcapFileException; -import org.eclipse.linuxtools.pcap.core.trace.PcapFile; import org.eclipse.test.performance.Dimension; import org.eclipse.test.performance.Performance; import org.eclipse.test.performance.PerformanceMeter; diff --git a/org.eclipse.linuxtools.pcap.core.tests/perf/org/eclipse/linuxtools/pcap/core/tests/perf/trace/PcapSeekBenchmark.java b/org.eclipse.linuxtools.pcap.core.tests/perf/org/eclipse/linuxtools/pcap/core/tests/perf/trace/PcapSeekBenchmark.java index c8439b2f12..e16cebac58 100644 --- a/org.eclipse.linuxtools.pcap.core.tests/perf/org/eclipse/linuxtools/pcap/core/tests/perf/trace/PcapSeekBenchmark.java +++ b/org.eclipse.linuxtools.pcap.core.tests/perf/org/eclipse/linuxtools/pcap/core/tests/perf/trace/PcapSeekBenchmark.java @@ -20,10 +20,10 @@ import java.util.LinkedList; import java.util.List; import java.util.Random; -import org.eclipse.linuxtools.pcap.core.packet.BadPacketException; +import org.eclipse.linuxtools.internal.pcap.core.packet.BadPacketException; +import org.eclipse.linuxtools.internal.pcap.core.trace.BadPcapFileException; +import org.eclipse.linuxtools.internal.pcap.core.trace.PcapFile; import org.eclipse.linuxtools.pcap.core.tests.shared.PcapTestTrace; -import org.eclipse.linuxtools.pcap.core.trace.BadPcapFileException; -import org.eclipse.linuxtools.pcap.core.trace.PcapFile; import org.eclipse.test.performance.Dimension; import org.eclipse.test.performance.Performance; import org.eclipse.test.performance.PerformanceMeter; diff --git a/org.eclipse.linuxtools.pcap.core.tests/shared/org/eclipse/linuxtools/pcap/core/tests/shared/PcapTestTrace.java b/org.eclipse.linuxtools.pcap.core.tests/shared/org/eclipse/linuxtools/pcap/core/tests/shared/PcapTestTrace.java index 4373e8d8c8..5f78b56b83 100644 --- a/org.eclipse.linuxtools.pcap.core.tests/shared/org/eclipse/linuxtools/pcap/core/tests/shared/PcapTestTrace.java +++ b/org.eclipse.linuxtools.pcap.core.tests/shared/org/eclipse/linuxtools/pcap/core/tests/shared/PcapTestTrace.java @@ -17,8 +17,8 @@ import java.nio.file.Files; import java.nio.file.Path; import org.eclipse.jdt.annotation.NonNull; -import org.eclipse.linuxtools.pcap.core.trace.BadPcapFileException; -import org.eclipse.linuxtools.pcap.core.trace.PcapFile; +import org.eclipse.linuxtools.internal.pcap.core.trace.BadPcapFileException; +import org.eclipse.linuxtools.internal.pcap.core.trace.PcapFile; /** * Here is the list of the available test traces for the Pcap parser. diff --git a/org.eclipse.linuxtools.pcap.core.tests/src/org/eclipse/linuxtools/pcap/core/tests/file/PcapFileEndiannessTest.java b/org.eclipse.linuxtools.pcap.core.tests/src/org/eclipse/linuxtools/pcap/core/tests/file/PcapFileEndiannessTest.java index d256cf7cd1..28a1dc744c 100644 --- a/org.eclipse.linuxtools.pcap.core.tests/src/org/eclipse/linuxtools/pcap/core/tests/file/PcapFileEndiannessTest.java +++ b/org.eclipse.linuxtools.pcap.core.tests/src/org/eclipse/linuxtools/pcap/core/tests/file/PcapFileEndiannessTest.java @@ -19,10 +19,10 @@ import java.io.IOException; import java.nio.ByteOrder; import java.nio.file.Path; -import org.eclipse.linuxtools.pcap.core.packet.BadPacketException; +import org.eclipse.linuxtools.internal.pcap.core.packet.BadPacketException; +import org.eclipse.linuxtools.internal.pcap.core.trace.BadPcapFileException; +import org.eclipse.linuxtools.internal.pcap.core.trace.PcapFile; import org.eclipse.linuxtools.pcap.core.tests.shared.PcapTestTrace; -import org.eclipse.linuxtools.pcap.core.trace.BadPcapFileException; -import org.eclipse.linuxtools.pcap.core.trace.PcapFile; import org.junit.Test; /** diff --git a/org.eclipse.linuxtools.pcap.core.tests/src/org/eclipse/linuxtools/pcap/core/tests/file/PcapFileOpenFailTest.java b/org.eclipse.linuxtools.pcap.core.tests/src/org/eclipse/linuxtools/pcap/core/tests/file/PcapFileOpenFailTest.java index cb015559a0..7b8ffcac8f 100644 --- a/org.eclipse.linuxtools.pcap.core.tests/src/org/eclipse/linuxtools/pcap/core/tests/file/PcapFileOpenFailTest.java +++ b/org.eclipse.linuxtools.pcap.core.tests/src/org/eclipse/linuxtools/pcap/core/tests/file/PcapFileOpenFailTest.java @@ -18,9 +18,9 @@ import static org.junit.Assume.assumeTrue; import java.io.IOException; +import org.eclipse.linuxtools.internal.pcap.core.trace.BadPcapFileException; +import org.eclipse.linuxtools.internal.pcap.core.trace.PcapFile; import org.eclipse.linuxtools.pcap.core.tests.shared.PcapTestTrace; -import org.eclipse.linuxtools.pcap.core.trace.BadPcapFileException; -import org.eclipse.linuxtools.pcap.core.trace.PcapFile; import org.junit.Test; /** diff --git a/org.eclipse.linuxtools.pcap.core.tests/src/org/eclipse/linuxtools/pcap/core/tests/file/PcapFileOpenTest.java b/org.eclipse.linuxtools.pcap.core.tests/src/org/eclipse/linuxtools/pcap/core/tests/file/PcapFileOpenTest.java index 43604e508e..df22a7b902 100644 --- a/org.eclipse.linuxtools.pcap.core.tests/src/org/eclipse/linuxtools/pcap/core/tests/file/PcapFileOpenTest.java +++ b/org.eclipse.linuxtools.pcap.core.tests/src/org/eclipse/linuxtools/pcap/core/tests/file/PcapFileOpenTest.java @@ -18,9 +18,9 @@ import static org.junit.Assume.assumeTrue; import java.io.IOException; import java.nio.ByteOrder; +import org.eclipse.linuxtools.internal.pcap.core.trace.BadPcapFileException; +import org.eclipse.linuxtools.internal.pcap.core.trace.PcapFile; import org.eclipse.linuxtools.pcap.core.tests.shared.PcapTestTrace; -import org.eclipse.linuxtools.pcap.core.trace.BadPcapFileException; -import org.eclipse.linuxtools.pcap.core.trace.PcapFile; import org.junit.Test; /** diff --git a/org.eclipse.linuxtools.pcap.core.tests/src/org/eclipse/linuxtools/pcap/core/tests/file/PcapFileReadTest.java b/org.eclipse.linuxtools.pcap.core.tests/src/org/eclipse/linuxtools/pcap/core/tests/file/PcapFileReadTest.java index ac659f39dc..86226a5804 100644 --- a/org.eclipse.linuxtools.pcap.core.tests/src/org/eclipse/linuxtools/pcap/core/tests/file/PcapFileReadTest.java +++ b/org.eclipse.linuxtools.pcap.core.tests/src/org/eclipse/linuxtools/pcap/core/tests/file/PcapFileReadTest.java @@ -19,12 +19,12 @@ import static org.junit.Assume.assumeTrue; import java.io.IOException; -import org.eclipse.linuxtools.pcap.core.packet.BadPacketException; -import org.eclipse.linuxtools.pcap.core.protocol.Protocol; -import org.eclipse.linuxtools.pcap.core.protocol.pcap.PcapPacket; +import org.eclipse.linuxtools.internal.pcap.core.packet.BadPacketException; +import org.eclipse.linuxtools.internal.pcap.core.protocol.Protocol; +import org.eclipse.linuxtools.internal.pcap.core.protocol.pcap.PcapPacket; +import org.eclipse.linuxtools.internal.pcap.core.trace.BadPcapFileException; +import org.eclipse.linuxtools.internal.pcap.core.trace.PcapFile; import org.eclipse.linuxtools.pcap.core.tests.shared.PcapTestTrace; -import org.eclipse.linuxtools.pcap.core.trace.BadPcapFileException; -import org.eclipse.linuxtools.pcap.core.trace.PcapFile; import org.junit.Test; /** diff --git a/org.eclipse.linuxtools.pcap.core.tests/src/org/eclipse/linuxtools/pcap/core/tests/packet/BadPacketTest.java b/org.eclipse.linuxtools.pcap.core.tests/src/org/eclipse/linuxtools/pcap/core/tests/packet/BadPacketTest.java index 390fcfb49b..484e46a9c5 100644 --- a/org.eclipse.linuxtools.pcap.core.tests/src/org/eclipse/linuxtools/pcap/core/tests/packet/BadPacketTest.java +++ b/org.eclipse.linuxtools.pcap.core.tests/src/org/eclipse/linuxtools/pcap/core/tests/packet/BadPacketTest.java @@ -19,11 +19,11 @@ import java.io.IOException; import java.nio.ByteBuffer; import java.nio.ByteOrder; -import org.eclipse.linuxtools.pcap.core.packet.BadPacketException; -import org.eclipse.linuxtools.pcap.core.protocol.ethernet2.EthernetIIPacket; +import org.eclipse.linuxtools.internal.pcap.core.packet.BadPacketException; +import org.eclipse.linuxtools.internal.pcap.core.protocol.ethernet2.EthernetIIPacket; +import org.eclipse.linuxtools.internal.pcap.core.trace.BadPcapFileException; +import org.eclipse.linuxtools.internal.pcap.core.trace.PcapFile; import org.eclipse.linuxtools.pcap.core.tests.shared.PcapTestTrace; -import org.eclipse.linuxtools.pcap.core.trace.BadPcapFileException; -import org.eclipse.linuxtools.pcap.core.trace.PcapFile; import org.junit.Before; import org.junit.Test; diff --git a/org.eclipse.linuxtools.pcap.core.tests/src/org/eclipse/linuxtools/pcap/core/tests/packet/PacketTest.java b/org.eclipse.linuxtools.pcap.core.tests/src/org/eclipse/linuxtools/pcap/core/tests/packet/PacketTest.java index a6d978d02e..af8efed435 100644 --- a/org.eclipse.linuxtools.pcap.core.tests/src/org/eclipse/linuxtools/pcap/core/tests/packet/PacketTest.java +++ b/org.eclipse.linuxtools.pcap.core.tests/src/org/eclipse/linuxtools/pcap/core/tests/packet/PacketTest.java @@ -23,13 +23,13 @@ import java.io.IOException; import java.nio.ByteBuffer; import java.nio.ByteOrder; -import org.eclipse.linuxtools.pcap.core.packet.BadPacketException; -import org.eclipse.linuxtools.pcap.core.packet.Packet; -import org.eclipse.linuxtools.pcap.core.protocol.Protocol; -import org.eclipse.linuxtools.pcap.core.protocol.ethernet2.EthernetIIPacket; +import org.eclipse.linuxtools.internal.pcap.core.packet.BadPacketException; +import org.eclipse.linuxtools.internal.pcap.core.packet.Packet; +import org.eclipse.linuxtools.internal.pcap.core.protocol.Protocol; +import org.eclipse.linuxtools.internal.pcap.core.protocol.ethernet2.EthernetIIPacket; +import org.eclipse.linuxtools.internal.pcap.core.trace.BadPcapFileException; +import org.eclipse.linuxtools.internal.pcap.core.trace.PcapFile; import org.eclipse.linuxtools.pcap.core.tests.shared.PcapTestTrace; -import org.eclipse.linuxtools.pcap.core.trace.BadPcapFileException; -import org.eclipse.linuxtools.pcap.core.trace.PcapFile; import org.junit.Before; import org.junit.Test; diff --git a/org.eclipse.linuxtools.pcap.core.tests/src/org/eclipse/linuxtools/pcap/core/tests/protocol/ProtocolTest.java b/org.eclipse.linuxtools.pcap.core.tests/src/org/eclipse/linuxtools/pcap/core/tests/protocol/ProtocolTest.java index 38b9922d7b..024a8573b5 100644 --- a/org.eclipse.linuxtools.pcap.core.tests/src/org/eclipse/linuxtools/pcap/core/tests/protocol/ProtocolTest.java +++ b/org.eclipse.linuxtools.pcap.core.tests/src/org/eclipse/linuxtools/pcap/core/tests/protocol/ProtocolTest.java @@ -18,8 +18,8 @@ import static org.junit.Assert.fail; import java.util.ArrayList; import java.util.List; -import org.eclipse.linuxtools.pcap.core.protocol.Protocol; -import org.eclipse.linuxtools.pcap.core.protocol.ProtocolValues; +import org.eclipse.linuxtools.internal.pcap.core.protocol.Protocol; +import org.eclipse.linuxtools.internal.pcap.core.protocol.ProtocolValues; import org.junit.Test; /** diff --git a/org.eclipse.linuxtools.pcap.core.tests/src/org/eclipse/linuxtools/pcap/core/tests/protocol/ethernet2/EthernetIIPacketTest.java b/org.eclipse.linuxtools.pcap.core.tests/src/org/eclipse/linuxtools/pcap/core/tests/protocol/ethernet2/EthernetIIPacketTest.java index 284d1a7387..b53b389c65 100644 --- a/org.eclipse.linuxtools.pcap.core.tests/src/org/eclipse/linuxtools/pcap/core/tests/protocol/ethernet2/EthernetIIPacketTest.java +++ b/org.eclipse.linuxtools.pcap.core.tests/src/org/eclipse/linuxtools/pcap/core/tests/protocol/ethernet2/EthernetIIPacketTest.java @@ -24,14 +24,14 @@ import java.nio.ByteOrder; import java.util.Arrays; import java.util.Map; -import org.eclipse.linuxtools.pcap.core.packet.BadPacketException; -import org.eclipse.linuxtools.pcap.core.protocol.Protocol; -import org.eclipse.linuxtools.pcap.core.protocol.ethernet2.EthernetIIEndpoint; -import org.eclipse.linuxtools.pcap.core.protocol.ethernet2.EthernetIIPacket; -import org.eclipse.linuxtools.pcap.core.protocol.ethernet2.EthernetIIValues; +import org.eclipse.linuxtools.internal.pcap.core.packet.BadPacketException; +import org.eclipse.linuxtools.internal.pcap.core.protocol.Protocol; +import org.eclipse.linuxtools.internal.pcap.core.protocol.ethernet2.EthernetIIEndpoint; +import org.eclipse.linuxtools.internal.pcap.core.protocol.ethernet2.EthernetIIPacket; +import org.eclipse.linuxtools.internal.pcap.core.protocol.ethernet2.EthernetIIValues; +import org.eclipse.linuxtools.internal.pcap.core.trace.BadPcapFileException; +import org.eclipse.linuxtools.internal.pcap.core.trace.PcapFile; import org.eclipse.linuxtools.pcap.core.tests.shared.PcapTestTrace; -import org.eclipse.linuxtools.pcap.core.trace.BadPcapFileException; -import org.eclipse.linuxtools.pcap.core.trace.PcapFile; import org.junit.Before; import org.junit.Test; diff --git a/org.eclipse.linuxtools.pcap.core.tests/src/org/eclipse/linuxtools/pcap/core/tests/protocol/ipv4/IPv4PacketTest.java b/org.eclipse.linuxtools.pcap.core.tests/src/org/eclipse/linuxtools/pcap/core/tests/protocol/ipv4/IPv4PacketTest.java index 66ef3a3edb..d2176338f4 100644 --- a/org.eclipse.linuxtools.pcap.core.tests/src/org/eclipse/linuxtools/pcap/core/tests/protocol/ipv4/IPv4PacketTest.java +++ b/org.eclipse.linuxtools.pcap.core.tests/src/org/eclipse/linuxtools/pcap/core/tests/protocol/ipv4/IPv4PacketTest.java @@ -26,13 +26,13 @@ import java.util.Arrays; import java.util.LinkedHashMap; import java.util.Map; -import org.eclipse.linuxtools.pcap.core.packet.BadPacketException; -import org.eclipse.linuxtools.pcap.core.protocol.Protocol; -import org.eclipse.linuxtools.pcap.core.protocol.ipv4.IPv4Endpoint; -import org.eclipse.linuxtools.pcap.core.protocol.ipv4.IPv4Packet; +import org.eclipse.linuxtools.internal.pcap.core.packet.BadPacketException; +import org.eclipse.linuxtools.internal.pcap.core.protocol.Protocol; +import org.eclipse.linuxtools.internal.pcap.core.protocol.ipv4.IPv4Endpoint; +import org.eclipse.linuxtools.internal.pcap.core.protocol.ipv4.IPv4Packet; +import org.eclipse.linuxtools.internal.pcap.core.trace.BadPcapFileException; +import org.eclipse.linuxtools.internal.pcap.core.trace.PcapFile; import org.eclipse.linuxtools.pcap.core.tests.shared.PcapTestTrace; -import org.eclipse.linuxtools.pcap.core.trace.BadPcapFileException; -import org.eclipse.linuxtools.pcap.core.trace.PcapFile; import org.junit.Before; import org.junit.Test; diff --git a/org.eclipse.linuxtools.pcap.core.tests/src/org/eclipse/linuxtools/pcap/core/tests/protocol/pcap/PcapPacketTest.java b/org.eclipse.linuxtools.pcap.core.tests/src/org/eclipse/linuxtools/pcap/core/tests/protocol/pcap/PcapPacketTest.java index 8d37059c8b..50b70e572e 100644 --- a/org.eclipse.linuxtools.pcap.core.tests/src/org/eclipse/linuxtools/pcap/core/tests/protocol/pcap/PcapPacketTest.java +++ b/org.eclipse.linuxtools.pcap.core.tests/src/org/eclipse/linuxtools/pcap/core/tests/protocol/pcap/PcapPacketTest.java @@ -23,13 +23,13 @@ import java.nio.ByteBuffer; import java.nio.ByteOrder; import java.util.Map; -import org.eclipse.linuxtools.pcap.core.packet.BadPacketException; -import org.eclipse.linuxtools.pcap.core.protocol.Protocol; -import org.eclipse.linuxtools.pcap.core.protocol.pcap.PcapEndpoint; -import org.eclipse.linuxtools.pcap.core.protocol.pcap.PcapPacket; +import org.eclipse.linuxtools.internal.pcap.core.packet.BadPacketException; +import org.eclipse.linuxtools.internal.pcap.core.protocol.Protocol; +import org.eclipse.linuxtools.internal.pcap.core.protocol.pcap.PcapEndpoint; +import org.eclipse.linuxtools.internal.pcap.core.protocol.pcap.PcapPacket; +import org.eclipse.linuxtools.internal.pcap.core.trace.BadPcapFileException; +import org.eclipse.linuxtools.internal.pcap.core.trace.PcapFile; import org.eclipse.linuxtools.pcap.core.tests.shared.PcapTestTrace; -import org.eclipse.linuxtools.pcap.core.trace.BadPcapFileException; -import org.eclipse.linuxtools.pcap.core.trace.PcapFile; import org.junit.Before; import org.junit.Test; diff --git a/org.eclipse.linuxtools.pcap.core.tests/src/org/eclipse/linuxtools/pcap/core/tests/protocol/tcp/TCPPacketTest.java b/org.eclipse.linuxtools.pcap.core.tests/src/org/eclipse/linuxtools/pcap/core/tests/protocol/tcp/TCPPacketTest.java index d7027c59a5..c5de48e325 100644 --- a/org.eclipse.linuxtools.pcap.core.tests/src/org/eclipse/linuxtools/pcap/core/tests/protocol/tcp/TCPPacketTest.java +++ b/org.eclipse.linuxtools.pcap.core.tests/src/org/eclipse/linuxtools/pcap/core/tests/protocol/tcp/TCPPacketTest.java @@ -25,13 +25,13 @@ import java.util.Arrays; import java.util.LinkedHashMap; import java.util.Map; -import org.eclipse.linuxtools.pcap.core.packet.BadPacketException; -import org.eclipse.linuxtools.pcap.core.protocol.Protocol; -import org.eclipse.linuxtools.pcap.core.protocol.tcp.TCPEndpoint; -import org.eclipse.linuxtools.pcap.core.protocol.tcp.TCPPacket; +import org.eclipse.linuxtools.internal.pcap.core.packet.BadPacketException; +import org.eclipse.linuxtools.internal.pcap.core.protocol.Protocol; +import org.eclipse.linuxtools.internal.pcap.core.protocol.tcp.TCPEndpoint; +import org.eclipse.linuxtools.internal.pcap.core.protocol.tcp.TCPPacket; +import org.eclipse.linuxtools.internal.pcap.core.trace.BadPcapFileException; +import org.eclipse.linuxtools.internal.pcap.core.trace.PcapFile; import org.eclipse.linuxtools.pcap.core.tests.shared.PcapTestTrace; -import org.eclipse.linuxtools.pcap.core.trace.BadPcapFileException; -import org.eclipse.linuxtools.pcap.core.trace.PcapFile; import org.junit.Before; import org.junit.Test; diff --git a/org.eclipse.linuxtools.pcap.core.tests/src/org/eclipse/linuxtools/pcap/core/tests/protocol/udp/UDPPacketTest.java b/org.eclipse.linuxtools.pcap.core.tests/src/org/eclipse/linuxtools/pcap/core/tests/protocol/udp/UDPPacketTest.java index b85bf3ad97..91a91d30e4 100644 --- a/org.eclipse.linuxtools.pcap.core.tests/src/org/eclipse/linuxtools/pcap/core/tests/protocol/udp/UDPPacketTest.java +++ b/org.eclipse.linuxtools.pcap.core.tests/src/org/eclipse/linuxtools/pcap/core/tests/protocol/udp/UDPPacketTest.java @@ -23,13 +23,13 @@ import java.nio.ByteBuffer; import java.nio.ByteOrder; import java.util.Map; -import org.eclipse.linuxtools.pcap.core.packet.BadPacketException; -import org.eclipse.linuxtools.pcap.core.protocol.Protocol; -import org.eclipse.linuxtools.pcap.core.protocol.udp.UDPEndpoint; -import org.eclipse.linuxtools.pcap.core.protocol.udp.UDPPacket; +import org.eclipse.linuxtools.internal.pcap.core.packet.BadPacketException; +import org.eclipse.linuxtools.internal.pcap.core.protocol.Protocol; +import org.eclipse.linuxtools.internal.pcap.core.protocol.udp.UDPEndpoint; +import org.eclipse.linuxtools.internal.pcap.core.protocol.udp.UDPPacket; +import org.eclipse.linuxtools.internal.pcap.core.trace.BadPcapFileException; +import org.eclipse.linuxtools.internal.pcap.core.trace.PcapFile; import org.eclipse.linuxtools.pcap.core.tests.shared.PcapTestTrace; -import org.eclipse.linuxtools.pcap.core.trace.BadPcapFileException; -import org.eclipse.linuxtools.pcap.core.trace.PcapFile; import org.junit.Before; import org.junit.Test; diff --git a/org.eclipse.linuxtools.pcap.core.tests/src/org/eclipse/linuxtools/pcap/core/tests/protocol/unknown/UnknownPacketTest.java b/org.eclipse.linuxtools.pcap.core.tests/src/org/eclipse/linuxtools/pcap/core/tests/protocol/unknown/UnknownPacketTest.java index 0607b7ba9e..08a5243ceb 100644 --- a/org.eclipse.linuxtools.pcap.core.tests/src/org/eclipse/linuxtools/pcap/core/tests/protocol/unknown/UnknownPacketTest.java +++ b/org.eclipse.linuxtools.pcap.core.tests/src/org/eclipse/linuxtools/pcap/core/tests/protocol/unknown/UnknownPacketTest.java @@ -23,12 +23,12 @@ import java.nio.ByteBuffer; import java.nio.ByteOrder; import java.util.Map; -import org.eclipse.linuxtools.pcap.core.protocol.Protocol; -import org.eclipse.linuxtools.pcap.core.protocol.unknown.UnknownEndpoint; -import org.eclipse.linuxtools.pcap.core.protocol.unknown.UnknownPacket; +import org.eclipse.linuxtools.internal.pcap.core.protocol.Protocol; +import org.eclipse.linuxtools.internal.pcap.core.protocol.unknown.UnknownEndpoint; +import org.eclipse.linuxtools.internal.pcap.core.protocol.unknown.UnknownPacket; +import org.eclipse.linuxtools.internal.pcap.core.trace.BadPcapFileException; +import org.eclipse.linuxtools.internal.pcap.core.trace.PcapFile; import org.eclipse.linuxtools.pcap.core.tests.shared.PcapTestTrace; -import org.eclipse.linuxtools.pcap.core.trace.BadPcapFileException; -import org.eclipse.linuxtools.pcap.core.trace.PcapFile; import org.junit.Before; import org.junit.Test; diff --git a/org.eclipse.linuxtools.pcap.core.tests/src/org/eclipse/linuxtools/pcap/core/tests/stream/StreamBuildTest.java b/org.eclipse.linuxtools.pcap.core.tests/src/org/eclipse/linuxtools/pcap/core/tests/stream/StreamBuildTest.java index 4ccc686926..9ffea021a0 100644 --- a/org.eclipse.linuxtools.pcap.core.tests/src/org/eclipse/linuxtools/pcap/core/tests/stream/StreamBuildTest.java +++ b/org.eclipse.linuxtools.pcap.core.tests/src/org/eclipse/linuxtools/pcap/core/tests/stream/StreamBuildTest.java @@ -18,11 +18,11 @@ import static org.junit.Assume.assumeTrue; import java.io.IOException; -import org.eclipse.linuxtools.pcap.core.protocol.Protocol; -import org.eclipse.linuxtools.pcap.core.stream.PacketStream; -import org.eclipse.linuxtools.pcap.core.stream.PacketStreamBuilder; +import org.eclipse.linuxtools.internal.pcap.core.protocol.Protocol; +import org.eclipse.linuxtools.internal.pcap.core.stream.PacketStream; +import org.eclipse.linuxtools.internal.pcap.core.stream.PacketStreamBuilder; +import org.eclipse.linuxtools.internal.pcap.core.trace.BadPcapFileException; import org.eclipse.linuxtools.pcap.core.tests.shared.PcapTestTrace; -import org.eclipse.linuxtools.pcap.core.trace.BadPcapFileException; import org.junit.Test; /** diff --git a/org.eclipse.linuxtools.pcap.core/META-INF/MANIFEST.MF b/org.eclipse.linuxtools.pcap.core/META-INF/MANIFEST.MF index 03ad1ffb5a..93664d2fde 100644 --- a/org.eclipse.linuxtools.pcap.core/META-INF/MANIFEST.MF +++ b/org.eclipse.linuxtools.pcap.core/META-INF/MANIFEST.MF @@ -11,18 +11,18 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Require-Bundle: org.eclipse.core.runtime, org.eclipse.core.resources Export-Package: org.eclipse.linuxtools.internal.pcap.core;x-friends:="org.eclipse.linuxtools.pcap.core.tests", - org.eclipse.linuxtools.pcap.core.endpoint, - org.eclipse.linuxtools.pcap.core.filter, - org.eclipse.linuxtools.pcap.core.packet, - org.eclipse.linuxtools.pcap.core.protocol, - org.eclipse.linuxtools.pcap.core.protocol.ethernet2, - org.eclipse.linuxtools.pcap.core.protocol.ipv4, - org.eclipse.linuxtools.pcap.core.protocol.pcap, - org.eclipse.linuxtools.pcap.core.protocol.tcp, - org.eclipse.linuxtools.pcap.core.protocol.udp, - org.eclipse.linuxtools.pcap.core.protocol.unknown, - org.eclipse.linuxtools.pcap.core.stream, - org.eclipse.linuxtools.pcap.core.trace, - org.eclipse.linuxtools.pcap.core.util + org.eclipse.linuxtools.internal.pcap.core.endpoint;x-friends:="org.eclipse.linuxtools.tmf.pcap.core", + org.eclipse.linuxtools.internal.pcap.core.filter;x-internal:=true, + org.eclipse.linuxtools.internal.pcap.core.packet;x-friends:="org.eclipse.linuxtools.pcap.core.tests,org.eclipse.linuxtools.tmf.pcap.core.tests,org.eclipse.linuxtools.tmf.pcap.core", + org.eclipse.linuxtools.internal.pcap.core.protocol;x-friends:="org.eclipse.linuxtools.pcap.core.tests,org.eclipse.linuxtools.tmf.pcap.core.tests,org.eclipse.linuxtools.tmf.pcap.core", + org.eclipse.linuxtools.internal.pcap.core.protocol.ethernet2;x-friends:="org.eclipse.linuxtools.pcap.core.tests", + org.eclipse.linuxtools.internal.pcap.core.protocol.ipv4;x-friends:="org.eclipse.linuxtools.pcap.core.tests,org.eclipse.linuxtools.tmf.pcap.core.tests,org.eclipse.linuxtools.tmf.pcap.core", + org.eclipse.linuxtools.internal.pcap.core.protocol.pcap;x-friends:="org.eclipse.linuxtools.pcap.core.tests,org.eclipse.linuxtools.tmf.pcap.core.tests,org.eclipse.linuxtools.tmf.pcap.core", + org.eclipse.linuxtools.internal.pcap.core.protocol.tcp;x-friends:="org.eclipse.linuxtools.pcap.core.tests", + org.eclipse.linuxtools.internal.pcap.core.protocol.udp;x-friends:="org.eclipse.linuxtools.pcap.core.tests", + org.eclipse.linuxtools.internal.pcap.core.protocol.unknown;x-friends:="org.eclipse.linuxtools.pcap.core.tests", + org.eclipse.linuxtools.internal.pcap.core.stream;x-friends:="org.eclipse.linuxtools.pcap.core.tests,org.eclipse.linuxtools.tmf.pcap.core", + org.eclipse.linuxtools.internal.pcap.core.trace;x-friends:="org.eclipse.linuxtools.pcap.core.tests,org.eclipse.linuxtools.tmf.pcap.core.tests,org.eclipse.linuxtools.tmf.pcap.core", + org.eclipse.linuxtools.internal.pcap.core.util;x-friends:="org.eclipse.linuxtools.tmf.pcap.core" Import-Package: com.google.common.collect, com.google.common.math diff --git a/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/pcap/core/endpoint/ProtocolEndpoint.java b/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/internal/pcap/core/endpoint/ProtocolEndpoint.java similarity index 95% rename from org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/pcap/core/endpoint/ProtocolEndpoint.java rename to org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/internal/pcap/core/endpoint/ProtocolEndpoint.java index cabb7c2065..1ba0fe0d98 100644 --- a/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/pcap/core/endpoint/ProtocolEndpoint.java +++ b/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/internal/pcap/core/endpoint/ProtocolEndpoint.java @@ -10,10 +10,10 @@ * Vincent Perot - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.pcap.core.endpoint; +package org.eclipse.linuxtools.internal.pcap.core.endpoint; import org.eclipse.jdt.annotation.Nullable; -import org.eclipse.linuxtools.pcap.core.packet.Packet; +import org.eclipse.linuxtools.internal.pcap.core.packet.Packet; /** * Abstract class that represents an endpoint. An endpoint is an address where a diff --git a/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/pcap/core/endpoint/ProtocolEndpointPair.java b/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/internal/pcap/core/endpoint/ProtocolEndpointPair.java similarity index 95% rename from org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/pcap/core/endpoint/ProtocolEndpointPair.java rename to org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/internal/pcap/core/endpoint/ProtocolEndpointPair.java index 9f8826c23e..15dd90cd2f 100644 --- a/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/pcap/core/endpoint/ProtocolEndpointPair.java +++ b/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/internal/pcap/core/endpoint/ProtocolEndpointPair.java @@ -10,10 +10,10 @@ * Vincent Perot - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.pcap.core.endpoint; +package org.eclipse.linuxtools.internal.pcap.core.endpoint; import org.eclipse.jdt.annotation.Nullable; -import org.eclipse.linuxtools.pcap.core.packet.Packet; +import org.eclipse.linuxtools.internal.pcap.core.packet.Packet; /** * Class that represents a pair of endpoints. This is used to find a packet diff --git a/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/internal/pcap/core/endpoint/package-info.java b/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/internal/pcap/core/endpoint/package-info.java new file mode 100644 index 0000000000..c68f342be7 --- /dev/null +++ b/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/internal/pcap/core/endpoint/package-info.java @@ -0,0 +1,14 @@ +/******************************************************************************* + * Copyright (c) 2014 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: + * Ericsson - Initial API and implementation + *******************************************************************************/ + +@org.eclipse.jdt.annotation.NonNullByDefault +package org.eclipse.linuxtools.internal.pcap.core.endpoint; \ No newline at end of file diff --git a/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/pcap/core/filter/IPacketFilter.java b/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/internal/pcap/core/filter/IPacketFilter.java similarity index 87% rename from org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/pcap/core/filter/IPacketFilter.java rename to org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/internal/pcap/core/filter/IPacketFilter.java index 80115eabc6..457fa7fc91 100644 --- a/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/pcap/core/filter/IPacketFilter.java +++ b/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/internal/pcap/core/filter/IPacketFilter.java @@ -10,9 +10,9 @@ * Vincent Perot - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.pcap.core.filter; +package org.eclipse.linuxtools.internal.pcap.core.filter; -import org.eclipse.linuxtools.pcap.core.packet.Packet; +import org.eclipse.linuxtools.internal.pcap.core.packet.Packet; /** * Interface used to filter the packets. diff --git a/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/pcap/core/filter/PacketFilterByProtocol.java b/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/internal/pcap/core/filter/PacketFilterByProtocol.java similarity index 87% rename from org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/pcap/core/filter/PacketFilterByProtocol.java rename to org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/internal/pcap/core/filter/PacketFilterByProtocol.java index e3b5729fba..4da6fb9a7b 100644 --- a/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/pcap/core/filter/PacketFilterByProtocol.java +++ b/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/internal/pcap/core/filter/PacketFilterByProtocol.java @@ -10,10 +10,10 @@ * Vincent Perot - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.pcap.core.filter; +package org.eclipse.linuxtools.internal.pcap.core.filter; -import org.eclipse.linuxtools.pcap.core.packet.Packet; -import org.eclipse.linuxtools.pcap.core.protocol.Protocol; +import org.eclipse.linuxtools.internal.pcap.core.packet.Packet; +import org.eclipse.linuxtools.internal.pcap.core.protocol.Protocol; /** * Class used to filter the packets by protocol. This is used, for instance, to diff --git a/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/pcap/core/packet/package-info.java b/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/internal/pcap/core/filter/package-info.java similarity index 90% rename from org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/pcap/core/packet/package-info.java rename to org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/internal/pcap/core/filter/package-info.java index 5a173764d3..d5e6b615bf 100644 --- a/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/pcap/core/packet/package-info.java +++ b/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/internal/pcap/core/filter/package-info.java @@ -11,4 +11,4 @@ *******************************************************************************/ @org.eclipse.jdt.annotation.NonNullByDefault -package org.eclipse.linuxtools.pcap.core.packet; \ No newline at end of file +package org.eclipse.linuxtools.internal.pcap.core.filter; \ No newline at end of file diff --git a/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/pcap/core/packet/BadPacketException.java b/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/internal/pcap/core/packet/BadPacketException.java similarity index 97% rename from org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/pcap/core/packet/BadPacketException.java rename to org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/internal/pcap/core/packet/BadPacketException.java index 83836f2763..9db396ae67 100644 --- a/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/pcap/core/packet/BadPacketException.java +++ b/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/internal/pcap/core/packet/BadPacketException.java @@ -10,7 +10,7 @@ * Vincent Perot - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.pcap.core.packet; +package org.eclipse.linuxtools.internal.pcap.core.packet; /** * Exception that is thrown when Packet is erroneous. This is different than an diff --git a/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/pcap/core/packet/Packet.java b/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/internal/pcap/core/packet/Packet.java similarity index 95% rename from org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/pcap/core/packet/Packet.java rename to org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/internal/pcap/core/packet/Packet.java index edc0820eaa..7eb0e4edb5 100644 --- a/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/pcap/core/packet/Packet.java +++ b/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/internal/pcap/core/packet/Packet.java @@ -10,18 +10,18 @@ * Vincent Perot - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.pcap.core.packet; +package org.eclipse.linuxtools.internal.pcap.core.packet; import java.nio.ByteBuffer; import java.util.Map; import org.eclipse.jdt.annotation.NonNull; import org.eclipse.jdt.annotation.Nullable; -import org.eclipse.linuxtools.pcap.core.endpoint.ProtocolEndpoint; -import org.eclipse.linuxtools.pcap.core.protocol.Protocol; -import org.eclipse.linuxtools.pcap.core.protocol.ipv4.IPv4Packet; -import org.eclipse.linuxtools.pcap.core.protocol.unknown.UnknownPacket; -import org.eclipse.linuxtools.pcap.core.trace.PcapFile; +import org.eclipse.linuxtools.internal.pcap.core.endpoint.ProtocolEndpoint; +import org.eclipse.linuxtools.internal.pcap.core.protocol.Protocol; +import org.eclipse.linuxtools.internal.pcap.core.protocol.ipv4.IPv4Packet; +import org.eclipse.linuxtools.internal.pcap.core.protocol.unknown.UnknownPacket; +import org.eclipse.linuxtools.internal.pcap.core.trace.PcapFile; // TODO For all packets, make checks on dimension. // TODO maybe add a invalid packet type? diff --git a/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/pcap/core/protocol/ipv4/package-info.java b/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/internal/pcap/core/packet/package-info.java similarity index 90% rename from org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/pcap/core/protocol/ipv4/package-info.java rename to org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/internal/pcap/core/packet/package-info.java index 554b3312ac..9edaef996b 100644 --- a/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/pcap/core/protocol/ipv4/package-info.java +++ b/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/internal/pcap/core/packet/package-info.java @@ -11,4 +11,4 @@ *******************************************************************************/ @org.eclipse.jdt.annotation.NonNullByDefault -package org.eclipse.linuxtools.pcap.core.protocol.ipv4; \ No newline at end of file +package org.eclipse.linuxtools.internal.pcap.core.packet; \ No newline at end of file diff --git a/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/pcap/core/protocol/Protocol.java b/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/internal/pcap/core/protocol/Protocol.java similarity index 98% rename from org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/pcap/core/protocol/Protocol.java rename to org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/internal/pcap/core/protocol/Protocol.java index 18c88b63a3..fa4f41b56e 100644 --- a/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/pcap/core/protocol/Protocol.java +++ b/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/internal/pcap/core/protocol/Protocol.java @@ -10,7 +10,7 @@ * Vincent Perot - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.pcap.core.protocol; +package org.eclipse.linuxtools.internal.pcap.core.protocol; import java.util.ArrayList; import java.util.Arrays; diff --git a/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/pcap/core/protocol/ProtocolValues.java b/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/internal/pcap/core/protocol/ProtocolValues.java similarity index 95% rename from org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/pcap/core/protocol/ProtocolValues.java rename to org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/internal/pcap/core/protocol/ProtocolValues.java index 95d4e9b1e5..2ad19a3397 100644 --- a/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/pcap/core/protocol/ProtocolValues.java +++ b/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/internal/pcap/core/protocol/ProtocolValues.java @@ -10,7 +10,7 @@ * Vincent Perot - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.pcap.core.protocol; +package org.eclipse.linuxtools.internal.pcap.core.protocol; /** * Interface that lists constants related to protocols/layers. diff --git a/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/pcap/core/protocol/ethernet2/EthernetIIEndpoint.java b/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/internal/pcap/core/protocol/ethernet2/EthernetIIEndpoint.java similarity index 93% rename from org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/pcap/core/protocol/ethernet2/EthernetIIEndpoint.java rename to org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/internal/pcap/core/protocol/ethernet2/EthernetIIEndpoint.java index 284ebd9fa0..912343c890 100644 --- a/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/pcap/core/protocol/ethernet2/EthernetIIEndpoint.java +++ b/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/internal/pcap/core/protocol/ethernet2/EthernetIIEndpoint.java @@ -10,13 +10,13 @@ * Vincent Perot - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.pcap.core.protocol.ethernet2; +package org.eclipse.linuxtools.internal.pcap.core.protocol.ethernet2; import java.util.Arrays; import org.eclipse.jdt.annotation.Nullable; -import org.eclipse.linuxtools.pcap.core.endpoint.ProtocolEndpoint; -import org.eclipse.linuxtools.pcap.core.util.ConversionHelper; +import org.eclipse.linuxtools.internal.pcap.core.endpoint.ProtocolEndpoint; +import org.eclipse.linuxtools.internal.pcap.core.util.ConversionHelper; /** * Class that extends the {@link ProtocolEndpoint} class. It represents the diff --git a/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/pcap/core/protocol/ethernet2/EthernetIIPacket.java b/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/internal/pcap/core/protocol/ethernet2/EthernetIIPacket.java similarity index 93% rename from org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/pcap/core/protocol/ethernet2/EthernetIIPacket.java rename to org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/internal/pcap/core/protocol/ethernet2/EthernetIIPacket.java index 72ddfda313..d05d7356e6 100644 --- a/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/pcap/core/protocol/ethernet2/EthernetIIPacket.java +++ b/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/internal/pcap/core/protocol/ethernet2/EthernetIIPacket.java @@ -10,7 +10,7 @@ * Vincent Perot - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.pcap.core.protocol.ethernet2; +package org.eclipse.linuxtools.internal.pcap.core.protocol.ethernet2; import java.nio.ByteBuffer; import java.nio.ByteOrder; @@ -19,14 +19,14 @@ import java.util.Map; import org.eclipse.jdt.annotation.NonNull; import org.eclipse.jdt.annotation.Nullable; -import org.eclipse.linuxtools.pcap.core.packet.BadPacketException; -import org.eclipse.linuxtools.pcap.core.packet.Packet; -import org.eclipse.linuxtools.pcap.core.protocol.Protocol; -import org.eclipse.linuxtools.pcap.core.protocol.ipv4.IPv4Packet; -import org.eclipse.linuxtools.pcap.core.protocol.unknown.UnknownPacket; -import org.eclipse.linuxtools.pcap.core.trace.PcapFile; -import org.eclipse.linuxtools.pcap.core.util.ConversionHelper; -import org.eclipse.linuxtools.pcap.core.util.EthertypeHelper; +import org.eclipse.linuxtools.internal.pcap.core.packet.BadPacketException; +import org.eclipse.linuxtools.internal.pcap.core.packet.Packet; +import org.eclipse.linuxtools.internal.pcap.core.protocol.Protocol; +import org.eclipse.linuxtools.internal.pcap.core.protocol.ipv4.IPv4Packet; +import org.eclipse.linuxtools.internal.pcap.core.protocol.unknown.UnknownPacket; +import org.eclipse.linuxtools.internal.pcap.core.trace.PcapFile; +import org.eclipse.linuxtools.internal.pcap.core.util.ConversionHelper; +import org.eclipse.linuxtools.internal.pcap.core.util.EthertypeHelper; import com.google.common.collect.ImmutableMap; diff --git a/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/pcap/core/protocol/ethernet2/EthernetIIValues.java b/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/internal/pcap/core/protocol/ethernet2/EthernetIIValues.java similarity index 94% rename from org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/pcap/core/protocol/ethernet2/EthernetIIValues.java rename to org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/internal/pcap/core/protocol/ethernet2/EthernetIIValues.java index 983123f784..42804932db 100644 --- a/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/pcap/core/protocol/ethernet2/EthernetIIValues.java +++ b/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/internal/pcap/core/protocol/ethernet2/EthernetIIValues.java @@ -10,7 +10,7 @@ * Vincent Perot - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.pcap.core.protocol.ethernet2; +package org.eclipse.linuxtools.internal.pcap.core.protocol.ethernet2; /** * Interface that lists constants related to Ethernet II. diff --git a/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/internal/pcap/core/protocol/ethernet2/package-info.java b/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/internal/pcap/core/protocol/ethernet2/package-info.java new file mode 100644 index 0000000000..1dfef35d1e --- /dev/null +++ b/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/internal/pcap/core/protocol/ethernet2/package-info.java @@ -0,0 +1,14 @@ +/******************************************************************************* + * Copyright (c) 2014 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: + * Ericsson - Initial API and implementation + *******************************************************************************/ + +@org.eclipse.jdt.annotation.NonNullByDefault +package org.eclipse.linuxtools.internal.pcap.core.protocol.ethernet2; \ No newline at end of file diff --git a/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/pcap/core/protocol/ipv4/IPv4Endpoint.java b/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/internal/pcap/core/protocol/ipv4/IPv4Endpoint.java similarity index 95% rename from org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/pcap/core/protocol/ipv4/IPv4Endpoint.java rename to org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/internal/pcap/core/protocol/ipv4/IPv4Endpoint.java index 68b639280a..85668b2447 100644 --- a/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/pcap/core/protocol/ipv4/IPv4Endpoint.java +++ b/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/internal/pcap/core/protocol/ipv4/IPv4Endpoint.java @@ -10,13 +10,13 @@ * Vincent Perot - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.pcap.core.protocol.ipv4; +package org.eclipse.linuxtools.internal.pcap.core.protocol.ipv4; import java.net.Inet4Address; import org.eclipse.jdt.annotation.NonNull; import org.eclipse.jdt.annotation.Nullable; -import org.eclipse.linuxtools.pcap.core.endpoint.ProtocolEndpoint; +import org.eclipse.linuxtools.internal.pcap.core.endpoint.ProtocolEndpoint; /** * Class that extends the {@link ProtocolEndpoint} class. It represents the diff --git a/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/pcap/core/protocol/ipv4/IPv4Packet.java b/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/internal/pcap/core/protocol/ipv4/IPv4Packet.java similarity index 96% rename from org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/pcap/core/protocol/ipv4/IPv4Packet.java rename to org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/internal/pcap/core/protocol/ipv4/IPv4Packet.java index db605cc0c7..3bfd97efdf 100644 --- a/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/pcap/core/protocol/ipv4/IPv4Packet.java +++ b/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/internal/pcap/core/protocol/ipv4/IPv4Packet.java @@ -10,7 +10,7 @@ * Vincent Perot - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.pcap.core.protocol.ipv4; +package org.eclipse.linuxtools.internal.pcap.core.protocol.ipv4; import java.net.Inet4Address; import java.net.InetAddress; @@ -22,15 +22,15 @@ import java.util.Map; import org.eclipse.jdt.annotation.NonNull; import org.eclipse.jdt.annotation.Nullable; -import org.eclipse.linuxtools.pcap.core.packet.BadPacketException; -import org.eclipse.linuxtools.pcap.core.packet.Packet; -import org.eclipse.linuxtools.pcap.core.protocol.Protocol; -import org.eclipse.linuxtools.pcap.core.protocol.tcp.TCPPacket; -import org.eclipse.linuxtools.pcap.core.protocol.udp.UDPPacket; -import org.eclipse.linuxtools.pcap.core.protocol.unknown.UnknownPacket; -import org.eclipse.linuxtools.pcap.core.trace.PcapFile; -import org.eclipse.linuxtools.pcap.core.util.ConversionHelper; -import org.eclipse.linuxtools.pcap.core.util.IPProtocolNumberHelper; +import org.eclipse.linuxtools.internal.pcap.core.packet.BadPacketException; +import org.eclipse.linuxtools.internal.pcap.core.packet.Packet; +import org.eclipse.linuxtools.internal.pcap.core.protocol.Protocol; +import org.eclipse.linuxtools.internal.pcap.core.protocol.tcp.TCPPacket; +import org.eclipse.linuxtools.internal.pcap.core.protocol.udp.UDPPacket; +import org.eclipse.linuxtools.internal.pcap.core.protocol.unknown.UnknownPacket; +import org.eclipse.linuxtools.internal.pcap.core.trace.PcapFile; +import org.eclipse.linuxtools.internal.pcap.core.util.ConversionHelper; +import org.eclipse.linuxtools.internal.pcap.core.util.IPProtocolNumberHelper; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMap.Builder; diff --git a/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/pcap/core/protocol/ipv4/IPv4Values.java b/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/internal/pcap/core/protocol/ipv4/IPv4Values.java similarity index 93% rename from org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/pcap/core/protocol/ipv4/IPv4Values.java rename to org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/internal/pcap/core/protocol/ipv4/IPv4Values.java index e6a34aa278..3e4e157241 100644 --- a/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/pcap/core/protocol/ipv4/IPv4Values.java +++ b/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/internal/pcap/core/protocol/ipv4/IPv4Values.java @@ -10,7 +10,7 @@ * Vincent Perot - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.pcap.core.protocol.ipv4; +package org.eclipse.linuxtools.internal.pcap.core.protocol.ipv4; /** * Interface that lists constants related to Internet Protocol v4. diff --git a/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/internal/pcap/core/protocol/ipv4/package-info.java b/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/internal/pcap/core/protocol/ipv4/package-info.java new file mode 100644 index 0000000000..b8484b6472 --- /dev/null +++ b/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/internal/pcap/core/protocol/ipv4/package-info.java @@ -0,0 +1,14 @@ +/******************************************************************************* + * Copyright (c) 2014 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: + * Ericsson - Initial API and implementation + *******************************************************************************/ + +@org.eclipse.jdt.annotation.NonNullByDefault +package org.eclipse.linuxtools.internal.pcap.core.protocol.ipv4; \ No newline at end of file diff --git a/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/internal/pcap/core/protocol/package-info.java b/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/internal/pcap/core/protocol/package-info.java new file mode 100644 index 0000000000..eea3ac9296 --- /dev/null +++ b/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/internal/pcap/core/protocol/package-info.java @@ -0,0 +1,14 @@ +/******************************************************************************* + * Copyright (c) 2014 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: + * Ericsson - Initial API and implementation + *******************************************************************************/ + +@org.eclipse.jdt.annotation.NonNullByDefault +package org.eclipse.linuxtools.internal.pcap.core.protocol; \ No newline at end of file diff --git a/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/pcap/core/protocol/pcap/PcapEndpoint.java b/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/internal/pcap/core/protocol/pcap/PcapEndpoint.java similarity index 93% rename from org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/pcap/core/protocol/pcap/PcapEndpoint.java rename to org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/internal/pcap/core/protocol/pcap/PcapEndpoint.java index ac906686a5..8662c76e30 100644 --- a/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/pcap/core/protocol/pcap/PcapEndpoint.java +++ b/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/internal/pcap/core/protocol/pcap/PcapEndpoint.java @@ -10,10 +10,10 @@ * Vincent Perot - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.pcap.core.protocol.pcap; +package org.eclipse.linuxtools.internal.pcap.core.protocol.pcap; import org.eclipse.jdt.annotation.Nullable; -import org.eclipse.linuxtools.pcap.core.endpoint.ProtocolEndpoint; +import org.eclipse.linuxtools.internal.pcap.core.endpoint.ProtocolEndpoint; /** * Class that extends the {@link ProtocolEndpoint} class. It represents the endpoint at diff --git a/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/pcap/core/protocol/pcap/PcapPacket.java b/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/internal/pcap/core/protocol/pcap/PcapPacket.java similarity index 93% rename from org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/pcap/core/protocol/pcap/PcapPacket.java rename to org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/internal/pcap/core/protocol/pcap/PcapPacket.java index 6be21cdc93..270b8f9c37 100644 --- a/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/pcap/core/protocol/pcap/PcapPacket.java +++ b/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/internal/pcap/core/protocol/pcap/PcapPacket.java @@ -10,7 +10,7 @@ * Vincent Perot - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.pcap.core.protocol.pcap; +package org.eclipse.linuxtools.internal.pcap.core.protocol.pcap; import java.nio.ByteBuffer; import java.nio.ByteOrder; @@ -18,16 +18,16 @@ import java.util.Map; import org.eclipse.jdt.annotation.NonNull; import org.eclipse.jdt.annotation.Nullable; -import org.eclipse.linuxtools.pcap.core.packet.BadPacketException; -import org.eclipse.linuxtools.pcap.core.packet.Packet; -import org.eclipse.linuxtools.pcap.core.protocol.Protocol; -import org.eclipse.linuxtools.pcap.core.protocol.ethernet2.EthernetIIPacket; -import org.eclipse.linuxtools.pcap.core.protocol.unknown.UnknownPacket; -import org.eclipse.linuxtools.pcap.core.trace.PcapFile; -import org.eclipse.linuxtools.pcap.core.trace.PcapFileValues; -import org.eclipse.linuxtools.pcap.core.util.ConversionHelper; -import org.eclipse.linuxtools.pcap.core.util.LinkTypeHelper; -import org.eclipse.linuxtools.pcap.core.util.PcapTimestampScale; +import org.eclipse.linuxtools.internal.pcap.core.packet.BadPacketException; +import org.eclipse.linuxtools.internal.pcap.core.packet.Packet; +import org.eclipse.linuxtools.internal.pcap.core.protocol.Protocol; +import org.eclipse.linuxtools.internal.pcap.core.protocol.ethernet2.EthernetIIPacket; +import org.eclipse.linuxtools.internal.pcap.core.protocol.unknown.UnknownPacket; +import org.eclipse.linuxtools.internal.pcap.core.trace.PcapFile; +import org.eclipse.linuxtools.internal.pcap.core.trace.PcapFileValues; +import org.eclipse.linuxtools.internal.pcap.core.util.ConversionHelper; +import org.eclipse.linuxtools.internal.pcap.core.util.LinkTypeHelper; +import org.eclipse.linuxtools.internal.pcap.core.util.PcapTimestampScale; import com.google.common.collect.ImmutableMap; diff --git a/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/internal/pcap/core/protocol/pcap/package-info.java b/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/internal/pcap/core/protocol/pcap/package-info.java new file mode 100644 index 0000000000..173f3a9557 --- /dev/null +++ b/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/internal/pcap/core/protocol/pcap/package-info.java @@ -0,0 +1,14 @@ +/******************************************************************************* + * Copyright (c) 2014 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: + * Ericsson - Initial API and implementation + *******************************************************************************/ + +@org.eclipse.jdt.annotation.NonNullByDefault +package org.eclipse.linuxtools.internal.pcap.core.protocol.pcap; \ No newline at end of file diff --git a/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/pcap/core/protocol/tcp/TCPEndpoint.java b/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/internal/pcap/core/protocol/tcp/TCPEndpoint.java similarity index 95% rename from org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/pcap/core/protocol/tcp/TCPEndpoint.java rename to org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/internal/pcap/core/protocol/tcp/TCPEndpoint.java index d9ab72e3a8..97b291cdf3 100644 --- a/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/pcap/core/protocol/tcp/TCPEndpoint.java +++ b/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/internal/pcap/core/protocol/tcp/TCPEndpoint.java @@ -10,11 +10,11 @@ * Vincent Perot - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.pcap.core.protocol.tcp; +package org.eclipse.linuxtools.internal.pcap.core.protocol.tcp; import org.eclipse.jdt.annotation.NonNull; import org.eclipse.jdt.annotation.Nullable; -import org.eclipse.linuxtools.pcap.core.endpoint.ProtocolEndpoint; +import org.eclipse.linuxtools.internal.pcap.core.endpoint.ProtocolEndpoint; /** * Class that extends the {@link ProtocolEndpoint} class. It represents the diff --git a/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/pcap/core/protocol/tcp/TCPPacket.java b/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/internal/pcap/core/protocol/tcp/TCPPacket.java similarity index 97% rename from org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/pcap/core/protocol/tcp/TCPPacket.java rename to org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/internal/pcap/core/protocol/tcp/TCPPacket.java index 0ae9d0fcb6..8ff0cd2f4a 100644 --- a/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/pcap/core/protocol/tcp/TCPPacket.java +++ b/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/internal/pcap/core/protocol/tcp/TCPPacket.java @@ -10,7 +10,7 @@ * Vincent Perot - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.pcap.core.protocol.tcp; +package org.eclipse.linuxtools.internal.pcap.core.protocol.tcp; import java.nio.ByteBuffer; import java.nio.ByteOrder; @@ -19,12 +19,12 @@ import java.util.Map; import org.eclipse.jdt.annotation.NonNull; import org.eclipse.jdt.annotation.Nullable; -import org.eclipse.linuxtools.pcap.core.packet.BadPacketException; -import org.eclipse.linuxtools.pcap.core.packet.Packet; -import org.eclipse.linuxtools.pcap.core.protocol.Protocol; -import org.eclipse.linuxtools.pcap.core.protocol.unknown.UnknownPacket; -import org.eclipse.linuxtools.pcap.core.trace.PcapFile; -import org.eclipse.linuxtools.pcap.core.util.ConversionHelper; +import org.eclipse.linuxtools.internal.pcap.core.packet.BadPacketException; +import org.eclipse.linuxtools.internal.pcap.core.packet.Packet; +import org.eclipse.linuxtools.internal.pcap.core.protocol.Protocol; +import org.eclipse.linuxtools.internal.pcap.core.protocol.unknown.UnknownPacket; +import org.eclipse.linuxtools.internal.pcap.core.trace.PcapFile; +import org.eclipse.linuxtools.internal.pcap.core.util.ConversionHelper; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMap.Builder; diff --git a/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/pcap/core/protocol/tcp/TCPValues.java b/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/internal/pcap/core/protocol/tcp/TCPValues.java similarity index 93% rename from org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/pcap/core/protocol/tcp/TCPValues.java rename to org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/internal/pcap/core/protocol/tcp/TCPValues.java index b00db9a6e1..fc1e389a73 100644 --- a/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/pcap/core/protocol/tcp/TCPValues.java +++ b/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/internal/pcap/core/protocol/tcp/TCPValues.java @@ -10,7 +10,7 @@ * Vincent Perot - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.pcap.core.protocol.tcp; +package org.eclipse.linuxtools.internal.pcap.core.protocol.tcp; /** * Interface that lists constants related to TCP. diff --git a/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/internal/pcap/core/protocol/tcp/package-info.java b/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/internal/pcap/core/protocol/tcp/package-info.java new file mode 100644 index 0000000000..2f7a7fdc99 --- /dev/null +++ b/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/internal/pcap/core/protocol/tcp/package-info.java @@ -0,0 +1,14 @@ +/******************************************************************************* + * Copyright (c) 2014 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: + * Ericsson - Initial API and implementation + *******************************************************************************/ + +@org.eclipse.jdt.annotation.NonNullByDefault +package org.eclipse.linuxtools.internal.pcap.core.protocol.tcp; \ No newline at end of file diff --git a/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/pcap/core/protocol/udp/UDPEndpoint.java b/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/internal/pcap/core/protocol/udp/UDPEndpoint.java similarity index 95% rename from org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/pcap/core/protocol/udp/UDPEndpoint.java rename to org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/internal/pcap/core/protocol/udp/UDPEndpoint.java index a7f7fae66b..a55416f933 100644 --- a/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/pcap/core/protocol/udp/UDPEndpoint.java +++ b/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/internal/pcap/core/protocol/udp/UDPEndpoint.java @@ -10,11 +10,11 @@ * Vincent Perot - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.pcap.core.protocol.udp; +package org.eclipse.linuxtools.internal.pcap.core.protocol.udp; import org.eclipse.jdt.annotation.NonNull; import org.eclipse.jdt.annotation.Nullable; -import org.eclipse.linuxtools.pcap.core.endpoint.ProtocolEndpoint; +import org.eclipse.linuxtools.internal.pcap.core.endpoint.ProtocolEndpoint; /** * Class that extends the ProtocolEndpoint class. It represents the endpoint at diff --git a/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/pcap/core/protocol/udp/UDPPacket.java b/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/internal/pcap/core/protocol/udp/UDPPacket.java similarity index 94% rename from org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/pcap/core/protocol/udp/UDPPacket.java rename to org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/internal/pcap/core/protocol/udp/UDPPacket.java index df1b614c21..95e98507d7 100644 --- a/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/pcap/core/protocol/udp/UDPPacket.java +++ b/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/internal/pcap/core/protocol/udp/UDPPacket.java @@ -10,7 +10,7 @@ * Vincent Perot - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.pcap.core.protocol.udp; +package org.eclipse.linuxtools.internal.pcap.core.protocol.udp; import java.nio.ByteBuffer; import java.nio.ByteOrder; @@ -18,12 +18,12 @@ import java.util.Map; import org.eclipse.jdt.annotation.NonNull; import org.eclipse.jdt.annotation.Nullable; -import org.eclipse.linuxtools.pcap.core.packet.BadPacketException; -import org.eclipse.linuxtools.pcap.core.packet.Packet; -import org.eclipse.linuxtools.pcap.core.protocol.Protocol; -import org.eclipse.linuxtools.pcap.core.protocol.unknown.UnknownPacket; -import org.eclipse.linuxtools.pcap.core.trace.PcapFile; -import org.eclipse.linuxtools.pcap.core.util.ConversionHelper; +import org.eclipse.linuxtools.internal.pcap.core.packet.BadPacketException; +import org.eclipse.linuxtools.internal.pcap.core.packet.Packet; +import org.eclipse.linuxtools.internal.pcap.core.protocol.Protocol; +import org.eclipse.linuxtools.internal.pcap.core.protocol.unknown.UnknownPacket; +import org.eclipse.linuxtools.internal.pcap.core.trace.PcapFile; +import org.eclipse.linuxtools.internal.pcap.core.util.ConversionHelper; import com.google.common.collect.ImmutableMap; diff --git a/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/internal/pcap/core/protocol/udp/package-info.java b/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/internal/pcap/core/protocol/udp/package-info.java new file mode 100644 index 0000000000..a55251124b --- /dev/null +++ b/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/internal/pcap/core/protocol/udp/package-info.java @@ -0,0 +1,14 @@ +/******************************************************************************* + * Copyright (c) 2014 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: + * Ericsson - Initial API and implementation + *******************************************************************************/ + +@org.eclipse.jdt.annotation.NonNullByDefault +package org.eclipse.linuxtools.internal.pcap.core.protocol.udp; \ No newline at end of file diff --git a/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/pcap/core/protocol/unknown/UnknownEndpoint.java b/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/internal/pcap/core/protocol/unknown/UnknownEndpoint.java similarity index 92% rename from org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/pcap/core/protocol/unknown/UnknownEndpoint.java rename to org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/internal/pcap/core/protocol/unknown/UnknownEndpoint.java index 481e809501..a731bd5d0f 100644 --- a/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/pcap/core/protocol/unknown/UnknownEndpoint.java +++ b/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/internal/pcap/core/protocol/unknown/UnknownEndpoint.java @@ -10,10 +10,10 @@ * Vincent Perot - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.pcap.core.protocol.unknown; +package org.eclipse.linuxtools.internal.pcap.core.protocol.unknown; import org.eclipse.jdt.annotation.Nullable; -import org.eclipse.linuxtools.pcap.core.endpoint.ProtocolEndpoint; +import org.eclipse.linuxtools.internal.pcap.core.endpoint.ProtocolEndpoint; /** * Class that extends the {@link ProtocolEndpoint} class. It represents the diff --git a/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/pcap/core/protocol/unknown/UnknownPacket.java b/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/internal/pcap/core/protocol/unknown/UnknownPacket.java similarity index 94% rename from org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/pcap/core/protocol/unknown/UnknownPacket.java rename to org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/internal/pcap/core/protocol/unknown/UnknownPacket.java index c247c5a06f..c50b9d132e 100644 --- a/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/pcap/core/protocol/unknown/UnknownPacket.java +++ b/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/internal/pcap/core/protocol/unknown/UnknownPacket.java @@ -10,7 +10,7 @@ * Vincent Perot - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.pcap.core.protocol.unknown; +package org.eclipse.linuxtools.internal.pcap.core.protocol.unknown; import java.io.UnsupportedEncodingException; import java.nio.ByteBuffer; @@ -18,10 +18,10 @@ import java.util.Map; import org.eclipse.jdt.annotation.NonNull; import org.eclipse.jdt.annotation.Nullable; -import org.eclipse.linuxtools.pcap.core.packet.Packet; -import org.eclipse.linuxtools.pcap.core.protocol.Protocol; -import org.eclipse.linuxtools.pcap.core.trace.PcapFile; -import org.eclipse.linuxtools.pcap.core.util.ConversionHelper; +import org.eclipse.linuxtools.internal.pcap.core.packet.Packet; +import org.eclipse.linuxtools.internal.pcap.core.protocol.Protocol; +import org.eclipse.linuxtools.internal.pcap.core.trace.PcapFile; +import org.eclipse.linuxtools.internal.pcap.core.util.ConversionHelper; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMap.Builder; diff --git a/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/internal/pcap/core/protocol/unknown/package-info.java b/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/internal/pcap/core/protocol/unknown/package-info.java new file mode 100644 index 0000000000..8478b55a88 --- /dev/null +++ b/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/internal/pcap/core/protocol/unknown/package-info.java @@ -0,0 +1,14 @@ +/******************************************************************************* + * Copyright (c) 2014 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: + * Ericsson - Initial API and implementation + *******************************************************************************/ + +@org.eclipse.jdt.annotation.NonNullByDefault +package org.eclipse.linuxtools.internal.pcap.core.protocol.unknown; \ No newline at end of file diff --git a/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/pcap/core/stream/PacketStream.java b/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/internal/pcap/core/stream/PacketStream.java similarity index 95% rename from org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/pcap/core/stream/PacketStream.java rename to org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/internal/pcap/core/stream/PacketStream.java index c6492ea38b..28d8a8158d 100644 --- a/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/pcap/core/stream/PacketStream.java +++ b/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/internal/pcap/core/stream/PacketStream.java @@ -10,13 +10,13 @@ * Vincent Perot - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.pcap.core.stream; +package org.eclipse.linuxtools.internal.pcap.core.stream; import org.eclipse.jdt.annotation.NonNull; -import org.eclipse.linuxtools.pcap.core.endpoint.ProtocolEndpointPair; -import org.eclipse.linuxtools.pcap.core.packet.Packet; -import org.eclipse.linuxtools.pcap.core.protocol.Protocol; -import org.eclipse.linuxtools.pcap.core.protocol.pcap.PcapPacket; +import org.eclipse.linuxtools.internal.pcap.core.endpoint.ProtocolEndpointPair; +import org.eclipse.linuxtools.internal.pcap.core.packet.Packet; +import org.eclipse.linuxtools.internal.pcap.core.protocol.Protocol; +import org.eclipse.linuxtools.internal.pcap.core.protocol.pcap.PcapPacket; import com.google.common.math.DoubleMath; diff --git a/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/pcap/core/stream/PacketStreamBuilder.java b/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/internal/pcap/core/stream/PacketStreamBuilder.java similarity index 86% rename from org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/pcap/core/stream/PacketStreamBuilder.java rename to org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/internal/pcap/core/stream/PacketStreamBuilder.java index 1b17c30c8a..c8696c602f 100644 --- a/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/pcap/core/stream/PacketStreamBuilder.java +++ b/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/internal/pcap/core/stream/PacketStreamBuilder.java @@ -10,7 +10,7 @@ * Vincent Perot - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.pcap.core.stream; +package org.eclipse.linuxtools.internal.pcap.core.stream; import java.io.IOException; import java.nio.file.Path; @@ -19,16 +19,16 @@ import java.util.LinkedList; import java.util.Map; import org.eclipse.jdt.annotation.Nullable; -import org.eclipse.linuxtools.pcap.core.endpoint.ProtocolEndpoint; -import org.eclipse.linuxtools.pcap.core.endpoint.ProtocolEndpointPair; -import org.eclipse.linuxtools.pcap.core.filter.IPacketFilter; -import org.eclipse.linuxtools.pcap.core.filter.PacketFilterByProtocol; -import org.eclipse.linuxtools.pcap.core.packet.BadPacketException; -import org.eclipse.linuxtools.pcap.core.packet.Packet; -import org.eclipse.linuxtools.pcap.core.protocol.Protocol; -import org.eclipse.linuxtools.pcap.core.protocol.pcap.PcapPacket; -import org.eclipse.linuxtools.pcap.core.trace.BadPcapFileException; -import org.eclipse.linuxtools.pcap.core.trace.PcapFile; +import org.eclipse.linuxtools.internal.pcap.core.endpoint.ProtocolEndpoint; +import org.eclipse.linuxtools.internal.pcap.core.endpoint.ProtocolEndpointPair; +import org.eclipse.linuxtools.internal.pcap.core.filter.IPacketFilter; +import org.eclipse.linuxtools.internal.pcap.core.filter.PacketFilterByProtocol; +import org.eclipse.linuxtools.internal.pcap.core.packet.BadPacketException; +import org.eclipse.linuxtools.internal.pcap.core.packet.Packet; +import org.eclipse.linuxtools.internal.pcap.core.protocol.Protocol; +import org.eclipse.linuxtools.internal.pcap.core.protocol.pcap.PcapPacket; +import org.eclipse.linuxtools.internal.pcap.core.trace.BadPcapFileException; +import org.eclipse.linuxtools.internal.pcap.core.trace.PcapFile; /** * Class that parse an entire pcap file to build the different streams. diff --git a/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/internal/pcap/core/stream/package-info.java b/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/internal/pcap/core/stream/package-info.java new file mode 100644 index 0000000000..e9904b7a8b --- /dev/null +++ b/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/internal/pcap/core/stream/package-info.java @@ -0,0 +1,14 @@ +/******************************************************************************* + * Copyright (c) 2014 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: + * Ericsson - Initial API and implementation + *******************************************************************************/ + +@org.eclipse.jdt.annotation.NonNullByDefault +package org.eclipse.linuxtools.internal.pcap.core.stream; \ No newline at end of file diff --git a/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/pcap/core/trace/BadPcapFileException.java b/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/internal/pcap/core/trace/BadPcapFileException.java similarity index 96% rename from org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/pcap/core/trace/BadPcapFileException.java rename to org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/internal/pcap/core/trace/BadPcapFileException.java index 8515ca07b4..dbf825d343 100644 --- a/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/pcap/core/trace/BadPcapFileException.java +++ b/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/internal/pcap/core/trace/BadPcapFileException.java @@ -10,7 +10,7 @@ * Vincent Perot - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.pcap.core.trace; +package org.eclipse.linuxtools.internal.pcap.core.trace; /** * Exception that is thrown when the Pcap file is not valid. diff --git a/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/pcap/core/trace/PcapFile.java b/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/internal/pcap/core/trace/PcapFile.java similarity index 97% rename from org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/pcap/core/trace/PcapFile.java rename to org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/internal/pcap/core/trace/PcapFile.java index 4289163c27..2c29c8afde 100644 --- a/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/pcap/core/trace/PcapFile.java +++ b/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/internal/pcap/core/trace/PcapFile.java @@ -10,7 +10,7 @@ * Vincent Perot - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.pcap.core.trace; +package org.eclipse.linuxtools.internal.pcap.core.trace; import java.io.Closeable; import java.io.IOException; @@ -23,10 +23,10 @@ import java.util.TreeMap; import org.eclipse.jdt.annotation.NonNull; import org.eclipse.jdt.annotation.Nullable; -import org.eclipse.linuxtools.pcap.core.packet.BadPacketException; -import org.eclipse.linuxtools.pcap.core.protocol.pcap.PcapPacket; -import org.eclipse.linuxtools.pcap.core.util.ConversionHelper; -import org.eclipse.linuxtools.pcap.core.util.PcapTimestampScale; +import org.eclipse.linuxtools.internal.pcap.core.packet.BadPacketException; +import org.eclipse.linuxtools.internal.pcap.core.protocol.pcap.PcapPacket; +import org.eclipse.linuxtools.internal.pcap.core.util.ConversionHelper; +import org.eclipse.linuxtools.internal.pcap.core.util.PcapTimestampScale; /** * Class that allows the interaction with a pcap file. diff --git a/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/pcap/core/trace/PcapFileValues.java b/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/internal/pcap/core/trace/PcapFileValues.java similarity index 96% rename from org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/pcap/core/trace/PcapFileValues.java rename to org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/internal/pcap/core/trace/PcapFileValues.java index 1b5a39f18b..169a0c388d 100644 --- a/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/pcap/core/trace/PcapFileValues.java +++ b/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/internal/pcap/core/trace/PcapFileValues.java @@ -10,7 +10,7 @@ * Vincent Perot - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.pcap.core.trace; +package org.eclipse.linuxtools.internal.pcap.core.trace; /** * Interface that lists constants related to a Pcap File. diff --git a/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/pcap/core/filter/package-info.java b/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/internal/pcap/core/trace/package-info.java similarity index 90% rename from org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/pcap/core/filter/package-info.java rename to org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/internal/pcap/core/trace/package-info.java index b5af5d5dd7..1b5ed9ac32 100644 --- a/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/pcap/core/filter/package-info.java +++ b/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/internal/pcap/core/trace/package-info.java @@ -11,4 +11,4 @@ *******************************************************************************/ @org.eclipse.jdt.annotation.NonNullByDefault -package org.eclipse.linuxtools.pcap.core.filter; \ No newline at end of file +package org.eclipse.linuxtools.internal.pcap.core.trace; \ No newline at end of file diff --git a/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/pcap/core/util/ConversionHelper.java b/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/internal/pcap/core/util/ConversionHelper.java similarity index 97% rename from org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/pcap/core/util/ConversionHelper.java rename to org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/internal/pcap/core/util/ConversionHelper.java index 503ffc552c..7757dbb122 100644 --- a/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/pcap/core/util/ConversionHelper.java +++ b/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/internal/pcap/core/util/ConversionHelper.java @@ -10,14 +10,14 @@ * Vincent Perot - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.pcap.core.util; +package org.eclipse.linuxtools.internal.pcap.core.util; import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.Date; import org.eclipse.jdt.annotation.NonNull; -import org.eclipse.linuxtools.pcap.core.protocol.ethernet2.EthernetIIValues; +import org.eclipse.linuxtools.internal.pcap.core.protocol.ethernet2.EthernetIIValues; /** * Class for helping with the conversion of data. diff --git a/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/pcap/core/util/EthertypeHelper.java b/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/internal/pcap/core/util/EthertypeHelper.java similarity index 97% rename from org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/pcap/core/util/EthertypeHelper.java rename to org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/internal/pcap/core/util/EthertypeHelper.java index d6a379fd7a..8f5f81aa69 100644 --- a/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/pcap/core/util/EthertypeHelper.java +++ b/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/internal/pcap/core/util/EthertypeHelper.java @@ -10,7 +10,7 @@ * Vincent Perot - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.pcap.core.util; +package org.eclipse.linuxtools.internal.pcap.core.util; // TODO finish this // TODO maybe match it to protocol instead of string. diff --git a/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/pcap/core/util/IPProtocolNumberHelper.java b/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/internal/pcap/core/util/IPProtocolNumberHelper.java similarity index 95% rename from org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/pcap/core/util/IPProtocolNumberHelper.java rename to org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/internal/pcap/core/util/IPProtocolNumberHelper.java index 52381ba3f7..8166ca8509 100644 --- a/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/pcap/core/util/IPProtocolNumberHelper.java +++ b/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/internal/pcap/core/util/IPProtocolNumberHelper.java @@ -10,9 +10,9 @@ * Vincent Perot - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.pcap.core.util; +package org.eclipse.linuxtools.internal.pcap.core.util; -import org.eclipse.linuxtools.pcap.core.protocol.Protocol; +import org.eclipse.linuxtools.internal.pcap.core.protocol.Protocol; // TODO finish this // TODO maybe match it to protocol instead of string. diff --git a/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/pcap/core/util/LinkTypeHelper.java b/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/internal/pcap/core/util/LinkTypeHelper.java similarity index 97% rename from org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/pcap/core/util/LinkTypeHelper.java rename to org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/internal/pcap/core/util/LinkTypeHelper.java index e5d54fa0f6..4241864520 100644 --- a/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/pcap/core/util/LinkTypeHelper.java +++ b/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/internal/pcap/core/util/LinkTypeHelper.java @@ -10,7 +10,7 @@ * Vincent Perot - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.pcap.core.util; +package org.eclipse.linuxtools.internal.pcap.core.util; // TODO finish this // TODO map to protocol instead of string? that would make more sense imo. diff --git a/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/pcap/core/util/PcapTimestampScale.java b/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/internal/pcap/core/util/PcapTimestampScale.java similarity index 92% rename from org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/pcap/core/util/PcapTimestampScale.java rename to org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/internal/pcap/core/util/PcapTimestampScale.java index af5552cdb1..9dc04fcc39 100644 --- a/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/pcap/core/util/PcapTimestampScale.java +++ b/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/internal/pcap/core/util/PcapTimestampScale.java @@ -10,7 +10,7 @@ * Vincent Perot - Initial API and implementation *******************************************************************************/ -package org.eclipse.linuxtools.pcap.core.util; +package org.eclipse.linuxtools.internal.pcap.core.util; /** * Enum for the different time precision for pcap files. diff --git a/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/pcap/core/endpoint/package-info.java b/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/internal/pcap/core/util/package-info.java similarity index 91% rename from org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/pcap/core/endpoint/package-info.java rename to org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/internal/pcap/core/util/package-info.java index a6748c1dda..da154e4298 100644 --- a/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/pcap/core/endpoint/package-info.java +++ b/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/internal/pcap/core/util/package-info.java @@ -11,4 +11,4 @@ *******************************************************************************/ @org.eclipse.jdt.annotation.NonNullByDefault -package org.eclipse.linuxtools.pcap.core.endpoint; \ No newline at end of file +package org.eclipse.linuxtools.internal.pcap.core.util; \ No newline at end of file diff --git a/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/pcap/core/protocol/package-info.java b/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/pcap/core/protocol/package-info.java deleted file mode 100644 index 65e3e7a387..0000000000 --- a/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/pcap/core/protocol/package-info.java +++ /dev/null @@ -1,14 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2014 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: - * Ericsson - Initial API and implementation - *******************************************************************************/ - -@org.eclipse.jdt.annotation.NonNullByDefault -package org.eclipse.linuxtools.pcap.core.protocol; \ No newline at end of file diff --git a/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/pcap/core/protocol/pcap/package-info.java b/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/pcap/core/protocol/pcap/package-info.java deleted file mode 100644 index 6a7e0bd39e..0000000000 --- a/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/pcap/core/protocol/pcap/package-info.java +++ /dev/null @@ -1,14 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2014 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: - * Ericsson - Initial API and implementation - *******************************************************************************/ - -@org.eclipse.jdt.annotation.NonNullByDefault -package org.eclipse.linuxtools.pcap.core.protocol.pcap; \ No newline at end of file diff --git a/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/pcap/core/protocol/tcp/package-info.java b/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/pcap/core/protocol/tcp/package-info.java deleted file mode 100644 index 3ebf52510b..0000000000 --- a/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/pcap/core/protocol/tcp/package-info.java +++ /dev/null @@ -1,14 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2014 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: - * Ericsson - Initial API and implementation - *******************************************************************************/ - -@org.eclipse.jdt.annotation.NonNullByDefault -package org.eclipse.linuxtools.pcap.core.protocol.tcp; \ No newline at end of file diff --git a/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/pcap/core/protocol/udp/package-info.java b/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/pcap/core/protocol/udp/package-info.java deleted file mode 100644 index d88e4a1bfe..0000000000 --- a/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/pcap/core/protocol/udp/package-info.java +++ /dev/null @@ -1,14 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2014 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: - * Ericsson - Initial API and implementation - *******************************************************************************/ - -@org.eclipse.jdt.annotation.NonNullByDefault -package org.eclipse.linuxtools.pcap.core.protocol.udp; \ No newline at end of file diff --git a/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/pcap/core/protocol/unknown/package-info.java b/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/pcap/core/protocol/unknown/package-info.java deleted file mode 100644 index 424f88930b..0000000000 --- a/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/pcap/core/protocol/unknown/package-info.java +++ /dev/null @@ -1,14 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2014 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: - * Ericsson - Initial API and implementation - *******************************************************************************/ - -@org.eclipse.jdt.annotation.NonNullByDefault -package org.eclipse.linuxtools.pcap.core.protocol.unknown; \ No newline at end of file diff --git a/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/pcap/core/stream/package-info.java b/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/pcap/core/stream/package-info.java deleted file mode 100644 index 2cc0a8fa0a..0000000000 --- a/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/pcap/core/stream/package-info.java +++ /dev/null @@ -1,14 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2014 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: - * Ericsson - Initial API and implementation - *******************************************************************************/ - -@org.eclipse.jdt.annotation.NonNullByDefault -package org.eclipse.linuxtools.pcap.core.stream; \ No newline at end of file diff --git a/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/pcap/core/trace/package-info.java b/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/pcap/core/trace/package-info.java deleted file mode 100644 index 1e6b655f8e..0000000000 --- a/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/pcap/core/trace/package-info.java +++ /dev/null @@ -1,14 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2014 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: - * Ericsson - Initial API and implementation - *******************************************************************************/ - -@org.eclipse.jdt.annotation.NonNullByDefault -package org.eclipse.linuxtools.pcap.core.trace; \ No newline at end of file diff --git a/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/pcap/core/util/package-info.java b/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/pcap/core/util/package-info.java deleted file mode 100644 index 9d8a6e4084..0000000000 --- a/org.eclipse.linuxtools.pcap.core/src/org/eclipse/linuxtools/pcap/core/util/package-info.java +++ /dev/null @@ -1,14 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2014 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: - * Ericsson - Initial API and implementation - *******************************************************************************/ - -@org.eclipse.jdt.annotation.NonNullByDefault -package org.eclipse.linuxtools.pcap.core.util; \ No newline at end of file diff --git a/org.eclipse.linuxtools.tmf.help/doc/Developer-Guide.mediawiki b/org.eclipse.linuxtools.tmf.help/doc/Developer-Guide.mediawiki index f57700e512..ac049ec2b6 100644 --- a/org.eclipse.linuxtools.tmf.help/doc/Developer-Guide.mediawiki +++ b/org.eclipse.linuxtools.tmf.help/doc/Developer-Guide.mediawiki @@ -3754,9 +3754,9 @@ package org.eclipse.linuxtools.pcap.core.protocol.udp; import java.nio.ByteBuffer; import java.util.Map; -import org.eclipse.linuxtools.pcap.core.endpoint.ProtocolEndpoint; -import org.eclipse.linuxtools.pcap.core.packet.BadPacketException; -import org.eclipse.linuxtools.pcap.core.packet.Packet; +import org.eclipse.linuxtools.internal.pcap.core.endpoint.ProtocolEndpoint; +import org.eclipse.linuxtools.internal.pcap.core.packet.BadPacketException; +import org.eclipse.linuxtools.internal.pcap.core.packet.Packet; public class UDPPacket extends Packet { @@ -4109,8 +4109,8 @@ We obtain the following unimplemented class: 
 package org.eclipse.linuxtools.pcap.core.protocol.udp;
 
-import org.eclipse.linuxtools.pcap.core.endpoint.ProtocolEndpoint;
-import org.eclipse.linuxtools.pcap.core.packet.Packet;
+import org.eclipse.linuxtools.internal.pcap.core.endpoint.ProtocolEndpoint;
+import org.eclipse.linuxtools.internal.pcap.core.packet.Packet;
 
 public class UDPEndpoint extends ProtocolEndpoint {
 
diff --git a/org.eclipse.linuxtools.tmf.pcap.core.tests/META-INF/MANIFEST.MF b/org.eclipse.linuxtools.tmf.pcap.core.tests/META-INF/MANIFEST.MF
index ba2f56721e..6ed7768112 100644
--- a/org.eclipse.linuxtools.tmf.pcap.core.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.linuxtools.tmf.pcap.core.tests/META-INF/MANIFEST.MF
@@ -19,6 +19,6 @@ Import-Package: com.google.common.collect
 Export-Package: org.eclipse.linuxtools.tmf.pcap.core.tests,
  org.eclipse.linuxtools.tmf.pcap.core.tests.analysis;x-internal:=true,
  org.eclipse.linuxtools.tmf.pcap.core.tests.event;x-internal:=true,
- org.eclipse.linuxtools.tmf.pcap.core.tests.shared,
+ org.eclipse.linuxtools.tmf.pcap.core.tests.shared;x-friends:="org.eclipse.linuxtools.tmf.pcap.ui.swtbot.tests",
  org.eclipse.linuxtools.tmf.pcap.core.tests.stubs;x-internal:=true,
  org.eclipse.linuxtools.tmf.pcap.core.tests.trace;x-internal:=true
diff --git a/org.eclipse.linuxtools.tmf.pcap.core.tests/shared/org/eclipse/linuxtools/tmf/pcap/core/tests/shared/PcapTmfTestTrace.java b/org.eclipse.linuxtools.tmf.pcap.core.tests/shared/org/eclipse/linuxtools/tmf/pcap/core/tests/shared/PcapTmfTestTrace.java
index f3b989fff6..ad0f499473 100644
--- a/org.eclipse.linuxtools.tmf.pcap.core.tests/shared/org/eclipse/linuxtools/tmf/pcap/core/tests/shared/PcapTmfTestTrace.java
+++ b/org.eclipse.linuxtools.tmf.pcap.core.tests/shared/org/eclipse/linuxtools/tmf/pcap/core/tests/shared/PcapTmfTestTrace.java
@@ -15,11 +15,11 @@ package org.eclipse.linuxtools.tmf.pcap.core.tests.shared;
 import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.jdt.annotation.NonNullByDefault;
 import org.eclipse.jdt.annotation.Nullable;
+import org.eclipse.linuxtools.internal.tmf.pcap.core.event.PcapEvent;
+import org.eclipse.linuxtools.internal.tmf.pcap.core.trace.PcapTrace;
 import org.eclipse.linuxtools.pcap.core.tests.shared.PcapTestTrace;
 import org.eclipse.linuxtools.tmf.core.exceptions.TmfTraceException;
-import org.eclipse.linuxtools.tmf.pcap.core.event.PcapEvent;
 import org.eclipse.linuxtools.tmf.pcap.core.tests.stubs.PcapTmfTraceStub;
-import org.eclipse.linuxtools.tmf.pcap.core.trace.PcapTrace;
 
 /**
  * Available Pcap TMF test traces. Kind-of-extends {@link PcapTestTrace}.
diff --git a/org.eclipse.linuxtools.tmf.pcap.core.tests/src/org/eclipse/linuxtools/tmf/pcap/core/tests/analysis/StreamListAnalysisTest.java b/org.eclipse.linuxtools.tmf.pcap.core.tests/src/org/eclipse/linuxtools/tmf/pcap/core/tests/analysis/StreamListAnalysisTest.java
index f0fd29d45c..cb975bfc92 100644
--- a/org.eclipse.linuxtools.tmf.pcap.core.tests/src/org/eclipse/linuxtools/tmf/pcap/core/tests/analysis/StreamListAnalysisTest.java
+++ b/org.eclipse.linuxtools.tmf.pcap.core.tests/src/org/eclipse/linuxtools/tmf/pcap/core/tests/analysis/StreamListAnalysisTest.java
@@ -19,13 +19,13 @@ import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 import static org.junit.Assume.assumeTrue;
 
+import org.eclipse.linuxtools.internal.tmf.pcap.core.analysis.StreamListAnalysis;
+import org.eclipse.linuxtools.internal.tmf.pcap.core.event.TmfPacketStreamBuilder;
+import org.eclipse.linuxtools.internal.tmf.pcap.core.protocol.TmfProtocol;
+import org.eclipse.linuxtools.internal.tmf.pcap.core.trace.PcapTrace;
 import org.eclipse.linuxtools.pcap.core.tests.shared.PcapTestTrace;
 import org.eclipse.linuxtools.tmf.core.exceptions.TmfAnalysisException;
 import org.eclipse.linuxtools.tmf.core.exceptions.TmfTraceException;
-import org.eclipse.linuxtools.tmf.pcap.core.analysis.StreamListAnalysis;
-import org.eclipse.linuxtools.tmf.pcap.core.event.TmfPacketStreamBuilder;
-import org.eclipse.linuxtools.tmf.pcap.core.protocol.TmfProtocol;
-import org.eclipse.linuxtools.tmf.pcap.core.trace.PcapTrace;
 import org.junit.Test;
 
 /**
diff --git a/org.eclipse.linuxtools.tmf.pcap.core.tests/src/org/eclipse/linuxtools/tmf/pcap/core/tests/event/PcapEventFieldTest.java b/org.eclipse.linuxtools.tmf.pcap.core.tests/src/org/eclipse/linuxtools/tmf/pcap/core/tests/event/PcapEventFieldTest.java
index 7993732a7f..67f624f95b 100644
--- a/org.eclipse.linuxtools.tmf.pcap.core.tests/src/org/eclipse/linuxtools/tmf/pcap/core/tests/event/PcapEventFieldTest.java
+++ b/org.eclipse.linuxtools.tmf.pcap.core.tests/src/org/eclipse/linuxtools/tmf/pcap/core/tests/event/PcapEventFieldTest.java
@@ -24,16 +24,16 @@ import java.util.List;
 import java.util.Map;
 
 import org.eclipse.jdt.annotation.NonNull;
-import org.eclipse.linuxtools.pcap.core.packet.BadPacketException;
-import org.eclipse.linuxtools.pcap.core.packet.Packet;
-import org.eclipse.linuxtools.pcap.core.protocol.ipv4.IPv4Packet;
+import org.eclipse.linuxtools.internal.pcap.core.packet.BadPacketException;
+import org.eclipse.linuxtools.internal.pcap.core.packet.Packet;
+import org.eclipse.linuxtools.internal.pcap.core.protocol.ipv4.IPv4Packet;
+import org.eclipse.linuxtools.internal.pcap.core.trace.BadPcapFileException;
+import org.eclipse.linuxtools.internal.pcap.core.trace.PcapFile;
+import org.eclipse.linuxtools.internal.tmf.pcap.core.event.PcapEventField;
+import org.eclipse.linuxtools.internal.tmf.pcap.core.event.PcapRootEventField;
 import org.eclipse.linuxtools.pcap.core.tests.shared.PcapTestTrace;
-import org.eclipse.linuxtools.pcap.core.trace.BadPcapFileException;
-import org.eclipse.linuxtools.pcap.core.trace.PcapFile;
 import org.eclipse.linuxtools.tmf.core.event.ITmfEventField;
 import org.eclipse.linuxtools.tmf.core.event.TmfEventField;
-import org.eclipse.linuxtools.tmf.pcap.core.event.PcapEventField;
-import org.eclipse.linuxtools.tmf.pcap.core.event.PcapRootEventField;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
diff --git a/org.eclipse.linuxtools.tmf.pcap.core.tests/src/org/eclipse/linuxtools/tmf/pcap/core/tests/event/PcapEventTest.java b/org.eclipse.linuxtools.tmf.pcap.core.tests/src/org/eclipse/linuxtools/tmf/pcap/core/tests/event/PcapEventTest.java
index e801d79f32..c9ede2e474 100644
--- a/org.eclipse.linuxtools.tmf.pcap.core.tests/src/org/eclipse/linuxtools/tmf/pcap/core/tests/event/PcapEventTest.java
+++ b/org.eclipse.linuxtools.tmf.pcap.core.tests/src/org/eclipse/linuxtools/tmf/pcap/core/tests/event/PcapEventTest.java
@@ -21,15 +21,15 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
+import org.eclipse.linuxtools.internal.pcap.core.trace.BadPcapFileException;
+import org.eclipse.linuxtools.internal.pcap.core.trace.PcapFile;
+import org.eclipse.linuxtools.internal.tmf.pcap.core.event.PcapEvent;
+import org.eclipse.linuxtools.internal.tmf.pcap.core.protocol.TmfProtocol;
+import org.eclipse.linuxtools.internal.tmf.pcap.core.trace.PcapTrace;
 import org.eclipse.linuxtools.pcap.core.tests.shared.PcapTestTrace;
-import org.eclipse.linuxtools.pcap.core.trace.BadPcapFileException;
-import org.eclipse.linuxtools.pcap.core.trace.PcapFile;
 import org.eclipse.linuxtools.tmf.core.exceptions.TmfTraceException;
 import org.eclipse.linuxtools.tmf.core.trace.TmfContext;
 import org.eclipse.linuxtools.tmf.core.trace.location.TmfLongLocation;
-import org.eclipse.linuxtools.tmf.pcap.core.event.PcapEvent;
-import org.eclipse.linuxtools.tmf.pcap.core.protocol.TmfProtocol;
-import org.eclipse.linuxtools.tmf.pcap.core.trace.PcapTrace;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
diff --git a/org.eclipse.linuxtools.tmf.pcap.core.tests/src/org/eclipse/linuxtools/tmf/pcap/core/tests/trace/PcapTraceTest.java b/org.eclipse.linuxtools.tmf.pcap.core.tests/src/org/eclipse/linuxtools/tmf/pcap/core/tests/trace/PcapTraceTest.java
index ab2724b253..d1bc1f948a 100644
--- a/org.eclipse.linuxtools.tmf.pcap.core.tests/src/org/eclipse/linuxtools/tmf/pcap/core/tests/trace/PcapTraceTest.java
+++ b/org.eclipse.linuxtools.tmf.pcap.core.tests/src/org/eclipse/linuxtools/tmf/pcap/core/tests/trace/PcapTraceTest.java
@@ -21,6 +21,8 @@ import static org.junit.Assume.assumeTrue;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.runtime.IStatus;
+import org.eclipse.linuxtools.internal.tmf.pcap.core.event.PcapEvent;
+import org.eclipse.linuxtools.internal.tmf.pcap.core.trace.PcapTrace;
 import org.eclipse.linuxtools.tmf.core.exceptions.TmfTraceException;
 import org.eclipse.linuxtools.tmf.core.signal.TmfEndSynchSignal;
 import org.eclipse.linuxtools.tmf.core.signal.TmfSignal;
@@ -28,9 +30,7 @@ import org.eclipse.linuxtools.tmf.core.timestamp.ITmfTimestamp;
 import org.eclipse.linuxtools.tmf.core.timestamp.TmfTimeRange;
 import org.eclipse.linuxtools.tmf.core.trace.ITmfContext;
 import org.eclipse.linuxtools.tmf.core.trace.location.TmfLongLocation;
-import org.eclipse.linuxtools.tmf.pcap.core.event.PcapEvent;
 import org.eclipse.linuxtools.tmf.pcap.core.tests.shared.PcapTmfTestTrace;
-import org.eclipse.linuxtools.tmf.pcap.core.trace.PcapTrace;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/org.eclipse.linuxtools.tmf.pcap.core.tests/stubs/org/eclipse/linuxtools/tmf/pcap/core/tests/stubs/PcapTmfTraceStub.java b/org.eclipse.linuxtools.tmf.pcap.core.tests/stubs/org/eclipse/linuxtools/tmf/pcap/core/tests/stubs/PcapTmfTraceStub.java
index 574af69fb2..ab0228ddc2 100644
--- a/org.eclipse.linuxtools.tmf.pcap.core.tests/stubs/org/eclipse/linuxtools/tmf/pcap/core/tests/stubs/PcapTmfTraceStub.java
+++ b/org.eclipse.linuxtools.tmf.pcap.core.tests/stubs/org/eclipse/linuxtools/tmf/pcap/core/tests/stubs/PcapTmfTraceStub.java
@@ -12,10 +12,10 @@
 
 package org.eclipse.linuxtools.tmf.pcap.core.tests.stubs;
 
+import org.eclipse.linuxtools.internal.tmf.pcap.core.trace.PcapTrace;
 import org.eclipse.linuxtools.tmf.core.signal.TmfSignalManager;
 import org.eclipse.linuxtools.tmf.core.signal.TmfTraceOpenedSignal;
 import org.eclipse.linuxtools.tmf.core.signal.TmfTraceSelectedSignal;
-import org.eclipse.linuxtools.tmf.pcap.core.trace.PcapTrace;
 
 /**
  * Dummy test pcap trace
diff --git a/org.eclipse.linuxtools.tmf.pcap.core/META-INF/MANIFEST.MF b/org.eclipse.linuxtools.tmf.pcap.core/META-INF/MANIFEST.MF
index 35c01d6a76..7bc16f7bab 100644
--- a/org.eclipse.linuxtools.tmf.pcap.core/META-INF/MANIFEST.MF
+++ b/org.eclipse.linuxtools.tmf.pcap.core/META-INF/MANIFEST.MF
@@ -13,10 +13,10 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.linuxtools.tmf.core;bundle-version="3.1.0",
  org.eclipse.linuxtools.pcap.core;bundle-version="1.0.0"
 Export-Package: org.eclipse.linuxtools.internal.tmf.pcap.core;x-internal:=true,
- org.eclipse.linuxtools.internal.tmf.pcap.core.util;x-internal:=true,
- org.eclipse.linuxtools.tmf.pcap.core.analysis,
- org.eclipse.linuxtools.tmf.pcap.core.event,
- org.eclipse.linuxtools.tmf.pcap.core.protocol,
- org.eclipse.linuxtools.tmf.pcap.core.signal,
- org.eclipse.linuxtools.tmf.pcap.core.trace
+ org.eclipse.linuxtools.internal.tmf.pcap.core.analysis;x-friends:="org.eclipse.linuxtools.tmf.pcap.core.tests,org.eclipse.linuxtools.tmf.pcap.ui",
+ org.eclipse.linuxtools.internal.tmf.pcap.core.event;x-friends:="org.eclipse.linuxtools.tmf.pcap.core.tests,org.eclipse.linuxtools.tmf.pcap.ui",
+ org.eclipse.linuxtools.internal.tmf.pcap.core.protocol;x-friends:="org.eclipse.linuxtools.tmf.pcap.core.tests,org.eclipse.linuxtools.tmf.pcap.ui",
+ org.eclipse.linuxtools.internal.tmf.pcap.core.signal;x-friends:="org.eclipse.linuxtools.tmf.pcap.ui",
+ org.eclipse.linuxtools.internal.tmf.pcap.core.trace;x-friends:="org.eclipse.linuxtools.tmf.pcap.core.tests,org.eclipse.linuxtools.tmf.pcap.ui,org.eclipse.linuxtools.tmf.pcap.ui.swtbot.tests",
+ org.eclipse.linuxtools.internal.tmf.pcap.core.util;x-internal:=true
 Import-Package: com.google.common.collect
diff --git a/org.eclipse.linuxtools.tmf.pcap.core/plugin.xml b/org.eclipse.linuxtools.tmf.pcap.core/plugin.xml
index 15f4181c3b..1f2360e248 100644
--- a/org.eclipse.linuxtools.tmf.pcap.core/plugin.xml
+++ b/org.eclipse.linuxtools.tmf.pcap.core/plugin.xml
@@ -13,19 +13,19 @@
             id="org.eclipse.linuxtools.tmf.pcap.core.pcaptrace"
             isDirectory="false"
             name="Pcap Trace"
-            trace_type="org.eclipse.linuxtools.tmf.pcap.core.trace.PcapTrace">
+            trace_type="org.eclipse.linuxtools.internal.tmf.pcap.core.trace.PcapTrace">
       
    
    
       
          
+               class="org.eclipse.linuxtools.internal.tmf.pcap.core.trace.PcapTrace">
          
          
          
+               class="org.eclipse.linuxtools.internal.tmf.pcap.ui.editor.PcapEventsTable">
          
       
    
@@ -20,7 +20,7 @@
       
       
          
+               class="org.eclipse.linuxtools.internal.tmf.pcap.core.analysis.StreamListAnalysis">
          
       
    
diff --git a/org.eclipse.linuxtools.tmf.pcap.ui/src/org/eclipse/linuxtools/tmf/pcap/ui/NetworkingPerspectiveFactory.java b/org.eclipse.linuxtools.tmf.pcap.ui/src/org/eclipse/linuxtools/internal/tmf/pcap/ui/NetworkingPerspectiveFactory.java
similarity index 96%
rename from org.eclipse.linuxtools.tmf.pcap.ui/src/org/eclipse/linuxtools/tmf/pcap/ui/NetworkingPerspectiveFactory.java
rename to org.eclipse.linuxtools.tmf.pcap.ui/src/org/eclipse/linuxtools/internal/tmf/pcap/ui/NetworkingPerspectiveFactory.java
index ec89977de0..616b3b0bc7 100644
--- a/org.eclipse.linuxtools.tmf.pcap.ui/src/org/eclipse/linuxtools/tmf/pcap/ui/NetworkingPerspectiveFactory.java
+++ b/org.eclipse.linuxtools.tmf.pcap.ui/src/org/eclipse/linuxtools/internal/tmf/pcap/ui/NetworkingPerspectiveFactory.java
@@ -10,11 +10,11 @@
  *   Vincent Perot - Initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.linuxtools.tmf.pcap.ui;
+package org.eclipse.linuxtools.internal.tmf.pcap.ui;
 
 import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.jdt.annotation.Nullable;
-import org.eclipse.linuxtools.tmf.pcap.ui.stream.StreamListView;
+import org.eclipse.linuxtools.internal.tmf.pcap.ui.stream.StreamListView;
 import org.eclipse.linuxtools.tmf.ui.project.wizards.NewTmfProjectWizard;
 import org.eclipse.linuxtools.tmf.ui.views.colors.ColorsView;
 import org.eclipse.linuxtools.tmf.ui.views.filter.FilterView;
diff --git a/org.eclipse.linuxtools.tmf.pcap.ui/src/org/eclipse/linuxtools/tmf/pcap/ui/editor/Messages.java b/org.eclipse.linuxtools.tmf.pcap.ui/src/org/eclipse/linuxtools/internal/tmf/pcap/ui/editor/Messages.java
similarity index 91%
rename from org.eclipse.linuxtools.tmf.pcap.ui/src/org/eclipse/linuxtools/tmf/pcap/ui/editor/Messages.java
rename to org.eclipse.linuxtools.tmf.pcap.ui/src/org/eclipse/linuxtools/internal/tmf/pcap/ui/editor/Messages.java
index f890a69a4d..590d964dc7 100644
--- a/org.eclipse.linuxtools.tmf.pcap.ui/src/org/eclipse/linuxtools/tmf/pcap/ui/editor/Messages.java
+++ b/org.eclipse.linuxtools.tmf.pcap.ui/src/org/eclipse/linuxtools/internal/tmf/pcap/ui/editor/Messages.java
@@ -10,20 +10,23 @@
  *   Vincent Perot - Initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.linuxtools.tmf.pcap.ui.editor;
+package org.eclipse.linuxtools.internal.tmf.pcap.ui.editor;
 
 import org.eclipse.jdt.annotation.Nullable;
 import org.eclipse.osgi.util.NLS;
 
 @SuppressWarnings("javadoc")
 public class Messages extends NLS {
-    private static final String BUNDLE_NAME = "org.eclipse.linuxtools.tmf.pcap.ui.editor.messages"; //$NON-NLS-1$
+
+    private static final String BUNDLE_NAME = "org.eclipse.linuxtools.internal.tmf.pcap.ui.editor.messages"; //$NON-NLS-1$
+
     public static @Nullable String PcapEventsTable_Content;
     public static @Nullable String PcapEventsTable_Destination;
     public static @Nullable String PcapEventsTable_Protocol;
     public static @Nullable String PcapEventsTable_Reference;
     public static @Nullable String PcapEventsTable_Source;
     public static @Nullable String PcapEventsTable_Timestamp;
+
     static {
         // initialize resource bundle
         NLS.initializeMessages(BUNDLE_NAME, Messages.class);
diff --git a/org.eclipse.linuxtools.tmf.pcap.ui/src/org/eclipse/linuxtools/tmf/pcap/ui/editor/PcapEventsTable.java b/org.eclipse.linuxtools.tmf.pcap.ui/src/org/eclipse/linuxtools/internal/tmf/pcap/ui/editor/PcapEventsTable.java
similarity index 95%
rename from org.eclipse.linuxtools.tmf.pcap.ui/src/org/eclipse/linuxtools/tmf/pcap/ui/editor/PcapEventsTable.java
rename to org.eclipse.linuxtools.tmf.pcap.ui/src/org/eclipse/linuxtools/internal/tmf/pcap/ui/editor/PcapEventsTable.java
index 4ac42dd623..ecf34347fb 100644
--- a/org.eclipse.linuxtools.tmf.pcap.ui/src/org/eclipse/linuxtools/tmf/pcap/ui/editor/PcapEventsTable.java
+++ b/org.eclipse.linuxtools.tmf.pcap.ui/src/org/eclipse/linuxtools/internal/tmf/pcap/ui/editor/PcapEventsTable.java
@@ -11,15 +11,15 @@
  *   Alexandre Montplaisir - Update to new TmfEventTableColumn API
  *******************************************************************************/
 
-package org.eclipse.linuxtools.tmf.pcap.ui.editor;
+package org.eclipse.linuxtools.internal.tmf.pcap.ui.editor;
 
 import java.util.Collection;
 
 import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.jdt.annotation.Nullable;
+import org.eclipse.linuxtools.internal.tmf.pcap.core.event.PcapEvent;
+import org.eclipse.linuxtools.internal.tmf.pcap.core.protocol.TmfProtocol;
 import org.eclipse.linuxtools.tmf.core.event.ITmfEvent;
-import org.eclipse.linuxtools.tmf.pcap.core.event.PcapEvent;
-import org.eclipse.linuxtools.tmf.pcap.core.protocol.TmfProtocol;
 import org.eclipse.linuxtools.tmf.ui.viewers.events.TmfEventsTable;
 import org.eclipse.linuxtools.tmf.ui.viewers.events.columns.TmfEventTableColumn;
 import org.eclipse.swt.widgets.Composite;
diff --git a/org.eclipse.linuxtools.tmf.pcap.ui/src/org/eclipse/linuxtools/tmf/pcap/ui/editor/messages.properties b/org.eclipse.linuxtools.tmf.pcap.ui/src/org/eclipse/linuxtools/internal/tmf/pcap/ui/editor/messages.properties
similarity index 100%
rename from org.eclipse.linuxtools.tmf.pcap.ui/src/org/eclipse/linuxtools/tmf/pcap/ui/editor/messages.properties
rename to org.eclipse.linuxtools.tmf.pcap.ui/src/org/eclipse/linuxtools/internal/tmf/pcap/ui/editor/messages.properties
diff --git a/org.eclipse.linuxtools.tmf.pcap.ui/src/org/eclipse/linuxtools/internal/tmf/pcap/ui/editor/package-info.java b/org.eclipse.linuxtools.tmf.pcap.ui/src/org/eclipse/linuxtools/internal/tmf/pcap/ui/editor/package-info.java
new file mode 100644
index 0000000000..f3c77e9d57
--- /dev/null
+++ b/org.eclipse.linuxtools.tmf.pcap.ui/src/org/eclipse/linuxtools/internal/tmf/pcap/ui/editor/package-info.java
@@ -0,0 +1,14 @@
+/*******************************************************************************
+ * Copyright (c) 2014 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:
+ *    Ericsson - Initial API and implementation
+ *******************************************************************************/
+
+@org.eclipse.jdt.annotation.NonNullByDefault
+package org.eclipse.linuxtools.internal.tmf.pcap.ui.editor;
\ No newline at end of file
diff --git a/org.eclipse.linuxtools.tmf.pcap.ui/src/org/eclipse/linuxtools/tmf/pcap/ui/stream/Messages.java b/org.eclipse.linuxtools.tmf.pcap.ui/src/org/eclipse/linuxtools/internal/tmf/pcap/ui/stream/Messages.java
similarity index 94%
rename from org.eclipse.linuxtools.tmf.pcap.ui/src/org/eclipse/linuxtools/tmf/pcap/ui/stream/Messages.java
rename to org.eclipse.linuxtools.tmf.pcap.ui/src/org/eclipse/linuxtools/internal/tmf/pcap/ui/stream/Messages.java
index d2576649ee..06b3efd3e7 100644
--- a/org.eclipse.linuxtools.tmf.pcap.ui/src/org/eclipse/linuxtools/tmf/pcap/ui/stream/Messages.java
+++ b/org.eclipse.linuxtools.tmf.pcap.ui/src/org/eclipse/linuxtools/internal/tmf/pcap/ui/stream/Messages.java
@@ -10,14 +10,16 @@
  *   Vincent Perot - Initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.linuxtools.tmf.pcap.ui.stream;
+package org.eclipse.linuxtools.internal.tmf.pcap.ui.stream;
 
 import org.eclipse.jdt.annotation.Nullable;
 import org.eclipse.osgi.util.NLS;
 
 @SuppressWarnings("javadoc")
 public class Messages extends NLS {
-    private static final String BUNDLE_NAME = "org.eclipse.linuxtools.tmf.pcap.ui.stream.messages"; //$NON-NLS-1$
+
+    private static final String BUNDLE_NAME = "org.eclipse.linuxtools.internal.tmf.pcap.ui.stream.messages"; //$NON-NLS-1$
+
     public static @Nullable String StreamListView_BPSAtoB;
     public static @Nullable String StreamListView_BPSBtoA;
     public static @Nullable String StreamListView_BytesAtoB;
@@ -36,6 +38,7 @@ public class Messages extends NLS {
     public static @Nullable String StreamListView_StopTime;
     public static @Nullable String StreamListView_TotalBytes;
     public static @Nullable String StreamListView_TotalPackets;
+
     static {
         // initialize resource bundle
         NLS.initializeMessages(BUNDLE_NAME, Messages.class);
diff --git a/org.eclipse.linuxtools.tmf.pcap.ui/src/org/eclipse/linuxtools/tmf/pcap/ui/stream/StreamListView.java b/org.eclipse.linuxtools.tmf.pcap.ui/src/org/eclipse/linuxtools/internal/tmf/pcap/ui/stream/StreamListView.java
similarity index 96%
rename from org.eclipse.linuxtools.tmf.pcap.ui/src/org/eclipse/linuxtools/tmf/pcap/ui/stream/StreamListView.java
rename to org.eclipse.linuxtools.tmf.pcap.ui/src/org/eclipse/linuxtools/internal/tmf/pcap/ui/stream/StreamListView.java
index ff4fd8caab..37f45d5625 100644
--- a/org.eclipse.linuxtools.tmf.pcap.ui/src/org/eclipse/linuxtools/tmf/pcap/ui/stream/StreamListView.java
+++ b/org.eclipse.linuxtools.tmf.pcap.ui/src/org/eclipse/linuxtools/internal/tmf/pcap/ui/stream/StreamListView.java
@@ -10,7 +10,7 @@
  *   Vincent Perot - Initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.linuxtools.tmf.pcap.ui.stream;
+package org.eclipse.linuxtools.internal.tmf.pcap.ui.stream;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -19,6 +19,13 @@ import java.util.Map;
 
 import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.jdt.annotation.Nullable;
+import org.eclipse.linuxtools.internal.tmf.pcap.core.analysis.StreamListAnalysis;
+import org.eclipse.linuxtools.internal.tmf.pcap.core.event.PcapEvent;
+import org.eclipse.linuxtools.internal.tmf.pcap.core.event.TmfPacketStream;
+import org.eclipse.linuxtools.internal.tmf.pcap.core.event.TmfPacketStreamBuilder;
+import org.eclipse.linuxtools.internal.tmf.pcap.core.protocol.TmfProtocol;
+import org.eclipse.linuxtools.internal.tmf.pcap.core.signal.TmfPacketStreamSelectedSignal;
+import org.eclipse.linuxtools.internal.tmf.pcap.core.trace.PcapTrace;
 import org.eclipse.linuxtools.internal.tmf.pcap.ui.Activator;
 import org.eclipse.linuxtools.tmf.core.filter.model.ITmfFilterTreeNode;
 import org.eclipse.linuxtools.tmf.core.filter.model.TmfFilterAndNode;
@@ -32,13 +39,6 @@ import org.eclipse.linuxtools.tmf.core.signal.TmfTraceClosedSignal;
 import org.eclipse.linuxtools.tmf.core.signal.TmfTraceOpenedSignal;
 import org.eclipse.linuxtools.tmf.core.signal.TmfTraceSelectedSignal;
 import org.eclipse.linuxtools.tmf.core.trace.ITmfTrace;
-import org.eclipse.linuxtools.tmf.pcap.core.analysis.StreamListAnalysis;
-import org.eclipse.linuxtools.tmf.pcap.core.event.PcapEvent;
-import org.eclipse.linuxtools.tmf.pcap.core.event.TmfPacketStream;
-import org.eclipse.linuxtools.tmf.pcap.core.event.TmfPacketStreamBuilder;
-import org.eclipse.linuxtools.tmf.pcap.core.protocol.TmfProtocol;
-import org.eclipse.linuxtools.tmf.pcap.core.signal.TmfPacketStreamSelectedSignal;
-import org.eclipse.linuxtools.tmf.pcap.core.trace.PcapTrace;
 import org.eclipse.linuxtools.tmf.ui.project.model.TraceUtils;
 import org.eclipse.linuxtools.tmf.ui.views.TmfView;
 import org.eclipse.linuxtools.tmf.ui.views.filter.FilterManager;
diff --git a/org.eclipse.linuxtools.tmf.pcap.ui/src/org/eclipse/linuxtools/tmf/pcap/ui/stream/messages.properties b/org.eclipse.linuxtools.tmf.pcap.ui/src/org/eclipse/linuxtools/internal/tmf/pcap/ui/stream/messages.properties
similarity index 100%
rename from org.eclipse.linuxtools.tmf.pcap.ui/src/org/eclipse/linuxtools/tmf/pcap/ui/stream/messages.properties
rename to org.eclipse.linuxtools.tmf.pcap.ui/src/org/eclipse/linuxtools/internal/tmf/pcap/ui/stream/messages.properties
diff --git a/org.eclipse.linuxtools.tmf.pcap.ui/src/org/eclipse/linuxtools/internal/tmf/pcap/ui/stream/package-info.java b/org.eclipse.linuxtools.tmf.pcap.ui/src/org/eclipse/linuxtools/internal/tmf/pcap/ui/stream/package-info.java
new file mode 100644
index 0000000000..9aeb3c64eb
--- /dev/null
+++ b/org.eclipse.linuxtools.tmf.pcap.ui/src/org/eclipse/linuxtools/internal/tmf/pcap/ui/stream/package-info.java
@@ -0,0 +1,14 @@
+/*******************************************************************************
+ * Copyright (c) 2014 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:
+ *    Ericsson - Initial API and implementation
+ *******************************************************************************/
+
+@org.eclipse.jdt.annotation.NonNullByDefault
+package org.eclipse.linuxtools.internal.tmf.pcap.ui.stream;
\ No newline at end of file
diff --git a/org.eclipse.linuxtools.tmf.pcap.ui/src/org/eclipse/linuxtools/tmf/pcap/ui/editor/package-info.java b/org.eclipse.linuxtools.tmf.pcap.ui/src/org/eclipse/linuxtools/tmf/pcap/ui/editor/package-info.java
deleted file mode 100644
index cdbeeddc30..0000000000
--- a/org.eclipse.linuxtools.tmf.pcap.ui/src/org/eclipse/linuxtools/tmf/pcap/ui/editor/package-info.java
+++ /dev/null
@@ -1,14 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2014 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:
- *    Ericsson - Initial API and implementation
- *******************************************************************************/
-
-@org.eclipse.jdt.annotation.NonNullByDefault
-package org.eclipse.linuxtools.tmf.pcap.ui.editor;
\ No newline at end of file
diff --git a/org.eclipse.linuxtools.tmf.pcap.ui/src/org/eclipse/linuxtools/tmf/pcap/ui/package-info.java b/org.eclipse.linuxtools.tmf.pcap.ui/src/org/eclipse/linuxtools/tmf/pcap/ui/package-info.java
deleted file mode 100644
index 9af145908c..0000000000
--- a/org.eclipse.linuxtools.tmf.pcap.ui/src/org/eclipse/linuxtools/tmf/pcap/ui/package-info.java
+++ /dev/null
@@ -1,14 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2014 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:
- *    Ericsson - Initial API and implementation
- *******************************************************************************/
-
-@org.eclipse.jdt.annotation.NonNullByDefault
-package org.eclipse.linuxtools.tmf.pcap.ui;
\ No newline at end of file
diff --git a/org.eclipse.linuxtools.tmf.pcap.ui/src/org/eclipse/linuxtools/tmf/pcap/ui/stream/package-info.java b/org.eclipse.linuxtools.tmf.pcap.ui/src/org/eclipse/linuxtools/tmf/pcap/ui/stream/package-info.java
deleted file mode 100644
index aebf25ab7f..0000000000
--- a/org.eclipse.linuxtools.tmf.pcap.ui/src/org/eclipse/linuxtools/tmf/pcap/ui/stream/package-info.java
+++ /dev/null
@@ -1,14 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2014 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:
- *    Ericsson - Initial API and implementation
- *******************************************************************************/
-
-@org.eclipse.jdt.annotation.NonNullByDefault
-package org.eclipse.linuxtools.tmf.pcap.ui.stream;
\ No newline at end of file
-- 
2.34.1