Organize imports

diff --git a/src/main/java/com/gitblit/git/GitblitUploadPackFactory.java b/src/main/java/com/gitblit/git/GitblitUploadPackFactory.java
index 7a476775fbd2a445730d7244354a32b8d16ac2e6..ec8562850d72abf608b5604782d7816f3a3954f0 100644 (file)
--- 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 a66c9b47bafc44d472fd9900e31a1752559601aa..d996ea9a9356c2e1ce81573ae87a72824d6acd37 100644 (file)
--- 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 0d5864e446b4ec9d6b3d246babab0c42735a63c2..202b9d5aa82723cac07811095279eb53257770a7 100644 (file)
--- 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;\r
 import org.apache.wicket.markup.repeater.data.ListDataProvider;\r
 \r
+import com.gitblit.Keys;\r
 import com.gitblit.servlet.DownloadZipServlet;\r
 import com.gitblit.servlet.DownloadZipServlet.Format;\r
-import com.gitblit.Keys;\r
 \r
 public class CompressedDownloadsPanel extends BasePanel {\r
 \r

diff --git a/src/test/java/com/gitblit/tests/GitblitUnitTest.java b/src/test/java/com/gitblit/tests/GitblitUnitTest.java
index 6539d656539071b36546546731b0b0a378bde096..9dceaaf498a2d5a1221dce3e4d5553a74b10fe10 100644 (file)
--- a/src/test/java/com/gitblit/tests/GitblitUnitTest.java
+++ b/src/test/java/com/gitblit/tests/GitblitUnitTest.java
@@ -16,13 +16,13 @@
 package com.gitblit.tests;
 
 import com.gitblit.IStoredSettings;
+import com.gitblit.manager.IAuthenticationManager;
 import com.gitblit.manager.IFederationManager;
 import com.gitblit.manager.IGitblit;
 import com.gitblit.manager.INotificationManager;
 import com.gitblit.manager.IProjectManager;
 import com.gitblit.manager.IRepositoryManager;
 import com.gitblit.manager.IRuntimeManager;
-import com.gitblit.manager.IAuthenticationManager;
 import com.gitblit.manager.IUserManager;
 import com.gitblit.servlet.GitblitContext;