Use IMapping<Resource,INode> in node maps.

[simantics/3d.git] / org.simantics.g3d / src / org / simantics / g3d / scl / ScriptNodeMap.java

diff --git a/org.simantics.g3d/src/org/simantics/g3d/scl/ScriptNodeMap.java b/org.simantics.g3d/src/org/simantics/g3d/scl/ScriptNodeMap.java
index d532e1f0557adbf8b93099713bc56732a9e28a66..f9a245dcd541f0dd2b92b155a280a5c72ccb933f 100644 (file)
--- a/org.simantics.g3d/src/org/simantics/g3d/scl/ScriptNodeMap.java
+++ b/org.simantics.g3d/src/org/simantics/g3d/scl/ScriptNodeMap.java
@@ -47,7 +47,7 @@ public abstract class ScriptNodeMap<DBObject,E extends INode> implements NodeMap
        private static final boolean DEBUG = false;
        
        protected Session session;
-       protected IMapping<DBObject,E> mapping;
+       protected IMapping<DBObject,INode> mapping;
        
        protected ParentNode<E> rootNode;
        
@@ -55,7 +55,7 @@ public abstract class ScriptNodeMap<DBObject,E extends INode> implements NodeMap
        
        private boolean dirty = false;
        
-       public ScriptNodeMap(Session session, IMapping<DBObject,E> mapping, ParentNode<E> rootNode) {
+       public ScriptNodeMap(Session session, IMapping<DBObject,INode> mapping, ParentNode<E> rootNode) {
                this.session = session;
                this.mapping = mapping;
                this.rootNode = rootNode;
@@ -91,14 +91,11 @@ public abstract class ScriptNodeMap<DBObject,E extends INode> implements NodeMap
                return Collections.EMPTY_LIST;
        }
        
-       @SuppressWarnings("unchecked")
        @Override
        public ParentNode<E> getRootNode() {
                return (ParentNode<E>)rootNode;
        }
        
-       
-       
        @Override
        public boolean isChangeTracking() {
                return changeTracking;
@@ -120,11 +117,9 @@ public abstract class ScriptNodeMap<DBObject,E extends INode> implements NodeMap
 
        private boolean rangeModified = false;
        
-       @SuppressWarnings("unchecked")
        @Override
        public void updateRenderObjectsFor(E node) {
-               nodes.add((E)node);
-
+               nodes.add(node);
        }
        
        @SuppressWarnings("unchecked")
@@ -160,7 +155,6 @@ public abstract class ScriptNodeMap<DBObject,E extends INode> implements NodeMap
                repaint();
        }
        
-       @SuppressWarnings("unchecked")
        private void receiveUpdate(E node, String id, boolean db) {
                if (DEBUG) System.out.println("receiveUpdate " + debugString(node)  + " " + id + " " + db);
                synchronized (syncMutex) {
@@ -255,7 +249,8 @@ public abstract class ScriptNodeMap<DBObject,E extends INode> implements NodeMap
                synchronized (syncMutex) {
                        graphUpdates = true;
                        for (DBObject domainObject : mapping.getDomainModified()) {
-                               E rangeObject = mapping.get(domainObject);
+                               @SuppressWarnings("unchecked")
+                               E rangeObject = (E) mapping.get(domainObject);
                                if (rangeObject != null)
                                        graphModified.add(rangeObject);
                        }
@@ -290,7 +285,6 @@ public abstract class ScriptNodeMap<DBObject,E extends INode> implements NodeMap
                                doCommit();
                        }
                        session.syncRequest(new ReadRequest() { 
-                               @SuppressWarnings("unchecked")
                                @Override
                                public void run(ReadGraph graph) throws DatabaseException {
                                        update(graph);
@@ -319,6 +313,7 @@ public abstract class ScriptNodeMap<DBObject,E extends INode> implements NodeMap
         * This code here synchronizes removed and added objects to collect deletable objects. (a deletable object is one which is removed but not added).  
         * 
         */
+       @SuppressWarnings("unused")
        protected void syncDeletes() {
                deleteUC.clear();
                for (Pair<E, String> n : removed) {
@@ -340,6 +335,7 @@ public abstract class ScriptNodeMap<DBObject,E extends INode> implements NodeMap
        /**
         * Clears deletable objects from mapping cache.
         */
+       @SuppressWarnings("unused")
        protected void clearDeletes() {
                if (DEBUG && delete.size() > 0) System.out.println("Delete");
                for (E n : delete) {
@@ -561,7 +557,8 @@ public abstract class ScriptNodeMap<DBObject,E extends INode> implements NodeMap
                
        }
        
-       public IMapping<DBObject,E> getMapping() {
+       @Override
+       public IMapping<DBObject,INode> getMapping() {
                return mapping;
        }