From 28e81afd92a6568ff78736b72c5257a86c0b9b91 Mon Sep 17 00:00:00 2001
From: clemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Tue, 18 Nov 2008 08:03:35 +0000
Subject: GUI refactoring 1

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@177 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 .../src/main/java/at/gv/egiz/bku/local/stal/BKUGuiProxy.java | 12 +++++-------
 .../at/gv/egiz/bku/local/stal/LocalSignRequestHandler.java   |  2 +-
 .../main/java/at/gv/egiz/bku/local/stal/SMCCSTALFactory.java |  7 +++++--
 3 files changed, 11 insertions(+), 10 deletions(-)

(limited to 'BKULocal')

diff --git a/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/BKUGuiProxy.java b/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/BKUGuiProxy.java
index fb8f2432..eaa4d6ad 100644
--- a/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/BKUGuiProxy.java
+++ b/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/BKUGuiProxy.java
@@ -37,10 +37,10 @@ public class BKUGuiProxy implements BKUGUIFacade {
     return delegate.getPin();
   }
 
-  @Override
-  public void init(Container contentPane, Locale locale, URL bgImage, ActionListener helpListener) {
-    delegate.init(contentPane, locale, bgImage, helpListener);
-  }
+//  @Override
+//  public void init(Container contentPane, Locale locale, URL bgImage, ActionListener helpListener) {
+//    delegate.init(contentPane, locale, bgImage, helpListener);
+//  }
 
   @Override
   public Locale getLocale() {
@@ -126,11 +126,9 @@ public class BKUGuiProxy implements BKUGUIFacade {
 
   @Override
   public void showHashDataInputDialog(List<HashDataInput> signedReferences, 
-          boolean externalDisplay, 
           ActionListener okListener, 
           String okCommand) {
     showDialog();
-    delegate.showHashDataInputDialog(signedReferences, externalDisplay, okListener,
-        okCommand);
+    delegate.showHashDataInputDialog(signedReferences, okListener, okCommand);
   }
 }
diff --git a/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/LocalSignRequestHandler.java b/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/LocalSignRequestHandler.java
index 19e6a657..bfce0f0d 100644
--- a/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/LocalSignRequestHandler.java
+++ b/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/LocalSignRequestHandler.java
@@ -109,7 +109,7 @@ public class LocalSignRequestHandler extends SignRequestHandler {
       log.error("dsig:SignedInfo does not contain a data reference");
       throw new Exception("dsig:SignedInfo does not contain a data reference");
     }
-    gui.showHashDataInputDialog(selectedHashDataInputs, false, this, "ok");
+    gui.showHashDataInputDialog(selectedHashDataInputs, this, "ok");
   }
 
   private ByteArrayHashDataInput getByteArrayHashDataInput(HashDataInput hashDataInput) throws IOException {
diff --git a/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/SMCCSTALFactory.java b/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/SMCCSTALFactory.java
index cad8cfb6..7012fec0 100644
--- a/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/SMCCSTALFactory.java
+++ b/BKULocal/src/main/java/at/gv/egiz/bku/local/stal/SMCCSTALFactory.java
@@ -48,7 +48,6 @@ public class SMCCSTALFactory implements STALFactory {
     if (locale != null) {
       dialog.setLocale(locale);
     }
-    BKUGUIFacade gui = BKUGUIFactory.createGUI(BKUGUIFactory.ADVANCED_GUI);
     DefaultHelpListener helpListener = null;
     try {
       if (helpURL != null) {
@@ -60,7 +59,11 @@ public class SMCCSTALFactory implements STALFactory {
     } catch (MalformedURLException ex) {
       log.error("failed to configure help listener: " + ex.getMessage(), ex);
     }
-    gui.init(dialog.getContentPane(), dialog.getLocale(), null, helpListener);
+    BKUGUIFacade gui = BKUGUIFactory.createGUI(dialog.getContentPane(), 
+            dialog.getLocale(),
+            BKUGUIFactory.ADVANCED_GUI,
+            null,
+            helpListener);
     stal = new SMCCSTAL(new BKUGuiProxy(dialog, gui), dialog);
     dialog.setPreferredSize(new Dimension(400, 200));
     dialog.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
-- 
cgit v1.2.3