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

Merge pull request #252 from Athou/dragndrop

Browse Source 
Dragndrop
This commit is contained in:
Athou
2013-06-03 22:17:18 -07:00
parent 0de19a2d18 6f35491ec6
commit 41344e08f7
16 changed files with 361 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/com/commafeed/backend/model/FeedCategory.java
View File

@@ -35,6 +35,8 @@ public class FeedCategory extends AbstractModel {
private boolean collapsed;
private Integer position;
public String getName() {
return name;
}
@@ -86,4 +88,12 @@ public class FeedCategory extends AbstractModel {
this.collapsed = collapsed;
}
public Integer getPosition() {
return position;
}
public void setPosition(Integer position) {
this.position = position;
}
}

10
src/main/java/com/commafeed/backend/model/FeedSubscription.java
View File

@@ -33,6 +33,8 @@ public class FeedSubscription extends AbstractModel {
@OneToMany(mappedBy = "subscription", cascade = CascadeType.REMOVE)
private Set<FeedEntryStatus> statuses;
private Integer position;
public Feed getFeed() {
return feed;
}
@@ -73,4 +75,12 @@ public class FeedSubscription extends AbstractModel {
this.statuses = statuses;
}
public Integer getPosition() {
return position;
}
public void setPosition(Integer position) {
this.position = position;
}
}