Fixed multiple issues causing dangling references to discarded queries

[simantics/platform.git] / bundles / org.simantics.db.common / src / org / simantics / db / common / NamedTypedResource.java

diff --git a/bundles/org.simantics.db.common/src/org/simantics/db/common/NamedTypedResource.java b/bundles/org.simantics.db.common/src/org/simantics/db/common/NamedTypedResource.java
index 208798361c1098fb17264684aeacf809cd0f35a4..639520474e26952fcbc53ff9fc44d1dbb381bba1 100644 (file)
--- a/bundles/org.simantics.db.common/src/org/simantics/db/common/NamedTypedResource.java
+++ b/bundles/org.simantics.db.common/src/org/simantics/db/common/NamedTypedResource.java
@@ -1,73 +1,73 @@
-/*******************************************************************************\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.db.common;\r
-\r
-import org.simantics.db.Resource;\r
-\r
-/**\r
- * \r
- */\r
-final public class NamedTypedResource implements Comparable<NamedTypedResource> {\r
-       \r
-    final String   name;\r
-    final Resource resource;\r
-    final Resource type;\r
-\r
-    public NamedTypedResource(String name, Resource resource, Resource type) {\r
-       assert(name != null);\r
-       assert(resource != null);\r
-       assert(type != null);\r
-        this.name = name;\r
-        this.resource = resource;\r
-        this.type = type;\r
-    }\r
-\r
-    public String getName() {\r
-        return name;\r
-    }\r
-\r
-    public Resource getResource() {\r
-        return resource;\r
-    }\r
-\r
-    public Resource getType() {\r
-        return type;\r
-    }\r
-\r
-    @Override\r
-    public int compareTo(NamedTypedResource o) {\r
-        return name.compareToIgnoreCase(o.name);\r
-    }\r
-\r
-    @Override\r
-    public String toString() {\r
-        return name;\r
-    }\r
-\r
-    @Override\r
-    public int hashCode() {\r
-        return resource.hashCode();\r
-    }\r
-\r
-    @Override\r
-    public boolean equals(Object obj) {\r
-        if (this == obj)\r
-            return true;\r
-        if (obj == null)\r
-            return false;\r
-        if (getClass() != obj.getClass())\r
-            return false;\r
-        NamedTypedResource other = (NamedTypedResource) obj;\r
-        return resource.equals(other.resource) && type.equals(other.type) && name.equals(other.name);\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.db.common;
+
+import org.simantics.db.Resource;
+
+/**
+ * 
+ */
+final public class NamedTypedResource implements Comparable<NamedTypedResource> {
+       
+    final String   name;
+    final Resource resource;
+    final Resource type;
+
+    public NamedTypedResource(String name, Resource resource, Resource type) {
+       assert(name != null);
+       assert(resource != null);
+       assert(type != null);
+        this.name = name;
+        this.resource = resource;
+        this.type = type;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public Resource getResource() {
+        return resource;
+    }
+
+    public Resource getType() {
+        return type;
+    }
+
+    @Override
+    public int compareTo(NamedTypedResource o) {
+        return name.compareToIgnoreCase(o.name);
+    }
+
+    @Override
+    public String toString() {
+        return name;
+    }
+
+    @Override
+    public int hashCode() {
+        return resource.hashCode();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+        if (getClass() != obj.getClass())
+            return false;
+        NamedTypedResource other = (NamedTypedResource) obj;
+        return resource.equals(other.resource) && type.equals(other.type) && name.equals(other.name);
+    }
+
+}