You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@plc4x.apache.org by sr...@apache.org on 2018/02/17 15:04:34 UTC
[incubator-plc4x] branch master updated: improve length calculation
in fixed byte use cases
This is an automated email from the ASF dual-hosted git repository.
sruehl pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git
The following commit(s) were added to refs/heads/master by this push:
new eedeea2 improve length calculation in fixed byte use cases
eedeea2 is described below
commit eedeea2bbe0d72e8b131760a5e50e5a1aef02b47
Author: Sebastian Rühl <sr...@apache.org>
AuthorDate: Sat Feb 17 16:04:30 2018 +0100
improve length calculation in fixed byte use cases
---
.../java/org/apache/plc4x/java/ads/api/commands/types/Device.java | 5 +++++
.../org/apache/plc4x/java/ads/api/commands/types/MajorVersion.java | 5 +++++
.../org/apache/plc4x/java/ads/api/commands/types/MinorVersion.java | 5 +++++
.../java/org/apache/plc4x/java/ads/api/commands/types/TimeStamp.java | 5 +++++
.../org/apache/plc4x/java/ads/api/util/UnsignedIntLEByteValue.java | 5 +++++
.../org/apache/plc4x/java/ads/api/util/UnsignedShortLEByteValue.java | 5 +++++
6 files changed, 30 insertions(+)
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/types/Device.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/types/Device.java
index e4eeb91..e7f31af 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/types/Device.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/types/Device.java
@@ -56,6 +56,11 @@ public class Device extends ByteValue {
}
@Override
+ public long getCalculatedLength() {
+ return NUM_BYTES;
+ }
+
+ @Override
public String toString() {
// TODO: this might break some outputs like surefire if this id can contain non printable characters
return "Device{" + new String(value) + "} " + super.toString();
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/types/MajorVersion.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/types/MajorVersion.java
index dfa5b8a..884ba2b 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/types/MajorVersion.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/types/MajorVersion.java
@@ -51,6 +51,11 @@ public class MajorVersion extends ByteValue {
}
@Override
+ public long getCalculatedLength() {
+ return NUM_BYTES;
+ }
+
+ @Override
public String toString() {
return "MajorVersion{" +
"value=" + Arrays.toString(value) +
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/types/MinorVersion.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/types/MinorVersion.java
index 1264f43..6084051 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/types/MinorVersion.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/types/MinorVersion.java
@@ -51,6 +51,11 @@ public class MinorVersion extends ByteValue {
}
@Override
+ public long getCalculatedLength() {
+ return NUM_BYTES;
+ }
+
+ @Override
public String toString() {
return "MinorVersion{" +
"value=" + Arrays.toString(value) +
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/types/TimeStamp.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/types/TimeStamp.java
index b5485a0..198b45e 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/types/TimeStamp.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/commands/types/TimeStamp.java
@@ -135,6 +135,11 @@ public class TimeStamp extends ByteValue {
}
@Override
+ public long getCalculatedLength() {
+ return NUM_BYTES;
+ }
+
+ @Override
public boolean equals(Object o) {
if (this == o) return true;
if (!(o instanceof TimeStamp)) return false;
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/util/UnsignedIntLEByteValue.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/util/UnsignedIntLEByteValue.java
index 5ec1c05..9b0f394 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/util/UnsignedIntLEByteValue.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/util/UnsignedIntLEByteValue.java
@@ -63,6 +63,11 @@ public abstract class UnsignedIntLEByteValue extends ByteValue {
}
@Override
+ public long getCalculatedLength() {
+ return UNSIGNED_INT_LE_NUM_BYTES;
+ }
+
+ @Override
public boolean equals(Object o) {
if (this == o) return true;
if (!(o instanceof UnsignedIntLEByteValue)) return false;
diff --git a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/util/UnsignedShortLEByteValue.java b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/util/UnsignedShortLEByteValue.java
index ec74b81..f5752af 100644
--- a/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/util/UnsignedShortLEByteValue.java
+++ b/plc4j/protocols/ads/src/main/java/org/apache/plc4x/java/ads/api/util/UnsignedShortLEByteValue.java
@@ -61,6 +61,11 @@ public abstract class UnsignedShortLEByteValue extends ByteValue {
}
@Override
+ public long getCalculatedLength() {
+ return UNSIGNED_SHORT_LE_NUM_BYTES;
+ }
+
+ @Override
public boolean equals(Object o) {
if (this == o) return true;
if (!(o instanceof UnsignedShortLEByteValue)) return false;
--
To stop receiving notification emails like this one, please contact
sruehl@apache.org.