From 82a0b614c019d2641596b0e31b800b29befe2cb2 Mon Sep 17 00:00:00 2001 From: greatim Date: Tue, 15 Sep 2015 17:17:16 +0900 Subject: [PATCH] [COMM] remove communicator 4.1 and integrate to 4.0 remove communicator for 4.1 and itegrate to 4.0 Change-Id: Ie822226c56ba7b3004ea8bf61c66a0234cbe49c4 Signed-off-by: greatim --- .../communicator/BaseCommunicator.java | 4 -- .../tizen/dynamicanalyzer/protocol/Protocol.java | 4 +- .../protocol/p40/Communicator40.java | 27 ++++++++++++ .../protocol/p40/ProtocolConstant40.java | 2 + .../protocol/p41/Communicator41.java | 48 ---------------------- .../protocol/p41/ProtocolConstant41.java | 10 ----- 6 files changed, 30 insertions(+), 65 deletions(-) delete mode 100644 org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/protocol/p41/Communicator41.java delete mode 100644 org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/protocol/p41/ProtocolConstant41.java diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/communicator/BaseCommunicator.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/communicator/BaseCommunicator.java index 4311a04..8fa4798 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/communicator/BaseCommunicator.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/communicator/BaseCommunicator.java @@ -49,7 +49,6 @@ import org.tizen.dynamicanalyzer.protocol.Protocol; import org.tizen.dynamicanalyzer.protocol.ProtocolConstants; import org.tizen.dynamicanalyzer.protocol.p30.Communicator30; import org.tizen.dynamicanalyzer.protocol.p40.Communicator40; -import org.tizen.dynamicanalyzer.protocol.p41.Communicator41; import org.tizen.dynamicanalyzer.ui.info.screenshot.EmulatorScreenshot; import org.tizen.dynamicanalyzer.ui.info.screenshot.SocketClient; import org.tizen.dynamicanalyzer.util.ByteUtil; @@ -352,9 +351,6 @@ public class BaseCommunicator { case VERSION_40: subCommunicator = new Communicator40(this); break; - case VERSION_41: - subCommunicator = new Communicator41(this); - break; default: // unknown version result = new DAResult(ErrorCode.ERR_INVALID_VERSION); break; diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/protocol/Protocol.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/protocol/Protocol.java index 2b450f3..9847f86 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/protocol/Protocol.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/protocol/Protocol.java @@ -37,8 +37,7 @@ import org.tizen.dynamicanalyzer.setting.Feature; public enum Protocol { VERSION_UNKNOWN(CommonConstants.EMPTY), VERSION_30("3.0"), - VERSION_40("4.0"), - VERSION_41("4.1"); + VERSION_40("4.0"); private String versionName; @@ -119,7 +118,6 @@ public enum Protocol { configs = ProtocolConfig30.getProtocolConfig(feature); break; case VERSION_40: - case VERSION_41: configs = ProtocolConfig40.getProtocolConfig(feature); break; default: // unknown protocol diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/protocol/p40/Communicator40.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/protocol/p40/Communicator40.java index b4208e4..adaf976 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/protocol/p40/Communicator40.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/protocol/p40/Communicator40.java @@ -583,4 +583,31 @@ public class Communicator40 extends Communicator30 { return ret; } + @Override + public DAResult sendRealPathMessage(IProgress progress, String path) + throws InterruptedException, UnsupportedProtocolException { + ProtocolSerializer ps = new ProtocolSerializer(); + ps.setMessageID(ProtocolConstant40.MSG_GET_REALPATH); + ps.putString(path); + byte[] msg = ps.toByteArray(); + + AckMessage result = parent.handleControlMessage(msg, 0); + if (result != null && result.isSuccess() + && result.isCorrectID(ProtocolConstant40.MSG_GET_REALPATH_ACK)) { + byte[] payload = result.getPayload(); + if (payload != null) { + ProtocolParser parser = new ProtocolParser(payload); + parser.getInt(); // for return code + + BinaryInfo binInfo = parent.getDevice().getDeviceStatusInfo().getBinaryInfo(path); + binInfo.setRealPath(parser.getString()); // set real path + return new DAResult(ErrorCode.SUCCESS); + } else { + Logger.error("wrong format ACK for real path message"); + return new DAResult(ErrorCode.ERR_WRONG_MESSAGE_FORMAT); + } + } else { + return new DAResult(ErrorCode.ERR_MSG_SEND_FAIL); + } + } } diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/protocol/p40/ProtocolConstant40.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/protocol/p40/ProtocolConstant40.java index 2ae901f..e73cf30 100644 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/protocol/p40/ProtocolConstant40.java +++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/protocol/p40/ProtocolConstant40.java @@ -34,9 +34,11 @@ public class ProtocolConstant40 extends ProtocolConstant30 { // added in protocol 4.0 public static final int MSG_VERSION = 0x0001; public static final int MSG_GET_PROBEMAP = 0x000A; + public static final int MSG_GET_REALPATH = 0x0020; // changed from protocol 3.0 public static final int MSG_KEEP_ALIVE_ACK = 0x100F; + public static final int MSG_GET_REALPATH_ACK = 0x1020; // added in protocol 4.0 public static final int MSG_UNKNOWN_ACK = 0x1000; diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/protocol/p41/Communicator41.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/protocol/p41/Communicator41.java deleted file mode 100644 index 8462e80..0000000 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/protocol/p41/Communicator41.java +++ /dev/null @@ -1,48 +0,0 @@ -package org.tizen.dynamicanalyzer.protocol.p41; - -import org.tizen.dynamicanalyzer.common.DAResult; -import org.tizen.dynamicanalyzer.common.DAResult.ErrorCode; -import org.tizen.dynamicanalyzer.communicator.AckMessage; -import org.tizen.dynamicanalyzer.communicator.BaseCommunicator; -import org.tizen.dynamicanalyzer.communicator.ProtocolParser; -import org.tizen.dynamicanalyzer.communicator.ProtocolSerializer; -import org.tizen.dynamicanalyzer.communicator.UnsupportedProtocolException; -import org.tizen.dynamicanalyzer.control.IProgress; -import org.tizen.dynamicanalyzer.project.BinaryInfo; -import org.tizen.dynamicanalyzer.protocol.p40.Communicator40; -import org.tizen.dynamicanalyzer.util.Logger; - -public class Communicator41 extends Communicator40 { - - public Communicator41(BaseCommunicator parent) { - super(parent); - } - - @Override - public DAResult sendRealPathMessage(IProgress progress, String path) - throws InterruptedException, UnsupportedProtocolException { - ProtocolSerializer ps = new ProtocolSerializer(); - ps.setMessageID(ProtocolConstant41.MSG_GET_REALPATH); - ps.putString(path); - byte[] msg = ps.toByteArray(); - - AckMessage result = parent.handleControlMessage(msg, 0); - if (result != null && result.isSuccess() - && result.isCorrectID(ProtocolConstant41.MSG_GET_REALPATH_ACK)) { - byte[] payload = result.getPayload(); - if (payload != null) { - ProtocolParser parser = new ProtocolParser(payload); - parser.getInt(); // for return code - - BinaryInfo binInfo = parent.getDevice().getDeviceStatusInfo().getBinaryInfo(path); - binInfo.setRealPath(parser.getString()); // set real path - return new DAResult(ErrorCode.SUCCESS); - } else { - Logger.error("wrong format ACK for real path message"); - return new DAResult(ErrorCode.ERR_WRONG_MESSAGE_FORMAT); - } - } else { - return new DAResult(ErrorCode.ERR_MSG_SEND_FAIL); - } - } -} diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/protocol/p41/ProtocolConstant41.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/protocol/p41/ProtocolConstant41.java deleted file mode 100644 index aa99b6b..0000000 --- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/protocol/p41/ProtocolConstant41.java +++ /dev/null @@ -1,10 +0,0 @@ -package org.tizen.dynamicanalyzer.protocol.p41; - -import org.tizen.dynamicanalyzer.protocol.p40.ProtocolConstant40; - -public class ProtocolConstant41 extends ProtocolConstant40 { - - // added in protocol 4.1 - public static final int MSG_GET_REALPATH = 0x0020; - public static final int MSG_GET_REALPATH_ACK = 0x1020; -} -- 2.7.4