From ee458f82b8502e238a96e6582e910cb366059ead Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Mon, 07 Nov 2011 22:12:38 -0500
Subject: [PATCH] Log feature based on Search dialog. Renamed some classes.
---
src/com/gitblit/utils/SyndicationUtils.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/com/gitblit/utils/SyndicationUtils.java b/src/com/gitblit/utils/SyndicationUtils.java
index 6919cd2..6ba8d73 100644
--- a/src/com/gitblit/utils/SyndicationUtils.java
+++ b/src/com/gitblit/utils/SyndicationUtils.java
@@ -26,7 +26,7 @@
import com.gitblit.Constants;
import com.gitblit.GitBlitException;
-import com.gitblit.models.SyndicatedEntryModel;
+import com.gitblit.models.FeedEntryModel;
import com.sun.syndication.feed.synd.SyndCategory;
import com.sun.syndication.feed.synd.SyndCategoryImpl;
import com.sun.syndication.feed.synd.SyndContent;
@@ -63,7 +63,7 @@
* @throws FeedException
*/
public static void toRSS(String hostUrl, String feedLink, String title, String description,
- String repository, List<SyndicatedEntryModel> entryModels, OutputStream os)
+ String repository, List<FeedEntryModel> entryModels, OutputStream os)
throws IOException, FeedException {
SyndFeed feed = new SyndFeedImpl();
@@ -79,7 +79,7 @@
feed.setImage(image);
List<SyndEntry> entries = new ArrayList<SyndEntry>();
- for (SyndicatedEntryModel entryModel : entryModels) {
+ for (FeedEntryModel entryModel : entryModels) {
SyndEntry entry = new SyndEntryImpl();
entry.setTitle(entryModel.title);
entry.setAuthor(entryModel.author);
@@ -130,7 +130,7 @@
* @return a list of SyndicationModel entries
* @throws {@link IOException}
*/
- public static List<SyndicatedEntryModel> readFeed(String url, String repository, String branch,
+ public static List<FeedEntryModel> readFeed(String url, String repository, String branch,
int numberOfEntries, int page, String username, char[] password) throws IOException {
// build feed url
List<String> parameters = new ArrayList<String>();
@@ -167,7 +167,7 @@
* @return a list of SyndicationModel entries
* @throws {@link IOException}
*/
- public static List<SyndicatedEntryModel> readSearchFeed(String url, String repository,
+ public static List<FeedEntryModel> readSearchFeed(String url, String repository,
String branch, String fragment, Constants.SearchType searchType, int numberOfEntries,
int page, String username, char[] password) throws IOException {
// determine parameters
@@ -202,7 +202,7 @@
* @return a list of SyndicationModel entries
* @throws {@link IOException}
*/
- private static List<SyndicatedEntryModel> readFeed(String url, List<String> parameters,
+ private static List<FeedEntryModel> readFeed(String url, List<String> parameters,
String repository, String branch, String username, char[] password) throws IOException {
// build url
StringBuilder sb = new StringBuilder();
@@ -230,10 +230,10 @@
throw new GitBlitException(f);
}
is.close();
- List<SyndicatedEntryModel> entries = new ArrayList<SyndicatedEntryModel>();
+ List<FeedEntryModel> entries = new ArrayList<FeedEntryModel>();
for (Object o : feed.getEntries()) {
SyndEntryImpl entry = (SyndEntryImpl) o;
- SyndicatedEntryModel model = new SyndicatedEntryModel();
+ FeedEntryModel model = new FeedEntryModel();
model.repository = repository;
model.branch = branch;
model.title = entry.getTitle();
--
Gitblit v1.9.1