Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-05 04:55:50 +01:00
Code Issues Packages Projects Releases Activity

Rename 'proceedFrom' to 'offset'

Browse Source
This commit is contained in:
René Pfeuffer
2020-02-19 09:23:23 +01:00
parent 6b3f36e7ea
commit fe1591171d
14 changed files with 51 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
scm-plugins/scm-git-plugin/src/main/java/sonia/scm/repository/spi/GitBrowseCommand.java
View File

@@ -254,7 +254,7 @@ public class GitBrowseCommand extends AbstractGitCommand
private FileObject findChildren(FileObject parent, org.eclipse.jgit.lib.Repository repo, BrowseCommandRequest request, ObjectId revId, TreeWalk treeWalk) throws IOException {
List<FileObject> files = Lists.newArrayList();
while (treeWalk.next() && ++resultCount <= request.getLimit() + request.getProceedFrom())
while (treeWalk.next() && ++resultCount <= request.getLimit() + request.getOffset())
{
FileObject fileObject = createFileObject(repo, request, revId, treeWalk);
@@ -263,7 +263,7 @@ public class GitBrowseCommand extends AbstractGitCommand
return fileObject;
}
if (resultCount > request.getProceedFrom()) {
if (resultCount > request.getOffset()) {
files.add(fileObject);
}
@@ -278,7 +278,7 @@ public class GitBrowseCommand extends AbstractGitCommand
parent.setChildren(files);
if (resultCount > request.getLimit() + request.getProceedFrom()) {
if (resultCount > request.getLimit() + request.getOffset()) {
parent.setTruncated(true);
}

4
scm-plugins/scm-git-plugin/src/test/java/sonia/scm/repository/spi/GitBrowseCommandTest.java
View File

@@ -252,10 +252,10 @@ public class GitBrowseCommandTest extends AbstractGitCommandTestBase {
}
@Test
public void testBrowseProceedFrom() throws IOException {
public void testBrowseOffset() throws IOException {
BrowseCommandRequest request = new BrowseCommandRequest();
request.setLimit(2);
request.setProceedFrom(2);
request.setOffset(2);
FileObject root = createCommand()
.getBrowserResult(request).getFile();
assertNotNull(root);