[Title] String externalization
authorsanghyunnim.lee <sanghyunnim.lee@samsung.com>
Tue, 31 Jul 2012 15:20:35 +0000 (00:20 +0900)
committersanghyunnim.lee <sanghyunnim.lee@samsung.com>
Tue, 31 Jul 2012 15:20:35 +0000 (00:20 +0900)
[Type]
[Module]
[Priority]
[CQ#]
[Redmine#]
[Problem]
[Cause]
[Solution]
[TestCase]

17 files changed:
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/constants/TimelineConstants.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/TimelineChartLabels.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/TimelineChartLabels.properties
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/TempConstants.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/TimelineEditItemsDialog.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/TimelineItemManager.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/chart/CPUChart.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/chart/CPUCoreChart.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/chart/CPUFrequencyChart.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/chart/DeviceChart.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/chart/EnergyChart.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/chart/FileChart.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/chart/HeapChart.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/chart/ProcessMemoryChart.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/chart/SnapShotChart.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/timeline/chart/SystemMemoryChart.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/utils/TimelineUtils.java

index 657c33b..eb02491 100644 (file)
@@ -16,25 +16,14 @@ public class TimelineConstants {
 
        /* Time-line Item type */
        // Resource
-       public static final int CHART_TYPE_RESOURCE_USAGE = 2;
        public static final int CHART_TYPE_FILE = 3;
        // Memory
        public static final int CHART_TYPE_HEAP = 4;
        // UI
-       public static final int CHART_TYPE_UI_EVENTS = 18;
        public static final int CHART_TYPE_SNAPSHOT = 19;
        // Proc
        public static final int CHART_TYPE_CPU = 1;
-       public static final int CHART_TYPE_WIFI = 6;
-       public static final int CHART_TYPE_BT = 7;
-       public static final int CHART_TYPE_GPS = 8;
-       public static final int CHART_TYPE_BRIGHTNESS = 9;
-       public static final int CHART_TYPE_CAMERA = 10;
-       public static final int CHART_TYPE_SOUND = 11;
-       public static final int CHART_TYPE_AUDIO = 12;
-       public static final int CHART_TYPE_VIBRATION = 13;
        public static final int CHART_TYPE_PROCESS_SIZE = 14;
-       public static final int CHART_TYPE_VOLTAGE = 15;
        public static final int CHART_TYPE_DEVICE = 20;
        public static final int CHART_TYPE_ENERGY = 21;
        public static final int CHART_TYPE_SYSTEM_MEMORY = 22;
index d4ddb36..54614d1 100644 (file)
@@ -6,105 +6,56 @@ public class TimelineChartLabels extends NLS {
        private static final String BUNDLE_NAME = "org.tizen.dynamicanalyzer.nl.TimelineChartLabels"; //$NON-NLS-1$
        public static String CPU_CHART_SERIES_NAME_APP_LOAD;
        public static String CPU_CHART_SERIES_NAME_TOTLA_LOAD;
-       public static String CPU_CHART_TIME;
        public static String CPU_CHART_TITLE;
+       
        public static String CPU_CORE_CHART_SERIES_NAME_CORE0;
        public static String CPU_CORE_CHART_SERIES_NAME_CORE1;
        public static String CPU_CORE_CHART_SERIES_NAME_CORE2;
        public static String CPU_CORE_CHART_SERIES_NAME_CORE3;
-       public static String CPU_CORE_CHART_TIME;
        public static String CPU_CORE_CHART_TITLE;
+       
        public static String CPU_FREQUENCY_CHART_FREQUENCY;
-       public static String CPU_FREQUENCY_CHART_HZ;
-       public static String CPU_FREQUENCY_CHART_TIME;
        public static String CPU_FREQUENCY_CHART_TITLE;
-       public static String DEVICE_CHART_14;
-       public static String DEVICE_CHART_15;
+       
        public static String DEVICE_CHART_BLUETOOTH;
-       public static String DEVICE_CHART_BLUETOOTH_ENABLED;
        public static String DEVICE_CHART_CALL;
        public static String DEVICE_CHART_DNET;
-       public static String DEVICE_CHART_DNET_ENABLED;
        public static String DEVICE_CHART_GPS;
-       public static String DEVICE_CHART_GPS_ENABLED;
        public static String DEVICE_CHART_TITLE;
-       public static String DEVICE_CHART_VIDEO_CALL;
-       public static String DEVICE_CHART_VOICE_CALL;
        public static String DEVICE_CHART_WIFI;
-       public static String DEVICE_CHART_WIFI_CONNECTED;
-       public static String DEVICE_CHART_WIFI_ENABLED;
-       public static String ENERGY_CHART_ENERGY;
-       public static String ENERGY_CHART_MILLI_WATT;
-       public static String ENERGY_CHART_TIME;
+       
        public static String ENERGY_CHART_TITLE;
-       public static String ENERGY_CHART_WATT;
+       
        public static String FILE_CHART_SERIES_NAME_FD_COUNT;
        public static String FILE_CHART_SERIES_NAME_READ;
        public static String FILE_CHART_SERIES_NAME_WRITE;
-       public static String FILE_CHART_SIZE;
-       public static String FILE_CHART_TIME;
        public static String FILE_CHART_TITLE;
-       public static String HEAP_CHART_BYTE;
-       public static String HEAP_CHART_NIL;
-       public static String HEAP_CHART_SERIES_NAME_TOTAL_ALLOCATION;
+       
+       public static String HEAP_CHART_SERIES_NAME_PLATFORM_ALLOCATION;
        public static String HEAP_CHART_SERIES_NAME_USER_ALLOCATION;
-       public static String HEAP_CHART_TIME;
        public static String HEAP_CHART_TITLE;
-       public static String PROCESS_MEMORY_CHART_BYTE;
+       
        public static String PROCESS_MEMORY_CHART_PSS;
        public static String PROCESS_MEMORY_CHART_RSS;
-       public static String PROCESS_MEMORY_CHART_TIME;
        public static String PROCESS_MEMORY_CHART_TITLE;
        public static String PROCESS_MEMORY_CHART_VSS;
+       
        public static String SNAPSHOT_CHART_SERIES_NAME_EVENT_MOVE;
        public static String SNAPSHOT_CHART_SERIES_NAME_EVENT_UP_DOWN;
-       public static String SNAPSHOT_CHART_STATUS;
-       public static String SNAPSHOT_CHART_TIME;
        public static String SNAPSHOT_CHART_TITLE;
-       public static String SYSTEM_MEMORY_CHART_BYTE;
+       
        public static String SYSTEM_MEMORY_CHART_SERIES_NAME_PROC_RESIDENT;
        public static String SYSTEM_MEMORY_CHART_SERIES_NAME_SYSTEM;
        public static String SYSTEM_MEMORY_CHART_SERIES_NAME_TOTAL;
-       public static String SYSTEM_MEMORY_CHART_TIME;
        public static String SYSTEM_MEMORY_CHART_TITLE;
-       public static String TEMP_CONSTANTS_APP_CREATE;
-       public static String TEMP_CONSTANTS_APP_PAUSE;
-       public static String TEMP_CONSTANTS_APP_RESUME;
-       public static String TEMP_CONSTANTS_APP_SERVICE;
-       public static String TEMP_CONSTANTS_APP_TERMINATE;
-       public static String TIMELINE_EDIT_ITEMS_DLG_A;
-       public static String TIMELINE_EDIT_ITEMS_DLG_ADD;
-       public static String TIMELINE_EDIT_ITEMS_DLG_ADD_ALL;
-       public static String TIMELINE_EDIT_ITEMS_DLG_ADD_ITEMS;
-       public static String TIMELINE_EDIT_ITEMS_DLG_AVAILABLE_ITEMS;
-       public static String TIMELINE_EDIT_ITEMS_DLG_ITEM_NAME;
-       public static String TIMELINE_EDIT_ITEMS_DLG_REMOVE;
-       public static String TIMELINE_EDIT_ITEMS_DLG_REMOVE_ALL;
-       public static String TIMELINE_EDIT_ITEMS_DLG_SELECTED_ITEMS;
-       public static String TIMELINE_EDIT_ITEMS_DLG_SWAP;
-       public static String TIMELINE_LINE_ITEM_MANAGER_APP_LABEL;
+       
        public static String TIMELINE_MASTER_CREATED;
        public static String TIMELINE_MASTER_PAUSED;
        public static String TIMELINE_MASTER_RESUMED;
        public static String TIMELINE_MASTER_SERVICED;
        public static String TIMELINE_MASTER_TERMINATED;
-       public static String TIMELINE_TICK_ADD;
-       public static String TIMELINE_UTILS_ADD_ITEM_NAME;
-       public static String TIMELINE_UTILS_AUDIO;
-       public static String TIMELINE_UTILS_BLUETOOTH;
-       public static String TIMELINE_UTILS_BRIGHTNESS;
-       public static String TIMELINE_UTILS_CAMERA;
-       public static String TIMELINE_UTILS_DEVICES;
-       public static String TIMELINE_UTILS_GPS;
-       public static String TIMELINE_UTILS_RESOURCE_USAGE;
-       public static String TIMELINE_UTILS_SOUND;
-       public static String TIMELINE_UTILS_UI_EVENTS;
-       public static String TIMELINE_UTILS_VIBRATION;
-       public static String TIMELINE_UTILS_VOLTAGE;
-       public static String TIMELINE_UTILS_WIFI;
-       public static String CHART_AXIS_LABEL_PERCENT;
        
-       public static String ADD_CHART_DLG_ITEM_SUB;
+       public static String TIMELINE_TICK_ADD;
        
        static {
                // initialize resource bundle
index 6f0df34..2b157ed 100644 (file)
@@ -1,96 +1,48 @@
 CPU_CHART_SERIES_NAME_APP_LOAD=App.
 CPU_CHART_SERIES_NAME_TOTLA_LOAD=Total
-
-CPU_CHART_TIME=Time
 CPU_CHART_TITLE=CPU
 
 CPU_CORE_CHART_SERIES_NAME_CORE0=Core0
 CPU_CORE_CHART_SERIES_NAME_CORE1=Core1
 CPU_CORE_CHART_SERIES_NAME_CORE2=Core2
 CPU_CORE_CHART_SERIES_NAME_CORE3=Core3
-
-CPU_CORE_CHART_TIME=Time
 CPU_CORE_CHART_TITLE=CPU Core
 
 CPU_FREQUENCY_CHART_FREQUENCY=Frequency
-CPU_FREQUENCY_CHART_HZ=Hz
-CPU_FREQUENCY_CHART_TIME=Time
 CPU_FREQUENCY_CHART_TITLE=CPU Frequency
 
-DEVICE_CHART_14=Time
-DEVICE_CHART_15=
 DEVICE_CHART_BLUETOOTH=Bluetooth
-DEVICE_CHART_BLUETOOTH_ENABLED=BT_ENABLED
-DEVICE_CHART_CALL=CALL
+DEVICE_CHART_CALL=Call
 DEVICE_CHART_DNET=DNET
-DEVICE_CHART_DNET_ENABLED=DNET_ENABLED
 DEVICE_CHART_GPS=GPS
-DEVICE_CHART_GPS_ENABLED=GPS_ENABLED
-DEVICE_CHART_TITLE=DDEVICE
-DEVICE_CHART_VIDEO_CALL=VIDEO_CALL
-DEVICE_CHART_VOICE_CALL=VOICE_CALL
+DEVICE_CHART_TITLE=Device
 DEVICE_CHART_WIFI=WIFI
-DEVICE_CHART_WIFI_CONNECTED=WIFI_CONNECTED
-DEVICE_CHART_WIFI_ENABLED=WIFI_ENABLED
-ENERGY_CHART_ENERGY=Energy
-ENERGY_CHART_MILLI_WATT=mW
-ENERGY_CHART_TIME=Time
+
 ENERGY_CHART_TITLE=Energy
-ENERGY_CHART_WATT=Watt
 
 FILE_CHART_SERIES_NAME_FD_COUNT=File Count
 FILE_CHART_SERIES_NAME_READ=Read
 FILE_CHART_SERIES_NAME_WRITE=Write
-
-FILE_CHART_SIZE=Size
-FILE_CHART_TIME=Time
 FILE_CHART_TITLE=File
 
-HEAP_CHART_BYTE=Byte
-HEAP_CHART_NIL=(nil)
-HEAP_CHART_SERIES_NAME_TOTAL_ALLOCATION=Platform
+HEAP_CHART_SERIES_NAME_PLATFORM_ALLOCATION=Platform
 HEAP_CHART_SERIES_NAME_USER_ALLOCATION=App.
-HEAP_CHART_TIME=Time
 HEAP_CHART_TITLE=Heap Allocation
 
-PROCESS_MEMORY_CHART_BYTE=Byte
 PROCESS_MEMORY_CHART_PSS=PSS
 PROCESS_MEMORY_CHART_RSS=RSS
-PROCESS_MEMORY_CHART_TIME=Time
 PROCESS_MEMORY_CHART_TITLE=Process Size
 PROCESS_MEMORY_CHART_VSS=VSS
 
 SNAPSHOT_CHART_SERIES_NAME_EVENT_MOVE=Move Event
 SNAPSHOT_CHART_SERIES_NAME_EVENT_UP_DOWN=Up/Down Event
-SNAPSHOT_CHART_STATUS=Status
-SNAPSHOT_CHART_TIME=Time
 SNAPSHOT_CHART_TITLE=UI Event
 
-SYSTEM_MEMORY_CHART_BYTE=Byte
 SYSTEM_MEMORY_CHART_SERIES_NAME_PROC_RESIDENT=Process
 SYSTEM_MEMORY_CHART_SERIES_NAME_SYSTEM=System
 SYSTEM_MEMORY_CHART_SERIES_NAME_TOTAL=Total
-SYSTEM_MEMORY_CHART_TIME=Time
 SYSTEM_MEMORY_CHART_TITLE=Memory
 
-TEMP_CONSTANTS_APP_CREATE=usercallback_app_create
-TEMP_CONSTANTS_APP_PAUSE=usercallback_app_pause
-TEMP_CONSTANTS_APP_RESUME=usercallback_app_resume
-TEMP_CONSTANTS_APP_SERVICE=usercallback_app_service
-TEMP_CONSTANTS_APP_TERMINATE=usercallback_app_terminate
-
-TIMELINE_EDIT_ITEMS_DLG_A=A
-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_REMOVE=<-- &Remove
-TIMELINE_EDIT_ITEMS_DLG_REMOVE_ALL=<-- Re&move All
-TIMELINE_EDIT_ITEMS_DLG_SELECTED_ITEMS=Selected Items
-TIMELINE_EDIT_ITEMS_DLG_SWAP=<-- &Swap -->
-TIMELINE_LINE_ITEM_MANAGER_APP_LABEL=App : 
-
 TIMELINE_MASTER_CREATED=Created
 TIMELINE_MASTER_PAUSED=Paused
 TIMELINE_MASTER_RESUMED=Resumed
@@ -98,21 +50,3 @@ TIMELINE_MASTER_SERVICED=Serviced
 TIMELINE_MASTER_TERMINATED=Terminated
 
 TIMELINE_TICK_ADD=Add
-
-TIMELINE_UTILS_ADD_ITEM_NAME=Add Item Name
-TIMELINE_UTILS_AUDIO=Audio
-TIMELINE_UTILS_BLUETOOTH=Bluetooth
-TIMELINE_UTILS_BRIGHTNESS=Brightness
-TIMELINE_UTILS_CAMERA=Camera
-TIMELINE_UTILS_DEVICES=Devices
-TIMELINE_UTILS_GPS=GPS
-TIMELINE_UTILS_RESOURCE_USAGE=Resource Usage
-TIMELINE_UTILS_SOUND=Sound
-TIMELINE_UTILS_UI_EVENTS=UI Events
-TIMELINE_UTILS_VIBRATION=Vibration
-TIMELINE_UTILS_VOLTAGE=Voltage
-TIMELINE_UTILS_WIFI=WIFI
-
-CHART_AXIS_LABEL_PERCENT=%
-
-ADD_CHART_DLG_ITEM_SUB=
index 5ff5577..6ba00db 100644 (file)
@@ -2,8 +2,6 @@ package org.tizen.dynamicanalyzer.timeline;
 
 import java.awt.Color;
 
-import org.tizen.dynamicanalyzer.nl.TimelineChartLabels;
-
 
 public class TempConstants {
        public static final int NOT_INITED = -1;
@@ -49,11 +47,11 @@ public class TempConstants {
        
        public static boolean isSnapshotChartDisposed = false;
 
-       public static final String LIFECYCLE_API_NAME_CREATE = TimelineChartLabels.TEMP_CONSTANTS_APP_CREATE;
-       public static final String LIFECYCLE_API_NAME_TERMINATE = TimelineChartLabels.TEMP_CONSTANTS_APP_TERMINATE;
-       public static final String LIFECYCLE_API_NAME_PAUSE = TimelineChartLabels.TEMP_CONSTANTS_APP_PAUSE;
-       public static final String LIFECYCLE_API_NAME_RESUME = TimelineChartLabels.TEMP_CONSTANTS_APP_RESUME;
-       public static final String LIFECYCLE_API_NAME_SERVICE = TimelineChartLabels.TEMP_CONSTANTS_APP_SERVICE;
+       public static final String LIFECYCLE_API_NAME_CREATE = "usercallback_app_create"; //$NON-NLS-1$
+       public static final String LIFECYCLE_API_NAME_TERMINATE = "usercallback_app_terminate"; //$NON-NLS-1$
+       public static final String LIFECYCLE_API_NAME_PAUSE = "usercallback_app_pause"; //$NON-NLS-1$
+       public static final String LIFECYCLE_API_NAME_RESUME = "usercallback_app_resume"; //$NON-NLS-1$
+       public static final String LIFECYCLE_API_NAME_SERVICE = "usercallback_app_service"; //$NON-NLS-1$
        
        public static final int LIFECYCLE_CREATE = 0;
        public static final int LIFECYCLE_TERMINATE = 1;
index 3e0dc23..7173787 100644 (file)
@@ -92,21 +92,14 @@ public class TimelineEditItemsDialog extends Dialog {
 
                        TimelineItemsProvider.setAvailableItemsList(availableItemList);
                        TimelineItemsProvider.setSelectedItemList(selectedItemList);
-                       TimelineComposite timelineComposite = AnalyzerUtil
-                                       .getTimelineComposite();
+                       TimelineComposite timelineComposite = AnalyzerUtil.getTimelineComposite();
                        if (null != timelineComposite) {
                                timelineComposite.resetItems(selectedItemList);
                                TimelineMaster.getInstance().redrawTimeTickCanvas();
                        }
 
-                       ConfigureManager
-                                       .getInstance()
-                                       .setValue(
-                                                       ConfigureManager.CONFIGUREMANAGER_CHART_AVAILABLE_ITEM_LIST,
-                                                       strSaveAvailableItems.toString());
-                       ConfigureManager.getInstance().setValue(
-                                       ConfigureManager.CONFIGUREMANAGER_CHART_SELECTED_ITEM_LIST,
-                                       strSaveSelectedItems.toString());
+                       ConfigureManager.getInstance().setValue(ConfigureManager.CONFIGUREMANAGER_CHART_AVAILABLE_ITEM_LIST, strSaveAvailableItems.toString());
+                       ConfigureManager.getInstance().setValue(ConfigureManager.CONFIGUREMANAGER_CHART_SELECTED_ITEM_LIST, strSaveSelectedItems.toString());
                        shell.dispose();
                }
        };
@@ -141,7 +134,7 @@ public class TimelineEditItemsDialog extends Dialog {
                data.right = new FormAttachment(100, 0);
                editorContainer.setLayoutData(data);
                editorContainer.setBackground(ColorResources.EDIT_CHART_DIALOG_UPPER);
-               chartTableViewer = new TableViewer(editorContainer, SWT.MULTI | SWT.FULL_SELECTION );
+               chartTableViewer = new TableViewer(editorContainer, SWT.MULTI | SWT.FULL_SELECTION);
                GridData tableGridData = new GridData(GridData.FILL_BOTH);
                chartTableViewer.getTable().setLayoutData(tableGridData);
                chartTableViewer.getTable().setLinesVisible(true);
@@ -157,8 +150,7 @@ public class TimelineEditItemsDialog extends Dialog {
                                new TableColumn(chartTableViewer.getTable(), SWT.NONE).setWidth(0);
                }
 
-               List<String> availableItemsList = TimelineItemsProvider
-                               .getAvailableItemsList();
+               List<String> availableItemsList = TimelineItemsProvider.getAvailableItemsList();
                if (null == availableItemsList || availableItemsList.isEmpty()) {
                        return -1;
                }
@@ -202,18 +194,15 @@ public class TimelineEditItemsDialog extends Dialog {
                                        break;
                                }
                                case SWT.PaintItem: {
-
-                                       
                                        int width = chartTableViewer.getTable().getClientArea().width;
-       
-                                       
+
                                        TableItem item = (TableItem) event.item;
 
                                        String itemName = item.getText(event.index + 1);
                                        Point size = event.gc.textExtent(itemName);
                                        int offset2 = event.index == 0 ? Math.max(0, (event.height - size.y) / 2) : 0;
 
-                                       String itemExplan = TimelineChartLabels.ADD_CHART_DLG_ITEM_SUB;
+                                       String itemExplan = ""; //$NON-NLS-1$
                                        size = event.gc.textExtent(itemExplan);
                                        offset2 = event.index == 0 ? Math.max(0, (event.height - size.y) / 2) : 0;
 
@@ -231,46 +220,43 @@ public class TimelineEditItemsDialog extends Dialog {
                                                event.gc.setForeground(ColorResources.ADD_CHART_DISABLE_COLOR_START);
                                                event.gc.setBackground(ColorResources.ADD_CHART_DISABLE_COLOR_END);
                                        }
-                                       
-                                       
-                                       
+
                                        event.gc.fillGradientRectangle(0, rect.y, width, 66, true);
                                        gc.setForeground(foreground);
                                        gc.setBackground(background);
                                        event.detail &= ~SWT.SELECTED;
 
-                                       if (strItemStatus_1.equals("selected enable")
-                                                       && event.index == 1) {
-                                               event.gc.drawImage(ImageResources.ADD_CHART_ON, 370,event.y + 15);
+                                       if (strItemStatus_1.equals("selected enable") && event.index == 1) {
+                                               event.gc.drawImage(ImageResources.ADD_CHART_ON, 370, event.y + 15);
                                        } else {
-                                               event.gc.drawImage(ImageResources.ADD_CHART_OFF, 370,event.y + 15);
+                                               event.gc.drawImage(ImageResources.ADD_CHART_OFF, 370, event.y + 15);
                                        }
 
                                        String strItemName = item.getText(2);
                                        Image itemImage = ImageResources.ADD_CHART_CPU;
                                        if (strItemName.equalsIgnoreCase("cpu")) {
                                                itemImage = ImageResources.ADD_CHART_CPU;
-                                       } else if (strItemName.equalsIgnoreCase( TimelineChartLabels.CPU_CORE_CHART_TITLE )) {
+                                       } else if (strItemName.equalsIgnoreCase(TimelineChartLabels.CPU_CORE_CHART_TITLE)) {
                                                itemImage = ImageResources.ADD_CHART_CPU_CORE;
-                                       } else if (strItemName.equalsIgnoreCase( TimelineChartLabels.HEAP_CHART_TITLE )) {
+                                       } else if (strItemName.equalsIgnoreCase(TimelineChartLabels.HEAP_CHART_TITLE)) {
                                                itemImage = ImageResources.ADD_CHART_MEMORY_HEAP;
-                                       } else if (strItemName.equalsIgnoreCase( TimelineChartLabels.PROCESS_MEMORY_CHART_TITLE )) {
+                                       } else if (strItemName.equalsIgnoreCase(TimelineChartLabels.PROCESS_MEMORY_CHART_TITLE)) {
                                                itemImage = ImageResources.ADD_CHART_MEMORY_PROCESS;
-                                       } else if (strItemName.equalsIgnoreCase( TimelineChartLabels.SYSTEM_MEMORY_CHART_TITLE )) {
+                                       } else if (strItemName.equalsIgnoreCase(TimelineChartLabels.SYSTEM_MEMORY_CHART_TITLE)) {
                                                itemImage = ImageResources.ADD_CHART_MEMORY_ALLOCATION;
-                                       } else if (strItemName.equalsIgnoreCase( TimelineChartLabels.SNAPSHOT_CHART_TITLE )) {
+                                       } else if (strItemName.equalsIgnoreCase(TimelineChartLabels.SNAPSHOT_CHART_TITLE)) {
                                                itemImage = ImageResources.ADD_CHART_UI_EVENT;
-                                       } else if (strItemName.equalsIgnoreCase( TimelineChartLabels.FILE_CHART_TITLE )) {
+                                       } else if (strItemName.equalsIgnoreCase(TimelineChartLabels.FILE_CHART_TITLE)) {
                                                itemImage = ImageResources.ADD_CHART_READ_WRITE;
-                                       } else if (strItemName.equalsIgnoreCase( TimelineChartLabels.CPU_FREQUENCY_CHART_TITLE)) {
+                                       } else if (strItemName.equalsIgnoreCase(TimelineChartLabels.CPU_FREQUENCY_CHART_TITLE)) {
                                                itemImage = ImageResources.ADD_CHART_CPU_FREQUENCY;
                                        }
                                        if (event.index == 0) {
                                                event.gc.drawImage(itemImage, 3, event.y);
                                        } else if (event.index == 1) {
-                                               event.gc.drawText(itemName, event.x + 20, event.y+ offset2 + 15, true);
+                                               event.gc.drawText(itemName, event.x + 20, event.y + offset2 + 15, true);
                                                event.gc.setForeground(ColorResources.BLACK);
-                                               event.gc.drawText(itemExplan, event.x + 20, event.y+ offset2 + 35, true);
+                                               event.gc.drawText(itemExplan, event.x + 20, event.y + offset2 + 35, true);
                                        }
                                        break;
                                }
@@ -304,7 +290,7 @@ public class TimelineEditItemsDialog extends Dialog {
                        }
                });
 
-               DropTarget target = new DropTarget(chartTableViewer.getTable(),DND.DROP_MOVE | DND.DROP_COPY | DND.DROP_DEFAULT);
+               DropTarget target = new DropTarget(chartTableViewer.getTable(), DND.DROP_MOVE | DND.DROP_COPY | DND.DROP_DEFAULT);
                target.setTransfer(types);
                target.addDropListener(new DropTargetAdapter() {
                        public void dragEnter(DropTargetEvent event) {
@@ -312,7 +298,7 @@ public class TimelineEditItemsDialog extends Dialog {
                                ItemIndexA = chartTableViewer.getTable().getSelectionIndex();
 
                                if (event.detail == DND.DROP_DEFAULT) {
-                                       event.detail = (event.operations & DND.DROP_COPY) != 0 ? DND.DROP_COPY: DND.DROP_NONE;
+                                       event.detail = (event.operations & DND.DROP_COPY) != 0 ? DND.DROP_COPY : DND.DROP_NONE;
                                }
                                for (int i = 0, n = event.dataTypes.length; i < n; i++) {
                                        if (TextTransfer.getInstance().isSupportedType(event.dataTypes[i])) {
@@ -327,7 +313,7 @@ public class TimelineEditItemsDialog extends Dialog {
                                DropTarget target = (DropTarget) event.widget;
                                Table table = (Table) target.getControl();
 
-                               Point point = shell.getDisplay().map(null, table, event.x,event.y);
+                               Point point = shell.getDisplay().map(null, table, event.x, event.y);
                                TableItem tblItemTarget = table.getItem(point);
                                if (tblItemTarget == null) {
                                        return;
@@ -365,8 +351,7 @@ public class TimelineEditItemsDialog extends Dialog {
                        }
 
                        public void drop(DropTargetEvent event) {
-                               if (TextTransfer.getInstance().isSupportedType(
-                                               event.currentDataType)) {
+                               if (TextTransfer.getInstance().isSupportedType(event.currentDataType)) {
                                }
                        }
                });
@@ -417,8 +402,6 @@ public class TimelineEditItemsDialog extends Dialog {
                return 0;
        }
 
-
-        
        private MouseListener itemZoomMouseListener = new MouseAdapter() {
                public void mouseUp(MouseEvent event) {
                        if (chartChangeSatus == true) {
@@ -426,9 +409,9 @@ public class TimelineEditItemsDialog extends Dialog {
                                int selectItemIndex = table.getSelectionIndex();
                                TableItem[] chartTableItems = chartTableViewer.getTable().getItems();
                                if (chartTableItems[selectItemIndex].getText(3).equals("selected enable")) {
-                                       chartTableItems[selectItemIndex].setText(3,"selected disable");
+                                       chartTableItems[selectItemIndex].setText(3, "selected disable");
                                } else if (chartTableItems[selectItemIndex].getText(3).equals("selected disable")) {
-                                       chartTableItems[selectItemIndex].setText(3,"selected enable");
+                                       chartTableItems[selectItemIndex].setText(3, "selected enable");
                                }
                                chartTableViewer.getTable().redraw();
                        }
index c7f5f54..a6b180d 100755 (executable)
@@ -791,27 +791,9 @@ 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);
 
                batteryItemList.add(infoCPU);
                batteryItemList.add(infoMemory);
-               batteryItemList.add(infoVoltage);
-               batteryItemList.add(infoBright);
-               batteryItemList.add(infoWifi);
-               batteryItemList.add(infoBT);
-               batteryItemList.add(infoGPS);
-               batteryItemList.add(infoCamera);
-               batteryItemList.add(infoAudio);
-               batteryItemList.add(infoSound);
-               batteryItemList.add(infoVibration);
 
                setSelectedItemColor(tabID, batteryItemList.get(0));
 
index 0440c45..4299bfe 100644 (file)
@@ -84,7 +84,7 @@ public class CPUChart extends TimelineChart {
                XYSeriesCollection appLoadDataSet = createAppLoadDataset();
                XYSeriesCollection systemLoadDataSet = createSystemLoadDataset();
 
-               chart = ChartFactory.createXYAreaChart(CHART_TITLE, TimelineChartLabels.CPU_CHART_TIME, TimelineChartLabels.CHART_AXIS_LABEL_PERCENT, appLoadDataSet, PlotOrientation.VERTICAL, false, false, false); //$NON-NLS-2$ //$NON-NLS-1$
+               chart = ChartFactory.createXYAreaChart(CHART_TITLE, "Time", "%", appLoadDataSet, PlotOrientation.VERTICAL, false, false, false); //$NON-NLS-2$ //$NON-NLS-1$
 
                if (null == chart) {
                        return null;
index dbf3d84..d0ccfb4 100644 (file)
@@ -116,7 +116,7 @@ public class CPUCoreChart extends TimelineChart {
        
        @Override
        public JFreeChart createChart() {
-               chart = ChartFactory.createXYLineChart(CHART_TITLE, TimelineChartLabels.CPU_CORE_CHART_TIME, TimelineChartLabels.CHART_AXIS_LABEL_PERCENT, createCoreLoadDataset(), PlotOrientation.VERTICAL, false, false, false); //$NON-NLS-2$ //$NON-NLS-1$
+               chart = ChartFactory.createXYLineChart(CHART_TITLE, "Time", "%", createCoreLoadDataset(), PlotOrientation.VERTICAL, false, false, false); //$NON-NLS-2$ //$NON-NLS-1$
                
                if(null == chart) {
                        return null;
index 368faf1..3ff338f 100644 (file)
@@ -28,71 +28,71 @@ import org.tizen.dynamicanalyzer.utils.TimelineUtils;
 public class CPUFrequencyChart extends TimelineChart {
        public static final String CHART_TITLE = TimelineChartLabels.CPU_FREQUENCY_CHART_TITLE;
        public static final String SERIES_NAME_FREQUENCY = TimelineChartLabels.CPU_FREQUENCY_CHART_FREQUENCY;
-       
+
        private static XYPlot xyPlot;
        private static double chartMaxVal = 0;
        private static boolean needUpdateChartRange = false;
-       
-       class CPUFrequencySeriesInfo{
+
+       class CPUFrequencySeriesInfo {
                private XYSeries baseSeries;
                private Vector<XYDataItem> newXYDataItems;
        }
-       
+
        private static CPUFrequencySeriesInfo freequencyInfo = null;
-       
+
        public CPUFrequencyChart() {
-               if(freequencyInfo == null) {
+               if (freequencyInfo == null) {
                        freequencyInfo = new CPUFrequencySeriesInfo();
                        freequencyInfo.baseSeries = new XYSeries(SERIES_NAME_FREQUENCY);
                        freequencyInfo.newXYDataItems = new Vector<XYDataItem>();
                }
        }
-       
+
        public static List<XYSeries> getSeriesList() {
                ArrayList<XYSeries> seriesList = new ArrayList<XYSeries>();
                seriesList.add(freequencyInfo.baseSeries);
-               
+
                return seriesList;
        }
-       
+
        private static List<String> getSeriesNameList() {
                ArrayList<String> seriesNameList = new ArrayList<String>();
                seriesNameList.add(SERIES_NAME_FREQUENCY);
-               
+
                return seriesNameList;
        }
-       
+
        public static List<Color> getSeriesColor() {
                ArrayList<Color> seriesColorList = new ArrayList<Color>();
                seriesColorList.add(SWTUtils.toAwtColor(ColorResources.SERIESE_COLOR_CPU_FREQ));
-               
+
                return seriesColorList;
        }
-       
+
        @Override
        public JFreeChart createChart() {
                XYSeriesCollection frequencyDataSet = createFrequencyDataset();
-               
-               chart = ChartFactory.createXYLineChart(CHART_TITLE, TimelineChartLabels.CPU_FREQUENCY_CHART_TIME, TimelineChartLabels.CPU_FREQUENCY_CHART_HZ, frequencyDataSet, PlotOrientation.VERTICAL, false, false, false);
-               
-               if(null == chart) {
+
+               chart = ChartFactory.createXYLineChart(CHART_TITLE, "Time", "Hz", frequencyDataSet, PlotOrientation.VERTICAL, false, false, false); //$NON-NLS-2$ //$NON-NLS-1$
+
+               if (null == chart) {
                        return null;
                }
-               
+
                setChartStyle();
-               
+
                xyPlot = chart.getXYPlot();
                xyPlot.setForegroundAlpha(1.0f);
                xyPlot.getRangeAxis().setAutoRange(false);
-               
+
                setSeriesRendering();
-               
+
                return chart;
        }
-       
+
        private XYSeriesCollection createFrequencyDataset() {
                XYSeriesCollection seriesCollection = new XYSeriesCollection(freequencyInfo.baseSeries);
-               
+
                return seriesCollection;
        }
 
@@ -101,12 +101,12 @@ public class CPUFrequencyChart extends TimelineChart {
                Display.getDefault().asyncExec(new Runnable() {
                        @Override
                        public void run() {
-                               for(XYDataItem xyDataItem : freequencyInfo.newXYDataItems) {
+                               for (XYDataItem xyDataItem : freequencyInfo.newXYDataItems) {
                                        freequencyInfo.baseSeries.add(xyDataItem);
                                }
                                freequencyInfo.newXYDataItems.clear();
-                               
-                               if(needUpdateChartRange) {
+
+                               if (needUpdateChartRange) {
                                        xyPlot.getRangeAxis().setRange(new Range(0, chartMaxVal / TempConstants.chartRangeRatio));
                                        needUpdateChartRange = false;
                                }
@@ -121,7 +121,7 @@ public class CPUFrequencyChart extends TimelineChart {
                xyPlot.getRangeAxis().setRange(new Range(0, 0));
                chartMaxVal = 0;
                needUpdateChartRange = false;
-               
+
                Display.getDefault().asyncExec(new Runnable() {
                        @Override
                        public void run() {
@@ -150,7 +150,7 @@ public class CPUFrequencyChart extends TimelineChart {
                        parsingLog(logList.get(i));
                }
        }
-       
+
        private static void parsingLog(List<String> log) {
                if (null == log || 0 > log.size()) {
                        return;
@@ -161,7 +161,8 @@ public class CPUFrequencyChart extends TimelineChart {
                        double freq0 = 0;
 
                        try {
-                               time = TimelineUtils.transformLogTimeIntoTimelineTime(Double.parseDouble(log.get(LogCenterConstants.DEVICE_TIME_INDEX))) / TimelineConstants.TIME_US_TO_MS / TimelineConstants.TIME_US_TO_MS;
+                               time = TimelineUtils.transformLogTimeIntoTimelineTime(Double.parseDouble(log.get(LogCenterConstants.DEVICE_TIME_INDEX)))
+                                               / TimelineConstants.TIME_US_TO_MS / TimelineConstants.TIME_US_TO_MS;
                                String[] cpuFreqs = log.get(LogCenterConstants.DEVICE_CPU_FREQUENCY_INDEX).split(","); //$NON-NLS-1$
                                freq0 = Double.parseDouble(cpuFreqs[0]) * TimelineConstants.BYTE_TO_KBYTE;
                        } catch (NumberFormatException ne) {
@@ -173,14 +174,14 @@ public class CPUFrequencyChart extends TimelineChart {
                        }
 
                        freequencyInfo.newXYDataItems.add(new XYDataItem(time, freq0));
-                       if(chartMaxVal < freq0) {
+                       if (chartMaxVal < freq0) {
                                chartMaxVal = freq0;
                                needUpdateChartRange = true;
                        }
                }
        }
 
-       //FIXME remove
+       // FIXME remove
        public static List<SeriesDataSet> newSeriesDataSetList() {
                List<SeriesDataSet> seriesDataSetList = new ArrayList<SeriesDataSet>();
 
@@ -193,20 +194,20 @@ public class CPUFrequencyChart extends TimelineChart {
 
                return seriesDataSetList;
        }
-       
+
        private void setSeriesRendering() {
                XYLineAndShapeRenderer lineRenderer = new XYLineAndShapeRenderer(true, false);
                lineRenderer.setSeriesPaint(0, SWTUtils.toAwtColor(ColorResources.SERIESE_COLOR_CPU_FREQ));
                xyPlot.setRenderer(0, lineRenderer);
        }
-       
+
        @Override
        public void setRenderingBySize() {
        }
-       
+
        public static String getTooltipContent(int index, double yValue) {
                StringBuilder returnString = new StringBuilder();
-               
+
                return returnString.append(getSeriesNameList().get(index)).append(" : ").append(Formatter.toHzFormat(yValue)).toString(); //$NON-NLS-1$
        }
 }
index c1da098..b0d3067 100644 (file)
@@ -29,7 +29,7 @@ import org.tizen.dynamicanalyzer.timeline.TimelineMaster;
 
 
 public class DeviceChart extends TimelineChart {
-       private static final String CHART_TITLE = TimelineChartLabels.DEVICE_CHART_TITLE;
+       public static final String CHART_TITLE = TimelineChartLabels.DEVICE_CHART_TITLE;
        
        private static final int DEVICE_DISABLED = 0;
        private static final int DEVICE_ENABLED = 1;
@@ -48,13 +48,13 @@ public class DeviceChart extends TimelineChart {
        private XYTextAnnotation dnetAnnotation = new XYTextAnnotation(TimelineChartLabels.DEVICE_CHART_DNET, 0, TempConstants.DNET_SET_VALUE);
        private XYTextAnnotation callAnnotation = new XYTextAnnotation(TimelineChartLabels.DEVICE_CHART_CALL, 0, TempConstants.CALL_SET_VALUE);
        
-       private static final String SERIES_NAME_WIFI_ENABLED = TimelineChartLabels.DEVICE_CHART_WIFI_ENABLED;
-       private static final String SERIES_NAME_WIFI_CONNECTED = TimelineChartLabels.DEVICE_CHART_WIFI_CONNECTED;
-       private static final String SERIES_NAME_BT_ENABLED = TimelineChartLabels.DEVICE_CHART_BLUETOOTH_ENABLED;
-       private static final String SERIES_NAME_GPS_ENABLED = TimelineChartLabels.DEVICE_CHART_GPS_ENABLED;
-       private static final String SERIES_NAME_DNET_ENABLED = TimelineChartLabels.DEVICE_CHART_DNET_ENABLED;
-       private static final String SERIES_NAME_VOICE_CALL= TimelineChartLabels.DEVICE_CHART_VOICE_CALL;
-       private static final String SERIES_NAME_VIDEO_CALL= TimelineChartLabels.DEVICE_CHART_VIDEO_CALL;
+       private static final String SERIES_NAME_WIFI_ENABLED = "WIFI_ENABLED"; //$NON-NLS-1$
+       private static final String SERIES_NAME_WIFI_CONNECTED = "WIFI_CONNECTED"; //$NON-NLS-1$;
+       private static final String SERIES_NAME_BT_ENABLED = "BT_ENABLED"; //$NON-NLS-1$
+       private static final String SERIES_NAME_GPS_ENABLED = "GPS_ENABLED"; //$NON-NLS-1$
+       private static final String SERIES_NAME_DNET_ENABLED = "DNET_ENABLED"; //$NON-NLS-1$
+       private static final String SERIES_NAME_VOICE_CALL= "VOICE_CALL"; //$NON-NLS-1$
+       private static final String SERIES_NAME_VIDEO_CALL= "VIDEO_CALL"; //$NON-NLS-1$
        
        private ArrayList<XYTextAnnotation> deviceAnnotations = new ArrayList<XYTextAnnotation>();
        
@@ -143,7 +143,7 @@ public class DeviceChart extends TimelineChart {
        public JFreeChart createChart() {
                XYSeriesCollection dataSet = createDeviceDataset();
 
-               chart = ChartFactory.createXYAreaChart(CHART_TITLE, TimelineChartLabels.DEVICE_CHART_14, TimelineChartLabels.DEVICE_CHART_15, dataSet, PlotOrientation.VERTICAL, true, false, false);
+               chart = ChartFactory.createXYAreaChart(CHART_TITLE, "", "", dataSet, PlotOrientation.VERTICAL, true, false, false); //$NON-NLS-2$ //$NON-NLS-1$
                
                if (null == chart) {
                        return null;
index 164464c..46854e1 100644 (file)
@@ -21,7 +21,7 @@ import org.tizen.dynamicanalyzer.nl.TimelineChartLabels;
 
 public class EnergyChart extends TimelineChart {
        public static final String CHART_TITLE = TimelineChartLabels.ENERGY_CHART_TITLE;
-       public static final String SERIES_NAME_ENERGY = TimelineChartLabels.ENERGY_CHART_ENERGY;
+       public static final String SERIES_NAME_ENERGY = "Energy"; //$NON-NLS-1$
        public static final Color COLOR_ENERGY = Color.WHITE;
 
        class EnergySeriesInfo {
@@ -55,7 +55,7 @@ public class EnergyChart extends TimelineChart {
        
        public static List<String> getSeriesUnitList() {
                ArrayList<String> seriesUnitList = new ArrayList<String>();
-               seriesUnitList.add(TimelineChartLabels.ENERGY_CHART_MILLI_WATT);
+               seriesUnitList.add("mW"); //$NON-NLS-1$
                
                return seriesUnitList;
        }
@@ -71,7 +71,7 @@ public class EnergyChart extends TimelineChart {
        public JFreeChart createChart() {
                XYSeriesCollection dataSet = new XYSeriesCollection(energyInfo.baseSeries);
 
-               chart = ChartFactory.createXYBarChart(CHART_TITLE, TimelineChartLabels.ENERGY_CHART_TIME, false, TimelineChartLabels.ENERGY_CHART_WATT, dataSet, PlotOrientation.VERTICAL, true, false, false);
+               chart = ChartFactory.createXYBarChart(CHART_TITLE, "Time", false, "mW", dataSet, PlotOrientation.VERTICAL, true, false, false); //$NON-NLS-2$ //$NON-NLS-1$
 
                if (null == chart) {
                        return null;
index ca0edc1..4376999 100644 (file)
@@ -101,7 +101,7 @@ public class FileChart extends TimelineChart {
                XYSeriesCollection fdCountDataset = createFDCountDataset();
                XYSeriesCollection RWDataset = createRWDataset();
 
-               chart = ChartFactory.createXYBarChart(CHART_TITLE, TimelineChartLabels.FILE_CHART_TIME, false, TimelineChartLabels.FILE_CHART_SIZE, fdCountDataset, PlotOrientation.VERTICAL, false, false, false);
+               chart = ChartFactory.createXYBarChart(CHART_TITLE, "Time", false, "Size", fdCountDataset, PlotOrientation.VERTICAL, false, false, false); //$NON-NLS-2$ //$NON-NLS-1$
 
                if (null == chart) {
                        return null;
@@ -151,21 +151,25 @@ public class FileChart extends TimelineChart {
        public void update() {
                Display.getDefault().asyncExec(new Runnable() {
                        @Override
+                       @SuppressWarnings("unchecked")
                        public void run() {
-                               for(XYDataItem xyDataItem : readInfo.newXYDataItems) {
+                               Vector<XYDataItem> tempXYDataItems = (Vector<XYDataItem>) readInfo.newXYDataItems.clone();
+                               readInfo.newXYDataItems.clear();
+                               for(XYDataItem xyDataItem : tempXYDataItems) {
                                        readInfo.baseSeries.add(xyDataItem);
                                }
-                               readInfo.newXYDataItems.clear();
                                
-                               for(XYDataItem xyDataItem : writeInfo.newXYDataItems) {
+                               tempXYDataItems = (Vector<XYDataItem>) writeInfo.newXYDataItems.clone();
+                               writeInfo.newXYDataItems.clear();
+                               for(XYDataItem xyDataItem : tempXYDataItems) {
                                        writeInfo.baseSeries.add(xyDataItem);
                                }
-                               writeInfo.newXYDataItems.clear();
                                
-                               for(XYDataItem xyDataItem : fdCountInfo.newXYDataItems) {
+                               tempXYDataItems = (Vector<XYDataItem>) fdCountInfo.newXYDataItems.clone();
+                               fdCountInfo.newXYDataItems.clear();
+                               for(XYDataItem xyDataItem : tempXYDataItems) {
                                        fdCountInfo.baseSeries.add(xyDataItem);
                                }
-                               fdCountInfo.newXYDataItems.clear();
                                
                                chart.getXYPlot().getRangeAxis(0).setRange(new Range(0, maxFDCount));
                        }
index ebca11d..d984957 100644 (file)
@@ -29,10 +29,10 @@ import org.tizen.dynamicanalyzer.utils.TimelineUtils;
 
 public class HeapChart extends TimelineChart {
        public static final String CHART_TITLE = TimelineChartLabels.HEAP_CHART_TITLE;
-       public static final String SERIES_NAME_TOTAL_ALLOCATION = TimelineChartLabels.HEAP_CHART_SERIES_NAME_TOTAL_ALLOCATION;
+       public static final String SERIES_NAME_TOTAL_ALLOCATION = TimelineChartLabels.HEAP_CHART_SERIES_NAME_PLATFORM_ALLOCATION;
        public static final String SERIES_NAME_USER_ALLOCATION = TimelineChartLabels.HEAP_CHART_SERIES_NAME_USER_ALLOCATION;
 
-       public static final String NIL = TimelineChartLabels.HEAP_CHART_NIL;
+       public static final String NIL = "(nil)"; //$NON-NLS-1$
        
        public static int sizeMode = TimelineConstants.ITEM_SIZE_MODE_DEF;
 
@@ -95,7 +95,7 @@ public class HeapChart extends TimelineChart {
        public JFreeChart createChart() {
                XYSeriesCollection dataset = createDataset();
 
-               chart = ChartFactory.createXYAreaChart(CHART_TITLE, TimelineChartLabels.HEAP_CHART_TIME, TimelineChartLabels.HEAP_CHART_BYTE, dataset, PlotOrientation.VERTICAL, false, false, false);
+               chart = ChartFactory.createXYAreaChart(CHART_TITLE, "Time", "byte", dataset, PlotOrientation.VERTICAL, false, false, false); //$NON-NLS-2$ //$NON-NLS-1$
 
                if (null == chart) {
                        return null;
@@ -124,18 +124,21 @@ public class HeapChart extends TimelineChart {
        public void update() {
                Display.getDefault().asyncExec(new Runnable() {
                        @Override
+                       @SuppressWarnings("unchecked")
                        public void run() {
-                               for (XYDataItem xyDataItem : totalAllocationInfo.newXYDataItems) {
+                               Vector<XYDataItem> tempXYDataItems = (Vector<XYDataItem>) totalAllocationInfo.newXYDataItems.clone();
+                               totalAllocationInfo.newXYDataItems.clear();
+                               for (XYDataItem xyDataItem : tempXYDataItems) {
                                        totalAllocationInfo.baseSeries.add(xyDataItem);
                                }
-                               totalAllocationInfo.newXYDataItems.clear();
 
-                               for (XYDataItem xyDataItem : userAllocationInfo.newXYDataItems) {
+                               tempXYDataItems = (Vector<XYDataItem>) userAllocationInfo.newXYDataItems.clone();
+                               userAllocationInfo.newXYDataItems.clear();
+                               for (XYDataItem xyDataItem : tempXYDataItems) {
                                        userAllocationInfo.baseSeries.add(xyDataItem);
                                }
-                               userAllocationInfo.newXYDataItems.clear();
-                               
-                               if(needUpdateChartRange) {
+
+                               if (needUpdateChartRange) {
                                        xyPlot.getRangeAxis().setRange(new Range(0, chartMaxVal / TempConstants.chartRangeRatio));
                                        needUpdateChartRange = false;
                                }
index bd881d7..77d2f1f 100644 (file)
@@ -101,7 +101,7 @@ public class ProcessMemoryChart extends TimelineChart {
        public JFreeChart createChart() {
                XYSeriesCollection dataset = createDataset();
 
-               chart = ChartFactory.createXYAreaChart(CHART_TITLE, TimelineChartLabels.PROCESS_MEMORY_CHART_TIME, TimelineChartLabels.PROCESS_MEMORY_CHART_BYTE, dataset, PlotOrientation.VERTICAL, false, false, false);
+               chart = ChartFactory.createXYAreaChart(CHART_TITLE, "Time", "byte", dataset, PlotOrientation.VERTICAL, false, false, false); //$NON-NLS-2$ //$NON-NLS-1$
 
                if (null == chart) {
                        return null;
index 0034cbd..e20f1be 100644 (file)
@@ -84,7 +84,7 @@ public class SnapShotChart extends TimelineChart {
        public JFreeChart createChart() {
                XYSeriesCollection moveDataset = createUIEventsMoveDataset();
 
-               chart = ChartFactory.createXYBarChart(CHART_TITLE, TimelineChartLabels.SNAPSHOT_CHART_TIME, false, TimelineChartLabels.SNAPSHOT_CHART_STATUS, moveDataset, PlotOrientation.VERTICAL, false, false, false);
+               chart = ChartFactory.createXYBarChart(CHART_TITLE, "Time", false, "Events", moveDataset, PlotOrientation.VERTICAL, false, false, false); //$NON-NLS-2$ //$NON-NLS-1$
 
                if (null == chart) {
                        return null;
index d68ea33..6982de5 100644 (file)
@@ -100,7 +100,7 @@ public class SystemMemoryChart extends TimelineChart {
        public JFreeChart createChart() {
                XYSeriesCollection dataset = createDataset();
                
-               chart = ChartFactory.createXYAreaChart(CHART_TITLE, TimelineChartLabels.SYSTEM_MEMORY_CHART_TIME, TimelineChartLabels.SYSTEM_MEMORY_CHART_BYTE, dataset, PlotOrientation.VERTICAL, false, false, false);
+               chart = ChartFactory.createXYAreaChart(CHART_TITLE, "Time", "byte", dataset, PlotOrientation.VERTICAL, false, false, false); //$NON-NLS-2$ //$NON-NLS-1$
 
                if (null == chart) {
                        return null;
@@ -129,21 +129,25 @@ public class SystemMemoryChart extends TimelineChart {
        public void update() {
                Display.getDefault().asyncExec(new Runnable() {
                        @Override
+                       @SuppressWarnings("unchecked")
                        public void run() {
-                               for(XYDataItem xyDataItem : processInfo.newXYDataItems) {
+                               Vector<XYDataItem> tempXYDataItems = (Vector<XYDataItem>) processInfo.newXYDataItems.clone();
+                               processInfo.newXYDataItems.clear();
+                               for(XYDataItem xyDataItem : tempXYDataItems) {
                                        processInfo.baseSeries.add(xyDataItem);
                                }
-                               processInfo.newXYDataItems.clear();
                                
+                               tempXYDataItems = (Vector<XYDataItem>) systemInfo.newXYDataItems.clone();
+                               systemInfo.newXYDataItems.clear();
                                for(XYDataItem xyDataItem : systemInfo.newXYDataItems) {
                                        systemInfo.baseSeries.add(xyDataItem);
                                }
-                               systemInfo.newXYDataItems.clear();
                                
+                               tempXYDataItems = (Vector<XYDataItem>) totalInfo.newXYDataItems.clone();
+                               totalInfo.newXYDataItems.clear();
                                for(XYDataItem xyDataItem : totalInfo.newXYDataItems) {
                                        totalInfo.baseSeries.add(xyDataItem);
                                }
-                               totalInfo.newXYDataItems.clear();
                                
                                if(needUpdateChartRange) {
                                        xyPlot.getRangeAxis().setRange(new Range(0, chartMaxVal / TempConstants.chartRangeRatio));
index 9faab6c..e07f8f1 100644 (file)
@@ -18,17 +18,17 @@ import org.jfree.data.time.FixedMillisecond;
 import org.tizen.dynamicanalyzer.ImageResources;
 import org.tizen.dynamicanalyzer.constants.LogCenterConstants;
 import org.tizen.dynamicanalyzer.constants.TimelineConstants;
-import org.tizen.dynamicanalyzer.nl.TimelineChartLabels;
 import org.tizen.dynamicanalyzer.services.TimelineUpdateSourceProvider;
+import org.tizen.dynamicanalyzer.timeline.chart.CPUChart;
 import org.tizen.dynamicanalyzer.timeline.chart.CPUCoreChart;
 import org.tizen.dynamicanalyzer.timeline.chart.CPUFrequencyChart;
-import org.tizen.dynamicanalyzer.timeline.chart.HeapChart;
-import org.tizen.dynamicanalyzer.timeline.chart.CPUChart;
+import org.tizen.dynamicanalyzer.timeline.chart.DeviceChart;
 import org.tizen.dynamicanalyzer.timeline.chart.EnergyChart;
 import org.tizen.dynamicanalyzer.timeline.chart.FileChart;
-import org.tizen.dynamicanalyzer.timeline.chart.SystemMemoryChart;
+import org.tizen.dynamicanalyzer.timeline.chart.HeapChart;
 import org.tizen.dynamicanalyzer.timeline.chart.ProcessMemoryChart;
 import org.tizen.dynamicanalyzer.timeline.chart.SnapShotChart;
+import org.tizen.dynamicanalyzer.timeline.chart.SystemMemoryChart;
 
 
 public class TimelineUtils {
@@ -84,9 +84,6 @@ public class TimelineUtils {
                case TimelineConstants.CHART_TYPE_HEAP:
                        name = HeapChart.CHART_TITLE;
                        break;
-               case TimelineConstants.CHART_TYPE_RESOURCE_USAGE:
-                       name = TimelineChartLabels.TIMELINE_UTILS_RESOURCE_USAGE;
-                       break;
                case TimelineConstants.CHART_TYPE_FILE:
                        name = FileChart.CHART_TITLE;
                        break;
@@ -99,44 +96,14 @@ public class TimelineUtils {
                case TimelineConstants.CHART_TYPE_CPU_FREQUENCY:
                        name = CPUFrequencyChart.CHART_TITLE;
                        break;
-               case TimelineConstants.CHART_TYPE_WIFI:
-                       name = TimelineChartLabels.TIMELINE_UTILS_WIFI;
-                       break;
-               case TimelineConstants.CHART_TYPE_BT:
-                       name = TimelineChartLabels.TIMELINE_UTILS_BLUETOOTH;
-                       break;
-               case TimelineConstants.CHART_TYPE_GPS:
-                       name = TimelineChartLabels.TIMELINE_UTILS_GPS;
-                       break;
-               case TimelineConstants.CHART_TYPE_BRIGHTNESS:
-                       name = TimelineChartLabels.TIMELINE_UTILS_BRIGHTNESS;
-                       break;
-               case TimelineConstants.CHART_TYPE_CAMERA:
-                       name = TimelineChartLabels.TIMELINE_UTILS_CAMERA;
-                       break;
-               case TimelineConstants.CHART_TYPE_SOUND:
-                       name = TimelineChartLabels.TIMELINE_UTILS_SOUND;
-                       break;
-               case TimelineConstants.CHART_TYPE_AUDIO:
-                       name = TimelineChartLabels.TIMELINE_UTILS_AUDIO;
-                       break;
-               case TimelineConstants.CHART_TYPE_VIBRATION:
-                       name = TimelineChartLabels.TIMELINE_UTILS_VIBRATION;
-                       break;
                case TimelineConstants.CHART_TYPE_PROCESS_SIZE:
                        name = ProcessMemoryChart.CHART_TITLE;
                        break;
-               case TimelineConstants.CHART_TYPE_VOLTAGE:
-                       name = TimelineChartLabels.TIMELINE_UTILS_VOLTAGE;
-                       break;
-               case TimelineConstants.CHART_TYPE_UI_EVENTS:
-                       name = TimelineChartLabels.TIMELINE_UTILS_UI_EVENTS;
-                       break;
                case TimelineConstants.CHART_TYPE_SNAPSHOT:
                        name = SnapShotChart.CHART_TITLE;
                        break;
                case TimelineConstants.CHART_TYPE_DEVICE:
-                       name = TimelineChartLabels.TIMELINE_UTILS_DEVICES;
+                       name = DeviceChart.CHART_TITLE;
                        break;
                case TimelineConstants.CHART_TYPE_ENERGY:
                        name = EnergyChart.CHART_TITLE;
@@ -144,9 +111,6 @@ public class TimelineUtils {
                case TimelineConstants.CHART_TYPE_SYSTEM_MEMORY:
                        name = SystemMemoryChart.CHART_TITLE;
                        break;
-               default:
-                       name = TimelineChartLabels.TIMELINE_UTILS_ADD_ITEM_NAME;
-                       break;
                }
                return name;
        }
@@ -155,7 +119,6 @@ public class TimelineUtils {
                int probeType = 0;
 
                switch (chartType) {
-               case TimelineConstants.CHART_TYPE_RESOURCE_USAGE:
                case TimelineConstants.CHART_TYPE_FILE:
                        probeType = LogCenterConstants.LOG_RESOURCE;
                        break;
@@ -165,22 +128,12 @@ public class TimelineUtils {
                case TimelineConstants.CHART_TYPE_CPU:
                case TimelineConstants.CHART_TYPE_CPU_CORE:
                case TimelineConstants.CHART_TYPE_CPU_FREQUENCY:
-               case TimelineConstants.CHART_TYPE_WIFI:
-               case TimelineConstants.CHART_TYPE_BT:
-               case TimelineConstants.CHART_TYPE_GPS:
-               case TimelineConstants.CHART_TYPE_BRIGHTNESS:
-               case TimelineConstants.CHART_TYPE_CAMERA:
-               case TimelineConstants.CHART_TYPE_SOUND:
-               case TimelineConstants.CHART_TYPE_AUDIO:
-               case TimelineConstants.CHART_TYPE_VIBRATION:
                case TimelineConstants.CHART_TYPE_PROCESS_SIZE:
-               case TimelineConstants.CHART_TYPE_VOLTAGE:
                case TimelineConstants.CHART_TYPE_DEVICE:
                case TimelineConstants.CHART_TYPE_ENERGY:
                case TimelineConstants.CHART_TYPE_SYSTEM_MEMORY:
                        probeType = LogCenterConstants.LOG_DEVICE;
                        break;
-               case TimelineConstants.CHART_TYPE_UI_EVENTS:
                case TimelineConstants.CHART_TYPE_SNAPSHOT:
                        probeType = LogCenterConstants.LOG_RECODER;
                        break;
@@ -201,9 +154,6 @@ public class TimelineUtils {
                Image iconImage = null;
 
                switch (chartType) {
-               case TimelineConstants.CHART_TYPE_RESOURCE_USAGE:
-                       iconImage = ImageResources.FD_USAGE;
-                       break;
                case TimelineConstants.CHART_TYPE_FILE:
                        iconImage = ImageResources.FILE;
                        break;
@@ -228,24 +178,12 @@ public class TimelineUtils {
                case TimelineConstants.CHART_TYPE_SNAPSHOT:
                        iconImage = ImageResources.UI_EVENT;
                        break;
-               case TimelineConstants.CHART_TYPE_VOLTAGE:
-                       iconImage = ImageResources.CPU;
-                       break;
                case TimelineConstants.CHART_TYPE_ENERGY:
                        iconImage = ImageResources.ENERGY;
                        break;
                case TimelineConstants.CHART_TYPE_DEVICE:
                        iconImage = ImageResources.DEVICES;
                        break;
-               case TimelineConstants.CHART_TYPE_WIFI:
-               case TimelineConstants.CHART_TYPE_BT:
-               case TimelineConstants.CHART_TYPE_GPS:
-               case TimelineConstants.CHART_TYPE_BRIGHTNESS:
-               case TimelineConstants.CHART_TYPE_CAMERA:
-               case TimelineConstants.CHART_TYPE_SOUND:
-               case TimelineConstants.CHART_TYPE_AUDIO:
-               case TimelineConstants.CHART_TYPE_VIBRATION:
-               case TimelineConstants.CHART_TYPE_UI_EVENTS:
                default:
                        iconImage = ImageResources.CPU;
                        break;
@@ -255,9 +193,7 @@ public class TimelineUtils {
        }
 
        public static int getChartType(String string) {
-               if (string.equals(getStringChartType(TimelineConstants.CHART_TYPE_RESOURCE_USAGE))) {
-                       return TimelineConstants.CHART_TYPE_RESOURCE_USAGE;
-               } else if (string.equals(getStringChartType(TimelineConstants.CHART_TYPE_FILE))) {
+               if (string.equals(getStringChartType(TimelineConstants.CHART_TYPE_FILE))) {
                        return TimelineConstants.CHART_TYPE_FILE;
                } else if (string.equals(getStringChartType(TimelineConstants.CHART_TYPE_HEAP))) {
                        return TimelineConstants.CHART_TYPE_HEAP;
@@ -271,28 +207,8 @@ public class TimelineUtils {
                        return TimelineConstants.CHART_TYPE_CPU_CORE;
                } else if (string.equals(getStringChartType(TimelineConstants.CHART_TYPE_CPU_FREQUENCY))) {
                        return TimelineConstants.CHART_TYPE_CPU_FREQUENCY;
-               } else if (string.equals(getStringChartType(TimelineConstants.CHART_TYPE_WIFI))) {
-                       return TimelineConstants.CHART_TYPE_WIFI;
-               } else if (string.equals(getStringChartType(TimelineConstants.CHART_TYPE_BT))) {
-                       return TimelineConstants.CHART_TYPE_BT;
-               } else if (string.equals(getStringChartType(TimelineConstants.CHART_TYPE_GPS))) {
-                       return TimelineConstants.CHART_TYPE_GPS;
-               } else if (string.equals(getStringChartType(TimelineConstants.CHART_TYPE_BRIGHTNESS))) {
-                       return TimelineConstants.CHART_TYPE_BRIGHTNESS;
-               } else if (string.equals(getStringChartType(TimelineConstants.CHART_TYPE_CAMERA))) {
-                       return TimelineConstants.CHART_TYPE_CAMERA;
-               } else if (string.equals(getStringChartType(TimelineConstants.CHART_TYPE_SOUND))) {
-                       return TimelineConstants.CHART_TYPE_SOUND;
-               } else if (string.equals(getStringChartType(TimelineConstants.CHART_TYPE_AUDIO))) {
-                       return TimelineConstants.CHART_TYPE_AUDIO;
-               } else if (string.equals(getStringChartType(TimelineConstants.CHART_TYPE_VIBRATION))) {
-                       return TimelineConstants.CHART_TYPE_VIBRATION;
                } else if (string.equals(getStringChartType(TimelineConstants.CHART_TYPE_PROCESS_SIZE))) {
                        return TimelineConstants.CHART_TYPE_PROCESS_SIZE;
-               } else if (string.equals(getStringChartType(TimelineConstants.CHART_TYPE_VOLTAGE))) {
-                       return TimelineConstants.CHART_TYPE_VOLTAGE;
-               } else if (string.equals(getStringChartType(TimelineConstants.CHART_TYPE_UI_EVENTS))) {
-                       return TimelineConstants.CHART_TYPE_UI_EVENTS;
                } else if (string.equals(getStringChartType(TimelineConstants.CHART_TYPE_SNAPSHOT))) {
                        return TimelineConstants.CHART_TYPE_SNAPSHOT;
                } else if (string.equals(getStringChartType(TimelineConstants.CHART_TYPE_DEVICE))) {