From cb285cbfddfc0b633d6b8cdb4dc0d2bd2b8b51ef Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 05 Jan 2012 17:34:05 -0500
Subject: [PATCH] Fixed bug in receive hook for repositories in subfolders
---
src/com/gitblit/models/TicketModel.java | 56 ++++++++++++++++++++++++++++++++------------------------
1 files changed, 32 insertions(+), 24 deletions(-)
diff --git a/src/com/gitblit/models/TicketModel.java b/src/com/gitblit/models/TicketModel.java
index b284340..b8043c6 100644
--- a/src/com/gitblit/models/TicketModel.java
+++ b/src/com/gitblit/models/TicketModel.java
@@ -21,6 +21,12 @@
import java.util.Date;
import java.util.List;
+/**
+ * TicketModel is a serializable model class that represents a Ticgit ticket.
+ *
+ * @author James Moger
+ *
+ */
public class TicketModel implements Serializable, Comparable<TicketModel> {
private static final long serialVersionUID = 1L;
@@ -50,6 +56,32 @@
}
}
+ @Override
+ public int hashCode() {
+ return id.hashCode();
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (o instanceof TicketModel) {
+ TicketModel other = (TicketModel) o;
+ return id.equals(other.id);
+ }
+ return super.equals(o);
+ }
+
+ @Override
+ public int compareTo(TicketModel o) {
+ return date.compareTo(o.date);
+ }
+
+ /**
+ * Comment is a serializable model class that represents a Ticgit ticket
+ * comment.
+ *
+ * @author James Moger
+ *
+ */
public static class Comment implements Serializable, Comparable<Comment> {
private static final long serialVersionUID = 1L;
@@ -57,11 +89,6 @@
public String text;
public String author;
public Date date;
-
- public Comment(String text, Date date) {
- this.text = text;
- this.date = date;
- }
public Comment(String filename, String content) throws ParseException {
String[] chunks = filename.split("_", -1);
@@ -88,24 +115,5 @@
public int compareTo(Comment o) {
return date.compareTo(o.date);
}
- }
-
- @Override
- public int hashCode() {
- return id.hashCode();
- }
-
- @Override
- public boolean equals(Object o) {
- if (o instanceof TicketModel) {
- TicketModel other = (TicketModel) o;
- return id.equals(other.id);
- }
- return super.equals(o);
- }
-
- @Override
- public int compareTo(TicketModel o) {
- return date.compareTo(o.date);
}
}
--
Gitblit v1.9.1