Fixed multiple issues causing dangling references to discarded queries

[simantics/platform.git] / bundles / org.simantics.diagram / src / org / simantics / diagram / adapter / NodeClassRequest.java

diff --git a/bundles/org.simantics.diagram/src/org/simantics/diagram/adapter/NodeClassRequest.java b/bundles/org.simantics.diagram/src/org/simantics/diagram/adapter/NodeClassRequest.java
index a0bc8c52e2dd5188c5fb7322ed37f25570c1482c..8ab24b71ab083012ca97fd695e90592b0304d929 100644 (file)
--- a/bundles/org.simantics.diagram/src/org/simantics/diagram/adapter/NodeClassRequest.java
+++ b/bundles/org.simantics.diagram/src/org/simantics/diagram/adapter/NodeClassRequest.java
@@ -1,104 +1,80 @@
-/*******************************************************************************\r
- * Copyright (c) 2007, 2010 Association for Decentralized Information Management\r
- * in Industry THTH ry.\r
- * All rights reserved. This program and the accompanying materials\r
- * are made available under the terms of the Eclipse Public License v1.0\r
- * which accompanies this distribution, and is available at\r
- * http://www.eclipse.org/legal/epl-v10.html\r
- *\r
- * Contributors:\r
- *     VTT Technical Research Centre of Finland - initial API and implementation\r
- *******************************************************************************/\r
-package org.simantics.diagram.adapter;\r
-\r
-import org.simantics.db.AsyncReadGraph;\r
-import org.simantics.db.Resource;\r
-import org.simantics.db.procedure.AsyncProcedure;\r
-import org.simantics.g2d.canvas.ICanvasContext;\r
-import org.simantics.g2d.diagram.IDiagram;\r
-import org.simantics.g2d.element.ElementClass;\r
-\r
-public class NodeClassRequest extends BaseRequest2<Resource, ElementClass> {\r
-\r
-    private final IDiagram diagram;\r
-    private final boolean exceptionOnAdaptionFailure;\r
-\r
-    public NodeClassRequest(ICanvasContext canvas, IDiagram diagram, Resource resource) {\r
-        this(canvas, diagram, resource, false);\r
-    }\r
-\r
-    public NodeClassRequest(ICanvasContext canvas, IDiagram diagram, Resource resource, boolean exceptionOnAdaptionFailure) {\r
-        super(canvas, resource);\r
-        this.diagram = diagram;\r
-        this.exceptionOnAdaptionFailure = exceptionOnAdaptionFailure;\r
-    }\r
-\r
-    @Override\r
-    public void perform(AsyncReadGraph graph, final AsyncProcedure<ElementClass> procedure) {\r
-\r
-//        System.out.println("NodeClassRequest " + data.getResourceId());\r
-//        graph.asyncRequest(new SafeName(data), new Procedure<String>() {\r
-//            @Override\r
-//            public void exception(Throwable t) {\r
-//            }\r
-//            @Override\r
-//            public void execute(String result) {\r
-//                System.out.println("NodeClassRequest "  + result);\r
-//                debug = result;\r
-//            }\r
-//        });\r
-\r
-        graph.forAdapted(data, ElementFactory.class, new AsyncProcedure<ElementFactory>() {\r
-\r
-            @Override\r
-            public void exception(AsyncReadGraph graph, Throwable throwable) {\r
-                if (exceptionOnAdaptionFailure)\r
-                    procedure.exception(graph, throwable);\r
-                else\r
-                    procedure.execute(graph, null);\r
-            }\r
-\r
-            @Override\r
-            public void execute(AsyncReadGraph graph, final ElementFactory factory) {\r
-\r
-//                System.out.println("NodeClassRequest factory " + data.getResourceId() + " = " + factory.getClass().getName());\r
-//                graph.asyncRequest(new SafeName(data), new Procedure<String>() {\r
-//                    @Override\r
-//                    public void exception(Throwable t) {\r
-//                    }\r
-//                    @Override\r
-//                    public void execute(String result) {\r
-//                        System.out.println("NodeClassRequest "  + result + " " + factory.getClass().getName());\r
-//                        debug = result;\r
-//                    }\r
-//                });\r
-\r
-                if (factory == null) {\r
-                    // Should never happen since we are using forAdapted\r
-                    System.out.println("No factory in NodeClassRequest! " + this);\r
-                    procedure.execute(graph, null);\r
-                    return;\r
-                }\r
-\r
-                factory.create(graph, canvas, diagram, data, new AsyncProcedure<ElementClass>() {\r
-\r
-                    @Override\r
-                    public void exception(AsyncReadGraph graph, Throwable throwable) {\r
-                        procedure.exception(graph, throwable);\r
-                    }\r
-\r
-                    @Override\r
-                    public void execute(AsyncReadGraph graph, ElementClass ec) {\r
-//                        System.out.println("Produced element class " + ec);\r
-                        procedure.execute(graph, ec);\r
-                    }\r
-\r
-                });\r
-\r
-            }\r
-\r
-        });\r
-\r
-    }\r
-\r
-}\r
+/*******************************************************************************
+ * Copyright (c) 2007, 2010 Association for Decentralized Information Management
+ * in Industry THTH ry.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     VTT Technical Research Centre of Finland - initial API and implementation
+ *******************************************************************************/
+package org.simantics.diagram.adapter;
+
+import org.simantics.db.AsyncReadGraph;
+import org.simantics.db.Resource;
+import org.simantics.db.procedure.AsyncProcedure;
+import org.simantics.g2d.canvas.ICanvasContext;
+import org.simantics.g2d.diagram.IDiagram;
+import org.simantics.g2d.element.ElementClass;
+
+public class NodeClassRequest extends BaseRequest2<Resource, ElementClass> {
+
+    private final IDiagram diagram;
+    private final boolean exceptionOnAdaptionFailure;
+
+    public NodeClassRequest(ICanvasContext canvas, IDiagram diagram, Resource resource) {
+        this(canvas, diagram, resource, false);
+    }
+
+    public NodeClassRequest(ICanvasContext canvas, IDiagram diagram, Resource resource, boolean exceptionOnAdaptionFailure) {
+        super(canvas, resource);
+        this.diagram = diagram;
+        this.exceptionOnAdaptionFailure = exceptionOnAdaptionFailure;
+    }
+
+    @Override
+    public void perform(AsyncReadGraph graph, final AsyncProcedure<ElementClass> procedure) {
+
+        graph.forAdapted(data, ElementFactory.class, new AsyncProcedure<ElementFactory>() {
+
+            @Override
+            public void exception(AsyncReadGraph graph, Throwable throwable) {
+                if (exceptionOnAdaptionFailure)
+                    procedure.exception(graph, throwable);
+                else
+                    procedure.execute(graph, null);
+            }
+
+            @Override
+            public void execute(AsyncReadGraph graph, final ElementFactory factory) {
+
+                if (factory == null) {
+                    // Should never happen since we are using forAdapted
+                    System.out.println("No factory in NodeClassRequest! " + this);
+                    procedure.execute(graph, null);
+                    return;
+                }
+
+                factory.create(graph, canvas, diagram, data, new AsyncProcedure<ElementClass>() {
+
+                    @Override
+                    public void exception(AsyncReadGraph graph, Throwable throwable) {
+                        procedure.exception(graph, throwable);
+                    }
+
+                    @Override
+                    public void execute(AsyncReadGraph graph, ElementClass ec) {
+//                        System.out.println("Produced element class " + ec);
+                        procedure.execute(graph, ec);
+                    }
+
+                });
+
+            }
+
+        });
+
+    }
+
+}