From 690b35c501d707686c1f142999a17fb6f0e90689 Mon Sep 17 00:00:00 2001 From: Matthew Khouzam Date: Tue, 19 Jan 2016 10:00:21 -0500 Subject: [PATCH] xml: remove dead store of value in XmlPresentationProvider.java Change-Id: I50bf309c3aa38b8bf4d09ada185cb4be52708410 Signed-off-by: Matthew Khouzam Reviewed-on: https://git.eclipse.org/r/64702 Reviewed-by: Hudson CI Reviewed-by: Marc-Andre Laperle Tested-by: Marc-Andre Laperle --- .../timegraph/XmlPresentationProvider.java | 21 ++++++++++--------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/tmf/org.eclipse.tracecompass.tmf.analysis.xml.ui/src/org/eclipse/tracecompass/tmf/analysis/xml/ui/views/timegraph/XmlPresentationProvider.java b/tmf/org.eclipse.tracecompass.tmf.analysis.xml.ui/src/org/eclipse/tracecompass/tmf/analysis/xml/ui/views/timegraph/XmlPresentationProvider.java index 8c88a9456e..f8985ad10c 100644 --- a/tmf/org.eclipse.tracecompass.tmf.analysis.xml.ui/src/org/eclipse/tracecompass/tmf/analysis/xml/ui/views/timegraph/XmlPresentationProvider.java +++ b/tmf/org.eclipse.tracecompass.tmf.analysis.xml.ui/src/org/eclipse/tracecompass/tmf/analysis/xml/ui/views/timegraph/XmlPresentationProvider.java @@ -141,16 +141,7 @@ public class XmlPresentationProvider extends TimeGraphPresentationProvider { return; } - RGB colorRGB = new RGB(255, 0, 0); - if (color.startsWith(TmfXmlStrings.COLOR_PREFIX)) { - Integer hex = Integer.parseInt(color.substring(1), 16); - int hex1 = hex.intValue() % 256; - int hex2 = (hex.intValue() / 256) % 256; - int hex3 = (hex.intValue() / (256 * 256)) % 256; - colorRGB = new RGB(hex3, hex2, hex1); - } else { - colorRGB = calcColor(value); - } + final RGB colorRGB = (color.startsWith(TmfXmlStrings.COLOR_PREFIX)) ? parseColor(color) : calcColor(value); StateItem item = new StateItem(colorRGB, name); @@ -172,6 +163,16 @@ public class XmlPresentationProvider extends TimeGraphPresentationProvider { }); } + private static RGB parseColor(String color) { + RGB colorRGB; + Integer hex = Integer.parseInt(color.substring(1), 16); + int hex1 = hex.intValue() % 256; + int hex2 = (hex.intValue() / 256) % 256; + int hex3 = (hex.intValue() / (256 * 256)) % 256; + colorRGB = new RGB(hex3, hex2, hex1); + return colorRGB; + } + private static RGB calcColor(int value) { int x = (value * 97) % 1530; int r = 0, g = 0, b = 0; -- 2.39.5