From b7594d5935baf0221891fbaa3f11e008ffa8c956 Mon Sep 17 00:00:00 2001
From: brinn <brinn>
Date: Fri, 10 Aug 2012 12:30:47 +0000
Subject: [PATCH] Move Methods getCustomDisplaySettings() and
setCustomDisplaySettings() from IGeneralInformationService to
IGeneralInformationChangingService.
SVN: 26328
---
.../v1/GeneralInformationChangingService.java | 26 ++++++++++++++++++-
...neralInformationChangingServiceLogger.java | 14 ++++++++++
.../api/v1/GeneralInformationService.java | 26 +------------------
.../v1/GeneralInformationServiceLogger.java | 14 ----------
4 files changed, 40 insertions(+), 40 deletions(-)
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/api/v1/GeneralInformationChangingService.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/api/v1/GeneralInformationChangingService.java
index 40a5cabdcc3..7a989296f44 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/api/v1/GeneralInformationChangingService.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/api/v1/GeneralInformationChangingService.java
@@ -35,6 +35,7 @@ import ch.systemsx.cisd.openbis.generic.shared.api.v1.dto.NewVocabularyTerm;
import ch.systemsx.cisd.openbis.generic.shared.authorization.annotation.RolesAllowed;
import ch.systemsx.cisd.openbis.generic.shared.basic.TechId;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DatabaseModificationKind.ObjectKind;
+import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DisplaySettings;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.RoleWithHierarchy;
import ch.systemsx.cisd.openbis.generic.shared.dto.Session;
import ch.systemsx.cisd.openbis.generic.shared.util.EntityHelper;
@@ -103,6 +104,29 @@ public class GeneralInformationChangingService extends
term.getLabel(), term.getDescription(), term.getPreviousTermOrdinal());
}
+ @Override
+ @Transactional(readOnly = true)
+ @RolesAllowed(RoleWithHierarchy.SPACE_OBSERVER)
+ @SuppressWarnings("deprecation")
+ public Map<String, String> getCustomDisplaySettings(String sessionToken, String webAppId)
+ {
+ final Session session = getSession(sessionToken);
+ return session.getPerson().getDisplaySettings().getCustomWebAppSettings(webAppId);
+ }
+
+ @Override
+ @Transactional(readOnly = false)
+ @RolesAllowed(RoleWithHierarchy.SPACE_OBSERVER)
+ @SuppressWarnings("deprecation")
+ public void setCustomDisplaySettings(String sessionToken, String webAppId,
+ Map<String, String> customDisplaySettings)
+ {
+ final Session session = getSession(sessionToken);
+ final DisplaySettings displaySettings = session.getPerson().getDisplaySettings();
+ displaySettings.setCustomWebAppSettings(webAppId, customDisplaySettings);
+ saveDisplaySettings(session.getSessionToken(), null, -1);
+ }
+
@Override
public int getMajorVersion()
{
@@ -112,7 +136,7 @@ public class GeneralInformationChangingService extends
@Override
public int getMinorVersion()
{
- return 1;
+ return 2;
}
}
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/api/v1/GeneralInformationChangingServiceLogger.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/api/v1/GeneralInformationChangingServiceLogger.java
index 946c53ac234..4d88002ad19 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/api/v1/GeneralInformationChangingServiceLogger.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/api/v1/GeneralInformationChangingServiceLogger.java
@@ -64,6 +64,20 @@ class GeneralInformationChangingServiceLogger extends AbstractServerLogger imple
}
+ @Override
+ public Map<String, String> getCustomDisplaySettings(String sessionToken, String webAppId)
+ {
+ logAccess(sessionToken, "get-custom-display-settings", "WEB_APP_ID(%s)", webAppId);
+ return null;
+ }
+
+ @Override
+ public void setCustomDisplaySettings(String sessionToken, String webAppId,
+ Map<String, String> customDisplaySettings)
+ {
+ logAccess(sessionToken, "set-custom-display-settings", "WEB_APP_ID(%s)", webAppId);
+ }
+
@Override
public int getMajorVersion()
{
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/api/v1/GeneralInformationService.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/api/v1/GeneralInformationService.java
index 20006e69508..c9851c8c751 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/api/v1/GeneralInformationService.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/api/v1/GeneralInformationService.java
@@ -86,7 +86,6 @@ import ch.systemsx.cisd.openbis.generic.shared.authorization.validator.SimpleSpa
import ch.systemsx.cisd.openbis.generic.shared.basic.TechId;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DataSetRelatedEntities;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DetailedSearchCriteria;
-import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DisplaySettings;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.EntityType;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ExperimentType;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ExternalData;
@@ -218,7 +217,7 @@ public class GeneralInformationService extends AbstractServer<IGeneralInformatio
@Override
public int getMinorVersion()
{
- return 19;
+ return 18;
}
private Map<String, List<RoleAssignmentPE>> getRoleAssignmentsPerSpace()
@@ -974,27 +973,4 @@ public class GeneralInformationService extends AbstractServer<IGeneralInformatio
return Translator.translateMaterials(materials);
}
- @Override
- @Transactional(readOnly = true)
- @RolesAllowed(RoleWithHierarchy.SPACE_OBSERVER)
- @SuppressWarnings("deprecation")
- public Map<String, String> getCustomDisplaySettings(String sessionToken, String webAppId)
- {
- final Session session = getSession(sessionToken);
- return session.getPerson().getDisplaySettings().getCustomWebAppSettings(webAppId);
- }
-
- @Override
- @Transactional(readOnly = false)
- @RolesAllowed(RoleWithHierarchy.SPACE_OBSERVER)
- @SuppressWarnings("deprecation")
- public void setCustomDisplaySettings(String sessionToken, String webAppId,
- Map<String, String> customDisplaySettings)
- {
- final Session session = getSession(sessionToken);
- final DisplaySettings displaySettings = session.getPerson().getDisplaySettings();
- displaySettings.setCustomWebAppSettings(webAppId, customDisplaySettings);
- saveDisplaySettings(session.getSessionToken(), null, -1);
- }
-
}
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/api/v1/GeneralInformationServiceLogger.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/api/v1/GeneralInformationServiceLogger.java
index bd65f943caf..0752cad68e9 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/api/v1/GeneralInformationServiceLogger.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/api/v1/GeneralInformationServiceLogger.java
@@ -353,18 +353,4 @@ class GeneralInformationServiceLogger extends AbstractServerLogger implements
return null;
}
- @Override
- public Map<String, String> getCustomDisplaySettings(String sessionToken, String webAppId)
- {
- logAccess(sessionToken, "get-custom-display-settings", "WEB_APP_ID(%s)", webAppId);
- return null;
- }
-
- @Override
- public void setCustomDisplaySettings(String sessionToken, String webAppId,
- Map<String, String> customDisplaySettings)
- {
- logAccess(sessionToken, "set-custom-display-settings", "WEB_APP_ID(%s)", webAppId);
- }
-
}
--
GitLab