Fixed multiple issues causing dangling references to discarded queries

[simantics/platform.git] / bundles / org.simantics.diagram / src / org / simantics / diagram / flag / FlagStringModifierFactory.java

diff --git a/bundles/org.simantics.diagram/src/org/simantics/diagram/flag/FlagStringModifierFactory.java b/bundles/org.simantics.diagram/src/org/simantics/diagram/flag/FlagStringModifierFactory.java
index cca6e7ff83dd4cbae8691b2c41b51d7a8c10d93c..0f360b7ca5a22b68dd0c4c197e541651f9a4e9f4 100644 (file)
--- a/bundles/org.simantics.diagram/src/org/simantics/diagram/flag/FlagStringModifierFactory.java
+++ b/bundles/org.simantics.diagram/src/org/simantics/diagram/flag/FlagStringModifierFactory.java
@@ -1,49 +1,49 @@
-/*******************************************************************************\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.flag;\r
-\r
-import org.simantics.db.ReadGraph;\r
-import org.simantics.db.Resource;\r
-import org.simantics.db.exception.DatabaseException;\r
-import org.simantics.db.layer0.adapter.StringModifier;\r
-import org.simantics.db.layer0.adapter.StringModifierFactory;\r
-import org.simantics.layer0.Layer0;\r
-\r
-/**\r
- * Makes sure that two things apply:\r
- * <ol>\r
- * <li>If a flag is joined with another flag, both flags must have the same label property</li>\r
- * <li>A flag's label is unique within its own diagram</li>\r
- * </ol> \r
- * @author Tuukka Lehtonen\r
- */\r
-public final class FlagStringModifierFactory implements StringModifierFactory {\r
-\r
-    private Resource subject;\r
-\r
-    public FlagStringModifierFactory(ReadGraph graph, Resource subject) throws DatabaseException {\r
-        this.subject = subject;\r
-    }\r
-\r
-    @Override\r
-    public StringModifier createModifier(ReadGraph graph, Resource relation, Resource property) throws DatabaseException {\r
-//        System.out.println(NameUtils.getSafeName(graph, subject));\r
-//        System.out.println(NameUtils.getSafeName(graph, relation));\r
-//        System.out.println(NameUtils.getSafeName(graph, property));\r
-        Layer0 L0 = Layer0.getInstance(graph);\r
-        if (L0.HasLabel.equals(relation)) {\r
-            return new FlagLabelModifier(graph, subject, relation, property);\r
-        }\r
-        return null;\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.flag;
+
+import org.simantics.db.ReadGraph;
+import org.simantics.db.Resource;
+import org.simantics.db.exception.DatabaseException;
+import org.simantics.db.layer0.adapter.StringModifier;
+import org.simantics.db.layer0.adapter.StringModifierFactory;
+import org.simantics.layer0.Layer0;
+
+/**
+ * Makes sure that two things apply:
+ * <ol>
+ * <li>If a flag is joined with another flag, both flags must have the same label property</li>
+ * <li>A flag's label is unique within its own diagram</li>
+ * </ol> 
+ * @author Tuukka Lehtonen
+ */
+public final class FlagStringModifierFactory implements StringModifierFactory {
+
+    private Resource subject;
+
+    public FlagStringModifierFactory(ReadGraph graph, Resource subject) throws DatabaseException {
+        this.subject = subject;
+    }
+
+    @Override
+    public StringModifier createModifier(ReadGraph graph, Resource relation, Resource property) throws DatabaseException {
+//        System.out.println(NameUtils.getSafeName(graph, subject));
+//        System.out.println(NameUtils.getSafeName(graph, relation));
+//        System.out.println(NameUtils.getSafeName(graph, property));
+        Layer0 L0 = Layer0.getInstance(graph);
+        if (L0.HasLabel.equals(relation)) {
+            return new FlagLabelModifier(graph, subject, relation, property);
+        }
+        return null;
+    }
+
+}