1.1 --- a/src/org/sonews/daemon/NNTPConnection.java	Sun Sep 11 14:19:19 2011 +0200
     1.2 +++ b/src/org/sonews/daemon/NNTPConnection.java	Sun Sep 11 15:05:04 2011 +0200
     1.3 @@ -32,7 +32,7 @@
     1.4  import java.util.TimerTask;
     1.5  import org.sonews.daemon.command.Command;
     1.6  import org.sonews.storage.Article;
     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  import org.sonews.util.Stats;
    1.12 @@ -54,7 +54,7 @@
    1.13  	private Charset charset = Charset.forName("UTF-8");
    1.14  	private Command command = null;
    1.15  	private Article currentArticle = null;
    1.16 -	private Channel currentGroup = null;
    1.17 +	private Group currentGroup = null;
    1.18  	private volatile long lastActivity = System.currentTimeMillis();
    1.19  	private ChannelLineBuffers lineBuffers = new ChannelLineBuffers();
    1.20  	private int readLock = 0;
    1.21 @@ -196,7 +196,7 @@
    1.22  	/**
    1.23  	 * @return The currently selected communication channel (not SocketChannel)
    1.24  	 */
    1.25 -	public Channel getCurrentChannel()
    1.26 +	public Group getCurrentChannel()
    1.27  	{
    1.28  		return this.currentGroup;
    1.29  	}
    1.30 @@ -206,7 +206,7 @@
    1.31  		this.currentArticle = article;
    1.32  	}
    1.33  
    1.34 -	public void setCurrentGroup(final Channel group)
    1.35 +	public void setCurrentGroup(final Group group)
    1.36  	{
    1.37  		this.currentGroup = group;
    1.38  	}