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

diff --git a/org.simantics.proconf.g3d/src/org/simantics/proconf/g3d/base/ScenegraphAdapterImpl.java b/org.simantics.proconf.g3d/src/org/simantics/proconf/g3d/base/ScenegraphAdapterImpl.java
index d90b9dd0a3226b5db08eef62cc4f112ef89a9122..2760c2918c74fac88d9ac0bf0851a539e31b9a3f 100644 (file)
--- a/org.simantics.proconf.g3d/src/org/simantics/proconf/g3d/base/ScenegraphAdapterImpl.java
+++ b/org.simantics.proconf.g3d/src/org/simantics/proconf/g3d/base/ScenegraphAdapterImpl.java
@@ -179,7 +179,7 @@ public abstract class ScenegraphAdapterImpl implements ScenegraphAdapter {
        String name = nameMap.getRight(nodeResource);\r
        if (name == null) {\r
                //name = UUID.randomUUID().toString();\r
-               name = Long.toString(nodeResource.getResourceId());\r
+               name = Long.toString(nodeResource.getResourceId(session));\r
                nameMap.map(nodeResource, name);\r
        }\r
        return name;\r
@@ -321,8 +321,8 @@ public abstract class ScenegraphAdapterImpl implements ScenegraphAdapter {
             return null;\r
         }\r
         if (parent.equals(r)) {\r
-               if (DEBUG) System.out.println("ThreeDimensionalEditorBase.addNodeP(" + r.getResource().getResourceId() + ") adding node to itself?!");\r
-            ErrorLogger.defaultLogError("Adding scnegraphnode " + r.getResource().getResourceId() + " to itself!", new Exception("ASSERT!"));\r
+               if (DEBUG) System.out.println("ThreeDimensionalEditorBase.addNodeP(" + r.getResource().getResourceId(session) + ") adding node to itself?!");\r
+            ErrorLogger.defaultLogError("Adding scnegraphnode " + r.getResource().getResourceId(session) + " to itself!", new Exception("ASSERT!"));\r
             return abstractGraphicsNodes.get(r);\r
         }\r
         \r
@@ -335,10 +335,10 @@ public abstract class ScenegraphAdapterImpl implements ScenegraphAdapter {
                 return null;\r
             }\r
             if (parent.equals(inView.getParent().getResource())) {\r
-               if (DEBUG) System.out.println("ThreeDimensionalEditorBase.addNodeP(" + r.getResource().getResourceId() + ") already in view");\r
+               if (DEBUG) System.out.println("ThreeDimensionalEditorBase.addNodeP(" + r.getResource().getResourceId(session) + ") already in view");\r
                 return inView;\r
             } else {\r
-               if (DEBUG) System.out.println("ThreeDimensionalEditorBase.addNodeP(" + r.getResource().getResourceId() + ") already in view, but has different parent, current parent is ("+inView.getParent().getResource()+") and node is added to  ("+parent+") -> removing from old parent and inserting to new");\r
+               if (DEBUG) System.out.println("ThreeDimensionalEditorBase.addNodeP(" + r.getResource().getResourceId(session) + ") already in view, but has different parent, current parent is ("+inView.getParent().getResource().getResourceId(session)+") and node is added to  ("+parent+") -> removing from old parent and inserting to new");\r
                 removeNode(inView.getParent().getResource(),r.getResource());\r
             }\r
         }\r
@@ -348,15 +348,15 @@ public abstract class ScenegraphAdapterImpl implements ScenegraphAdapter {
         IGraphicsNode mo;\r
         IGraphicsNode parentNode = abstractGraphicsNodes.get(parent);\r
         if (parentNode == null) {\r
-               if (DEBUG) System.out.println("No graphicsnode for (" + parent.getResource().getResourceId() + ")");\r
+               if (DEBUG) System.out.println("No graphicsnode for (" + parent.getResource().getResourceId(session) + ")");\r
             return null;\r
         } else {\r
             mo = instantiateNode(parentNode, node);\r
             if (mo == null) {\r
-                ErrorLogger.defaultLogError("Could not instantiate scenegraph node for " + r.getResource().getResourceId(), null);\r
+                ErrorLogger.defaultLogError("Could not instantiate scenegraph node for " + r.getResource().getResourceId(session), null);\r
                 return null;\r
             }\r
-            if (DEBUG) System.out.println("ThreeDimensionalEditorBase.addNodeP(" + r.getResource().getResourceId() + ") added to parent (" + parent.getResource().getResourceId() + ") " + mo.getClass());\r
+            if (DEBUG) System.out.println("ThreeDimensionalEditorBase.addNodeP(" + r.getResource().getResourceId(session) + ") added to parent (" + parent.getResource().getResourceId(session) + ") " + mo.getClass());\r
         }\r
         addSubnodeListener(node);\r
         addPropertyListener(node);\r

diff --git a/org.simantics.proconf.g3d/src/org/simantics/proconf/g3d/base/ThreeDimensionalEditorBase.java b/org.simantics.proconf.g3d/src/org/simantics/proconf/g3d/base/ThreeDimensionalEditorBase.java
index 39c73fddaf4cca541ca8911e7515e58c7372d01d..32f36c8a0b8c1ae410c3a311e013c80737d8fb85 100644 (file)
--- a/org.simantics.proconf.g3d/src/org/simantics/proconf/g3d/base/ThreeDimensionalEditorBase.java
+++ b/org.simantics.proconf.g3d/src/org/simantics/proconf/g3d/base/ThreeDimensionalEditorBase.java
@@ -344,7 +344,7 @@ public abstract class ThreeDimensionalEditorBase implements  Runnable {
     }\r
     \r
     public String getMenuID() {\r
-       return Long.toString(getInputResource().getResourceId());\r
+       return Long.toString(getInputResource().getResourceId(session));\r
     }\r
 \r
     protected void makeActions(Graph graph) {\r

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 ad0780d883c343be0a175db1ed793928f06ea1a9..c4af61be8304042e8187c4195ccd5310a92fd016 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
@@ -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().getResourceId() + " has no shapes", null);\r
+                ErrorLogger.defaultLogError("ModelNode " + model.getResource().getResourceId(graph.getSession()) + " has no shapes", null);\r
                 return;\r
             }\r
             for (G3DNode node: nodes) {\r