[#430] Activation/PIN-management in MOCCA Web Start

- new Modules: smccSTALExt, BKUGuiExt in order not to depend on BKUAppletExt in BKULocal
- provide stal-request handler de-registration in abstractSMCCSTAL

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

2 files changed, 14 insertions, 4 deletions

diff --git a/BKUAppletExt/src/main/java/at/gv/egiz/bku/online/applet/ActivationApplet.java b/BKUAppletExt/src/main/java/at/gv/egiz/bku/online/applet/ActivationApplet.java
index 68f0cb72..cfd1e200 100644
--- a/BKUAppletExt/src/main/java/at/gv/egiz/bku/online/applet/ActivationApplet.java
+++ b/BKUAppletExt/src/main/java/at/gv/egiz/bku/online/applet/ActivationApplet.java
@@ -22,7 +22,7 @@ import at.gv.egiz.bku.gui.BKUGUIFacade;
 import at.gv.egiz.bku.gui.BKUGUIFacade.Style;
 import at.gv.egiz.bku.online.applet.BKUApplet;
 import at.gv.egiz.bku.smccstal.AbstractSMCCSTAL;
-import at.gv.egiz.bku.smccstal.ext.CardMgmtRequestHandler;
+import at.gv.egiz.bku.smccstal.CardMgmtRequestHandler;
 import at.gv.egiz.stal.ext.APDUScriptRequest;
 import at.gv.egiz.stal.service.STALPortType;
 import at.gv.egiz.stal.service.translator.STALTranslator;
diff --git a/BKUAppletExt/src/main/java/at/gv/egiz/bku/online/applet/PINManagementBKUWorker.java b/BKUAppletExt/src/main/java/at/gv/egiz/bku/online/applet/PINManagementBKUWorker.java
index 81b635f8..d06c2865 100644
--- a/BKUAppletExt/src/main/java/at/gv/egiz/bku/online/applet/PINManagementBKUWorker.java
+++ b/BKUAppletExt/src/main/java/at/gv/egiz/bku/online/applet/PINManagementBKUWorker.java
@@ -18,11 +18,16 @@ package at.gv.egiz.bku.online.applet;
 
 import at.gv.egiz.bku.gui.BKUGUIFacade;
 import at.gv.egiz.bku.gui.PINManagementGUIFacade;
-import at.gv.egiz.bku.smccstal.ext.PINManagementRequestHandler;
+import at.gv.egiz.bku.smccstal.PINManagementRequestHandler;
 import at.gv.egiz.stal.ErrorResponse;
+import at.gv.egiz.stal.InfoboxReadRequest;
+import at.gv.egiz.stal.QuitRequest;
+import at.gv.egiz.stal.STALRequest;
 import at.gv.egiz.stal.STALResponse;
+import at.gv.egiz.stal.SignRequest;
 import at.gv.egiz.stal.ext.PINManagementRequest;
 import at.gv.egiz.stal.ext.PINManagementResponse;
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
@@ -36,7 +41,8 @@ public class PINManagementBKUWorker extends AppletBKUWorker {
 
   public PINManagementBKUWorker(BKUApplet applet, PINManagementGUIFacade gui) {
     super(applet, gui);
-    handlerMap.clear();
+    removeRequestHandler(InfoboxReadRequest.class);
+    removeRequestHandler(SignRequest.class);
     addRequestHandler(PINManagementRequest.class, new PINManagementRequestHandler());
   }
 
@@ -46,7 +52,11 @@ public class PINManagementBKUWorker extends AppletBKUWorker {
             BKUGUIFacade.MESSAGE_WELCOME);
 
     try {
-      List<STALResponse> responses = handleRequest(Collections.singletonList(new PINManagementRequest()));
+
+      ArrayList<STALRequest> reqs = new ArrayList<STALRequest>();
+      reqs.add(new PINManagementRequest());
+      reqs.add(new QuitRequest());
+      List<STALResponse> responses = handleRequest(reqs);
 
       if (responses.size() == 1) {
         STALResponse response = responses.get(0);