From d187a562870b5cc6163436f9ba88648c687d84aa Mon Sep 17 00:00:00 2001 From: Patrick Tasse Date: Mon, 6 Jun 2016 14:10:14 -0400 Subject: [PATCH] doc: Bug 495211: Update TmfTimestampFormat reference API Update TmfTimestampFormat.html link to external user guide location. Update pom.xml to copy the reference directory in deploy-doc profile. Update external Javadoc links to Java 8. Change-Id: I6fc2e12ca4c0b8aac8253d0f805ad3c5d76dd8c7 Signed-off-by: Patrick Tasse Reviewed-on: https://git.eclipse.org/r/74716 Reviewed-by: Hudson CI --- .../doc/User-Guide.mediawiki | 9 +- doc/org.eclipse.tracecompass.doc.user/pom.xml | 5 +- .../reference/api/allclasses-frame.html | 7 +- .../reference/api/allclasses-noframe.html | 7 +- .../reference/api/constant-values.html | 19 +- .../reference/api/deprecated-list.html | 30 ++ .../reference/api/help-doc.html | 19 +- .../reference/api/index.html | 2 +- .../core/timestamp/TmfTimestampFormat.html | 402 +++++++++++------- .../tmf/core/timestamp/package-frame.html | 5 +- .../tmf/core/timestamp/package-summary.html | 15 +- .../reference/api/script.js | 30 ++ .../reference/api/serialized-form.html | 57 ++- .../reference/api/stylesheet.css | 342 +++++++++------ .../CustomTxtParserInputWizardPage.java | 2 +- 15 files changed, 616 insertions(+), 335 deletions(-) create mode 100644 doc/org.eclipse.tracecompass.doc.user/reference/api/deprecated-list.html create mode 100644 doc/org.eclipse.tracecompass.doc.user/reference/api/script.js diff --git a/doc/org.eclipse.tracecompass.doc.user/doc/User-Guide.mediawiki b/doc/org.eclipse.tracecompass.doc.user/doc/User-Guide.mediawiki index b417deb209..3bd4dd97a4 100644 --- a/doc/org.eclipse.tracecompass.doc.user/doc/User-Guide.mediawiki +++ b/doc/org.eclipse.tracecompass.doc.user/doc/User-Guide.mediawiki @@ -591,7 +591,7 @@ The Events editor can be closed, disposing a trace. When this is done, all the v Searching and filtering of events in the table can be performed by entering matching conditions in one or multiple columns in the header row (the first row below the column header). -To apply a matching condition to a specific column, click on the column's header row cell, type in a [http://download.oracle.com/javase/7/docs/api/java/util/regex/Pattern.html regular expression]. You can also enter a simple text string and it will be automatically be replaced with a 'contains' regular expression. +To apply a matching condition to a specific column, click on the column's header row cell, type in a [http://docs.oracle.com/javase/8/docs/api/java/util/regex/Pattern.html regular expression]. You can also enter a simple text string and it will be automatically be replaced with a 'contains' regular expression. Press the '''Enter''' key to apply the condition as a search condition. It will be added to any existing search conditions. @@ -861,12 +861,12 @@ Fill out the first wizard page with the following information: * '''Category:''' Enter a category name for the trace type. * '''Trace type:''' Enter a name for the trace type, which is also the name of the custom parser. * '''Time Stamp format:''' Enter the date and time pattern that will be used to output the Time Stamp.
-Note: information about date and time patterns can be found here: [../reference/api/org/eclipse/tracecompass/tmf/core/timestamp/TmfTimestampFormat.html TmfTimestampFormat] +Note: information about date and time patterns can be found here: [http://archive.eclipse.org/tracecompass/doc/stable/org.eclipse.tracecompass.doc.user/reference/api/org/eclipse/tracecompass/tmf/core/timestamp/TmfTimestampFormat.html TmfTimestampFormat] Click the '''Add next line''', '''Add child line''' or '''Remove line''' buttons to create a new line of input or delete it. For each line of input, enter the following information: * '''Regular expression:''' Enter a regular expression that should match the input line in the log, using capturing groups to extract the data.
-Note: information about date and time patterns can be found here: [http://java.sun.com/javase/6/docs/api/java/util/regex/Pattern.html] +Note: information about regular expression patterns can be found here: [http://docs.oracle.com/javase/8/docs/api/java/util/regex/Pattern.html] * '''Cardinality:''' Enter the minimum and maximum number of lines matching this line's regular expression that must be found in the log. At least the minimum number of lines must be found before the parser will consider the next line. Child lines will always be considered first. @@ -929,8 +929,7 @@ Fill out the first wizard page with the following information: * '''Category:''' Enter a category name for the trace type. * '''Trace type:''' Enter a name for the trace type, which is also the name of the custom parser. * '''Time Stamp format:''' Enter the date and time pattern that will be used to output the Time Stamp.
- -Note: information about date and time patterns can be found here: [../reference/api/org/eclipse/tracecompass/tmf/core/timestamp/TmfTimestampFormat.html TmfTimestampFormat] +Note: information about date and time patterns can be found here: [http://archive.eclipse.org/tracecompass/doc/stable/org.eclipse.tracecompass.doc.user/reference/api/org/eclipse/tracecompass/tmf/core/timestamp/TmfTimestampFormat.html TmfTimestampFormat] Click the '''Add document element''' button to create a new document element and enter a name for the root-level document element of the XML file. diff --git a/doc/org.eclipse.tracecompass.doc.user/pom.xml b/doc/org.eclipse.tracecompass.doc.user/pom.xml index dffd581902..afbcdf0394 100644 --- a/doc/org.eclipse.tracecompass.doc.user/pom.xml +++ b/doc/org.eclipse.tracecompass.doc.user/pom.xml @@ -109,10 +109,13 @@ - + + + + diff --git a/doc/org.eclipse.tracecompass.doc.user/reference/api/allclasses-frame.html b/doc/org.eclipse.tracecompass.doc.user/reference/api/allclasses-frame.html index 071dd464a2..890136768f 100644 --- a/doc/org.eclipse.tracecompass.doc.user/reference/api/allclasses-frame.html +++ b/doc/org.eclipse.tracecompass.doc.user/reference/api/allclasses-frame.html @@ -2,13 +2,14 @@ - + All Classes - + + -

All Classes

+

All Classes

  • TmfTimestampFormat
    • diff --git a/doc/org.eclipse.tracecompass.doc.user/reference/api/allclasses-noframe.html b/doc/org.eclipse.tracecompass.doc.user/reference/api/allclasses-noframe.html index 204e0bb8a4..d2c9f795c7 100644 --- a/doc/org.eclipse.tracecompass.doc.user/reference/api/allclasses-noframe.html +++ b/doc/org.eclipse.tracecompass.doc.user/reference/api/allclasses-noframe.html @@ -2,13 +2,14 @@ - + All Classes - + + -

    All Classes

    +

    All Classes

    • TmfTimestampFormat
      • diff --git a/doc/org.eclipse.tracecompass.doc.user/reference/api/constant-values.html b/doc/org.eclipse.tracecompass.doc.user/reference/api/constant-values.html index e6f9587285..5c8327023b 100644 --- a/doc/org.eclipse.tracecompass.doc.user/reference/api/constant-values.html +++ b/doc/org.eclipse.tracecompass.doc.user/reference/api/constant-values.html @@ -2,15 +2,20 @@ - + Constant Field Values - + + @@ -30,7 +35,7 @@

      org.eclipse.*

      • - +
        @@ -41,14 +46,14 @@ +public static final String +public static final String diff --git a/doc/org.eclipse.tracecompass.doc.user/reference/api/deprecated-list.html b/doc/org.eclipse.tracecompass.doc.user/reference/api/deprecated-list.html new file mode 100644 index 0000000000..4a94f9c22e --- /dev/null +++ b/doc/org.eclipse.tracecompass.doc.user/reference/api/deprecated-list.html @@ -0,0 +1,30 @@ + + + + + +Deprecated List + + + + + + + +
        +

        Deprecated API

        +

        Contents

        +
        + + diff --git a/doc/org.eclipse.tracecompass.doc.user/reference/api/help-doc.html b/doc/org.eclipse.tracecompass.doc.user/reference/api/help-doc.html index 2641a37d2c..ca410e3511 100644 --- a/doc/org.eclipse.tracecompass.doc.user/reference/api/help-doc.html +++ b/doc/org.eclipse.tracecompass.doc.user/reference/api/help-doc.html @@ -2,15 +2,20 @@ - +API Help - + + @@ -81,6 +86,10 @@
      • +

        Deprecated API

        +

        The Deprecated API page lists all of the API that have been deprecated. A deprecated API is not recommended for use, generally due to improvements, and a replacement API is usually given. Deprecated APIs may be removed in future implementations.

        +
        • +

      • Prev/Next

        These links take you to the next or previous class, interface, package, or related page.

        • @@ -101,6 +110,6 @@

        The Constant Field Values page lists the static final fields and their values.

        -This help file applies to API documentation generated using the standard doclet. +This help file applies to API documentation generated using the standard doclet. diff --git a/doc/org.eclipse.tracecompass.doc.user/reference/api/index.html b/doc/org.eclipse.tracecompass.doc.user/reference/api/index.html index 2f47b741dc..470c6f1c55 100644 --- a/doc/org.eclipse.tracecompass.doc.user/reference/api/index.html +++ b/doc/org.eclipse.tracecompass.doc.user/reference/api/index.html @@ -2,7 +2,7 @@ - +Generated Documentation (Untitled)
        org.eclipse.tracecompass.tmf.core.timestamp.TmfTimestampFormat 
        Modifier and Type
        -public static final String DEFAULT_INTERVAL_PATTERN "TTT.SSS SSS SSS"
        -public static final String DEFAULT_TIME_PATTERN "HH:mm:ss.SSS SSS SSS"
        - + + + + + + + + + + + + + +
        Format Description Value Range Example -
        T The seconds since the epoch 0-9223372036 1332170682 +
        Td + The deciseconds since the epoch + 0-92233720368 + 13321706825 +
        Tc + The centiseconds since the epoch + 0-922337203685 + 133217068253 +
        Tm + The milliseconds since the epoch + 0-9223372036854 + 1332170682539 +
        Tu + The microseconds since the epoch + 0-9223372036854775 + 1332170682539677 +
        Tn + The nanoseconds since the epoch + 0-9223372036854775807 + 1332170682539677389
        S Millisecond N/A Not supported -
        W Week in month N/A @@ -105,17 +141,17 @@ extends +
        Format Description Value Range Example
        S - Fraction of second + Fraction of second (or unit of second) 0-999999999 123456789 -
        C Microseconds in ms 0-999 @@ -163,33 +199,42 @@ extends +
        Date and Time Pattern Result
        "yyyy-MM-dd HH:mm:ss.SSS.SSS.SSS" 2012-03-19 11:24:42.539.677.389 -
        "yyyy-MM-dd HH:mm:ss.SSS.SSS" 2012-03-19 11:24:42.539.677
        "yyyy-D HH:mm:ss.SSS.SSS" 2012-79 11:24:42.539.677 -
        "ss,SSSS" 42,5397
        "T.SSS SSS SSS" 1332170682.539 677 389 -
        "T" 1332170682 +
        "Tm.SSSSSS" + 1332170682539.677389 +
        "Tn" + 1332170682539677389

    -
    Since:
    -
    2.0
    -
    See Also:
    Serialized Form
    +
    +
    Author:
    +
    Francois Chouinard
    +
    See Also:
    +
    Serialized Form
    +
@@ -198,89 +243,89 @@ extends @@ -377,41 +424,47 @@ extends
    -
  • +

  • Constructor Detail

    - + - +

    • TmfTimestampFormat

      -
      public TmfTimestampFormat(String pattern)
      +
      public TmfTimestampFormat(String pattern)
      The normal constructor
      -
      Parameters:
      pattern - the format pattern
      +
      +
      Parameters:
      +
      pattern - the format pattern
      +
    - +

    • TmfTimestampFormat

      -
      public TmfTimestampFormat(String pattern,
-                  TimeZone timeZone)
      +
      public TmfTimestampFormat(String pattern,
+                          TimeZone timeZone)
      The full constructor
      -
      Parameters:
      pattern - the format pattern
      timeZone - the time zone
      Since:
      -
      2.1
      +
      +
      Parameters:
      +
      pattern - the format pattern
      +
      timeZone - the time zone
      +
    - +

    • TmfTimestampFormat

      -
      public TmfTimestampFormat(String pattern,
-                  TimeZone timeZone,
-                  Locale locale)
      +
      public TmfTimestampFormat(String pattern,
+                          TimeZone timeZone,
+                          Locale locale)
      The fuller constructor
      -
      Parameters:
      pattern - the format pattern
      timeZone - the time zone
      locale - the locale
      Since:
      -
      3.2
      +
      +
      Parameters:
      +
      pattern - the format pattern
      +
      timeZone - the time zone
      +
      locale - the locale
      +
    - +
      @@ -467,115 +530,136 @@ extends TmfTimestampFormat other)
      The copy constructor
      -
      Parameters:
      other - the other format pattern
      +
      +
      Parameters:
      +
      other - the other format pattern
      +
    -
  • +

  • Method Detail

    - +
    • -

      applyPattern

      -
      public void applyPattern(String pattern)
      -
      -
      Overrides:
      -
      applyPattern in class SimpleDateFormat
      -
      +

      updateDefaultFormats

      +
      public static void updateDefaultFormats()
      +
      Update the default time and default interval formats
    - +
    • -

      format

      -
      public String format(long value)
      -
      Format the timestamp according to its pattern.
      -
      Parameters:
      value - the timestamp value to format (in ns)
      -
      Returns:
      the formatted timestamp
      +

      getDefaulTimeFormat

      +
      public static TmfTimestampFormat getDefaulTimeFormat()
      +
      +
      Returns:
      +
      the default time format pattern
      +
    - +

    • getDefaulIntervalFormat

      public static TmfTimestampFormat getDefaulIntervalFormat()
      -
      Returns:
      the default interval format pattern
      +
      +
      Returns:
      +
      the default interval format pattern
      +
    - + - +
    • -

      parseValue

      -
      public long parseValue(String source)
-                throws ParseException
      -
      Parse a string according to the format pattern
      -
      Parameters:
      source - the source string
      -
      Returns:
      the parsed value (in ns)
      -
      Throws:
      -
      ParseException - if the string has an invalid format
      +

      toPattern

      +
      public String toPattern()
      +
      +
      Overrides:
      +
      toPattern in class SimpleDateFormat
      +
    - +
    • -

      parseValue

      -
      public long parseValue(String source,
-              long ref)
-                throws ParseException
      -
      Parse a string according to the format pattern
      -
      Parameters:
      source - the source string
      ref - the reference (base) time (in ns)
      -
      Returns:
      the parsed value (in ns)
      -
      Throws:
      -
      ParseException - if the string has an invalid format
      +

      format

      +
      public String format(long value)
      +
      Format the timestamp according to its pattern.
      +
      +
      Parameters:
      +
      value - the timestamp value to format (in ns)
      +
      Returns:
      +
      the formatted timestamp
      +
    - +
    • -

      toPattern

      -
      public String toPattern()
      +

      parseValue

      +
      public long parseValue(String source,
+                       long ref)
+                throws ParseException
      +
      Parse a string according to the format pattern
      -
      Overrides:
      -
      toPattern in class SimpleDateFormat
      +
      Parameters:
      +
      source - the source string
      +
      ref - the reference (base) time (in ns)
      +
      Returns:
      +
      the parsed value (in ns)
      +
      Throws:
      +
      ParseException - if the string has an invalid format
    - +
    • -

      updateDefaultFormats

      -
      public static void updateDefaultFormats()
      -
      Since:
      -
      2.1
      +

      parseValue

      +
      public long parseValue(String source)
+                throws ParseException
      +
      Parse a string according to the format pattern
      +
      +
      Parameters:
      +
      source - the source string
      +
      Returns:
      +
      the parsed value (in ns)
      +
      Throws:
      +
      ParseException - if the string has an invalid format
      +
    • diff --git a/doc/org.eclipse.tracecompass.doc.user/reference/api/org/eclipse/tracecompass/tmf/core/timestamp/package-frame.html b/doc/org.eclipse.tracecompass.doc.user/reference/api/org/eclipse/tracecompass/tmf/core/timestamp/package-frame.html index 92b75265ce..735ff6cbf3 100644 --- a/doc/org.eclipse.tracecompass.doc.user/reference/api/org/eclipse/tracecompass/tmf/core/timestamp/package-frame.html +++ b/doc/org.eclipse.tracecompass.doc.user/reference/api/org/eclipse/tracecompass/tmf/core/timestamp/package-frame.html @@ -2,10 +2,11 @@ - + org.eclipse.tracecompass.tmf.core.timestamp - + +

    org.eclipse.tracecompass.tmf.core.timestamp

    diff --git a/doc/org.eclipse.tracecompass.doc.user/reference/api/org/eclipse/tracecompass/tmf/core/timestamp/package-summary.html b/doc/org.eclipse.tracecompass.doc.user/reference/api/org/eclipse/tracecompass/tmf/core/timestamp/package-summary.html index a53a153659..52ad82976b 100644 --- a/doc/org.eclipse.tracecompass.doc.user/reference/api/org/eclipse/tracecompass/tmf/core/timestamp/package-summary.html +++ b/doc/org.eclipse.tracecompass.doc.user/reference/api/org/eclipse/tracecompass/tmf/core/timestamp/package-summary.html @@ -2,15 +2,20 @@ - + org.eclipse.tracecompass.tmf.core.timestamp - + + @@ -23,7 +28,7 @@
    • - +
      diff --git a/doc/org.eclipse.tracecompass.doc.user/reference/api/script.js b/doc/org.eclipse.tracecompass.doc.user/reference/api/script.js new file mode 100644 index 0000000000..b346356931 --- /dev/null +++ b/doc/org.eclipse.tracecompass.doc.user/reference/api/script.js @@ -0,0 +1,30 @@ +function show(type) +{ + count = 0; + for (var key in methods) { + var row = document.getElementById(key); + if ((methods[key] & type) != 0) { + row.style.display = ''; + row.className = (count++ % 2) ? rowColor : altColor; + } + else + row.style.display = 'none'; + } + updateTabs(type); +} + +function updateTabs(type) +{ + for (var value in tabs) { + var sNode = document.getElementById(tabs[value][0]); + var spanNode = sNode.firstChild; + if (value == type) { + sNode.className = activeTableTab; + spanNode.innerHTML = tabs[value][1]; + } + else { + sNode.className = tableTab; + spanNode.innerHTML = "" + tabs[value][1] + ""; + } + } +} diff --git a/doc/org.eclipse.tracecompass.doc.user/reference/api/serialized-form.html b/doc/org.eclipse.tracecompass.doc.user/reference/api/serialized-form.html index fbc6d4cbb7..ae136552b8 100644 --- a/doc/org.eclipse.tracecompass.doc.user/reference/api/serialized-form.html +++ b/doc/org.eclipse.tracecompass.doc.user/reference/api/serialized-form.html @@ -2,15 +2,20 @@ - +Serialized Form - + + @@ -28,20 +33,18 @@
    • -

      Class org.eclipse.tracecompass.tmf.core.timestamp.TmfTimestampFormat extends SimpleDateFormat implements Serializable

      +

      Class org.eclipse.tracecompass.tmf.core.timestamp.TmfTimestampFormat extends SimpleDateFormat implements Serializable

      serialVersionUID:
      2835829763122454020L
        -
      • - - +

      • Serialized Fields

        • fPattern

          -
          String fPattern
          +
          String fPattern

        • fPatternDecimalSeparatorIndex

          @@ -53,23 +56,27 @@

        • fDateTimePattern

          -
          String fDateTimePattern
          +
          String fDateTimePattern

        • fSubSecPattern

          -
          String fSubSecPattern
          +
          String fSubSecPattern

        • fSupplPatterns

          -
          List<E> fSupplPatterns
          +
          List<E> fSupplPatterns
          +
          • +
        • +

          fUnitOfSeconds

          +
          long fUnitOfSeconds

        • fLocale

          -
          Locale fLocale
          +
          Locale fLocale

        • fSupplPatternLetters

          -
          String fSupplPatternLetters
          +
          String fSupplPatternLetters
          The supplementary pattern letters. Can be redefined by sub-classes to either override existing letters or augment the letter set. If so, the format() method must provide the (re-)implementation of the @@ -77,26 +84,32 @@

        • fSubSecPatternChars

          -
          String fSubSecPatternChars
          +
          String fSubSecPatternChars
          The sub-second pattern letters.
          -
          Since:
          -
          3.0

        • fDelimiterChars

          -
          String fDelimiterChars
          +
          String fDelimiterChars
          The optional sub-second delimiter characters.
          -
          Since:
          -
          3.0
          +
          • +
        • +

          fUnitOfSecondsMap

          +
          Map<K,V> fUnitOfSecondsMap
          +
          The map of optional unit of seconds suffix characters that can follow the + T pattern. The map value is the unit of seconds denominator.
          +
          +
          Since:
          +
          2.0
          +

        • fOpenBracket

          -
          String fOpenBracket
          +
          String fOpenBracket
          The open bracket symbol

        • fCloseBracket

          -
          String fCloseBracket
          +
          String fCloseBracket
          The closing bracket symbol
        diff --git a/doc/org.eclipse.tracecompass.doc.user/reference/api/stylesheet.css b/doc/org.eclipse.tracecompass.doc.user/reference/api/stylesheet.css index 0aeaa97fe0..98055b22d6 100644 --- a/doc/org.eclipse.tracecompass.doc.user/reference/api/stylesheet.css +++ b/doc/org.eclipse.tracecompass.doc.user/reference/api/stylesheet.css @@ -2,16 +2,19 @@ /* Overall document style */ + +@import url('resources/fonts/dejavu.css'); + body { background-color:#ffffff; color:#353833; - font-family:Arial, Helvetica, sans-serif; - font-size:76%; + font-family:'DejaVu Sans', Arial, Helvetica, sans-serif; + font-size:14px; margin:0; } a:link, a:visited { text-decoration:none; - color:#4c6b87; + color:#4A6782; } a:hover, a:focus { text-decoration:none; @@ -19,7 +22,7 @@ a:hover, a:focus { } a:active { text-decoration:none; - color:#4c6b87; + color:#4A6782; } a[name] { color:#353833; @@ -29,41 +32,51 @@ a[name]:hover { color:#353833; } pre { - font-size:1.3em; + font-family:'DejaVu Sans Mono', monospace; + font-size:14px; } h1 { - font-size:1.8em; + font-size:20px; } h2 { - font-size:1.5em; + font-size:18px; } h3 { - font-size:1.4em; + font-size:16px; + font-style:italic; } h4 { - font-size:1.3em; + font-size:13px; } h5 { - font-size:1.2em; + font-size:12px; } h6 { - font-size:1.1em; + font-size:11px; } ul { list-style-type:disc; } code, tt { - font-size:1.2em; + font-family:'DejaVu Sans Mono', monospace; + font-size:14px; + padding-top:4px; + margin-top:8px; + line-height:1.4em; } dt code { - font-size:1.2em; + font-family:'DejaVu Sans Mono', monospace; + font-size:14px; + padding-top:4px; } table tr td dt code { - font-size:1.2em; + font-family:'DejaVu Sans Mono', monospace; + font-size:14px; vertical-align:top; + padding-top:4px; } sup { - font-size:.6em; + font-size:8px; } /* Document title and Copyright styles @@ -76,9 +89,9 @@ Document title and Copyright styles .aboutLanguage { float:right; padding:0px 21px; - font-size:.8em; + font-size:11px; z-index:200; - margin-top:-7px; + margin-top:-9px; } .legalCopy { margin-left:.5em; @@ -92,9 +105,6 @@ Document title and Copyright styles } .tab { background-color:#0066FF; - background-image:url(resources/titlebar.gif); - background-position:left top; - background-repeat:no-repeat; color:#ffffff; padding:8px; width:5em; @@ -104,17 +114,15 @@ Document title and Copyright styles Navigation bar styles */ .bar { - background-image:url(resources/background.gif); - background-repeat:repeat-x; + background-color:#4D7A97; color:#FFFFFF; padding:.8em .5em .4em .8em; height:auto;/*height:1.8em;*/ - font-size:1em; + font-size:11px; margin:0; } .topNav { - background-image:url(resources/background.gif); - background-repeat:repeat-x; + background-color:#4D7A97; color:#FFFFFF; float:left; padding:0; @@ -123,11 +131,11 @@ Navigation bar styles height:2.8em; padding-top:10px; overflow:hidden; + font-size:12px; } .bottomNav { margin-top:10px; - background-image:url(resources/background.gif); - background-repeat:repeat-x; + background-color:#4D7A97; color:#FFFFFF; float:left; padding:0; @@ -136,18 +144,20 @@ Navigation bar styles height:2.8em; padding-top:10px; overflow:hidden; + font-size:12px; } .subNav { background-color:#dee3e9; - border-bottom:1px solid #9eadc0; float:left; width:100%; overflow:hidden; + font-size:12px; } .subNav div { clear:left; float:left; padding:0 0 5px 6px; + text-transform:uppercase; } ul.navList, ul.subNavList { float:left; @@ -157,27 +167,33 @@ ul.navList, ul.subNavList { ul.navList li{ list-style:none; float:left; - padding:3px 6px; + padding: 5px 6px; + text-transform:uppercase; } ul.subNavList li{ list-style:none; float:left; - font-size:90%; } .topNav a:link, .topNav a:active, .topNav a:visited, .bottomNav a:link, .bottomNav a:active, .bottomNav a:visited { color:#FFFFFF; text-decoration:none; + text-transform:uppercase; } .topNav a:hover, .bottomNav a:hover { text-decoration:none; color:#bb7a2a; + text-transform:uppercase; } .navBarCell1Rev { - background-image:url(resources/tab.gif); - background-color:#a88834; - color:#FFFFFF; + background-color:#F8981D; + color:#253441; margin: auto 5px; - border:1px solid #c9aa44; +} +.skipNav { + position:absolute; + top:auto; + left:-9999px; + overflow:hidden; } /* Page header and footer styles @@ -191,8 +207,11 @@ Page header and footer styles margin:10px; position:relative; } +.indexHeader span{ + margin-right:15px; +} .indexHeader h1 { - font-size:1.3em; + font-size:13px; } .title { color:#2c4557; @@ -202,7 +221,7 @@ Page header and footer styles margin:5px 0 0 0; } .header ul { - margin:0 0 25px 0; + margin:0 0 15px 0; padding:0; } .footer ul { @@ -210,24 +229,22 @@ Page header and footer styles } .header ul li, .footer ul li { list-style:none; - font-size:1.2em; + font-size:13px; } /* Heading styles */ div.details ul.blockList ul.blockList ul.blockList li.blockList h4, div.details ul.blockList ul.blockList ul.blockListLast li.blockList h4 { background-color:#dee3e9; - border-top:1px solid #9eadc0; - border-bottom:1px solid #9eadc0; + border:1px solid #d0d9e0; margin:0 0 6px -8px; - padding:2px 5px; + padding:7px 5px; } ul.blockList ul.blockList ul.blockList li.blockList h3 { background-color:#dee3e9; - border-top:1px solid #9eadc0; - border-bottom:1px solid #9eadc0; + border:1px solid #d0d9e0; margin:0 0 6px -8px; - padding:2px 5px; + padding:7px 5px; } ul.blockList ul.blockList li.blockList h3 { padding:0; @@ -247,10 +264,10 @@ Page layout container styles .indexContainer { margin:10px; position:relative; - font-size:1.0em; + font-size:12px; } .indexContainer h2 { - font-size:1.1em; + font-size:13px; padding:0 0 3px 0; } .indexContainer ul { @@ -259,15 +276,18 @@ Page layout container styles } .indexContainer ul li { list-style:none; + padding-top:2px; } .contentContainer .description dl dt, .contentContainer .details dl dt, .serializedFormContainer dl dt { - font-size:1.1em; + font-size:12px; font-weight:bold; margin:10px 0 0 0; color:#4E4E4E; } .contentContainer .description dl dd, .contentContainer .details dl dd, .serializedFormContainer dl dd { - margin:10px 0 10px 20px; + margin:5px 0 10px 0px; + font-size:14px; + font-family:'DejaVu Sans Mono',monospace; } .serializedFormContainer dl.nameValue dt { margin-left:1px; @@ -306,25 +326,24 @@ ul.blockList, ul.blockListLast { } ul.blockList li.blockList, ul.blockListLast li.blockList { list-style:none; - margin-bottom:25px; + margin-bottom:15px; + line-height:1.4; } ul.blockList ul.blockList li.blockList, ul.blockList ul.blockListLast li.blockList { padding:0px 20px 5px 10px; - border:1px solid #9eadc0; - background-color:#f9f9f9; + border:1px solid #ededed; + background-color:#f8f8f8; } ul.blockList ul.blockList ul.blockList li.blockList, ul.blockList ul.blockList ul.blockListLast li.blockList { padding:0 0 5px 8px; background-color:#ffffff; - border:1px solid #9eadc0; - border-top:none; + border:none; } ul.blockList ul.blockList ul.blockList ul.blockList li.blockList { margin-left:0; padding-left:0; padding-bottom:15px; border:none; - border-bottom:1px solid #9eadc0; } ul.blockList ul.blockList ul.blockList ul.blockList li.blockListLast { list-style:none; @@ -338,107 +357,155 @@ table tr td dl, table tr td dl dt, table tr td dl dd { /* Table styles */ -.contentContainer table, .classUseContainer table, .constantValuesContainer table { - border-bottom:1px solid #9eadc0; - width:100%; -} -.contentContainer ul li table, .classUseContainer ul li table, .constantValuesContainer ul li table { +.overviewSummary, .memberSummary, .typeSummary, .useSummary, .constantsSummary, .deprecatedSummary { width:100%; + border-left:1px solid #EEE; + border-right:1px solid #EEE; + border-bottom:1px solid #EEE; } -.contentContainer .description table, .contentContainer .details table { - border-bottom:none; -} -.contentContainer ul li table th.colOne, .contentContainer ul li table th.colFirst, .contentContainer ul li table th.colLast, .classUseContainer ul li table th, .constantValuesContainer ul li table th, .contentContainer ul li table td.colOne, .contentContainer ul li table td.colFirst, .contentContainer ul li table td.colLast, .classUseContainer ul li table td, .constantValuesContainer ul li table td{ - vertical-align:top; - padding-right:20px; -} -.contentContainer ul li table th.colLast, .classUseContainer ul li table th.colLast,.constantValuesContainer ul li table th.colLast, -.contentContainer ul li table td.colLast, .classUseContainer ul li table td.colLast,.constantValuesContainer ul li table td.colLast, -.contentContainer ul li table th.colOne, .classUseContainer ul li table th.colOne, -.contentContainer ul li table td.colOne, .classUseContainer ul li table td.colOne { - padding-right:3px; +.overviewSummary, .memberSummary { + padding:0px; } -.overviewSummary caption, .packageSummary caption, .contentContainer ul.blockList li.blockList caption, .summary caption, .classUseContainer caption, .constantValuesContainer caption { +.overviewSummary caption, .memberSummary caption, .typeSummary caption, +.useSummary caption, .constantsSummary caption, .deprecatedSummary caption { position:relative; text-align:left; background-repeat:no-repeat; - color:#FFFFFF; + color:#253441; font-weight:bold; clear:none; overflow:hidden; padding:0px; + padding-top:10px; + padding-left:1px; margin:0px; -} -caption a:link, caption a:hover, caption a:active, caption a:visited { + white-space:pre; +} +.overviewSummary caption a:link, .memberSummary caption a:link, .typeSummary caption a:link, +.useSummary caption a:link, .constantsSummary caption a:link, .deprecatedSummary caption a:link, +.overviewSummary caption a:hover, .memberSummary caption a:hover, .typeSummary caption a:hover, +.useSummary caption a:hover, .constantsSummary caption a:hover, .deprecatedSummary caption a:hover, +.overviewSummary caption a:active, .memberSummary caption a:active, .typeSummary caption a:active, +.useSummary caption a:active, .constantsSummary caption a:active, .deprecatedSummary caption a:active, +.overviewSummary caption a:visited, .memberSummary caption a:visited, .typeSummary caption a:visited, +.useSummary caption a:visited, .constantsSummary caption a:visited, .deprecatedSummary caption a:visited { color:#FFFFFF; } -.overviewSummary caption span, .packageSummary caption span, .contentContainer ul.blockList li.blockList caption span, .summary caption span, .classUseContainer caption span, .constantValuesContainer caption span { +.overviewSummary caption span, .memberSummary caption span, .typeSummary caption span, +.useSummary caption span, .constantsSummary caption span, .deprecatedSummary caption span { white-space:nowrap; - padding-top:8px; - padding-left:8px; - display:block; + padding-top:5px; + padding-left:12px; + padding-right:12px; + padding-bottom:7px; + display:inline-block; float:left; - background-image:url(resources/titlebar.gif); - height:18px; + background-color:#F8981D; + border: none; + height:16px; } -.overviewSummary .tabEnd, .packageSummary .tabEnd, .contentContainer ul.blockList li.blockList .tabEnd, .summary .tabEnd, .classUseContainer .tabEnd, .constantValuesContainer .tabEnd { - width:10px; - background-image:url(resources/titlebar_end.gif); - background-repeat:no-repeat; - background-position:top right; - position:relative; +.memberSummary caption span.activeTableTab span { + white-space:nowrap; + padding-top:5px; + padding-left:12px; + padding-right:12px; + margin-right:3px; + display:inline-block; float:left; + background-color:#F8981D; + height:16px; } -ul.blockList ul.blockList li.blockList table { - margin:0 0 12px 0px; - width:100%; +.memberSummary caption span.tableTab span { + white-space:nowrap; + padding-top:5px; + padding-left:12px; + padding-right:12px; + margin-right:3px; + display:inline-block; + float:left; + background-color:#4D7A97; + height:16px; +} +.memberSummary caption span.tableTab, .memberSummary caption span.activeTableTab { + padding-top:0px; + padding-left:0px; + padding-right:0px; + background-image:none; + float:none; + display:inline; } -.tableSubHeadingColor { - background-color: #EEEEFF; +.overviewSummary .tabEnd, .memberSummary .tabEnd, .typeSummary .tabEnd, +.useSummary .tabEnd, .constantsSummary .tabEnd, .deprecatedSummary .tabEnd { + display:none; + width:5px; + position:relative; + float:left; + background-color:#F8981D; } -.altColor { - background-color:#eeeeef; +.memberSummary .activeTableTab .tabEnd { + display:none; + width:5px; + margin-right:3px; + position:relative; + float:left; + background-color:#F8981D; } -.rowColor { - background-color:#ffffff; +.memberSummary .tableTab .tabEnd { + display:none; + width:5px; + margin-right:3px; + position:relative; + background-color:#4D7A97; + float:left; + } -.overviewSummary td, .packageSummary td, .contentContainer ul.blockList li.blockList td, .summary td, .classUseContainer td, .constantValuesContainer td { +.overviewSummary td, .memberSummary td, .typeSummary td, +.useSummary td, .constantsSummary td, .deprecatedSummary td { text-align:left; - padding:3px 3px 3px 7px; + padding:0px 0px 12px 10px; +} +th.colOne, th.colFirst, th.colLast, .useSummary th, .constantsSummary th, +td.colOne, td.colFirst, td.colLast, .useSummary td, .constantsSummary td{ + vertical-align:top; + padding-right:0px; + padding-top:8px; + padding-bottom:3px; } -th.colFirst, th.colLast, th.colOne, .constantValuesContainer th { +th.colFirst, th.colLast, th.colOne, .constantsSummary th { background:#dee3e9; - border-top:1px solid #9eadc0; - border-bottom:1px solid #9eadc0; text-align:left; - padding:3px 3px 3px 7px; -} -td.colOne a:link, td.colOne a:active, td.colOne a:visited, td.colOne a:hover, td.colFirst a:link, td.colFirst a:active, td.colFirst a:visited, td.colFirst a:hover, td.colLast a:link, td.colLast a:active, td.colLast a:visited, td.colLast a:hover, .constantValuesContainer td a:link, .constantValuesContainer td a:active, .constantValuesContainer td a:visited, .constantValuesContainer td a:hover { - font-weight:bold; + padding:8px 3px 3px 7px; } td.colFirst, th.colFirst { - border-left:1px solid #9eadc0; white-space:nowrap; + font-size:13px; } td.colLast, th.colLast { - border-right:1px solid #9eadc0; + font-size:13px; } td.colOne, th.colOne { - border-right:1px solid #9eadc0; - border-left:1px solid #9eadc0; + font-size:13px; +} +.overviewSummary td.colFirst, .overviewSummary th.colFirst, +.useSummary td.colFirst, .useSummary th.colFirst, +.overviewSummary td.colOne, .overviewSummary th.colOne, +.memberSummary td.colFirst, .memberSummary th.colFirst, +.memberSummary td.colOne, .memberSummary th.colOne, +.typeSummary td.colFirst{ + width:25%; + vertical-align:top; } -table.overviewSummary { - padding:0px; - margin-left:0px; +td.colOne a:link, td.colOne a:active, td.colOne a:visited, td.colOne a:hover, td.colFirst a:link, td.colFirst a:active, td.colFirst a:visited, td.colFirst a:hover, td.colLast a:link, td.colLast a:active, td.colLast a:visited, td.colLast a:hover, .constantValuesContainer td a:link, .constantValuesContainer td a:active, .constantValuesContainer td a:visited, .constantValuesContainer td a:hover { + font-weight:bold; } -table.overviewSummary td.colFirst, table.overviewSummary th.colFirst, -table.overviewSummary td.colOne, table.overviewSummary th.colOne { - width:25%; - vertical-align:middle; +.tableSubHeadingColor { + background-color:#EEEEFF; } -table.packageSummary td.colFirst, table.overviewSummary th.colFirst { - width:25%; - vertical-align:middle; +.altColor { + background-color:#FFFFFF; +} +.rowColor { + background-color:#EEEEEF; } /* Content styles @@ -453,6 +520,24 @@ Content styles .docSummary { padding:0; } + +ul.blockList ul.blockList ul.blockList li.blockList h3 { + font-style:normal; +} + +div.block { + font-size:14px; + font-family:'DejaVu Serif', Georgia, "Times New Roman", Times, serif; +} + +td.colLast div { + padding-top:0px; +} + + +td.colLast a { + padding-bottom:3px; +} /* Formatting effect styles */ @@ -463,12 +548,27 @@ Formatting effect styles h1.hidden { visibility:hidden; overflow:hidden; - font-size:.9em; + font-size:10px; } .block { display:block; - margin:3px 0 0 0; + margin:3px 10px 2px 0px; + color:#474747; } -.strong { +.deprecatedLabel, .descfrmTypeLabel, .memberNameLabel, .memberNameLink, +.overrideSpecifyLabel, .packageHierarchyLabel, .paramLabel, .returnLabel, +.seeLabel, .simpleTagLabel, .throwsLabel, .typeNameLabel, .typeNameLink { font-weight:bold; } +.deprecationComment, .emphasizedPhrase, .interfaceName { + font-style:italic; +} + +div.block div.block span.deprecationComment, div.block div.block span.emphasizedPhrase, +div.block div.block span.interfaceName { + font-style:normal; +} + +div.contentContainer ul.blockList li.blockList h2{ + padding-bottom:0px; +} diff --git a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/internal/tmf/ui/parsers/wizards/CustomTxtParserInputWizardPage.java b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/internal/tmf/ui/parsers/wizards/CustomTxtParserInputWizardPage.java index 7b6808a7c3..88f0a8941e 100644 --- a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/internal/tmf/ui/parsers/wizards/CustomTxtParserInputWizardPage.java +++ b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/internal/tmf/ui/parsers/wizards/CustomTxtParserInputWizardPage.java @@ -102,7 +102,7 @@ public class CustomTxtParserInputWizardPage extends WizardPage { private static final String DEFAULT_TIMESTAMP_FORMAT = "yyyy-MM-dd HH:mm:ss.SSS"; //$NON-NLS-1$ private static final String TIMESTAMP_FORMAT_BUNDLE = "org.eclipse.tracecompass.doc.user"; //$NON-NLS-1$ private static final String TIMESTAMP_FORMAT_PATH = "reference/api/org/eclipse/tracecompass/tmf/core/timestamp/TmfTimestampFormat.html"; //$NON-NLS-1$ - private static final String PATTERN_URL = "http://docs.oracle.com/javase/7/docs/api/java/util/regex/Pattern.html#sum"; //$NON-NLS-1$ + private static final String PATTERN_URL = "http://docs.oracle.com/javase/8/docs/api/java/util/regex/Pattern.html#sum"; //$NON-NLS-1$ private static final Image LINE_IMAGE = Activator.getDefault().getImageFromPath("/icons/elcl16/line_icon.gif"); //$NON-NLS-1$ private static final Image ADD_IMAGE = Activator.getDefault().getImageFromPath("/icons/elcl16/add_button.gif"); //$NON-NLS-1$ private static final Image ADD_NEXT_IMAGE = Activator.getDefault().getImageFromPath("/icons/elcl16/addnext_button.gif"); //$NON-NLS-1$ -- 2.34.1
      • Class Summary 
      Class