Organize imports

diff --git a/src/main/java/com/gitblit/RpcServlet.java b/src/main/java/com/gitblit/RpcServlet.java
index f6368dd097a9e0cb8748bca1d58285e155faa81f..f31bf8628215ac854cb88f2f4df5990600ca9537 100644 (file)
--- a/src/main/java/com/gitblit/RpcServlet.java
+++ b/src/main/java/com/gitblit/RpcServlet.java
@@ -30,8 +30,8 @@ import javax.servlet.http.HttpServletResponse;
 import org.eclipse.jgit.lib.Repository;\r
 \r
 import com.gitblit.Constants.RpcRequest;\r
-import com.gitblit.models.RegistrantAccessPermission;\r
 import com.gitblit.models.RefModel;\r
+import com.gitblit.models.RegistrantAccessPermission;\r
 import com.gitblit.models.RepositoryModel;\r
 import com.gitblit.models.ServerSettings;\r
 import com.gitblit.models.TeamModel;\r

diff --git a/src/main/java/com/gitblit/authority/RequestFocusListener.java b/src/main/java/com/gitblit/authority/RequestFocusListener.java
index e93686863ba2ecac89de4dadd8ae44cb88a0f004..82eba6a0a4502ef47e0aa3d3c083d46694dbe46f 100644 (file)
--- a/src/main/java/com/gitblit/authority/RequestFocusListener.java
+++ b/src/main/java/com/gitblit/authority/RequestFocusListener.java
@@ -14,8 +14,9 @@
  * limitations under the License.\r
  */\r
 package com.gitblit.authority;\r
-import javax.swing.*;\r
-import javax.swing.event.*;\r
+import javax.swing.JComponent;\r
+import javax.swing.event.AncestorEvent;\r
+import javax.swing.event.AncestorListener;\r
 \r
 /**\r
  *  Convenience class to request focus on a component.\r

diff --git a/src/main/java/com/gitblit/utils/RpcUtils.java b/src/main/java/com/gitblit/utils/RpcUtils.java
index ed23dab62ca06e93550966a54c1d6fbd7ad72380..cd80fc4550b4fe26e924f417aa78121a918d003c 100644 (file)
--- a/src/main/java/com/gitblit/utils/RpcUtils.java
+++ b/src/main/java/com/gitblit/utils/RpcUtils.java
@@ -25,11 +25,11 @@ import java.util.Map;
 import com.gitblit.Constants;\r
 import com.gitblit.Constants.RpcRequest;\r
 import com.gitblit.GitBlitException.UnknownRequestException;\r
-import com.gitblit.models.RegistrantAccessPermission;\r
 import com.gitblit.models.FederationModel;\r
 import com.gitblit.models.FederationProposal;\r
 import com.gitblit.models.FederationSet;\r
 import com.gitblit.models.FeedModel;\r
+import com.gitblit.models.RegistrantAccessPermission;\r
 import com.gitblit.models.RepositoryModel;\r
 import com.gitblit.models.ServerSettings;\r
 import com.gitblit.models.ServerStatus;\r

diff --git a/src/main/java/com/gitblit/wicket/pages/EditTeamPage.java b/src/main/java/com/gitblit/wicket/pages/EditTeamPage.java
index 8344d387e1c89bb25934790e7c26202517954fca..26e2509de9746eb7d68d89782026717bf23b85ee 100644 (file)
--- a/src/main/java/com/gitblit/wicket/pages/EditTeamPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/EditTeamPage.java
@@ -36,10 +36,10 @@ import org.apache.wicket.model.Model;
 import org.apache.wicket.model.util.CollectionModel;\r
 import org.apache.wicket.model.util.ListModel;\r
 \r
+import com.gitblit.Constants.RegistrantType;\r
 import com.gitblit.GitBlit;\r
 import com.gitblit.GitBlitException;\r
 import com.gitblit.Keys;\r
-import com.gitblit.Constants.RegistrantType;\r
 import com.gitblit.models.RegistrantAccessPermission;\r
 import com.gitblit.models.TeamModel;\r
 import com.gitblit.utils.StringUtils;\r

diff --git a/src/main/java/com/gitblit/wicket/pages/LogoutPage.java b/src/main/java/com/gitblit/wicket/pages/LogoutPage.java
index 982de0ecad1872b598c9ec3d4dbf0b913cacf656..1028c5a481a3d6458d396f53bd66cb99b7118f7b 100644 (file)
--- a/src/main/java/com/gitblit/wicket/pages/LogoutPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/LogoutPage.java
@@ -15,7 +15,6 @@
  */\r
 package com.gitblit.wicket.pages;\r
 \r
-import org.apache.wicket.markup.html.WebPage;\r
 import org.apache.wicket.protocol.http.WebRequest;\r
 import org.apache.wicket.protocol.http.WebResponse;\r
 \r

diff --git a/src/main/java/com/gitblit/wicket/panels/HistoryPanel.java b/src/main/java/com/gitblit/wicket/panels/HistoryPanel.java
index 4d275892706b7abad20d0b966988dbf903e350e6..e2b7e72304b1e631443f91518f87c5f725b7a962 100644 (file)
--- a/src/main/java/com/gitblit/wicket/panels/HistoryPanel.java
+++ b/src/main/java/com/gitblit/wicket/panels/HistoryPanel.java
@@ -42,9 +42,9 @@ import com.gitblit.Constants;
 import com.gitblit.GitBlit;\r
 import com.gitblit.Keys;\r
 import com.gitblit.models.PathModel;\r
