You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@plc4x.apache.org by cd...@apache.org on 2018/09/17 07:08:08 UTC
[incubator-plc4x] 24/29: renamce shortcut numValues to
numberOfValues
This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-plc4x.git
commit dc2032699563c41892a134fdc0d0aefc70d15746
Author: Sebastian Rühl <sr...@apache.org>
AuthorDate: Fri Sep 14 16:11:55 2018 +0200
renamce shortcut numValues to numberOfValues
---
.../java/base/messages/DefaultPlcReadResponse.java | 28 +++++++--------
.../java/base/messages/DefaultPlcWriteRequest.java | 2 +-
.../plc4x/java/base/messages/items/FieldItem.java | 2 +-
.../plc4x/java/s7/netty/Plc4XS7Protocol.java | 42 +++++++++++-----------
4 files changed, 37 insertions(+), 37 deletions(-)
diff --git a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/DefaultPlcReadResponse.java b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/DefaultPlcReadResponse.java
index eadf20b..1d37858 100644
--- a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/DefaultPlcReadResponse.java
+++ b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/DefaultPlcReadResponse.java
@@ -51,7 +51,7 @@ public class DefaultPlcReadResponse implements InternalPlcReadResponse {
public int getNumberOfValues(String name) {
FieldItem fieldInternal = getFieldInternal(name);
if (fieldInternal != null) {
- return fieldInternal.getNumValues();
+ return fieldInternal.getNumberOfValues();
}
return 0;
}
@@ -126,7 +126,7 @@ public class DefaultPlcReadResponse implements InternalPlcReadResponse {
public Collection<Boolean> getAllBooleans(String name) {
FieldItem fieldInternal = getFieldInternal(name);
if (fieldInternal != null) {
- int num = fieldInternal.getNumValues();
+ int num = fieldInternal.getNumberOfValues();
List<Boolean> values = new ArrayList<>(num);
for (int i = 0; i < num; i++) {
values.add(fieldInternal.getBoolean(i));
@@ -168,7 +168,7 @@ public class DefaultPlcReadResponse implements InternalPlcReadResponse {
public Collection<Byte> getAllBytes(String name) {
FieldItem fieldInternal = getFieldInternal(name);
if (fieldInternal != null) {
- int num = fieldInternal.getNumValues();
+ int num = fieldInternal.getNumberOfValues();
List<Byte> values = new ArrayList<>(num);
for (int i = 0; i < num; i++) {
values.add(fieldInternal.getByte(i));
@@ -182,7 +182,7 @@ public class DefaultPlcReadResponse implements InternalPlcReadResponse {
public byte[] getByteArray(String name) {
FieldItem fieldInternal = getFieldInternal(name);
if (fieldInternal != null) {
- int num = fieldInternal.getNumValues();
+ int num = fieldInternal.getNumberOfValues();
byte[] values = new byte[num];
for (int i = 0; i < num; i++) {
values[i] = fieldInternal.getByte(i);
@@ -224,7 +224,7 @@ public class DefaultPlcReadResponse implements InternalPlcReadResponse {
public Collection<Short> getAllShorts(String name) {
FieldItem fieldInternal = getFieldInternal(name);
if (fieldInternal != null) {
- int num = fieldInternal.getNumValues();
+ int num = fieldInternal.getNumberOfValues();
List<Short> values = new ArrayList<>(num);
for (int i = 0; i < num; i++) {
values.add(fieldInternal.getShort(i));
@@ -266,7 +266,7 @@ public class DefaultPlcReadResponse implements InternalPlcReadResponse {
public Collection<Integer> getAllIntegers(String name) {
FieldItem fieldInternal = getFieldInternal(name);
if (fieldInternal != null) {
- int num = fieldInternal.getNumValues();
+ int num = fieldInternal.getNumberOfValues();
List<Integer> values = new ArrayList<>(num);
for (int i = 0; i < num; i++) {
values.add(fieldInternal.getInteger(i));
@@ -308,7 +308,7 @@ public class DefaultPlcReadResponse implements InternalPlcReadResponse {
public Collection<BigInteger> getAllBigIntegers(String name) {
FieldItem fieldInternal = getFieldInternal(name);
if (fieldInternal != null) {
- int num = fieldInternal.getNumValues();
+ int num = fieldInternal.getNumberOfValues();
List<BigInteger> values = new ArrayList<>(num);
for (int i = 0; i < num; i++) {
values.add(fieldInternal.getBigInteger(i));
@@ -350,7 +350,7 @@ public class DefaultPlcReadResponse implements InternalPlcReadResponse {
public Collection<Long> getAllLongs(String name) {
FieldItem fieldInternal = getFieldInternal(name);
if (fieldInternal != null) {
- int num = fieldInternal.getNumValues();
+ int num = fieldInternal.getNumberOfValues();
List<Long> values = new ArrayList<>(num);
for (int i = 0; i < num; i++) {
values.add(fieldInternal.getLong(i));
@@ -392,7 +392,7 @@ public class DefaultPlcReadResponse implements InternalPlcReadResponse {
public Collection<Float> getAllFloats(String name) {
FieldItem fieldInternal = getFieldInternal(name);
if (fieldInternal != null) {
- int num = fieldInternal.getNumValues();
+ int num = fieldInternal.getNumberOfValues();
List<Float> values = new ArrayList<>(num);
for (int i = 0; i < num; i++) {
values.add(fieldInternal.getFloat(i));
@@ -434,7 +434,7 @@ public class DefaultPlcReadResponse implements InternalPlcReadResponse {
public Collection<Double> getAllDoubles(String name) {
FieldItem fieldInternal = getFieldInternal(name);
if (fieldInternal != null) {
- int num = fieldInternal.getNumValues();
+ int num = fieldInternal.getNumberOfValues();
List<Double> values = new ArrayList<>(num);
for (int i = 0; i < num; i++) {
values.add(fieldInternal.getDouble(i));
@@ -476,7 +476,7 @@ public class DefaultPlcReadResponse implements InternalPlcReadResponse {
public Collection<String> getAllStrings(String name) {
FieldItem fieldInternal = getFieldInternal(name);
if (fieldInternal != null) {
- int num = fieldInternal.getNumValues();
+ int num = fieldInternal.getNumberOfValues();
List<String> values = new ArrayList<>(num);
for (int i = 0; i < num; i++) {
values.add(fieldInternal.getString(i));
@@ -518,7 +518,7 @@ public class DefaultPlcReadResponse implements InternalPlcReadResponse {
public Collection<LocalTime> getAllTimes(String name) {
FieldItem fieldInternal = getFieldInternal(name);
if (fieldInternal != null) {
- int num = fieldInternal.getNumValues();
+ int num = fieldInternal.getNumberOfValues();
List<LocalTime> values = new ArrayList<>(num);
for (int i = 0; i < num; i++) {
values.add(fieldInternal.getTime(i));
@@ -560,7 +560,7 @@ public class DefaultPlcReadResponse implements InternalPlcReadResponse {
public Collection<LocalDate> getAllDates(String name) {
FieldItem fieldInternal = getFieldInternal(name);
if (fieldInternal != null) {
- int num = fieldInternal.getNumValues();
+ int num = fieldInternal.getNumberOfValues();
List<LocalDate> values = new ArrayList<>(num);
for (int i = 0; i < num; i++) {
values.add(fieldInternal.getDate(i));
@@ -602,7 +602,7 @@ public class DefaultPlcReadResponse implements InternalPlcReadResponse {
public Collection<LocalDateTime> getAllDateTimes(String name) {
FieldItem fieldInternal = getFieldInternal(name);
if (fieldInternal != null) {
- int num = fieldInternal.getNumValues();
+ int num = fieldInternal.getNumberOfValues();
List<LocalDateTime> values = new ArrayList<>(num);
for (int i = 0; i < num; i++) {
values.add(fieldInternal.getDateTime(i));
diff --git a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/DefaultPlcWriteRequest.java b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/DefaultPlcWriteRequest.java
index ec94553..263505f 100644
--- a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/DefaultPlcWriteRequest.java
+++ b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/DefaultPlcWriteRequest.java
@@ -74,7 +74,7 @@ public class DefaultPlcWriteRequest implements InternalPlcWriteRequest {
@Override
public int getNumberOfValues(String name) {
- return fields.get(name).getValue().getNumValues();
+ return fields.get(name).getValue().getNumberOfValues();
}
public static class Builder implements PlcWriteRequest.Builder {
diff --git a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/items/FieldItem.java b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/items/FieldItem.java
index 1d1b2bd..bb9d7db 100644
--- a/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/items/FieldItem.java
+++ b/plc4j/protocols/driver-bases/base/src/main/java/org/apache/plc4x/java/base/messages/items/FieldItem.java
@@ -32,7 +32,7 @@ public abstract class FieldItem<T> {
this.values = values;
}
- public int getNumValues() {
+ public int getNumberOfValues() {
return values.length;
}
diff --git a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/Plc4XS7Protocol.java b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/Plc4XS7Protocol.java
index 3c34ee6..2a52b01 100644
--- a/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/Plc4XS7Protocol.java
+++ b/plc4j/protocols/s7/src/main/java/org/apache/plc4x/java/s7/netty/Plc4XS7Protocol.java
@@ -36,7 +36,7 @@ import org.apache.plc4x.java.api.types.PlcResponseCode;
import org.apache.plc4x.java.base.PlcMessageToMessageCodec;
import org.apache.plc4x.java.base.events.ConnectedEvent;
import org.apache.plc4x.java.base.messages.*;
-import org.apache.plc4x.java.base.messages.items.*;
+import org.apache.plc4x.java.base.messages.items.FieldItem;
import org.apache.plc4x.java.s7.messages.items.*;
import org.apache.plc4x.java.s7.model.S7Field;
import org.apache.plc4x.java.s7.netty.events.S7ConnectedEvent;
@@ -213,10 +213,10 @@ public class Plc4XS7Protocol extends PlcMessageToMessageCodec<S7Message, PlcRequ
// Bit
// -----------------------------------------
case BOOL: {
- int numBytes = fieldItem.getNumValues() >> 3 / 8;
+ int numBytes = fieldItem.getNumberOfValues() >> 3 / 8;
byteData = new byte[numBytes];
BitSet bitSet = new BitSet();
- for(int i = 0; i < fieldItem.getNumValues(); i++) {
+ for (int i = 0; i < fieldItem.getNumberOfValues(); i++) {
bitSet.set(i, fieldItem.getBoolean(i));
}
System.arraycopy(bitSet.toByteArray(), 0, byteData, 0, numBytes);
@@ -228,9 +228,9 @@ public class Plc4XS7Protocol extends PlcMessageToMessageCodec<S7Message, PlcRequ
case BYTE:
case SINT:
case CHAR: { // 1 byte
- int numBytes = fieldItem.getNumValues();
+ int numBytes = fieldItem.getNumberOfValues();
ByteBuffer buffer = ByteBuffer.allocate(numBytes);
- for(int i = 0; i < fieldItem.getNumValues(); i++) {
+ for (int i = 0; i < fieldItem.getNumberOfValues(); i++) {
buffer.put(fieldItem.getByte(i));
}
byteData = buffer.array();
@@ -239,9 +239,9 @@ public class Plc4XS7Protocol extends PlcMessageToMessageCodec<S7Message, PlcRequ
case WORD:
case INT:
case WCHAR: { // 2 byte (16 bit)
- int numBytes = fieldItem.getNumValues() * 2;
+ int numBytes = fieldItem.getNumberOfValues() * 2;
ByteBuffer buffer = ByteBuffer.allocate(numBytes);
- for(int i = 0; i < fieldItem.getNumValues(); i++) {
+ for (int i = 0; i < fieldItem.getNumberOfValues(); i++) {
buffer.putShort(fieldItem.getShort(i));
}
byteData = buffer.array();
@@ -249,9 +249,9 @@ public class Plc4XS7Protocol extends PlcMessageToMessageCodec<S7Message, PlcRequ
}
case DWORD:
case DINT: { // 4 byte (32 bit)
- int numBytes = fieldItem.getNumValues() * 4;
+ int numBytes = fieldItem.getNumberOfValues() * 4;
ByteBuffer buffer = ByteBuffer.allocate(numBytes);
- for(int i = 0; i < fieldItem.getNumValues(); i++) {
+ for (int i = 0; i < fieldItem.getNumberOfValues(); i++) {
buffer.putInt(fieldItem.getInteger(i));
}
byteData = buffer.array();
@@ -259,9 +259,9 @@ public class Plc4XS7Protocol extends PlcMessageToMessageCodec<S7Message, PlcRequ
}
case LWORD:
case LINT: { // 8 byte (64 bit)
- int numBytes = fieldItem.getNumValues() * 8;
+ int numBytes = fieldItem.getNumberOfValues() * 8;
ByteBuffer buffer = ByteBuffer.allocate(numBytes);
- for(int i = 0; i < fieldItem.getNumValues(); i++) {
+ for (int i = 0; i < fieldItem.getNumberOfValues(); i++) {
buffer.putLong(fieldItem.getLong(i));
}
byteData = buffer.array();
@@ -272,9 +272,9 @@ public class Plc4XS7Protocol extends PlcMessageToMessageCodec<S7Message, PlcRequ
// -----------------------------------------
// 8 bit:
case USINT: {
- int numBytes = fieldItem.getNumValues();
+ int numBytes = fieldItem.getNumberOfValues();
ByteBuffer buffer = ByteBuffer.allocate(numBytes);
- for(int i = 0; i < fieldItem.getNumValues(); i++) {
+ for (int i = 0; i < fieldItem.getNumberOfValues(); i++) {
buffer.put((byte) (short) fieldItem.getShort(i));
}
byteData = buffer.array();
@@ -282,9 +282,9 @@ public class Plc4XS7Protocol extends PlcMessageToMessageCodec<S7Message, PlcRequ
}
// 16 bit:
case UINT: {
- int numBytes = fieldItem.getNumValues() * 2;
+ int numBytes = fieldItem.getNumberOfValues() * 2;
ByteBuffer buffer = ByteBuffer.allocate(numBytes);
- for(int i = 0; i < fieldItem.getNumValues(); i++) {
+ for (int i = 0; i < fieldItem.getNumberOfValues(); i++) {
buffer.putShort((short) (int) fieldItem.getInteger(i));
}
byteData = buffer.array();
@@ -292,9 +292,9 @@ public class Plc4XS7Protocol extends PlcMessageToMessageCodec<S7Message, PlcRequ
}
// 32 bit:
case UDINT: {
- int numBytes = fieldItem.getNumValues() * 4;
+ int numBytes = fieldItem.getNumberOfValues() * 4;
ByteBuffer buffer = ByteBuffer.allocate(numBytes);
- for(int i = 0; i < fieldItem.getNumValues(); i++) {
+ for (int i = 0; i < fieldItem.getNumberOfValues(); i++) {
buffer.putInt((int) (double) fieldItem.getDouble(i));
}
byteData = buffer.array();
@@ -309,18 +309,18 @@ public class Plc4XS7Protocol extends PlcMessageToMessageCodec<S7Message, PlcRequ
// Floating point values
// -----------------------------------------
case REAL: {
- int numBytes = fieldItem.getNumValues() * 4;
+ int numBytes = fieldItem.getNumberOfValues() * 4;
ByteBuffer buffer = ByteBuffer.allocate(numBytes);
- for(int i = 0; i < fieldItem.getNumValues(); i++) {
+ for (int i = 0; i < fieldItem.getNumberOfValues(); i++) {
buffer.putFloat(fieldItem.getFloat(i));
}
byteData = buffer.array();
break;
}
case LREAL: {
- int numBytes = fieldItem.getNumValues() * 8;
+ int numBytes = fieldItem.getNumberOfValues() * 8;
ByteBuffer buffer = ByteBuffer.allocate(numBytes);
- for(int i = 0; i < fieldItem.getNumValues(); i++) {
+ for (int i = 0; i < fieldItem.getNumberOfValues(); i++) {
buffer.putDouble(fieldItem.getDouble(i));
}
byteData = buffer.array();