Skip to content

Commit

Permalink
Review comments
Browse files Browse the repository at this point in the history
  • Loading branch information
ginoaugustine committed Feb 25, 2024
1 parent 8f5bf9d commit 16ccfcf
Showing 1 changed file with 10 additions and 11 deletions.
21 changes: 10 additions & 11 deletions opengrok-indexer/src/main/java/org/opengrok/indexer/web/Util.java
Original file line number Diff line number Diff line change
Expand Up @@ -1382,9 +1382,8 @@ public static String createSlider(int offset, int limit, int size) {
* @return string containing slider html
*/
public static String createSlider(int offset, int limit, long size, HttpServletRequest request) {
String slider = "";
if (limit < size) {
final StringBuilder buf = new StringBuilder(4096);
final StringBuilder slider = new StringBuilder(4096);
int lastPage = (int) Math.ceil((double) size / limit);
// startingResult is the number of a first result on the current page
int startingResult = offset - limit * (offset / limit % 10 + 1);
Expand All @@ -1396,29 +1395,29 @@ public static String createSlider(int offset, int limit, long size, HttpServletR
.map(query -> query.replaceFirst(RE_Q_E_A_A_START_EQ_VAL, ""))
.map(query -> query.replaceFirst(RE_A_ANCHOR_Q_E_A_A, ""))
.orElse("");
IntConsumer generatePageLink = pageNumber -> {
IntConsumer addToSliderPageWithPageNumber = pageNumber -> {
var isFirstPage = pageNumber == myFirstPage;
var isLastPage = pageNumber == myLastPage;
buf.append(
slider.append(
generatePageLink(pageNumber, offset, limit, size, isFirstPage, isLastPage, queryString)
);
};


// slider composition
if (myFirstPage != 1) {
generatePageLink.accept(1);
buf.append("<span>...</span>");
addToSliderPageWithPageNumber.accept(1);
slider.append("<span>...</span>");
}
IntStream.rangeClosed(myFirstPage, myLastPage)
.forEach(generatePageLink);
.forEach(addToSliderPageWithPageNumber);
if (myLastPage != lastPage) {
buf.append("<span>...</span>");
generatePageLink.accept(lastPage);
slider.append("<span>...</span>");
addToSliderPageWithPageNumber.accept(lastPage);
}
return buf.toString();
return slider.toString();
}
return slider;
return "";
}

private static String generatePageLink(int page, int offset, int limit, long size,
Expand Down

0 comments on commit 16ccfcf

Please sign in to comment.