From 05d6b89177d16d63016c6640f76a0cd79fc4fde5 Mon Sep 17 00:00:00 2001
From: Lukas Eder <lukas.eder@gmail.com>
Date: Tue, 18 Oct 2011 19:57:01 +0000
Subject: [PATCH] Resolved javac compilation problem

---
 .../java/org/jooq/impl/AbstractSubSelect.java    |  4 ++--
 .../java/org/jooq/impl/AliasProviderImpl.java    |  5 +++--
 jOOQ/src/main/java/org/jooq/impl/Join.java       |  2 +-
 jOOQ/src/main/java/org/jooq/impl/JooqUtil.java   | 16 ++++++++++++++++
 .../java/org/jooq/impl/NamedQueryPartList.java   | 15 ---------------
 5 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/jOOQ/src/main/java/org/jooq/impl/AbstractSubSelect.java b/jOOQ/src/main/java/org/jooq/impl/AbstractSubSelect.java
index 175b223a8f..c0262adc2f 100644
--- a/jOOQ/src/main/java/org/jooq/impl/AbstractSubSelect.java
+++ b/jOOQ/src/main/java/org/jooq/impl/AbstractSubSelect.java
@@ -234,7 +234,7 @@ implements
 
             if (!forUpdateOf.isEmpty()) {
                 context.sql(" of ");
-                forUpdateOf.toSQLNames(context);
+                JooqUtil.toSQLNames(context, forUpdateOf);
             }
             else if (!forUpdateOfTables.isEmpty()) {
                 context.sql(" of ");
@@ -253,7 +253,7 @@ implements
 
                     // Render the OF [table-names] clause
                     default:
-                        forUpdateOfTables.toSQLNames(context);
+                        JooqUtil.toSQLNames(context, forUpdateOfTables);
                         break;
                 }
             }
diff --git a/jOOQ/src/main/java/org/jooq/impl/AliasProviderImpl.java b/jOOQ/src/main/java/org/jooq/impl/AliasProviderImpl.java
index 8640bef4e0..6f21f56327 100644
--- a/jOOQ/src/main/java/org/jooq/impl/AliasProviderImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/AliasProviderImpl.java
@@ -43,6 +43,7 @@ import org.jooq.AliasProvider;
 import org.jooq.Attachable;
 import org.jooq.BindContext;
 import org.jooq.RenderContext;
+import org.jooq.Table;
 
 /**
  * @author Lukas Eder
@@ -112,10 +113,10 @@ class AliasProviderImpl<T extends AliasProvider<T>> extends AbstractNamedQueryPa
                 case HSQLDB:
                 case POSTGRES: {
                     if (context.declareTables() && aliasProvider instanceof ArrayTable) {
-                        ArrayTable<?> table = (ArrayTable<?>) aliasProvider;
+                        Table<?> table = (Table<?>) aliasProvider;
 
                         context.sql("(");
-                        table.getFields().toSQLNames(context);
+                        JooqUtil.toSQLNames(context, table.getFields());
                         context.sql(")");
                     }
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/Join.java b/jOOQ/src/main/java/org/jooq/impl/Join.java
index decf437f7c..e890315541 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Join.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Join.java
@@ -145,7 +145,7 @@ class Join extends AbstractQueryPart {
     private void toSQL0(RenderContext context) {
         if (usingSyntax) {
             context.sql(" using (");
-            using.toSQLNames(context);
+            JooqUtil.toSQLNames(context, using);
             context.sql(")");
         }
         else {
diff --git a/jOOQ/src/main/java/org/jooq/impl/JooqUtil.java b/jOOQ/src/main/java/org/jooq/impl/JooqUtil.java
index 8c068c3325..f49888fd0d 100644
--- a/jOOQ/src/main/java/org/jooq/impl/JooqUtil.java
+++ b/jOOQ/src/main/java/org/jooq/impl/JooqUtil.java
@@ -40,6 +40,7 @@ import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.Statement;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
 
 import javax.persistence.Column;
@@ -49,6 +50,7 @@ import org.jooq.Configuration;
 import org.jooq.Cursor;
 import org.jooq.Field;
 import org.jooq.FieldProvider;
+import org.jooq.NamedQueryPart;
 import org.jooq.Record;
 import org.jooq.RenderContext;
 import org.jooq.Table;
@@ -181,6 +183,20 @@ final class JooqUtil {
         context.sql(")");
     }
 
+    /**
+     * Render a list of names of the <code>NamedQueryParts</code> contained in
+     * this list.
+     */
+    static void toSQLNames(RenderContext context, Collection<? extends NamedQueryPart> list) {
+        String separator = "";
+
+        for (NamedQueryPart part : list) {
+            context.sql(separator).literal(part.getName());
+
+            separator = ", ";
+        }
+    }
+
     /**
      * Combine a field with an array of fields
      */
diff --git a/jOOQ/src/main/java/org/jooq/impl/NamedQueryPartList.java b/jOOQ/src/main/java/org/jooq/impl/NamedQueryPartList.java
index b9ac4feb7b..614cb4bf2a 100644
--- a/jOOQ/src/main/java/org/jooq/impl/NamedQueryPartList.java
+++ b/jOOQ/src/main/java/org/jooq/impl/NamedQueryPartList.java
@@ -38,7 +38,6 @@ package org.jooq.impl;
 import java.util.Collection;
 
 import org.jooq.NamedQueryPart;
-import org.jooq.RenderContext;
 
 /**
  * @author Lukas Eder
@@ -57,18 +56,4 @@ class NamedQueryPartList<T extends NamedQueryPart> extends QueryPartList<T> {
     NamedQueryPartList(Collection<? extends T> wrappedList) {
         super(wrappedList);
     }
-
-    /**
-     * Render a list of names of the <code>NamedQueryParts</code> contained in
-     * this list.
-     */
-    final void toSQLNames(RenderContext context) {
-        String separator = "";
-
-        for (NamedQueryPart part : this) {
-            context.sql(separator).literal(part.getName());
-
-            separator = ", ";
-        }
-    }
 }