2 files changed, 17 insertions, 18 deletions

diff --git a/src/simpleapdu/CardMngr.java b/src/simpleapdu/CardMngr.java
index ae8bd55..e60f695 100644
--- a/src/simpleapdu/CardMngr.java
+++ b/src/simpleapdu/CardMngr.java
@@ -12,13 +12,13 @@ import javax.smartcardio.*;
  * @author xsvenda
  */
 public class CardMngr {
-    static CardTerminal m_terminal = null;
-    static CardChannel m_channel = null;
-    static Card m_card = null;
+    private CardTerminal m_terminal = null;
+    private CardChannel m_channel = null;
+    private Card m_card = null;
     
     // Simulator related attributes
-    private static CAD m_cad = null;
-    private static JavaxSmartCardInterface m_simulator = null;
+    private CAD m_cad = null;
+    private JavaxSmartCardInterface m_simulator = null;
 
     
     private final byte selectCM[] = {
@@ -37,10 +37,11 @@ public class CardMngr {
 
     public boolean ConnectToCard() throws Exception {
         // TRY ALL READERS, FIND FIRST SELECTABLE
-        List terminalList = GetReaderList();
+        List<CardTerminal> terminalList = GetReaderList();
 
-        if (terminalList.isEmpty()) {
+        if (terminalList == null || terminalList.isEmpty()) {
             System.out.println("No terminals found");
+            return false;
         }
 
         //List numbers of Card readers
@@ -64,10 +65,10 @@ public class CardMngr {
         return cardFound;
     }
     
-    static boolean ConnectToCardSelect() throws CardException {
+    public boolean ConnectToCardSelect() throws CardException {
         // Test available card - if more present, let user to select one
         List<CardTerminal> terminalList = CardMngr.GetReaderList();
-        if (terminalList.isEmpty()) {
+        if (terminalList == null || terminalList.isEmpty()) {
             System.out.println("ERROR: No suitable reader with card detected. Please check your reader connection");
             return false;
         } else {
@@ -163,11 +164,10 @@ public class CardMngr {
         }
     }
     
-    public static List GetReaderList() {
+    public static List<CardTerminal> GetReaderList() {
         try {
             TerminalFactory factory = TerminalFactory.getDefault();
-            List readersList = factory.terminals().list();
-            return readersList;
+            return factory.terminals().list();
         } catch (Exception ex) {
             System.out.println("Exception : " + ex);
             return null;
diff --git a/src/simpleapdu/SimpleAPDU.java b/src/simpleapdu/SimpleAPDU.java
index 4f291f0..5e51221 100644
--- a/src/simpleapdu/SimpleAPDU.java
+++ b/src/simpleapdu/SimpleAPDU.java
@@ -14,7 +14,6 @@ import org.apache.commons.cli.Options;
 import org.apache.commons.cli.ParseException;
 
 import javax.smartcardio.ResponseAPDU;
-import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.util.Arrays;
@@ -54,7 +53,7 @@ public class SimpleAPDU {
     private static final short GENERATEECKEY_ANOMALOUS_OFFSET = 8;
 
 
-    public void run(String[] args) {
+    private void run(String[] args) {
         try {
             //parse cmd args
             CommandLine cli = parseArgs(args);
@@ -91,7 +90,7 @@ public class SimpleAPDU {
                         generateECKeys(genAmount, KeyPair.ALG_EC_F2M, (short) keyLength, cli.hasOption("anomalous"));
                     }
                 } else if (cli.hasOption("test")) {
-                    if (cli.hasOption("bit-length")) {
+                    if (cli.hasOption("bit-size")) {
                         //test only one bitsize
                         if (fp) {
                             testSupportECFp((short) keyLength);
@@ -132,7 +131,7 @@ public class SimpleAPDU {
                 .desc("generate EC keys").build());
         opts.addOption("t", "test", false, "test EC support (default)");
         opts.addOption(Option.builder("b")
-                .longOpt("bit-length")
+                .longOpt("bit-size")
                 .hasArg()
                 .argName("bits")
                 .desc("set EC bit size").build());
@@ -288,7 +287,7 @@ public class SimpleAPDU {
         }
     }
 
-    static String getPrintError(short code) {
+    private static String getPrintError(short code) {
         if (code == ISO7816.SW_NO_ERROR) {
             return "OK\t(0x9000)";
         } else {
@@ -454,7 +453,7 @@ public class SimpleAPDU {
         }
     }
 
-    public static void main(String[] args) throws FileNotFoundException, IOException {
+    public static void main(String[] args) throws IOException {
         SimpleAPDU app = new SimpleAPDU();
         app.run(args);
     }