From 33d8d8b21c5586f1328c8c3e7f6049037ae5fd0d Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Fri, 04 Nov 2011 17:22:06 -0400
Subject: [PATCH] Moved SearchType enum to Constants
---
src/com/gitblit/client/SyndicatedEntryTableModel.java | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/src/com/gitblit/client/SyndicatedEntryTableModel.java b/src/com/gitblit/client/SyndicatedEntryTableModel.java
index 4f25c9b..8fcdb47 100644
--- a/src/com/gitblit/client/SyndicatedEntryTableModel.java
+++ b/src/com/gitblit/client/SyndicatedEntryTableModel.java
@@ -25,7 +25,7 @@
import com.gitblit.models.SyndicatedEntryModel;
/**
- * Table model of List<SyndicatedEntryModel>
+ * Table model for a list of retrieved feed entries.
*
* @author James Moger
*
@@ -37,7 +37,7 @@
List<SyndicatedEntryModel> entries;
enum Columns {
- Date, Repository, Author, Message;
+ Date, Repository, Branch, Author, Message;
@Override
public String toString() {
@@ -46,11 +46,7 @@
}
public SyndicatedEntryTableModel() {
- this(new ArrayList<SyndicatedEntryModel>());
- }
-
- public SyndicatedEntryTableModel(List<SyndicatedEntryModel> entries) {
- setEntries(entries);
+ this.entries = new ArrayList<SyndicatedEntryModel>();
}
public void setEntries(List<SyndicatedEntryModel> entries) {
@@ -76,6 +72,8 @@
return Translation.get("gb.date");
case Repository:
return Translation.get("gb.repository");
+ case Branch:
+ return Translation.get("gb.branch");
case Author:
return Translation.get("gb.author");
case Message:
@@ -94,6 +92,8 @@
public Class<?> getColumnClass(int columnIndex) {
if (Columns.Date.ordinal() == columnIndex) {
return Date.class;
+ } else if (Columns.Message.ordinal() == columnIndex) {
+ return SyndicatedEntryModel.class;
}
return String.class;
}
@@ -107,10 +107,12 @@
return entry.published;
case Repository:
return entry.repository;
+ case Branch:
+ return entry.branch;
case Author:
return entry.author;
case Message:
- return entry.title;
+ return entry;
}
return null;
}
--
Gitblit v1.9.1