Improved Quit Handling for multiple applet instances

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

3 files changed, 5 insertions, 7 deletions

diff --git a/smcc/src/main/java/at/gv/egiz/smcc/AbstractSignatureCard.java b/smcc/src/main/java/at/gv/egiz/smcc/AbstractSignatureCard.java
index ab6932d7..7f3a3b1c 100644
--- a/smcc/src/main/java/at/gv/egiz/smcc/AbstractSignatureCard.java
+++ b/smcc/src/main/java/at/gv/egiz/smcc/AbstractSignatureCard.java
@@ -262,11 +262,11 @@ public abstract class AbstractSignatureCard implements SignatureCard {
   }
 
   @Override
-  public void reset() {
-    log.debug("Resetting card");
+  public void disconnect(boolean reset) {
+    log.debug("Disconnect called");
     if (card_ != null) {
       try {
-        card_.disconnect(true);
+        card_.disconnect(reset);
       } catch (CardException e) {
         log.info("Error while resetting card", e);
       }
diff --git a/smcc/src/main/java/at/gv/egiz/smcc/SWCard.java b/smcc/src/main/java/at/gv/egiz/smcc/SWCard.java
index 28cce350..68a6f6df 100644
--- a/smcc/src/main/java/at/gv/egiz/smcc/SWCard.java
+++ b/smcc/src/main/java/at/gv/egiz/smcc/SWCard.java
@@ -320,9 +320,7 @@ public class SWCard implements SignatureCard {
   }
 
   @Override
-  public void reset() {
-    // TODO Auto-generated method stub
-    
+  public void disconnect(boolean reset) {    
   }
 
 }
diff --git a/smcc/src/main/java/at/gv/egiz/smcc/SignatureCard.java b/smcc/src/main/java/at/gv/egiz/smcc/SignatureCard.java
index 5e859d52..37bd7cf9 100644
--- a/smcc/src/main/java/at/gv/egiz/smcc/SignatureCard.java
+++ b/smcc/src/main/java/at/gv/egiz/smcc/SignatureCard.java
@@ -79,7 +79,7 @@ public interface SignatureCard {
   public byte[] getCertificate(KeyboxName keyboxName)
       throws SignatureCardException;
   
-  public void reset();
+  public void disconnect(boolean reset);
 
   /**
    *