From 2a8a74bedafdb56b7e7edcb42642dc1eb5e54fff Mon Sep 17 00:00:00 2001
From: saheba <mail@saheba.net>
Date: Mon, 25 Mar 2013 16:34:45 -0400
Subject: [PATCH] code cleanup
---
src/com/gitblit/GitblitUserService.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/com/gitblit/GitblitUserService.java b/src/com/gitblit/GitblitUserService.java
index db450cf..fe35db9 100644
--- a/src/com/gitblit/GitblitUserService.java
+++ b/src/com/gitblit/GitblitUserService.java
@@ -18,6 +18,7 @@
import java.io.File;
import java.io.IOException;
import java.text.MessageFormat;
+import java.util.Collection;
import java.util.List;
import org.slf4j.Logger;
@@ -60,7 +61,7 @@
@Override
public void setup(IStoredSettings settings) {
- File realmFile = GitBlit.getFileOrFolder(Keys.realm.userService, "users.conf");
+ File realmFile = GitBlit.getFileOrFolder(Keys.realm.userService, "${baseFolder}/users.conf");
serviceImpl = createUserService(realmFile);
logger.info("GUS delegating to " + serviceImpl.toString());
}
@@ -178,7 +179,7 @@
}
@Override
- public boolean updateUserModels(List<UserModel> models) {
+ public boolean updateUserModels(Collection<UserModel> models) {
return serviceImpl.updateUserModels(models);
}
@@ -267,7 +268,7 @@
}
@Override
- public boolean updateTeamModels(List<TeamModel> models) {
+ public boolean updateTeamModels(Collection<TeamModel> models) {
return serviceImpl.updateTeamModels(models);
}
--
Gitblit v1.9.1