rename variables/methods for better readability

Author: vladak

opengrok-web/src/main/java/org/opengrok/web/PageConfig.java

@@ -556,24 +556,24 @@ public int getIntParam(String name, int defaultValue) {
     }
 
     /**
-     * Get the <b>start</b> index for a search result to return by looking up
+     * Get the <b>start</b> index for a search result or history listing to return by looking up
      * the {@code start} request parameter.
      *
      * @return 0 if the corresponding start parameter is not set or not a
      * number, the number found otherwise.
      */
-    public int getSearchStart() {
+    public int getStartIndex() {
         return getIntParam(QueryParameters.START_PARAM, 0);
     }
 
     /**
-     * Get the number of search results to max. return by looking up the
+     * Get the number of search results or history entries to display by looking up the
      * {@code n} request parameter.
      *
-     * @return the default number of hits if the corresponding start parameter
+     * @return the default number of items if the corresponding start parameter
      * is not set or not a number, the number found otherwise.
      */
-    public int getSearchMaxItems() {
+    public int getMaxItems() {
         return getIntParam(QueryParameters.COUNT_PARAM, getEnv().getHitsPerPage());
     }
 
@@ -1482,8 +1482,8 @@ public SearchHelper prepareSearch() {
      */
     public SearchHelper prepareInternalSearch(SortOrder sortOrder) {
         String xrValue = req.getParameter(QueryParameters.NO_REDIRECT_PARAM);
-        return new SearchHelper(getSearchStart(), sortOrder, getDataRoot(), new File(getSourceRootPath()),
-                getSearchMaxItems(), getEftarReader(), getQueryBuilder(), getPrefix() == Prefix.SEARCH_R,
+        return new SearchHelper(getStartIndex(), sortOrder, getDataRoot(), new File(getSourceRootPath()),
+                getMaxItems(), getEftarReader(), getQueryBuilder(), getPrefix() == Prefix.SEARCH_R,
                 req.getContextPath(), getPrefix() == Prefix.SEARCH_R || getPrefix() == Prefix.SEARCH_P,
                 xrValue != null && !xrValue.isEmpty());
     }

opengrok-web/src/main/webapp/history.jsp

@@ -138,8 +138,8 @@ include file="/httpheader.jspf"
     History hist;
     if ((hist = (History) request.getAttribute("history.jsp-hist")) != null) {
 
-        int start = cfg.getSearchStart();
-        int max = cfg.getSearchMaxItems();
+        int start = cfg.getStartIndex();
+        int max = cfg.getMaxItems();
         long totalHits = hist.getHistoryEntries().size();
         long thispage = Math.min(totalHits - start, max);
 
@@ -198,8 +198,8 @@ include file="/minisearch.jspf"
                 revision2 + 1 : cfg.getIntParam(QueryParameters.REVISION_1_PARAM, -1);
         revision2 = revision2 >= hist.getHistoryEntries().size() ? hist.getHistoryEntries().size() - 1 : revision2;
 
-        int start = cfg.getSearchStart();
-        int max = cfg.getSearchMaxItems();
+        int startIndex = cfg.getStartIndex();
+        int maxItems = cfg.getMaxItems();
 %>
 <script type="text/javascript">/* <![CDATA[ */
 document.domReady.push(function() {domReadyHistory();});
@@ -255,7 +255,7 @@ document.domReady.push(function() {domReadyHistory();});
     <tbody>
             <%
             int count=0;
-            for (HistoryEntry entry : hist.getHistoryEntries(max, start)) {
+            for (HistoryEntry entry : hist.getHistoryEntries(maxItems, startIndex)) {
                 String rev = entry.getRevision();
                 if (rev == null || rev.length() == 0) {
                     rev = "";
@@ -296,17 +296,17 @@ document.domReady.push(function() {domReadyHistory();});
             <td><%
                 %><input type="radio"
                         aria-label="From"
-                        data-revision-1="<%= (start + count) %>"
+                        data-revision-1="<%= (startIndex + count) %>"
                         data-revision-2="<%= revision2 %>"
                         data-diff-revision="<%= QueryParameters.REVISION_1_PARAM %>"
-                        data-revision-path="<%= path + '@' + hist.getHistoryEntries().get(start + count).getRevision()%>"
+                        data-revision-path="<%= path + '@' + hist.getHistoryEntries().get(startIndex + count).getRevision()%>"
                 <%
-                if (count + start > revision1 || (count + start > revision2 && count + start <= revision1 - 1)) {
+                if (count + startIndex > revision1 || (count + startIndex > revision2 && count + startIndex <= revision1 - 1)) {
                     // revision1 enabled
-                } else if (count + start == revision1 ) {
+                } else if (count + startIndex == revision1 ) {
                     // revision1 selected
                     %> checked="checked"<%
-                } else if( count + start <= revision2 ) {
+                } else if( count + startIndex <= revision2 ) {
                     // revision1 disabled
                     %> disabled="disabled" <%
                 }
@@ -315,16 +315,16 @@ document.domReady.push(function() {domReadyHistory();});
                 %><input type="radio"
                         aria-label="To"
                         data-revision-1="<%= revision1 %>"
-                        data-revision-2="<%= (start + count) %>"
+                        data-revision-2="<%= (startIndex + count) %>"
                         data-diff-revision="<%= QueryParameters.REVISION_2_PARAM %>"
-                        data-revision-path="<%= path + '@' + hist.getHistoryEntries().get(start + count).getRevision() %>"
+                        data-revision-path="<%= path + '@' + hist.getHistoryEntries().get(startIndex + count).getRevision() %>"
                 <%
-                if( count + start < revision2 || (count + start > revision2 && count + start <= revision1 - 1) ) {
+                if( count + startIndex < revision2 || (count + startIndex > revision2 && count + startIndex <= revision1 - 1) ) {
                     // revision2 enabled
-                } else if( count + start == revision2 ) {
+                } else if( count + startIndex == revision2 ) {
                     // revision2 selected
                     %> checked="checked" <%
-                } else if (count + start >= revision1 ) {
+                } else if (count + startIndex >= revision1 ) {
                     // revision2 disabled
                     %> disabled="disabled" <%
                 }