-import com.gitblit.models.SubmoduleModel;\r
 import com.gitblit.models.PathModel.PathChangeModel;\r
 import com.gitblit.models.RefModel;\r
+import com.gitblit.models.SubmoduleModel;\r
 import com.gitblit.utils.JGitUtils;\r
 import com.gitblit.utils.StringUtils;\r
 import com.gitblit.wicket.WicketUtils;\r

diff --git a/src/main/java/com/gitblit/wicket/panels/LogPanel.java b/src/main/java/com/gitblit/wicket/panels/LogPanel.java
index 05397642866dd1739cae6452daace6ed81894c6f..6c523be68e8c6f30ac17a76befd3945ece9cc553 100644 (file)
--- a/src/main/java/com/gitblit/wicket/panels/LogPanel.java
+++ b/src/main/java/com/gitblit/wicket/panels/LogPanel.java
@@ -38,8 +38,8 @@ import com.gitblit.utils.StringUtils;
 import com.gitblit.wicket.WicketUtils;\r
 import com.gitblit.wicket.pages.CommitDiffPage;\r
 import com.gitblit.wicket.pages.CommitPage;\r
-import com.gitblit.wicket.pages.LogPage;\r
 import com.gitblit.wicket.pages.GitSearchPage;\r
+import com.gitblit.wicket.pages.LogPage;\r
 import com.gitblit.wicket.pages.TreePage;\r
 \r
 public class LogPanel extends BasePanel {\r

diff --git a/src/test/java/com/gitblit/tests/FanoutServiceTest.java b/src/test/java/com/gitblit/tests/FanoutServiceTest.java
index 28e5d82d83f78e270ef401171bd81f9ae4fe5574..cd094dacc8339e6397c365aca20e86f77626db39 100644 (file)
--- a/src/test/java/com/gitblit/tests/FanoutServiceTest.java
+++ b/src/test/java/com/gitblit/tests/FanoutServiceTest.java
@@ -25,7 +25,6 @@ import java.util.concurrent.atomic.AtomicInteger;
 \r
 import org.junit.Test;\r
 \r
-import com.gitblit.fanout.FanoutService;\r
 import com.gitblit.fanout.FanoutClient;\r
 import com.gitblit.fanout.FanoutClient.FanoutAdapter;\r
 import com.gitblit.fanout.FanoutNioService;\r

diff --git a/src/test/java/com/gitblit/tests/PermissionsTest.java b/src/test/java/com/gitblit/tests/PermissionsTest.java
index a094f9a970538d6750037d88f479cac61169e7c2..8e2ed9778b2bf399da70ee063b26a59d6c93d420 100644 (file)
--- a/src/test/java/com/gitblit/tests/PermissionsTest.java
+++ b/src/test/java/com/gitblit/tests/PermissionsTest.java
@@ -18,7 +18,6 @@ package com.gitblit.tests;
 import java.util.Date;
 
 import org.junit.Assert;
-
 import org.junit.Test;
 
 import com.gitblit.Constants.AccessPermission;

diff --git a/src/test/java/com/gitblit/tests/RpcTests.java b/src/test/java/com/gitblit/tests/RpcTests.java
index 3241a8abbf790cc390724ca612afaea5f3119a62..f8fdf6f90a40fd46577758c35c43f40de110e583 100644 (file)
--- a/src/test/java/com/gitblit/tests/RpcTests.java
+++ b/src/test/java/com/gitblit/tests/RpcTests.java
@@ -40,10 +40,10 @@ import com.gitblit.Constants.RegistrantType;
 import com.gitblit.GitBlitException.UnauthorizedException;\r
 import com.gitblit.Keys;\r
 import com.gitblit.RpcServlet;\r
-import com.gitblit.models.RegistrantAccessPermission;\r
 import com.gitblit.models.FederationModel;\r
 import com.gitblit.models.FederationProposal;\r
 import com.gitblit.models.FederationSet;\r
+import com.gitblit.models.RegistrantAccessPermission;\r
 import com.gitblit.models.RepositoryModel;\r
 import com.gitblit.models.ServerSettings;\r
 import com.gitblit.models.ServerStatus;\r

diff --git a/src/test/java/de/akquinet/devops/GitblitRunnable.java b/src/test/java/de/akquinet/devops/GitblitRunnable.java
index 66a31e3c11cc9896043d0c440bb58fcbc2e8f6d9..32983d8d5a807e7b0ce402a0abcfd0b55ea2d675 100644 (file)
--- a/src/test/java/de/akquinet/devops/GitblitRunnable.java
+++ b/src/test/java/de/akquinet/devops/GitblitRunnable.java
@@ -18,7 +18,6 @@ package de.akquinet.devops;
 import java.net.InetAddress;
 import java.net.ServerSocket;
 
-import com.gitblit.GitBlitServer;
 import com.gitblit.tests.GitBlitSuite;
 
 /**

diff --git a/src/test/java/de/akquinet/devops/LaunchWithUITestConfig.java b/src/test/java/de/akquinet/devops/LaunchWithUITestConfig.java
index aebde9a2f37ef86496fb98fd68273f515e54ec03..d144a243cdefa6f49576386b9f44db05a92ec915 100644 (file)
--- a/src/test/java/de/akquinet/devops/LaunchWithUITestConfig.java
+++ b/src/test/java/de/akquinet/devops/LaunchWithUITestConfig.java
@@ -26,8 +26,6 @@ import junit.framework.Assert;
 import org.junit.Test;
 
 import com.gitblit.Constants;
-import com.gitblit.GitBlitServer;
-import com.gitblit.tests.GitBlitSuite;
 
 /**
  * This test checks if it is possible to run two server instances in the same