1.1 --- a/src/org/sonews/storage/impl/JDBCDatabase.java	Sat Sep 10 18:18:05 2011 +0200
     1.2 +++ b/src/org/sonews/storage/impl/JDBCDatabase.java	Sun Sep 11 15:05:04 2011 +0200
     1.3 @@ -38,7 +38,6 @@
     1.4  import org.sonews.feed.Subscription;
     1.5  import org.sonews.storage.Article;
     1.6  import org.sonews.storage.ArticleHead;
     1.7 -import org.sonews.storage.Channel;
     1.8  import org.sonews.storage.Group;
     1.9  import org.sonews.storage.Storage;
    1.10  import org.sonews.storage.StorageBackendException;
    1.11 @@ -106,7 +105,7 @@
    1.12  	protected void prepareCountGroupsStatement() throws SQLException {
    1.13  		this.pstmtCountGroups = conn.prepareStatement(
    1.14  				"SELECT Count(group_id) FROM groups WHERE "
    1.15 -				+ "flags & " + Channel.DELETED + " = 0");
    1.16 +				+ "flags & " + Group.DELETED + " = 0");
    1.17  	}
    1.18  
    1.19  	protected void prepareGetPostingsCountStatement() throws SQLException {
    1.20 @@ -610,7 +609,7 @@
    1.21  	 * @throws StorageBackendException
    1.22  	 */
    1.23  	@Override
    1.24 -	public List<Pair<Long, String>> getArticleHeaders(Channel group, long start,
    1.25 +	public List<Pair<Long, String>> getArticleHeaders(Group group, long start,
    1.26  		long end, String headerKey, String patStr)
    1.27  		throws StorageBackendException, PatternSyntaxException
    1.28  	{
    1.29 @@ -824,7 +823,7 @@
    1.30  	}
    1.31  
    1.32  	@Override
    1.33 -	public int getEventsCount(int type, long start, long end, Channel channel)
    1.34 +	public int getEventsCount(int type, long start, long end, Group channel)
    1.35  		throws StorageBackendException
    1.36  	{
    1.37  		ResultSet rs = null;
    1.38 @@ -868,11 +867,11 @@
    1.39  	 * @throws StorageBackendException
    1.40  	 */
    1.41  	@Override
    1.42 -	public List<Channel> getGroups()
    1.43 +	public List<Group> getGroups()
    1.44  		throws StorageBackendException
    1.45  	{
    1.46  		ResultSet rs;
    1.47 -		List<Channel> buffer = new ArrayList<Channel>();
    1.48 +		List<Group> buffer = new ArrayList<Group>();
    1.49  		Statement stmt = null;
    1.50  
    1.51  		try {