Organize imports

3 files changed, 7 insertions, 12 deletions

diff --git a/src/main/java/com/gitblit/git/GitblitUploadPackFactory.java b/src/main/java/com/gitblit/git/GitblitUploadPackFactory.java
index 7a476775..ec856285 100644
--- a/src/main/java/com/gitblit/git/GitblitUploadPackFactory.java
+++ b/src/main/java/com/gitblit/git/GitblitUploadPackFactory.java
@@ -15,8 +15,6 @@
  */
 package com.gitblit.git;
 
-import javax.servlet.http.HttpServletRequest;
-
 import org.eclipse.jgit.lib.Repository;
 import org.eclipse.jgit.transport.UploadPack;
 import org.eclipse.jgit.transport.resolver.ServiceNotAuthorizedException;
@@ -24,7 +22,6 @@ import org.eclipse.jgit.transport.resolver.ServiceNotEnabledException;
 import org.eclipse.jgit.transport.resolver.UploadPackFactory;
 
 import com.gitblit.manager.IAuthenticationManager;
-import com.gitblit.models.UserModel;
 import com.gitblit.transport.git.GitDaemonClient;
 
 /**
diff --git a/src/main/java/com/gitblit/transport/ssh/commands/BaseCommand.java b/src/main/java/com/gitblit/transport/ssh/commands/BaseCommand.java
index a66c9b47..d996ea9a 100644
--- a/src/main/java/com/gitblit/transport/ssh/commands/BaseCommand.java
+++ b/src/main/java/com/gitblit/transport/ssh/commands/BaseCommand.java
@@ -33,9 +33,7 @@ import org.apache.sshd.server.Environment;
 import org.apache.sshd.server.ExitCallback;
 import org.apache.sshd.server.SessionAware;
 import org.apache.sshd.server.session.ServerSession;
-import org.kohsuke.args4j.Argument;
 import org.kohsuke.args4j.CmdLineException;
-import org.kohsuke.args4j.Option;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -350,13 +348,13 @@ public abstract class BaseCommand implements Command, SessionAware {
 	}
 
 	/** Runnable function which can throw an exception. */
-	public static interface CommandRunnable {
-		public void run() throws Exception;
+	public interface CommandRunnable {
+		void run() throws Exception;
 	}
 
 	/** Runnable function which can retrieve a project name related to the task */
-	public static interface RepositoryCommandRunnable extends CommandRunnable {
-		public String getRepository();
+	public interface RepositoryCommandRunnable extends CommandRunnable {
+		String getRepository();
 	}
 
 	/**
@@ -398,8 +396,8 @@ public abstract class BaseCommand implements Command, SessionAware {
 	}
 
 	private int handleError(final Throwable e) {
-		if ((e.getClass() == IOException.class && "Pipe closed".equals(e.getMessage())) || //
-				(e.getClass() == SshException.class && "Already closed".equals(e.getMessage())) || //
+		if ((e.getClass() == IOException.class && "Pipe closed".equals(e.getMessage())) ||
+				(e.getClass() == SshException.class && "Already closed".equals(e.getMessage())) ||
 				e.getClass() == InterruptedIOException.class) {
 			// This is sshd telling us the client just dropped off while
 			// we were waiting for a read or a write to complete. Either
diff --git a/src/main/java/com/gitblit/wicket/panels/CompressedDownloadsPanel.java b/src/main/java/com/gitblit/wicket/panels/CompressedDownloadsPanel.java
index 0d5864e4..202b9d5a 100644
--- a/src/main/java/com/gitblit/wicket/panels/CompressedDownloadsPanel.java
+++ b/src/main/java/com/gitblit/wicket/panels/CompressedDownloadsPanel.java
@@ -22,9 +22,9 @@ import org.apache.wicket.markup.repeater.Item;
 import org.apache.wicket.markup.repeater.data.DataView;

 import org.apache.wicket.markup.repeater.data.ListDataProvider;

 

+import com.gitblit.Keys;

 import com.gitblit.servlet.DownloadZipServlet;

 import com.gitblit.servlet.DownloadZipServlet.Format;

-import com.gitblit.Keys;

 

 public class CompressedDownloadsPanel extends BasePanel {