diff options
| author | mcentner <mcentner@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4> | 2010-07-28 11:29:32 +0000 |
|---|---|---|
| committer | mcentner <mcentner@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4> | 2010-07-28 11:29:32 +0000 |
| commit | 41ff25e2ed31fbc2f6300ff27841c3d1341e3e7d (patch) | |
| tree | c0f25848bbd9b408329df798fe446b211e657064 | |
| parent | 5004463ffd6b0e42355bdc756939561749f39e79 (diff) | |
| download | mocca-41ff25e2ed31fbc2f6300ff27841c3d1341e3e7d.tar.gz mocca-41ff25e2ed31fbc2f6300ff27841c3d1341e3e7d.tar.bz2 mocca-41ff25e2ed31fbc2f6300ff27841c3d1341e3e7d.zip | |
Fixed issues with help URLs and applet caching which where introduced with changes to [#MOCCA-745].
git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@797 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
| -rw-r--r-- | BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HelpListener.java | 2 | ||||
| -rw-r--r-- | BKUOnline/src/main/webapp/applet.jsp | 29 |
2 files changed, 11 insertions, 20 deletions
diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HelpListener.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HelpListener.java index a0ab2d77..9bfd89ae 100644 --- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HelpListener.java +++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HelpListener.java @@ -72,7 +72,7 @@ public class HelpListener implements MouseListener, KeyListener, HelpURLProvider @Override public synchronized String getHelpURL() { try { - URL helpURL = new URL(baseURL, (helpTopic != null) ? "index.html" : helpTopic + ".html"); + URL helpURL = new URL(baseURL, (helpTopic == null) ? "index.html" : helpTopic + ".html"); log.debug("Return help url: {}.", helpURL); return helpURL.toString(); } catch (MalformedURLException e) { diff --git a/BKUOnline/src/main/webapp/applet.jsp b/BKUOnline/src/main/webapp/applet.jsp index 5782c6af..1c2754fb 100644 --- a/BKUOnline/src/main/webapp/applet.jsp +++ b/BKUOnline/src/main/webapp/applet.jsp @@ -46,36 +46,27 @@ <%-- Messages --%> <fmt:bundle basename="web"> <%-- Applet archive and class --%> -<%-- - Uncomment the following line if you would like to prevent applet caching! ---%> -<%-- jsp:useBean id="now" class="java.util.Date" scope="request"/ --%> <c:choose> <c:when test="${requestScope.moccaParam.extension == 'activation'}"> - <c:url var="appletArchive" value="BKUAppletExt-single.jar"> - <c:if test="${! empty now}"> - <c:param name="no-cache" value="${now.time}"/> - </c:if> - </c:url> + <c:set var="appletArchive" value="BKUAppletExt-single.jar"/> <c:set var="appletClass" value="at.gv.egiz.bku.online.applet.ActivationApplet.class"/> </c:when> <c:when test="${requestScope.moccaParam.extension == 'pin'}"> - <c:url var="appletArchive" value="BKUAppletExt-single.jar"> - <c:if test="${! empty now}"> - <c:param name="no-cache" value="${now.time}"/> - </c:if> - </c:url> + <c:set var="appletArchive" value="BKUAppletExt-single.jar"/> <c:set var="appletClass" value="at.gv.egiz.bku.online.applet.PINManagementApplet.class"/> </c:when> <c:otherwise> - <c:url var="appletArchive" value="BKUApplet-single.jar"> - <c:if test="${! empty now}"> - <c:param name="no-cache" value="${now.time}"/> - </c:if> - </c:url> + <c:set var="appletArchive" value="BKUApplet-single.jar"/> <c:set var="appletClass" value="at.gv.egiz.bku.online.applet.BKUApplet.class"/> </c:otherwise> </c:choose> +<%-- + Uncomment the following line if you would like to prevent applet caching! +--%> +<%-- jsp:useBean id="now" class="java.util.Date" scope="request"/ --%> +<c:if test="${! empty now}"> + <c:set var="appletArchive" value="${appletArchive}?no-cache=${now.time}"/> +</c:if> <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> <html> <head> |