[Title] Strings change, diable lifecycle, fix legend order
authorsanghyunnim.lee <sanghyunnim.lee@samsung.com>
Wed, 27 Jun 2012 02:11:31 +0000 (11:11 +0900)
committersanghyunnim.lee <sanghyunnim.lee@samsung.com>
Wed, 27 Jun 2012 02:11:31 +0000 (11:11 +0900)
[Type]
[Module]
[Priority]
[CQ#]
[Redmine#] 5530
[Problem]
[Cause]
[Solution]
[TestCase]

13 files changed:
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/constants/TimelineConstants.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/TimelineChartLables.properties
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/TimeTickComposite.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/TimelineComposite.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/TimelineItemManager.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/TimelineItemsProvider.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/TimelineMaster.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/TimelineSelection.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/chart/CPUChart.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/chart/ChartDataSetCenter.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/chart/DeviceChart.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/chart/TimelineChart.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/utils/TimelineUtils.java

index 6890465..657c33b 100644 (file)
@@ -10,8 +10,6 @@ public class TimelineConstants {
        public static final int PAGE_BASE_INFO = 2;
        public static final int PAGE_BATTERY = 9;
 
-//     public static final long MS_TO_FIXEDMS = 54000000;
-       public static final long MS_TO_FIXEDMS = 0;
        public static final int BYTE_TO_KBYTE = 1024;
 
        public static final long CHART_RANGE_DEFAULT = 120000;// 12
@@ -43,11 +41,6 @@ public class TimelineConstants {
        public static final int CHART_TYPE_CPU_CORE = 23;
        public static final int CHART_TYPE_CPU_FREQUENCY = 24;
 
-       /* Time-line Item disabled */
-       // public static final int CHART_TYPE_ALLOCFREE = 5;
-       // public static final int CHART_TYPE_DEFAULT = 0;
-       // public static final int CHART_TYPE_MEMORYUSAGE = 17;
-
        public static final int FD_TYPE_FILE = 0;
        public static final int FD_TYPE_SOCKET = 1;
 
index 5d46ab2..142be03 100644 (file)
@@ -1,4 +1,4 @@
-CPU_CHART_SERIES_NAME_APP_LOAD=App Load
+CPU_CHART_SERIES_NAME_APP_LOAD=App. Load
 CPU_CHART_SERIES_NAME_TOTLA_LOAD=Total Load
 
 CPU_CHART_TIME=Time
@@ -36,9 +36,9 @@ ENERGY_CHART_ENERGY=Energy
 ENERGY_CHART_MILLI_WATT=mW
 ENERGY_CHART_TIME=Time
 ENERGY_CHART_TITLE=Energy
-ENERGY_CHART_WATT=watt
+ENERGY_CHART_WATT=Watt
 
-FILE_CHART_SERIES_NAME_FD_COUNT=FD Count
+FILE_CHART_SERIES_NAME_FD_COUNT=File Count
 FILE_CHART_SERIES_NAME_READ=Read
 FILE_CHART_SERIES_NAME_WRITE=Write
 
@@ -48,10 +48,10 @@ FILE_CHART_TITLE=File
 
 HEAP_CHART_BYTE=Byte
 HEAP_CHART_NIL=(nil)
-HEAP_CHART_SERIES_NAME_TOTAL_ALLOCATION=Platform Allocation
-HEAP_CHART_SERIES_NAME_USER_ALLOCATION=App Allocation
+HEAP_CHART_SERIES_NAME_TOTAL_ALLOCATION=Platform
+HEAP_CHART_SERIES_NAME_USER_ALLOCATION=App.
 HEAP_CHART_TIME=Time
-HEAP_CHART_TITLE=Heap
+HEAP_CHART_TITLE=Heap Allocation
 
 PROCESS_MEMORY_CHART_BYTE=byte
 PROCESS_MEMORY_CHART_PSS=PSS
@@ -84,7 +84,7 @@ TIMELINE_EDIT_ITEMS_DLG_ADD=&Add -->
 TIMELINE_EDIT_ITEMS_DLG_ADD_ALL=A&dd All -->
 TIMELINE_EDIT_ITEMS_DLG_ADD_ITEMS=Add Items
 TIMELINE_EDIT_ITEMS_DLG_AVAILABLE_ITEMS=Avaliable Items
-TIMELINE_EDIT_ITEMS_DLG_ITEM_NAME=Item name
+TIMELINE_EDIT_ITEMS_DLG_ITEM_NAME=Item Name
 TIMELINE_EDIT_ITEMS_DLG_REMOVE=<-- &Remove
 TIMELINE_EDIT_ITEMS_DLG_REMOVE_ALL=<-- Re&move All
 TIMELINE_EDIT_ITEMS_DLG_SELECTED_ITEMS=Selected Items
index e1894ef..f5909a1 100644 (file)
@@ -170,8 +170,8 @@ public class TimeTickComposite extends Composite {
                                }
 
                                timelineMaster.setChartDomainAxis(
-                                               TempConstants.startPx * scaleSec / oneTickPx / 10.0 + TimelineConstants.MS_TO_FIXEDMS
-                                               TempConstants.endPx * scaleSec / oneTickPx / 10.0 + TimelineConstants.MS_TO_FIXEDMS);
+                                               TempConstants.startPx * scaleSec / oneTickPx / 10.0, 
+                                               TempConstants.endPx * scaleSec / oneTickPx / 10.0);
                                TempConstants.allowRedrawTimeTickCanvas = true;
                        }
                });
index a9a7b94..7e6ff7e 100644 (file)
@@ -81,7 +81,8 @@ public class TimelineComposite extends DAView {
                TempConstants.chartRunningSec = (int) (runTimeMs / TimelineConstants.TIME_SEC_TO_MS);
                TimelineMaster.getInstance().redrawTimeTickCanvas();
                
-               TimelineMaster.getInstance().getUpdateliLifecycleMarkerThread(runTimeMs / TimelineConstants.TIME_US_TO_MS).run();
+               //FIXME lifecycle
+//             TimelineMaster.getInstance().getUpdateliLifecycleMarkerThread(runTimeMs / TimelineConstants.TIME_US_TO_MS).run();
        }
 
        public void setRangeSelection(int startSec, int range) {
@@ -243,8 +244,8 @@ public class TimelineComposite extends DAView {
                        startPx = middlePx - TempConstants.MIN_SELECTION_HALF_WIDTH_PX;
                        endPx = middlePx + TempConstants.MIN_SELECTION_HALF_WIDTH_PX;
                }
-               startTime = timelineMaster.getSecByPx(startPx) * TimelineConstants.TIME_SEC_TO_MS + TimelineConstants.MS_TO_FIXEDMS;
-               endTime = timelineMaster.getSecByPx(endPx) * TimelineConstants.TIME_SEC_TO_MS + TimelineConstants.MS_TO_FIXEDMS;
+               startTime = timelineMaster.getSecByPx(startPx) * TimelineConstants.TIME_SEC_TO_MS;
+               endTime = timelineMaster.getSecByPx(endPx) * TimelineConstants.TIME_SEC_TO_MS;
 
                timelineMaster.setSelectionMarkerValues(startTime, endTime);
        }
index cd37ef2..20353dc 100755 (executable)
@@ -57,7 +57,6 @@ import org.tizen.dynamicanalyzer.constants.TimelineConstants;
 import org.tizen.dynamicanalyzer.model.DASelectionData;
 import org.tizen.dynamicanalyzer.model.LogPackage;
 import org.tizen.dynamicanalyzer.model.SnapshotData;
-import org.tizen.dynamicanalyzer.nl.TimelineChartLables;
 import org.tizen.dynamicanalyzer.timeline.chart.CPUChart;
 import org.tizen.dynamicanalyzer.timeline.chart.CPUCoreChart;
 import org.tizen.dynamicanalyzer.timeline.chart.CPUFrequencyChart;
