X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=bundles%2Forg.simantics.db.common%2Fsrc%2Forg%2Fsimantics%2Fdb%2Fcommon%2Frequest%2FResourceAsyncRead2.java;fp=bundles%2Forg.simantics.db.common%2Fsrc%2Forg%2Fsimantics%2Fdb%2Fcommon%2Frequest%2FResourceAsyncRead2.java;h=ae40ad4acc90db9e8f6240ab5edc09d675a92f77;hb=0ae2b770234dfc3cbb18bd38f324125cf0faca07;hp=4c421945f6b122cdb4b1f6e939b7226d83cbc981;hpb=24e2b34260f219f0d1644ca7a138894980e25b14;p=simantics%2Fplatform.git

diff --git a/bundles/org.simantics.db.common/src/org/simantics/db/common/request/ResourceAsyncRead2.java b/bundles/org.simantics.db.common/src/org/simantics/db/common/request/ResourceAsyncRead2.java
index 4c421945f..ae40ad4ac 100644
--- a/bundles/org.simantics.db.common/src/org/simantics/db/common/request/ResourceAsyncRead2.java
+++ b/bundles/org.simantics.db.common/src/org/simantics/db/common/request/ResourceAsyncRead2.java
@@ -1,108 +1,108 @@
-/*******************************************************************************
- * 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.request;
-
-import org.simantics.db.AsyncRequestProcessor;
-import org.simantics.db.RequestProcessor;
-import org.simantics.db.Resource;
-import org.simantics.db.exception.DatabaseException;
-import org.simantics.db.procedure.AsyncListener;
-import org.simantics.db.procedure.AsyncProcedure;
-import org.simantics.db.procedure.Listener;
-import org.simantics.db.procedure.Procedure;
-import org.simantics.db.procedure.SyncListener;
-import org.simantics.db.procedure.SyncProcedure;
-import org.simantics.db.request.AsyncRead;
-import org.simantics.db.request.ReadInterface;
-import org.simantics.db.request.Request;
-
-public abstract class ResourceAsyncRead2<T> implements AsyncRead<T>, Request, ReadInterface<T> {
-
-    final protected Resource resource;
-    final protected Resource resource2;
-
-    @Override
-    final public int hashCode() {
-        final int h1 = resource != null ? resource.hashCode() : 0;
-        final int h2 = resource2 != null ? resource2.hashCode() : 0;
-        return h1 ^ h2;
-    }
-
-    @Override
-    public int threadHash() {
-    	return resource.hashCode() >>> 16;
-    }
-    
-    @Override
-    final public boolean equals(Object object) {
-        if (this == object)
-            return true;
-        else if (object == null)
-            return false;
-        else if (getClass() != object.getClass())
-            return false;
-        ResourceAsyncRead2<?> r = (ResourceAsyncRead2<?>) object;
-        if(resource != null) {
-            if(!resource.equals(r.resource)) return false;
-        } else if(r.resource != null) return false;
-        if(resource2 != null) {
-            if(!resource2.equals(r.resource2)) return false;
-        } else if(r.resource2 != null) return false;
-        return true;
-    }
-
-    @Override
-    public int getFlags() {
-        return 0;
-    }
-    
-    public ResourceAsyncRead2(Resource resource, Resource resource2) {
-        this.resource = resource;
-        this.resource2 = resource2;
-    }
-
-    @Override
-    public void request(AsyncRequestProcessor processor, AsyncProcedure<T> procedure) {
-    	processor.asyncRequest(this, procedure);
-    }
-    
-    @Override
-    public void request(AsyncRequestProcessor processor, Procedure<T> procedure) {
-    	processor.asyncRequest(this, procedure);
-    }
-    
-    @Override
-    public void request(AsyncRequestProcessor processor, SyncProcedure<T> procedure) {
-    	processor.asyncRequest(this, procedure);
-    }
-
-    @Override
-    public void request(AsyncRequestProcessor processor, AsyncListener<T> procedure) {
-    	processor.asyncRequest(this, procedure);
-    }
-    
-    @Override
-    public void request(AsyncRequestProcessor processor, Listener<T> procedure) {
-    	processor.asyncRequest(this, procedure);
-    }
-    
-    @Override
-    public void request(AsyncRequestProcessor processor, SyncListener<T> procedure) {
-    	processor.asyncRequest(this, procedure);
-    }
-    
-    @Override
-    public T request(RequestProcessor processor) throws DatabaseException {
-    	return processor.syncRequest(this);
-    }
-    
-}
+/*******************************************************************************
+ * 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.request;
+
+import org.simantics.db.AsyncRequestProcessor;
+import org.simantics.db.RequestProcessor;
+import org.simantics.db.Resource;
+import org.simantics.db.exception.DatabaseException;
+import org.simantics.db.procedure.AsyncListener;
+import org.simantics.db.procedure.AsyncProcedure;
+import org.simantics.db.procedure.Listener;
+import org.simantics.db.procedure.Procedure;
+import org.simantics.db.procedure.SyncListener;
+import org.simantics.db.procedure.SyncProcedure;
+import org.simantics.db.request.AsyncRead;
+import org.simantics.db.request.ReadInterface;
+import org.simantics.db.request.Request;
+
+public abstract class ResourceAsyncRead2<T> implements AsyncRead<T>, Request, ReadInterface<T> {
+
+    final protected Resource resource;
+    final protected Resource resource2;
+
+    @Override
+    final public int hashCode() {
+        final int h1 = resource != null ? resource.hashCode() : 0;
+        final int h2 = resource2 != null ? resource2.hashCode() : 0;
+        return h1 ^ h2;
+    }
+
+    @Override
+    public int threadHash() {
+    	return resource.hashCode() >>> 16;
+    }
+    
+    @Override
+    final public boolean equals(Object object) {
+        if (this == object)
+            return true;
+        else if (object == null)
+            return false;
+        else if (getClass() != object.getClass())
+            return false;
+        ResourceAsyncRead2<?> r = (ResourceAsyncRead2<?>) object;
+        if(resource != null) {
+            if(!resource.equals(r.resource)) return false;
+        } else if(r.resource != null) return false;
+        if(resource2 != null) {
+            if(!resource2.equals(r.resource2)) return false;
+        } else if(r.resource2 != null) return false;
+        return true;
+    }
+
+    @Override
+    public int getFlags() {
+        return 0;
+    }
+    
+    public ResourceAsyncRead2(Resource resource, Resource resource2) {
+        this.resource = resource;
+        this.resource2 = resource2;
+    }
+
+    @Override
+    public void request(AsyncRequestProcessor processor, AsyncProcedure<T> procedure) {
+    	processor.asyncRequest(this, procedure);
+    }
+    
+    @Override
+    public void request(AsyncRequestProcessor processor, Procedure<T> procedure) {
+    	processor.asyncRequest(this, procedure);
+    }
+    
+    @Override
+    public void request(AsyncRequestProcessor processor, SyncProcedure<T> procedure) {
+    	processor.asyncRequest(this, procedure);
+    }
+
+    @Override
+    public void request(AsyncRequestProcessor processor, AsyncListener<T> procedure) {
+    	processor.asyncRequest(this, procedure);
+    }
+    
+    @Override
+    public void request(AsyncRequestProcessor processor, Listener<T> procedure) {
+    	processor.asyncRequest(this, procedure);
+    }
+    
+    @Override
+    public void request(AsyncRequestProcessor processor, SyncListener<T> procedure) {
+    	processor.asyncRequest(this, procedure);
+    }
+    
+    @Override
+    public T request(RequestProcessor processor) throws DatabaseException {
+    	return processor.syncRequest(this);
+    }
+    
+}