git-svn-id: https://www.simantics.org/svn/simantics/3d/branches/dev@9354 ac1ea38d...

[simantics/3d.git] / org.simantics.proconf.g3d / src / org / simantics / proconf / g3d / scenegraph / ModelNode.java

diff --git a/org.simantics.proconf.g3d/src/org/simantics/proconf/g3d/scenegraph/ModelNode.java b/org.simantics.proconf.g3d/src/org/simantics/proconf/g3d/scenegraph/ModelNode.java
index 40e845a10b8d7a0ec901931d253d846053bb69fa..ad0780d883c343be0a175db1ed793928f06ea1a9 100644 (file)
--- a/org.simantics.proconf.g3d/src/org/simantics/proconf/g3d/scenegraph/ModelNode.java
+++ b/org.simantics.proconf.g3d/src/org/simantics/proconf/g3d/scenegraph/ModelNode.java
@@ -22,7 +22,7 @@ import org.simantics.proconf.g3d.animation.Animatable;
 import org.simantics.proconf.g3d.base.ThreeDimensionalEditorBase;\r
 import org.simantics.proconf.g3d.stubs.G3DModel;\r
 import org.simantics.proconf.g3d.stubs.G3DNode;\r
-import org.simantics.utils.ErrorLogger;\r
+import org.simantics.utils.ui.ErrorLogger;\r
 \r
 public class ModelNode extends AbstractGraphicsNode implements Animatable, IGeometryNode{\r
        protected List<ShapeNode> shapes = new ArrayList<ShapeNode>();\r
@@ -43,7 +43,7 @@ public class ModelNode extends AbstractGraphicsNode implements Animatable, IGeom
                G3DModel model = getG3DModel(graph);\r
             Collection<G3DNode> nodes = model.getChild();\r
             if (nodes.size() == 0) {\r
-                ErrorLogger.defaultLogError("ModelNode " + model.getResource() + " has no shapes", null);\r
+                ErrorLogger.defaultLogError("ModelNode " + model.getResource().getResourceId() + " has no shapes", null);\r
                 return;\r
             }\r
             for (G3DNode node: nodes) {\r
@@ -175,14 +175,14 @@ public class ModelNode extends AbstractGraphicsNode implements Animatable, IGeom
             return false;    \r
         }\r
         G3DModel model = getG3DModel(graph);\r
-        Collection<org.simantics.g2d.stubs.anim.Animation> animations = model.getAnimation();\r
+        Collection<org.simantics.animation.stubs.Animation> animations = model.getAnimation();\r
         int num = animations.size();\r
         if (num == 0) {\r
             ErrorLogger.getDefault().logWarning("Cannot set animation for " + shapeResource + " since it has no animations", null);\r
             return false;            \r
         }\r
         int random = (int)Math.round(Math.random() * (num-1));\r
-        Iterator<org.simantics.g2d.stubs.anim.Animation> i = animations.iterator();\r
+        Iterator<org.simantics.animation.stubs.Animation> i = animations.iterator();\r
         while(random > 0) {\r
             i.next();\r
             random--;\r