@@ -161,8 +160,7 @@ public class TimelineItemManager {
        private MouseListener itemZoomMouseListener = new MouseAdapter() {
                @Override
                public void mouseDown(MouseEvent event) {
-                       ItemInfoComposite itemInfoComp = (ItemInfoComposite) ((Label) event
-                                       .getSource()).getParent();
+                       ItemInfoComposite itemInfoComp = (ItemInfoComposite) ((Label) event.getSource()).getParent();
 
                        if (null == itemInfoComp) {
                                return;
@@ -173,15 +171,12 @@ public class TimelineItemManager {
 
                        TimelineItemSettingProvider.setItemZoomToggle(itemID);
 
-                       TimelineComposite timelineComposite = AnalyzerUtil
-                                       .getTimelineComposite();
+                       TimelineComposite timelineComposite = AnalyzerUtil.getTimelineComposite();
                        if (null != timelineComposite) {
                                timelineComposite.resizeItemArea();
-                               setActivateItem(localPageID, itemInfoComp.ID,
-                                               getItemInfoList(localPageID).size());
+                               setActivateItem(localPageID, itemInfoComp.ID, getItemInfoList(localPageID).size());
 
-                               if (TimelineConstants.ITEM_SIZE_MODE_MAX == TimelineItemSettingProvider
-                                               .getItemSetting(itemID).getSizeMode()) {
+                               if (TimelineConstants.ITEM_SIZE_MODE_MAX == TimelineItemSettingProvider.getItemSetting(itemID).getSizeMode()) {
                                        focusItem(itemID);
                                }
                        }
@@ -197,8 +192,7 @@ public class TimelineItemManager {
                                return;
                        }
 
-                       setActivateItem(localPageID, itemInfoComp.ID,
-                                       getItemNum(localPageID));
+                       setActivateItem(localPageID, itemInfoComp.ID, getItemNum(localPageID));
                }
        };
 
@@ -210,15 +204,13 @@ public class TimelineItemManager {
                                return;
                        }
 
-                       ItemInfoComposite itemInfoComp = (ItemInfoComposite) label
-                                       .getParent();
+                       ItemInfoComposite itemInfoComp = (ItemInfoComposite) label.getParent();
 
                        if (null == itemInfoComp) {
                                return;
                        }
 
-                       setActivateItem(localPageID, itemInfoComp.ID,
-                                       getItemNum(localPageID));
+                       setActivateItem(localPageID, itemInfoComp.ID, getItemNum(localPageID));
                }
        };
 
@@ -251,22 +243,15 @@ public class TimelineItemManager {
 
                        XYPlot xyplot = itemChartComp.getChart().getXYPlot();
                        Rectangle2D rect2D = plotInfo.getDataArea();
-                       rect2D.setRect(rect2D.getX(), rect2D.getY(),
-                                       canvas.getBounds().width - rect2D.getY(),
-                                       rect2D.getHeight());
+                       rect2D.setRect(rect2D.getX(), rect2D.getY(), canvas.getBounds().width - rect2D.getY(), rect2D.getHeight());
 
-                       Double selectionEndTime = xyplot.getDomainAxis().java2DToValue(e.x,
-                                       rect2D, xyplot.getDomainAxisEdge());
+                       Double selectionEndTime = xyplot.getDomainAxis().java2DToValue(e.x, rect2D, xyplot.getDomainAxisEdge());
                        tempUpTime = selectionEndTime;
 
                        setSelectionMarkerEndVal(selectionEndTime);
                        sendSelectionTimes();
 
-                       TimelineMaster.getInstance().highlightSelectedSnapshot(
-                                       selectionMarker.getStartValue()
-                                                       - TimelineConstants.MS_TO_FIXEDMS,
-                                       selectionMarker.getEndValue()
-                                                       - TimelineConstants.MS_TO_FIXEDMS);
+                       TimelineMaster.getInstance().highlightSelectedSnapshot(selectionMarker.getStartValue(), selectionMarker.getEndValue());
                }
 
                @Override
@@ -283,18 +268,12 @@ public class TimelineItemManager {
 
                        XYPlot xyplot = itemChartComp.getChart().getXYPlot();
                        Rectangle2D rect2D = plotInfo.getDataArea();
-                       rect2D.setRect(rect2D.getX(), rect2D.getY(),
-                                       canvas.getBounds().width - rect2D.getY(),
-                                       rect2D.getHeight());
+                       rect2D.setRect(rect2D.getX(), rect2D.getY(), canvas.getBounds().width - rect2D.getY(), rect2D.getHeight());
 
-                       tempDownTime = xyplot.getDomainAxis().java2DToValue(e.x, rect2D,
-                                       xyplot.getDomainAxisEdge());
-                       Double selectionStartTime = xyplot.getDomainAxis().java2DToValue(
-                                       e.x - TempConstants.MIN_SELECTION_HALF_WIDTH_PX, rect2D,
-                                       xyplot.getDomainAxisEdge());
-                       Double selectionEndTime = xyplot.getDomainAxis().java2DToValue(
-                                       e.x + TempConstants.MIN_SELECTION_HALF_WIDTH_PX, rect2D,
+                       tempDownTime = xyplot.getDomainAxis().java2DToValue(e.x, rect2D, xyplot.getDomainAxisEdge());
+                       Double selectionStartTime = xyplot.getDomainAxis().java2DToValue(e.x - TempConstants.MIN_SELECTION_HALF_WIDTH_PX, rect2D,
                                        xyplot.getDomainAxisEdge());
+                       Double selectionEndTime = xyplot.getDomainAxis().java2DToValue(e.x + TempConstants.MIN_SELECTION_HALF_WIDTH_PX, rect2D, xyplot.getDomainAxisEdge());
 
                        selectionMarker.setStartValue(selectionStartTime);
                        selectionMarker.setEndValue(selectionEndTime);
@@ -331,14 +310,11 @@ public class TimelineItemManager {
 
                        XYPlot xyplot = itemChartComp.getChart().getXYPlot();
                        Rectangle2D rect2D = plotInfo.getDataArea();
-                       rect2D.setRect(rect2D.getX(), rect2D.getY(),
-                                       canvas.getBounds().width - rect2D.getY(),
-                                       rect2D.getHeight());
+                       rect2D.setRect(rect2D.getX(), rect2D.getY(), canvas.getBounds().width - rect2D.getY(), rect2D.getHeight());
 
                        createTooltip(e);
 
-                       double chartX = xyplot.getDomainAxis().java2DToValue(e.x, rect2D,
-                                       xyplot.getDomainAxisEdge());
+                       double chartX = xyplot.getDomainAxis().java2DToValue(e.x, rect2D, xyplot.getDomainAxisEdge());
                        tooltipValue = getTooltipXPosition(chartX);
                        // FIXME tooltip
                        // tooltipMarker.setValue(tooltipValue);
@@ -354,14 +330,11 @@ public class TimelineItemManager {
        };
 
        @SuppressWarnings("unused")
-       private void drawVerticalLine(Graphics2D g2, Rectangle2D dataArea,
-                       double value, Stroke stroke, Paint paint, XYPlot xyplot) {
+       private void drawVerticalLine(Graphics2D g2, Rectangle2D dataArea, double value, Stroke stroke, Paint paint, XYPlot xyplot) {
                ValueAxis axis = xyplot.getDomainAxis();
                if (axis.getRange().contains(value)) {
-                       double xx = axis.valueToJava2D(value, dataArea,
-                                       RectangleEdge.BOTTOM);
-                       Line2D line = new Line2D.Double(xx, dataArea.getMinY(), xx,
-                                       dataArea.getMaxY());
+                       double xx = axis.valueToJava2D(value, dataArea, RectangleEdge.BOTTOM);
+                       Line2D line = new Line2D.Double(xx, dataArea.getMinY(), xx, dataArea.getMaxY());
                        g2.setStroke(stroke);
                        g2.setPaint(paint);
                        g2.draw(line);
@@ -383,12 +356,9 @@ public class TimelineItemManager {
 
                        XYPlot xyplot = itemChartComp.getChart().getXYPlot();
                        Rectangle2D rect2D = plotInfo.getDataArea();
-                       rect2D.setRect(rect2D.getX(), rect2D.getY(),
-                                       canvas.getBounds().width - rect2D.getY(),
-                                       rect2D.getHeight());
+                       rect2D.setRect(rect2D.getX(), rect2D.getY(), canvas.getBounds().width - rect2D.getY(), rect2D.getHeight());
 
-                       double x = xyplot.getDomainAxis().java2DToValue(e.x, rect2D,
-                                       xyplot.getDomainAxisEdge());
+                       double x = xyplot.getDomainAxis().java2DToValue(e.x, rect2D, xyplot.getDomainAxisEdge());
                        if (tooltipValue != getTooltipXPosition(x)) {
                                tooltipValue = getTooltipXPosition(x);
                                // FIXME tooltip
@@ -400,75 +370,58 @@ public class TimelineItemManager {
                                case TimelineConstants.CHART_TYPE_CPU:
                                        seriesList = CPUChart.getSeriesList();
                                        for (int i = 0; i < seriesList.size(); i++) {
-                                               double yValue = getYbyX(seriesList.get(i).toArray(),
-                                                               tooltipValue);
+                                               double yValue = getYbyX(seriesList.get(i).toArray(), tooltipValue);
 
-                                               indexInfoLabelList.get(i).setText(
-                                                               CPUChart.getTooltipContent(i, yValue));
+                                               indexInfoLabelList.get(i).setText(CPUChart.getTooltipContent(i, yValue));
                                        }
                                        break;
                                case TimelineConstants.CHART_TYPE_CPU_CORE:
                                        seriesList = CPUCoreChart.getSeriesList();
-                                       int seriesSize = CPUCoreChart.getCoreSize() == TempConstants.NOT_INITED ? 4
-                                                       : CPUCoreChart.getCoreSize();
+                                       int seriesSize = CPUCoreChart.getCoreSize() == TempConstants.NOT_INITED ? 4 : CPUCoreChart.getCoreSize();
                                        for (int i = 0; i < seriesSize; i++) {
-                                               double yValue = getYbyX(seriesList.get(i).toArray(),
-                                                               tooltipValue);
+                                               double yValue = getYbyX(seriesList.get(i).toArray(), tooltipValue);
 
-                                               indexInfoLabelList.get(i).setText(
-                                                               CPUCoreChart.getTooltipContent(i, yValue));
+                                               indexInfoLabelList.get(i).setText(CPUCoreChart.getTooltipContent(i, yValue));
                                        }
                                        break;
                                case TimelineConstants.CHART_TYPE_CPU_FREQUENCY:
                                        seriesList = CPUFrequencyChart.getSeriesList();
                                        for (int i = 0; i < seriesList.size(); i++) {
-                                               double yValue = getYbyX(seriesList.get(i).toArray(),
-                                                               tooltipValue);
+                                               double yValue = getYbyX(seriesList.get(i).toArray(), tooltipValue);
 
-                                               indexInfoLabelList.get(i).setText(
-                                                               CPUFrequencyChart.getTooltipContent(i, yValue));
+                                               indexInfoLabelList.get(i).setText(CPUFrequencyChart.getTooltipContent(i, yValue));
                                        }
                                        break;
                                case TimelineConstants.CHART_TYPE_HEAP:
                                        seriesList = HeapChart.getSeriesList();
                                        for (int i = 0; i < seriesList.size(); i++) {
-                                               double yValue = getYbyX(seriesList.get(i).toArray(),
-                                                               tooltipValue);
+                                               double yValue = getYbyX(seriesList.get(i).toArray(), tooltipValue);
 
-                                               indexInfoLabelList.get(i).setText(
-                                                               HeapChart.getTooltipContent(i, yValue));
+                                               indexInfoLabelList.get(i).setText(HeapChart.getTooltipContent(i, yValue));
                                        }
                                        break;
                                case TimelineConstants.CHART_TYPE_PROCESS_SIZE:
                                        seriesList = ProcessMemoryChart.getSeriesList();
                                        for (int i = 0; i < seriesList.size(); i++) {
-                                               double yValue = getYbyX(seriesList.get(i).toArray(),
-                                                               tooltipValue);
+                                               double yValue = getYbyX(seriesList.get(i).toArray(), tooltipValue);
 
-                                               indexInfoLabelList.get(i)
-                                                               .setText(
-                                                                               ProcessMemoryChart.getTooltipContent(i,
-                                                                                               yValue));
+                                               indexInfoLabelList.get(i).setText(ProcessMemoryChart.getTooltipContent(i, yValue));
                                        }
                                        break;
                                case TimelineConstants.CHART_TYPE_SYSTEM_MEMORY:
                                        seriesList = SystemMemoryChart.getSeriesList();
                                        for (int i = 0; i < seriesList.size(); i++) {
-                                               double yValue = getYbyX(seriesList.get(i).toArray(),
-                                                               tooltipValue);
+                                               double yValue = getYbyX(seriesList.get(i).toArray(), tooltipValue);
 
-                                               indexInfoLabelList.get(i).setText(
-                                                               SystemMemoryChart.getTooltipContent(i, yValue));
+                                               indexInfoLabelList.get(i).setText(SystemMemoryChart.getTooltipContent(i, yValue));
                                        }
                                        break;
                                case TimelineConstants.CHART_TYPE_FILE:
                                        seriesList = FileChart.getSeriesList();
                                        for (int i = 0; i < seriesList.size(); i++) {
-                                               double yValue = getYbyX(seriesList.get(i).toArray(),
-                                                               tooltipValue);
+                                               double yValue = getYbyX(seriesList.get(i).toArray(), tooltipValue);
 
-                                               indexInfoLabelList.get(i).setText(
-                                                               FileChart.getTooltipContent(i, yValue));
+                                               indexInfoLabelList.get(i).setText(FileChart.getTooltipContent(i, yValue));
                                        }
                                        break;
                                }
@@ -476,9 +429,7 @@ public class TimelineItemManager {
 
                        Point pt = itemChartComp.toDisplay(e.x, e.y);
                        Point size = tooltip.computeSize(SWT.DEFAULT, SWT.DEFAULT);
-                       tooltip.setBounds(pt.x + TOOLTIP_MARGIN, pt.y - e.y
-                                       + (itemChartComp.getBounds().height - size.y) / 2, size.x,
-                                       size.y);
+                       tooltip.setBounds(pt.x + TOOLTIP_MARGIN, pt.y - e.y + (itemChartComp.getBounds().height - size.y) / 2, size.x, size.y);
                }
        };
 
@@ -496,11 +447,8 @@ public class TimelineItemManager {
 
                XYPlot xyplot = itemChartComp.getChart().getXYPlot();
                Rectangle2D rect2D = plotInfo.getDataArea();
-               rect2D.setRect(rect2D.getX(), canvas.getBounds().y,
-                               canvas.getBounds().width - rect2D.getY(),
-                               canvas.getBounds().height);
-               double selectedTime = xyplot.getDomainAxis().java2DToValue(e.x, rect2D,
-                               xyplot.getDomainAxisEdge());
+               rect2D.setRect(rect2D.getX(), canvas.getBounds().y, canvas.getBounds().width - rect2D.getY(), canvas.getBounds().height);
+               double selectedTime = xyplot.getDomainAxis().java2DToValue(e.x, rect2D, xyplot.getDomainAxisEdge());
 
                Shell shell = AnalyzerUtil.getWorkbenchWindow().getShell();
                tooltip = new Shell(shell, SWT.ON_TOP | SWT.NO_FOCUS | SWT.TOOL);
@@ -513,8 +461,7 @@ public class TimelineItemManager {
                gridLayout.verticalSpacing = SPACING;
                tooltip.setLayout(gridLayout);
 
-               Font indexInfoFont = new Font(Display.getDefault(),
-                               FontResources.ARIAL, 8, SWT.NORMAL);
+               Font indexInfoFont = new Font(Display.getDefault(), FontResources.ARIAL, 8, SWT.NORMAL);
 
                RowData rowData;
                boolean show = true;
@@ -530,8 +477,7 @@ public class TimelineItemManager {
                        seriesSize = seriesList.size();
                        rowData = new RowData(10, 10);
 
-                       makeTooltip(seriesSize, seriesColorList, rowData, seriesList,
-                                       selectedTime, indexInfoFont, chartID);
+                       makeTooltip(seriesSize, seriesColorList, rowData, seriesList, selectedTime, indexInfoFont, chartID);
 
                        break;
                case TimelineConstants.CHART_TYPE_CPU:
@@ -540,19 +486,16 @@ public class TimelineItemManager {
                        seriesSize = seriesList.size();
                        rowData = new RowData(10, 10);
 
-                       makeTooltip(seriesSize, seriesColorList, rowData, seriesList,
-                                       selectedTime, indexInfoFont, chartID);
+                       makeTooltip(seriesSize, seriesColorList, rowData, seriesList, selectedTime, indexInfoFont, chartID);
 
                        break;
                case TimelineConstants.CHART_TYPE_CPU_CORE:
                        seriesList = CPUCoreChart.getSeriesList();
                        seriesColorList = CPUCoreChart.getSeriesColor();
-                       seriesSize = CPUCoreChart.getCoreSize() == TempConstants.NOT_INITED ? 4
-                                       : CPUCoreChart.getCoreSize();
+                       seriesSize = CPUCoreChart.getCoreSize() == TempConstants.NOT_INITED ? 4 : CPUCoreChart.getCoreSize();
                        rowData = new RowData(10, 10);
 
-                       makeTooltip(seriesSize, seriesColorList, rowData, seriesList,
-                                       selectedTime, indexInfoFont, chartID);
+                       makeTooltip(seriesSize, seriesColorList, rowData, seriesList, selectedTime, indexInfoFont, chartID);
 
                        break;
                case TimelineConstants.CHART_TYPE_CPU_FREQUENCY:
@@ -561,8 +504,7 @@ public class TimelineItemManager {
                        seriesSize = seriesList.size();
                        rowData = new RowData(10, 10);
 
-                       makeTooltip(seriesSize, seriesColorList, rowData, seriesList,
-                                       selectedTime, indexInfoFont, chartID);
+                       makeTooltip(seriesSize, seriesColorList, rowData, seriesList, selectedTime, indexInfoFont, chartID);
 
                        break;
                case TimelineConstants.CHART_TYPE_PROCESS_SIZE:
@@ -571,8 +513,7 @@ public class TimelineItemManager {
                        seriesSize = seriesList.size();
                        rowData = new RowData(10, 10);
 
-                       makeTooltip(seriesSize, seriesColorList, rowData, seriesList,
-                                       selectedTime, indexInfoFont, chartID);
+                       makeTooltip(seriesSize, seriesColorList, rowData, seriesList, selectedTime, indexInfoFont, chartID);
 
                        break;
                case TimelineConstants.CHART_TYPE_SYSTEM_MEMORY:
@@ -581,8 +522,7 @@ public class TimelineItemManager {
                        seriesSize = seriesList.size();
                        rowData = new RowData(10, 10);
 
-                       makeTooltip(seriesSize, seriesColorList, rowData, seriesList,
-                                       selectedTime, indexInfoFont, chartID);
+                       makeTooltip(seriesSize, seriesColorList, rowData, seriesList, selectedTime, indexInfoFont, chartID);
 
                        break;
                case TimelineConstants.CHART_TYPE_SNAPSHOT:
@@ -596,8 +536,7 @@ public class TimelineItemManager {
                                IndexInfoComposite.setLayout(new RowLayout(SWT.HORIZONTAL));
 
                                Canvas indexCanvas = new Canvas(IndexInfoComposite, SWT.NONE);
-                               indexCanvas.setBackground(getColorFromAwtColor(seriesColorList
-                                               .get(i)));
+                               indexCanvas.setBackground(getColorFromAwtColor(seriesColorList.get(i)));
                                indexCanvas.setLayoutData(rowData);
 
                                Label indexLabel = new Label(IndexInfoComposite, SWT.NONE);
@@ -623,8 +562,7 @@ public class TimelineItemManager {
                        seriesSize = seriesList.size();
                        rowData = new RowData(10, 10);
 
-                       makeTooltip(seriesSize, seriesColorList, rowData, seriesList,
-                                       selectedTime, indexInfoFont, chartID);
+                       makeTooltip(seriesSize, seriesColorList, rowData, seriesList, selectedTime, indexInfoFont, chartID);
 
                        break;
                // case TimelineConstants.CHART_TYPE_DEVICE:
@@ -683,18 +621,18 @@ public class TimelineItemManager {
                // break;
                }
 
-               int lifecycle = TimelineMaster.getInstance().getLifecycleByTime(
-                               selectedTime);
-               String lifecycleDetail = TimelineMaster.getInstance()
-                               .getLifecycleString(lifecycle);
-               if (lifecycleDetail != null) {
-                       show = true;
-                       Label lifecycleInfoColorLabel = new Label(tooltip, SWT.NONE);
-                       lifecycleInfoColorLabel
-                                       .setText(TimelineChartLables.TIMELINE_LINE_ITEM_MANAGER_APP_LABLE
-                                                       + lifecycleDetail);
-                       lifecycleInfoColorLabel.setFont(indexInfoFont);
-               }
+               // FIXME lifecycle
+               /*
+                * int lifecycle =
+                * TimelineMaster.getInstance().getLifecycleByTime(selectedTime); String
+                * lifecycleDetail =
+                * TimelineMaster.getInstance().getLifecycleString(lifecycle); if
+                * (lifecycleDetail != null) { show = true; Label
+                * lifecycleInfoColorLabel = new Label(tooltip, SWT.NONE);
+                * lifecycleInfoColorLabel
+                * .setText(TimelineChartLables.TIMELINE_LINE_ITEM_MANAGER_APP_LABLE +
+                * lifecycleDetail); lifecycleInfoColorLabel.setFont(indexInfoFont); }
+                */
 
                if (show) {
                        showTooltip(itemChartComp, e.x, e.y);
@@ -704,9 +642,7 @@ public class TimelineItemManager {
        private void showTooltip(ChartComposite chartComp, int x, int y) {
                Point size = tooltip.computeSize(SWT.DEFAULT, SWT.DEFAULT);
                Point pt = chartComp.toDisplay(x, y);
-               tooltip.setBounds(pt.x + TOOLTIP_MARGIN,
-                               pt.y - y + (chartComp.getBounds().height - size.y) / 2, size.x,
-                               size.y);
+               tooltip.setBounds(pt.x + TOOLTIP_MARGIN, pt.y - y + (chartComp.getBounds().height - size.y) / 2, size.x, size.y);
                tooltip.setVisible(true);
        }
 
@@ -741,10 +677,8 @@ public class TimelineItemManager {
                return seriesData[1][index];
        }
 
-       private void makeTooltip(int seriesSize,
-                       List<java.awt.Color> seriesColorList, RowData rowData,
-                       List<XYSeries> seriesList, double selectedTime, Font indexInfoFont,
-                       int chartType) {
+       private void makeTooltip(int seriesSize, List<java.awt.Color> seriesColorList, RowData rowData, List<XYSeries> seriesList, double selectedTime,
+                       Font indexInfoFont, int chartType) {
                for (int i = 0; i < seriesSize; i++) {
                        if (i == 0) {
                                indexInfoLabelList.clear();
@@ -754,8 +688,7 @@ public class TimelineItemManager {
                        IndexInfoComposite.setLayout(new RowLayout(SWT.HORIZONTAL));
 
                        Canvas indexCanvas = new Canvas(IndexInfoComposite, SWT.BORDER);
-                       indexCanvas.setBackground(getColorFromAwtColor(seriesColorList
-                                       .get(i)));
+                       indexCanvas.setBackground(getColorFromAwtColor(seriesColorList.get(i)));
                        indexCanvas.setLayoutData(rowData);
 
                        Label indexLabel = new Label(IndexInfoComposite, SWT.NONE);
@@ -771,23 +704,19 @@ public class TimelineItemManager {
                        } else if (chartType == TimelineConstants.CHART_TYPE_HEAP) {
                                indexLabel.setText(HeapChart.getTooltipContent(i, yValue));
                        } else if (chartType == TimelineConstants.CHART_TYPE_PROCESS_SIZE) {
-                               indexLabel.setText(ProcessMemoryChart.getTooltipContent(i,
-                                               yValue));
+                               indexLabel.setText(ProcessMemoryChart.getTooltipContent(i, yValue));
                        } else if (chartType == TimelineConstants.CHART_TYPE_SYSTEM_MEMORY) {
-                               indexLabel.setText(SystemMemoryChart.getTooltipContent(i,
-                                               yValue));
+                               indexLabel.setText(SystemMemoryChart.getTooltipContent(i, yValue));
                        } else if (chartType == TimelineConstants.CHART_TYPE_FILE) {
                                indexLabel.setText(FileChart.getTooltipContent(i, yValue));
                        } else if (chartType == TimelineConstants.CHART_TYPE_CPU_FREQUENCY) {
-                               indexLabel.setText(CPUFrequencyChart.getTooltipContent(i,
-                                               yValue));
+                               indexLabel.setText(CPUFrequencyChart.getTooltipContent(i, yValue));
                        }
                }
        }
 
        private Color getColorFromAwtColor(java.awt.Color color) {
-               return new Color(Display.getDefault(), color.getRed(),
-                               color.getGreen(), color.getBlue());
+               return new Color(Display.getDefault(), color.getRed(), color.getGreen(), color.getBlue());
        }
 
        public void addItems(int tabID, Composite page) {
@@ -818,8 +747,7 @@ public class TimelineItemManager {
 
        public void updateActiveItem(double runTimeMs) {
                chartManager.updateChart(runTimeMs);
-               SnapshotData.getInstance().querySnapshotInfo(
-                               runTimeMs * TimelineConstants.TIME_US_TO_MS);
+               SnapshotData.getInstance().querySnapshotInfo(runTimeMs * TimelineConstants.TIME_US_TO_MS);
        }
 
        public void clear() {
@@ -972,8 +900,7 @@ public class TimelineItemManager {
                List<ItemInfo> ItemList = getItemInfoList(localPageID);
 
                for (int i = 0; i < selectedItemList.size(); i++) {
-                       ItemInfo info = createItemInfo(itemsAreaComp, localPageID,
-                                       TimelineUtils.getChartType(selectedItemList.get(i)));
+                       ItemInfo info = createItemInfo(itemsAreaComp, localPageID, TimelineUtils.getChartType(selectedItemList.get(i)));
                        ItemList.add(info);
                }
 
@@ -997,15 +924,12 @@ public class TimelineItemManager {
        private void setSelectionMarkerEndVal(Double endTime) {
                double selectionMarkerStartValue = selectionMarker.getStartValue();
                double selectionMarkerEndValue = selectionMarker.getEndValue();
-               if (endTime >= selectionMarkerStartValue
-                               && endTime <= selectionMarkerEndValue) {
+               if (endTime >= selectionMarkerStartValue && endTime <= selectionMarkerEndValue) {
                        return;
                }
 
-               double minSelectionWidthTime = selectionMarkerEndValue
-                               - selectionMarkerStartValue;
-               if (endTime < selectionMarkerStartValue
-                               && endTime > selectionMarkerStartValue - minSelectionWidthTime) {
+               double minSelectionWidthTime = selectionMarkerEndValue - selectionMarkerStartValue;
+               if (endTime < selectionMarkerStartValue && endTime > selectionMarkerStartValue - minSelectionWidthTime) {
                        selectionMarker.setStartValue(endTime);
                        return;
                }
@@ -1022,65 +946,51 @@ public class TimelineItemManager {
                long coolBarTime = CoolbarArea.getInstance().getTime();
 
                if (tempDownTime == tempUpTime) {
-                       long time = (long) ((tempDownTime - TimelineConstants.MS_TO_FIXEDMS)
-                                       * TimelineConstants.TIME_SEC_TO_MS * TimelineConstants.TIME_SEC_TO_MS);
+                       long time = (long) (tempDownTime * TimelineConstants.TIME_SEC_TO_MS * TimelineConstants.TIME_SEC_TO_MS);
                        if (time <= coolBarTime) {
-                               AnalyzerManager.getCurrentPage().updatePage(
-                                               new DASelectionData(TimelineComposite.ID, time, time,
-                                                               null, null));
+                               AnalyzerManager.getCurrentPage().updatePage(new DASelectionData(TimelineComposite.ID, time, time, null, null));
                        }
                } else {
-                       long startTime = (long) ((selectionMarker.getStartValue() - TimelineConstants.MS_TO_FIXEDMS)
-                                       * TimelineConstants.TIME_SEC_TO_MS * TimelineConstants.TIME_SEC_TO_MS);
-                       long endTime = (long) ((selectionMarker.getEndValue() - TimelineConstants.MS_TO_FIXEDMS)
-                                       * TimelineConstants.TIME_SEC_TO_MS * TimelineConstants.TIME_SEC_TO_MS);
+                       long startTime = (long) (selectionMarker.getStartValue() * TimelineConstants.TIME_SEC_TO_MS * TimelineConstants.TIME_SEC_TO_MS);
+                       long endTime = (long) (selectionMarker.getEndValue() * TimelineConstants.TIME_SEC_TO_MS * TimelineConstants.TIME_SEC_TO_MS);
                        if (startTime < coolBarTime) {
                                if (endTime > coolBarTime) {
                                        endTime = coolBarTime;
                                }
-                               AnalyzerManager.getCurrentPage().updatePage(
-                                               new DASelectionData(TimelineComposite.ID, startTime,
-                                                               endTime, null, null));
+                               AnalyzerManager.getCurrentPage().updatePage(new DASelectionData(TimelineComposite.ID, startTime, endTime, null, null));
                        }
                }
        }
 
        private Composite createItemPage(int tabID, Composite rscPage) {
                /* CPU */
-               ItemInfo infoCPU = createItemInfo(rscPage, tabID,
-                               TimelineConstants.CHART_TYPE_CPU);
+               ItemInfo infoCPU = createItemInfo(rscPage, tabID, TimelineConstants.CHART_TYPE_CPU);
                realTimeItemList.add(infoCPU);
 
                /* CPU Core */
-               ItemInfo infoCPUCore = createItemInfo(rscPage, tabID,
-                               TimelineConstants.CHART_TYPE_CPU_CORE);
+               ItemInfo infoCPUCore = createItemInfo(rscPage, tabID, TimelineConstants.CHART_TYPE_CPU_CORE);
                realTimeItemList.add(infoCPUCore);
 
                /* CPU Frequency */
                @SuppressWarnings("unused")
-               ItemInfo infoCPUFreq = createItemInfo(rscPage, tabID,
-                               TimelineConstants.CHART_TYPE_CPU_FREQUENCY);
+               ItemInfo infoCPUFreq = createItemInfo(rscPage, tabID, TimelineConstants.CHART_TYPE_CPU_FREQUENCY);
                // realTimeItemList.add(infoCPUFreq);
 
                /* Allocated memory */
-               ItemInfo infoAlloc = createItemInfo(rscPage, tabID,
-                               TimelineConstants.CHART_TYPE_HEAP);
+               ItemInfo infoAlloc = createItemInfo(rscPage, tabID, TimelineConstants.CHART_TYPE_HEAP);
                realTimeItemList.add(infoAlloc);
 
                /* Process memory */
-               ItemInfo infoProcessMem = createItemInfo(rscPage, tabID,
-                               TimelineConstants.CHART_TYPE_PROCESS_SIZE);
+               ItemInfo infoProcessMem = createItemInfo(rscPage, tabID, TimelineConstants.CHART_TYPE_PROCESS_SIZE);
                realTimeItemList.add(infoProcessMem);
 
                /* Available memory */
-               ItemInfo infoAvailableMem = createItemInfo(rscPage, tabID,
-                               TimelineConstants.CHART_TYPE_SYSTEM_MEMORY);
+               ItemInfo infoAvailableMem = createItemInfo(rscPage, tabID, TimelineConstants.CHART_TYPE_SYSTEM_MEMORY);
                realTimeItemList.add(infoAvailableMem);
 
                /* Snapshot */
                @SuppressWarnings("unused")
-               ItemInfo infoSnapshot = createItemInfo(rscPage, tabID,
-                               TimelineConstants.CHART_TYPE_SNAPSHOT);
+               ItemInfo infoSnapshot = createItemInfo(rscPage, tabID, TimelineConstants.CHART_TYPE_SNAPSHOT);
                // realTimeItemList.add(infoSnapshot);
 
                /* Device */
@@ -1092,8 +1002,7 @@ public class TimelineItemManager {
                // TimelineConstants.CHART_TYPE_ENERGY);
                // realTimeItemList.add(infoEnergy);
                /* File */
-               ItemInfo infoFile = createItemInfo(rscPage, tabID,
-                               TimelineConstants.CHART_TYPE_FILE);
+               ItemInfo infoFile = createItemInfo(rscPage, tabID, TimelineConstants.CHART_TYPE_FILE);
                realTimeItemList.add(infoFile);
 
                // setSelectedItemColor(tabID, realTimeItemList.get(0));
@@ -1103,28 +1012,17 @@ public class TimelineItemManager {
        }
 
        private Composite createBatteryPage(int tabID, Composite batPage) {
-               ItemInfo infoCPU = createItemInfo(batPage, tabID,
-                               TimelineConstants.CHART_TYPE_CPU);
-               ItemInfo infoMemory = createItemInfo(batPage, tabID,
-                               TimelineConstants.CHART_TYPE_PROCESS_SIZE);
-               ItemInfo infoVoltage = createItemInfo(batPage, tabID,
-                               TimelineConstants.CHART_TYPE_VOLTAGE);
-               ItemInfo infoBright = createItemInfo(batPage, tabID,
-                               TimelineConstants.CHART_TYPE_BRIGHTNESS);
-               ItemInfo infoWifi = createItemInfo(batPage, tabID,
-                               TimelineConstants.CHART_TYPE_WIFI);
-               ItemInfo infoBT = createItemInfo(batPage, tabID,
-                               TimelineConstants.CHART_TYPE_BT);
-               ItemInfo infoGPS = createItemInfo(batPage, tabID,
-                               TimelineConstants.CHART_TYPE_GPS);
-               ItemInfo infoCamera = createItemInfo(batPage, tabID,
-                               TimelineConstants.CHART_TYPE_CAMERA);
-               ItemInfo infoAudio = createItemInfo(batPage, tabID,
-                               TimelineConstants.CHART_TYPE_AUDIO);
-               ItemInfo infoSound = createItemInfo(batPage, tabID,
-                               TimelineConstants.CHART_TYPE_SOUND);
-               ItemInfo infoVibration = createItemInfo(batPage, tabID,
-                               TimelineConstants.CHART_TYPE_VIBRATION);
+               ItemInfo infoCPU = createItemInfo(batPage, tabID, TimelineConstants.CHART_TYPE_CPU);
+               ItemInfo infoMemory = createItemInfo(batPage, tabID, TimelineConstants.CHART_TYPE_PROCESS_SIZE);
+               ItemInfo infoVoltage = createItemInfo(batPage, tabID, TimelineConstants.CHART_TYPE_VOLTAGE);
+               ItemInfo infoBright = createItemInfo(batPage, tabID, TimelineConstants.CHART_TYPE_BRIGHTNESS);
+               ItemInfo infoWifi = createItemInfo(batPage, tabID, TimelineConstants.CHART_TYPE_WIFI);
+               ItemInfo infoBT = createItemInfo(batPage, tabID, TimelineConstants.CHART_TYPE_BT);
+               ItemInfo infoGPS = createItemInfo(batPage, tabID, TimelineConstants.CHART_TYPE_GPS);
+               ItemInfo infoCamera = createItemInfo(batPage, tabID, TimelineConstants.CHART_TYPE_CAMERA);
+               ItemInfo infoAudio = createItemInfo(batPage, tabID, TimelineConstants.CHART_TYPE_AUDIO);
+               ItemInfo infoSound = createItemInfo(batPage, tabID, TimelineConstants.CHART_TYPE_SOUND);
+               ItemInfo infoVibration = createItemInfo(batPage, tabID, TimelineConstants.CHART_TYPE_VIBRATION);
 
                batteryItemList.add(infoCPU);
                batteryItemList.add(infoMemory);
@@ -1165,8 +1063,7 @@ public class TimelineItemManager {
                FormLayout fLayout = new FormLayout();
                infoComp.setLayout(fLayout);
 
-               if (chartType != TimelineConstants.CHART_TYPE_SNAPSHOT
-                               && chartType != TimelineConstants.CHART_TYPE_DEVICE) {
+               if (chartType != TimelineConstants.CHART_TYPE_SNAPSHOT && chartType != TimelineConstants.CHART_TYPE_DEVICE) {
                        addZoomLabel(infoComp, chartType);
                }
                addIconInfoLabel(infoComp, chartType);
@@ -1186,8 +1083,7 @@ public class TimelineItemManager {
                infoComp.infoZoomLabel.setText(info);
                infoComp.infoZoomLabel.setImage(ImageResources.TIMLINE_FULL);
                infoComp.infoZoomLabel.setAlignment(SWT.RIGHT);
-               FormData fData2 = new FormData(ITEM_INFO_ZOOM_HEIGHT,
-                               ITEM_INFO_ZOOM_HEIGHT);
+               FormData fData2 = new FormData(ITEM_INFO_ZOOM_HEIGHT, ITEM_INFO_ZOOM_HEIGHT);
 
                fData2.top = new FormAttachment(1, 0);
                fData2.left = new FormAttachment(82, 0);
@@ -1204,16 +1100,13 @@ public class TimelineItemManager {
                infoComp.infoIconLabel = new Label(infoComp, SWT.NONE);
                infoComp.infoIconLabel.setImage(TimelineUtils.getIconImage(chartType));
                infoComp.infoIconLabel.setAlignment(SWT.CENTER);
-               FormData fData = new FormData(
-                               TimelineConstants.TIMELINE_ITEM_INFO_WIDTH,
-                               ITEM_INFO_ICON_HEIGHT);
+               FormData fData = new FormData(TimelineConstants.TIMELINE_ITEM_INFO_WIDTH, ITEM_INFO_ICON_HEIGHT);
                fData.top = new FormAttachment(8, 0);
                infoComp.infoIconLabel.setLayoutData(fData);
                infoComp.infoIconLabel.addMouseListener(itemLableMouseListener);
        }
 
-       private boolean addTextInfoLabel(ItemInfoComposite infoComp, int chartType,
-                       boolean isAlone) {
+       private boolean addTextInfoLabel(ItemInfoComposite infoComp, int chartType, boolean isAlone) {
                String info = TimelineUtils.getStringChartType(chartType);
 
                if (null == infoComp || infoComp.isDisposed()) {
@@ -1225,9 +1118,7 @@ public class TimelineItemManager {
                infoComp.infoTextLabel.setForeground(ColorResources.WHITE);
                infoComp.infoTextLabel.setText(info);
                infoComp.infoTextLabel.setAlignment(SWT.CENTER);
-               FormData fData2 = new FormData(
-                               TimelineConstants.TIMELINE_ITEM_INFO_WIDTH,
-                               ITEM_INFO_LABEL_HEIGHT);
+               FormData fData2 = new FormData(TimelineConstants.TIMELINE_ITEM_INFO_WIDTH, ITEM_INFO_LABEL_HEIGHT);
                if (isAlone) {
                        fData2.top = new FormAttachment(0, 8);
                } else {
@@ -1258,14 +1149,12 @@ public class TimelineItemManager {
                iteminfo.itemComp.setBackground(ColorResources.GRAY_170);
 
                /* Item info composite */
-               final ItemInfoComposite itemInfoComp = createItemInfoComp(
-                               iteminfo.itemComp, chartType);
+               final ItemInfoComposite itemInfoComp = createItemInfoComp(iteminfo.itemComp, chartType);
                if (chartType == TimelineConstants.CHART_TYPE_SNAPSHOT) {
                        TempConstants.isSnapshotChartDisposed = false;
                }
                GridData gDataInfo = new GridData();
-               if (chartType == TimelineConstants.CHART_TYPE_SNAPSHOT
-                               || chartType == TimelineConstants.CHART_TYPE_DEVICE) {
+               if (chartType == TimelineConstants.CHART_TYPE_SNAPSHOT || chartType == TimelineConstants.CHART_TYPE_DEVICE) {
                        gDataInfo.heightHint = TimelineConstants.ITEM_HEIGHT_DEF;
                        gDataInfo.verticalAlignment = GridData.BEGINNING;
                } else {
@@ -1279,18 +1168,15 @@ public class TimelineItemManager {
 
                /* Item Chart composite */
                JFreeChart chart = chartManager.createTimelineChart(chartType);
-               final ChartComposite itemChartComposite = new ChartComposite(
-                               iteminfo.itemComp, SWT.NONE, chart, true) {
-                       protected Menu createPopupMenu(boolean properties, boolean save,
-                                       boolean print, boolean zoom) {
+               final ChartComposite itemChartComposite = new ChartComposite(iteminfo.itemComp, SWT.NONE, chart, true) {
+                       protected Menu createPopupMenu(boolean properties, boolean save, boolean print, boolean zoom) {
                                return null;
                        }
                };
                itemChartComposite.setData(chartType);
 
                GridData gDataChart;
-               if (chartType == TimelineConstants.CHART_TYPE_SNAPSHOT
-                               || chartType == TimelineConstants.CHART_TYPE_DEVICE) {
+               if (chartType == TimelineConstants.CHART_TYPE_SNAPSHOT || chartType == TimelineConstants.CHART_TYPE_DEVICE) {
                        gDataChart = new GridData(GridData.FILL_HORIZONTAL);
                        gDataChart.heightHint = TempConstants.JFREE_MIN_SIZE;
                } else {
@@ -1316,13 +1202,11 @@ public class TimelineItemManager {
                if (tooltipMarker == null) {
                        initTooltipMarker();
                }
-               itemChartComposite.getChart().getXYPlot()
-                               .addDomainMarker(selectionMarker, Layer.FOREGROUND);
+               itemChartComposite.getChart().getXYPlot().addDomainMarker(selectionMarker, Layer.FOREGROUND);
                // FIXME tooltip
                // itemChartComposite.getChart().getXYPlot().addDomainMarker(tooltipMarker,
                // Layer.FOREGROUND);
-               TimelineMaster.getInstance().addChartPlot(
-                               itemChartComposite.getChart().getXYPlot());
+               TimelineMaster.getInstance().addChartPlot(itemChartComposite.getChart().getXYPlot());
 
                iteminfo.infoComp = itemInfoComp;
                iteminfo.chartComp = itemChartComposite;
@@ -1336,16 +1220,11 @@ public class TimelineItemManager {
                }
 
                for (int i = 0; i < ItemList.size(); i++) {
-                       if (null != ItemList.get(i).chartComp
-                                       && !ItemList.get(i).chartComp.isDisposed()) {
-                               ItemList.get(i).chartComp
-                                               .removeMouseListener(itemMouseListener);
-                               ItemList.get(i).chartComp
-                                               .removeMouseTrackListener(chartMouseTrackListener);
-                               ItemList.get(i).chartComp
-                                               .removeMouseMoveListener(chartMouseMoveListener);
-                               ItemList.get(i).chartComp.getChart().getXYPlot()
-                                               .removeDomainMarker(selectionMarker);
+                       if (null != ItemList.get(i).chartComp && !ItemList.get(i).chartComp.isDisposed()) {
+                               ItemList.get(i).chartComp.removeMouseListener(itemMouseListener);
+                               ItemList.get(i).chartComp.removeMouseTrackListener(chartMouseTrackListener);
+                               ItemList.get(i).chartComp.removeMouseMoveListener(chartMouseMoveListener);
+                               ItemList.get(i).chartComp.getChart().getXYPlot().removeDomainMarker(selectionMarker);
                                // FIXME tooltip
                                // ItemList.get(i).chartComp.getChart().getXYPlot().removeDomainMarker(tooltipMarker);
                        }
@@ -1363,8 +1242,7 @@ public class TimelineItemManager {
                List<ItemInfo> infoList = getItemInfoList(localPageID);
 
                for (int i = 0; i < infoList.size(); i++) {
-                       TimelineItemSetting itemSetting = TimelineItemSettingProvider
-                                       .getItemSetting(infoList.get(i).itemType);
+                       TimelineItemSetting itemSetting = TimelineItemSettingProvider.getItemSetting(infoList.get(i).itemType);
                        setItemSize(infoList.get(i), width, itemSetting.getSizeMode());
                }
 
@@ -1405,8 +1283,7 @@ public class TimelineItemManager {
                Rectangle rect = composite.getClientArea();
 
                if (null == itemImage) {
-                       itemImage = new Image(composite.getDisplay(), 1, Math.max(1,
-                                       rect.height));
+                       itemImage = new Image(composite.getDisplay(), 1, Math.max(1, rect.height));
                        GC gc = new GC(itemImage);
                        gc.setForeground(ColorResources.GRAY_210); // brighter
                        gc.setBackground(ColorResources.GRAY_130); // darker
@@ -1416,8 +1293,7 @@ public class TimelineItemManager {
                } else if (itemImage.getBounds().height != rect.height) {
 
                        itemImage.dispose();
-                       itemImage = new Image(composite.getDisplay(), 1, Math.max(1,
-                                       rect.height));
+                       itemImage = new Image(composite.getDisplay(), 1, Math.max(1, rect.height));
                        GC gc = new GC(itemImage);
                        gc.setForeground(ColorResources.GRAY_210); // brighter
                        gc.setBackground(ColorResources.GRAY_130); // darker
@@ -1439,8 +1315,7 @@ public class TimelineItemManager {
                Rectangle rect = composite.getClientArea();
 
                if (null == selectedItemImage) {
-                       selectedItemImage = new Image(composite.getDisplay(), 1, Math.max(
-                                       1, rect.height));
+                       selectedItemImage = new Image(composite.getDisplay(), 1, Math.max(1, rect.height));
                        GC gc = new GC(selectedItemImage);
                        gc.setForeground(ColorResources.ITEM_BLUE_BRIGHT); // brighter
                        gc.setBackground(ColorResources.ITEM_BLUE_DARK); // darker
@@ -1450,8 +1325,7 @@ public class TimelineItemManager {
                } else if (selectedItemImage.getBounds().height != rect.height) {
 
                        selectedItemImage.dispose();
-                       selectedItemImage = new Image(composite.getDisplay(), 1, Math.max(
-                                       1, rect.height));
+                       selectedItemImage = new Image(composite.getDisplay(), 1, Math.max(1, rect.height));
                        GC gc = new GC(selectedItemImage);
                        gc.setForeground(ColorResources.ITEM_BLUE_BRIGHT); // brighter
                        gc.setBackground(ColorResources.ITEM_BLUE_DARK); // darker
@@ -1472,8 +1346,7 @@ public class TimelineItemManager {
                }
 
                if (isSelected) {
-                       chartComp.getChart().setBackgroundPaint(
-                                       ColorResources.ITEM_BLUE_AWT);
+                       chartComp.getChart().setBackgroundPaint(ColorResources.ITEM_BLUE_AWT);
                } else {
                        chartComp.getChart().setBackgroundPaint(ColorResources.ITEM_BG_AWT);
                }
@@ -1549,39 +1422,33 @@ public class TimelineItemManager {
                ScrolledComposite sc = (ScrolledComposite) itemsAreaComp.getParent();
 
                if (itemsAreaComp.getBounds().height - sc.getClientArea().height < focusY) {
-                       focusY = itemsAreaComp.getBounds().height
-                                       - sc.getClientArea().height;
+                       focusY = itemsAreaComp.getBounds().height - sc.getClientArea().height;
                }
 
                itemsAreaComp.setLocation(0, -focusY);
                sc.getVerticalBar().setSelection(focusY);
        }
 
-       private void setItemInfoIconVisible(ItemInfoComposite infoComp,
-                       boolean isIconVisible) {
+       private void setItemInfoIconVisible(ItemInfoComposite infoComp, boolean isIconVisible) {
                if (null == infoComp) {
                        return;
                }
 
                if (isIconVisible) {
-                       if (null == infoComp.getIconLabel()
-                                       || infoComp.getIconLabel().isDisposed()) {
-                               addIconInfoLabel(infoComp,
-                                               TimelineUtils.getChartType(infoComp.ID));
+                       if (null == infoComp.getIconLabel() || infoComp.getIconLabel().isDisposed()) {
+                               addIconInfoLabel(infoComp, TimelineUtils.getChartType(infoComp.ID));
 
                                if (null != infoComp.infoTextLabel) {
                                        infoComp.infoTextLabel.dispose();
                                }
-                               addTextInfoLabel(infoComp,
-                                               TimelineUtils.getChartType(infoComp.ID), false);
+                               addTextInfoLabel(infoComp, TimelineUtils.getChartType(infoComp.ID), false);
                        }
                } else {
                        if (null != infoComp.infoIconLabel) {
                                infoComp.infoIconLabel.dispose();
                                infoComp.infoTextLabel.dispose();
 
-                               boolean isSucced = addTextInfoLabel(infoComp,
-                                               TimelineUtils.getChartType(infoComp.ID), true);
+                               boolean isSucced = addTextInfoLabel(infoComp, TimelineUtils.getChartType(infoComp.ID), true);
                                if (isSucced) {
                                        infoComp.layout();
                                }
index 7950bb4..0b8bec2 100644 (file)
@@ -33,7 +33,7 @@ public class TimelineItemsProvider {
                availableItemsList.add(TimelineUtils.getStringChartType(TimelineConstants.CHART_TYPE_HEAP));
                availableItemsList.add(TimelineUtils.getStringChartType(TimelineConstants.CHART_TYPE_PROCESS_SIZE));
                availableItemsList.add(TimelineUtils.getStringChartType(TimelineConstants.CHART_TYPE_SYSTEM_MEMORY));
-               availableItemsList.add(TimelineUtils.getStringChartType(TimelineConstants.CHART_TYPE_SNAPSHOT));
+//             availableItemsList.add(TimelineUtils.getStringChartType(TimelineConstants.CHART_TYPE_SNAPSHOT));
 //             availableItemsList.add(TimelineUtils.getStringChartType(TimelineConstants.CHART_TYPE_ENERGY));
                availableItemsList.add(TimelineUtils.getStringChartType(TimelineConstants.CHART_TYPE_FILE));
 //             availableItemsList.add(TimelineUtils.getStringChartType(TimelineConstants.CHART_TYPE_DEVICE));
index ff23405..605e65c 100644 (file)
@@ -211,7 +211,7 @@ public class TimelineMaster {
                snapShotInfos.add(new SnapShotInfo(time, seq));
 
                Image snapShotImage = convertToAWT(imgDesc.createImage().getImageData());
-               time = time / TimelineConstants.TIME_SEC_TO_MS / TimelineConstants.TIME_US_TO_MS + TimelineConstants.MS_TO_FIXEDMS;
+               time = time / TimelineConstants.TIME_SEC_TO_MS / TimelineConstants.TIME_US_TO_MS;
                XYImageAnnotation snapShotImgAnnotation = new XYImageAnnotation(time, 0.8, snapShotImage, RectangleAnchor.BOTTOM_LEFT);
                snapshotAnnotations.add(snapShotImgAnnotation);
                if (!TempConstants.isSnapshotChartDisposed) {
@@ -255,7 +255,7 @@ public class TimelineMaster {
                }
 
                Image snapShotImage = convertToAWT(imgDesc.createImage().getImageData());
-               double time = snapShotInfo.time / TimelineConstants.TIME_US_TO_MS / TimelineConstants.TIME_US_TO_MS + TimelineConstants.MS_TO_FIXEDMS;
+               double time = snapShotInfo.time / TimelineConstants.TIME_US_TO_MS / TimelineConstants.TIME_US_TO_MS;
 
                if (selectedImageAnnotation != null) {
                        snapShotXYPlot.removeAnnotation(selectedImageAnnotation);
@@ -378,7 +378,7 @@ public class TimelineMaster {
                lifecycleMarkers.clear();
                lifecycleValues.clear();
 
-               AppLifecycleInfo baseInfo = new AppLifecycleInfo(TempConstants.LIFECYCLE_CREATE, TimelineConstants.MS_TO_FIXEDMS);
+               AppLifecycleInfo baseInfo = new AppLifecycleInfo(TempConstants.LIFECYCLE_CREATE, 0);
                lifecycleInfoList.add(baseInfo);
                lifecycleMarkers.add(baseInfo.marker);
                lifecycleValues.add(TempConstants.LIFECYCLE_CREATE);
@@ -391,14 +391,14 @@ public class TimelineMaster {
                                @Override
                                public void run() {
                                        try {
-                                               lastInfo.marker.setEndValue(time + TimelineConstants.MS_TO_FIXEDMS);
+                                               lastInfo.marker.setEndValue(time);
                                        } catch (SWTException e) {
                                                // widget disposed
                                        }
                                }
                        });
                        if (lastInfo.lifecycle != lifecycle) {
-                               AppLifecycleInfo newInfo = new AppLifecycleInfo(lifecycle, time + TimelineConstants.MS_TO_FIXEDMS);
+                               AppLifecycleInfo newInfo = new AppLifecycleInfo(lifecycle, time);
                                lifecycleInfoList.add(newInfo);
                        }
                        lifecycleInfoList.notify();
@@ -415,7 +415,7 @@ public class TimelineMaster {
                                @Override
                                public void run() {
                                        try {
-                                               lifecycleInfoList.get(0).marker.setEndValue(time + TimelineConstants.MS_TO_FIXEDMS);
+                                               lifecycleInfoList.get(0).marker.setEndValue(time);
                                        } catch (SWTException e) {
                                                // widget disposed
                                        }
@@ -431,7 +431,7 @@ public class TimelineMaster {
                                        final AppLifecycleInfo lifecycleInfo = lifecycleInfoList.get(i);
                                        if (i == lifecycleInfoList.size() - 1) {
                                                for (XYPlot chartPlot : chartPlots) {
-                                                       lifecycleInfo.marker.setEndValue(time + TimelineConstants.MS_TO_FIXEDMS);
+                                                       lifecycleInfo.marker.setEndValue(time);
                                                        chartPlot.addDomainMarker(lifecycleInfo.marker, Layer.BACKGROUND);
                                                }
                                                lifecycleMarkers.add(lifecycleInfo.marker);
index 34579ac..b8b3cce 100644 (file)
@@ -1,6 +1,5 @@
 package org.tizen.dynamicanalyzer.timeline;
 
-import org.tizen.dynamicanalyzer.constants.TimelineConstants;
 
 public class TimelineSelection {
 
@@ -58,7 +57,7 @@ public class TimelineSelection {
                microsecond = 0;
                microsecond = 0;
                second = 0;
-               fixedMilisecond = TimelineConstants.MS_TO_FIXEDMS;
+               fixedMilisecond = 0;
                seletedPixel = 0;
 
        }
index 72a8d81..ad23f1a 100644 (file)
@@ -58,24 +58,24 @@ public class CPUChart extends TimelineChart {
        
        public static List<XYSeries> getSeriesList() {
                ArrayList<XYSeries> seriesList = new ArrayList<XYSeries>();
-               seriesList.add(appLoadInfo.baseSeries);
                seriesList.add(totalLoadInfo.baseSeries);
+               seriesList.add(appLoadInfo.baseSeries);
                
                return seriesList;
        }
        
        private static List<String> getSeriesNameList() {
                ArrayList<String> seriesNameList = new ArrayList<String>();
-               seriesNameList.add(SERIES_NAME_APP_LOAD);
                seriesNameList.add(SERIES_NAME_TOTAL_LOAD);
+               seriesNameList.add(SERIES_NAME_APP_LOAD);
                
                return seriesNameList;
        }
        
        public static List<Color> getSeriesColor() {
                ArrayList<Color> seriesColorList = new ArrayList<Color>();
-               seriesColorList.add(COLOR_APP_LOAD);
                seriesColorList.add(COLOR_TOTAL_LOAD);
+               seriesColorList.add(COLOR_APP_LOAD);
                
                return seriesColorList;
        }
index c2fdc14..0c06dbd 100644 (file)
@@ -9,7 +9,6 @@ import org.tizen.dynamicanalyzer.constants.TimelineConstants;
 import org.tizen.dynamicanalyzer.model.LogPackage;
 import org.tizen.dynamicanalyzer.model.Logs;
 import org.tizen.dynamicanalyzer.timeline.TimelineItemsProvider;
-import org.tizen.dynamicanalyzer.timeline.TimelineMaster;
 import org.tizen.dynamicanalyzer.timeline.chart.deprecated.AudioChart;
 import org.tizen.dynamicanalyzer.timeline.chart.deprecated.BTChart;
 import org.tizen.dynamicanalyzer.timeline.chart.deprecated.BrightnessChart;
@@ -225,6 +224,8 @@ public class ChartDataSetCenter {
                                        return;
                                }
 
+//                             FIXME lifecycle
+                               /*
                                double time = 0;
                                String apiName = null;
 
@@ -233,6 +234,7 @@ public class ChartDataSetCenter {
 
                                int lifecycle = TimelineMaster.getInstance().getLifecycleValue(apiName);
                                TimelineMaster.getInstance().getMakeLifecycleInfoThread(lifecycle, time).run();
+                               */
                        }
                }
 
index 3464676..4774cbf 100644 (file)
@@ -42,11 +42,11 @@ public class DeviceChart extends TimelineChart {
        public static final Color COLOR_CALL_VOICE = TempConstants.LINE_COLOR_GOLDENROD;
        public static final Color COLOR_CALL_VIDEO = TempConstants.LINE_COLOR_TURQUOISE;
        
-       private XYTextAnnotation wifiAnnotation = new XYTextAnnotation(TimelineChartLables.DEVICE_CHART_WIFI, TimelineConstants.MS_TO_FIXEDMS, TempConstants.WIFI_SET_VALUE);
-       private XYTextAnnotation btAnnotation = new XYTextAnnotation(TimelineChartLables.DEVICE_CHART_BLUETOOTH, TimelineConstants.MS_TO_FIXEDMS, TempConstants.BT_SET_VALUE);
-       private XYTextAnnotation gpsAnnotation = new XYTextAnnotation(TimelineChartLables.DEVICE_CHART_GPS, TimelineConstants.MS_TO_FIXEDMS, TempConstants.GPS_SET_VALUE);
-       private XYTextAnnotation dnetAnnotation = new XYTextAnnotation(TimelineChartLables.DEVICE_CHART_DNET, TimelineConstants.MS_TO_FIXEDMS, TempConstants.DNET_SET_VALUE);
-       private XYTextAnnotation callAnnotation = new XYTextAnnotation(TimelineChartLables.DEVICE_CHART_CALL, TimelineConstants.MS_TO_FIXEDMS, TempConstants.CALL_SET_VALUE);
+       private XYTextAnnotation wifiAnnotation = new XYTextAnnotation(TimelineChartLables.DEVICE_CHART_WIFI, 0, TempConstants.WIFI_SET_VALUE);
+       private XYTextAnnotation btAnnotation = new XYTextAnnotation(TimelineChartLables.DEVICE_CHART_BLUETOOTH, 0, TempConstants.BT_SET_VALUE);
+       private XYTextAnnotation gpsAnnotation = new XYTextAnnotation(TimelineChartLables.DEVICE_CHART_GPS, 0, TempConstants.GPS_SET_VALUE);
+       private XYTextAnnotation dnetAnnotation = new XYTextAnnotation(TimelineChartLables.DEVICE_CHART_DNET, 0, TempConstants.DNET_SET_VALUE);
+       private XYTextAnnotation callAnnotation = new XYTextAnnotation(TimelineChartLables.DEVICE_CHART_CALL, 0, TempConstants.CALL_SET_VALUE);
        
        private static final String SERIES_NAME_WIFI_ENABLED = TimelineChartLables.DEVICE_CHART_WIFI_ENABLED;
        private static final String SERIES_NAME_WIFI_CONNECTED = TimelineChartLables.DEVICE_CHART_WIFI_CONNECTED;
index 373b543..8ae9804 100644 (file)
@@ -57,7 +57,7 @@ public abstract class TimelineChart {
                        return;
                }
 
-               long startInput = startMs + TimelineConstants.MS_TO_FIXEDMS;
+               long startInput = startMs;
                long endInput = startInput + CHART_RANGE;
 
                if (startInput >= endInput) {
index d576d4b..1aa2383 100644 (file)
@@ -192,7 +192,6 @@ public class TimelineUtils {
        }
 
        public static FixedMillisecond convertToFixedMs(long timeMs) {
-               timeMs = timeMs + TimelineConstants.MS_TO_FIXEDMS;
                FixedMillisecond sec = new FixedMillisecond(timeMs);
 
                return sec;