GUI refactoring 2

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

3 files changed, 29 insertions, 64 deletions

diff --git a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/AppletHashDataDisplay.java b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/AppletHashDataDisplay.java
index ba502906..7be40d65 100644
--- a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/AppletHashDataDisplay.java
+++ b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/AppletHashDataDisplay.java
@@ -75,7 +75,7 @@ public class AppletHashDataDisplay extends SignRequestHandler {
     List<HashDataInput> verifiedHashDataInputs = verifyHashDataInput(signedReferences, hdi);
 
     if (verifiedHashDataInputs.size() > 0) {
-      gui.showHashDataInputDialog(verifiedHashDataInputs, this, "ok");
+      gui.showHashDataInputDialog(verifiedHashDataInputs, this, "hashDataDone");
     } else {
       throw new Exception("No signature data (apart from any QualifyingProperties or a Manifest)");
     }
diff --git a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/BKUApplet.java b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/BKUApplet.java
index 5b45c8e1..d0eed607 100644
--- a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/BKUApplet.java
+++ b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/BKUApplet.java
@@ -43,14 +43,13 @@ public class BKUApplet extends JApplet implements AppletParameterProvider {
    * Applet parameter keys
    */
   public static final String GUI_STYLE = "GuiStyle";
-  public final static String LOCALE_PARAM_KEY = "Locale";
-  public final static String LOGO_URL_KEY = "LogoURL";
+  public final static String LOCALE = "Locale";
   public final static String WSDL_URL = "WSDL_URL";
   public static final String HASHDATA_DISPLAY = "HashDataDisplay";
   public final static String HASHDATA_URL = "HashDataURL";
   public final static String HELP_URL = "HelpURL";
   public final static String SESSION_ID = "SessionID";
-  public static final String BACKGROUND_PARAM = "Background";
+  public static final String BACKGROUND_IMG = "Background";
   public static final String REDIRECT_URL = "RedirectURL";
   public static final String REDIRECT_TARGET = "RedirectTarget";
 //  public static final String HASHDATA_DISPLAY_INTERNAL = "internal";
@@ -76,6 +75,7 @@ public class BKUApplet extends JApplet implements AppletParameterProvider {
 
   /**
    * Factory method to create and wire HelpListener, GUI and BKUWorker.
+   * (Config via applet parameters as constants BKUApplet.*)
    */
   @Override
   public void init() {
@@ -84,30 +84,40 @@ public class BKUApplet extends JApplet implements AppletParameterProvider {
     
     HttpsURLConnection.setDefaultSSLSocketFactory(InternalSSLSocketFactory.getInstance());
     
-    String locale = getAppletParameter(LOCALE_PARAM_KEY);
-    String guiStyle = getAppletParameter(GUI_STYLE);
+    String locale = getAppletParameter(LOCALE);
+    if (locale != null) {
+      this.setLocale(new Locale(locale));
+    }
+    log.debug("setting locale to " + getLocale());
+
+    BKUGUIFacade.Style guiStyle;
+    if ("advanced".equals(getAppletParameter(GUI_STYLE))) { 
+      guiStyle = BKUGUIFacade.Style.advanced;
+    } else {
+      guiStyle = BKUGUIFacade.Style.simple;
+    }
+    
     URL backgroundImgURL = null;
+    try {
+      backgroundImgURL = getURLParameter(BACKGROUND_IMG);
+    } catch (MalformedURLException ex) {
+      log.warn("failed to load applet background image: " + ex.getMessage() + ", using default");
+    }
+    
     AbstractHelpListener helpListener = null;
     try {
-      URL helpURL = getURLParameter(HELP_URL); //, getAppletParameter(SESSION_ID));
+      URL helpURL = getURLParameter(HELP_URL); 
 //      helpListener = new BrowserHelpListener(getAppletContext(), helpURL, getLocale());
       helpListener = new DefaultHelpListener(getAppletContext(), helpURL, getLocale());
     } catch (MalformedURLException ex) {
       log.warn("failed to load help URL: " + ex.getMessage() + ", disabling help");
     }
-    try {
-      backgroundImgURL = getURLParameter(BACKGROUND_PARAM);
-    } catch (MalformedURLException ex) {
-      log.warn("failed to load applet background image: " + ex.getMessage() + ", using default");
-    }
     
-    if (locale != null) {
-      this.setLocale(new Locale(locale));
-    }
-    log.debug("setting locale to " + getLocale());
-
-    BKUGUIFacade gui = BKUGUIFactory.createGUI(getContentPane(), getLocale(), guiStyle, backgroundImgURL, helpListener);
-//    gui.init(getContentPane(), getLocale(), BKUGUIFacade.Style.advanced, backgroundImgURL, helpListener);
+    BKUGUIFacade gui = BKUGUIFactory.createGUI(getContentPane(), 
+            getLocale(), 
+            guiStyle, 
+            backgroundImgURL, 
+            helpListener);
 
     worker = new AppletBKUWorker(gui, getAppletContext(), this);
   }
diff --git a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/BrowserHelpListener.java b/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/BrowserHelpListener.java
deleted file mode 100644
index 265acca0..00000000
--- a/BKUApplet/src/main/java/at/gv/egiz/bku/online/applet/BrowserHelpListener.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright 2008 Federal Chancellery Austria and
- * Graz University of Technology
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *     http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package at.gv.egiz.bku.online.applet;
-
-import at.gv.egiz.bku.gui.AbstractHelpListener;
-import java.applet.AppletContext;
-import java.net.URL;
-import java.util.Locale;
-
-/**
- * 
- * @author Clemens Orthacker <clemens.orthacker@iaik.tugraz.at>
- */
-public class BrowserHelpListener extends AbstractHelpListener {
-
-  protected AppletContext ctx;
-
-  public BrowserHelpListener(AppletContext ctx, URL helpURL, Locale locale) {
-    super(helpURL, locale);
-    if (ctx == null) {
-      throw new RuntimeException("no applet context provided");
-    }
-    this.ctx = ctx;
-  }
-
-  @Override
-  public void showDocument(URL helpDocument, String helpTopic) throws Exception {
-    ctx.showDocument(helpDocument, "_blank");
-  }
-}