Unit testing.

11 files changed, 28 insertions, 27 deletions

diff --git a/src/com/gitblit/Constants.java b/src/com/gitblit/Constants.java
index 3589f491..55232842 100644
--- a/src/com/gitblit/Constants.java
+++ b/src/com/gitblit/Constants.java
@@ -38,7 +38,7 @@ public class Constants {
 	public static final String ZIP_SERVLET_PATH = "/zip/";

 

 	public static final String BORDER = "***********************************************************";

-	

+

 	public static enum AccessRestrictionType {

 		NONE, PUSH, CLONE, VIEW;

 

diff --git a/src/com/gitblit/FileSettings.java b/src/com/gitblit/FileSettings.java
index 393e76c0..01176c03 100644
--- a/src/com/gitblit/FileSettings.java
+++ b/src/com/gitblit/FileSettings.java
@@ -35,7 +35,7 @@ public class FileSettings implements IStoredSettings {
 	private final Logger logger = LoggerFactory.getLogger(FileSettings.class);

 

 	private final File propertiesFile;

-	

+

 	private Properties properties = new Properties();

 

 	private long lastread;

@@ -43,7 +43,7 @@ public class FileSettings implements IStoredSettings {
 	public FileSettings(String file) {

 		this.propertiesFile = new File(file);

 	}

-	

+

 	@Override

 	public List<String> getAllKeys(String startingWith) {

 		startingWith = startingWith.toLowerCase();

@@ -144,7 +144,7 @@ public class FileSettings implements IStoredSettings {
 		return strings;

 	}

 

-	private synchronized Properties read() {		

+	private synchronized Properties read() {

 		if (propertiesFile.exists() && (propertiesFile.lastModified() > lastread)) {

 			FileInputStream is = null;

 			try {

diff --git a/src/com/gitblit/GitBlitServer.java b/src/com/gitblit/GitBlitServer.java
index 28b16279..928bf7e6 100644
--- a/src/com/gitblit/GitBlitServer.java
+++ b/src/com/gitblit/GitBlitServer.java
@@ -297,8 +297,9 @@ public class GitBlitServer {
 			handler = rootContext;

 		}

 

-		logger.info("Git repositories folder " + new File(params.repositoriesFolder).getAbsolutePath());

-		

+		logger.info("Git repositories folder "

+				+ new File(params.repositoriesFolder).getAbsolutePath());

+

 		// Set the server's contexts

 		server.setHandler(handler);

 

@@ -384,7 +385,7 @@ public class GitBlitServer {
 		private final ServerSocket socket;

 

 		private final Server server;

-		

+

 		private final Logger logger = LoggerFactory.getLogger(ShutdownMonitorThread.class);

 

 		public ShutdownMonitorThread(Server server, Params params) {

@@ -424,7 +425,7 @@ public class GitBlitServer {
 

 	@Parameters(separators = " ")

 	private static class Params {

-		

+

 		private static final FileSettings FILESETTINGS = new FileSettings(Constants.PROPERTIES_FILE);

 

 		/*

diff --git a/src/com/gitblit/MakeCertificate.java b/src/com/gitblit/MakeCertificate.java
index cd01643e..17124b32 100644
--- a/src/com/gitblit/MakeCertificate.java
+++ b/src/com/gitblit/MakeCertificate.java
@@ -44,7 +44,7 @@ import com.beust.jcommander.Parameters;
 import com.gitblit.utils.TimeUtils;

 

 public class MakeCertificate {

-	

+

 	private static final String BC = org.bouncycastle.jce.provider.BouncyCastleProvider.PROVIDER_NAME;

 

 	public static void main(String... args) {

@@ -157,7 +157,7 @@ public class MakeCertificate {
 	private static class Params {

 

 		private static final FileSettings FILESETTINGS = new FileSettings(Constants.PROPERTIES_FILE);

-		

+

 		@Parameter(names = { "--alias" }, description = "Server alias", required = true)

 		public String alias;

 

diff --git a/src/com/gitblit/utils/ByteFormat.java b/src/com/gitblit/utils/ByteFormat.java
index fee645c7..97b77bde 100644
--- a/src/com/gitblit/utils/ByteFormat.java
+++ b/src/com/gitblit/utils/ByteFormat.java
@@ -26,7 +26,7 @@ public class ByteFormat extends Format {
 
 	public ByteFormat() {
 	}
-	
+
 	public String format(long value) {
 		return format(new Long(value));
 	}
@@ -51,7 +51,7 @@ public class ByteFormat extends Format {
 		}
 		return buf;
 	}
-	
+
 	public Object parseObject(String source, ParsePosition pos) {
 		return null;
 	}
diff --git a/src/com/gitblit/utils/DiffUtils.java b/src/com/gitblit/utils/DiffUtils.java
index c9d0fc36..969cb916 100644
--- a/src/com/gitblit/utils/DiffUtils.java
+++ b/src/com/gitblit/utils/DiffUtils.java
@@ -35,23 +35,23 @@ import com.gitblit.utils.JGitUtils.DiffOutputType;
 public class DiffUtils {

 

 	private static final Logger LOGGER = LoggerFactory.getLogger(DiffUtils.class);

-	

+

 	public static String getCommitDiff(Repository r, RevCommit commit, DiffOutputType outputType) {

-		return getCommitDiff(r, null, commit, null, outputType);

+		return getDiff(r, null, commit, null, outputType);

 	}

 

-	public static String getCommitDiff(Repository r, RevCommit commit, String path,

+	public static String getDiff(Repository r, RevCommit commit, String path,

 			DiffOutputType outputType) {

-		return getCommitDiff(r, null, commit, path, outputType);

+		return getDiff(r, null, commit, path, outputType);

 	}

 

-	public static String getCommitDiff(Repository r, RevCommit baseCommit, RevCommit commit,

+	public static String getDiff(Repository r, RevCommit baseCommit, RevCommit commit,

 			DiffOutputType outputType) {

-		return getCommitDiff(r, baseCommit, commit, null, outputType);

+		return getDiff(r, baseCommit, commit, null, outputType);

 	}

 

-	public static String getCommitDiff(Repository r, RevCommit baseCommit, RevCommit commit,

-			String path, DiffOutputType outputType) {

+	public static String getDiff(Repository r, RevCommit baseCommit, RevCommit commit, String path,

+			DiffOutputType outputType) {

 		try {

 			RevTree baseTree;

 			if (baseCommit == null) {

diff --git a/src/com/gitblit/utils/JGitUtils.java b/src/com/gitblit/utils/JGitUtils.java
index f99fbfdd..ecf12e7f 100644
--- a/src/com/gitblit/utils/JGitUtils.java
+++ b/src/com/gitblit/utils/JGitUtils.java
@@ -186,7 +186,7 @@ public class JGitUtils {
 		if (r != null && r.getDirectory().exists()) {

 			return new File(r.getDirectory(), Constants.R_HEADS).list().length > 0;

 		}

-		return false;		

+		return false;

 	}

 

 	public static Date getLastChange(Repository r) {

diff --git a/src/com/gitblit/wicket/pages/BlobDiffPage.java b/src/com/gitblit/wicket/pages/BlobDiffPage.java
index 4bd61d5c..b94da011 100644
--- a/src/com/gitblit/wicket/pages/BlobDiffPage.java
+++ b/src/com/gitblit/wicket/pages/BlobDiffPage.java
@@ -48,13 +48,13 @@ public class BlobDiffPage extends RepositoryPage {
 		String diff;

 		if (StringUtils.isEmpty(baseObjectId)) {

 			// use first parent

-			diff = DiffUtils.getCommitDiff(r, commit, blobPath, diffType);

+			diff = DiffUtils.getDiff(r, commit, blobPath, diffType);

 			add(new BookmarkablePageLink<Void>("patchLink", PatchPage.class,

 					WicketUtils.newPathParameter(repositoryName, objectId, blobPath)));

 		} else {

 			// base commit specified

 			RevCommit baseCommit = JGitUtils.getCommit(r, baseObjectId);

-			diff = DiffUtils.getCommitDiff(r, baseCommit, commit, blobPath, diffType);

+			diff = DiffUtils.getDiff(r, baseCommit, commit, blobPath, diffType);

 			add(new BookmarkablePageLink<Void>("patchLink", PatchPage.class,

 					WicketUtils.newBlobDiffParameter(repositoryName, baseObjectId, objectId,

 							blobPath)));

diff --git a/src/com/gitblit/wicket/pages/EditUserPage.java b/src/com/gitblit/wicket/pages/EditUserPage.java
index fe40a3df..eafec05d 100644
--- a/src/com/gitblit/wicket/pages/EditUserPage.java
+++ b/src/com/gitblit/wicket/pages/EditUserPage.java
@@ -143,7 +143,7 @@ public class EditUserPage extends BasePage {
 					repos.add(selectedRepositories.next().toLowerCase());

 				}

 				userModel.repositories.clear();

-				userModel.repositories.addAll(repos);				

+				userModel.repositories.addAll(repos);

 				try {

 					GitBlit.self().editUserModel(oldName, userModel, isCreate);

 				} catch (GitBlitException e) {

diff --git a/src/com/gitblit/wicket/pages/LoginPage.java b/src/com/gitblit/wicket/pages/LoginPage.java
index 56e979ce..971ba327 100644
--- a/src/com/gitblit/wicket/pages/LoginPage.java
+++ b/src/com/gitblit/wicket/pages/LoginPage.java
@@ -45,12 +45,12 @@ public class LoginPage extends WebPage {
 			setRedirect(true);

 			setResponsePage(getApplication().getHomePage());

 		}

-		

+

 		add(new Label("title", GitBlit.getString(Keys.web.siteName, Constants.NAME)));

 		add(new Label("name", Constants.NAME));

 

 		StatelessForm<Void> loginForm = new StatelessForm<Void>("loginForm") {

-			

+

 			private static final long serialVersionUID = 1L;

 

 			@Override

diff --git a/src/com/gitblit/wicket/panels/PathBreadcrumbsPanel.java b/src/com/gitblit/wicket/panels/PathBreadcrumbsPanel.java
index bc98e25c..f6c0e4f8 100644
--- a/src/com/gitblit/wicket/panels/PathBreadcrumbsPanel.java
+++ b/src/com/gitblit/wicket/panels/PathBreadcrumbsPanel.java
@@ -87,6 +87,6 @@ public class PathBreadcrumbsPanel extends Panel {
 			this.name = name;

 			this.path = path;

 			this.isLeaf = isLeaf;

-		}		

+		}

 	}

 }
\ No newline at end of file