From 38688b1f17bb2d43a144e92b086768e3e2523d2a Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Tue, 01 Nov 2011 17:21:09 -0400
Subject: [PATCH] Refactored monolithic GitblitPanel into pieces. Revised feed generation.
---
src/com/gitblit/utils/SyndicationUtils.java | 24 +++++++++++-------------
1 files changed, 11 insertions(+), 13 deletions(-)
diff --git a/src/com/gitblit/utils/SyndicationUtils.java b/src/com/gitblit/utils/SyndicationUtils.java
index 2237774..6ea5f0e 100644
--- a/src/com/gitblit/utils/SyndicationUtils.java
+++ b/src/com/gitblit/utils/SyndicationUtils.java
@@ -24,8 +24,6 @@
import java.util.ArrayList;
import java.util.List;
-import org.eclipse.jgit.revwalk.RevCommit;
-
import com.gitblit.Constants;
import com.gitblit.GitBlitException;
import com.gitblit.models.SyndicatedEntryModel;
@@ -50,19 +48,20 @@
public class SyndicationUtils {
/**
- * Outputs an RSS feed of the list of commits to the outputstream.
+ * Outputs an RSS feed of the list of entries to the outputstream.
*
* @param hostUrl
* @param title
* @param description
* @param repository
- * @param commits
+ * @param entryModels
* @param os
* @throws IOException
* @throws FeedException
*/
public static void toRSS(String hostUrl, String title, String description, String repository,
- List<RevCommit> commits, OutputStream os) throws IOException, FeedException {
+ List<SyndicatedEntryModel> entryModels, OutputStream os) throws IOException,
+ FeedException {
SyndFeed feed = new SyndFeedImpl();
feed.setFeedType("rss_2.0");
@@ -78,17 +77,16 @@
feed.setImage(image);
List<SyndEntry> entries = new ArrayList<SyndEntry>();
- for (RevCommit commit : commits) {
+ for (SyndicatedEntryModel entryModel : entryModels) {
SyndEntry entry = new SyndEntryImpl();
- entry.setTitle(commit.getShortMessage());
- entry.setAuthor(commit.getAuthorIdent().getName());
- entry.setLink(MessageFormat.format("{0}/commit/{1}/{2}", hostUrl,
- StringUtils.encodeURL(repository), commit.getName()));
- entry.setPublishedDate(commit.getCommitterIdent().getWhen());
+ entry.setTitle(entryModel.title);
+ entry.setAuthor(entryModel.author);
+ entry.setLink(entryModel.link);
+ entry.setPublishedDate(entryModel.published);
SyndContent content = new SyndContentImpl();
- content.setType("text/plain");
- content.setValue(commit.getFullMessage());
+ content.setType(entryModel.contentType);
+ content.setValue(entryModel.content);
entry.setDescription(content);
entries.add(entry);
}
--
Gitblit v1.9.1