1 files changed, 17 insertions, 8 deletions
diff --git a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/BKUWorker.java b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/BKUWorker.java
index b11413d6..350925ce 100644
--- a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/BKUWorker.java
+++ b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/BKUWorker.java
@@ -55,7 +55,7 @@ public class BKUWorker extends AbstractSMCCSTAL implements Runnable,
   protected BKUGUIFacade gui;
   protected BKUApplet parent;
   private STALPortType stalPort;
-  private URL hashDataURL;
+//  private URL hashDataURL;
   protected List<String> actionCommandList = new ArrayList<String>();
   protected Boolean actionPerformed = false;
   protected boolean finished = false;
@@ -140,7 +140,6 @@ public class BKUWorker extends AbstractSMCCSTAL implements Runnable,
     gui.showWelcomeDialog();
     try {
       stalPort = getSTALPort();
-      hashDataURL = getHashDataURL();
     } catch (Exception e) {
       log.fatal("Failed to call STAL service.", e);
       actionCommandList.clear();
@@ -155,10 +154,10 @@ public class BKUWorker extends AbstractSMCCSTAL implements Runnable,
       return;
     }
     
-    //TODO factory for SignRequestHandler providing either WebServiceHDISignRequestHandler or ExternalHDIDisplaySignRequestHandler
-    AppletContext ctx = parent.getAppletContext();
-    log.debug("register SignRequestHandler for HashDataURL " + hashDataURL);
-    addRequestHandler(at.gv.egiz.stal.SignRequest.class, new ExternalDisplaySignRequestHandler(ctx, hashDataURL));
+//    //TODO factory for SignRequestHandler providing either WebServiceHDISignRequestHandler or ExternalHDIDisplaySignRequestHandler
+//    AppletContext ctx = parent.getAppletContext();
+//    log.debug("register SignRequestHandler for HashDataURL " + hashDataURL);
+//    addRequestHandler(at.gv.egiz.stal.SignRequest.class, new ExternalDisplaySignRequestHandler(ctx, hashDataURL));
     
     try {
       String sessionId = parent.getMyAppletParameter(BKUApplet.SESSION_ID);
@@ -167,6 +166,16 @@ public class BKUWorker extends AbstractSMCCSTAL implements Runnable,
         sessionId = "TestSession";
       }
       
+      String hashDataDisplayStyle = parent.getMyAppletParameter(BKUApplet.HASHDATA_DISPLAY);
+      if (BKUApplet.HASHDATA_DISPLAY_INTERNAL.equals(hashDataDisplayStyle)) {
+        log.debug("register SignRequestHandler for STAL port " + BKUApplet.WSDL_URL);
+        addRequestHandler(at.gv.egiz.stal.SignRequest.class, new WebServiceSignRequestHandler(sessionId, stalPort));
+      } else { //if (HASHDATADISPLAY_EXTERNAL.equals(displayStyle)) {
+        URL hashDataURL = getHashDataURL();
+        log.debug("register SignRequestHandler for HashDataURL " + hashDataURL);
+        addRequestHandler(at.gv.egiz.stal.SignRequest.class, new ExternalDisplaySignRequestHandler(parent.getAppletContext(), hashDataURL));
+      }
+      
 //      log.debug("register SignRequestHandler for STAL port " + BKUApplet.WSDL_URL);
 //      addRequestHandler(at.gv.egiz.stal.SignRequest.class, new WebServiceSignRequestHandler(sessionId, stalPort));
 
@@ -254,8 +263,8 @@ public class BKUWorker extends AbstractSMCCSTAL implements Runnable,
 
   protected void sendRedirect() {
     log.info("Done, sending redirect to get BKU response");
-    String redirectURL = parent.getMyAppletParameter("redirectURL");
-    String redirectTarget = parent.getMyAppletParameter("redirectTarget");
+    String redirectURL = parent.getMyAppletParameter(BKUApplet.REDIRECT_URL);
+    String redirectTarget = parent.getMyAppletParameter(BKUApplet.REDIRECT_TARGET);
     log.info("Redirecting to: " + redirectURL + " target: " + redirectTarget);
     URL url = null;
     if (redirectURL != null) {