From: jsimomaa <jsimomaa@ac1ea38d-2e2b-0410-8846-a27921b304fc>
Date: Thu, 16 Oct 2014 08:50:00 +0000 (+0000)
Subject: Merged trunk@30066-30400 to branches/sysdyn-1.8 on 2014-10-16 for 1.8.2 release.
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=1a90d1f407b47953db532825d581c315a04f280a;p=simantics%2Fsysdyn.git

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 0e5de3ad..67721548 100644
--- 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;
 import java.util.HashMap;
 
-import org.simantics.databoard.util.URIStringUtils;
 import org.simantics.db.Resource;
 import org.simantics.db.WriteGraph;
 import org.simantics.db.common.request.ObjectsWithType;
 import org.simantics.db.common.utils.NameUtils;
+import org.simantics.db.common.utils.URIStringUtils;
 import org.simantics.db.exception.DatabaseException;
 import org.simantics.layer0.Layer0;
 import org.simantics.layer0.utils.direct.GraphUtils;