1.1 --- a/src/org/sonews/daemon/command/XDaemonCommand.java	Sun Sep 11 14:19:19 2011 +0200
     1.2 +++ b/src/org/sonews/daemon/command/XDaemonCommand.java	Tue Sep 13 23:34:16 2011 +0200
     1.3 @@ -27,7 +27,6 @@
     1.4  import org.sonews.storage.StorageManager;
     1.5  import org.sonews.feed.FeedManager;
     1.6  import org.sonews.feed.Subscription;
     1.7 -import org.sonews.storage.Channel;
     1.8  import org.sonews.storage.Group;
     1.9  import org.sonews.util.Stats;
    1.10  
    1.11 @@ -132,19 +131,19 @@
    1.12  				String flagName = commands[4];
    1.13  				if(commands[3].equalsIgnoreCase("SET")) {
    1.14  					if(flagName.equals("MAILINGLIST")) {
    1.15 -						group.setFlag(Channel.MAILINGLIST);
    1.16 +						group.setFlag(Group.MAILINGLIST);
    1.17  					} else if(flagName.equals("DELETED")) {
    1.18 -						group.setFlag(Channel.DELETED);
    1.19 +						group.setFlag(Group.DELETED);
    1.20  					} else if(flagName.equals("READONLY")) {
    1.21 -						group.setFlag(Channel.READONLY);
    1.22 +						group.setFlag(Group.READONLY);
    1.23  					}
    1.24  				} else if(commands[3].equalsIgnoreCase("UNSET")) {
    1.25  					if(flagName.equals("MAILINGLIST")) {
    1.26 -						group.unsetFlag(Channel.MAILINGLIST);
    1.27 +						group.unsetFlag(Group.MAILINGLIST);
    1.28  					} else if(flagName.equals("DELETED")) {
    1.29 -						group.unsetFlag(Channel.DELETED);
    1.30 +						group.unsetFlag(Group.DELETED);
    1.31  					} else if(flagName.equals("READONLY")) {
    1.32 -						group.unsetFlag(Channel.READONLY);
    1.33 +						group.unsetFlag(Group.READONLY);
    1.34  					}
    1.35  				} else {
    1.36  					conn.println("500 invalid command usage");
    1.37 @@ -168,7 +167,7 @@
    1.38  			} else if (commands.length >= 3 && commands[1].equalsIgnoreCase("LOG")) {
    1.39  				Group group = null;
    1.40  				if (commands.length > 3) {
    1.41 -					group = (Group) Channel.getByName(commands[3]);
    1.42 +					group = StorageManager.current().getGroup(commands[3]);
    1.43  				}
    1.44  
    1.45  				if (commands[2].equalsIgnoreCase("CONNECTED_CLIENTS")) {