commit 5f999f92aa74a7a77d439b057c1c802c7eb0e38c
author Shawn O. Pearce <sop@google.com> Fri Jun 04 11:10:25 2010 -0700
committer Shawn O. Pearce <sop@google.com> Fri Jun 04 12:44:28 2010 -0700
tree acbe83f49d014d309c8d343994955704c53d7993
parent f3ee9a51092457a894f9ee518450065d9c7e0a54

Widen generic annotations in jdbc AccessGen

Some Java compilers won't compile this code correctly, so relax
the type annotations to be less complex.

Change-Id: Iea176366e81eac219af9417f106907aeaace42b8
Signed-off-by: Shawn O. Pearce <sop@google.com>

src/main/java/com/google/gwtorm/jdbc/AccessGen.java

diff --git a/src/main/java/com/google/gwtorm/jdbc/AccessGen.java b/src/main/java/com/google/gwtorm/jdbc/AccessGen.java
index ea1412f..819dafe 100644
--- a/src/main/java/com/google/gwtorm/jdbc/AccessGen.java
+++ b/src/main/java/com/google/gwtorm/jdbc/AccessGen.java
@@ -78,7 +78,7 @@
         Type.getObjectType(model.getEntityTypeClassName().replace('.', '/'));
   }
 
-  <A extends Access<?, ?>> Class<A> create() throws OrmException {
+  public Class<?> create() throws OrmException {
     init();
     implementConstructor();
     implementGetString("getRelationName", model.getRelationName());
@@ -122,11 +122,9 @@
     return loadClass();
   }
 
-  @SuppressWarnings("unchecked")
-  private <A extends Access<?, ?>> Class<A> loadClass() throws OrmException {
+  private Class<?> loadClass() throws OrmException {
     try {
-      final Class<?> c = Class.forName(implClassName, false, classLoader);
-      return (Class<A>) c;
+      return Class.forName(implClassName, false, classLoader);
     } catch (ClassNotFoundException err) {
       throw new OrmException("Cannot load generated class", err);
     }

src/main/java/com/google/gwtorm/jdbc/Database.java

diff --git a/src/main/java/com/google/gwtorm/jdbc/Database.java b/src/main/java/com/google/gwtorm/jdbc/Database.java
index e1982d5..184edff 100644
--- a/src/main/java/com/google/gwtorm/jdbc/Database.java
+++ b/src/main/java/com/google/gwtorm/jdbc/Database.java
@@ -14,7 +14,6 @@
 
 package com.google.gwtorm.jdbc;
 
-import com.google.gwtorm.client.Access;
 import com.google.gwtorm.client.KeyUtil;
 import com.google.gwtorm.client.OrmException;
 import com.google.gwtorm.client.Schema;
@@ -112,8 +111,7 @@
     return new SchemaGen(loader, schemaModel, JdbcSchema.class,
         new SchemaGen.AccessGenerator() {
           @Override
-          public <A extends Access<?, ?>> Class<A> create(
-              GeneratedClassLoader loader, RelationModel rm)
+          public Class<?> create(GeneratedClassLoader loader, RelationModel rm)
               throws OrmException {
             return new AccessGen(loader, rm, dialect).create();
           }

src/main/java/com/google/gwtorm/server/SchemaGen.java

diff --git a/src/main/java/com/google/gwtorm/server/SchemaGen.java b/src/main/java/com/google/gwtorm/server/SchemaGen.java
index d6aa052..9cbce29 100644
--- a/src/main/java/com/google/gwtorm/server/SchemaGen.java
+++ b/src/main/java/com/google/gwtorm/server/SchemaGen.java
@@ -14,7 +14,6 @@
 
 package com.google.gwtorm.server;
 
-import com.google.gwtorm.client.Access;
 import com.google.gwtorm.client.OrmException;
 import com.google.gwtorm.client.Schema;
 import com.google.gwtorm.jdbc.Database;
@@ -35,8 +34,8 @@
 /** Generates a concrete implementation of a {@link Schema} extension. */
 public class SchemaGen<S extends AbstractSchema> implements Opcodes {
   public interface AccessGenerator {
-    <A extends Access<?, ?>> Class<A> create(GeneratedClassLoader loader,
-        RelationModel rm) throws OrmException;
+    Class<?> create(GeneratedClassLoader loader, RelationModel rm)
+        throws OrmException;
   }
 
   private final GeneratedClassLoader classLoader;
@@ -95,7 +94,7 @@
   private void defineRelationClasses() throws OrmException {
     relations = new ArrayList<RelationGen>();
     for (final RelationModel rel : schema.getRelations()) {
-      final Class<? extends Access> a = accessGen.create(classLoader, rel);
+      final Class<?> a = accessGen.create(classLoader, rel);
       relations.add(new RelationGen(rel, a));
     }
   }