releng: Support of building for Oxygen target
- Added target definition
- Removed usage of FontMetrics API introduced in later target
- Provide a legacy product definition for the Incubator RCP. This one
needs to be copied over the regular product definition when building
for Oxygen.
[Added] Support of building for Oxygen target
Change-Id: Id48167f9cda2971a228fc06e8f4629d7d341d940
Signed-off-by: Bernd Hufmann <Bernd.Hufmann@ericsson.com>
Reviewed-on: https://git.eclipse.org/r/152689
Tested-by: CI Bot
Reviewed-by: Matthew Khouzam <matthew.khouzam@ericsson.com>
Tested-by: Matthew Khouzam <matthew.khouzam@ericsson.com>
Reviewed-by: Bernd Hufmann <bernd.hufmann@ericsson.com>
diff --git a/common/org.eclipse.tracecompass.incubator.target/pom.xml b/common/org.eclipse.tracecompass.incubator.target/pom.xml
index dc965fd..84788ce 100644
--- a/common/org.eclipse.tracecompass.incubator.target/pom.xml
+++ b/common/org.eclipse.tracecompass.incubator.target/pom.xml
@@ -43,6 +43,11 @@
<type>target</type>
<classifier>tracecompass-incubator-master</classifier>
</artifact>
+ <artifact>
+ <file>tracecompass-incubator-oxygen.target</file>
+ <type>target</type>
+ <classifier>tracecompass-oxygen-master</classifier>
+ </artifact>
<!-- More targets could be added here -->
</artifacts>
</configuration>
diff --git a/common/org.eclipse.tracecompass.incubator.target/tracecompass-incubator-oxygen.target b/common/org.eclipse.tracecompass.incubator.target/tracecompass-incubator-oxygen.target
new file mode 100644
index 0000000..7d7e5c6
--- /dev/null
+++ b/common/org.eclipse.tracecompass.incubator.target/tracecompass-incubator-oxygen.target
@@ -0,0 +1,176 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?pde version="3.8"?>
+<target name="tracecompass-incubator-master" sequenceNumber="1">
+<locations>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.cdt.gnu.dsf.feature.group" version="0.0.0"/>
+<repository location="https://download.eclipse.org/tools/cdt/releases/9.4/cdt-9.4.3/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.mylyn.wikitext_feature.feature.group" version="0.0.0"/>
+<repository location="https://download.eclipse.org/mylyn/releases/3.21/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.linuxtools.dataviewers.feature.feature.group" version="0.0.0"/>
+<repository location="https://download.eclipse.org/linuxtools/update-oxygen-3"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.swtbot.eclipse.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.swtbot.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.swtbot.generator.feature.feature.group" version="0.0.0"/>
+<repository location="https://download.eclipse.org/technology/swtbot/snapshots/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.remote.core" version="0.0.0"/>
+<unit id="org.eclipse.remote.ui" version="0.0.0"/>
+<unit id="org.eclipse.remote.jsch.core" version="0.0.0"/>
+<unit id="org.eclipse.remote.jsch.ui" version="0.0.0"/>
+<repository location="https://download.eclipse.org/tools/ptp/builds/remote/3.0.0"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.tm.terminal.control" version="0.0.0"/>
+<repository location="https://download.eclipse.org/tm/terminal/updates/4.3/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<repository location="https://download.eclipse.org/tools/cdt/launchbar/oxygen.2/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.antlr.runtime" version="3.2.0.v201101311130"/>
+<unit id="org.antlr.runtime.source" version="3.2.0.v201101311130"/>
+<unit id="org.apache.commons.cli" version="0.0.0"/>
+<unit id="org.apache.commons.compress" version="0.0.0"/>
+<unit id="org.apache.commons.io" version="0.0.0"/>
+<unit id="org.apache.commons.lang" version="0.0.0"/>
+<unit id="org.apache.commons.lang3" version="0.0.0"/>
+<unit id="org.apache.commons.math3" version="0.0.0"/>
+<unit id="org.swtchart" version="0.10.0.v201605200358"/>
+<unit id="org.swtchart.source" version="0.10.0.v201605200358"/>
+<unit id="com.google.guava" version="21.0.0.v20170206-1425"/>
+<unit id="org.json" version="0.0.0"/>
+<unit id="org.apache.derby" version="0.0.0"/>
+<unit id="org.hamcrest" version="0.0.0"/>
+<unit id="javax.xml.bind" version="0.0.0"/>
+<unit id="javax.activation" version="0.0.0"/>
+<unit id="javax.xml.stream" version="0.0.0"/>
+<unit id="org.apache.felix.scr" version="0.0.0"/>
+<unit id="com.fasterxml.jackson.core.jackson-annotations" version="0.0.0"/>
+<unit id="com.fasterxml.jackson.core.jackson-annotations.source" version="0.0.0"/>
+<unit id="com.fasterxml.jackson.core.jackson-core" version="0.0.0"/>
+<unit id="com.fasterxml.jackson.core.jackson-core.source" version="0.0.0"/>
+<unit id="com.fasterxml.jackson.core.jackson-databind" version="0.0.0"/>
+<unit id="com.fasterxml.jackson.core.jackson-databind.source" version="0.0.0"/>
+<unit id="com.fasterxml.jackson.jaxrs.jackson-jaxrs-base" version="0.0.0"/>
+<unit id="com.fasterxml.jackson.jaxrs.jackson-jaxrs-base.source" version="0.0.0"/>
+<unit id="com.fasterxml.jackson.datatype.jackson-datatype-guava" version="0.0.0"/>
+<unit id="com.fasterxml.jackson.datatype.jackson-datatype-guava.source" version="0.0.0"/>
+<unit id="javassist" version="0.0.0"/>
+<unit id="javax.annotation" version="0.0.0"/>
+<unit id="javax.inject" version="0.0.0"/>
+<unit id="javax.servlet" version="0.0.0"/>
+<unit id="javax.ws.rs" version="0.0.0"/>
+<unit id="org.aopalliance" version="0.0.0"/>
+<unit id="org.glassfish.hk2.api" version="0.0.0"/>
+<unit id="org.glassfish.hk2.api.source" version="0.0.0"/>
+<unit id="org.glassfish.hk2.locator" version="0.0.0"/>
+<unit id="org.glassfish.hk2.locator.source" version="0.0.0"/>
+<unit id="org.glassfish.hk2.utils" version="0.0.0"/>
+<unit id="org.glassfish.hk2.utils.source" version="0.0.0"/>
+<unit id="org.glassfish.hk2.osgi-resource-locator" version="0.0.0"/>
+<unit id="org.glassfish.hk2.osgi-resource-locator.source" version="0.0.0"/>
+<unit id="org.glassfish.jersey.core.jersey-client" version="0.0.0"/>
+<unit id="org.glassfish.jersey.core.jersey-client.source" version="0.0.0"/>
+<unit id="org.glassfish.jersey.core.jersey-common" version="0.0.0"/>
+<unit id="org.glassfish.jersey.core.jersey-common.source" version="0.0.0"/>
+<unit id="org.glassfish.jersey.core.jersey-server" version="0.0.0"/>
+<unit id="org.glassfish.jersey.core.jersey-server.source" version="0.0.0"/>
+<unit id="org.glassfish.jersey.media.jersey-media-json-jackson" version="0.0.0"/>
+<unit id="org.glassfish.jersey.media.jersey-media-json-jackson.source" version="0.0.0"/>
+<unit id="org.glassfish.jersey.containers.servlet" version="0.0.0"/>
+<unit id="org.glassfish.jersey.containers.servlet.source" version="0.0.0"/>
+<unit id="org.glassfish.jersey.containers.servlet.core" version="0.0.0"/>
+<unit id="org.glassfish.jersey.containers.servlet.core.source" version="0.0.0"/>
+<unit id="org.glassfish.jersey.ext.entityfiltering" version="0.0.0"/>
+<unit id="org.glassfish.jersey.ext.entityfiltering.source" version="0.0.0"/>
+<unit id="org.glassfish.jersey.bundles.repackaged.jersey-guava" version="0.0.0"/>
+<unit id="org.glassfish.jersey.bundles.repackaged.jersey-guava.source" version="0.0.0"/>
+<unit id="org.mozilla.javascript" version="0.0.0"/>
+<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20180206163158/repository"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.license.feature.group" version="0.0.0"/>
+<repository location="https://download.eclipse.org/cbi/updates/license"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.platform.ide" version="0.0.0"/>
+<unit id="org.eclipse.equinox.executable.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.pde.runtime" version="0.0.0"/>
+<unit id="org.eclipse.pde.junit.runtime" version="0.0.0"/>
+<unit id="org.eclipse.equinox.p2.discovery.feature.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.equinox.p2.sdk.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.equinox.p2.core.feature.source.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.test.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.jdt.annotation" version="0.0.0"/>
+<unit id="org.eclipse.swt.tools.spies" version="0.0.0"/>
+<unit id="org.eclipse.ui.trace" version="0.0.0"/>
+<unit id="org.eclipse.ui.views.log" version="0.0.0"/>
+<unit id="org.eclipse.jdt.junit4.runtime" version="0.0.0"/>
+<repository location="https://download.eclipse.org/eclipse/updates/4.7/R-4.7.3-201803010715"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.tracecompass.testtraces.tracecompass-test-traces-ctf" version="1.7.2"/>
+<repository location="https://archive.eclipse.org/tracecompass/tracecompass-test-traces/repository/1.7.2"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.wst.xml.core" version="0.0.0"/>
+<unit id="org.eclipse.wst.xml.ui" version="0.0.0"/>
+<unit id="org.eclipse.wst.xsd.core" version="0.0.0"/>
+<repository location="https://download.eclipse.org/webtools/downloads/drops/R3.9.3/R-3.9.3-20180302093744/repository/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.xsd" version="0.0.0"/>
+<repository location="https://download.eclipse.org/modeling/emf/emf/updates/2.13/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.tracecompass.ctf.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.tracecompass.tmf.ctf.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.tracecompass.lttng2.ust.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.tracecompass.tmf.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.tracecompass.tmf.pcap.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.tracecompass.tmf.remote.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.tracecompass.testing.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.tracecompass.lttng2.kernel.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.tracecompass.lttng2.control.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.tracecompass.jsontrace.feature.group" version="0.0.0"/>
+<repository location="http://download.eclipse.org/tracecompass/master/4.7/repository"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<repository location="https://download.eclipse.org/tracecompass/master/4.7/rcp-repository/"/>
+<unit id="org.eclipse.tracecompass.rcp.feature.group" version="0.0.0"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.nebula.widgets.opal.notifier.feature.feature.group" version="0.0.0"/>
+<repository location="http://download.eclipse.org/nebula/releases/latest"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.lsp4j.sdk.feature.group" version="0.0.0"/>
+<repository location="http://download.eclipse.org/releases/2019-09"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.ease.feature.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.ease.lang.javascript.feature.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.ease.lang.python.py4j.feature.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.ease.ui.feature.feature.group" version="0.0.0"/>
+<repository location="https://download.eclipse.org/ease/release/0.7.0"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
+<unit id="org.py4j.feature.feature.group" version="0.0.0"/>
+<repository location="https://dl.bintray.com/py4j/py4j-eclipse/0.10.8.1"/>
+</location>
+</locations>
+<targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+<launcherArgs>
+<vmArgs>-Xms40m
+-Xmx512M</vmArgs>
+<programArgs>-consolelog</programArgs>
+</launcherArgs>
+</target>
diff --git a/rcp/org.eclipse.tracecompass.incubator.rcp.product/legacy/tracing.incubator.product b/rcp/org.eclipse.tracecompass.incubator.rcp.product/legacy/tracing.incubator.product
new file mode 100644
index 0000000..7d8ad67
--- /dev/null
+++ b/rcp/org.eclipse.tracecompass.incubator.rcp.product/legacy/tracing.incubator.product
@@ -0,0 +1,258 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?pde version="3.5"?>
+
+<product name="Trace Compass (Incubator)" uid="org.eclipse.tracecompass.incubator.rcp" id="org.eclipse.tracecompass.rcp.branding.product" application="org.eclipse.tracecompass.rcp.ui.application" version="0.0.1.qualifier" useFeatures="true" includeLaunchers="true">
+
+ <aboutInfo>
+ <image path="/org.eclipse.tracecompass.incubator.rcp.branding/icons/tc_about.png"/>
+ <text>
+ Trace Compass Incubator
+
+Version: 0.0.1
+
+Copyright (c) 2019 École Polytechnique de Montréal
+
+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
+ </text>
+ </aboutInfo>
+
+ <configIni use="default">
+ </configIni>
+
+ <launcherArgs>
+ <programArgs>-data @noDefault
+ </programArgs>
+ <programArgsLin>--launcher.GTK_version 3
+ </programArgsLin>
+ <vmArgsLin>-Xms512m -Xmx1024m -Dosgi.requiredJavaVersion=1.8
+ </vmArgsLin>
+ <vmArgsMac>-Xms512m -Xmx1024m -XstartOnFirstThread -Dosgi.requiredJavaVersion=1.8 -Dorg.eclipse.swt.internal.carbon.smallFonts
+ </vmArgsMac>
+ <vmArgsWin>-Xms512m -Xmx1024m -Dosgi.requiredJavaVersion=1.8
+ </vmArgsWin>
+ </launcherArgs>
+
+ <windowImages i16="/org.eclipse.tracecompass.incubator.rcp.branding/icons/png/tc_icon_16x16.png" i32="/org.eclipse.tracecompass.incubator.rcp.branding/icons/png/tc_icon_32x32.png" i48="/org.eclipse.tracecompass.incubator.rcp.branding/icons/png/tc_icon_48x48.png" i64="/org.eclipse.tracecompass.incubator.rcp.branding/icons/png/tc_icon_64x64.png" i128="/org.eclipse.tracecompass.incubator.rcp.branding/icons/png/tc_icon_128x128.png" i256="/org.eclipse.tracecompass.incubator.rcp.branding/icons/png/tc_icon_256x256.png"/>
+
+ <splash
+ location="org.eclipse.tracecompass.incubator.rcp.branding" />
+ <launcher name="tracecompass">
+ <linux icon="../org.eclipse.tracecompass.incubator.rcp.branding/icons/xpm/tc_icon_256x256.xpm"/>
+ <macosx icon="../org.eclipse.tracecompass.incubator.rcp.branding/icons/icns/tc_icon.icns"/>
+ <win useIco="true">
+ <ico path="../org.eclipse.tracecompass.incubator.rcp.branding/icons/ico/tc_icon.ico"/>
+ <bmp/>
+ </win>
+ </launcher>
+
+ <vm>
+ <linux include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8</linux>
+ <macos include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8</macos>
+ <solaris include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8</solaris>
+ <windows include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8</windows>
+ </vm>
+
+ <license>
+ <url>http://eclipse.org/legal/epl/notice.php</url>
+ <text>
+ Eclipse Foundation Software User Agreement
+April 9, 2014
+
+Usage Of Content
+
+THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR
+OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").
+USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS
+AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR
+NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU
+AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT
+AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS
+OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE
+TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS
+OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED
+BELOW, THEN YOU MAY NOT USE THE CONTENT.
+
+Applicable Licenses
+
+Unless otherwise indicated, all Content made available by the
+Eclipse Foundation is provided to you under the terms and conditions of
+the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is
+provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.
+For purposes of the EPL, "Program" will mean the Content.
+
+Content includes, but is not limited to, source code, object code,
+documentation and other files maintained in the Eclipse Foundation source code
+repository ("Repository") in software modules ("Modules") and made available
+as downloadable archives ("Downloads").
+
+ - Content may be structured and packaged into modules to facilitate delivering,
+ extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),
+ plug-in fragments ("Fragments"), and features ("Features").
+ - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)
+ in a directory named "plugins".
+ - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.
+ Each Feature may be packaged as a sub-directory in a directory named "features".
+ Within a Feature, files named "feature.xml" may contain a list of the names and version
+ numbers of the Plug-ins and/or Fragments associated with that Feature.
+ - Features may also include other Features ("Included Features"). Within a Feature, files
+ named "feature.xml" may contain a list of the names and version numbers of Included Features.
+
+The terms and conditions governing Plug-ins and Fragments should be
+contained in files named "about.html" ("Abouts"). The terms and
+conditions governing Features and Included Features should be contained
+in files named "license.html" ("Feature Licenses"). Abouts and Feature
+Licenses may be located in any directory of a Download or Module
+including, but not limited to the following locations:
+
+ - The top-level (root) directory
+ - Plug-in and Fragment directories
+ - Inside Plug-ins and Fragments packaged as JARs
+ - Sub-directories of the directory named "src" of certain Plug-ins
+ - Feature directories
+
+Note: if a Feature made available by the Eclipse Foundation is installed using the
+Provisioning Technology (as defined below), you must agree to a license ("Feature
+Update License") during the installation process. If the Feature contains
+Included Features, the Feature Update License should either provide you
+with the terms and conditions governing the Included Features or inform
+you where you can locate them. Feature Update Licenses may be found in
+the "license" property of files named "feature.properties" found within a Feature.
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the
+terms and conditions (or references to such terms and conditions) that
+govern your use of the associated Content in that directory.
+
+THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER
+TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.
+SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):
+
+ - Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)
+ - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)
+ - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)
+ - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)
+ - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)
+
+IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR
+TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License
+is provided, please contact the Eclipse Foundation to determine what terms and conditions
+govern that particular Content.
+
+
+Use of Provisioning Technology
+
+The Eclipse Foundation makes available provisioning software, examples of which include,
+but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for
+the purpose of allowing users to install software, documentation, information and/or
+other materials (collectively "Installable Software"). This capability is provided with
+the intent of allowing such users to install, extend and update Eclipse-based products.
+Information about packaging Installable Software is available at
+http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").
+
+You may use Provisioning Technology to allow other parties to install Installable Software.
+You shall be responsible for enabling the applicable license agreements relating to the
+Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
+in accordance with the Specification. By using Provisioning Technology in such a manner and
+making it available in accordance with the Specification, you further acknowledge your
+agreement to, and the acquisition of all necessary rights to permit the following:
+
+ 1. A series of actions may occur ("Provisioning Process") in which a user may execute
+ the Provisioning Technology on a machine ("Target Machine") with the intent of installing,
+ extending or updating the functionality of an Eclipse-based product.
+ 2. During the Provisioning Process, the Provisioning Technology may cause third party
+ Installable Software or a portion thereof to be accessed and copied to the Target Machine.
+ 3. Pursuant to the Specification, you will provide to the user the terms and conditions that
+ govern the use of the Installable Software ("Installable Software Agreement") and such
+ Installable Software Agreement shall be accessed from the Target Machine in accordance
+ with the Specification. Such Installable Software Agreement must inform the user of the
+ terms and conditions that govern the Installable Software and must solicit acceptance by
+ the end user in the manner prescribed in such Installable Software Agreement. Upon such
+ indication of agreement by the user, the provisioning Technology will complete installation
+ of the Installable Software.
+
+Cryptography
+
+Content may contain encryption software. The country in which you are
+currently may have restrictions on the import, possession, and use,
+and/or re-export to another country, of encryption software. BEFORE
+using any encryption software, please check the country's laws,
+regulations and policies concerning the import, possession, or use, and
+re-export of encryption software, to see if this is permitted.
+
+Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.
+ </text>
+ </license>
+
+ <plugins>
+ </plugins>
+
+ <features>
+ <feature id="org.eclipse.tracecompass.lttng2.kernel"/>
+ <feature id="org.eclipse.tracecompass.lttng2.ust"/>
+ <feature id="org.eclipse.tracecompass.lttng2.control"/>
+ <feature id="org.eclipse.equinox.p2.core.feature"/>
+ <feature id="org.eclipse.platform"/>
+ <feature id="org.eclipse.help"/>
+ <feature id="org.eclipse.emf.ecore"/>
+ <feature id="org.eclipse.equinox.p2.rcp.feature"/>
+ <feature id="org.eclipse.equinox.p2.user.ui"/>
+ <feature id="org.eclipse.tracecompass.tmf"/>
+ <feature id="org.eclipse.rcp"/>
+ <feature id="org.eclipse.e4.rcp"/>
+ <feature id="org.eclipse.emf.common"/>
+ <feature id="org.eclipse.equinox.p2.extras.feature"/>
+ <feature id="org.eclipse.tracecompass.ctf"/>
+ <feature id="org.eclipse.tracecompass.tmf.ctf"/>
+ <feature id="org.eclipse.tracecompass.tmf.pcap"/>
+ <feature id="org.eclipse.ecf.core.ssl.feature"/>
+ <feature id="org.eclipse.ecf.filetransfer.ssl.feature"/>
+ <feature id="org.eclipse.ecf.core.feature"/>
+ <feature id="org.eclipse.ecf.filetransfer.feature"/>
+ <feature id="org.eclipse.ecf.filetransfer.httpclient4.feature"/>
+ <feature id="org.eclipse.ecf.filetransfer.httpclient4.ssl.feature"/>
+ <feature id="org.eclipse.tracecompass.incubator.virtual.machine.analysis"/>
+ <feature id="org.eclipse.tracecompass.incubator.rcp.branding.feature"/>
+ <feature id="org.eclipse.tracecompass.incubator.atrace"/>
+ <feature id="org.eclipse.tracecompass.incubator.callstack"/>
+ <feature id="org.eclipse.tracecompass.incubator.contextswitch"/>
+ <feature id="org.eclipse.tracecompass.incubator.eventfieldcount"/>
+ <feature id="org.eclipse.tracecompass.incubator.ftrace"/>
+ <feature id="org.eclipse.tracecompass.incubator.hudson.maven"/>
+ <feature id="org.eclipse.tracecompass.incubator.kernel"/>
+ <feature id="org.eclipse.tracecompass.incubator.lttng2.ust.extras"/>
+ <feature id="org.eclipse.tracecompass.incubator.opentracing"/>
+ <feature id="org.eclipse.tracecompass.incubator.perf.profiling"/>
+ <feature id="org.eclipse.tracecompass.incubator.ros"/>
+ <feature id="org.eclipse.tracecompass.incubator.tracecompass"/>
+ <feature id="org.eclipse.tracecompass.incubator.traceevent"/>
+ <feature id="org.eclipse.tracecompass.incubator.uftrace"/>
+ <feature id="org.eclipse.tracecompass.jsontrace" installMode="root"/>
+ <feature id="org.eclipse.tracecompass.rcp" installMode="root"/>
+ <feature id="org.eclipse.tracecompass.incubator.rcp" installMode="root"/>
+ </features>
+
+ <configurations>
+ <plugin id="org.apache.felix.scr" autoStart="true" startLevel="2" />
+ <plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="4" />
+ <plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" />
+ <plugin id="org.eclipse.equinox.ds" autoStart="true" startLevel="2" />
+ <plugin id="org.eclipse.equinox.event" autoStart="true" startLevel="2" />
+ <plugin id="org.eclipse.equinox.simpleconfigurator" autoStart="true" startLevel="1" />
+ <plugin id="org.eclipse.tracecompass.rcp.ui" autoStart="false" startLevel="5" />
+ <plugin id="org.eclipse.update.configurator" autoStart="true" startLevel="3" />
+ </configurations>
+
+ <repositories>
+ <repository location="http://download.eclipse.org/tracecompass/master/rcp-repository" enabled="true" />
+ <repository location="http://download.eclipse.org/tracecompass.incubator/master/repository" enabled="true" />
+ </repositories>
+
+ <preferencesInfo>
+ <targetfile overwrite="false"/>
+ </preferencesInfo>
+
+ <cssInfo>
+ </cssInfo>
+
+</product>
diff --git a/tracetypes/org.eclipse.tracecompass.incubator.ros.ui/src/org/eclipse/tracecompass/incubator/internal/ros/ui/views/AbstractRosPresentationProvider.java b/tracetypes/org.eclipse.tracecompass.incubator.ros.ui/src/org/eclipse/tracecompass/incubator/internal/ros/ui/views/AbstractRosPresentationProvider.java
index 4fda7af..1f381a0 100644
--- a/tracetypes/org.eclipse.tracecompass.incubator.ros.ui/src/org/eclipse/tracecompass/incubator/internal/ros/ui/views/AbstractRosPresentationProvider.java
+++ b/tracetypes/org.eclipse.tracecompass.incubator.ros.ui/src/org/eclipse/tracecompass/incubator/internal/ros/ui/views/AbstractRosPresentationProvider.java
@@ -67,9 +67,6 @@
}
}
- /** The minimum width */
- protected Integer fMinimumDisplayedTextWidth;
-
/** The event cache */
protected final LoadingCache<NamedTimeEvent, Optional<String>> fTimeEventNames = CacheBuilder.newBuilder()
.maximumSize(1000)
@@ -122,30 +119,15 @@
return;
}
- if (fMinimumDisplayedTextWidth == null) {
- fMinimumDisplayedTextWidth = getAverageCharacterWidth(gc) + gc.stringExtent(Utils.ELLIPSIS).x;
- }
- if (bounds.width <= fMinimumDisplayedTextWidth) {
- // Don't print anything if we cannot at least show one character and ellipses
- return;
- }
-
String name = fTimeEventNames.getUnchecked((NamedTimeEvent) event).orElse(StringUtils.EMPTY);
if (name.isEmpty()) {
// No text to print
return;
}
- gc.setForeground(gc.getDevice().getSystemColor(SWT.COLOR_WHITE));
- Utils.drawText(gc, name, bounds.x, bounds.y, bounds.width, bounds.height, true, true);
- }
-
- /**
- * @param gc
- * the graphics content
- * @return the average character width
- */
- protected static int getAverageCharacterWidth(GC gc) {
- return (int) gc.getFontMetrics().getAverageCharacterWidth();
+ if (bounds.width > bounds.height) {
+ gc.setForeground(gc.getDevice().getSystemColor(SWT.COLOR_WHITE));
+ Utils.drawText(gc, name, bounds.x, bounds.y, bounds.width, bounds.height, true, true);
+ }
}
}
