Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Goldthorpe2007-09-25 23:33:26 +0000
committerChris Goldthorpe2007-09-25 23:33:26 +0000
commita4375069c2db58dc5def46bcb811e6cdd27829bf (patch)
treea64441c673f0cb953928d6a63fb2b9e6aa51e224 /org.eclipse.help.webapp/index.jsp
parentcda496a27bd4d4ffb6ce150c0e475edf05040000 (diff)
downloadeclipse.platform.ua-a4375069c2db58dc5def46bcb811e6cdd27829bf.tar.gz
eclipse.platform.ua-a4375069c2db58dc5def46bcb811e6cdd27829bf.tar.xz
eclipse.platform.ua-a4375069c2db58dc5def46bcb811e6cdd27829bf.zip
Bug 185368 – Portability of RequestDispatch forward and query strings in index.jsp
Diffstat (limited to 'org.eclipse.help.webapp/index.jsp')
-rw-r--r--org.eclipse.help.webapp/index.jsp11
1 files changed, 5 insertions, 6 deletions
diff --git a/org.eclipse.help.webapp/index.jsp b/org.eclipse.help.webapp/index.jsp
index e71d82959..d8471f19b 100644
--- a/org.eclipse.help.webapp/index.jsp
+++ b/org.eclipse.help.webapp/index.jsp
@@ -11,22 +11,21 @@
<%@ page import="org.eclipse.help.internal.webapp.data.*" errorPage="/advanced/err.jsp" contentType="text/html; charset=UTF-8"%>
<%
request.setCharacterEncoding("UTF-8");
+ LayoutData data = new LayoutData(application,request, response);
if (request.getParameter("noscript") != null) {
- request.getRequestDispatcher("/basic/index.jsp").forward(request, response);
+ request.getRequestDispatcher("/basic/index.jsp" + data.getQuery()).forward(request, response);
return;
}
- RequestData data = new RequestData(application,request, response);
if(data.isBot()){
TocData tData = new TocData(application,request, response);
- LayoutData lData = new LayoutData(application,request, response);
%>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title><%=lData.getWindowTitle()%></title>
+<title><%=data.getWindowTitle()%></title>
</head>
<body>
<% tData.generateLinks(out); %>
@@ -34,8 +33,8 @@
</html>
<%
}else if(data.isAdvancedUI()){
- request.getRequestDispatcher("/advanced/index.jsp").forward(request, response);
+ request.getRequestDispatcher("/advanced/index.jsp" + data.getQuery()).forward(request, response);
}else{
- request.getRequestDispatcher("/basic/index.jsp").forward(request, response);
+ request.getRequestDispatcher("/basic/index.jsp" + data.getQuery()).forward(request, response);
}
%>

Back to the top