From c3f4f124f1b9e45d7696f3c16f958d1c81ff280a Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 21 Apr 2011 21:46:47 -0400
Subject: [PATCH] Use markdown for welcome message. Simplify login page appearance.
---
src/com/gitblit/wicket/models/PathModel.java | 36 +++++++++++++++++++++++++++++-------
1 files changed, 29 insertions(+), 7 deletions(-)
diff --git a/src/com/gitblit/wicket/models/PathModel.java b/src/com/gitblit/wicket/models/PathModel.java
index 3fa0f63..2895d56 100644
--- a/src/com/gitblit/wicket/models/PathModel.java
+++ b/src/com/gitblit/wicket/models/PathModel.java
@@ -2,20 +2,21 @@
import java.io.Serializable;
-import com.gitblit.utils.JGitUtils;
+import org.eclipse.jgit.diff.DiffEntry.ChangeType;
+import com.gitblit.utils.JGitUtils;
public class PathModel implements Serializable, Comparable<PathModel> {
private static final long serialVersionUID = 1L;
-
+
public final String name;
public final String path;
public final long size;
- public final int mode;
+ public final int mode;
public final String commitId;
public boolean isParentPath;
-
+
public PathModel(String name, String path, long size, int mode, String commitId) {
this.name = name;
this.path = path;
@@ -23,11 +24,11 @@
this.mode = mode;
this.commitId = commitId;
}
-
+
public boolean isTree() {
return JGitUtils.isTreeFromMode(mode);
}
-
+
public static PathModel getParentPath(String basePath, String commitId) {
String parentPath = null;
if (basePath.lastIndexOf('/') > -1) {
@@ -40,6 +41,27 @@
@Override
public int compareTo(PathModel o) {
- return path.compareTo(o.path);
+ boolean isTree = isTree();
+ boolean otherTree = o.isTree();
+ if (isTree && otherTree) {
+ return path.compareTo(o.path);
+ } else if (!isTree && !otherTree) {
+ return path.compareTo(o.path);
+ } else if (isTree && !otherTree) {
+ return -1;
+ }
+ return 1;
+ }
+
+ public static class PathChangeModel extends PathModel {
+
+ private static final long serialVersionUID = 1L;
+
+ public final ChangeType changeType;
+
+ public PathChangeModel(String name, String path, long size, int mode, String commitId, ChangeType type) {
+ super(name, path, size, mode, commitId);
+ this.changeType = type;
+ }
}
}
--
Gitblit v1.9.1