From 9882059f199454feafd1633e6f1b98e84b6f763e Mon Sep 17 00:00:00 2001
From: Antti Villberg <antti.villberg@semantum.fi>
Date: Sun, 7 May 2017 09:48:19 +0300
Subject: [PATCH] GenericReadBase2 without the unused template parameter

refs #7195

Change-Id: Id09d9a3c8f2752fda0d2b846f69382249374704a
---
 .../db/common/request/GenericReadBase.java    | 49 +--------------
 .../db/common/request/GenericReadBase2.java   | 63 +++++++++++++++++++
 2 files changed, 64 insertions(+), 48 deletions(-)
 create mode 100644 bundles/org.simantics.db.common/src/org/simantics/db/common/request/GenericReadBase2.java

diff --git a/bundles/org.simantics.db.common/src/org/simantics/db/common/request/GenericReadBase.java b/bundles/org.simantics.db.common/src/org/simantics/db/common/request/GenericReadBase.java
index 03608742d..9cddc12fd 100644
--- a/bundles/org.simantics.db.common/src/org/simantics/db/common/request/GenericReadBase.java
+++ b/bundles/org.simantics.db.common/src/org/simantics/db/common/request/GenericReadBase.java
@@ -11,53 +11,6 @@
  *******************************************************************************/
 package org.simantics.db.common.request;
 
-import org.simantics.db.AsyncRequestProcessor;
-import org.simantics.db.RequestProcessor;
-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.Read;
-import org.simantics.db.request.ReadInterface;
-
-public abstract class GenericReadBase<P, R> implements Read<R>, ReadInterface<R> {
-
-    @Override
-    public void request(AsyncRequestProcessor processor, AsyncProcedure<R> procedure) {
-    	processor.asyncRequest(this, procedure);
-    }
-    
-    @Override
-    public void request(AsyncRequestProcessor processor, Procedure<R> procedure) {
-    	processor.asyncRequest(this, procedure);
-    }
-    
-    @Override
-    public void request(AsyncRequestProcessor processor, SyncProcedure<R> procedure) {
-    	processor.asyncRequest(this, procedure);
-    }
-
-    @Override
-    public void request(AsyncRequestProcessor processor, AsyncListener<R> procedure) {
-    	processor.asyncRequest(this, procedure);
-    }
-    
-    @Override
-    public void request(AsyncRequestProcessor processor, Listener<R> procedure) {
-    	processor.asyncRequest(this, procedure);
-    }
-    
-    @Override
-    public void request(AsyncRequestProcessor processor, SyncListener<R> procedure) {
-    	processor.asyncRequest(this, procedure);
-    }
-    
-    @Override
-    public R request(RequestProcessor processor) throws DatabaseException {
-    	return processor.syncRequest(this);
-    }
+public abstract class GenericReadBase<P, R> extends GenericReadBase2<R> {
     
 }
diff --git a/bundles/org.simantics.db.common/src/org/simantics/db/common/request/GenericReadBase2.java b/bundles/org.simantics.db.common/src/org/simantics/db/common/request/GenericReadBase2.java
new file mode 100644
index 000000000..cca1cbff1
--- /dev/null
+++ b/bundles/org.simantics.db.common/src/org/simantics/db/common/request/GenericReadBase2.java
@@ -0,0 +1,63 @@
+/*******************************************************************************
+ * 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.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.Read;
+import org.simantics.db.request.ReadInterface;
+
+public abstract class GenericReadBase2<R> implements Read<R>, ReadInterface<R> {
+
+    @Override
+    public void request(AsyncRequestProcessor processor, AsyncProcedure<R> procedure) {
+    	processor.asyncRequest(this, procedure);
+    }
+    
+    @Override
+    public void request(AsyncRequestProcessor processor, Procedure<R> procedure) {
+    	processor.asyncRequest(this, procedure);
+    }
+    
+    @Override
+    public void request(AsyncRequestProcessor processor, SyncProcedure<R> procedure) {
+    	processor.asyncRequest(this, procedure);
+    }
+
+    @Override
+    public void request(AsyncRequestProcessor processor, AsyncListener<R> procedure) {
+    	processor.asyncRequest(this, procedure);
+    }
+    
+    @Override
+    public void request(AsyncRequestProcessor processor, Listener<R> procedure) {
+    	processor.asyncRequest(this, procedure);
+    }
+    
+    @Override
+    public void request(AsyncRequestProcessor processor, SyncListener<R> procedure) {
+    	processor.asyncRequest(this, procedure);
+    }
+    
+    @Override
+    public R request(RequestProcessor processor) throws DatabaseException {
+    	return processor.syncRequest(this);
+    }
+    
+}
-- 
2.43.2