summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/HelpListener.java2
-rw-r--r--BKUOnline/src/main/webapp/applet.jsp29
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 a0ab2d7..9bfd89a 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 5782c6a..1c2754f 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>