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

added paging to ChangesetViewer

Browse Source
This commit is contained in:
Sebastian Sdorra
2011-04-03 14:24:52 +02:00
parent a8598ffdc7
commit 8b7774d284
6 changed files with 213 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
scm-webapp/src/main/java/sonia/scm/api/rest/resources/RepositoryResource.java
View File

@@ -40,7 +40,7 @@ import com.google.inject.Provider;
import com.google.inject.Singleton;
import sonia.scm.config.ScmConfiguration;
import sonia.scm.repository.Changeset;
import sonia.scm.repository.ChangesetPagingResult;
import sonia.scm.repository.ChangesetViewer;
import sonia.scm.repository.Permission;
import sonia.scm.repository.PermissionType;
@@ -50,14 +50,12 @@ import sonia.scm.repository.RepositoryException;
import sonia.scm.repository.RepositoryHandler;
import sonia.scm.repository.RepositoryManager;
import sonia.scm.util.HttpUtil;
import sonia.scm.util.Util;
import sonia.scm.web.security.WebSecurityContext;
//~--- JDK imports ------------------------------------------------------------
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import javax.servlet.http.HttpServletRequest;
@@ -116,8 +114,8 @@ public class RepositoryResource
*
*
* @param id
* @param startId
* @param max
* @param start
* @param limit
*
* @return
*
@@ -126,9 +124,9 @@ public class RepositoryResource
@GET
@Path("{id}/changesets")
@Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON })
public Response getChangesets(@PathParam("id") String id,
@QueryParam("changeset") String startId,
@DefaultValue("25") @QueryParam("max") int max)
public Response getChangesets(@PathParam("id") String id,
@DefaultValue("0") @QueryParam("start") int start,
@DefaultValue("25") @QueryParam("limit") int limit)
throws RepositoryException
{
Response response = null;
@@ -141,19 +139,10 @@ public class RepositoryResource
if (changesetViewer != null)
{
List<Changeset> changesets = null;
ChangesetPagingResult changesets = changesetViewer.getChangesets(start,
limit);
if (Util.isNotEmpty(startId))
{
changesets = changesetViewer.getChangesets(startId, max);
}
else
{
changesets = changesetViewer.getLastChangesets(max);
}
response = Response.ok(new GenericEntity<List<Changeset>>(changesets) {}
).build();
response = Response.ok(changesets).build();
}
else
{