cleaned imports and added function calls to Templator

src/zutil/net/POP3Client.java

@@ -22,6 +22,8 @@
 
 package zutil.net;
 
+import javax.net.SocketFactory;
+import javax.net.ssl.SSLSocketFactory;
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
@@ -29,9 +31,6 @@ import java.io.PrintStream;
 import java.net.Socket;
 import java.net.UnknownHostException;
 
-import javax.net.SocketFactory;
-import javax.net.ssl.SSLSocketFactory;
-
 /**
  * A simple class that connects and logs in to a POP3
  * server and then can read and delete messages.

src/zutil/net/ServerFind.java

@@ -22,14 +22,14 @@
 
 package zutil.net;
 
+import zutil.io.MultiPrintStream;
+
 import java.io.IOException;
 import java.net.DatagramPacket;
 import java.net.DatagramSocket;
 import java.net.InetAddress;
 import java.net.MulticastSocket;
 
-import zutil.io.MultiPrintStream;
-
 /**
  * This class broadcast its address in the LAN so that 
  * the ServerFindClient can get the server IP

src/zutil/net/http/HttpClient.java

@@ -22,6 +22,8 @@
 
 package zutil.net.http;
 
+import zutil.net.http.HttpPrintStream.HttpMessageType;
+
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
@@ -29,8 +31,6 @@ import java.net.Socket;
 import java.net.URL;
 import java.util.HashMap;
 
-import zutil.net.http.HttpPrintStream.HttpMessageType;
-
 /**
  * This class connects to a HTTP server and 
  * parses the result

src/zutil/net/http/HttpPrintStream.java

@@ -22,7 +22,9 @@
 
 package zutil.net.http;
 
-import java.io.*;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.PrintStream;
 import java.util.HashMap;
 
 /**

src/zutil/net/http/HttpServer.java

@@ -22,25 +22,21 @@
 
 package zutil.net.http;
 
+import zutil.StringUtil;
+import zutil.log.LogUtil;
+import zutil.net.threaded.ThreadedTCPNetworkServer;
+import zutil.net.threaded.ThreadedTCPNetworkServerThread;
+
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.net.Socket;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Timer;
-import java.util.TimerTask;
+import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import zutil.StringUtil;
-import zutil.log.LogUtil;
-import zutil.net.threaded.ThreadedTCPNetworkServer;
-import zutil.net.threaded.ThreadedTCPNetworkServerThread;
-
 
 /**
  * A simple web server that handles both cookies and

src/zutil/net/http/multipart/MultipartParser.java

@@ -22,17 +22,16 @@
 
 package zutil.net.http.multipart;
 
+import zutil.ProgressListener;
+import zutil.net.http.HttpHeaderParser;
+
+import javax.servlet.http.HttpServletRequest;
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.servlet.http.HttpServletRequest;
-
-import zutil.ProgressListener;
-import zutil.net.http.HttpHeaderParser;
-
 /**
  * Parses a multipart/form-data http request, 
  * saves files to temporary location.

src/zutil/net/nio/NioClient.java

@@ -22,6 +22,10 @@
 
 package zutil.net.nio;
 
+import zutil.net.nio.message.Message;
+import zutil.net.nio.message.type.ResponseRequestMessage;
+import zutil.net.nio.response.ResponseEvent;
+
 import java.io.IOException;
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
@@ -29,10 +33,6 @@ import java.nio.channels.Selector;
 import java.nio.channels.SocketChannel;
 import java.nio.channels.spi.SelectorProvider;
 
-import zutil.net.nio.message.Message;
-import zutil.net.nio.message.type.ResponseRequestMessage;
-import zutil.net.nio.response.ResponseEvent;
-
 
 public class NioClient extends NioNetwork{
 	private SocketChannel serverSocket;

src/zutil/net/nio/NioNetwork.java

@@ -22,22 +22,6 @@
 
 package zutil.net.nio;
 
-import java.io.IOException;
-import java.net.InetAddress;
-import java.net.InetSocketAddress;
-import java.nio.ByteBuffer;
-import java.nio.channels.SelectionKey;
-import java.nio.channels.Selector;
-import java.nio.channels.ServerSocketChannel;
-import java.nio.channels.SocketChannel;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.logging.Logger;
-
 import zutil.Encrypter;
 import zutil.converters.Converter;
 import zutil.io.DynamicByteArrayStream;
@@ -51,6 +35,17 @@ import zutil.net.nio.server.ClientData;
 import zutil.net.nio.worker.SystemWorker;
 import zutil.net.nio.worker.Worker;
 
+import java.io.IOException;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.nio.ByteBuffer;
+import java.nio.channels.SelectionKey;
+import java.nio.channels.Selector;
+import java.nio.channels.ServerSocketChannel;
+import java.nio.channels.SocketChannel;
+import java.util.*;
+import java.util.logging.Logger;
+
 
 public abstract class NioNetwork implements Runnable {
 	private static Logger logger = LogUtil.getLogger();

src/zutil/net/nio/service/NetworkService.java

@@ -22,11 +22,11 @@
 
 package zutil.net.nio.service;
 
-import java.nio.channels.SocketChannel;
-
 import zutil.net.nio.NioNetwork;
 import zutil.net.nio.message.Message;
 
+import java.nio.channels.SocketChannel;
+
 public abstract class NetworkService {
 	protected static NetworkService instance;
 	protected NioNetwork nio;

src/zutil/net/nio/service/chat/ChatService.java

@@ -22,17 +22,17 @@
 
 package zutil.net.nio.service.chat;
 
-import java.nio.channels.SocketChannel;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.logging.Logger;
-
 import zutil.log.LogUtil;
 import zutil.net.nio.NioNetwork;
 import zutil.net.nio.message.ChatMessage;
 import zutil.net.nio.message.Message;
 import zutil.net.nio.service.NetworkService;
 
+import java.nio.channels.SocketChannel;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.logging.Logger;
+
 /**
  * A simple chat service with users and rooms
  * 

src/zutil/net/nio/service/sync/SyncService.java

@@ -22,16 +22,16 @@
 
 package zutil.net.nio.service.sync;
 
-import java.nio.channels.SocketChannel;
-import java.util.HashMap;
-import java.util.logging.Logger;
-
 import zutil.log.LogUtil;
 import zutil.net.nio.NioNetwork;
 import zutil.net.nio.message.Message;
 import zutil.net.nio.message.SyncMessage;
 import zutil.net.nio.service.NetworkService;
 
+import java.nio.channels.SocketChannel;
+import java.util.HashMap;
+import java.util.logging.Logger;
+
 public class SyncService extends NetworkService{
 	private static Logger logger = LogUtil.getLogger();
 	// list of objects to sync	

src/zutil/net/nio/worker/EchoWorker.java

@@ -22,10 +22,10 @@
 
 package zutil.net.nio.worker;
 
-import java.io.IOException;
-
 import zutil.io.MultiPrintStream;
 
+import java.io.IOException;
+
 public class EchoWorker extends ThreadedEventWorker {
 
 	@Override

src/zutil/net/nio/worker/SystemWorker.java

@@ -22,10 +22,6 @@
 
 package zutil.net.nio.worker;
 
-import java.util.HashMap;
-import java.util.Map;
-import java.util.logging.Logger;
-
 import zutil.log.LogUtil;
 import zutil.net.nio.NioNetwork;
 import zutil.net.nio.message.ChatMessage;
@@ -38,6 +34,10 @@ import zutil.net.nio.service.NetworkService;
 import zutil.net.nio.service.chat.ChatService;
 import zutil.net.nio.service.sync.SyncService;
 
+import java.util.HashMap;
+import java.util.Map;
+import java.util.logging.Logger;
+
 
 public class SystemWorker extends ThreadedEventWorker {
 	private static Logger logger = LogUtil.getLogger();

src/zutil/net/nio/worker/Worker.java

@@ -22,12 +22,12 @@
 
 package zutil.net.nio.worker;
 
+import zutil.net.nio.NioNetwork;
+
 import java.nio.channels.SocketChannel;
 import java.util.LinkedList;
 import java.util.List;
 
-import zutil.net.nio.NioNetwork;
-
 
 public abstract class Worker implements Runnable {
 	private LinkedList<WorkerDataEvent> queue = new LinkedList<WorkerDataEvent>();

src/zutil/net/nio/worker/WorkerDataEvent.java

@@ -22,10 +22,10 @@
 
 package zutil.net.nio.worker;
 
-import java.nio.channels.SocketChannel;
-
 import zutil.net.nio.NioNetwork;
 
+import java.nio.channels.SocketChannel;
+
 
 public class WorkerDataEvent {
 	public NioNetwork network;

src/zutil/net/nio/worker/grid/GridClient.java

@@ -22,16 +22,16 @@
 
 package zutil.net.nio.worker.grid;
 
-import java.io.IOException;
-import java.util.LinkedList;
-import java.util.Queue;
-
 import zutil.io.MultiPrintStream;
 import zutil.net.nio.NioClient;
 import zutil.net.nio.message.GridMessage;
 import zutil.net.nio.worker.ThreadedEventWorker;
 import zutil.net.nio.worker.WorkerDataEvent;
 
+import java.io.IOException;
+import java.util.LinkedList;
+import java.util.Queue;
+
 /**
  * This class is the client part of the grid.
  * It connects to a grid server and requests new job.

src/zutil/net/nio/worker/grid/GridServerWorker.java

@@ -22,15 +22,15 @@
 
 package zutil.net.nio.worker.grid;
 
+import zutil.net.nio.message.GridMessage;
+import zutil.net.nio.worker.ThreadedEventWorker;
+import zutil.net.nio.worker.WorkerDataEvent;
+
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.Queue;
 
-import zutil.net.nio.message.GridMessage;
-import zutil.net.nio.worker.ThreadedEventWorker;
-import zutil.net.nio.worker.WorkerDataEvent;
-
 /**
  * Implements a simple network computing server
  * 

src/zutil/net/ssdp/SSDPClient.java

@@ -22,6 +22,13 @@
 
 package zutil.net.ssdp;
 
+import zutil.io.StringOutputStream;
+import zutil.log.LogUtil;
+import zutil.net.http.HttpHeaderParser;
+import zutil.net.http.HttpPrintStream;
+import zutil.net.threaded.ThreadedUDPNetwork;
+import zutil.net.threaded.ThreadedUDPNetworkThread;
+
 import java.io.IOException;
 import java.net.DatagramPacket;
 import java.net.InetAddress;
@@ -30,13 +37,6 @@ import java.util.LinkedList;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import zutil.io.StringOutputStream;
-import zutil.log.LogUtil;
-import zutil.net.http.HttpHeaderParser;
-import zutil.net.http.HttpPrintStream;
-import zutil.net.threaded.ThreadedUDPNetwork;
-import zutil.net.threaded.ThreadedUDPNetworkThread;
-
 /**
  * An SSDP client class that will request
  * service information.

src/zutil/net/ssdp/SSDPServer.java

@@ -22,24 +22,22 @@
 
 package zutil.net.ssdp;
 
+import zutil.io.StringOutputStream;
+import zutil.log.LogUtil;
+import zutil.net.http.HttpHeaderParser;
+import zutil.net.http.HttpPrintStream;
+import zutil.net.threaded.ThreadedUDPNetwork;
+import zutil.net.threaded.ThreadedUDPNetworkThread;
+
 import java.io.IOException;
 import java.net.DatagramPacket;
 import java.net.InetAddress;
-import java.net.MulticastSocket;
 import java.util.HashMap;
 import java.util.Timer;
 import java.util.TimerTask;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import zutil.io.MultiPrintStream;
-import zutil.io.StringOutputStream;
-import zutil.log.LogUtil;
-import zutil.net.http.HttpHeaderParser;
-import zutil.net.http.HttpPrintStream;
-import zutil.net.threaded.ThreadedUDPNetworkThread;
-import zutil.net.threaded.ThreadedUDPNetwork;
-
 /**
  * A Server class that announces an service by the SSDP 
  * protocol specified at:

src/zutil/net/ssdp/SSDPServiceInfo.java

@@ -22,8 +22,6 @@
 
 package zutil.net.ssdp;
 
-import zutil.net.http.HttpPrintStream;
-
 /**
  * This class contains information about a service from
  * or through the SSDP protocol

src/zutil/net/threaded/ThreadedTCPNetworkServer.java

@@ -22,6 +22,9 @@
 
 package zutil.net.threaded;
 
+import zutil.log.LogUtil;
+
+import javax.net.ssl.SSLServerSocketFactory;
 import java.io.File;
 import java.io.IOException;
 import java.net.ServerSocket;
@@ -33,10 +36,6 @@ import java.security.cert.CertificateException;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import javax.net.ssl.SSLServerSocketFactory;
-
-import zutil.log.LogUtil;
-
 
 /**
  * A simple network server that handles TCP communication

src/zutil/net/threaded/ThreadedUDPNetwork.java

@@ -23,11 +23,7 @@
 package zutil.net.threaded;
 
 import java.io.IOException;
-import java.net.DatagramPacket;
-import java.net.DatagramSocket;
-import java.net.InetAddress;
-import java.net.MulticastSocket;
-import java.net.SocketException;
+import java.net.*;
 
 
 

src/zutil/net/torrent/TorrentMetainfo.java

@@ -22,17 +22,17 @@
 
 package zutil.net.torrent;
 
+import zutil.io.MultiPrintStream;
+import zutil.io.file.FileUtil;
+import zutil.parser.BEncodedParser;
+import zutil.parser.DataNode;
+
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Iterator;
 
-import zutil.io.MultiPrintStream;
-import zutil.io.file.FileUtil;
-import zutil.parser.BEncodedParser;
-import zutil.parser.DataNode;
-
 public class TorrentMetainfo {
 	/** Comment (optional) **/
 	private String comment;

