[Jnode-svn-commits] SF.net SVN: jnode: [2953] trunk/net/src/net/org/jnode/net

[<hag...@us...>]

Revision: 2953
          http://jnode.svn.sourceforge.net/jnode/?rev=2953&view=rev
Author:   hagar-wize
Date:     2006-12-22 01:56:52 -0800 (Fri, 22 Dec 2006)

Log Message:
-----------
Moved the printing of the dns servers to the command. Also using the out PrintStream to send output instead of System.out.

Modified Paths:
--------------
    trunk/net/src/net/org/jnode/net/command/ResolverCommand.java
    trunk/net/src/net/org/jnode/net/ipv4/util/ResolverImpl.java

Modified: trunk/net/src/net/org/jnode/net/command/ResolverCommand.java
===================================================================
--- trunk/net/src/net/org/jnode/net/command/ResolverCommand.java	2006-12-22 07:43:57 UTC (rev 2952)
+++ trunk/net/src/net/org/jnode/net/command/ResolverCommand.java	2006-12-22 09:56:52 UTC (rev 2953)
@@ -23,6 +23,7 @@
 
 import java.io.InputStream;
 import java.io.PrintStream;
+import java.util.Collection;
 
 import org.jnode.net.help.argument.HostArgument;
 import org.jnode.net.ipv4.IPv4Address;
@@ -75,9 +76,16 @@
 	
 	    if (cmdLine.size() == 0)
 	    {
-		      System.out.println("DNS servers");
-	      ResolverImpl.printDnsServers();
+	      Collection<String> resolvers = ResolverImpl.getDnsServers();
+	      if( resolvers == null )
+	    	  out.println("No DNS servers found.");
+	      else {
+		      out.println("DNS servers");
+	        for (String dnsServer : resolvers) {
+	            out.println(dnsServer);
 	        }
+	      }
+	    }
 	    else
 	    {
 	      String func = ARG_FUNCTION.getValue(cmdLine);
@@ -93,7 +101,6 @@
 	      }
 	    }
 	
-	    System.out.println();
-		
+	    out.println();
 	}
 }

Modified: trunk/net/src/net/org/jnode/net/ipv4/util/ResolverImpl.java
===================================================================
--- trunk/net/src/net/org/jnode/net/ipv4/util/ResolverImpl.java	2006-12-22 07:43:57 UTC (rev 2952)
+++ trunk/net/src/net/org/jnode/net/ipv4/util/ResolverImpl.java	2006-12-22 09:56:52 UTC (rev 2953)
@@ -28,6 +28,7 @@
 import java.security.PrivilegedExceptionAction;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Collection;
 
 import org.jnode.driver.net.NetworkException;
 import org.jnode.net.ProtocolAddress;
@@ -88,17 +89,10 @@
     }
 
     /**
-     * List all the dns servers
+     * Get list all the dns servers
      */
-
-    public static void printDnsServers() {
-        if (resolvers == null) {
-            return;
-        }
-
-        for (String dnsServer : resolvers.keySet()) {
-            System.out.println(dnsServer);
-        }
+    public static Collection getDnsServers() {
+        return resolvers.keySet(); 
     }
 
     /**


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.