Browse Source

Cleanup imports and formatting.

tags/v0.5.2
James Moger 13 years ago
parent
commit
671c19d369

+ 1
- 1
src/com/gitblit/utils/FileUtils.java View File

@@ -69,7 +69,7 @@ public class FileUtils {
public static void writeContent(File file, String content) {
try {
OutputStreamWriter os = new OutputStreamWriter(new FileOutputStream(file),
Charset.forName("UTF-8"));
Charset.forName("UTF-8"));
BufferedWriter writer = new BufferedWriter(os);
writer.append(content);
writer.close();

+ 3
- 3
src/com/gitblit/utils/MetricUtils.java View File

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

+ 0
- 1
src/com/gitblit/wicket/WicketUtils.java View File

@@ -36,7 +36,6 @@ import org.apache.wicket.markup.html.image.ContextImage;
import org.apache.wicket.protocol.http.WebRequest;
import org.apache.wicket.resource.ContextRelativeResource;
import org.eclipse.jgit.diff.DiffEntry.ChangeType;
import org.eclipse.jgit.lib.Constants;
import org.wicketstuff.googlecharts.AbstractChartData;
import org.wicketstuff.googlecharts.IChartData;

+ 1
- 1
src/com/gitblit/wicket/pages/TicketsPage.java View File

@@ -64,7 +64,7 @@ public class TicketsPage extends RepositoryPage {
};
add(ticketsView);
}
protected PageParameters newPathParameter(String path) {
return WicketUtils.newPathParameter(repositoryName, objectId, path);
}

+ 0
- 1
src/com/gitblit/wicket/panels/BranchesPanel.java View File

@@ -27,7 +27,6 @@ import org.apache.wicket.markup.repeater.Item;
import org.apache.wicket.markup.repeater.data.DataView;
import org.apache.wicket.markup.repeater.data.ListDataProvider;
import org.apache.wicket.model.StringResourceModel;
import org.eclipse.jgit.lib.Constants;
import org.eclipse.jgit.lib.Repository;
import com.gitblit.SyndicationServlet;

+ 2
- 2
tests/com/gitblit/tests/FileUtilsTest.java View File

@@ -17,10 +17,10 @@ package com.gitblit.tests;
import java.io.File;
import com.gitblit.utils.FileUtils;
import junit.framework.TestCase;
import com.gitblit.utils.FileUtils;
public class FileUtilsTest extends TestCase {
public void testReadContent() throws Exception {

+ 1
- 1
tests/com/gitblit/tests/JGitUtilsTest.java View File

@@ -199,7 +199,7 @@ public class JGitUtilsTest extends TestCase {
}
public void testCreateOrphanedBranch() throws Exception {
Repository repository = JGitUtils.createRepository(GitBlitSuite.REPOSITORIES, "orphantest");
Repository repository = JGitUtils.createRepository(GitBlitSuite.REPOSITORIES, "orphantest");
assertTrue(JGitUtils.createOrphanBranch(repository,
"x" + Long.toHexString(System.currentTimeMillis()).toUpperCase()));
FileUtils.delete(repository.getDirectory(), FileUtils.RECURSIVE);

Loading…
Cancel
Save