Fixed multiple issues causing dangling references to discarded queries

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

diff --git a/bundles/org.simantics.diagram/src/org/simantics/diagram/adapter/LoadRequest.java b/bundles/org.simantics.diagram/src/org/simantics/diagram/adapter/LoadRequest.java
index 6cf6a3b352f2685fa6e5ecf46f139b7f9bd2c48d..01b6f7ec7ecaf97023ce0fc667ef8b904de58455 100644 (file)
--- a/bundles/org.simantics.diagram/src/org/simantics/diagram/adapter/LoadRequest.java
+++ b/bundles/org.simantics.diagram/src/org/simantics/diagram/adapter/LoadRequest.java
@@ -1,44 +1,44 @@
-/*******************************************************************************\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
-import org.simantics.g2d.element.ElementHints;\r
-import org.simantics.g2d.element.IElement;\r
-import org.simantics.g2d.element.impl.Element;\r
-\r
-class LoadRequest extends BaseRequest2<Resource, IElement> {\r
-\r
-    final IDiagram diagram;\r
-    final ElementFactory factory;\r
-    final ElementClass clazz;\r
-\r
-    public LoadRequest(ICanvasContext canvas, IDiagram diagram, ElementFactory factory, ElementClass clazz, Resource resource) {\r
-        super(canvas, resource);\r
-        this.diagram = diagram;\r
-        this.factory = factory;\r
-        this.clazz = clazz;\r
-    }\r
-\r
-    @Override\r
-    public void perform(AsyncReadGraph graph, final AsyncProcedure<IElement> procedure) {\r
-        IElement e = Element.spawnNew(clazz);\r
-        e.setHint(ElementHints.KEY_OBJECT, data);\r
-        factory.load(graph, canvas, diagram, data, e, procedure);\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;
+import org.simantics.g2d.element.ElementHints;
+import org.simantics.g2d.element.IElement;
+import org.simantics.g2d.element.impl.Element;
+
+class LoadRequest extends BaseRequest2<Resource, IElement> {
+
+    final IDiagram diagram;
+    final ElementFactory factory;
+    final ElementClass clazz;
+
+    public LoadRequest(ICanvasContext canvas, IDiagram diagram, ElementFactory factory, ElementClass clazz, Resource resource) {
+        super(canvas, resource);
+        this.diagram = diagram;
+        this.factory = factory;
+        this.clazz = clazz;
+    }
+
+    @Override
+    public void perform(AsyncReadGraph graph, final AsyncProcedure<IElement> procedure) {
+        IElement e = Element.spawnNew(clazz);
+        e.setHint(ElementHints.KEY_OBJECT, data);
+        factory.load(graph, canvas, diagram, data, e, procedure);
+    }
+
+}