src/zutil/net/torrent/TorrentTracker.java

@@ -22,12 +22,12 @@
 
 package zutil.net.torrent;
 
-import java.io.IOException;
-import java.net.URL;
-
 import zutil.net.http.HttpClient;
 import zutil.net.http.HttpHeaderParser;
 
+import java.io.IOException;
+import java.net.URL;
+
 /**
  * This tracker represents a tracker client 
  * that connects to a tracker

src/zutil/net/update/FileInfo.java

@@ -22,13 +22,13 @@
 
 package zutil.net.update;
 
+import zutil.Hasher;
+import zutil.io.file.FileUtil;
+
 import java.io.File;
 import java.io.IOException;
 import java.io.Serializable;
 
-import zutil.Hasher;
-import zutil.io.file.FileUtil;
-
 /**
  * This class is used to store the files
  * and there hashes

src/zutil/net/update/FileListMessage.java

@@ -22,14 +22,14 @@
 
 package zutil.net.update;
 
+import zutil.io.file.FileUtil;
+
 import java.io.File;
 import java.io.IOException;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
 
-import zutil.io.file.FileUtil;
-
 /**
  * This class is used to store the files
  * and there hashes

src/zutil/net/update/UpdateClient.java

@@ -22,19 +22,15 @@
 
 package zutil.net.update;
 
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-import java.net.Socket;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
 import zutil.ProgressListener;
 import zutil.io.file.FileUtil;
 import zutil.log.LogUtil;
 
+import java.io.*;
+import java.net.Socket;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
 /**
  * This class connects to a update server and updates a path
  * with the servers

src/zutil/net/update/UpdateServer.java

@@ -22,6 +22,11 @@
 
 package zutil.net.update;
 
+import zutil.io.MultiPrintStream;
+import zutil.log.LogUtil;
+import zutil.net.threaded.ThreadedTCPNetworkServer;
+import zutil.net.threaded.ThreadedTCPNetworkServerThread;
+
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.ObjectInputStream;
@@ -30,11 +35,6 @@ import java.net.Socket;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import zutil.io.MultiPrintStream;
-import zutil.log.LogUtil;
-import zutil.net.threaded.ThreadedTCPNetworkServer;
-import zutil.net.threaded.ThreadedTCPNetworkServerThread;
-
 public class UpdateServer extends ThreadedTCPNetworkServer{
 	private static final Logger logger = LogUtil.getLogger();
 

src/zutil/net/upnp/UPnPMediaServer.java

@@ -22,13 +22,13 @@
 
 package zutil.net.upnp;
 
+import zutil.net.http.HttpHeaderParser;
+import zutil.net.http.HttpPrintStream;
+
 import java.io.IOException;
 import java.util.Map;
 import java.util.UUID;
 
-import zutil.net.http.HttpHeaderParser;
-import zutil.net.http.HttpPrintStream;
-
 /**
  * This class is a UPnP AV Media Server that handles all the
  * other UPnP services

src/zutil/net/upnp/services/UPnPContentDirectory.java

@@ -22,14 +22,7 @@
 
 package zutil.net.upnp.services;
 
-import java.io.File;
-import java.io.IOException;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-
 import org.dom4j.DocumentException;
-
 import zutil.io.file.FileUtil;
 import zutil.net.http.HttpHeaderParser;
 import zutil.net.http.HttpPage;
@@ -38,6 +31,12 @@ import zutil.net.upnp.UPnPService;
 import zutil.net.ws.WSInterface;
 import zutil.net.ws.WSReturnObject;
 
+import java.io.File;
+import java.io.IOException;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+
 /**
  * Information about a UPNP Service
  * 

src/zutil/net/ws/WSInterface.java

@@ -22,7 +22,10 @@
 
 package zutil.net.ws;
 
-import java.lang.annotation.*;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
 /**
  * 
  * Specifies web service parameter names and other things. 

src/zutil/net/ws/WSMethodDef.java

@@ -22,6 +22,9 @@
 
 package zutil.net.ws;
 
+import zutil.net.ws.WSInterface.WSDocumentation;
+import zutil.net.ws.WSInterface.WSNamespace;
+
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
@@ -29,9 +32,6 @@ import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.List;
 
-import zutil.net.ws.WSInterface.WSDocumentation;
-import zutil.net.ws.WSInterface.WSNamespace;
-
 /**
  * This is a web service method definition class
  * 

src/zutil/net/ws/rest/RestHttpPage.java

@@ -26,7 +26,6 @@ import zutil.converters.Converter;
 import zutil.net.http.HttpHeaderParser;
 import zutil.net.http.HttpPage;
 import zutil.net.http.HttpPrintStream;
-import zutil.net.http.HttpURL;
 import zutil.net.ws.WSInterface;
 import zutil.net.ws.WSMethodDef;
 import zutil.net.ws.WSParameterDef;