From cd85c68960e681e6889a49ea076be2b2f697ae42 Mon Sep 17 00:00:00 2001 From: brinn <brinn> Date: Wed, 25 Jul 2012 10:20:01 +0000 Subject: [PATCH] Rename changeUserHomeGroup() -> changeUserHomeSpace(). SVN: 26196 --- .../openbis/generic/client/web/client/IClientService.java | 4 ++-- .../generic/client/web/client/IClientServiceAsync.java | 4 ++-- .../client/application/ui/user/ChangeUserSettingsDialog.java | 2 +- .../generic/client/web/server/AbstractClientService.java | 2 +- .../generic/client/web/server/CommonClientServiceTest.java | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/IClientService.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/IClientService.java index cbc565ac110..1c4c7246bf5 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/IClientService.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/IClientService.java @@ -83,9 +83,9 @@ public interface IClientService extends RemoteService public DisplaySettings resetDisplaySettings(); /** - * Changes logged user home group on the server. + * Changes home space of the logged-in user on the server. */ - public void changeUserHomeGroup(TechId groupIdOrNull); + public void changeUserHomeSpace(TechId groupIdOrNull); /** * Logs out the user, saving his/her {@link DisplaySettings} if necessary. diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/IClientServiceAsync.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/IClientServiceAsync.java index f51a90c97e6..95c6d57e71a 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/IClientServiceAsync.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/IClientServiceAsync.java @@ -57,8 +57,8 @@ public interface IClientServiceAsync /** @see IClientService#resetDisplaySettings() */ public void resetDisplaySettings(AsyncCallback<DisplaySettings> resetUserSettingsCallback); - /** @see IClientService#changeUserHomeGroup(TechId) */ - public void changeUserHomeGroup(TechId groupIdOrNull, AsyncCallback<Void> callback); + /** @see IClientService#changeUserHomeSpace(TechId) */ + public void changeUserHomeSpace(TechId spaceIdOrNull, AsyncCallback<Void> callback); /** @see IClientService#logout(DisplaySettings, boolean) */ public void logout(DisplaySettings displaySettings, boolean simpleViewMode, diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/user/ChangeUserSettingsDialog.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/user/ChangeUserSettingsDialog.java index 5353b76e1eb..4799bfec6fd 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/user/ChangeUserSettingsDialog.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/user/ChangeUserSettingsDialog.java @@ -166,7 +166,7 @@ public class ChangeUserSettingsDialog extends AbstractSaveDialog String groupCodeOrNull = space == null ? null : space.getCode(); TechId groupIdOrNull = TechId.create(space); viewContext.getModel().getSessionContext().getUser().setHomeGroupCode(groupCodeOrNull); - viewContext.getService().changeUserHomeGroup(groupIdOrNull, saveCallback); + viewContext.getService().changeUserHomeSpace(groupIdOrNull, saveCallback); RealNumberFormatingParameters formatingParameters = getRealNumberFormatingParameters(); formatingParameters.setFormatingEnabled(formatingFields.isExpanded()); diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/AbstractClientService.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/AbstractClientService.java index e8b1e22a662..d9f5980f1cb 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/AbstractClientService.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/AbstractClientService.java @@ -665,7 +665,7 @@ public abstract class AbstractClientService implements IClientService, } @Override - public void changeUserHomeGroup(TechId groupIdOrNull) + public void changeUserHomeSpace(TechId groupIdOrNull) { try { diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/CommonClientServiceTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/CommonClientServiceTest.java index 98ad2c16cd8..ad857582c1f 100644 --- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/CommonClientServiceTest.java +++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/server/CommonClientServiceTest.java @@ -570,7 +570,7 @@ public final class CommonClientServiceTest extends AbstractClientServiceTest } }); - commonClientService.changeUserHomeGroup(groupId); + commonClientService.changeUserHomeSpace(groupId); context.assertIsSatisfied(); } -- GitLab