From 48409e3445f8cc329409483a3e0d10548d0e5b25 Mon Sep 17 00:00:00 2001 From: "Hyunjong,park" Date: Wed, 18 Dec 2013 13:28:42 +0900 Subject: [PATCH] [Title] fix. network, file analyzer [Desc.] filtering intenal log by configuration dlg. [Issue] - --- .../tizen/dynamicanalyzer/sql/DBTableManager.java | 8 +- .../swap/logparser/SWAPLogParser.java | 2 +- .../swap/model/data/NetworkData.java | 2 +- .../dynamicanalyzer/ui/file/FileApiListTable.java | 26 ++++--- .../dynamicanalyzer/ui/file/FileChartManager.java | 6 +- .../dynamicanalyzer/ui/file/FileDataMaker.java | 12 ++- .../ui/network/NetworkApiListTable.java | 34 +++++---- .../ui/network/NetworkChartManager.java | 39 +++++++--- .../ui/network/NetworkDataMaker.java | 86 +++++++++++----------- .../ConfigurationDialogFeaturesPage.java | 4 +- 10 files changed, 128 insertions(+), 91 deletions(-) diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/sql/DBTableManager.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/sql/DBTableManager.java index 5a32b37..a47b912 100755 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/sql/DBTableManager.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/sql/DBTableManager.java @@ -72,10 +72,10 @@ public class DBTableManager { public static int TABLE_COUNT = 14; public static final String EMPTY = CommonConstants.EMPTY; - // public static final String TEXT = "VARCHAR(64)";//$NON-NLS-1$ - //public static final String BIG_TEXT = "VARCHAR(1024)";//$NON-NLS-1$ - public static final String TEXT = "LONGVARCHAR";//$NON-NLS-1$ - public static final String BIG_TEXT = "LONGVARCHAR";//$NON-NLS-1$ + public static final String TEXT = "VARCHAR(256)";//$NON-NLS-1$ + public static final String BIG_TEXT = "VARCHAR(1024)";//$NON-NLS-1$ +// public static final String TEXT = "LONGVARCHAR";//$NON-NLS-1$ +// public static final String BIG_TEXT = "LONGVARCHAR";//$NON-NLS-1$ public static final String INTEGER = "INTEGER";//$NON-NLS-1$ public static final String LONG = "bigint";//$NON-NLS-1$ public static final String NOT_NULL = "not null";//$NON-NLS-1$ diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/logparser/SWAPLogParser.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/logparser/SWAPLogParser.java index 7b662c9..897a102 100755 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/logparser/SWAPLogParser.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/logparser/SWAPLogParser.java @@ -164,7 +164,7 @@ public class SWAPLogParser implements Runnable { } } - System.out.println("api name : " + apiName + " time : " + pData.getTime()); + // System.out.println("api name : " + apiName + " time : " + pData.getTime()); if (isDropCallTraceLog()) { apiName = pData.getApiName(); if (apiName.contains(OSP_MAIN)) { diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/model/data/NetworkData.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/model/data/NetworkData.java index b8f05ed..b7aa9a1 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/model/data/NetworkData.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/model/data/NetworkData.java @@ -84,7 +84,7 @@ public class NetworkData extends ProbeCommonData { messageSize = ByteUtils.toInt(data, index); index += LONG_SIZE; - if (messageSize > 1) { + if (messageSize > 0) { packetMessage = LogDataUtils.getString(index, data); } } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/FileApiListTable.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/FileApiListTable.java index 7e5e4c4..343cc78 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/FileApiListTable.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/FileApiListTable.java @@ -139,12 +139,14 @@ public class FileApiListTable extends DAApiListTableComposite { boolean isExistStartTimeLog = false; if (fdApiType == LogCenterConstants.FD_API_TYPE_READ_START || fdApiType == LogCenterConstants.FD_API_TYPE_WRITE_START) { - String keString = contentTemp.getApiName()+contentTemp.getPid()+contentTemp.getTid(); + String keString = contentTemp.getApiName() + + contentTemp.getPid() + contentTemp.getTid(); findStartAPITableIndexHashMap.put(keString, i); } else if (fdApiType == LogCenterConstants.FD_API_TYPE_READ_END || fdApiType == LogCenterConstants.FD_API_TYPE_WRITE_END) { - String keString = contentTemp.getApiName()+contentTemp.getPid()+contentTemp.getTid(); + String keString = contentTemp.getApiName() + + contentTemp.getPid() + contentTemp.getTid(); startLogIndex = findStartAPITableIndexHashMap.get(keString); if (null != startLogIndex) { contentText.add(input.get(startLogIndex.intValue()) @@ -156,7 +158,8 @@ public class FileApiListTable extends DAApiListTableComposite { .getContents().getTime(); String timeFormat = Formatter .toTimeFormat(time - startTime); - String removeTimeFormat = timeFormat.replace("00:", CommonConstants.EMPTY);//$NON-NLS-1$ + String removeTimeFormat = timeFormat.replace( + "00:", CommonConstants.EMPTY);//$NON-NLS-1$ contentText.add(removeTimeFormat); // elapsed time contentData.add(Long.toString(time - startTime)); @@ -175,13 +178,13 @@ public class FileApiListTable extends DAApiListTableComposite { contentText.add(Integer.toString(contentTemp.getPid())); contentData.add(Integer.toString(contentTemp.getPid())); - + contentText.add(Integer.toString(contentTemp.getTid())); contentData.add(Integer.toString(contentTemp.getTid())); - + contentText.add(contentTemp.getApiName()); contentData.add(contentTemp.getApiName()); - + contentText.add(contentTemp.getArgs()); contentData.add(contentTemp.getArgs()); @@ -216,8 +219,11 @@ public class FileApiListTable extends DAApiListTableComposite { } int removeCount = 0; for (int index : removeTableIndex) { - input.remove(index - removeCount); - removeCount++; + int removeIndex = index - removeCount; + if (removeIndex > 0) { + input.remove(removeIndex); + removeCount++; + } } return input; } @@ -257,8 +263,8 @@ public class FileApiListTable extends DAApiListTableComposite { board.setTimelineMarkerEndTime(endTime); ((DAChartPlotIntervalMarker) board.getMarkers().get( - UICommonConstants.RANGE_MARKER_INDEX)).setInterval(startTime, - endTime); + UICommonConstants.RANGE_MARKER_INDEX)).setInterval( + startTime, endTime); } } } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/FileChartManager.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/FileChartManager.java index 7b306ec..044b768 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/FileChartManager.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/FileChartManager.java @@ -125,8 +125,7 @@ public class FileChartManager implements Runnable { public int[] getParentChartIndex(int seq) { int parentChartIndex = -1; FileChartData chartData = null; - List fileChartDataLow = FileChartManager.getInstance() - .getFileDataMaker().getFileChartLow(); + List fileChartDataLow = getFileDataMaker().getFileChartLow(); for (int i = 0; i < fileChartDataLow.size(); i++) { chartData = fileChartDataLow.get(i); if (chartData.getChildCount() != 0) { @@ -140,8 +139,7 @@ public class FileChartManager implements Runnable { } public int getChildChartIndex(int parentChartIndex, int seq) { - List fileChartDataLow = FileChartManager.getInstance() - .getFileDataMaker().getFileChartLow(); + List fileChartDataLow = getFileDataMaker().getFileChartLow(); List childData = fileChartDataLow.get(parentChartIndex) .getChild(); FileChartData childChartData = null; diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/FileDataMaker.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/FileDataMaker.java index 9f1e39a..71d8578 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/FileDataMaker.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/FileDataMaker.java @@ -35,6 +35,7 @@ import org.tizen.dynamicanalyzer.common.AnalyzerManager; import org.tizen.dynamicanalyzer.common.CommonConstants; import org.tizen.dynamicanalyzer.logparser.LogCenterConstants; import org.tizen.dynamicanalyzer.nl.AnalyzerLabels; +import org.tizen.dynamicanalyzer.nl.ConfigureLabels; import org.tizen.dynamicanalyzer.nl.FilePageLabels; import org.tizen.dynamicanalyzer.nl.ThreadPageLabels; import org.tizen.dynamicanalyzer.nl.TimelineChartLabels; @@ -58,6 +59,7 @@ import org.tizen.dynamicanalyzer.ui.summary.warning.WarningChecker; import org.tizen.dynamicanalyzer.ui.summary.warning.WarningData; import org.tizen.dynamicanalyzer.ui.timeline.chart.FileChart; import org.tizen.dynamicanalyzer.ui.toolbar.ToolbarArea; +import org.tizen.dynamicanalyzer.ui.toolbar.configuration.ConfigurationDialogDataManager; import org.tizen.dynamicanalyzer.widgets.chart.DAChart; import org.tizen.dynamicanalyzer.widgets.chart.DAChartPlot; import org.tizen.dynamicanalyzer.widgets.chart.DAChartPlot.AutoRangeType; @@ -127,8 +129,12 @@ public class FileDataMaker { for (int i = 0; i < size; i++) { FileData input = (FileData) inputs.get(i); - if (input.isInternal()) { - continue; + if (ConfigurationDialogDataManager.getInstance() + .getfeatureSwapValue( + ConfigureLabels.INCLUDE_INSIDE_CALL_FILE) == 0) { + if (input.isInternal()) { + continue; + } } if (isPrintLog(input)) { @@ -387,7 +393,7 @@ public class FileDataMaker { } private void chartFilteringByPId() { - if(null == board || null == board.getItemList()){ + if (null == board || null == board.getItemList()) { return; } int selectedPid = ToolbarArea.getInstance().getSelectedPid(); diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/network/NetworkApiListTable.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/network/NetworkApiListTable.java index be5c277..503a14a 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/network/NetworkApiListTable.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/network/NetworkApiListTable.java @@ -103,7 +103,7 @@ public class NetworkApiListTable extends DAApiListTableComposite { networkData.getPacketMessage()); int sendAckTime = getSendAckTime(); - if (sendAckTime > 0) { + if (sendAckTime != -1) { String timeFormat = Formatter .toTimeFormat((long) sendAckTime); NetworkChartManager.getInstance() @@ -135,7 +135,7 @@ public class NetworkApiListTable extends DAApiListTableComposite { String strElapsedTime = CommonConstants.EMPTY; for (int i = selectedIndex; i < table.getItemCount(); i++) { apiName = table.getItem(i).getText(tableApiNameColumn); - if (apiName.contains("recv")||apiName.contains("GetResponse")) {//$NON-NLS-1$ + if (apiName.contains("recv") || apiName.contains("GetResponse")) {//$NON-NLS-1$ strRecvTime = table.getItem(i).getText(tableTimeColumn); strElapsedTime = table.getItem(i).getText( tableElapsedTimeColumn); @@ -146,8 +146,10 @@ public class NetworkApiListTable extends DAApiListTableComposite { int recvTime = getIntegerTime(strRecvTime); int elapsedTime = getIntegerElaspsedTime(strElapsedTime); sendAckTime = (recvTime + elapsedTime) - sendTime; + return sendAckTime * 1000; } - return sendAckTime * 1000; + return -1; + } private int getIntegerTime(String strTime) { @@ -214,13 +216,14 @@ public class NetworkApiListTable extends DAApiListTableComposite { .equals(Integer .toString(LogCenterConstants.SOCKET_API_EVENT_START))) { - findStartAPITableIndexHashMap.put(contentTemp.getArgs(), i); + String keString = contentTemp.getApiName() + + contentTemp.getPid() + contentTemp.getTid(); + findStartAPITableIndexHashMap.put(keString, i); contentText.add(Formatter.toTimeFormat(contentTemp.getTime())); // start// - // time contentData.add(Long.toString(contentTemp.getTime())); - contentText.add("not yet returned");//$NON-NLS-1$ - contentData.add("not yet returned");//$NON-NLS-1$ + contentText.add("00.000");//$NON-NLS-1$ + contentData.add("00.000");//$NON-NLS-1$ } else if (fdApiType.equals(Integer .toString(LogCenterConstants.SOCKET_API_RECV_END)) @@ -231,8 +234,9 @@ public class NetworkApiListTable extends DAApiListTableComposite { .toString(LogCenterConstants.SOCKET_API_ACCEPT_END)) || fdApiType.equals(Integer .toString(LogCenterConstants.SOCKET_API_EVENT_END))) { - startLogIndex = findStartAPITableIndexHashMap.get(contentTemp - .getArgs()); + String keString = contentTemp.getApiName() + + contentTemp.getPid() + contentTemp.getTid(); + startLogIndex = findStartAPITableIndexHashMap.get(keString); if (null != startLogIndex) { contentText.add(input.get(startLogIndex.intValue()) .getText().get(1)); // start time @@ -323,9 +327,13 @@ public class NetworkApiListTable extends DAApiListTableComposite { int removeCount = 0; for (int index : removeTableIndex) { - input.remove(index - removeCount); - removeCount++; + int removeIndex = index - removeCount; + if (removeIndex > 0) { + input.remove(removeIndex); + removeCount++; + } } + return input; } @@ -364,8 +372,8 @@ public class NetworkApiListTable extends DAApiListTableComposite { board.setTimelineMarkerEndTime(endTime); ((DAChartPlotIntervalMarker) board.getMarkers().get( - UICommonConstants.RANGE_MARKER_INDEX)).setInterval(startTime, - endTime); + UICommonConstants.RANGE_MARKER_INDEX)).setInterval( + startTime, endTime); } } } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/network/NetworkChartManager.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/network/NetworkChartManager.java index 9028ab1..56cca7b 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/network/NetworkChartManager.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/network/NetworkChartManager.java @@ -146,15 +146,31 @@ public class NetworkChartManager implements Runnable { } public int getChildChartIndex(int parentChartIndex, String seq) { - List networkChartDataLow = NetworkChartManager - .getInstance().getNetworkDataMaker().getNetworkChartLow(); - List childData = networkChartDataLow.get( - parentChartIndex).getChild(); - NetworkChartData childChartData = null; - for (int i = 0; i < childData.size(); i++) { - childChartData = childData.get(i); - if (isEqulasSeq(childChartData, seq)) { - return i; + List networkChartDataLow = getNetworkDataMaker() + .getNetworkChartLow(); + if (networkChartDataLow.size() > 0) { + List childData = networkChartDataLow.get( + parentChartIndex).getChild(); + NetworkChartData childChartData = null; + for (int i = 0; i < childData.size(); i++) { + childChartData = childData.get(i); + if (isEqulasSeq(childChartData, seq)) { + return i; + } + } + } + + List unknownChartDataLow = getNetworkDataMaker() + .getUnknownNetworkChartLow(); + if (unknownChartDataLow.size() > 0) { + List childData = unknownChartDataLow.get( + parentChartIndex).getChild(); + NetworkChartData childChartData = null; + for (int i = 0; i < childData.size(); i++) { + childChartData = childData.get(i); + if (isEqulasSeq(childChartData, seq)) { + return i; + } } } return 0; @@ -162,8 +178,9 @@ public class NetworkChartManager implements Runnable { public boolean isEqulasSeq(NetworkChartData chartData, String seq) { for (int j = 0; j < chartData.getContents().size(); j++) { - Long seqlong = chartData.getContents().get(j).getContents() - .getTime(); + + int seqlong = chartData.getContents().get(j).getContents() + .getSeq(); if (Long.toString(seqlong).equals(seq)) { return true; } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/network/NetworkDataMaker.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/network/NetworkDataMaker.java index 846fd70..e776fb4 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/network/NetworkDataMaker.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/network/NetworkDataMaker.java @@ -34,6 +34,7 @@ import java.util.List; import org.tizen.dynamicanalyzer.common.AnalyzerManager; import org.tizen.dynamicanalyzer.common.CommonConstants; import org.tizen.dynamicanalyzer.logparser.LogCenterConstants; +import org.tizen.dynamicanalyzer.nl.ConfigureLabels; import org.tizen.dynamicanalyzer.nl.NetworkPageLabels; import org.tizen.dynamicanalyzer.nl.ThreadPageLabels; import org.tizen.dynamicanalyzer.nl.TimelineChartLabels; @@ -56,6 +57,7 @@ import org.tizen.dynamicanalyzer.ui.summary.warning.WarningCase; import org.tizen.dynamicanalyzer.ui.summary.warning.WarningChecker; import org.tizen.dynamicanalyzer.ui.summary.warning.WarningData; import org.tizen.dynamicanalyzer.ui.toolbar.ToolbarArea; +import org.tizen.dynamicanalyzer.ui.toolbar.configuration.ConfigurationDialogDataManager; import org.tizen.dynamicanalyzer.utils.AnalyzerUtil; import org.tizen.dynamicanalyzer.widgets.chart.DAChart; import org.tizen.dynamicanalyzer.widgets.chart.DAChartPlot; @@ -70,7 +72,7 @@ import org.tizen.dynamicanalyzer.widgets.popupMenu.DAPopupMenuItem; public class NetworkDataMaker { private DAChartBoard board; private int preSelectionPId = -1; - private List unConnectedDataList = new ArrayList(); + private List unknownDataList = new ArrayList(); private List connectedDataList = new ArrayList(); private List networkEventQueue = new ArrayList(); @@ -85,8 +87,8 @@ public class NetworkDataMaker { private WarningChecker warningChecker = null; private FailedChecker failedChecker = null; - private boolean isUnknownChart = false; - private boolean isAddressChart = false; + // private boolean isUnknownChart = false; + // private boolean isAddressChart = false; public NetworkDataMaker(FailedChecker failedChecker, LeakDetector leakDetector, WarningChecker warningChecker) { @@ -99,9 +101,10 @@ public class NetworkDataMaker { } public void clear() { - unConnectedDataList.clear(); + unknownDataList.clear(); connectedDataList.clear(); networkEventQueue.clear(); + unConnectedEventQueue.clear(); addressByFdHashMap.clear(); parentFDByFdHashMap.clear(); // networkTransmissionSizeItem = null; @@ -112,6 +115,10 @@ public class NetworkDataMaker { public List getNetworkChartLow() { return connectedDataList; } + + public List getUnknownNetworkChartLow() { + return unknownDataList; + } /** * @@ -122,8 +129,12 @@ public class NetworkDataMaker { for (int i = 0; i < size; i++) { NetworkData input = (NetworkData) inputs.get(i); - if (input.isInternal()) { - continue; + if (ConfigurationDialogDataManager.getInstance() + .getfeatureSwapValue( + ConfigureLabels.INCLUDE_INSIDE_CALL_NETWORK) == 0) { + if (input.isInternal()) { + continue; + } } NetworkChartDataEvent event = makeEventData(input); @@ -150,7 +161,7 @@ public class NetworkDataMaker { int apiType = input.getFdApiType(); double time = input.getTime(); long errno = input.getErrno(); - + int connectedType = 5; String parentAddress = addressByFdHashMap.get(apiFD); if (null != parentAddress) { // get Address by FD @@ -171,14 +182,6 @@ public class NetworkDataMaker { case LogCenterConstants.SOCKET_API_ACCEPT_END: { String clientFD = input.getReturn(); addressByFdHashMap.put(clientFD, parentAddress); - // if (errno != 0) { - // NetworkChartDataEvent event = new NetworkChartDataEvent( - // apiAddress, apiFD, apiThread, time, apiName, apiType, - // NetworkChartDataEvent.NETWORK_CHART_SERVER_NAME, input); - // networkEventQueue.add(event); - // } - // apiFD = clientFD; - // connectedType = NetworkChartDataEvent.NETWORK_CHART_CLIENT_NAME; break; } case LogCenterConstants.SOCKET_API_FD_CLOSE: { @@ -374,7 +377,7 @@ public class NetworkDataMaker { } } - isAddressChart = true; + // isAddressChart = true; } private void checkClosedFDForFailedFD(NetworkChartDataEvent data) { @@ -558,7 +561,7 @@ public class NetworkDataMaker { } private void chartFilteringByPId() { - if(null == board || null == board.getItemList()){ + if (null == board || null == board.getItemList()) { return; } int selectedPid = ToolbarArea.getInstance().getSelectedPid(); @@ -628,32 +631,31 @@ public class NetworkDataMaker { return pid; } - private void hideUnConnectedItem() { - if (isUnknownChart == true && isAddressChart == true) { - int parentSize = board.getItemList().getItemSize(); - for (int i = 0; i < parentSize; i++) { - DAChartBoardItem parentItem = board.getItemList().get(i); - NetworkChartData itme = (NetworkChartData) parentItem.getData(); - if (itme.getChartKeyName().equals( - NetworkPageLabels.NETWORK_CHART_NOTCONNECT)) { - board.hideItem(i); - } - - } - - isUnknownChart = false; - } - } + // private void hideUnConnectedItem() { + // if (isUnknownChart == true && isAddressChart == true) { + // int parentSize = board.getItemList().getItemSize(); + // for (int i = 0; i < parentSize; i++) { + // DAChartBoardItem parentItem = board.getItemList().get(i); + // NetworkChartData itme = (NetworkChartData) parentItem.getData(); + // if (itme.getChartKeyName().equals( + // NetworkPageLabels.NETWORK_CHART_NOTCONNECT)) { + // board.hideItem(i); + // } + // + // } + // isUnknownChart = false; + // } + // } public void checkUpdate() { // createTransmissionSizeBoardItem(); if (!AnalyzerManager.isRunning()) { - int size = unConnectedDataList.size(); + int size = unknownDataList.size(); NetworkChartData data; for (int i = 0; i < size; i++) { - data = unConnectedDataList.get(i); + data = unknownDataList.get(i); data.checkUpdate(); } @@ -668,7 +670,7 @@ public class NetworkDataMaker { int size = networkEventQueue.size(); if (size > 0) { - hideUnConnectedItem(); + // hideUnConnectedItem(); NetworkChartData parentChart = null; NetworkChartData childChart = null; NetworkChartDataEvent event = null; @@ -678,13 +680,13 @@ public class NetworkDataMaker { parentChart = findAddressChart(event); if (parentChart == null) { - if (unConnectedDataList.size() > 0) { - parentChart = unConnectedDataList.get(0); + if (unknownDataList.size() > 0) { + parentChart = unknownDataList.get(0); } if (event.getAddress().equals("0.0.0.0\n0")) {//$NON-NLS-1$ event.setAddress(NetworkPageLabels.NETWORK_CHART_NOTCONNECT); unConnectedEventQueue.add(event); - isUnknownChart = true; + // isUnknownChart = true; } else { parentChart = null; } @@ -716,8 +718,8 @@ public class NetworkDataMaker { if (event.getAddress().equals( NetworkPageLabels.NETWORK_CHART_NOTCONNECT)) { - unConnectedDataList.add(parentChart); - unConnectedDataList.add(childChart); + unknownDataList.add(parentChart); + unknownDataList.add(childChart); } else { connectedDataList.add(parentChart); connectedDataList.add(childChart); @@ -729,7 +731,7 @@ public class NetworkDataMaker { if (event.getAddress().equals( NetworkPageLabels.NETWORK_CHART_NOTCONNECT)) { - unConnectedDataList.add(childChart); + unknownDataList.add(childChart); } else { connectedDataList.add(childChart); } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/configuration/ConfigurationDialogFeaturesPage.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/configuration/ConfigurationDialogFeaturesPage.java index a359780..5ec4f82 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/configuration/ConfigurationDialogFeaturesPage.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/configuration/ConfigurationDialogFeaturesPage.java @@ -482,7 +482,7 @@ public class ConfigurationDialogFeaturesPage extends DAPageComposite { info.setText("value is empty"); return false; } else if (!isInteger(textBox.getText())) { - info.setText("value contains character"); + info.setText("you have to set character"); return false; } int value = Integer.parseInt(textBox.getText()); @@ -516,7 +516,7 @@ public class ConfigurationDialogFeaturesPage extends DAPageComposite { || featuresName.equals(ConfigureLabels.FEATURE_SYSTEM_DEVICE) || featuresName.equals(ConfigureLabels.FEATURE_SYSTEM_ENERGY)) { if (value % 10 != 0) { - info.setText("value is not multiple of 10"); + info.setText("you have to set multiple of 10ms"); return false; } } -- 2.7.4