From cb946fa57e9dd4ca0853f079331c73dc0331c1e7 Mon Sep 17 00:00:00 2001 From: Florian Zschocke Date: Wed, 10 Jul 2013 09:14:29 +0200 Subject: Refactor logic for user repository path into one class. Gather logic for building the path/name of a personal user repository into one class. --- src/main/java/com/gitblit/models/UserModel.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/main/java/com/gitblit/models/UserModel.java') diff --git a/src/main/java/com/gitblit/models/UserModel.java b/src/main/java/com/gitblit/models/UserModel.java index 6d585127..d785ae9e 100644 --- a/src/main/java/com/gitblit/models/UserModel.java +++ b/src/main/java/com/gitblit/models/UserModel.java @@ -35,6 +35,7 @@ import com.gitblit.Constants.PermissionType; import com.gitblit.Constants.RegistrantType; import com.gitblit.Constants.Unused; import com.gitblit.utils.ArrayUtils; +import com.gitblit.utils.ModelUtils; import com.gitblit.utils.StringUtils; /** @@ -567,7 +568,7 @@ public class UserModel implements Principal, Serializable, Comparable } if (canCreate) { String projectPath = StringUtils.getFirstPathElement(repository); - if (!StringUtils.isEmpty(projectPath) && projectPath.equalsIgnoreCase("~" + username)) { + if (!StringUtils.isEmpty(projectPath) && projectPath.equalsIgnoreCase(getPersonalPath())) { // personal repository return true; } @@ -609,7 +610,7 @@ public class UserModel implements Principal, Serializable, Comparable } public String getPersonalPath() { - return "~" + username; + return ModelUtils.getPersonalPath(username); } public UserPreferences getPreferences() { @@ -675,6 +676,6 @@ public class UserModel implements Principal, Serializable, Comparable public boolean isMyPersonalRepository(String repository) { String projectPath = StringUtils.getFirstPathElement(repository); - return !StringUtils.isEmpty(projectPath) && projectPath.equalsIgnoreCase("~" + username); + return !StringUtils.isEmpty(projectPath) && projectPath.equalsIgnoreCase(getPersonalPath()); } } -- cgit v1.2.3