Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kurtakov2021-04-20 15:38:21 +0000
committerAlexander Kurtakov2021-04-20 15:53:45 +0000
commit0568d2421187557d37917af1f928289e4e2a5151 (patch)
tree8a901ab1d5e2fb384f40befce7bbeb0e9af31e1f
parent61a38108fb553e8bfe825e9373d529930e3192ea (diff)
downloadeclipse.platform.ua-0568d2421187557d37917af1f928289e4e2a5151.tar.gz
eclipse.platform.ua-0568d2421187557d37917af1f928289e4e2a5151.tar.xz
eclipse.platform.ua-0568d2421187557d37917af1f928289e4e2a5151.zip
Bug 573013 - Cleanup jsp files
Remove fheader.jsp and rather use header.jsp as the two files are identical. Change-Id: I830f51ef76daeaf8a0b7e99b3e7c3f763a2971a8 Signed-off-by: Alexander Kurtakov <akurtako@redhat.com> Reviewed-on: https://git.eclipse.org/r/c/platform/eclipse.platform.ua/+/179558 Tested-by: Platform Bot <platform-bot@eclipse.org>
Diffstat
-rw-r--r--org.eclipse.help.webapp/advanced/content.jsp2
-rw-r--r--org.eclipse.help.webapp/advanced/fheader.jsp35
-rw-r--r--org.eclipse.help.webapp/advanced/help.jsp2
-rw-r--r--org.eclipse.help.webapp/advanced/helpToolbar.jsp2
-rw-r--r--org.eclipse.help.webapp/advanced/index.jsp2
-rw-r--r--org.eclipse.help.webapp/advanced/indexView.jsp2
-rw-r--r--org.eclipse.help.webapp/advanced/nav.jsp2
-rw-r--r--org.eclipse.help.webapp/advanced/view.jsp2
8 files changed, 7 insertions, 42 deletions
diff --git a/org.eclipse.help.webapp/advanced/content.jsp b/org.eclipse.help.webapp/advanced/content.jsp
index 038e1914b..7d869e0e7 100644
--- a/org.eclipse.help.webapp/advanced/content.jsp
+++ b/org.eclipse.help.webapp/advanced/content.jsp
@@ -11,7 +11,7 @@
Contributors:
IBM Corporation - initial API and implementation
--%>
-<%@ include file="fheader.jsp"%>
+<%@ include file="header.jsp"%>
<%
LayoutData data = new LayoutData(application,request, response);
diff --git a/org.eclipse.help.webapp/advanced/fheader.jsp b/org.eclipse.help.webapp/advanced/fheader.jsp
deleted file mode 100644
index 81f1b1787..000000000
--- a/org.eclipse.help.webapp/advanced/fheader.jsp
+++ /dev/null
@@ -1,35 +0,0 @@
-<%--
- Copyright (c) 2000, 2018 IBM Corporation and others.
-
- This program and the accompanying materials
- are made available under the terms of the Eclipse Public License 2.0
- which accompanies this distribution, and is available at
- https://www.eclipse.org/legal/epl-2.0/
-
- SPDX-License-Identifier: EPL-2.0
-
- Contributors:
- IBM Corporation - initial API and implementation
---%><%@
-page import="org.eclipse.help.internal.webapp.data.*" contentType="text/html; charset=UTF-8"
-%>
-<%@page import="org.eclipse.help.webapp.*" %>
-<%
-request.setCharacterEncoding("UTF-8");
-boolean isRTL = UrlUtil.isRTL(request, response);
-String direction = isRTL?"rtl":"ltr";
-%>
- <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd">
-<!--
- ! Copyright (c) 2000, 2007 IBM Corporation and others.
- !
- ! This program and the accompanying materials
- ! are made available under the terms of the Eclipse Public License 2.0
- ! which accompanies this distribution, and is available at
- ! https://www.eclipse.org/legal/epl-2.0/
- !
- ! SPDX-License-Identifier: EPL-2.0
- !
- ! Contributors:
- ! IBM Corporation - initial API and implementation
- --> \ No newline at end of file
diff --git a/org.eclipse.help.webapp/advanced/help.jsp b/org.eclipse.help.webapp/advanced/help.jsp
index 5f66c1bee..30d3810e8 100644
--- a/org.eclipse.help.webapp/advanced/help.jsp
+++ b/org.eclipse.help.webapp/advanced/help.jsp
@@ -11,7 +11,7 @@
Contributors:
IBM Corporation - initial API and implementation
--%>
-<%@ include file="fheader.jsp"%>
+<%@ include file="header.jsp"%>
<%
LayoutData data = new LayoutData(application,request, response);
diff --git a/org.eclipse.help.webapp/advanced/helpToolbar.jsp b/org.eclipse.help.webapp/advanced/helpToolbar.jsp
index 501266cb2..d90e1ed3a 100644
--- a/org.eclipse.help.webapp/advanced/helpToolbar.jsp
+++ b/org.eclipse.help.webapp/advanced/helpToolbar.jsp
@@ -11,7 +11,7 @@
Contributors:
IBM Corporation - initial API and implementation
--%>
-<%@ include file="fheader.jsp"%>
+<%@ include file="header.jsp"%>
<%
LayoutData data = new LayoutData(application,request, response);
diff --git a/org.eclipse.help.webapp/advanced/index.jsp b/org.eclipse.help.webapp/advanced/index.jsp
index af5278090..cf733aca1 100644
--- a/org.eclipse.help.webapp/advanced/index.jsp
+++ b/org.eclipse.help.webapp/advanced/index.jsp
@@ -11,7 +11,7 @@
Contributors:
IBM Corporation - initial API and implementation
--%>
-<%@ include file="fheader.jsp"%>
+<%@ include file="header.jsp"%>
<%
LayoutData data = new LayoutData(application,request, response);
diff --git a/org.eclipse.help.webapp/advanced/indexView.jsp b/org.eclipse.help.webapp/advanced/indexView.jsp
index e6036dd4a..63c2b3774 100644
--- a/org.eclipse.help.webapp/advanced/indexView.jsp
+++ b/org.eclipse.help.webapp/advanced/indexView.jsp
@@ -16,7 +16,7 @@
IBM Corporation 2009, css changes
IBM Corporation 2010, added lang to html tag
--%>
-<%@ include file="fheader.jsp"%>
+<%@ include file="header.jsp"%>
<%
RequestData requestData = new ActivitiesData(application,request, response);
diff --git a/org.eclipse.help.webapp/advanced/nav.jsp b/org.eclipse.help.webapp/advanced/nav.jsp
index 944068ac7..9d102d739 100644
--- a/org.eclipse.help.webapp/advanced/nav.jsp
+++ b/org.eclipse.help.webapp/advanced/nav.jsp
@@ -11,7 +11,7 @@
Contributors:
IBM Corporation - initial API and implementation
--%>
-<%@ include file="fheader.jsp"%>
+<%@ include file="header.jsp"%>
<%
LayoutData data = new LayoutData(application,request, response);
diff --git a/org.eclipse.help.webapp/advanced/view.jsp b/org.eclipse.help.webapp/advanced/view.jsp
index b7ee86f96..5eed961f6 100644
--- a/org.eclipse.help.webapp/advanced/view.jsp
+++ b/org.eclipse.help.webapp/advanced/view.jsp
@@ -11,7 +11,7 @@
Contributors:
IBM Corporation - initial API and implementation
--%>
-<%@ include file="fheader.jsp"%>
+<%@ include file="header.jsp"%>
<%
new ActivitiesData(application, request, response); // here it can turn filtering on or off

Back to the top