From 1f01fcac029c4f8a660d17017ef39fc7e079768d Mon Sep 17 00:00:00 2001 From: Stefan Feuerhahn Date: Thu, 14 Jan 2021 21:31:02 +0100 Subject: [PATCH] enhanced SequenceNumber class --- .../internal/util/SequenceNumber.java | 25 +++++++++++-------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/beanit/iec61850bean/internal/util/SequenceNumber.java b/src/main/java/com/beanit/iec61850bean/internal/util/SequenceNumber.java index a486286..67e5d9a 100644 --- a/src/main/java/com/beanit/iec61850bean/internal/util/SequenceNumber.java +++ b/src/main/java/com/beanit/iec61850bean/internal/util/SequenceNumber.java @@ -28,20 +28,25 @@ public class SequenceNumber { public static int getIncrement(int value, int minValue, int maxValue) { assert (value >= minValue) && (value <= maxValue); - if (value == maxValue) { - return minValue; - } else { - return ++value; - } + return (value == maxValue) ? minValue : value + 1; } public int getAndIncrement() { int oldValue = value; - if (value == maxValue) { - value = minValue; - } else { - ++value; - } + value = (value == maxValue) ? minValue : value + 1; return oldValue; } + + public int get() { + return value; + } + + public void increment() { + value = (value == maxValue) ? minValue : value + 1; + } + + public int incrementAndGet() { + value = (value == maxValue) ? minValue : value + 1; + return value; + } }