From 2b3be0437f2a41e2541d8d84dc673e8ddee8c54a Mon Sep 17 00:00:00 2001 From: Jean-Christian Kouame Date: Mon, 16 Nov 2015 14:26:16 -0500 Subject: [PATCH] tmf : remove duplicated lines in TimeGraphScale.java add of the method drawAbsHeader() with a SimpleDateFormat parameter Change-Id: I0b65c18e5b367e232e221ea3bc5fe1f2a11e3bdb Signed-off-by: Jean-Christian Kouame Reviewed-on: https://git.eclipse.org/r/60548 Reviewed-by: Hudson CI Reviewed-by: Patrick Tasse Tested-by: Patrick Tasse Reviewed-by: Matthew Khouzam --- .../timegraph/widgets/TimeGraphScale.java | 84 +++++-------------- 1 file changed, 20 insertions(+), 64 deletions(-) diff --git a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/widgets/timegraph/widgets/TimeGraphScale.java b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/widgets/timegraph/widgets/TimeGraphScale.java index f99d62b539..743baaa610 100644 --- a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/widgets/timegraph/widgets/TimeGraphScale.java +++ b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/widgets/timegraph/widgets/TimeGraphScale.java @@ -767,6 +767,18 @@ abstract class TimeDraw { */ public void drawAbsHeader(GC gc, long nanosec, Rectangle absHeaderRect) { } + + protected void drawAbsHeader(GC gc, long nanosec, Rectangle rect, SimpleDateFormat dateFormat) { + String header; + synchronized (dateFormat) { + header = dateFormat.format(new Date(nanosec / MILLISEC_IN_NS)); + } + int headerwidth = gc.stringExtent(header).x + 4; + if (headerwidth <= rect.width) { + rect.x += (rect.width - headerwidth); + Utils.drawText(gc, header, rect, true); + } + } } class TimeDrawSec extends TimeDraw { @@ -846,15 +858,7 @@ class TimeDrawAbsDay extends TimeDraw { @Override public void drawAbsHeader(GC gc, long nanosec, Rectangle rect) { - String header; - synchronized (DAY_FORMAT_HEADER) { - header = DAY_FORMAT_HEADER.format(new Date(nanosec / MILLISEC_IN_NS)); - } - int headerwidth = gc.stringExtent(header).x + 4; - if (headerwidth <= rect.width) { - rect.x += (rect.width - headerwidth); - Utils.drawText(gc, header, rect, true); - } + drawAbsHeader(gc, nanosec, rect, DAY_FORMAT_HEADER); } } @@ -870,15 +874,7 @@ class TimeDrawAbsHrs extends TimeDraw { @Override public void drawAbsHeader(GC gc, long nanosec, Rectangle rect) { - String header; - synchronized (HOURS_FORMAT_HEADER) { - header = HOURS_FORMAT_HEADER.format(new Date(nanosec / MILLISEC_IN_NS)); - } - int headerwidth = gc.stringExtent(header).x + 4; - if (headerwidth <= rect.width) { - rect.x += (rect.width - headerwidth); - Utils.drawText(gc, header, rect, true); - } + drawAbsHeader(gc, nanosec, rect, HOURS_FORMAT_HEADER); } } @@ -894,15 +890,7 @@ class TimeDrawAbsMin extends TimeDraw { @Override public void drawAbsHeader(GC gc, long nanosec, Rectangle rect) { - String header; - synchronized (MIN_FORMAT_HEADER) { - header = MIN_FORMAT_HEADER.format(new Date(nanosec / MILLISEC_IN_NS)); - } - int headerwidth = gc.stringExtent(header).x + 4; - if (headerwidth <= rect.width) { - rect.x += (rect.width - headerwidth); - Utils.drawText(gc, header, rect, true); - } + drawAbsHeader(gc, nanosec, rect, MIN_FORMAT_HEADER); } } @@ -918,15 +906,7 @@ class TimeDrawAbsSec extends TimeDraw { @Override public void drawAbsHeader(GC gc, long nanosec, Rectangle rect) { - String header; - synchronized (SEC_FORMAT_HEADER) { - header = SEC_FORMAT_HEADER.format(new Date(nanosec / MILLISEC_IN_NS)); - } - int headerwidth = gc.stringExtent(header).x + 4; - if (headerwidth <= rect.width) { - rect.x += (rect.width - headerwidth); - Utils.drawText(gc, header, rect, true); - } + drawAbsHeader(gc, nanosec, rect, SEC_FORMAT_HEADER); } } @@ -943,15 +923,7 @@ class TimeDrawAbsMillisec extends TimeDraw { @Override public void drawAbsHeader(GC gc, long nanosec, Rectangle rect) { - String header; - synchronized (SEC_FORMAT_HEADER) { - header = SEC_FORMAT_HEADER.format(new Date(nanosec / MILLISEC_IN_NS)); - } - int headerwidth = gc.stringExtent(header).x + 4; - if (headerwidth <= rect.width) { - rect.x += (rect.width - headerwidth); - Utils.drawText(gc, header, rect, true); - } + drawAbsHeader(gc, nanosec, rect, SEC_FORMAT_HEADER); } } @@ -968,15 +940,7 @@ class TimeDrawAbsMicroSec extends TimeDraw { @Override public void drawAbsHeader(GC gc, long nanosec, Rectangle rect) { - String header; - synchronized (SEC_FORMAT_HEADER) { - header = SEC_FORMAT_HEADER.format(new Date(nanosec / MILLISEC_IN_NS)); - } - int headerwidth = gc.stringExtent(header).x + 4; - if (headerwidth <= rect.width) { - rect.x += (rect.width - headerwidth); - Utils.drawText(gc, header, rect, true); - } + drawAbsHeader(gc, nanosec, rect, SEC_FORMAT_HEADER); } } @@ -993,15 +957,7 @@ class TimeDrawAbsNanoSec extends TimeDraw { @Override public void drawAbsHeader(GC gc, long nanosec, Rectangle rect) { - String header; - synchronized (SEC_FORMAT_HEADER) { - header = SEC_FORMAT_HEADER.format(new Date(nanosec / MILLISEC_IN_NS)); - } - int headerwidth = gc.stringExtent(header).x + 4; - if (headerwidth <= rect.width) { - rect.x += (rect.width - headerwidth); - Utils.drawText(gc, header, rect, true); - } + drawAbsHeader(gc, nanosec, rect, SEC_FORMAT_HEADER); } } @@ -1019,4 +975,4 @@ class TimeDrawCycles extends TimeDraw { String stime = Utils.formatTime(time, TimeFormat.CYCLES, Resolution.SECONDS); return Utils.drawText(gc, stime, rect, true); } -} +} \ No newline at end of file -- 2.34.1