From: Hannu Niemistö <hannu.niemisto@semantum.fi>
Date: Mon, 30 Oct 2017 17:41:02 +0000 (+0200)
Subject: Merge "Remove http:.. prefix from logging in SCL"
X-Git-Tag: v1.31.0~80
X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=commitdiff_plain;h=abdd3c08889e43316a7f6d98743bdc1867849811;hp=58598dd648b043f1eab088d3231b395bc6783ebd

Merge "Remove http:.. prefix from logging in SCL"
---

diff --git a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/source/repository/ProceduralModuleSourceRepository.java b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/source/repository/ProceduralModuleSourceRepository.java
index 4899f88ba..8d0d2e42e 100644
--- a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/source/repository/ProceduralModuleSourceRepository.java
+++ b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/source/repository/ProceduralModuleSourceRepository.java
@@ -16,9 +16,13 @@ import org.simantics.scl.compiler.source.ModuleSource;
 import org.simantics.scl.compiler.source.PrecompiledModuleSource;
 import org.simantics.scl.compiler.source.repository.procedural.ProceduralValueDefinition;
 import org.simantics.scl.compiler.top.ValueNotFound;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public abstract class ProceduralModuleSourceRepository implements ModuleSourceRepository {
 
+    private static final Logger LOGGER = LoggerFactory.getLogger(ProceduralModuleSourceRepository.class);
+    
     public static final String PREFIX = "procedural:";
     
     protected abstract ModuleRepository getModuleRepository(UpdateListener listener);
@@ -44,6 +48,10 @@ public abstract class ProceduralModuleSourceRepository implements ModuleSourceRe
         try {
             values = sourceModule.getValue("values");
         } catch (ValueNotFound e) {
+            return null; // normal
+        } catch (Throwable e) {
+            // abnormal exception
+            LOGGER.error("Failed to find value " + moduleName + "/values", e);
             return null;
         }
         
diff --git a/bundles/org.simantics.scl.runtime/scl/MList.scl b/bundles/org.simantics.scl.runtime/scl/MList.scl
index 6cafe6bf4..fc4f94114 100644
--- a/bundles/org.simantics.scl.runtime/scl/MList.scl
+++ b/bundles/org.simantics.scl.runtime/scl/MList.scl
@@ -9,6 +9,7 @@ importJava "java.util.List" where
     size :: T a -> <Proc> Integer
     isEmpty :: T a -> <Proc> Boolean
     get :: T a -> Integer -> <Proc> a
+    set :: T a -> Integer -> a -> <Proc> Maybe a
     
     add :: T a -> a -> <Proc> ()
     addAll :: T a -> [a] -> <Proc> ()