diff options
| author | wbauer <wbauer@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4> | 2008-10-10 09:42:51 +0000 |
|---|---|---|
| committer | wbauer <wbauer@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4> | 2008-10-10 09:42:51 +0000 |
| commit | 520f2a4ee9ae69a06e5355028f5d62ee173cd484 (patch) | |
| tree | 2a5b4f058bbb7a085eb351608aba00f1db54a726 | |
| parent | 378f735d14a1f21571a3c3d5d4ae7eab02c5cf3c (diff) | |
| download | mocca-520f2a4ee9ae69a06e5355028f5d62ee173cd484.tar.gz mocca-520f2a4ee9ae69a06e5355028f5d62ee173cd484.tar.bz2 mocca-520f2a4ee9ae69a06e5355028f5d62ee173cd484.zip | |
git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@98 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
3 files changed, 24 insertions, 14 deletions
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 22ab1d6f..d12be9ac 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 @@ -7,6 +7,7 @@ import java.awt.event.ActionListener; import java.awt.event.FocusEvent;
import java.awt.event.FocusListener;
import java.awt.event.WindowEvent;
+import java.net.URL;
import java.util.List;
import javax.swing.JDialog;
@@ -36,8 +37,8 @@ public class BKUGuiProxy implements BKUGUIFacade { }
@Override
- public void init(Container contentPane, String localeString) {
- delegate.init(contentPane, localeString);
+ public void init(Container contentPane, String localeString, URL bgImage) {
+ delegate.init(contentPane, localeString, bgImage);
}
@Override
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 c1a69bd8..08f22595 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 @@ -47,7 +47,7 @@ public class SMCCSTALFactory implements STALFactory { } dialog = new JDialog(); BKUGUIFacade gui = BKUGUIFactory.createGUI(); - gui.init(dialog.getContentPane(), locale.toString()); + gui.init(dialog.getContentPane(), locale.toString(), null); stal = new SMCCSTAL(new BKUGuiProxy(dialog, gui), dialog, resourceBundle); dialog.setPreferredSize(new Dimension(400, 200)); dialog.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE); diff --git a/BKUOnline/src/main/webapp/appletPage.jsp b/BKUOnline/src/main/webapp/appletPage.jsp index 11f46dca..6c4aee58 100644 --- a/BKUOnline/src/main/webapp/appletPage.jsp +++ b/BKUOnline/src/main/webapp/appletPage.jsp @@ -19,15 +19,24 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> <html> <head> - <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> - <title>MOCCA Appletpage</title> - <link rel="shortcut icon" href="img/favicon.ico" type="image/x-icon"> - <script type="text/javascript" src="js/deployJava.js"></script> +<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> +<title>MOCCA Appletpage</title> +<link rel="shortcut icon" href="img/favicon.ico" type="image/x-icon"> +<script type="text/javascript" src="js/deployJava.js"></script> +<META HTTP-EQUIV="CACHE-CONTROL" CONTENT="NO-CACHE"> +<META HTTP-EQUIV="EXPIRES" CONTENT="Mon, 22 Jul 2002 11:12:01 GMT"> +<META HTTP-EQUIV="PRAGMA" CONTENT="NO-CACHE"> </head> <body> -<% int width= session.getAttribute("appletWidth") == null ? 190 : (Integer)session.getAttribute("appletWidth"); - int height=session.getAttribute("appletHeight") == null ? 130 : (Integer)session.getAttribute("appletHeight"); - String backgroundImg = (String) session.getAttribute("appletBackground"); +<% + int width = session.getAttribute("appletWidth") == null + ? 190 + : (Integer) session.getAttribute("appletWidth"); + int height = session.getAttribute("appletHeight") == null + ? 130 + : (Integer) session.getAttribute("appletHeight"); + String backgroundImg = (String) session + .getAttribute("appletBackground"); %> <script> if (!deployJava.versionCheck('1.6.0_04+')) { @@ -38,13 +47,13 @@ codebase :'applet', code :'at.gv.egiz.bku.online.applet.BKUApplet.class', archive :'BKUApplet-1.0-SNAPSHOT.jar, commons-logging-1.1.1.jar, iaik_jce_me4se-3.04.jar', - width : <%= width %>, - height :<%= height %> + width : <%=width%>, + height :<%=height%> }; var parameters = { - background : '<%= backgroundImg %>', + background : '<%=backgroundImg%>', WSDL_URL :'../stal?wsdl', - SessionID : '<%= session.getId() %>', + SessionID : '<%=session.getId()%>', redirectURL : '../bkuResult' }; var version = '1.6.0_02'; |