From 9effe1630d97039b3e01cd9b58ed07e75be1d63c Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Mon, 25 Feb 2013 08:40:30 -0500
Subject: [PATCH] Merge pull request #75 from thefake/master
---
src/com/gitblit/models/ForkModel.java | 13 +++++--------
1 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/src/com/gitblit/models/ForkModel.java b/src/com/gitblit/models/ForkModel.java
index b394396..849986c 100644
--- a/src/com/gitblit/models/ForkModel.java
+++ b/src/com/gitblit/models/ForkModel.java
@@ -32,20 +32,17 @@
private static final long serialVersionUID = 1L;
- public final String originRepository;
-
- public final String repository;
+ public final RepositoryModel repository;
public final List<ForkModel> forks;
- public ForkModel(String origin, String repository) {
- this.originRepository = origin;
+ public ForkModel(RepositoryModel repository) {
this.repository = repository;
this.forks = new ArrayList<ForkModel>();
}
public boolean isRoot() {
- return StringUtils.isEmpty(originRepository);
+ return StringUtils.isEmpty(repository.originRepository);
}
public boolean isNode() {
@@ -57,7 +54,7 @@
}
public boolean isPersonalRepository() {
- return repository.charAt(0) == '~';
+ return repository.isPersonalRepository();
}
@Override
@@ -75,6 +72,6 @@
@Override
public String toString() {
- return repository;
+ return repository.toString();
}
}
--
Gitblit v1.9.1