From fd9d28b6adc913dc332d321c0e519b9e0b4d46f5 Mon Sep 17 00:00:00 2001 From: James Moger Date: Thu, 2 May 2013 21:44:56 -0400 Subject: Organize imports --- src/main/java/com/gitblit/RpcServlet.java | 2 +- src/main/java/com/gitblit/authority/RequestFocusListener.java | 5 +++-- src/main/java/com/gitblit/utils/RpcUtils.java | 2 +- src/main/java/com/gitblit/wicket/pages/EditTeamPage.java | 2 +- src/main/java/com/gitblit/wicket/pages/LogoutPage.java | 1 - src/main/java/com/gitblit/wicket/panels/HistoryPanel.java | 2 +- src/main/java/com/gitblit/wicket/panels/LogPanel.java | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) (limited to 'src/main/java/com/gitblit') diff --git a/src/main/java/com/gitblit/RpcServlet.java b/src/main/java/com/gitblit/RpcServlet.java index f6368dd0..f31bf862 100644 --- 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; 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 e9368686..82eba6a0 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 ed23dab6..cd80fc45 100644 --- 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; 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 8344d387..26e2509d 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.Model; 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 982de0ec..1028c5a4 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 4d275892..e2b7e723 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.Constants; 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 05397642..6c523be6 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.utils.StringUtils; 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 { -- cgit v1.2.3