svn commit: r1080848 - in /commons/proper/net/trunk/src/main/java/examples/nntp: ExtendedNNTPOps.java MessageThreading.java NNTPUtils.java

[sebb]

Author: sebb
Date: Sat Mar 12 02:10:55 2011
New Revision: 1080848

URL: http://svn.apache.org/viewvc?rev=1080848&view=rev
Log:
Tidyup after recent changes to NNTP code

Modified:
    commons/proper/net/trunk/src/main/java/examples/nntp/ExtendedNNTPOps.java
    commons/proper/net/trunk/src/main/java/examples/nntp/MessageThreading.java
    commons/proper/net/trunk/src/main/java/examples/nntp/NNTPUtils.java

Modified: 
commons/proper/net/trunk/src/main/java/examples/nntp/ExtendedNNTPOps.java
URL: 
http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/examples/nntp/ExtendedNNTPOps.java?rev=1080848&r1=1080847&r2=1080848&view=diff
==============================================================================
--- commons/proper/net/trunk/src/main/java/examples/nntp/ExtendedNNTPOps.java 
(original)
+++ commons/proper/net/trunk/src/main/java/examples/nntp/ExtendedNNTPOps.java 
Sat Mar 12 02:10:55 2011
@@ -63,15 +63,14 @@ public class ExtendedNNTPOps {
             long  highArticleNumber = lowArticleNumber + 100;
             Iterable<Article> articles = 
client.iterateArticleInfo(lowArticleNumber, highArticleNumber);
 
-            if (articles != null) {
-                for (Article article : articles) {
-                    if (article.isDummy()) { // Subject will contain raw 
response
-                        System.out.println("Could not parse: 
"+article.getSubject());
-                    } else {
-                        System.out.println(article.getSubject());
-                    }
+            for (Article article : articles) {
+                if (article.isDummy()) { // Subject will contain raw response
+                    System.out.println("Could not parse: 
"+article.getSubject());
+                } else {
+                    System.out.println(article.getSubject());
                 }
             }
+
             // LIST ACTIVE
             NewsgroupInfo[] fanGroups = client.listNewsgroups("alt.fan.*");
             for (int i = 0; i < fanGroups.length; ++i) {

Modified: 
commons/proper/net/trunk/src/main/java/examples/nntp/MessageThreading.java
URL: 
http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/examples/nntp/MessageThreading.java?rev=1080848&r1=1080847&r2=1080848&view=diff
==============================================================================
--- commons/proper/net/trunk/src/main/java/examples/nntp/MessageThreading.java 
(original)
+++ commons/proper/net/trunk/src/main/java/examples/nntp/MessageThreading.java 
Sat Mar 12 02:10:55 2011
@@ -21,8 +21,6 @@ package examples.nntp;
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.net.SocketException;
-import java.util.List;
-
 import org.apache.commons.net.PrintCommandListener;
 import org.apache.commons.net.nntp.Article;
 import org.apache.commons.net.nntp.NNTPClient;
@@ -73,7 +71,7 @@ public class MessageThreading {
         long highArticleNumber = lowArticleNumber + 5000;
         
         System.out.println("Retrieving articles between [" + lowArticleNumber 
+ "] and [" + highArticleNumber + "]");
-        List<Article> articles = NNTPUtils.getArticleInfo(client, 
lowArticleNumber, highArticleNumber);
+        Iterable<Article> articles = 
client.iterateArticleInfo(lowArticleNumber, highArticleNumber);
         
         System.out.println("Building message thread tree...");
         Threader threader = new Threader();

Modified: commons/proper/net/trunk/src/main/java/examples/nntp/NNTPUtils.java
URL: 
http://svn.apache.org/viewvc/commons/proper/net/trunk/src/main/java/examples/nntp/NNTPUtils.java?rev=1080848&r1=1080847&r2=1080848&view=diff
==============================================================================
--- commons/proper/net/trunk/src/main/java/examples/nntp/NNTPUtils.java 
(original)
+++ commons/proper/net/trunk/src/main/java/examples/nntp/NNTPUtils.java Sat Mar 
12 02:10:55 2011
@@ -43,12 +43,8 @@ public class NNTPUtils {
     throws IOException {
         List<Article> articles = new ArrayList<Article>();
         Iterable<Article> arts = client.iterateArticleInfo(lowArticleNumber, 
highArticleNumber);
-        if (arts != null) {
-            for(Article article : arts){
-                if (article != null ) {
-                    articles.add(article);                
-                }
-            }
+        for(Article article : arts){
+            articles.add(article);                
         }
         return articles;
     }