Fix for supplementary comments on TmftimestampFormat implementation

Change-Id: I46acc468c064d76cf301618fa47377820d17262f
Signed-off-by: Francois Chouinard <fchouinard@gmail.com>
Reviewed-on: https://git.eclipse.org/r/8435
Tested-by: Hudson CI

diff --git a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfSimpleTimestampTest.java b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfSimpleTimestampTest.java
index 292f227606b7417711be0e5d6918b9c612a5f847..84b3bba2052d06bb3590d8583273b279e2ace361 100644 (file)
--- a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfSimpleTimestampTest.java
+++ b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfSimpleTimestampTest.java
@@ -229,9 +229,9 @@ public class TmfSimpleTimestampTest extends TestCase {
      *
      */
     public void testToString() {
-        assertEquals("toString", "00:00:00.000_000_000", ts0.toString());
-        assertEquals("toString", "03:25:45.000_000_000", ts1.toString());
-        assertEquals("toString", "23:39:26.000_000_000", ts2.toString());
+        assertEquals("toString", "00:00:00.000 000 000", ts0.toString());
+        assertEquals("toString", "03:25:45.000 000 000", ts1.toString());
+        assertEquals("toString", "23:39:26.000 000 000", ts2.toString());
     }
 
     // ------------------------------------------------------------------------

diff --git a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfTimestampTest.java b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfTimestampTest.java
index 44acb134c7ece86cb8e43a31b9b3b6e7819532b1..d4a842788572c879459c0cbe4033afac1d321004 100644 (file)
--- a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfTimestampTest.java
+++ b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfTimestampTest.java
@@ -293,20 +293,20 @@ public class TmfTimestampTest extends TestCase {
      *
      */
     public void testToStringDefault() {
-        assertEquals("toString", "00:00:00.000_000_000", ts0.toString());
-        assertEquals("toString", "03:25:45.000_000_000", ts1.toString());
-        assertEquals("toString", "00:20:34.500_000_000", ts2.toString());
-        assertEquals("toString", "06:55:00.000_000_000", ts3.toString());
+        assertEquals("toString", "00:00:00.000 000 000", ts0.toString());
+        assertEquals("toString", "03:25:45.000 000 000", ts1.toString());
+        assertEquals("toString", "00:20:34.500 000 000", ts2.toString());
+        assertEquals("toString", "06:55:00.000 000 000", ts3.toString());
     }
 
     /**
     *
     */
    public void testToStringInterval() {
-       assertEquals("toString", "000.000_000_000", ts0.toString(TmfTimestampFormat.getDefaulIntervalFormat()));
-       assertEquals("toString", "12345.000_000_000", ts1.toString(TmfTimestampFormat.getDefaulIntervalFormat()));
-       assertEquals("toString", "1234.500_000_000", ts2.toString(TmfTimestampFormat.getDefaulIntervalFormat()));
-       assertEquals("toString", "1234500.000_000_000", ts3.toString(TmfTimestampFormat.getDefaulIntervalFormat()));
+       assertEquals("toString", "000.000 000 000", ts0.toString(TmfTimestampFormat.getDefaulIntervalFormat()));
+       assertEquals("toString", "12345.000 000 000", ts1.toString(TmfTimestampFormat.getDefaulIntervalFormat()));
+       assertEquals("toString", "1234.500 000 000", ts2.toString(TmfTimestampFormat.getDefaulIntervalFormat()));
+       assertEquals("toString", "1234500.000 000 000", ts3.toString(TmfTimestampFormat.getDefaulIntervalFormat()));
    }
 
     // ------------------------------------------------------------------------

diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/ITmfTimestamp.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/ITmfTimestamp.java
index f9689a505d85ae50c3f1a846350f44f1248c819d..33db5a4ccc278cdd78a5027cdadbcb2b55f756e2 100644 (file)
--- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/ITmfTimestamp.java
+++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/ITmfTimestamp.java
@@ -44,25 +44,25 @@ public interface ITmfTimestamp extends Comparable<ITmfTimestamp> {
      * The millisecond scale factor (10e0)
      * @since 2.0
      */
-    public int SECOND_SCALE = 0;
+    public static final int SECOND_SCALE = 0;
 
     /**
      * The millisecond scale factor (10e-3)
      * @since 2.0
      */
-    public int MILLISECOND_SCALE = -3;
+    public static final int MILLISECOND_SCALE = -3;
 
     /**
      * The microsecond scale factor (10e-6)
      * @since 2.0
      */
-    public int MICROSECOND_SCALE = -6;
+    public static final int MICROSECOND_SCALE = -6;
 
     /**
      * The nanosecond scale factor (10e-9)
      * @since 2.0
      */
-    public int NANOSECOND_SCALE = -9;
+    public static final int NANOSECOND_SCALE = -9;
 
     // ------------------------------------------------------------------------
     // Getters

diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfTimestamp.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfTimestamp.java
index f23b91879048cb748ed2e01f72f74f703d414df4..37b74b50d2b9025d43847f40dc0c6d75e6bb175e 100644 (file)
--- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfTimestamp.java
+++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfTimestamp.java
@@ -17,8 +17,8 @@ package org.eclipse.linuxtools.tmf.core.event;
 
 /**
  * A generic timestamp implementation. The timestamp is represented by the
- * tuple { value, scale, precision }. By default, timestamps are in the
- * nanosecond scale.
+ * tuple { value, scale, precision }. By default, timestamps are scaled in
+ * seconds.
  *
  * @version 1.1
  * @author Francois Chouinard
@@ -51,7 +51,7 @@ public class TmfTimestamp implements ITmfTimestamp, Cloneable {
      * A more practical definition of "end of time"
      * @since 2.0
      */
-    public static final ITmfTimestamp PROJECT_IS_CANCELLED = BIG_CRUNCH;
+    public static final ITmfTimestamp PROJECT_IS_CANNED = BIG_CRUNCH;
 
     /**
      * Zero
@@ -64,7 +64,7 @@ public class TmfTimestamp implements ITmfTimestamp, Cloneable {
     // ------------------------------------------------------------------------
 
     /**
-     * The timestamp raw value (mantissa) in nanoseconds
+     * The timestamp raw value (mantissa)
      */
     private long fValue;
 

diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfTimestampFormat.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfTimestampFormat.java
index 1e271e376dfd169afa79bd3b18eb9289af342d5e..dac4ee3a5dffd4966ac437ddf92b2f4511c23e97 100644 (file)
--- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfTimestampFormat.java
+++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfTimestampFormat.java
@@ -188,12 +188,12 @@ public class TmfTimestampFormat extends SimpleDateFormat {
     /**
      * The default timestamp pattern
      */
-    public static final String DEFAULT_TIME_PATTERN = "HH:mm:ss.SSS_CCC_NNN"; //$NON-NLS-1$
+    public static final String DEFAULT_TIME_PATTERN = "HH:mm:ss.SSS CCC NNN"; //$NON-NLS-1$
 
     /**
      * The LTTng 0.x legacy timestamp format
      */
-    public static final String DEFAULT_INTERVAL_PATTERN = "TTT.SSS_CCC_NNN"; //$NON-NLS-1$
+    public static final String DEFAULT_INTERVAL_PATTERN = "TTT.SSS CCC NNN"; //$NON-NLS-1$
 
     // Fractions of seconds supported patterns
     private static final String DOT_RE = "\\.";                 //$NON-NLS-1$

diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/properties/TmfTimePreferences.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/properties/TmfTimePreferences.java
index 15c6ca857f80b749bceccf026116c3437a17f57d..4cbe4b6581f97d566b1ba04c3ad5c7c7d200ced4 100644 (file)
--- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/properties/TmfTimePreferences.java
+++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/properties/TmfTimePreferences.java
@@ -53,8 +53,8 @@ public class TmfTimePreferences {
     static final String TIME_NO_FMT      = "";                   //$NON-NLS-1$
 
     static final String SUBSEC_MILLI_FMT = "SSS";                //$NON-NLS-1$
-    static final String SUBSEC_MICRO_FMT = "SSS_CCC";            //$NON-NLS-1$
-    static final String SUBSEC_NANO_FMT  = "SSS_CCC_NNN";        //$NON-NLS-1$
+    static final String SUBSEC_MICRO_FMT = "SSS CCC";            //$NON-NLS-1$
+    static final String SUBSEC_NANO_FMT  = "SSS CCC NNN";        //$NON-NLS-1$
     static final String SUBSEC_NO_FMT    = "";                   //$NON-NLS-1$
 
     static final String DELIMITER_NONE      = "";    //$NON-NLS-1$
@@ -97,7 +97,7 @@ public class TmfTimePreferences {
         fPreferenceStore.setDefault(TmfTimePreferences.SUBSEC, SUBSEC_NANO_FMT);
         fPreferenceStore.setDefault(TmfTimePreferences.DATE_DELIMITER, DELIMITER_DASH);
         fPreferenceStore.setDefault(TmfTimePreferences.TIME_DELIMITER, DELIMITER_COLON);
-        fPreferenceStore.setDefault(TmfTimePreferences.SSEC_DELIMITER, DELIMITER_UNDERLINE);
+        fPreferenceStore.setDefault(TmfTimePreferences.SSEC_DELIMITER, DELIMITER_SPACE);
 
         // Create the singleton and initialize format preferences
         getInstance();
@@ -214,7 +214,7 @@ public class TmfTimePreferences {
     void updatePatterns() {
         String dateFmt = fDateFormat.replaceAll("-", fDateFieldSep); //$NON-NLS-1$
         String timeFmt = fTimeFormat.replaceAll(":", fTimeFieldSep); //$NON-NLS-1$
-        String ssecFmt = fSSecFormat.replaceAll("_", fSSecFieldSep); //$NON-NLS-1$
+        String ssecFmt = fSSecFormat.replaceAll(" ", fSSecFieldSep); //$NON-NLS-1$
 
         fTimestampPattern = dateFmt + timeFmt + "." + ssecFmt; //$NON-NLS-1$
         fIntervalPattern = "TTT." + ssecFmt; //$NON-NLS-1$
@@ -225,7 +225,7 @@ public class TmfTimePreferences {
         setSSecFormat(TmfTimePreferences.SUBSEC_NANO_FMT);
         setDateFieldSep(TmfTimePreferences.DELIMITER_DASH);
         setTimeFieldSep(TmfTimePreferences.DELIMITER_COLON);
-        setSSecFieldSep(TmfTimePreferences.DELIMITER_UNDERLINE);
+        setSSecFieldSep(TmfTimePreferences.DELIMITER_SPACE);
         updatePatterns();
     }
 

diff --git a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/properties/TmfTimestampFormatPage.java b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/properties/TmfTimestampFormatPage.java
index 29691a539929d87400289e11aa1870374318c5b1..e575ed23dd2bd1aa8206057ba070567fc5ef8891 100644 (file)
--- a/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/properties/TmfTimestampFormatPage.java
+++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/properties/TmfTimestampFormatPage.java
@@ -250,6 +250,15 @@ public class TmfTimestampFormatPage extends PreferencePage implements IWorkbench
         displayExample();
     }
 
+    /* (non-Javadoc)
+     * @see org.eclipse.jface.preference.PreferencePage#performOk()
+     */
+    @Override
+    public boolean performOk() {
+        performApply();
+        return super.performOk();
+    }
+
     // ------------------------------------------------------------------------
     // SelectionListener
     // ------------------------------------------------------------------------