replace string with field

vladak · vladak · commit ccc9ad9c8412 · 2022-12-01T10:21:57.000+01:00
diff --git a/opengrok-web/src/main/java/org/opengrok/web/PageConfig.java b/opengrok-web/src/main/java/org/opengrok/web/PageConfig.java
@@ -118,6 +118,8 @@ public final class PageConfig {
 
     public static final String DUMMY_REVISION = "unknown";
 
+    public static final String historyJspAttrName = "history.jsp-hist";
+
     // query parameters
     static final String PROJECT_PARAM_NAME = "project";
     static final String GROUP_PARAM_NAME = "group";
diff --git a/opengrok-web/src/main/webapp/history.jsp b/opengrok-web/src/main/webapp/history.jsp
@@ -98,7 +98,7 @@ org.opengrok.indexer.web.Util"
             response.sendError(HttpServletResponse.SC_NOT_FOUND);
             return;
         }
-        request.setAttribute("history.jsp-hist", hist);
+        request.setAttribute(PageConfig.historyJspAttrName, hist);
     }
 }
 %>
@@ -109,7 +109,7 @@ include file="/httpheader.jspf"
 %>
 <%
 {
-    if ((request.getAttribute("history.jsp-hist")) != null) {
+    if ((request.getAttribute(PageConfig.historyJspAttrName)) != null) {
 %>
 <body>
 <script type="text/javascript">/* <![CDATA[ */
@@ -124,7 +124,7 @@ include file="/httpheader.jspf"
     }
 }
 {
-    if (request.getAttribute("history.jsp-hist") != null) {
+    if (request.getAttribute(PageConfig.historyJspAttrName) != null) {
 %>
     <%@include file="/pageheader.jspf" %>
 <%
@@ -136,7 +136,7 @@ include file="/httpheader.jspf"
     String path = cfg.getPath();
 
     History hist;
-    if ((hist = (History) request.getAttribute("history.jsp-hist")) != null) {
+    if ((hist = (History) request.getAttribute(PageConfig.historyJspAttrName)) != null) {
 
         int startIndex = cfg.getStartIndex();
         int max = cfg.getMaxItems();
@@ -155,7 +155,7 @@ include file="/httpheader.jspf"
     }
 }
 {
-    if (request.getAttribute("history.jsp-hist") != null) {
+    if (request.getAttribute(PageConfig.historyJspAttrName) != null) {
 %>
         <%@
 
@@ -170,7 +170,7 @@ include file="/minisearch.jspf"
     String context = request.getContextPath();
     String path = cfg.getPath();
     History hist;
-    if ((hist = (History) request.getAttribute("history.jsp-hist")) != null) {
+    if ((hist = (History) request.getAttribute(PageConfig.historyJspAttrName)) != null) {
         RuntimeEnvironment env = cfg.getEnv();
         String uriEncodedName = cfg.getUriEncodedPath();
         Project project = cfg.getProject();

Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,7 @@ org.opengrok.indexer.web.Util"`
`98`	`98`	`response.sendError(HttpServletResponse.SC_NOT_FOUND);`
`99`	`99`	`return;`
`100`	`100`	`}`
`101`		`- request.setAttribute("history.jsp-hist", hist);`
	`101`	`+ request.setAttribute(PageConfig.historyJspAttrName, hist);`
`102`	`102`	`}`
`103`	`103`	`}`
`104`	`104`	`%>`
`@@ -109,7 +109,7 @@ include file="/httpheader.jspf"`
`109`	`109`	`%>`
`110`	`110`	`<%`
`111`	`111`	`{`
`112`		`- if ((request.getAttribute("history.jsp-hist")) != null) {`
	`112`	`+ if ((request.getAttribute(PageConfig.historyJspAttrName)) != null) {`
`113`	`113`	`%>`
`114`	`114`	`<body>`
`115`	`115`	`<script type="text/javascript">/* <![CDATA[ */`
`@@ -124,7 +124,7 @@ include file="/httpheader.jspf"`
`124`	`124`	`}`
`125`	`125`	`}`
`126`	`126`	`{`
`127`		`- if (request.getAttribute("history.jsp-hist") != null) {`
	`127`	`+ if (request.getAttribute(PageConfig.historyJspAttrName) != null) {`
`128`	`128`	`%>`
`129`	`129`	`<%@include file="/pageheader.jspf" %>`
`130`	`130`	`<%`
`@@ -136,7 +136,7 @@ include file="/httpheader.jspf"`
`136`	`136`	`String path = cfg.getPath();`
`137`	`137`
`138`	`138`	`History hist;`
`139`		`- if ((hist = (History) request.getAttribute("history.jsp-hist")) != null) {`
	`139`	`+ if ((hist = (History) request.getAttribute(PageConfig.historyJspAttrName)) != null) {`
`140`	`140`
`141`	`141`	`int startIndex = cfg.getStartIndex();`
`142`	`142`	`int max = cfg.getMaxItems();`
`@@ -155,7 +155,7 @@ include file="/httpheader.jspf"`
`155`	`155`	`}`
`156`	`156`	`}`
`157`	`157`	`{`
`158`		`- if (request.getAttribute("history.jsp-hist") != null) {`
	`158`	`+ if (request.getAttribute(PageConfig.historyJspAttrName) != null) {`
`159`	`159`	`%>`
`160`	`160`	`<%@`
`161`	`161`
`@@ -170,7 +170,7 @@ include file="/minisearch.jspf"`
`170`	`170`	`String context = request.getContextPath();`
`171`	`171`	`String path = cfg.getPath();`
`172`	`172`	`History hist;`
`173`		`- if ((hist = (History) request.getAttribute("history.jsp-hist")) != null) {`
	`173`	`+ if ((hist = (History) request.getAttribute(PageConfig.historyJspAttrName)) != null) {`
`174`	`174`	`RuntimeEnvironment env = cfg.getEnv();`
`175`	`175`	`String uriEncodedName = cfg.getUriEncodedPath();`
`176`	`176`	`Project project = cfg.getProject();`