Merged trunk@30066-30400 to branches/sysdyn-1.8 on 2014-10-16 for 1.8.2 release.

refs #5170
refs #5119
refs #4882
refs #5197
refs #5204
refs #5205
refs #5184
refs #5206
refs #5207
refs #5208
refs #5209
refs #5196
refs #5185
refs #5227
refs #5267
refs #5273
refs #5280
refs #5314
refs #5357
refs #5386

git-svn-id: https://www.simantics.org/svn/simantics/sysdyn/branches/1.8@30427 ac1ea38d-2e2b-0410-8846-a27921b304fc

diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/editor/SysdynCreationInstruction.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/editor/SysdynCreationInstruction.java
index 0e5de3ad45056ffc827b361cc5cae57806887f0d..67721548d5b12464aeed43d9719f3f321452c024 100644 (file)
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/editor/SysdynCreationInstruction.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/editor/SysdynCreationInstruction.java
@@ -16,11 +16,11 @@ import gnu.trove.TIntIntHashMap;
 import java.util.Collection;\r
 import java.util.HashMap;\r
 \r
-import org.simantics.databoard.util.URIStringUtils;\r
 import org.simantics.db.Resource;\r
 import org.simantics.db.WriteGraph;\r
 import org.simantics.db.common.request.ObjectsWithType;\r
 import org.simantics.db.common.utils.NameUtils;\r
+import org.simantics.db.common.utils.URIStringUtils;\r
 import org.simantics.db.exception.DatabaseException;\r
 import org.simantics.layer0.Layer0;\r
 import org.simantics.layer0.utils.direct.GraphUtils;\r