1.1 --- a/src/org/sonews/daemon/command/ListCommand.java	Sun Aug 29 18:17:37 2010 +0200
     1.2 +++ b/src/org/sonews/daemon/command/ListCommand.java	Sun Sep 11 15:05:04 2011 +0200
     1.3 @@ -24,7 +24,7 @@
     1.4  import java.util.regex.Pattern;
     1.5  import java.util.regex.PatternSyntaxException;
     1.6  import org.sonews.daemon.NNTPConnection;
     1.7 -import org.sonews.storage.Channel;
     1.8 +import org.sonews.storage.Group;
     1.9  import org.sonews.storage.StorageBackendException;
    1.10  import org.sonews.util.Log;
    1.11  
    1.12 @@ -74,8 +74,8 @@
    1.13  				conn.println(".");
    1.14  			} else if (command[1].equalsIgnoreCase("NEWSGROUPS")) {
    1.15  				conn.println("215 information follows");
    1.16 -				final List<Channel> list = Channel.getAll();
    1.17 -				for (Channel g : list) {
    1.18 +				final List<Group> list = Group.getAll();
    1.19 +				for (Group g : list) {
    1.20  					conn.println(g.getName() + "\t" + "-");
    1.21  				}
    1.22  				conn.println(".");
    1.23 @@ -103,10 +103,10 @@
    1.24  	private void printGroupInfo(NNTPConnection conn, String pattern)
    1.25  		throws IOException, StorageBackendException
    1.26  	{
    1.27 -		final List<Channel> groups = Channel.getAll();
    1.28 +		final List<Group> groups = Group.getAll();
    1.29  		if (groups != null) {
    1.30  			conn.println("215 list of newsgroups follows");
    1.31 -			for (Channel g : groups) {
    1.32 +			for (Group g : groups) {
    1.33  				try {
    1.34  					Matcher matcher = pattern == null
    1.35  						? null : Pattern.compile(pattern).matcher(g.getName());