From fd9d28b6adc913dc332d321c0e519b9e0b4d46f5 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 02 May 2013 21:44:56 -0400
Subject: [PATCH] Organize imports
---
src/main/java/com/gitblit/utils/RpcUtils.java | 2 +-
src/main/java/com/gitblit/wicket/panels/LogPanel.java | 2 +-
src/main/java/com/gitblit/wicket/pages/LogoutPage.java | 1 -
src/main/java/com/gitblit/wicket/pages/EditTeamPage.java | 2 +-
src/test/java/com/gitblit/tests/RpcTests.java | 2 +-
src/test/java/com/gitblit/tests/FanoutServiceTest.java | 1 -
src/test/java/de/akquinet/devops/GitblitRunnable.java | 1 -
src/main/java/com/gitblit/wicket/panels/HistoryPanel.java | 2 +-
src/main/java/com/gitblit/authority/RequestFocusListener.java | 5 +++--
src/test/java/com/gitblit/tests/PermissionsTest.java | 1 -
src/main/java/com/gitblit/RpcServlet.java | 2 +-
src/test/java/de/akquinet/devops/LaunchWithUITestConfig.java | 2 --
12 files changed, 9 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/gitblit/RpcServlet.java b/src/main/java/com/gitblit/RpcServlet.java
index f6368dd..f31bf86 100644
--- a/src/main/java/com/gitblit/RpcServlet.java
+++ b/src/main/java/com/gitblit/RpcServlet.java
@@ -30,8 +30,8 @@
import org.eclipse.jgit.lib.Repository;
import com.gitblit.Constants.RpcRequest;
-import com.gitblit.models.RegistrantAccessPermission;
import com.gitblit.models.RefModel;
+import com.gitblit.models.RegistrantAccessPermission;
import com.gitblit.models.RepositoryModel;
import com.gitblit.models.ServerSettings;
import com.gitblit.models.TeamModel;
diff --git a/src/main/java/com/gitblit/authority/RequestFocusListener.java b/src/main/java/com/gitblit/authority/RequestFocusListener.java
index e936868..82eba6a 100644
--- 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.
*/
package com.gitblit.authority;
-import javax.swing.*;
-import javax.swing.event.*;
+import javax.swing.JComponent;
+import javax.swing.event.AncestorEvent;
+import javax.swing.event.AncestorListener;
/**
* Convenience class to request focus on a component.
diff --git a/src/main/java/com/gitblit/utils/RpcUtils.java b/src/main/java/com/gitblit/utils/RpcUtils.java
index ed23dab..cd80fc4 100644
--- a/src/main/java/com/gitblit/utils/RpcUtils.java
+++ b/src/main/java/com/gitblit/utils/RpcUtils.java
@@ -25,11 +25,11 @@
import com.gitblit.Constants;
import com.gitblit.Constants.RpcRequest;
import com.gitblit.GitBlitException.UnknownRequestException;
-import com.gitblit.models.RegistrantAccessPermission;
import com.gitblit.models.FederationModel;
import com.gitblit.models.FederationProposal;
import com.gitblit.models.FederationSet;
import com.gitblit.models.FeedModel;
+import com.gitblit.models.RegistrantAccessPermission;
import com.gitblit.models.RepositoryModel;
import com.gitblit.models.ServerSettings;
import com.gitblit.models.ServerStatus;
diff --git a/src/main/java/com/gitblit/wicket/pages/EditTeamPage.java b/src/main/java/com/gitblit/wicket/pages/EditTeamPage.java
index 8344d38..26e2509 100644
--- 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.util.CollectionModel;
import org.apache.wicket.model.util.ListModel;
+import com.gitblit.Constants.RegistrantType;
import com.gitblit.GitBlit;
import com.gitblit.GitBlitException;
import com.gitblit.Keys;
-import com.gitblit.Constants.RegistrantType;
import com.gitblit.models.RegistrantAccessPermission;
import com.gitblit.models.TeamModel;
import com.gitblit.utils.StringUtils;
diff --git a/src/main/java/com/gitblit/wicket/pages/LogoutPage.java b/src/main/java/com/gitblit/wicket/pages/LogoutPage.java
index 982de0e..1028c5a 100644
--- a/src/main/java/com/gitblit/wicket/pages/LogoutPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/LogoutPage.java
@@ -15,7 +15,6 @@
*/
package com.gitblit.wicket.pages;
-import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.protocol.http.WebRequest;
import org.apache.wicket.protocol.http.WebResponse;
diff --git a/src/main/java/com/gitblit/wicket/panels/HistoryPanel.java b/src/main/java/com/gitblit/wicket/panels/HistoryPanel.java
index 4d27589..e2b7e72 100644
--- 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.GitBlit;
import com.gitblit.Keys;
import com.gitblit.models.PathModel;
-import com.gitblit.models.SubmoduleModel;
import com.gitblit.models.PathModel.PathChangeModel;
import com.gitblit.models.RefModel;
+import com.gitblit.models.SubmoduleModel;
import com.gitblit.utils.JGitUtils;
import com.gitblit.utils.StringUtils;
import com.gitblit.wicket.WicketUtils;
diff --git a/src/main/java/com/gitblit/wicket/panels/LogPanel.java b/src/main/java/com/gitblit/wicket/panels/LogPanel.java
index 0539764..6c523be 100644
--- 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.wicket.WicketUtils;
import com.gitblit.wicket.pages.CommitDiffPage;
import com.gitblit.wicket.pages.CommitPage;
-import com.gitblit.wicket.pages.LogPage;
import com.gitblit.wicket.pages.GitSearchPage;
+import com.gitblit.wicket.pages.LogPage;
import com.gitblit.wicket.pages.TreePage;
public class LogPanel extends BasePanel {
diff --git a/src/test/java/com/gitblit/tests/FanoutServiceTest.java b/src/test/java/com/gitblit/tests/FanoutServiceTest.java
index 28e5d82..cd094da 100644
--- a/src/test/java/com/gitblit/tests/FanoutServiceTest.java
+++ b/src/test/java/com/gitblit/tests/FanoutServiceTest.java
@@ -25,7 +25,6 @@
import org.junit.Test;
-import com.gitblit.fanout.FanoutService;
import com.gitblit.fanout.FanoutClient;
import com.gitblit.fanout.FanoutClient.FanoutAdapter;
import com.gitblit.fanout.FanoutNioService;
diff --git a/src/test/java/com/gitblit/tests/PermissionsTest.java b/src/test/java/com/gitblit/tests/PermissionsTest.java
index a094f9a..8e2ed97 100644
--- a/src/test/java/com/gitblit/tests/PermissionsTest.java
+++ b/src/test/java/com/gitblit/tests/PermissionsTest.java
@@ -18,7 +18,6 @@
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 3241a8a..f8fdf6f 100644
--- 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.GitBlitException.UnauthorizedException;
import com.gitblit.Keys;
import com.gitblit.RpcServlet;
-import com.gitblit.models.RegistrantAccessPermission;
import com.gitblit.models.FederationModel;
import com.gitblit.models.FederationProposal;
import com.gitblit.models.FederationSet;
+import com.gitblit.models.RegistrantAccessPermission;
import com.gitblit.models.RepositoryModel;
import com.gitblit.models.ServerSettings;
import com.gitblit.models.ServerStatus;
diff --git a/src/test/java/de/akquinet/devops/GitblitRunnable.java b/src/test/java/de/akquinet/devops/GitblitRunnable.java
index 66a31e3..32983d8 100644
--- a/src/test/java/de/akquinet/devops/GitblitRunnable.java
+++ b/src/test/java/de/akquinet/devops/GitblitRunnable.java
@@ -18,7 +18,6 @@
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 aebde9a..d144a24 100644
--- a/src/test/java/de/akquinet/devops/LaunchWithUITestConfig.java
+++ b/src/test/java/de/akquinet/devops/LaunchWithUITestConfig.java
@@ -26,8 +26,6 @@
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
--
Gitblit v1.9.1