From 30377a16a8087b983ba15cc674048d453c74c3e6 Mon Sep 17 00:00:00 2001 From: "Hyunjong,park" Date: Fri, 27 Dec 2013 16:12:11 +0900 Subject: [PATCH] [Title] fix. replay editor [Desc.] pring mouse move event in table [Issue] - --- .../org/tizen/dynamicanalyzer/sql/SqlManager.java | 18 +-- .../swap/model/data/ReplayData.java | 6 - .../ui/network/NetworkChartData.java | 81 +++++----- .../replayEditor/ReplayEditDialogDataManager.java | 175 +++++++++++---------- .../ui/toolbar/replayEditor/ReplayEditTable.java | 174 +++++++++++--------- .../replayEditor/ReplayEditTableCellRenderer.java | 58 +++---- 6 files changed, 281 insertions(+), 231 deletions(-) diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/sql/SqlManager.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/sql/SqlManager.java index 9924756..074e365 100755 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/sql/SqlManager.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/sql/SqlManager.java @@ -1766,15 +1766,15 @@ public class SqlManager { stat = conn.createStatement(); String query = String.format("delete from replay");//$NON-NLS-1$ StringBuffer queryBuffer = new StringBuffer(query); - for (int i = 0; i < input.size(); i++) { - if (i == 0) { - queryBuffer.append(" where "); - } - queryBuffer.append(" rid = ").append(input.get(i)); - if (i < input.size() - 1) { - queryBuffer.append(" or "); - } - } +// for (int i = 0; i < input.size(); i++) { +// if (i == 0) { +// queryBuffer.append(" where "); +// } +// queryBuffer.append(" rid = ").append(input.get(i)); +// if (i < input.size() - 1) { +// queryBuffer.append(" or "); +// } +// } if (isQueryPrint) { System.out.println("query : " + queryBuffer.toString()); } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/model/data/ReplayData.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/model/data/ReplayData.java index 360ae16..963a974 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/model/data/ReplayData.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/model/data/ReplayData.java @@ -41,7 +41,6 @@ public class ReplayData extends LogData { private int objectCount = 0; private List recordEvent = new ArrayList(); - private static int useTestlogCountBeforeFixSwapbug = 0; public ReplayData() { } @@ -81,10 +80,6 @@ public class ReplayData extends LogData { for (int i = 0; i < count; i++) { RecordEventObject recordObj = new RecordEventObject(); - if (recordObj.getEventType() == 1 - && useTestlogCountBeforeFixSwapbug % 2 == 0) { - continue; - } recordObj.setId(id); recordObj.setSeq(seq); @@ -120,7 +115,6 @@ public class ReplayData extends LogData { getRecordEvent().add(recordObj); } - useTestlogCountBeforeFixSwapbug++; } public int getObjectCount() { diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/network/NetworkChartData.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/network/NetworkChartData.java index 6cbc264..2be4a2a 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/network/NetworkChartData.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/network/NetworkChartData.java @@ -381,13 +381,24 @@ public class NetworkChartData { if (!isParent() && !isClientOfClient() && statueSeries.getSeriesItemList().size() == 0) { setFDOpendStatus(event); + if (getChartKeyName().contains( - NetworkPageLabels.NETWORK_CHART_CLIENT_NAME)) { + NetworkPageLabels.NETWORK_CHART_CLIENT_NAME) + && event.getApiType() == LogCenterConstants.SOCKET_API_RECV_END) { setConnectedStatus(event); } return; } - + + if (isParent() + && statueSeries.getSeriesItemList().size() == 0 + && getChartKeyName().contains( + NetworkPageLabels.NETWORK_CHART_CLIENT_NAME) + && event.getApiType() == LogCenterConstants.SOCKET_API_RECV_END) { + setConnectedStatus(event); + return; + } + if (statueSeries.getSeriesItemList().size() == 0) { setFDOpendStatus(event); return; @@ -408,12 +419,12 @@ public class NetworkChartData { case LogCenterConstants.SOCKET_API_CONNECT: { if (event.isFailedAPI() == true) { chartWarningStatus = true; - } - - if (isParent()) { - setConnectedStatus(event); } else { - setConnectedStatus(event); + if (isParent()) { + setConnectedStatus(event); + } else { + setConnectedStatus(event); + } } break; } @@ -487,15 +498,15 @@ public class NetworkChartData { case LogCenterConstants.HTTP_API_ALLOCATION: break; case LogCenterConstants.HTTP_API_SUBMIT: { -// if (event.isFailedAPI()) { -// setFDCloseStatusManager(event); -// return; -// } -// setConnectedStatus(event); + // if (event.isFailedAPI()) { + // setFDCloseStatusManager(event); + // return; + // } + // setConnectedStatus(event); break; } case LogCenterConstants.HTTP_API_REQUEST: - // setDisConnectedStatus(event); + // setDisConnectedStatus(event); break; case LogCenterConstants.HTTP_API_RESPONSE: break; @@ -601,28 +612,28 @@ public class NetworkChartData { } } -// private void setDisConnectedStatus(NetworkChartDataEvent event) { -// if ((isFDOpenFailed()) == true || (event.isFailedAPI() == true)) { -// return; -// } -// int nStatusLastIndex = statueSeries.getSeriesItemList().size() - 1; -// if (nStatusLastIndex > -1) { -// statueSeries.getSeriesItemList().get(nStatusLastIndex) -// .setColor(ColorResources.NETWORK_AREA_FD_USED_END); -// -// statueSeries -// .getSeriesItemList() -// .get(nStatusLastIndex) -// .setGradationForegroundColor( -// ColorResources.NETWORK_AREA_FD_USED_START); -// -// statueSeries -// .getSeriesItemList() -// .get(nStatusLastIndex) -// .setTooltipText( -// NetworkPageLabels.NETWORK_CHART_TOOLTIP_FD_OPEND); -// } -// } + // private void setDisConnectedStatus(NetworkChartDataEvent event) { + // if ((isFDOpenFailed()) == true || (event.isFailedAPI() == true)) { + // return; + // } + // int nStatusLastIndex = statueSeries.getSeriesItemList().size() - 1; + // if (nStatusLastIndex > -1) { + // statueSeries.getSeriesItemList().get(nStatusLastIndex) + // .setColor(ColorResources.NETWORK_AREA_FD_USED_END); + // + // statueSeries + // .getSeriesItemList() + // .get(nStatusLastIndex) + // .setGradationForegroundColor( + // ColorResources.NETWORK_AREA_FD_USED_START); + // + // statueSeries + // .getSeriesItemList() + // .get(nStatusLastIndex) + // .setTooltipText( + // NetworkPageLabels.NETWORK_CHART_TOOLTIP_FD_OPEND); + // } + // } private void setConnectedStatus(NetworkChartDataEvent event) { if ((isFDOpenFailed()) == true || (event.isFailedAPI() == true)) { diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/replayEditor/ReplayEditDialogDataManager.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/replayEditor/ReplayEditDialogDataManager.java index 1d1a15d..6c9dea3 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/replayEditor/ReplayEditDialogDataManager.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/replayEditor/ReplayEditDialogDataManager.java @@ -26,7 +26,6 @@ package org.tizen.dynamicanalyzer.ui.toolbar.replayEditor; import java.util.ArrayList; -import java.util.Collections; import java.util.List; import org.eclipse.swt.widgets.Shell; @@ -114,11 +113,12 @@ public class ReplayEditDialogDataManager { ReplayData replayData = getReplayDBData(); if (null != replayData) { makeReplayEditData(replayModifyDataList, replayData); - removeNotExistMouseUpTimeItem(replayModifyDataList); - setRemoveDBIndex(replayModifyDataList); - sortTableItem(replayModifyDataList); - // removeWrongData(replayModifyDataList); + // removeNotExistMouseUpTimeItem(replayModifyDataList); + // setRemoveDBIndex(replayModifyDataList); + // sortTableItem(replayModifyDataList); } + + // removeWrongData(replayModifyDataList); } return replayModifyDataList; } @@ -143,21 +143,24 @@ public class ReplayEditDialogDataManager { // listData.removeAll(removeList); // } - private void removeNotExistMouseUpTimeItem( - List listData) { - for (int i = 0; i < listData.size(); i++) { - if (listData.get(i).getStrEventMouseUpTime().length() < 1) { - listData.remove(i); - } - } - } - - private void sortTableItem(List listData) { - Collections.sort(listData, new ReplayEditTableItemListSortComparator()); - } + // private void removeNotExistMouseUpTimeItem( + // List listData) { + // for (int i = 0; i < listData.size(); i++) { + // if (listData.get(i).getStrEventMouseUpTime().length() < 1) { + // listData.remove(i); + // } + // } + // } + // + // private void sortTableItem(List listData) { + // Collections.sort(listData, new ReplayEditTableItemListSortComparator()); + // } private ReplayEditTableData getLastReplayEditTableData() { - return getReplayModifyData().get(getReplayModifyData().size() - 1); + if(getReplayModifyData().size() > 0 ){ + return getReplayModifyData().get(getReplayModifyData().size() - 1); + } + return null; } private void makeReplayEditData(List editList, @@ -179,27 +182,27 @@ public class ReplayEditDialogDataManager { } } - private void setRemoveDBIndex(List listData) { - int nSize = listData.size(); - for (int i = 0; i < nSize; i++) { - int rid = listData.get(i).getEventRid(); - if (rid > -1) { - if (listData.get(i).getStrEventType() - .equals(ReplayEditLabels.CONTEXT_TOUCH)) { - for (int j = rid; j < rid + 7; j++) { - removeDBIndex.add(j); - } - } else if (listData.get(i).getStrEventType() - .equals(ReplayEditLabels.CONTEXT_KEY)) { - for (int j = rid; j < rid + 4; j++) { - removeDBIndex.add(j); - } - } - - } - - } - } + // private void setRemoveDBIndex(List listData) { + // int nSize = listData.size(); + // for (int i = 0; i < nSize; i++) { + // int rid = listData.get(i).getEventRid(); + // if (rid > -1) { + // if (listData.get(i).getStrEventType() + // .equals(ReplayEditLabels.CONTEXT_TOUCH)) { + // for (int j = rid; j < rid + 7; j++) { + // removeDBIndex.add(j); + // } + // } else if (listData.get(i).getStrEventType() + // .equals(ReplayEditLabels.CONTEXT_KEY)) { + // for (int j = rid; j < rid + 4; j++) { + // removeDBIndex.add(j); + // } + // } + // + // } + // + // } + // } private boolean isEventMouseUpTime(RecordEventObject reo) { boolean isEventMouseUpTime = false; @@ -224,7 +227,9 @@ public class ReplayEditDialogDataManager { } private void updateEventMouseUpTime(long time) { - getLastReplayEditTableData().setEventMouseUpTime(time); + if(null != getLastReplayEditTableData()){ + getLastReplayEditTableData().setEventMouseUpTime(time); + } } private ReplayEditTableData makeEditTableData(RecordEventObject reo) { @@ -244,26 +249,30 @@ public class ReplayEditDialogDataManager { case TOUCH: { if (reo.getEventCode() == TOUCH_EVENT_CODE_MOUSED_DOWN_START && reo.getEventValue() != -1) { - if (isDrawEvnet()) { - return null; - } + // if (isDrawEvnet()) { + // return null; + // } replayType = new ReplayEditTableData(); replayType.setEventMouseDownTime(reo.getTime()); replayType.setStrEventType(setEventType(reo.getEventType())); replayType.setEventRid(reo.getId()); } else if (reo.getEventCode() == TOUCH_EVENT_CODE_X) { - getReplayModifyData() - .get(getReplayModifyData().size() - 1) - .setStrEventValue1( - ReplayEditLabels.CONTEXT_VALUE_X - + Integer.toString(reo.getEventValue())); + if (getReplayModifyData().size() > 0) { + getReplayModifyData() + .get(getReplayModifyData().size() - 1) + .setStrEventValue1( + ReplayEditLabels.CONTEXT_VALUE_X + + Integer.toString(reo.getEventValue())); + } } else if (reo.getEventCode() == TOUCH_EVENT_CODE_Y) { - getReplayModifyData() - .get(getReplayModifyData().size() - 1) - .setStrEventValue2( - ReplayEditLabels.CONTEXT_VALUE_Y - + Integer.toString(reo.getEventValue())); + if (getReplayModifyData().size() > 0) { + getReplayModifyData().get(getReplayModifyData().size() - 1) + .setStrEventValue2( + ReplayEditLabels.CONTEXT_VALUE_Y + + Integer.toString(reo + .getEventValue())); + } } break; } @@ -326,21 +335,21 @@ public class ReplayEditDialogDataManager { return strType; } - private boolean isDrawEvnet() { - if (getReplayModifyData().size() < 1) { - return false; - } - boolean isDrawEvnet = false; - if (getLastReplayEditTableData().getStrEventMouseUpTime().equals( - CommonConstants.EMPTY)) { - getLastReplayEditTableData().setStrEventType( - ReplayEditLabels.CONTEXT_DRAG); - getLastReplayEditTableData().setModifiabilityEvent(false); - getLastReplayEditTableData().setEventRid(-1); - isDrawEvnet = true; - } - return isDrawEvnet; - } + // private boolean isDrawEvnet() { + // if (getReplayModifyData().size() < 1) { + // return false; + // } + // boolean isDrawEvnet = false; + // if (getLastReplayEditTableData().getStrEventMouseUpTime().equals( + // CommonConstants.EMPTY)) { + // getLastReplayEditTableData().setStrEventType( + // ReplayEditLabels.CONTEXT_DRAG); + // getLastReplayEditTableData().setModifiabilityEvent(false); + // getLastReplayEditTableData().setEventRid(-1); + // isDrawEvnet = true; + // } + // return isDrawEvnet; + // } public void saveDialog() { SqlManager.getInstance().closeConnection(); @@ -358,8 +367,6 @@ public class ReplayEditDialogDataManager { } public void insertDB(boolean isSave, String dbPath) { - for (int i = 0; i < removeDBIndex.size(); i++) { - } SqlManager.getInstance().deleteReplayTableItems(isSave, dbPath, removeDBIndex); insertDBData(isSave, dbPath); @@ -382,8 +389,6 @@ public class ReplayEditDialogDataManager { } else if (item.get(EVENT_TYPE_TABLE_INDEX).equals( ReplayEditLabels.CONTEXT_KEY)) { dataList = makeDBKeyData(item); - } else { // Draw - } if (dataList.size() > 0) { SqlManager.getInstance().insertRepalyTableItem(isSave, dbPath, @@ -394,6 +399,9 @@ public class ReplayEditDialogDataManager { public String getDBTime(String time) { String strTime = time; + if (strTime.equals(CommonConstants.EMPTY)) { + return CommonConstants.EMPTY; + } if (strTime.contains(ReplayEditLabels.CONTEXT_VALUE_S)) { strTime = time.replace(ReplayEditLabels.CONTEXT_VALUE_S, CommonConstants.EMPTY); @@ -450,10 +458,10 @@ public class ReplayEditDialogDataManager { DATime resultTime = new DATime(); resultTime.setSec((int) eventTimeSec); resultTime.setNano((int) eventTimeNano); -// Long resultLongtime = getTimeValue(eventTimeSec, eventTimeNano); -// System.out.println("time : " + time + " resultLongtime : " -// + resultLongtime + " secTime : " + eventTimeSec -// + " nanoTime : " + eventTimeNano); + // Long resultLongtime = getTimeValue(eventTimeSec, eventTimeNano); + // System.out.println("time : " + time + " resultLongtime : " + // + resultLongtime + " secTime : " + eventTimeSec + // + " nanoTime : " + eventTimeNano); return resultTime; } @@ -545,15 +553,24 @@ public class ReplayEditDialogDataManager { private List> makeDBTouchData(List item) { String itemMouseDownTime = getDBTime(item .get(EVENT_MOUSE_DOWN_TIME_TABLE_INDEX)); + DATime mouseDownTime = getDATimeValue(Long.parseLong(itemMouseDownTime)); + + DATime mouseUpTime = null; + int makeLogCount = 7; String itemMouseUpTime = getDBTime(item .get(EVENT_MOUSE_UP_TIME_TABLE_INDEX)); - DATime mouseDownTime = getDATimeValue(Long.parseLong(itemMouseDownTime)); - DATime mouseUpTime = getDATimeValue(Long.parseLong(itemMouseUpTime)); + if (itemMouseUpTime.equals(CommonConstants.EMPTY)) { + makeLogCount = 5; + } else { + mouseUpTime = getDATimeValue(Long.parseLong(itemMouseUpTime)); + + } + String itemValue1 = item.get(EVENT_VALUE1_TABLE_INDEX).trim(); String itemValue2 = item.get(EVENT_VALUE2_TABLE_INDEX).trim(); List> dbKeyDataList = new ArrayList>(); - for (int i = 0; i < 7; i++) { + for (int i = 0; i < makeLogCount; i++) { List keyData = new ArrayList(); if (i == 0) { keyData.add(Integer.toString(mouseDownTime.getSec() diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/replayEditor/ReplayEditTable.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/replayEditor/ReplayEditTable.java index 10e1492..65a93a1 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/replayEditor/ReplayEditTable.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/replayEditor/ReplayEditTable.java @@ -297,7 +297,7 @@ public class ReplayEditTable extends DATableComposite { String optionText = table.getItem(getMouseSelectedTableItemIndex()) .getText(OPTION_TIME_TABLE_INDEX); if (optionText.contains(text)) { - optionText = optionText.replace(text, ""); + optionText = optionText.replace(text, CommonConstants.EMPTY); table.getItem(getMouseSelectedTableItemIndex()).setText( OPTION_TIME_TABLE_INDEX, optionText); } @@ -563,6 +563,16 @@ public class ReplayEditTable extends DATableComposite { inputString += ReplayEditLabels.CONTEXT_VALUE_S; } + if (savedString.contains(CommonConstants.DOT)) { + String lines[] = savedString.split(CommonConstants.CMD_SPLIT_DOT); + if (lines.length > 0) { + if (lines[1].length() > 1) { + return; + } + } + + } + setMouseSelectedTableItemText(inputString); tableRedraw(); } else if (getColumnName(getMouseSelectedTableColumnIndex()) @@ -741,7 +751,7 @@ public class ReplayEditTable extends DATableComposite { updateRollbackText(); updateNextItemsSavedTime(); - + updateVaildState(); isMouseSelectedTableItem = false; tableRedraw(); @@ -755,9 +765,15 @@ public class ReplayEditTable extends DATableComposite { for (int i = 0; i < nSize; i++) { long mouseDowntime = getLongTableTime(table.getItem(i).getText( DOWN_TIME_TABLE_INDEX)); - long mouseUptime = getLongTableTime(table.getItem(i).getText( - UP_TIME_TABLE_INDEX)); + String upTime = table.getItem(i).getText(UP_TIME_TABLE_INDEX); + long mouseUptime = 0; + if (!upTime.equals(CommonConstants.EMPTY)) { + mouseUptime = getLongTableTime(upTime); + }else{ + mouseUptime = mouseDowntime; + } + if (mouseUptime < mouseDowntime) { isVaild = false; } else if (mouseDowntime < preEventTime) { @@ -806,7 +822,11 @@ public class ReplayEditTable extends DATableComposite { if (strTime.length() == 1) { strTime += 0; } - return Long.parseLong(strTime); + if (strTime.equals(CommonConstants.EMPTY)) { + return 0; + } else { + return Long.parseLong(strTime); + } } private String getStrTableTime(Long time) { @@ -839,20 +859,27 @@ public class ReplayEditTable extends DATableComposite { } long mouseDowntime = getLongTableTime(table.getItem(i).getText( DOWN_TIME_TABLE_INDEX)); - long mouseUptime = getLongTableTime(table.getItem(i).getText( - UP_TIME_TABLE_INDEX)); mouseDowntime += addTime; + + String upTime = table.getItem(i).getText(UP_TIME_TABLE_INDEX); + long mouseUptime = 0; + if (!upTime.equals(CommonConstants.EMPTY)) { + mouseUptime = getLongTableTime(upTime); + } mouseUptime += addTime; if (i == startItem) { - if (isMouseDown) { + if (isMouseDown && !upTime.equals(CommonConstants.EMPTY)) { table.getItem(i).setText(UP_TIME_TABLE_INDEX, getStrTableTime(mouseUptime)); } } else { table.getItem(i).setText(DOWN_TIME_TABLE_INDEX, getStrTableTime(mouseDowntime)); - table.getItem(i).setText(UP_TIME_TABLE_INDEX, - getStrTableTime(mouseUptime)); + if (!upTime.equals(CommonConstants.EMPTY)) { + table.getItem(i).setText(UP_TIME_TABLE_INDEX, + getStrTableTime(mouseUptime)); + } + } } } @@ -879,49 +906,49 @@ public class ReplayEditTable extends DATableComposite { if (savedString.length() == 0) { isResetText = true; } else { - if (getColumnName(getMouseSelectedTableColumnIndex()).equals( - ReplayEditLabels.TABLE_COLUMN_MOUSE_DOWN_TIME)) { - String preItemmouseUpTime = CommonConstants.ZERO - + CommonConstants.DOT + CommonConstants.ZERO - + ReplayEditLabels.CONTEXT_VALUE_S; - if (getMouseSelectedTableItemIndex() > 0) { - preItemmouseUpTime = table.getItem( - getMouseSelectedTableItemIndex() - 1).getText( - getMouseSelectedTableColumnIndex() + 1); - } - String mouseDownTime = updateDotChartAtTime(); - int comparePreItemTime = compareTime(preItemmouseUpTime, - mouseDownTime); - if (comparePreItemTime >= 0) { - isResetText = true; - } - - } else if (getColumnName(getMouseSelectedTableColumnIndex()) - .equals(ReplayEditLabels.TABLE_COLUMN_MOUSE_UP_TIME)) { - String mouseUpTime = updateDotChartAtTime(); - if (table.getItemCount() <= getMouseSelectedTableItemIndex()) { - isResetText = false; - } else { - String sameItemMouseDownTime = table.getItem( - getMouseSelectedTableItemIndex()).getText( - getMouseSelectedTableColumnIndex() - 1); - int compareSameItemTime = compareTime( - sameItemMouseDownTime, mouseUpTime); - if (compareSameItemTime >= 0) { - isResetText = true; - } - } - } else if (getColumnName(getMouseSelectedTableColumnIndex()) - .equals(ReplayEditLabels.TABLE_COLUMN_VALUE1)) { - if (savedString.length() > 7) { - isResetText = true; - } - } else if (getColumnName(getMouseSelectedTableColumnIndex()) - .equals(ReplayEditLabels.TABLE_COLUMN_VALUE2)) { - if (savedString.length() > 7) { - isResetText = true; - } - } +// if (getColumnName(getMouseSelectedTableColumnIndex()).equals( +// ReplayEditLabels.TABLE_COLUMN_MOUSE_DOWN_TIME)) { +// String preItemmouseUpTime = CommonConstants.ZERO +// + CommonConstants.DOT + CommonConstants.ZERO +// + ReplayEditLabels.CONTEXT_VALUE_S; +// if (getMouseSelectedTableItemIndex() > 0) { +// preItemmouseUpTime = table.getItem( +// getMouseSelectedTableItemIndex() - 1).getText( +// getMouseSelectedTableColumnIndex() + 1); +// } +// String mouseDownTime = updateDotChartAtTime(); +// int comparePreItemTime = compareTime(preItemmouseUpTime, +// mouseDownTime); +// if (comparePreItemTime >= 0) { +// isResetText = true; +// } +// +// } else if (getColumnName(getMouseSelectedTableColumnIndex()) +// .equals(ReplayEditLabels.TABLE_COLUMN_MOUSE_UP_TIME)) { +// String mouseUpTime = updateDotChartAtTime(); +// if (table.getItemCount() <= getMouseSelectedTableItemIndex()) { +// isResetText = false; +// } else { +// String sameItemMouseDownTime = table.getItem( +// getMouseSelectedTableItemIndex()).getText( +// getMouseSelectedTableColumnIndex() - 1); +// int compareSameItemTime = compareTime( +// sameItemMouseDownTime, mouseUpTime); +// if (compareSameItemTime >= 0) { +// isResetText = true; +// } +// } +// } else if (getColumnName(getMouseSelectedTableColumnIndex()) +// .equals(ReplayEditLabels.TABLE_COLUMN_VALUE1)) { +// if (savedString.length() > 7) { +// isResetText = true; +// } +// } else if (getColumnName(getMouseSelectedTableColumnIndex()) +// .equals(ReplayEditLabels.TABLE_COLUMN_VALUE2)) { +// if (savedString.length() > 7) { +// isResetText = true; +// } +// } } if (isResetText) { setMouseSelectedTableItemText(savedItemTextForReset); @@ -931,25 +958,25 @@ public class ReplayEditTable extends DATableComposite { return false; } - private int compareTime(String firstTime, String secondTime) { - StringBuffer firstTimeBuffer = new StringBuffer(firstTime); - StringBuffer highTimeBuffer = new StringBuffer(secondTime); - firstTimeBuffer.deleteCharAt(firstTime.length() - 1); - firstTimeBuffer.deleteCharAt(firstTime.length() - 3); - highTimeBuffer.deleteCharAt(secondTime.length() - 1); - highTimeBuffer.deleteCharAt(secondTime.length() - 3); - - long lowTime = Long.parseLong(firstTimeBuffer.toString()); - long highTime = Long.parseLong(highTimeBuffer.toString()); - - if (lowTime > highTime) { - return 1; - } else if (lowTime < highTime) { - return -1; - } else { - return 0; - } - } +// private int compareTime(String firstTime, String secondTime) { +// StringBuffer firstTimeBuffer = new StringBuffer(firstTime); +// StringBuffer highTimeBuffer = new StringBuffer(secondTime); +// firstTimeBuffer.deleteCharAt(firstTime.length() - 1); +// firstTimeBuffer.deleteCharAt(firstTime.length() - 3); +// highTimeBuffer.deleteCharAt(secondTime.length() - 1); +// highTimeBuffer.deleteCharAt(secondTime.length() - 3); +// +// long lowTime = Long.parseLong(firstTimeBuffer.toString()); +// long highTime = Long.parseLong(highTimeBuffer.toString()); +// +// if (lowTime > highTime) { +// return 1; +// } else if (lowTime < highTime) { +// return -1; +// } else { +// return 0; +// } +// } private String updateDotChartAtTime() { String chagneString = CommonConstants.EMPTY; @@ -1001,7 +1028,8 @@ public class ReplayEditTable extends DATableComposite { String selectedText = getMouseSelectedTableItemText(); if (selectedText.contains(ReplayEditLabels.CONTEXT_VALUE_X) || selectedText.contains(ReplayEditLabels.CONTEXT_VALUE_Y) - || selectedText.contains(ReplayEditLabels.CONTEXT_VALUE_S)) { + || selectedText.contains(ReplayEditLabels.CONTEXT_VALUE_S) + || selectedText.equals(CommonConstants.EMPTY)) { isMouseSelectedTableItem = true; savedItemTextForReset = getMouseSelectedTableItemText(); setMouseSelectedTableItemText(CommonConstants.EMPTY); diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/replayEditor/ReplayEditTableCellRenderer.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/replayEditor/ReplayEditTableCellRenderer.java index d5d8dc0..2bfc4d6 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/replayEditor/ReplayEditTableCellRenderer.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/replayEditor/ReplayEditTableCellRenderer.java @@ -54,7 +54,7 @@ public class ReplayEditTableCellRenderer extends DefaultCellRenderer { paintTableBoardLine(gc, item); paintMouseOverColumn(gc, item); paintSelectedInputKey(gc, item); - paintSelectedCopy(gc, item); + // paintSelectedCopy(gc, item); paintVaildTime(gc, item); } @@ -169,34 +169,34 @@ public class ReplayEditTableCellRenderer extends DefaultCellRenderer { } } - private void paintSelectedCopy(GC gc, GridItem item) { - String optionColumn = item.getText(6); - if (optionColumn - .contains(ReplayEditDialogDataManager.SELECTED_ITEM_COPY)) { - gc.setForeground(ColorResources.BLACK); - gc.setLineWidth(2); - gc.setLineStyle(SWT.LINE_DOT); - gc.drawLine(getBounds().x, getBounds().y, getBounds().x - + getBounds().width, getBounds().y); - - gc.drawLine(getBounds().x, getBounds().y + getBounds().height, - getBounds().x + getBounds().width, getBounds().y - + getBounds().height); - if (getColumn() == 0) { - gc.drawLine(getBounds().x, getBounds().y, getBounds().x, - getBounds().y + getBounds().height); - } - - if (getColumn() == 0) { - gc.drawLine(getBounds().x, getBounds().y, getBounds().x, - getBounds().y + getBounds().height); - } - - gc.setLineStyle(SWT.LINE_SOLID); - gc.setLineWidth(1); - - } - } +// private void paintSelectedCopy(GC gc, GridItem item) { +// String optionColumn = item.getText(6); +// if (optionColumn +// .contains(ReplayEditDialogDataManager.SELECTED_ITEM_COPY)) { +// gc.setForeground(ColorResources.BLACK); +// gc.setLineWidth(2); +// gc.setLineStyle(SWT.LINE_DOT); +// gc.drawLine(getBounds().x, getBounds().y, getBounds().x +// + getBounds().width, getBounds().y); +// +// gc.drawLine(getBounds().x, getBounds().y + getBounds().height, +// getBounds().x + getBounds().width, getBounds().y +// + getBounds().height); +// if (getColumn() == 0) { +// gc.drawLine(getBounds().x, getBounds().y, getBounds().x, +// getBounds().y + getBounds().height); +// } +// +// if (getColumn() == 0) { +// gc.drawLine(getBounds().x, getBounds().y, getBounds().x, +// getBounds().y + getBounds().height); +// } +// +// gc.setLineStyle(SWT.LINE_SOLID); +// gc.setLineWidth(1); +// +// } +// } private void paintVaildTime(GC gc, GridItem item) { String optionColumn = item.getText(6); -- 2.7.4