cleaned imports and added function calls to Templator

ZUtil.iml

@@ -15,7 +15,6 @@
     </src_description>
   </component>
   <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <output url="file://$MODULE_DIR$/bin" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
@@ -81,15 +80,6 @@
         <SOURCES />
       </library>
     </orderEntry>
-    <orderEntry type="module-library">
-      <library name="junit4">
-        <CLASSES>
-          <root url="jar://$APPLICATION_HOME_DIR$/lib/junit-4.11.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="module-library">
       <library name="sqlite-jdbc-3.7.2.jar">
@@ -109,5 +99,16 @@
         <SOURCES />
       </library>
     </orderEntry>
+    <orderEntry type="module-library">
+      <library name="JUnit4">
+        <CLASSES>
+          <root url="jar://$APPLICATION_HOME_DIR$/lib/junit-4.11.jar!/" />
+          <root url="jar://$APPLICATION_HOME_DIR$/lib/hamcrest-core-1.3.jar!/" />
+          <root url="jar://$APPLICATION_HOME_DIR$/lib/hamcrest-library-1.3.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
   </component>
 </module>

src/zutil/Encrypter.java

@@ -22,26 +22,16 @@
 
 package zutil;
 
+import javax.crypto.*;
+import javax.crypto.spec.PBEKeySpec;
+import javax.crypto.spec.PBEParameterSpec;
 import java.io.InputStream;
 import java.io.OutputStream;
-import java.security.InvalidKeyException;
+import java.security.*;
-import java.security.Key;
-import java.security.NoSuchAlgorithmException;
-import java.security.Provider;
-import java.security.Security;
 import java.security.spec.AlgorithmParameterSpec;
 import java.security.spec.KeySpec;
 import java.util.Random;
 
-import javax.crypto.Cipher;
-import javax.crypto.CipherInputStream;
-import javax.crypto.CipherOutputStream;
-import javax.crypto.KeyGenerator;
-import javax.crypto.NoSuchPaddingException;
-import javax.crypto.SecretKeyFactory;
-import javax.crypto.spec.PBEKeySpec;
-import javax.crypto.spec.PBEParameterSpec;
-
 
 /**
  * Basic symmetric encryption example

src/zutil/Hasher.java

@@ -22,19 +22,14 @@
 
 package zutil;
 
-import java.io.File;
+import zutil.converters.Converter;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.Serializable;
-import java.math.BigInteger;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
 
 import javax.crypto.Mac;
 import javax.crypto.spec.SecretKeySpec;
-
+import java.io.*;
-import zutil.converters.Converter;
+import java.math.BigInteger;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
 
 public class Hasher {
 

src/zutil/OneInstanceNetwork.java

@@ -22,12 +22,12 @@
 
 package zutil;
 
+import zutil.io.MultiPrintStream;
+
 import java.io.IOException;
 import java.net.ServerSocket;
 import java.net.Socket;
 
-import zutil.io.MultiPrintStream;
-
 /**
  * This class checks if the app is alredy running
  * by Locking a port

src/zutil/algo/EuclideansAlgo.java

@@ -22,11 +22,11 @@
 
 package zutil.algo;
 
+import zutil.io.MultiPrintStream;
+
 import java.math.BigInteger;
 import java.util.LinkedList;
 
-import zutil.io.MultiPrintStream;
-
 /**
  * Euclidean algorithm is an algorithm to determine 
  * the greatest common divisor (GCD)

src/zutil/algo/WienersAlgo.java

@@ -22,11 +22,11 @@
 
 package zutil.algo;
 
+import zutil.math.ZMath;
+
 import java.math.BigInteger;
 import java.util.LinkedList;
 
-import zutil.math.ZMath;
-
 /**
  * The Wieners algorithm factorizes two big numbers a and b.
  * It uses the Euclidien algorithm to calculate the generator of the

src/zutil/algo/sort/ExternalSort.java

@@ -22,13 +22,7 @@
 
 package zutil.algo.sort;
 
-import java.io.BufferedReader;
+import java.io.*;
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileReader;
-import java.io.FileWriter;
-import java.io.IOException;
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.LinkedList;

src/zutil/chart/AbstractChart.java

@@ -21,18 +21,13 @@
  */
 package zutil.chart;
 
-import java.awt.FontMetrics;
+import zutil.log.LogUtil;
-import java.awt.Graphics;
+
-import java.awt.Graphics2D;
+import javax.swing.*;
-import java.awt.Point;
+import java.awt.*;
-import java.awt.Rectangle;
 import java.awt.geom.Line2D;
 import java.util.logging.Logger;
 
