Merge branch 'master' into permission-vertical

Conflicts:
	java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/server/DataMiningServiceImpl.java
	java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/StringMessages.java
	java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/StringMessages.properties
	java/com.sap.sse.gwt/src/com/sap/sse/gwt/client/StringMessages_de.properties

java/com.sap.sailing.server/src/com/sap/sailing/server/impl/Activator.java

@@ -41,6 +41,7 @@ import com.sap.sailing.server.RacingEventService;
 import com.sap.sailing.server.RacingEventServiceMXBean;
 import com.sap.sailing.server.impl.preferences.model.BoatClassNotificationPreferences;
 import com.sap.sailing.server.impl.preferences.model.CompetitorNotificationPreferences;
+import com.sap.sailing.server.impl.preferences.model.StoredDataMiningQueryPreferences;
 import com.sap.sailing.server.notification.impl.SailingNotificationServiceImpl;
 import com.sap.sailing.server.statistics.TrackedRaceStatisticsCache;
 import com.sap.sailing.server.statistics.TrackedRaceStatisticsCacheImpl;
@@ -223,6 +224,10 @@ public class Activator implements BundleActivator {
         registrations.add(context.registerService(PreferenceConverter.class,
                 new GenericJSONPreferenceConverter<>(() -> new BoatClassNotificationPreferences(racingEventService)),
                 properties));
+
+        properties.put(PreferenceConverter.KEY_PARAMETER_NAME, StoredDataMiningQueryPreferences.PREF_NAME);
+        registrations.add(context.registerService(PreferenceConverter.class,
+                new GenericJSONPreferenceConverter<>(() -> new StoredDataMiningQueryPreferences()), properties));
     }
 
     public static BundleContext getContext() {

java/com.sap.sailing.server/src/com/sap/sailing/server/impl/preferences/model/SailingPreferences.java

@@ -6,4 +6,5 @@ package com.sap.sailing.server.impl.preferences.model;
  */
 public interface SailingPreferences {
     public static final String NOTIFICATION_PREFERENCES_PREFIX = "sailing.notifications.";
+    public static final String STORED_DATAMINING_QUERY_PREFERENCES = "sailing.datamining.storedqueries";
 }

java/com.sap.sailing.server/src/com/sap/sailing/server/impl/preferences/model/StoredDataMiningQueryPreference.java

@@ -0,0 +1,44 @@
+package com.sap.sailing.server.impl.preferences.model;
+
+import java.util.UUID;
+
+import com.sap.sse.common.settings.generic.AbstractGenericSerializableSettings;
+import com.sap.sse.common.settings.generic.StringSetting;
+import com.sap.sse.common.settings.generic.UUIDSetting;
+
+/** Preference object which contains a stored data mining query with a name and a unique id. */
+public class StoredDataMiningQueryPreference extends AbstractGenericSerializableSettings {
+    private static final long serialVersionUID = -7100595551754668437L;
+
+    private transient StringSetting name;
+    private transient UUIDSetting id;
+    private transient StringSetting serializedQuery;
+
+    public StoredDataMiningQueryPreference() {
+    }
+
+    public StoredDataMiningQueryPreference(String name, UUID uuid, String serializedQuery) {
+        this.name.setValue(name);
+        this.id.setValue(uuid);
+        this.serializedQuery.setValue(serializedQuery);
+    }
+
+    @Override
+    protected void addChildSettings() {
+        name = new StringSetting("name", this);
+        id = new UUIDSetting("id", this);
+        serializedQuery = new StringSetting("serializedQuery", this);
+    }
+
+    public String getName() {
+        return name.getValue();
+    }
+
+    public UUID getId() {
+        return id.getValue();
+    }
+
+    public String getSerializedQuery() {
+        return serializedQuery.getValue();
+    }
+}

java/com.sap.sailing.server/src/com/sap/sailing/server/impl/preferences/model/StoredDataMiningQueryPreferences.java

@@ -0,0 +1,26 @@
+package com.sap.sailing.server.impl.preferences.model;
+
+import com.sap.sse.common.settings.generic.AbstractGenericSerializableSettings;
+import com.sap.sse.common.settings.generic.SettingsList;
+
+/** Holds a list of {@link StoredDataMiningQueryPreferences}. */
+public class StoredDataMiningQueryPreferences extends AbstractGenericSerializableSettings {
+
+    private static final long serialVersionUID = -8088467604778160161L;
+    public static final String PREF_NAME = SailingPreferences.STORED_DATAMINING_QUERY_PREFERENCES;
+
+    private transient SettingsList<StoredDataMiningQueryPreference> storedQueries;
+
+    @Override
+    protected void addChildSettings() {
+        storedQueries = new SettingsList<>("storedQueries", this, () -> new StoredDataMiningQueryPreference());
+    }
+
+    public Iterable<StoredDataMiningQueryPreference> getStoredQueries() {
+        return storedQueries.getValues();
+    }
+
+    public void setStoredQueries(Iterable<StoredDataMiningQueryPreference> storedQueries) {
+        this.storedQueries.setValues(storedQueries);
+    }
+}