From dd21f7494f8394330eda9f1e4d9246ba5f621255 Mon Sep 17 00:00:00 2001 From: Matthew Khouzam Date: Mon, 18 Apr 2016 23:12:23 -0400 Subject: [PATCH] tmf.core: Internalize timestamp types Move timestamp implementations to an internal package. Change-Id: I2705c11a4a2cf91204854e726c798c37b30bec6a Signed-off-by: Matthew Khouzam Reviewed-on: https://git.eclipse.org/r/70246 Reviewed-by: Hudson CI Reviewed-by: Patrick Tasse Tested-by: Patrick Tasse --- .../tmf/analysis/xml/core/model/TmfXmlAction.java | 4 ++-- .../tmf/core/tests/event/TmfNanoTimestampTest.java | 2 +- .../tmf/core/tests/event/TmfSecondTimestampTest.java | 2 +- .../META-INF/MANIFEST.MF | 1 + .../tmf/core/timestamp/TmfNanoTimestamp.java | 5 ++++- .../tmf/core/timestamp/TmfSecondTimestamp.java | 5 ++++- .../internal/tmf/core/timestamp/package-info.java | 11 +++++++++++ .../tracecompass/tmf/core/timestamp/TmfTimestamp.java | 2 ++ 8 files changed, 26 insertions(+), 6 deletions(-) rename tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/{ => internal}/tmf/core/timestamp/TmfNanoTimestamp.java (88%) rename tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/{ => internal}/tmf/core/timestamp/TmfSecondTimestamp.java (88%) create mode 100644 tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/internal/tmf/core/timestamp/package-info.java diff --git a/tmf/org.eclipse.tracecompass.tmf.analysis.xml.core/src/org/eclipse/tracecompass/tmf/analysis/xml/core/model/TmfXmlAction.java b/tmf/org.eclipse.tracecompass.tmf.analysis.xml.core/src/org/eclipse/tracecompass/tmf/analysis/xml/core/model/TmfXmlAction.java index cc38801e57..7f97ab3c3f 100644 --- a/tmf/org.eclipse.tracecompass.tmf.analysis.xml.core/src/org/eclipse/tracecompass/tmf/analysis/xml/core/model/TmfXmlAction.java +++ b/tmf/org.eclipse.tracecompass.tmf.analysis.xml.core/src/org/eclipse/tracecompass/tmf/analysis/xml/core/model/TmfXmlAction.java @@ -23,7 +23,7 @@ import org.eclipse.tracecompass.tmf.analysis.xml.core.module.XmlUtils; import org.eclipse.tracecompass.tmf.analysis.xml.core.stateprovider.TmfXmlStrings; import org.eclipse.tracecompass.tmf.core.event.ITmfEvent; import org.eclipse.tracecompass.tmf.core.timestamp.ITmfTimestamp; -import org.eclipse.tracecompass.tmf.core.timestamp.TmfNanoTimestamp; +import org.eclipse.tracecompass.tmf.core.timestamp.TmfTimestamp; import org.w3c.dom.Element; /** @@ -157,7 +157,7 @@ public class TmfXmlAction implements ITmfXmlAction { public void execute(ITmfEvent event, TmfXmlScenarioInfo scenarioInfo) { long ts = fProvider.getHistoryBuilder().getStartTime(fProvider, scenarioInfo, event); // FIXME Should the scale always be nanoseconds? - ITmfTimestamp start = new TmfNanoTimestamp(ts); + ITmfTimestamp start = TmfTimestamp.fromNanos(ts); ITmfTimestamp end = event.getTimestamp(); fSegmentBuilder.generatePatternSegment(event, start, end, scenarioInfo); } diff --git a/tmf/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/event/TmfNanoTimestampTest.java b/tmf/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/event/TmfNanoTimestampTest.java index a51ff90bbd..a3a7971992 100644 --- a/tmf/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/event/TmfNanoTimestampTest.java +++ b/tmf/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/event/TmfNanoTimestampTest.java @@ -21,8 +21,8 @@ import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.Date; +import org.eclipse.tracecompass.internal.tmf.core.timestamp.TmfNanoTimestamp; import org.eclipse.tracecompass.tmf.core.timestamp.ITmfTimestamp; -import org.eclipse.tracecompass.tmf.core.timestamp.TmfNanoTimestamp; import org.eclipse.tracecompass.tmf.core.timestamp.TmfTimestamp; import org.junit.Test; diff --git a/tmf/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/event/TmfSecondTimestampTest.java b/tmf/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/event/TmfSecondTimestampTest.java index dd18f042b8..8f65ef3401 100644 --- a/tmf/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/event/TmfSecondTimestampTest.java +++ b/tmf/org.eclipse.tracecompass.tmf.core.tests/src/org/eclipse/tracecompass/tmf/core/tests/event/TmfSecondTimestampTest.java @@ -21,8 +21,8 @@ import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.Date; +import org.eclipse.tracecompass.internal.tmf.core.timestamp.TmfSecondTimestamp; import org.eclipse.tracecompass.tmf.core.timestamp.ITmfTimestamp; -import org.eclipse.tracecompass.tmf.core.timestamp.TmfSecondTimestamp; import org.eclipse.tracecompass.tmf.core.timestamp.TmfTimestamp; import org.junit.Test; diff --git a/tmf/org.eclipse.tracecompass.tmf.core/META-INF/MANIFEST.MF b/tmf/org.eclipse.tracecompass.tmf.core/META-INF/MANIFEST.MF index ebb96a8e3f..6a6ac60669 100644 --- a/tmf/org.eclipse.tracecompass.tmf.core/META-INF/MANIFEST.MF +++ b/tmf/org.eclipse.tracecompass.tmf.core/META-INF/MANIFEST.MF @@ -26,6 +26,7 @@ Export-Package: org.eclipse.tracecompass.internal.tmf.core;x-friends:="org.eclip org.eclipse.tracecompass.internal.tmf.core.statesystem.mipmap;x-friends:="org.eclipse.tracecompass.tmf.core.tests", org.eclipse.tracecompass.internal.tmf.core.synchronization;x-friends:="org.eclipse.tracecompass.tmf.core.tests", org.eclipse.tracecompass.internal.tmf.core.synchronization.graph;x-friends:="org.eclipse.tracecompass.tmf.core.tests", + org.eclipse.tracecompass.internal.tmf.core.timestamp;x-friends:="org.eclipse.tracecompass.tmf.core.tests", org.eclipse.tracecompass.internal.tmf.core.trace.experiment;x-friends:="org.eclipse.tracecompass.tmf.core.tests", org.eclipse.tracecompass.internal.tmf.core.trace.indexer;x-friends:="org.eclipse.tracecompass.tmf.core.tests", org.eclipse.tracecompass.tmf.core, diff --git a/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/timestamp/TmfNanoTimestamp.java b/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/internal/tmf/core/timestamp/TmfNanoTimestamp.java similarity index 88% rename from tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/timestamp/TmfNanoTimestamp.java rename to tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/internal/tmf/core/timestamp/TmfNanoTimestamp.java index 35c6acac72..c047177630 100644 --- a/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/timestamp/TmfNanoTimestamp.java +++ b/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/internal/tmf/core/timestamp/TmfNanoTimestamp.java @@ -11,7 +11,10 @@ * Patrick Tasse - Modified from TmfSimpleTimestamp to use nanosecond scale *******************************************************************************/ -package org.eclipse.tracecompass.tmf.core.timestamp; +package org.eclipse.tracecompass.internal.tmf.core.timestamp; + +import org.eclipse.tracecompass.tmf.core.timestamp.ITmfTimestamp; +import org.eclipse.tracecompass.tmf.core.timestamp.TmfTimestamp; /** * A simplified timestamp where scale is nanoseconds and precision is set to 0. diff --git a/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/timestamp/TmfSecondTimestamp.java b/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/internal/tmf/core/timestamp/TmfSecondTimestamp.java similarity index 88% rename from tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/timestamp/TmfSecondTimestamp.java rename to tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/internal/tmf/core/timestamp/TmfSecondTimestamp.java index cba830804c..88b52b2757 100644 --- a/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/timestamp/TmfSecondTimestamp.java +++ b/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/internal/tmf/core/timestamp/TmfSecondTimestamp.java @@ -11,7 +11,10 @@ * Francois Chouinard - Standardize on the default toString() *******************************************************************************/ -package org.eclipse.tracecompass.tmf.core.timestamp; +package org.eclipse.tracecompass.internal.tmf.core.timestamp; + +import org.eclipse.tracecompass.tmf.core.timestamp.ITmfTimestamp; +import org.eclipse.tracecompass.tmf.core.timestamp.TmfTimestamp; /** * A simplified timestamp where scale and precision are set to 0. diff --git a/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/internal/tmf/core/timestamp/package-info.java b/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/internal/tmf/core/timestamp/package-info.java new file mode 100644 index 0000000000..fe339f1879 --- /dev/null +++ b/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/internal/tmf/core/timestamp/package-info.java @@ -0,0 +1,11 @@ +/******************************************************************************* + * Copyright (c) 2016 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 + *******************************************************************************/ + +@org.eclipse.jdt.annotation.NonNullByDefault +package org.eclipse.tracecompass.internal.tmf.core.timestamp; \ No newline at end of file diff --git a/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/timestamp/TmfTimestamp.java b/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/timestamp/TmfTimestamp.java index 141d7a3344..0b80e70b9b 100644 --- a/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/timestamp/TmfTimestamp.java +++ b/tmf/org.eclipse.tracecompass.tmf.core/src/org/eclipse/tracecompass/tmf/core/timestamp/TmfTimestamp.java @@ -18,6 +18,8 @@ package org.eclipse.tracecompass.tmf.core.timestamp; import java.nio.ByteBuffer; import org.eclipse.jdt.annotation.NonNull; +import org.eclipse.tracecompass.internal.tmf.core.timestamp.TmfNanoTimestamp; +import org.eclipse.tracecompass.internal.tmf.core.timestamp.TmfSecondTimestamp; /** * A generic timestamp implementation. The timestamp is represented by the tuple -- 2.34.1