From 334d158ad313aaf56e33d55981f969fa05d8547e Mon Sep 17 00:00:00 2001
From: mschaefers <mschaefers@scoop-gmbh.de>
Date: Tue, 04 Dec 2012 12:55:17 -0500
Subject: [PATCH] FIX: setting line separator back to Windows style

---
 src/com/gitblit/GitblitUserService.java |   45 +++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 41 insertions(+), 4 deletions(-)

diff --git a/src/com/gitblit/GitblitUserService.java b/src/com/gitblit/GitblitUserService.java
index 1514b6b..16d01b9 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;
@@ -118,6 +119,16 @@
 	}
 
 	@Override
+	public boolean supportsDisplayNameChanges() {
+		return serviceImpl.supportsDisplayNameChanges();
+	}
+
+	@Override
+	public boolean supportsEmailAddressChanges() {
+		return serviceImpl.supportsEmailAddressChanges();
+	}
+
+	@Override
 	public boolean supportsTeamMembershipChanges() {
 		return serviceImpl.supportsTeamMembershipChanges();
 	}
@@ -128,7 +139,7 @@
 	}
 
 	@Override
-	public char[] getCookie(UserModel model) {
+	public String getCookie(UserModel model) {
 		return serviceImpl.getCookie(model);
 	}
 
@@ -140,6 +151,11 @@
 	@Override
 	public UserModel authenticate(String username, char[] password) {
 		return serviceImpl.authenticate(username, password);
+	}
+	
+	@Override
+	public void logout(UserModel user) {
+		serviceImpl.logout(user);
 	}
 
 	@Override
@@ -153,12 +169,20 @@
 	}
 
 	@Override
+	public boolean updateUserModels(Collection<UserModel> models) {
+		return serviceImpl.updateUserModels(models);
+	}
+
+	@Override
 	public boolean updateUserModel(String username, UserModel model) {
 		if (supportsCredentialChanges()) {
 			if (!supportsTeamMembershipChanges()) {
-				//  teams are externally controlled
+				//  teams are externally controlled - copy from original model
+				UserModel existingModel = getUserModel(username);
+				
 				model = DeepCopier.copy(model);
 				model.teams.clear();
+				model.teams.addAll(existingModel.teams);
 			}
 			return serviceImpl.updateUserModel(username, model);
 		}
@@ -166,9 +190,12 @@
 			// passwords are not persisted by the backing user service
 			model.password = null;
 			if (!supportsTeamMembershipChanges()) {
-				//  teams are externally controlled
+				//  teams are externally controlled- copy from original model
+				UserModel existingModel = getUserModel(username);
+				
 				model = DeepCopier.copy(model);
 				model.teams.clear();
+				model.teams.addAll(existingModel.teams);
 			}
 			return serviceImpl.updateUserModel(username, model);
 		}
@@ -211,6 +238,7 @@
 	}
 
 	@Override
+	@Deprecated
 	public boolean setTeamnamesForRepositoryRole(String role, List<String> teamnames) {
 		return serviceImpl.setTeamnamesForRepositoryRole(role, teamnames);
 	}
@@ -226,11 +254,19 @@
 	}
 
 	@Override
+	public boolean updateTeamModels(Collection<TeamModel> models) {
+		return serviceImpl.updateTeamModels(models);
+	}
+
+	@Override
 	public boolean updateTeamModel(String teamname, TeamModel model) {
 		if (!supportsTeamMembershipChanges()) {
-			// teams are externally controlled
+			// teams are externally controlled - copy from original model
+			TeamModel existingModel = getTeamModel(teamname);
+			
 			model = DeepCopier.copy(model);
 			model.users.clear();
+			model.users.addAll(existingModel.users);
 		}
 		return serviceImpl.updateTeamModel(teamname, model);
 	}
@@ -251,6 +287,7 @@
 	}
 
 	@Override
+	@Deprecated
 	public boolean setUsernamesForRepositoryRole(String role, List<String> usernames) {
 		return serviceImpl.setUsernamesForRepositoryRole(role, usernames);
 	}

--
Gitblit v1.9.1