From ee458f82b8502e238a96e6582e910cb366059ead Mon Sep 17 00:00:00 2001 From: James Moger Date: Mon, 7 Nov 2011 22:12:38 -0500 Subject: Log feature based on Search dialog. Renamed some classes. --- src/com/gitblit/client/GitblitClient.java | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) (limited to 'src/com/gitblit/client/GitblitClient.java') diff --git a/src/com/gitblit/client/GitblitClient.java b/src/com/gitblit/client/GitblitClient.java index 588b6d80..c590dccc 100644 --- a/src/com/gitblit/client/GitblitClient.java +++ b/src/com/gitblit/client/GitblitClient.java @@ -36,7 +36,7 @@ import com.gitblit.models.FeedModel; import com.gitblit.models.RepositoryModel; import com.gitblit.models.ServerSettings; import com.gitblit.models.ServerStatus; -import com.gitblit.models.SyndicatedEntryModel; +import com.gitblit.models.FeedEntryModel; import com.gitblit.models.UserModel; import com.gitblit.utils.RpcUtils; import com.gitblit.utils.StringUtils; @@ -77,7 +77,7 @@ public class GitblitClient implements Serializable { private final List availableFeeds; - private final List syndicatedEntries; + private final List syndicatedEntries; private final Set subscribedRepositories; @@ -93,7 +93,7 @@ public class GitblitClient implements Serializable { this.allRepositories = new ArrayList(); this.federationRegistrations = new ArrayList(); this.availableFeeds = new ArrayList(); - this.syndicatedEntries = new ArrayList(); + this.syndicatedEntries = new ArrayList(); this.subscribedRepositories = new HashSet(); } @@ -247,13 +247,13 @@ public class GitblitClient implements Serializable { return availableFeeds; } - public List refreshSubscribedFeeds(int page) throws IOException { - Set allEntries = new HashSet(); + public List refreshSubscribedFeeds(int page) throws IOException { + Set allEntries = new HashSet(); if (reg.feeds.size() > 0) { for (FeedModel feed : reg.feeds) { feed.lastRefreshDate = feed.currentRefreshDate; feed.currentRefreshDate = new Date(); - List entries = SyndicationUtils.readFeed(url, + List entries = SyndicationUtils.readFeed(url, feed.repository, feed.branch, -1, page, account, password); allEntries.addAll(entries); } @@ -297,11 +297,17 @@ public class GitblitClient implements Serializable { return subscribedRepositories.contains(repository.name.toLowerCase()); } - public List getSyndicatedEntries() { + public List getSyndicatedEntries() { return syndicatedEntries; } - public List search(String repository, String branch, String fragment, + public List log(String repository, String branch, int numberOfEntries, + int page) throws IOException { + return SyndicationUtils.readFeed(url, repository, branch, numberOfEntries, page, account, + password); + } + + public List search(String repository, String branch, String fragment, Constants.SearchType type, int numberOfEntries, int page) throws IOException { return SyndicationUtils.readSearchFeed(url, repository, branch, fragment, type, numberOfEntries, page, account, password); -- cgit v1.2.3