Archives/Athou_commafeed
1
0
Fork 1
mirror of https://github.com/Athou/commafeed.git synced 2026-03-21 21:37:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

remove some whitespace, put tuples assignment back on one line

Browse Source
This commit is contained in:
tyler
2016-09-05 05:09:57 -04:00
parent 039ff4ee41
commit 61039dcd7e
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/com/commafeed/backend/dao/FeedEntryStatusDAO.java
View File

@@ -234,22 +234,21 @@ public class FeedEntryStatusDAO extends GenericDAO<FeedEntryStatus> {
} else { } else {
comparator = STATUS_COMPARATOR_ASC; comparator = STATUS_COMPARATOR_ASC;
} }
FixedSizeSortedSet<FeedEntryStatus> set = new FixedSizeSortedSet<FeedEntryStatus>(capacity, comparator); FixedSizeSortedSet<FeedEntryStatus> set = new FixedSizeSortedSet<FeedEntryStatus>(capacity, comparator);
for (FeedSubscription sub : subs) { for (FeedSubscription sub : subs) {
FeedEntryStatus last = (order != null && set.isFull()) ? set.last() : null; FeedEntryStatus last = (order != null && set.isFull()) ? set.last() : null;
HibernateQuery<FeedEntry> query = buildQuery(user, sub, unreadOnly, keywords, newerThan, -1, capacity, order, last, tag); HibernateQuery<FeedEntry> query = buildQuery(user, sub, unreadOnly, keywords, newerThan, -1, capacity, order, last, tag);
List<Tuple> tuples; List<Tuple> tuples = query.select(entry.id, entry.updated, status.id, entry.content.title).fetch();
tuples = query.select(entry.id, entry.updated, status.id, entry.content.title).fetch();
for (Tuple tuple : tuples) { for (Tuple tuple : tuples) {
Long id = tuple.get(entry.id); Long id = tuple.get(entry.id);
Date updated = tuple.get(entry.updated); Date updated = tuple.get(entry.updated);
Long statusId = tuple.get(status.id); Long statusId = tuple.get(status.id);
FeedEntryContent content = new FeedEntryContent(); FeedEntryContent content = new FeedEntryContent();
content.setTitle(tuple.get(entry.content.title)); content.setTitle(tuple.get(entry.content.title));
FeedEntry entry = new FeedEntry(); FeedEntry entry = new FeedEntry();
entry.setId(id); entry.setId(id);
entry.setUpdated(updated); entry.setUpdated(updated);
@@ -260,7 +259,7 @@ public class FeedEntryStatusDAO extends GenericDAO<FeedEntryStatus> {
status.setEntryUpdated(updated); status.setEntryUpdated(updated);
status.setEntry(entry); status.setEntry(entry);
status.setSubscription(sub); status.setSubscription(sub);
set.add(status); set.add(status);
} }
} }