From bfc1ec510b9a5e3f152a81cf6d5dd55f4ccc3473 Mon Sep 17 00:00:00 2001
From: Piotr Gawron <piotr.gawron@uni.lu>
Date: Fri, 23 Mar 2018 10:43:55 +0100
Subject: [PATCH] categories of configuration options modified
---
.../model/user/ConfigurationElementType.java | 14 +++++++++-----
.../model/user/ConfigurationElementTypeGroup.java | 1 +
2 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/model/src/main/java/lcsb/mapviewer/model/user/ConfigurationElementType.java b/model/src/main/java/lcsb/mapviewer/model/user/ConfigurationElementType.java
index 0f333b027c..b5271ecba5 100644
--- a/model/src/main/java/lcsb/mapviewer/model/user/ConfigurationElementType.java
+++ b/model/src/main/java/lcsb/mapviewer/model/user/ConfigurationElementType.java
@@ -48,7 +48,8 @@ public enum ConfigurationElementType {
/**
* Default map that should be presented if no map is selected by user side.
*/
- DEFAULT_MAP("Default Project Id", "empty", ConfigurationElementEditType.STRING, false, null), //
+ DEFAULT_MAP("Default Project Id", "empty", ConfigurationElementEditType.STRING, false,
+ ConfigurationElementTypeGroup.SERVER_CONFIGURATION), //
/**
* Logo presented in the system.
@@ -88,7 +89,7 @@ public enum ConfigurationElementType {
* </a>.
*/
GOOGLE_ANALYTICS_IDENTIFIER("Google Analytics tracking ID used for statistics", "",
- ConfigurationElementEditType.STRING, false, null),
+ ConfigurationElementEditType.STRING, false, ConfigurationElementTypeGroup.SERVER_CONFIGURATION),
/**
* Description of the logo presented in the system.
@@ -99,12 +100,14 @@ public enum ConfigurationElementType {
/**
* Domain allowed to connect via x-frame technology.
*/
- X_FRAME_DOMAIN("Domain allowed to connect via x-frame technology", "", ConfigurationElementEditType.URL, false, null),
+ X_FRAME_DOMAIN("Domain allowed to connect via x-frame technology", "", ConfigurationElementEditType.URL, false,
+ ConfigurationElementTypeGroup.SERVER_CONFIGURATION),
/**
* Relative directory (in webapps folder) where big files will be stored.
*/
- BIG_FILE_STORAGE_DIR("Path to store big files", "minerva-big/", ConfigurationElementEditType.STRING, false, null),
+ BIG_FILE_STORAGE_DIR("Path to store big files", "minerva-big/", ConfigurationElementEditType.STRING, false,
+ ConfigurationElementTypeGroup.SERVER_CONFIGURATION),
/**
* File where legend 1/4 is stored.
@@ -133,7 +136,8 @@ public enum ConfigurationElementType {
/**
* File where legend 4/4 is stored.
*/
- USER_MANUAL_FILE("User manual file", "resources/other/user_guide.pdf", ConfigurationElementEditType.URL, false, null),
+ USER_MANUAL_FILE("User manual file", "resources/other/user_guide.pdf", ConfigurationElementEditType.URL, false,
+ ConfigurationElementTypeGroup.LEGEND_AND_LOGO),
/**
* Color used for negative overlay values.
diff --git a/model/src/main/java/lcsb/mapviewer/model/user/ConfigurationElementTypeGroup.java b/model/src/main/java/lcsb/mapviewer/model/user/ConfigurationElementTypeGroup.java
index e246b880b7..baa88ee297 100644
--- a/model/src/main/java/lcsb/mapviewer/model/user/ConfigurationElementTypeGroup.java
+++ b/model/src/main/java/lcsb/mapviewer/model/user/ConfigurationElementTypeGroup.java
@@ -6,6 +6,7 @@ public enum ConfigurationElementTypeGroup {
LEGEND_AND_LOGO("Legend and logo"), //
OVERLAYS("Overlays"), //
POINT_AND_CLICK("Point and click"), //
+ SERVER_CONFIGURATION("Server configuration"),//
;
private String commonName;
--
GitLab