Use checkGreaterThanZero() instead of checkNotNullOrEmpty().

This commit is contained in:
Masaki Muranaka 2012-12-28 11:23:13 +09:00
parent 209bc8e617
commit c07009c101
1 changed files with 5 additions and 5 deletions

View File

@ -58,14 +58,14 @@ public final class SSMProtocol implements Protocol {
private final PollingState pollState = new PollingStateImpl();
public byte[] constructEcuInitRequest(byte id) {
checkNotNullOrEmpty(String.valueOf(id), "ECU_ID");
checkGreaterThanZero(id, "ECU_ID");
SSMProtocol.ECU_ID = id;
// 0x80 0x10 0xF0 0x01 0xBF 0x40
return buildRequest(ECU_INIT_COMMAND, false, new byte[0]);
}
public byte[] constructWriteMemoryRequest(byte id, byte[] address, byte[] values) {
checkNotNullOrEmpty(String.valueOf(id), "ECU_ID");
checkGreaterThanZero(id, "ECU_ID");
checkNotNullOrEmpty(address, "address");
checkNotNullOrEmpty(values, "values");
SSMProtocol.ECU_ID = id;
@ -81,7 +81,7 @@ public final class SSMProtocol implements Protocol {
}
public byte[] constructReadMemoryRequest(byte id, byte[] address, int numBytes) {
checkNotNullOrEmpty(String.valueOf(id), "ECU_ID");
checkGreaterThanZero(id, "ECU_ID");
checkNotNullOrEmpty(address, "address");
checkGreaterThanZero(numBytes, "numBytes");
SSMProtocol.ECU_ID = id;
@ -90,7 +90,7 @@ public final class SSMProtocol implements Protocol {
}
public byte[] constructReadAddressRequest(byte id, byte[][] addresses) {
checkNotNullOrEmpty(String.valueOf(id), "ECU_ID");
checkGreaterThanZero(id, "ECU_ID");
checkNotNullOrEmpty(addresses, "addresses");
SSMProtocol.ECU_ID = id;
// 0x80 0x10 0xF0 data_length 0xA8 padding address1 address2 ... addressN checksum
@ -124,7 +124,7 @@ public final class SSMProtocol implements Protocol {
public byte[] constructEcuResetRequest(byte id) {
// 80 10 F0 05 B8 00 00 60 40 DD
//FIXME: Create a buildWriteAddressRequest() method
checkNotNullOrEmpty(String.valueOf(id), "ECU_ID");
checkGreaterThanZero(id, "ECU_ID");
SSMProtocol.ECU_ID = id;
byte[] resetDataBytes = new byte[]{(byte) 0x00, (byte) 0x00, (byte) 0x60, (byte) 0x40};
return buildRequest(WRITE_ADDRESS_COMMAND, false, resetDataBytes);