merge issues

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);

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;