From 72494fb83d08bb76ff6848b20fff483ad8248e87 Mon Sep 17 00:00:00 2001 From: Stefan Feuerhahn Date: Fri, 22 Mar 2019 15:59:20 +0100 Subject: [PATCH] removed use of methods deprecated in java 11 --- src/main/java/com/beanit/openiec61850/SclParser.java | 8 ++++---- .../openiec61850/clientgui/databind/Int16DataBind.java | 2 +- .../openiec61850/clientgui/databind/Int16UDataBind.java | 2 +- .../openiec61850/clientgui/databind/Int32DataBind.java | 2 +- .../openiec61850/clientgui/databind/Int32UDataBind.java | 2 +- .../openiec61850/clientgui/databind/Int64DataBind.java | 2 +- .../openiec61850/clientgui/databind/Int8DataBind.java | 2 +- .../openiec61850/clientgui/databind/Int8UDataBind.java | 2 +- .../openiec61850/integrationtests/ReportingTest.java | 4 ++-- 9 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/main/java/com/beanit/openiec61850/SclParser.java b/src/main/java/com/beanit/openiec61850/SclParser.java index 4630ec5..76e1995 100644 --- a/src/main/java/com/beanit/openiec61850/SclParser.java +++ b/src/main/java/com/beanit/openiec61850/SclParser.java @@ -880,9 +880,9 @@ public class SclParser { BdaBoolean bda = new BdaBoolean(new ObjectReference(ref), fc, sAddr, dchg, dupd); if (val != null) { if (val.equalsIgnoreCase("true") || val.equals("1")) { - bda.setValue(new Boolean(true)); + bda.setValue(true); } else if (val.equalsIgnoreCase("false") || val.equals("0")) { - bda.setValue(new Boolean(false)); + bda.setValue(false); } else { throw new SclParseException("invalid boolean configured value: " + val); } @@ -1071,7 +1071,7 @@ public class SclParser { if (val != null) { for (EnumVal enumVal : enumType.getValues()) { if (val.equals(enumVal.getId())) { - bda.setValue(new Short((short) enumVal.getOrd())); + bda.setValue((short) enumVal.getOrd()); return bda; } } @@ -1083,7 +1083,7 @@ public class SclParser { if (val != null) { for (EnumVal enumVal : enumType.getValues()) { if (val.equals(enumVal.getId())) { - bda.setValue(new Byte((byte) enumVal.getOrd())); + bda.setValue((byte) enumVal.getOrd()); return bda; } } diff --git a/src/main/java/com/beanit/openiec61850/clientgui/databind/Int16DataBind.java b/src/main/java/com/beanit/openiec61850/clientgui/databind/Int16DataBind.java index f1dd284..a88f08a 100644 --- a/src/main/java/com/beanit/openiec61850/clientgui/databind/Int16DataBind.java +++ b/src/main/java/com/beanit/openiec61850/clientgui/databind/Int16DataBind.java @@ -26,7 +26,7 @@ public class Int16DataBind extends TextFieldDataBind { @Override protected void resetImpl() { - inputField.setText(new Short(data.getValue()).toString()); + inputField.setText(Short.toString(data.getValue())); } @Override diff --git a/src/main/java/com/beanit/openiec61850/clientgui/databind/Int16UDataBind.java b/src/main/java/com/beanit/openiec61850/clientgui/databind/Int16UDataBind.java index 749fb4f..d5d49c5 100644 --- a/src/main/java/com/beanit/openiec61850/clientgui/databind/Int16UDataBind.java +++ b/src/main/java/com/beanit/openiec61850/clientgui/databind/Int16UDataBind.java @@ -26,7 +26,7 @@ public class Int16UDataBind extends TextFieldDataBind { @Override protected void resetImpl() { - inputField.setText(new Integer(data.getValue()).toString()); + inputField.setText(Integer.toString(data.getValue())); } @Override diff --git a/src/main/java/com/beanit/openiec61850/clientgui/databind/Int32DataBind.java b/src/main/java/com/beanit/openiec61850/clientgui/databind/Int32DataBind.java index 456cd1e..9f72eb9 100644 --- a/src/main/java/com/beanit/openiec61850/clientgui/databind/Int32DataBind.java +++ b/src/main/java/com/beanit/openiec61850/clientgui/databind/Int32DataBind.java @@ -26,7 +26,7 @@ public class Int32DataBind extends TextFieldDataBind { @Override protected void resetImpl() { - inputField.setText(new Integer(data.getValue()).toString()); + inputField.setText(Integer.toString(data.getValue())); } @Override diff --git a/src/main/java/com/beanit/openiec61850/clientgui/databind/Int32UDataBind.java b/src/main/java/com/beanit/openiec61850/clientgui/databind/Int32UDataBind.java index 1fdcc0d..b3a84de 100644 --- a/src/main/java/com/beanit/openiec61850/clientgui/databind/Int32UDataBind.java +++ b/src/main/java/com/beanit/openiec61850/clientgui/databind/Int32UDataBind.java @@ -26,7 +26,7 @@ public class Int32UDataBind extends TextFieldDataBind { @Override protected void resetImpl() { - inputField.setText(new Long(data.getValue()).toString()); + inputField.setText(Long.toString(data.getValue())); } @Override diff --git a/src/main/java/com/beanit/openiec61850/clientgui/databind/Int64DataBind.java b/src/main/java/com/beanit/openiec61850/clientgui/databind/Int64DataBind.java index 245b93f..2f7b1de 100644 --- a/src/main/java/com/beanit/openiec61850/clientgui/databind/Int64DataBind.java +++ b/src/main/java/com/beanit/openiec61850/clientgui/databind/Int64DataBind.java @@ -26,7 +26,7 @@ public class Int64DataBind extends TextFieldDataBind { @Override protected void resetImpl() { - inputField.setText(new Long(data.getValue()).toString()); + inputField.setText(Long.toString(data.getValue())); } @Override diff --git a/src/main/java/com/beanit/openiec61850/clientgui/databind/Int8DataBind.java b/src/main/java/com/beanit/openiec61850/clientgui/databind/Int8DataBind.java index 5fad5c6..535148a 100644 --- a/src/main/java/com/beanit/openiec61850/clientgui/databind/Int8DataBind.java +++ b/src/main/java/com/beanit/openiec61850/clientgui/databind/Int8DataBind.java @@ -26,7 +26,7 @@ public class Int8DataBind extends TextFieldDataBind { @Override protected void resetImpl() { - inputField.setText(new Byte(data.getValue()).toString()); + inputField.setText(Byte.toString(data.getValue())); } @Override diff --git a/src/main/java/com/beanit/openiec61850/clientgui/databind/Int8UDataBind.java b/src/main/java/com/beanit/openiec61850/clientgui/databind/Int8UDataBind.java index 26ad026..0382c2e 100644 --- a/src/main/java/com/beanit/openiec61850/clientgui/databind/Int8UDataBind.java +++ b/src/main/java/com/beanit/openiec61850/clientgui/databind/Int8UDataBind.java @@ -26,7 +26,7 @@ public class Int8UDataBind extends TextFieldDataBind { @Override protected void resetImpl() { - inputField.setText(new Short(data.getValue()).toString()); + inputField.setText(Short.toString(data.getValue())); } @Override diff --git a/src/test/java/com/beanit/openiec61850/integrationtests/ReportingTest.java b/src/test/java/com/beanit/openiec61850/integrationtests/ReportingTest.java index 20a1fbb..1033bc9 100644 --- a/src/test/java/com/beanit/openiec61850/integrationtests/ReportingTest.java +++ b/src/test/java/com/beanit/openiec61850/integrationtests/ReportingTest.java @@ -105,7 +105,7 @@ public class ReportingTest implements ClientEventListener { Assert.assertNotNull(mag); Assert.assertEquals(0, this.reportCounter); - mag.setFloat(new Float(3.0)); + mag.setFloat(3.0f); List bdas = new ArrayList<>(); bdas.add(mag); this.serverSap.setValues(bdas); @@ -161,7 +161,7 @@ public class ReportingTest implements ClientEventListener { Assert.assertNotNull(mag); Assert.assertEquals(0, this.reportCounter); - mag.setFloat(new Float(3.0)); + mag.setFloat(3.0f); List bdas = new ArrayList<>(); bdas.add(mag); this.serverSap.setValues(bdas);