-import javax.swing.JPanel;
-
-import zutil.log.LogUtil;
-
 public abstract class AbstractChart extends JPanel{
 	private static final Logger logger = LogUtil.getLogger();
 	private static final long serialVersionUID = 1L;

src/zutil/chart/ChartData.java

@@ -21,7 +21,7 @@
  */
 package zutil.chart;
 
-import java.awt.Point;
+import java.awt.*;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;

src/zutil/chart/LineChart.java

@@ -21,10 +21,7 @@
  */
 package zutil.chart;
 
-import java.awt.BasicStroke;
+import java.awt.*;
-import java.awt.Color;
-import java.awt.Graphics2D;
-import java.awt.Rectangle;
 import java.awt.geom.Line2D;
 
 public class LineChart extends AbstractChart{

src/zutil/db/DBConnection.java

@@ -22,23 +22,17 @@
 
 package zutil.db;
 
-import java.io.Closeable;
+import zutil.db.handler.SimpleSQLHandler;
-import java.math.BigInteger;
+import zutil.log.LogUtil;
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
-import java.util.logging.Level;
-import java.util.logging.Logger;
 
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
 import javax.sql.DataSource;
-
+import java.io.Closeable;
-import zutil.db.handler.SimpleSQLHandler;
+import java.math.BigInteger;
-import zutil.log.LogUtil;
+import java.sql.*;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 public class DBConnection implements Closeable{
 	private static final Logger logger = LogUtil.getLogger();

src/zutil/db/DBConnectionPool.java

@@ -22,13 +22,13 @@
 
 package zutil.db;
 
+import zutil.db.DBConnection.DBMS;
+
 import java.io.Closeable;
 import java.util.LinkedList;
 import java.util.Timer;
 import java.util.TimerTask;
 
-import zutil.db.DBConnection.DBMS;
-
 /**
  * This class is an connection pool
  * 

src/zutil/db/SQLResultHandler.java

@@ -22,9 +22,9 @@
 
 package zutil.db;
 
+import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Statement;
-import java.sql.ResultSet;
 
 public interface SQLResultHandler<T> {
 	/**

src/zutil/db/bean/DBBean.java

@@ -22,6 +22,9 @@
 
 package zutil.db.bean;
 
+import zutil.db.DBConnection;
+import zutil.log.LogUtil;
+
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
@@ -40,9 +43,6 @@ import java.util.NoSuchElementException;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import zutil.db.DBConnection;
-import zutil.log.LogUtil;
-
 /** 
  * The class that extends this will be able to save its state to a database.
  * Fields that are transient will be ignored, and fields that extend 

src/zutil/db/bean/DBBeanSQLResultHandler.java

@@ -22,25 +22,21 @@
 
 package zutil.db.bean;
 
-import java.lang.reflect.Field;
-import java.sql.PreparedStatement;
-import java.sql.SQLException;
-import java.sql.Statement;
-import java.sql.ResultSet;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Timer;
-import java.util.TimerTask;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.logging.Logger;
-
 import zutil.db.DBConnection;
 import zutil.db.SQLResultHandler;
 import zutil.db.bean.DBBean.DBBeanConfig;
 import zutil.db.bean.DBBean.DBLinkTable;
 import zutil.log.LogUtil;
 
+import java.lang.reflect.Field;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.logging.Logger;
+
 public class DBBeanSQLResultHandler<T> implements SQLResultHandler<T>{
 	private static final Logger logger = LogUtil.getLogger();
 	/** This is the time to live for the cached items **/

src/zutil/db/handler/PropertiesSQLHandler.java

@@ -22,13 +22,13 @@
 
 package zutil.db.handler;
 
+import zutil.db.SQLResultHandler;
+
+import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Statement;
-import java.sql.ResultSet;
 import java.util.Properties;
 
-import zutil.db.SQLResultHandler;
-
 /**
  * Adds the result of the query to a Properties object,
  * 

src/zutil/db/handler/SimpleSQLHandler.java

@@ -22,11 +22,11 @@
 
 package zutil.db.handler;
 
+import zutil.db.SQLResultHandler;
+
+import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Statement;
-import java.sql.ResultSet;
-
-import zutil.db.SQLResultHandler;
 
 /**
  * Returns the first column of the first row from the query

src/zutil/image/ImageFilterProcessor.java

@@ -22,10 +22,10 @@
 
 package zutil.image;
 
-import java.awt.image.BufferedImage;
-
 import zutil.ProgressListener;
 
+import java.awt.image.BufferedImage;
+
 /**
  * This is a abstract class for all the effects
  * 

src/zutil/image/ImageUtil.java

@@ -22,7 +22,7 @@
 
 package zutil.image;
 
-import java.awt.Graphics2D;
+import java.awt.*;
 import java.awt.geom.AffineTransform;
 import java.awt.image.BufferedImage;
 

src/zutil/image/filters/BlurFilter.java

@@ -22,12 +22,12 @@
 
 package zutil.image.filters;
 
-import java.awt.image.BufferedImage;
-
 import zutil.image.ImageFilterProcessor;
 import zutil.image.RAWImageUtil;
 import zutil.math.ZMath;
 
+import java.awt.image.BufferedImage;
+
 public class BlurFilter extends ImageFilterProcessor{
 	private int blurValue;
 

src/zutil/image/filters/ColorIntensityFilter.java

@@ -22,11 +22,11 @@
 
 package zutil.image.filters;
 
-import java.awt.image.BufferedImage;
-
 import zutil.image.ImageFilterProcessor;
 import zutil.math.ZMath;
 
+import java.awt.image.BufferedImage;
+
 public class ColorIntensityFilter extends ImageFilterProcessor{
 	private boolean invert;
 	private double redScale;

src/zutil/image/filters/ContrastBrightnessFilter.java

@@ -22,11 +22,11 @@
 
 package zutil.image.filters;
 
-import java.awt.image.BufferedImage;
-
 import zutil.image.ImageFilterProcessor;
 import zutil.image.RAWImageUtil;
 
+import java.awt.image.BufferedImage;
+
 public class ContrastBrightnessFilter extends ImageFilterProcessor{
 	private double contrast;
 	private double brightness;

src/zutil/image/filters/ConvolutionFilter.java

@@ -22,12 +22,12 @@
 
 package zutil.image.filters;
 
-import java.awt.image.BufferedImage;
-
 import zutil.image.ImageFilterProcessor;
 import zutil.image.RAWImageUtil;
 import zutil.math.ZMath;
 
+import java.awt.image.BufferedImage;
+
 /**
  * Applies an Convolution kernel to the specified image
  * 

src/zutil/image/filters/DitheringFilter.java

@@ -22,12 +22,12 @@
 
 package zutil.image.filters;
 
-import java.awt.image.BufferedImage;
-
 import zutil.image.ImageFilterProcessor;
 import zutil.image.RAWImageUtil;
 import zutil.math.ZMath;
 
+import java.awt.image.BufferedImage;
+
 
 public class DitheringFilter extends ImageFilterProcessor{
 	// default palette is black and white

src/zutil/image/filters/MedianFilter.java

@@ -22,13 +22,13 @@
 
 package zutil.image.filters;
 
-import java.awt.image.BufferedImage;
-
 import zutil.algo.sort.sortable.SortableDataList;
 import zutil.image.ImageFilterProcessor;
 import zutil.image.RAWImageUtil;
 import zutil.math.ZMath;
 
+import java.awt.image.BufferedImage;
+
 /**
  * The MedianFilter is used for noise reduction and things
  * 

src/zutil/image/filters/ResizeImage.java

@@ -22,11 +22,11 @@
 
 package zutil.image.filters;
 
-import java.awt.image.BufferedImage;
-
 import zutil.image.ImageFilterProcessor;
 import zutil.math.ZMath;
 
+import java.awt.image.BufferedImage;
+
 public class ResizeImage extends ImageFilterProcessor{
 	private int width;
 	private int height;

src/zutil/image/filters/SobelEdgeDetectionFilter.java

@@ -22,11 +22,11 @@
 
 package zutil.image.filters;
 
-import java.awt.image.BufferedImage;
-
 import zutil.image.ImageFilterProcessor;
 import zutil.math.ZMath;
 
+import java.awt.image.BufferedImage;
+
 /**
  * Generates an image that contains the edges of the source image
  * 

src/zutil/image/filters/SpotLightFilter.java

@@ -22,12 +22,12 @@
 
 package zutil.image.filters;
 
-import java.awt.image.BufferedImage;
-
 import zutil.image.ImageFilterProcessor;
 import zutil.image.RAWImageUtil;
 import zutil.math.ZMath;
 
+import java.awt.image.BufferedImage;
+
 public class SpotLightFilter extends ImageFilterProcessor{
 	private int radius;
 	private int xPos;

src/zutil/io/file/FileSearch.java

@@ -22,22 +22,16 @@
 
 package zutil.io.file;
 
+import zutil.io.InputStreamCloser;
+
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.net.MalformedURLException;
+import java.util.*;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Enumeration;
-import java.util.Iterator;
-import java.util.List;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
 
-import zutil.io.InputStreamCloser;
-
 public class FileSearch implements Iterable<FileSearch.FileSearchItem>{
 	// Constants
 	private static final List<String> compressedFileExtensions = Arrays.asList(new String[]{

src/zutil/io/file/FileUtil.java

@@ -22,15 +22,10 @@
 
 package zutil.io.file;
 
-import java.io.BufferedInputStream;
+import zutil.io.IOUtil;
-import java.io.BufferedReader;
+import zutil.log.LogUtil;
-import java.io.EOFException;
+
-import java.io.File;
+import java.io.*;
-import java.io.FileInputStream;
-import java.io.FileReader;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.InputStream;
 import java.net.URISyntaxException;
 import java.net.URL;
 import java.util.HashMap;
@@ -39,9 +34,6 @@ import java.util.List;
 import java.util.logging.Logger;
 import java.util.regex.Matcher;
 
-import zutil.io.IOUtil;
-import zutil.log.LogUtil;
-
 /**
  * File path utilities
  * 

src/zutil/io/file/FileWatcher.java

@@ -22,13 +22,13 @@
 
 package zutil.io.file;
 
+import zutil.io.MultiPrintStream;
+
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.util.Timer;
 import java.util.TimerTask;
 
-import zutil.io.MultiPrintStream;
-
 /**
  * This class calls a given listener 
  * when a file is changed

src/zutil/log/CompactLogFormatter.java

@@ -22,6 +22,8 @@
 
 package zutil.log;
 
+import zutil.io.StringOutputStream;
+
 import java.io.PrintStream;
 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -30,8 +32,6 @@ import java.util.logging.Formatter;
 import java.util.logging.LogRecord;
 import java.util.regex.Pattern;
 
-import zutil.io.StringOutputStream;
-
 public class CompactLogFormatter extends Formatter{
 	// The split pattern where the 
 	private static final Pattern splitter = Pattern.compile("\n");

src/zutil/log/LogUtil.java

@@ -22,11 +22,7 @@
 
 package zutil.log;
 
-import java.util.logging.ConsoleHandler;
+import java.util.logging.*;
-import java.util.logging.Formatter;
-import java.util.logging.Handler;
-import java.util.logging.Level;
-import java.util.logging.Logger;
 
 /**
  * Utility functions for the standard Java Logger

src/zutil/log/net/NetLogClient.fxml

@@ -1,13 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import java.lang.*?>
-<?import java.util.*?>
-<?import javafx.collections.*?>
-<?import javafx.scene.*?>
-<?import javafx.scene.control.*?>
-<?import javafx.scene.layout.*?>
-<?import javafx.scene.paint.*?>
-
 <!--
   ~ Copyright (c) 2015 ezivkoc
   ~
@@ -30,6 +22,8 @@
   ~ THE SOFTWARE.
   -->
 
+<?import javafx.scene.control.*?>
+<?import javafx.scene.layout.*?>
 <AnchorPane id="AnchorPane" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" xmlns:fx="http://javafx.com/fxml" fx:controller="zutil.log.net.NetLogGuiClient">
   <children>
     <MenuBar prefWidth="598.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">

src/zutil/log/net/NetLogClient.java

@@ -22,6 +22,8 @@
 
 package zutil.log.net;
 
+import zutil.log.LogUtil;
+
 import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
@@ -31,8 +33,6 @@ import java.util.concurrent.ConcurrentLinkedQueue;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import zutil.log.LogUtil;
-
 
 public class NetLogClient extends Thread{
 	private static final Logger logger = LogUtil.getLogger();

src/zutil/log/net/NetLogClientInstance.fxml

@@ -1,15 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import java.lang.*?>
-<?import java.net.*?>
-<?import java.util.*?>
-<?import javafx.collections.*?>
-<?import javafx.scene.*?>
-<?import javafx.scene.control.*?>
-<?import javafx.scene.layout.*?>
-<?import javafx.scene.paint.*?>
-<?import javafx.scene.text.*?>
-
 <!--
   ~ Copyright (c) 2015 ezivkoc
   ~
@@ -32,6 +22,13 @@
   ~ THE SOFTWARE.
   -->
 
+<?import javafx.collections.FXCollections?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.Group?>
+<?import javafx.scene.layout.*?>
+<?import javafx.scene.text.Font?>
+<?import java.lang.*?>
+<?import java.net.URL?>
 <BorderPane xmlns:fx="http://javafx.com/fxml" fx:controller="zutil.log.net.NetLogGuiClientInstance">
   <stylesheets>
     <URL value="@NetLogClientInstance.css" />

src/zutil/log/net/NetLogExceptionMessage.java

@@ -22,10 +22,10 @@
 
 package zutil.log.net;
 
-import java.util.logging.LogRecord;
-
 import zutil.net.nio.message.Message;
 
+import java.util.logging.LogRecord;
+
 public class NetLogExceptionMessage extends Message {
 	private static final long serialVersionUID = 1L;
 	

src/zutil/log/net/NetLogGuiClient.java

@@ -22,18 +22,18 @@
 
 package zutil.log.net;
 
-import java.io.IOException;
-
 import javafx.application.Application;
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
 import javafx.fxml.FXMLLoader;
-import javafx.stage.Stage;
-import javafx.scene.Scene;
 import javafx.scene.Parent;
+import javafx.scene.Scene;
 import javafx.scene.control.Tab;
 import javafx.scene.control.TabPane;
 import javafx.scene.layout.AnchorPane;
+import javafx.stage.Stage;
+
+import java.io.IOException;
  
 public class NetLogGuiClient extends Application{
 	public static final String VERSION = "0.1";

src/zutil/log/net/NetLogGuiClientInstance.java

@@ -22,21 +22,20 @@
 
 package zutil.log.net;
 
-import java.net.URL;
-import java.util.ResourceBundle;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
 import javafx.application.Platform;
-import javafx.scene.control.*;
-import zutil.log.LogUtil;
-
 import javafx.event.ActionEvent;
 import javafx.event.Event;
 import javafx.fxml.FXML;
 import javafx.fxml.Initializable;
+import javafx.scene.control.*;
 import javafx.scene.control.cell.PropertyValueFactory;
 import javafx.util.Callback;
+import zutil.log.LogUtil;
+
+import java.net.URL;
+import java.util.ResourceBundle;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 public class NetLogGuiClientInstance implements Initializable, NetLogListener {
 	private static final Logger logger = LogUtil.getLogger();

src/zutil/log/net/NetLogMessage.java

@@ -22,12 +22,12 @@
 
 package zutil.log.net;
 
+import zutil.net.nio.message.Message;
+
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.logging.LogRecord;
 
-import zutil.net.nio.message.Message;
-
 public class NetLogMessage extends Message {
 	private static final long serialVersionUID = 1L;
     private static final SimpleDateFormat dataFormat =

src/zutil/log/net/NetLogServer.java

@@ -22,6 +22,11 @@
 
 package zutil.log.net;
 
+import zutil.log.LogUtil;
+import zutil.net.nio.message.Message;
+import zutil.net.threaded.ThreadedTCPNetworkServer;
+import zutil.net.threaded.ThreadedTCPNetworkServerThread;
+
 import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
@@ -33,11 +38,6 @@ import java.util.logging.Level;
 import java.util.logging.LogRecord;
 import java.util.logging.Logger;
 
-import zutil.log.LogUtil;
-import zutil.net.nio.message.Message;
-import zutil.net.threaded.ThreadedTCPNetworkServer;
-import zutil.net.threaded.ThreadedTCPNetworkServerThread;
-
 
 public class NetLogServer extends Handler {
 	private static final Logger logger = LogUtil.getLogger();

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.*;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Timer;
-import java.util.TimerTask;
 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.*;
-import java.net.DatagramSocket;
-import java.net.InetAddress;
-import java.net.MulticastSocket;
-import java.net.SocketException;
 
 
 

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;

src/zutil/osal/app/linux/AptGet.java

@@ -25,7 +25,6 @@ package zutil.osal.app.linux;
 import zutil.log.LogUtil;
 import zutil.osal.OSAbstractionLayer;
 
-import java.io.IOException;
 import java.util.logging.Logger;
 
 /**

src/zutil/osal/app/linux/ProcDiskstats.java

@@ -23,13 +23,13 @@
 package zutil.osal.app.linux;
 
 import zutil.StringUtil;
-import zutil.io.MultiPrintStream;
 import zutil.log.LogUtil;
 import zutil.net.ThroughputCalculator;
 
-import java.io.*;
+import java.io.BufferedReader;
+import java.io.FileReader;
+import java.io.IOException;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 

src/zutil/parser/BBCodeParser.java

@@ -22,10 +22,10 @@
 
 package zutil.parser;
 
-import java.util.HashMap;
-
 import zutil.struct.MutableInt;
 
+import java.util.HashMap;
+
 /**
  * Parses BBCode and replaces them with the corresponding HTML.
  * 

src/zutil/parser/DataNode.java

@@ -22,11 +22,7 @@
 
 package zutil.parser;
 
-import java.util.HashMap;
+import java.util.*;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
 
 
 /**

src/zutil/parser/Templator.java

@@ -30,7 +30,12 @@ import java.io.File;
 import java.io.IOException;
 import java.lang.reflect.Array;
 import java.lang.reflect.Field;
-import java.util.*;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -47,26 +52,35 @@ import java.util.logging.Logger;
  *  <li><b> {{#key}}...{{/key}} </b><br>
  *      <b> {{#obj.attr}}...{{/obj.attr}} </b><br>
  *      Will display content between the tags if:
- *      key is defined,
+ *      <ul>
- *      if the key references a list or array the content will be iterated
+ *          <li>key is defined,</li>
- *          for every element, the element can be referenced by the tag {{.}},
+ *          <li>if the key references a list or array the content will be iterated
- *      if key is a boolean with the value true,
+ *              for every element, the element can be referenced by the tag {{.}},</li>
- *      if key is a Integer with the value anything other then 0.</li>
+ *          <li>if key is a boolean with the value true,</li>
+ *          <li>if key is a Integer with the value anything other then 0,</li>
+ *          <li>if key ends with () it will be evaluated as a method call, the returned
+ *              type will be evaluated against the criteria in this list.</li>
+ *      </ul>
+ *      </li>
  *  <li><b> {{^key}}</b><br>
  *      <b> {{^obj.attr}}...{{/obj.attr}} </b><br>
  *      A negative condition, will display content if:
- *      the key is undefined,
+ *      <ul>
- *      the key is a empty list,
+ *          <li>the key is undefined,</li>
- *      the key is a zero length array,
+ *          <li>the key is a empty list,</li>
- *      the key is a false boolean,
+ *          <li>the key is a zero length array,</li>
- *      the key is a 0 Integer</li>
+ *          <li>the key is a false boolean,</li>
+ *          <li>the key is a 0 Integer</li>
+ *          <li>if key ends with () it will be evaluated as a method call, the returned
+ *              type will be evaluated against the criteria in this list.</li>
+ *      </ul>
+ *      </li>
  *  <li><b>{{! ignore me }}</b><br>
  *      Comment, will be ignored.</li>
  * </ul>
  *
  * TODO: {{> file}}: include file
  * TODO: {{=<% %>=}}: change delimiter
- * TODO: {{obj.func()}}: execute functions
  *
  * @author Ziver koc
  */
@@ -131,7 +145,7 @@ public class Templator {
     }
 
     /**
-     * Will pare or re-parse the source template.
+     * Will parse or re-parse the source template.
      */
     private void parseTemplate(String tmpl){
         tmplRoot = parseTemplate(new TemplateNode(), tmpl, new MutableInt(), null);
@@ -244,7 +258,6 @@ public class Templator {
         public void compile(StringBuilder str) {
             Object obj = attrib.getObject();
             if(obj != null) {
-
                 if(obj instanceof Boolean){
                     if ((Boolean) obj)
                         super.compile(str);
@@ -357,12 +370,27 @@ public class Templator {
         }
         protected Object getFieldValue(Object obj, String attrib){
             try {
-                if(obj.getClass().isArray() && "length".equals(attrib))
+                if(attrib.endsWith("()")){ // Is this a function call?
+                    if(attrib.length() > 2) {
+                        String funcName = attrib.substring(0, attrib.length()-2);
+                        // Using a loop as the direct lookup throws a exception if no field was found
+                        // So this is probably a bit faster
+                        for (Method m : obj.getClass().getMethods()) {
+                            if (m.getParameterTypes().length == 0 && m.getName().equals(funcName)) {
+                                m.setAccessible(true);
+                                return m.invoke(obj);
+                            }
+                        }
+                    }
+                }
+                else if(obj.getClass().isArray() && "length".equals(attrib))
                     return Array.getLength(obj);
                 else if(obj instanceof Collection && "length".equals(attrib))
                     return ((Collection) obj).size();
                 else {
-                    for (Field field : obj.getClass().getDeclaredFields()) {
+                    // Using a loop as the direct lookup throws a exception if no field was found
+                    // So this is probably a bit faster
+                    for (Field field : obj.getClass().getFields()) { // Only look for public fields
                         if (field.getName().equals(attrib)) {
                             field.setAccessible(true);
                             return field.get(obj);
@@ -371,6 +399,8 @@ public class Templator {
                 }
             }catch (IllegalAccessException e){
                 log.log(Level.WARNING, null, e);
+            } catch (InvocationTargetException e) {
+                log.log(Level.WARNING, null, e);
             }
             return null;
         }

src/zutil/parser/json/JSONObjectInputStream.java

@@ -25,6 +25,7 @@ package zutil.parser.json;
 import zutil.parser.Base64Decoder;
 import zutil.parser.DataNode;
 
+import javax.activation.UnsupportedDataTypeException;
 import java.io.*;
 import java.lang.reflect.Array;
 import java.lang.reflect.Field;
@@ -33,8 +34,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import javax.activation.UnsupportedDataTypeException;
-
 public class JSONObjectInputStream extends InputStream implements ObjectInput, Closeable{
     private JSONParser parser;
     private HashMap<Integer, Object> objectCache;

src/zutil/parser/json/JSONObjectOutputStream.java

@@ -26,7 +26,11 @@ import zutil.ClassUtil;
 import zutil.parser.DataNode;
 import zutil.parser.DataNode.DataType;
 
-import java.io.*;
+import javax.activation.UnsupportedDataTypeException;
+import java.io.Closeable;
+import java.io.IOException;
+import java.io.ObjectOutput;
+import java.io.OutputStream;
 import java.lang.reflect.Array;
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
@@ -34,8 +38,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import javax.activation.UnsupportedDataTypeException;
-
 public class JSONObjectOutputStream extends OutputStream implements ObjectOutput, Closeable{
     private boolean generateMetaData;
 

src/zutil/parser/json/JSONParser.java

@@ -26,7 +26,9 @@ import zutil.parser.DataNode;
 import zutil.parser.DataNode.DataType;
 import zutil.struct.MutableInt;
 
-import java.io.*;
+import java.io.IOException;
+import java.io.Reader;
+import java.io.StringReader;
 import java.util.regex.Pattern;
 
 /**

src/zutil/parser/json/JSONWriter.java

@@ -22,15 +22,15 @@
 
 package zutil.parser.json;
 
+import zutil.io.StringOutputStream;
+import zutil.parser.DataNode;
+import zutil.parser.DataNode.DataType;
+
 import java.io.OutputStream;
 import java.io.PrintStream;
 import java.io.PrintWriter;
 import java.util.Iterator;
 
-import zutil.io.StringOutputStream;
-import zutil.parser.DataNode;
-import zutil.parser.DataNode.DataType;
-
 /**
  * Writes An JSONNode to an String or stream
  *

src/zutil/plugin/PluginData.java

@@ -22,14 +22,10 @@
 
 package zutil.plugin;
 
-import zutil.ClassUtil;
 import zutil.log.LogUtil;
 import zutil.parser.DataNode;
 
-import javax.xml.crypto.Data;
 import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.URLClassLoader;
 import java.util.*;
 import java.util.logging.Level;
 import java.util.logging.Logger;

src/zutil/plugin/PluginManager.java

@@ -22,16 +22,19 @@
 
 package zutil.plugin;
 
-import java.io.File;
-import java.util.*;
-import java.util.logging.Logger;
-
 import zutil.io.IOUtil;
 import zutil.io.file.FileSearch;
 import zutil.log.LogUtil;
 import zutil.parser.DataNode;
 import zutil.parser.json.JSONParser;
 
+import java.io.File;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.NoSuchElementException;
+import java.util.logging.Logger;
+
 /**
  * This class will search the file system for files
  * with the name "plugin.json" that defines data 

src/zutil/struct/BloomFilter.java

@@ -22,14 +22,14 @@
 
 package zutil.struct;
 
+import zutil.Hasher;
+
 import java.io.Serializable;
 import java.util.BitSet;
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.Set;
 
-import zutil.Hasher;
-
 /**
  * A implementation of a bloom filter
  * @author Ziver

src/zutil/test/BloomFilterTest.java

@@ -22,14 +22,13 @@
 
 package zutil.test;
 
+import junit.framework.TestCase;
+import zutil.struct.BloomFilter;
+
 import java.text.DecimalFormat;
 import java.util.HashSet;
 import java.util.Random;
 
-import zutil.struct.BloomFilter;
-
-import junit.framework.TestCase;
-
 /**
  * This code may be used, modified, and redistributed provided that the 
  * author tag below remains intact.

src/zutil/test/BoundaryBufferedInputStreamTest.java

@@ -22,14 +22,13 @@
 
 package zutil.test;
 
-import static org.junit.Assert.*;
+import org.junit.Test;
+import zutil.io.BoundaryBufferedInputStream;
+import zutil.io.StringInputStream;
 
 import java.io.IOException;
 
-import org.junit.Test;
+import static org.junit.Assert.assertEquals;
-
-import zutil.io.BoundaryBufferedInputStream;
-import zutil.io.StringInputStream;
 
 @SuppressWarnings("resource")
 public class BoundaryBufferedInputStreamTest {

src/zutil/test/ChartTest.java

@@ -21,14 +21,13 @@
  */
 package zutil.test;
 
-import java.util.logging.Level;
-
-import javax.swing.JFrame;
-
 import zutil.chart.ChartData;
 import zutil.chart.LineChart;
 import zutil.log.LogUtil;
 
+import javax.swing.*;
+import java.util.logging.Level;
+
 public class ChartTest extends JFrame{
 	private static final long serialVersionUID = 1L;
 

src/zutil/test/ConsoleTest.java

@@ -22,12 +22,12 @@
 
 package zutil.test;
 
+import zutil.ui.Console;
+
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
 
-import zutil.ui.Console;
-
 public class ConsoleTest {
 	public static void main(String[] args) throws IOException{
 		new Console("Console Test");

src/zutil/test/ConverterTest.java

@@ -22,12 +22,12 @@
 
 package zutil.test;
 
-import static org.junit.Assert.*;
-
 import org.junit.Test;
-
 import zutil.converters.Converter;
 
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+
 public class ConverterTest {
 
 	@Test

src/zutil/test/DBConnectionTest.java

@@ -22,11 +22,11 @@
 
 package zutil.test;
 
-import java.sql.PreparedStatement;
-
 import zutil.db.DBConnection;
 import zutil.db.handler.SimpleSQLHandler;
 
+import java.sql.PreparedStatement;
+
 public class DBConnectionTest {
 
 	public static void main(String[] args){

src/zutil/test/ExternalSortTest.java

@@ -22,10 +22,10 @@
 
 package zutil.test;
 
-import java.io.File;
-
 import zutil.algo.sort.ExternalSort;
 
+import java.io.File;
+
 
 public class ExternalSortTest {
 	public static void main(String[] args){		

src/zutil/test/FileChangedTest.java

@@ -22,14 +22,14 @@
 
 package zutil.test;
 
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.net.URISyntaxException;
-
 import zutil.io.file.FileChangeListener;
 import zutil.io.file.FileUtil;
 import zutil.io.file.FileWatcher;
 
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.net.URISyntaxException;
+
 public class FileChangedTest implements FileChangeListener{
 	public static void main(String[] args) throws URISyntaxException, FileNotFoundException{
 		FileWatcher watcher = new FileWatcher(FileUtil.find("test.txt"));

src/zutil/test/FileFinderHasherTest.java

@@ -22,13 +22,13 @@
 
 package zutil.test;
 
+import zutil.Hasher;
+import zutil.io.file.FileUtil;
+
 import java.io.File;
 import java.net.URISyntaxException;
 import java.util.List;
 
-import zutil.Hasher;
-import zutil.io.file.FileUtil;
-
 public class FileFinderHasherTest {
 	public static void main(String[] args) throws URISyntaxException{
 		String relativePath = "zutil/test";

src/zutil/test/HTTPGuessTheNumber.java

@@ -22,14 +22,14 @@
 
 package zutil.test;
 
-import java.io.IOException;
-import java.util.Map;
-
 import zutil.net.http.HttpHeaderParser;
 import zutil.net.http.HttpPage;
 import zutil.net.http.HttpPrintStream;
 import zutil.net.http.HttpServer;
 
+import java.io.IOException;
+import java.util.Map;
+
 
 public class HTTPGuessTheNumber implements HttpPage{
 

src/zutil/test/HTTPUploaderTest.java

@@ -22,14 +22,14 @@
 
 package zutil.test;
 
-import java.io.IOException;
-import java.util.Map;
-
 import zutil.net.http.HttpHeaderParser;
 import zutil.net.http.HttpPage;
 import zutil.net.http.HttpPrintStream;
 import zutil.net.http.HttpServer;
 
+import java.io.IOException;
+import java.util.Map;
+
 
 
 public class HTTPUploaderTest implements HttpPage{

src/zutil/test/HasherTest.java

@@ -22,12 +22,11 @@
 
 package zutil.test;
 
-import static org.junit.Assert.*;
-
 import org.junit.Test;
-
 import zutil.Hasher;
 
+import static org.junit.Assert.assertEquals;
+
 
 public class HasherTest {
 	

src/zutil/test/HttpURLTest.java

@@ -22,12 +22,11 @@
 
 package zutil.test;
 
-import static org.junit.Assert.*;
-
 import org.junit.Test;
-
 import zutil.net.http.HttpURL;
 
+import static org.junit.Assert.assertEquals;
+
 public class HttpURLTest {
 
 	@Test