Refactored STAL interface. Additional infobox functionality.

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@236 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4

2 files changed, 10 insertions, 3 deletions

diff --git a/smcc/src/main/java/at/gv/egiz/smcc/util/SMCCHelper.java b/smcc/src/main/java/at/gv/egiz/smcc/util/SMCCHelper.java
index 4dae7975..f7d3bab7 100644
--- a/smcc/src/main/java/at/gv/egiz/smcc/util/SMCCHelper.java
+++ b/smcc/src/main/java/at/gv/egiz/smcc/util/SMCCHelper.java
@@ -57,7 +57,7 @@ public class SMCCHelper {
     SignatureCardFactory factory = SignatureCardFactory.getInstance();

     if (useSWCard) {

       try {

-        signatureCard = factory.createSignatureCard(null);

+        signatureCard = factory.createSignatureCard(null, null);

         resultCode = CARD_FOUND;

       } catch (CardNotSupportedException e) {

         resultCode = CARD_NOT_SUPPORTED;

@@ -83,7 +83,7 @@ public class SMCCHelper {
             if (c == null) {

               throw new CardNotSupportedException();

             }

-            signatureCard = factory.createSignatureCard(c);

+            signatureCard = factory.createSignatureCard(c, cardTerminal);

             ATR atr = newCards.get(cardTerminal).getATR();

             log.trace("Found supported card (" + signatureCard.toString() + ") "

                 + "in terminal '" + cardTerminal.getName() + "', ATR = "

diff --git a/smcc/src/main/java/at/gv/egiz/smcc/util/SmartCardIO.java b/smcc/src/main/java/at/gv/egiz/smcc/util/SmartCardIO.java
index b70b44a7..b1866894 100644
--- a/smcc/src/main/java/at/gv/egiz/smcc/util/SmartCardIO.java
+++ b/smcc/src/main/java/at/gv/egiz/smcc/util/SmartCardIO.java
@@ -16,6 +16,7 @@
 */
 package at.gv.egiz.smcc.util;

 

+import java.security.NoSuchAlgorithmException;
 import java.util.Collections;

 import java.util.HashMap;

 import java.util.List;

@@ -54,7 +55,13 @@ public class SmartCardIO {
   CardTerminals cardTerminals_;

 

   private void updateTerminalFactory() {

-    TerminalFactory terminalFactory = TerminalFactory.getDefault();

+    TerminalFactory terminalFactory;
+    try {
+      terminalFactory = TerminalFactory.getInstance("PC/SC", null);
+    } catch (NoSuchAlgorithmException e) {
+      log.info("Failed to get TerminalFactory of type 'PC/SC'.", e);
+      terminalFactory = TerminalFactory.getDefault();
+    }

     log.debug("TerminalFactory : " + terminalFactory);

     if ("PC/SC".equals(terminalFactory.getType())) {

       terminalFactory_ = terminalFactory;