From 2a7306a1d92522569a8bb6e5a7c0bcdd5cf4cfaa Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 26 May 2011 17:11:38 -0400
Subject: [PATCH] Findbugs. CodePro Audit. Checkstyle. Unit test refactoring.
---
src/com/gitblit/wicket/models/PathModel.java | 33 +++++++++++++++++++++++++++++----
1 files changed, 29 insertions(+), 4 deletions(-)
diff --git a/src/com/gitblit/wicket/models/PathModel.java b/src/com/gitblit/wicket/models/PathModel.java
index b9a47bf..2edc96c 100644
--- a/src/com/gitblit/wicket/models/PathModel.java
+++ b/src/com/gitblit/wicket/models/PathModel.java
@@ -49,9 +49,23 @@
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
@@ -69,14 +83,25 @@
}
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) {
+ 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