From 17c417dad5c7be28df4b6e1fd25ec56b484faaff Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 26 May 2011 17:22:03 -0400
Subject: [PATCH] Changed git.otherUrls to web.otherUrls.
---
src/com/gitblit/wicket/models/PathModel.java | 78 +++++++++++++++++++++++++++++++++++----
1 files changed, 70 insertions(+), 8 deletions(-)
diff --git a/src/com/gitblit/wicket/models/PathModel.java b/src/com/gitblit/wicket/models/PathModel.java
index 3fa0f63..2edc96c 100644
--- a/src/com/gitblit/wicket/models/PathModel.java
+++ b/src/com/gitblit/wicket/models/PathModel.java
@@ -1,21 +1,37 @@
+/*
+ * Copyright 2011 gitblit.com.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package com.gitblit.wicket.models;
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,23 +39,69 @@
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) {
parentPath = basePath.substring(0, basePath.lastIndexOf('/'));
}
- PathModel model = new PathModel("..", parentPath, 0, 0040000, commitId);
+ PathModel model = new PathModel("..", parentPath, 0, 40000, commitId);
model.isParentPath = true;
return model;
}
@Override
+ public int hashCode() {
+ return commitId.hashCode() + path.hashCode();
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (o instanceof PathModel) {
+ PathModel other = (PathModel) o;
+ return this.path.equals(other.path);
+ }
+ return super.equals(o);
+ }
+
+ @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;
+ }
+
+ @Override
+ public int hashCode() {
+ return super.hashCode();
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ return super.equals(o);
+ }
}
}
--
Gitblit v1.9.1