From eedebb7f1831267ed4dbc20cc78d5bea95098ac2 Mon Sep 17 00:00:00 2001 From: Tuukka Lehtonen Date: Fri, 1 Sep 2017 16:00:37 +0300 Subject: [PATCH] Fixed function name clash in Simantics/DB#createList The second createList is now createListWithType which takes the type of the list as the first argument. refs #7390 Change-Id: I8b52f792cb683bfc764ecd7a53bfb9b0c76b4d5f (cherry picked from commit 4be719091f987e1377657949584f28665c852ce3) --- .../src/org/simantics/db/common/utils/ListUtils.java | 4 ++-- bundles/org.simantics.scl.db/scl/Simantics/DB.scl | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bundles/org.simantics.db.common/src/org/simantics/db/common/utils/ListUtils.java b/bundles/org.simantics.db.common/src/org/simantics/db/common/utils/ListUtils.java index 15910147a..4d6518524 100644 --- a/bundles/org.simantics.db.common/src/org/simantics/db/common/utils/ListUtils.java +++ b/bundles/org.simantics.db.common/src/org/simantics/db/common/utils/ListUtils.java @@ -50,7 +50,7 @@ public class ListUtils { } /** - * Creates a list containing the givens {@code elements}. + * Creates a list containing the given {@code elements}. */ public static Resource create(WriteGraph g, Iterable elements) throws DatabaseException { Layer0 L0 = Layer0.getInstance(g); @@ -63,7 +63,7 @@ public class ListUtils { } /** - * Creates a list containing the givens {@code elements}. + * Creates a list of the given list type containing the given {@code elements}. */ public static Resource create(WriteGraph g, Resource type, Iterable elements) throws DatabaseException { Layer0 L0 = Layer0.getInstance(g); diff --git a/bundles/org.simantics.scl.db/scl/Simantics/DB.scl b/bundles/org.simantics.scl.db/scl/Simantics/DB.scl index 32019768b..f2984f369 100644 --- a/bundles/org.simantics.scl.db/scl/Simantics/DB.scl +++ b/bundles/org.simantics.scl.db/scl/Simantics/DB.scl @@ -267,7 +267,7 @@ importJava "org.simantics.db.common.utils.ListUtils" where createList :: [Resource] -> Resource @JavaName create - createList :: Resource -> [Resource] -> Resource + createListWithType :: Resource -> [Resource] -> Resource @javaName insertBack insertBack :: Resource -> [Resource] -> () -- 2.45.2