From 3a0c76cf2060b3e915a69a9c5c7c7340dee95748 Mon Sep 17 00:00:00 2001
From: Piotr Gawron <piotr.gawron@uni.lu>
Date: Wed, 24 Jan 2018 13:36:27 +0100
Subject: [PATCH] merge issues
---
.../annotation/cache/PermanentDatabaseLevelCache.java | 2 +-
.../main/java/lcsb/mapviewer/services/impl/LayoutService.java | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/annotation/src/main/java/lcsb/mapviewer/annotation/cache/PermanentDatabaseLevelCache.java b/annotation/src/main/java/lcsb/mapviewer/annotation/cache/PermanentDatabaseLevelCache.java
index 986b24bc69..f013003304 100644
--- a/annotation/src/main/java/lcsb/mapviewer/annotation/cache/PermanentDatabaseLevelCache.java
+++ b/annotation/src/main/java/lcsb/mapviewer/annotation/cache/PermanentDatabaseLevelCache.java
@@ -253,7 +253,7 @@ public class PermanentDatabaseLevelCache extends XmlParser
entry.setValue(value);
entry.setType(type);
Calendar expires = Calendar.getInstance();
- expires.add(Calendar.DAY_OF_MONTH, validDays());
+ expires.add(Calendar.DAY_OF_MONTH, validDays);
entry.setExpires(expires);
getCacheQueryDao().add(entry);
diff --git a/service/src/main/java/lcsb/mapviewer/services/impl/LayoutService.java b/service/src/main/java/lcsb/mapviewer/services/impl/LayoutService.java
index 53762ae79f..4104e98609 100644
--- a/service/src/main/java/lcsb/mapviewer/services/impl/LayoutService.java
+++ b/service/src/main/java/lcsb/mapviewer/services/impl/LayoutService.java
@@ -171,7 +171,8 @@ public class LayoutService implements ILayoutService {
}
@Override
- public List<LayoutView> getCustomLayouts(Model model, User user) {
+ public List<LayoutView> getCustomLayouts(Model model, User user, Boolean publicOverlay, User creator) {
+ // TODO remove publicOverlay and creator params
List<LayoutView> result = new ArrayList<>();
if (model == null || user == null) {
return result;
--
GitLab