Standalone cleanup.

5 files changed, 11 insertions, 12 deletions

diff --git a/standalone/src/main/java/cz/crcs/ectester/standalone/ECTesterStandalone.java b/standalone/src/main/java/cz/crcs/ectester/standalone/ECTesterStandalone.java
index e6d8188..4f76639 100644
--- a/standalone/src/main/java/cz/crcs/ectester/standalone/ECTesterStandalone.java
+++ b/standalone/src/main/java/cz/crcs/ectester/standalone/ECTesterStandalone.java
@@ -71,7 +71,7 @@ public class ECTesterStandalone {
     private ProviderECLibrary[] libs;
     private Config cfg;
 
-    private Options opts = new Options();
+    private final Options opts = new Options();
     private TreeParser optParser;
     private TreeCommandLine cli;
     public static final String VERSION = "v0.3.3";
@@ -903,7 +903,7 @@ public class ECTesterStandalone {
      *
      */
     public static class Config {
-        private ProviderECLibrary[] libs;
+        private final ProviderECLibrary[] libs;
         public ProviderECLibrary selected = null;
         public boolean color = false;
 
diff --git a/standalone/src/main/java/cz/crcs/ectester/standalone/output/TextTestWriter.java b/standalone/src/main/java/cz/crcs/ectester/standalone/output/TextTestWriter.java
index c53adb2..13a9e72 100644
--- a/standalone/src/main/java/cz/crcs/ectester/standalone/output/TextTestWriter.java
+++ b/standalone/src/main/java/cz/crcs/ectester/standalone/output/TextTestWriter.java
@@ -46,10 +46,9 @@ public class TextTestWriter extends BaseTextTestWriter {
     protected String deviceString(TestSuite suite) {
         if (suite instanceof StandaloneTestSuite) {
             StandaloneTestSuite standaloneSuite = (StandaloneTestSuite) suite;
-            StringBuilder sb = new StringBuilder();
-            sb.append("═══ ").append(Colors.underline("ECTester version:")).append(" ").append(ECTesterStandalone.VERSION).append(System.lineSeparator());
-            sb.append("═══ ").append(Colors.underline("Library:")).append(" ").append(standaloneSuite.getLibrary().fullName()).append(System.lineSeparator());
-            return sb.toString();
+            String sb = "═══ " + Colors.underline("ECTester version:") + " " + ECTesterStandalone.VERSION + System.lineSeparator() +
+                    "═══ " + Colors.underline("Library:") + " " + standaloneSuite.getLibrary().fullName() + System.lineSeparator();
+            return sb;
         }
         return "";
     }
diff --git a/standalone/src/main/java/cz/crcs/ectester/standalone/test/base/KeyAgreementTestable.java b/standalone/src/main/java/cz/crcs/ectester/standalone/test/base/KeyAgreementTestable.java
index 24c25c5..579904c 100644
--- a/standalone/src/main/java/cz/crcs/ectester/standalone/test/base/KeyAgreementTestable.java
+++ b/standalone/src/main/java/cz/crcs/ectester/standalone/test/base/KeyAgreementTestable.java
@@ -46,7 +46,7 @@ public class KeyAgreementTestable extends StandaloneTestable<KeyAgreementTestabl
     }
 
     public KeyAgreementTestable(KeyAgreement ka, KeyGeneratorTestable kgt, ECPrivateKey privateKey, ECParameterSpec spec) {
-        this(ka, privateKey, (ECPublicKey) null, spec);
+        this(ka, privateKey, null, spec);
         this.kgtPublic = kgt;
     }
 
@@ -56,7 +56,7 @@ public class KeyAgreementTestable extends StandaloneTestable<KeyAgreementTestabl
     }
 
     public KeyAgreementTestable(KeyAgreement ka, ECPublicKey publicKey, KeyGeneratorTestable kgt, ECParameterSpec spec) {
-        this(ka, (ECPrivateKey) null, publicKey, spec);
+        this(ka, null, publicKey, spec);
         this.kgtPrivate = kgt;
     }
 
@@ -66,7 +66,7 @@ public class KeyAgreementTestable extends StandaloneTestable<KeyAgreementTestabl
     }
 
     public KeyAgreementTestable(KeyAgreement ka, KeyGeneratorTestable privKgt, KeyGeneratorTestable pubKgt, ECParameterSpec spec) {
-        this(ka, (ECPrivateKey) null, (ECPublicKey) null, spec);
+        this(ka, null, (ECPublicKey) null, spec);
         this.kgtPrivate = privKgt;
         this.kgtPublic = pubKgt;
     }
@@ -97,7 +97,7 @@ public class KeyAgreementTestable extends StandaloneTestable<KeyAgreementTestabl
     }
 
     public KeyAgreementTestable(KeyAgreement ka, KeyGeneratorTestable privKgt, KeyGeneratorTestable pubKgt) {
-        this(ka, (ECPrivateKey) null, (ECPublicKey) null, (ECParameterSpec) null);
+        this(ka, null, (ECPublicKey) null, (ECParameterSpec) null);
         this.kgtPrivate = privKgt;
         this.kgtPublic = pubKgt;
     }
diff --git a/standalone/src/main/java/cz/crcs/ectester/standalone/test/base/PerformanceTest.java b/standalone/src/main/java/cz/crcs/ectester/standalone/test/base/PerformanceTest.java
index d50c7e9..3b15c94 100644
--- a/standalone/src/main/java/cz/crcs/ectester/standalone/test/base/PerformanceTest.java
+++ b/standalone/src/main/java/cz/crcs/ectester/standalone/test/base/PerformanceTest.java
@@ -13,7 +13,7 @@ import java.util.Arrays;
  */
 public class PerformanceTest extends SimpleTest<BaseTestable> {
 
-    private ProviderECLibrary library;
+    private final ProviderECLibrary library;
     private long[] times;
     private long mean;
     private long median;
diff --git a/standalone/src/main/java/cz/crcs/ectester/standalone/test/base/SignatureTestable.java b/standalone/src/main/java/cz/crcs/ectester/standalone/test/base/SignatureTestable.java
index fe81b10..76074e4 100644
--- a/standalone/src/main/java/cz/crcs/ectester/standalone/test/base/SignatureTestable.java
+++ b/standalone/src/main/java/cz/crcs/ectester/standalone/test/base/SignatureTestable.java
@@ -11,7 +11,7 @@ import java.security.interfaces.ECPublicKey;
  * @author Jan Jancar johny@neuromancer.sk
  */
 public class SignatureTestable extends StandaloneTestable<SignatureTestable.SignatureStage> {
-    private Signature sig;
+    private final Signature sig;
     private ECPrivateKey signKey;
     private ECPublicKey verifyKey;
     private KeyGeneratorTestable kgt;