Trim trailing whitespace and organize imports

Change-Id: I9f91138b20219be6e3c4b28251487df262bff6cc

1 files changed, 12 insertions, 10 deletions

diff --git a/src/main/java/com/gitblit/git/GitDaemon.java b/src/main/java/com/gitblit/git/GitDaemon.java
index b760fbcc..bb578efc 100644
--- a/src/main/java/com/gitblit/git/GitDaemon.java
+++ b/src/main/java/com/gitblit/git/GitDaemon.java
@@ -73,9 +73,9 @@ import com.gitblit.utils.StringUtils;
 /**

  * Gitblit's Git Daemon ignores any and all per-repository daemon settings and

  * integrates into Gitblit's security model.

- * 

+ *

  * @author James Moger

- * 

+ *

  */

 public class GitDaemon {

 

@@ -113,7 +113,7 @@ public class GitDaemon {
 

 	/**

 	 * Construct the Gitblit Git daemon.

-	 * 

+	 *

 	 * @param bindInterface

 	 *            the ip address of the interface to bind

 	 * @param port

@@ -128,10 +128,10 @@ public class GitDaemon {
 		// set the repository resolver and pack factories

 		repositoryResolver = new RepositoryResolver<GitDaemonClient>(folder);

 	}

-	

+

 	/**

 	 * Configure a new daemon for the specified network address.

-	 * 

+	 *

 	 * @param addr

 	 *            address to listen for connections on. If null, any available

 	 *            port will be chosen on all network interfaces.

@@ -177,11 +177,11 @@ public class GitDaemon {
 					}

 				} };

 	}

-	

+

 	public int getPort() {

 		return myAddress.getPort();

 	}

-	

+

 	public String formatUrl(String servername, String repository) {

 		if (getPort() == 9418) {

 			// standard port

@@ -199,7 +199,7 @@ public class GitDaemon {
 

 	/**

 	 * Set the timeout before willing to abort an IO call.

-	 * 

+	 *

 	 * @param seconds

 	 *            number of seconds to wait (with no data transfer occurring)

 	 *            before aborting an IO read or write operation with the

@@ -211,7 +211,7 @@ public class GitDaemon {
 

 	/**

 	 * Start this daemon on a background thread.

-	 * 

+	 *

 	 * @throws IOException

 	 *             the server socket could not be opened.

 	 * @throws IllegalStateException

@@ -228,6 +228,7 @@ public class GitDaemon {
 		run.set(true);

 		acceptSocket = listenSock;

 		acceptThread = new Thread(processors, "Git-Daemon-Accept") {

+			@Override

 			public void run() {

 				while (isRunning()) {

 					try {

@@ -250,7 +251,7 @@ public class GitDaemon {
 			}

 		};

 		acceptThread.start();

-		

+

 		logger.info(MessageFormat.format("Git Daemon is listening on {0}:{1,number,0}", myAddress.getAddress().getHostAddress(), myAddress.getPort()));

 	}

 

@@ -290,6 +291,7 @@ public class GitDaemon {
 			dc.setRemoteAddress(((InetSocketAddress) peer).getAddress());

 

 		new Thread(processors, "Git-Daemon-Client " + peer.toString()) {

+			@Override

 			public void run() {

 				try {

 					dc.execute(s);