From 7b23bd59260035f6f4b5958b0148e06883ee5a5f Mon Sep 17 00:00:00 2001
From: luukkainen <luukkainen@ac1ea38d-2e2b-0410-8846-a27921b304fc>
Date: Thu, 8 Jan 2009 14:57:15 +0000
Subject: [PATCH] git-svn-id:
 https://www.simantics.org/svn/simantics/3d/branches/dev@8535
 ac1ea38d-2e2b-0410-8846-a27921b304fc

---
 .../schema/geometry.exsd                      | 45 +++++++++----------
 .../g3d/base/ScenegraphAdapterImpl.java       | 22 ++++++++-
 .../proconf/g3d/scenegraph/ModelNode.java     |  2 +-
 3 files changed, 43 insertions(+), 26 deletions(-)

diff --git a/org.simantics.proconf.g3d/schema/geometry.exsd b/org.simantics.proconf.g3d/schema/geometry.exsd
index f6af1286..2447088b 100644
--- a/org.simantics.proconf.g3d/schema/geometry.exsd
+++ b/org.simantics.proconf.g3d/schema/geometry.exsd
@@ -1,16 +1,21 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!-- Schema file written by PDE -->
-<schema targetNamespace="org.simantics.proconf.g3d">
+<schema targetNamespace="org.simantics.proconf.g3d" xmlns="http://www.w3.org/2001/XMLSchema">
 <annotation>
-      <appInfo>
+      <appinfo>
          <meta.schema plugin="org.simantics.proconf.g3d" id="geometry" name="Geometry"/>
-      </appInfo>
+      </appinfo>
       <documentation>
          [Enter description of this extension point.]
       </documentation>
    </annotation>
 
    <element name="extension">
+      <annotation>
+         <appinfo>
+            <meta.element />
+         </appinfo>
+      </annotation>
       <complexType>
          <sequence>
             <element ref="Geometry" minOccurs="0" maxOccurs="unbounded"/>
@@ -34,9 +39,9 @@
                <documentation>
                   
                </documentation>
-               <appInfo>
+               <appinfo>
                   <meta.attribute translatable="true"/>
-               </appInfo>
+               </appinfo>
             </annotation>
          </attribute>
       </complexType>
@@ -56,57 +61,49 @@
                <documentation>
                   
                </documentation>
-               <appInfo>
-                  <meta.attribute kind="java" basedOn=":fi.vtt.simantics.g3d.base.GeometryProvider"/>
-               </appInfo>
+               <appinfo>
+                  <meta.attribute kind="java" basedOn=":org.simantics.proconf.g3d.base.GeometryProvider"/>
+               </appinfo>
             </annotation>
          </attribute>
       </complexType>
    </element>
 
    <annotation>
-      <appInfo>
+      <appinfo>
          <meta.section type="since"/>
-      </appInfo>
+      </appinfo>
       <documentation>
          [Enter the first release in which this extension point appears.]
       </documentation>
    </annotation>
 
    <annotation>
-      <appInfo>
+      <appinfo>
          <meta.section type="examples"/>
-      </appInfo>
+      </appinfo>
       <documentation>
          [Enter extension point usage example here.]
       </documentation>
    </annotation>
 
    <annotation>
-      <appInfo>
+      <appinfo>
          <meta.section type="apiInfo"/>
-      </appInfo>
+      </appinfo>
       <documentation>
          [Enter API information here.]
       </documentation>
    </annotation>
 
    <annotation>
-      <appInfo>
+      <appinfo>
          <meta.section type="implementation"/>
-      </appInfo>
+      </appinfo>
       <documentation>
          [Enter information about supplied implementation of this extension point.]
       </documentation>
    </annotation>
 
-   <annotation>
-      <appInfo>
-         <meta.section type="copyright"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
 
 </schema>
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 c7ba95db..d90b9dd0 100644
--- 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
@@ -317,7 +317,7 @@ public abstract class ScenegraphAdapterImpl implements ScenegraphAdapter {
      */
     protected IGraphicsNode addNode(IEntity parent, IEntity r) {
         if (!r.isInstanceOf(Resources.g3dResource.G3DNode)) {
-            ErrorLogger.defaultLogError("Trying to add node into scenegraph that is not instance of graphicsnode " + r,new Exception("ASSERT!"));
+            ErrorLogger.defaultLogError("Trying to add node into scenegraph that is not instance of G3DNode " + r,new Exception("ASSERT!"));
             return null;
         }
         if (parent.equals(r)) {
@@ -473,6 +473,7 @@ public abstract class ScenegraphAdapterImpl implements ScenegraphAdapter {
         protected Resource nodeResource;
         private boolean disposed = false;
         
+        private IQueryListener listener = null;
     	
     	public NodeQuery(Resource r) {
     		this.nodeResource = r;
@@ -541,6 +542,25 @@ public abstract class ScenegraphAdapterImpl implements ScenegraphAdapter {
         public boolean isDisposed() {
             return disposed;
         }
+        
+        // without separate listener, this query would work only once
+        @Override
+        public IQueryListener getListener() {
+        	if (listener == null) {
+        		listener = new IQueryListener() {
+        			@Override
+        			public boolean isDisposed() {
+        				return NodeQuery.this.disposed;
+        			}
+        			
+        			@Override
+        			public void resultChangedRaw(Object oldResult, Object newResult) {
+        				NodeQuery.this.resultChangedRaw(oldResult, newResult);
+        			}
+        		};
+        	}
+        	return listener;
+        }
     }
     
     /**
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 844393aa..ad0780d8 100644
--- 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);
             Collection<G3DNode> nodes = model.getChild();
             if (nodes.size() == 0) {
-                ErrorLogger.defaultLogError("ModelNode " + model.getResource() + " has no shapes", null);
+                ErrorLogger.defaultLogError("ModelNode " + model.getResource().getResourceId() + " has no shapes", null);
                 return;
             }
             for (G3DNode node: nodes) {
-- 
2.45.2