Cleanup imports and formatting.

diff --git a/src/com/gitblit/utils/FileUtils.java b/src/com/gitblit/utils/FileUtils.java
index 6644d83cc5041790f3350bde7117d7cc529495a8..73bef34f70c1e472acaf67d1fa2e6ac5d3d12a53 100644 (file)
--- a/src/com/gitblit/utils/FileUtils.java
+++ b/src/com/gitblit/utils/FileUtils.java
@@ -69,7 +69,7 @@ public class FileUtils {
        public static void writeContent(File file, String content) {\r
                try {\r
                        OutputStreamWriter os = new OutputStreamWriter(new FileOutputStream(file),\r
-                                       Charset.forName("UTF-8")); \r
+                                       Charset.forName("UTF-8"));\r
                        BufferedWriter writer = new BufferedWriter(os);\r
                        writer.append(content);\r
                        writer.close();\r

diff --git a/src/com/gitblit/utils/MetricUtils.java b/src/com/gitblit/utils/MetricUtils.java
index bf63a95284fe36fbfc467616e51eb64c561425c0..2919b1520b961ddfcb0e574efee06b46a80cf901 100644 (file)
--- a/src/com/gitblit/utils/MetricUtils.java
+++ b/src/com/gitblit/utils/MetricUtils.java
@@ -25,7 +25,6 @@ import java.util.HashMap;
 import java.util.List;\r
 import java.util.Map;\r
 \r
-import org.eclipse.jgit.lib.Constants;\r
 import org.eclipse.jgit.lib.ObjectId;\r
 import org.eclipse.jgit.lib.Repository;\r
 import org.eclipse.jgit.revwalk.RevCommit;\r
@@ -107,7 +106,7 @@ public class MetricUtils {
                                } else {\r
                                        branchObject = repository.resolve(objectId);\r
                                }\r
-                               \r
+\r
                                revWalk = new RevWalk(repository);\r
                                RevCommit lastCommit = revWalk.parseCommit(branchObject);\r
                                revWalk.markStart(lastCommit);\r
@@ -115,7 +114,8 @@ public class MetricUtils {
                                DateFormat df;\r
                                if (StringUtils.isEmpty(dateFormat)) {\r
                                        // dynamically determine date format\r
-                                       RevCommit firstCommit = JGitUtils.getFirstCommit(repository, branchObject.getName());\r
+                                       RevCommit firstCommit = JGitUtils.getFirstCommit(repository,\r
+                                                       branchObject.getName());\r
                                        int diffDays = (lastCommit.getCommitTime() - firstCommit.getCommitTime())\r
                                                        / (60 * 60 * 24);\r
                                        total.duration = diffDays;\r

diff --git a/src/com/gitblit/wicket/WicketUtils.java b/src/com/gitblit/wicket/WicketUtils.java
index 11522634c205d7f936a0f24dcd75b5b46f2957e8..614cb7d1deba59ee18d7da0dff74b91995a631a0 100644 (file)
--- a/src/com/gitblit/wicket/WicketUtils.java
+++ b/src/com/gitblit/wicket/WicketUtils.java
@@ -36,7 +36,6 @@ import org.apache.wicket.markup.html.image.ContextImage;
 import org.apache.wicket.protocol.http.WebRequest;\r
 import org.apache.wicket.resource.ContextRelativeResource;\r
 import org.eclipse.jgit.diff.DiffEntry.ChangeType;\r
-import org.eclipse.jgit.lib.Constants;\r
 import org.wicketstuff.googlecharts.AbstractChartData;\r
 import org.wicketstuff.googlecharts.IChartData;\r
 \r

diff --git a/src/com/gitblit/wicket/pages/TicketsPage.java b/src/com/gitblit/wicket/pages/TicketsPage.java
index 68c28525f50017557caac924c678dc215d709e56..0ac8114b6b2fb237670ac1ac215b6c2a9a548854 100644 (file)
--- a/src/com/gitblit/wicket/pages/TicketsPage.java
+++ b/src/com/gitblit/wicket/pages/TicketsPage.java
@@ -64,7 +64,7 @@ public class TicketsPage extends RepositoryPage {
                };\r
                add(ticketsView);\r
        }\r
-       \r
+\r
        protected PageParameters newPathParameter(String path) {\r
                return WicketUtils.newPathParameter(repositoryName, objectId, path);\r
        }\r

diff --git a/src/com/gitblit/wicket/panels/BranchesPanel.java b/src/com/gitblit/wicket/panels/BranchesPanel.java
index d7843548690fff7aab060640ece530e2670f63be..d45c0e6267f143242261c6ddd9c2dd7c751e2d61 100644 (file)
--- a/src/com/gitblit/wicket/panels/BranchesPanel.java
+++ b/src/com/gitblit/wicket/panels/BranchesPanel.java
@@ -27,7 +27,6 @@ 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
 import org.apache.wicket.model.StringResourceModel;\r
-import org.eclipse.jgit.lib.Constants;\r
 import org.eclipse.jgit.lib.Repository;\r
 \r
 import com.gitblit.SyndicationServlet;\r

diff --git a/tests/com/gitblit/tests/FileUtilsTest.java b/tests/com/gitblit/tests/FileUtilsTest.java
index 4e416cb775f82ebc882f7127ef66e12ded62e930..63d0f330f5313b5019d392ccbad166d458903431 100644 (file)
--- a/tests/com/gitblit/tests/FileUtilsTest.java
+++ b/tests/com/gitblit/tests/FileUtilsTest.java
@@ -17,10 +17,10 @@ package com.gitblit.tests;
 \r
 import java.io.File;\r
 \r
-import com.gitblit.utils.FileUtils;\r
-\r
 import junit.framework.TestCase;\r
 \r
+import com.gitblit.utils.FileUtils;\r
+\r
 public class FileUtilsTest extends TestCase {\r
 \r
        public void testReadContent() throws Exception {\r

diff --git a/tests/com/gitblit/tests/JGitUtilsTest.java b/tests/com/gitblit/tests/JGitUtilsTest.java
index 44d725422ee24d3c94aa38f2b2f69d0c5049dccb..0d7aa635f8bdff9cf50e3c7d842192dc28609811 100644 (file)
--- a/tests/com/gitblit/tests/JGitUtilsTest.java
+++ b/tests/com/gitblit/tests/JGitUtilsTest.java
@@ -199,7 +199,7 @@ public class JGitUtilsTest extends TestCase {
        }\r
 \r
        public void testCreateOrphanedBranch() throws Exception {\r
-               Repository repository = JGitUtils.createRepository(GitBlitSuite.REPOSITORIES, "orphantest");            \r
+               Repository repository = JGitUtils.createRepository(GitBlitSuite.REPOSITORIES, "orphantest");\r
                assertTrue(JGitUtils.createOrphanBranch(repository,\r
                                "x" + Long.toHexString(System.currentTimeMillis()).toUpperCase()));\r
                FileUtils.delete(repository.getDirectory(), FileUtils.RECURSIVE);\r