style fixes

Author: peteroupc

src/main/java/com/upokecenter/util/RadixMath.java

@@ -3767,8 +3767,7 @@ private T RoundToPrecisionInternal(
           if (!unlimitedPrec && (rounding == Rounding.Down || rounding ==
                    Rounding.ZeroFiveUp ||
           (rounding == Rounding.OddOrZeroFiveUp || rounding == Rounding.Odd) ||
-
-                   (rounding == Rounding.Ceiling &&
+                (rounding == Rounding.Ceiling &&
                 neg) || (rounding == Rounding.Floor && !neg))) {
             // Set to the highest possible value for
             // the given precision

src/test/java/com/upokecenter/test/ExtendedFloatTest.java

@@ -5,7 +5,7 @@
 import com.upokecenter.util.*;
 
   public class ExtendedFloatTest {
-    public ExtendedFloat FromBinary(String str) {
+    public static ExtendedFloat FromBinary(String str) {
       int smallExponent = 0;
       int index = 0;
       BigInteger ret = BigInteger.ZERO;
@@ -20,15 +20,16 @@ public ExtendedFloat FromBinary(String str) {
         if (str.charAt(index) == '.') {
           ++index;
           break;
-        } else if (str.charAt(index)=='1') {
+        }
+        if (str.charAt(index) == '1') {
           ++index;
           if (ret.signum() == 0) {
             ret = BigInteger.ONE;
           } else {
             ret = ret.shiftLeft(1);
             ret = ret.add(BigInteger.ONE);
           }
-        } else if (str.charAt(index)=='0') {
+        } else if (str.charAt(index) == '0') {
           ++index;
           ret = ret.shiftLeft(1);
           continue;

src/test/java/com/upokecenter/test/RandomObjects.java

@@ -101,8 +101,7 @@ public static CBORObject RandomCBORTextString(FastRandom rand) {
 
     public static CBORObject RandomCBORMap(FastRandom rand, int depth) {
       int x = rand.NextValue(100);
-      int count = 0;
-      count = (x < 80) ? 2 : ((x < 93) ? 1 : ((x < 98) ? 0 : 10));
+      int count = (x < 80) ? 2 : ((x < 93) ? 1 : ((x < 98) ? 0 : 10));
       CBORObject cborRet = CBORObject.NewMap();
       for (int i = 0; i < count; ++i) {
         CBORObject key = RandomCBORObject(rand, depth + 1);
@@ -162,8 +161,7 @@ public static CBORObject RandomCBORTaggedObject(
 
     public static CBORObject RandomCBORArray(FastRandom rand, int depth) {
       int x = rand.NextValue(100);
-      int count = 0;
-      count = (x < 80) ? 2 : ((x < 93) ? 1 : ((x < 98) ? 0 : 10));
+      int count = (x < 80) ? 2 : ((x < 93) ? 1 : ((x < 98) ? 0 : 10));
       CBORObject cborRet = CBORObject.NewArray();
       for (int i = 0; i < count; ++i) {
         cborRet.Add(RandomCBORObject(rand, depth + 1));
@@ -276,17 +274,18 @@ public static BigInteger RandomBigInteger(FastRandom r) {
       if (selection < 40) {
         StringAndBigInt sabi = StringAndBigInt.Generate(r, 16);
         return sabi.getBigIntValue();
-      } else if (selection < 50) {
+      }
+      if (selection < 50) {
         StringAndBigInt sabi = StringAndBigInt.Generate(r, 2 + r.NextValue(35));
         return sabi.getBigIntValue();
       } else {
-      int count = r.NextValue(60) + 1;
-      byte[] bytes = new byte[count];
-      for (int i = 0; i < count; ++i) {
-        bytes[i] = (byte)((int)r.NextValue(256));
+        int count = r.NextValue(60) + 1;
+        byte[] bytes = new byte[count];
+        for (int i = 0; i < count; ++i) {
+          bytes[i] = (byte)((int)r.NextValue(256));
+        }
+        return BigInteger.fromByteArray(bytes, true);
       }
-      return BigInteger.fromByteArray(bytes, true);
-     }
     }
 
     public static ExtendedFloat RandomExtendedFloat(FastRandom r) {

src/test/java/com/upokecenter/test/StringAndBigInt.java

@@ -1,7 +1,5 @@
 package com.upokecenter.test;
 
-import org.junit.Assert;
-
 import com.upokecenter.util.*;
 
   final class StringAndBigInt {