From af78ccd4845ddd1a7556acf5ac4ca57ffe8dc25a Mon Sep 17 00:00:00 2001 From: Lukas Eder Date: Fri, 21 Nov 2014 16:01:36 +0100 Subject: [PATCH] [#3792] Code generator erroneously refers to "singleton instances" of tables in generated Javadoc --- .../src/main/java/org/jooq/util/GeneratorStrategy.java | 8 ++++---- .../src/main/java/org/jooq/util/JavaGenerator.java | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/jOOQ-codegen/src/main/java/org/jooq/util/GeneratorStrategy.java b/jOOQ-codegen/src/main/java/org/jooq/util/GeneratorStrategy.java index b369db14d9..b7e2c84672 100644 --- a/jOOQ-codegen/src/main/java/org/jooq/util/GeneratorStrategy.java +++ b/jOOQ-codegen/src/main/java/org/jooq/util/GeneratorStrategy.java @@ -82,8 +82,8 @@ public interface GeneratorStrategy { boolean getInstanceFields(); /** - * This is applied to definitions that can result in singleton static and - * instance members. For instance, the singleton instance of a + * This is applied to definitions that can result in reference static and + * instance members. For instance, the reference instance of a * {@link TableDefinition} is a java identifier * * @return The Java identifier representing this object, e.g. [my_table] @@ -101,8 +101,8 @@ public interface GeneratorStrategy { List getJavaIdentifiers(Definition... definitions); /** - * This is applied to definitions that can result in singleton static and - * instance members. For instance, the singleton instance of a + * This is applied to definitions that can result in reference static and + * instance members. For instance, the reference instance of a * {@link TableDefinition} is a java identifier * * @return The Java identifier representing this object, e.g. [my_table] diff --git a/jOOQ-codegen/src/main/java/org/jooq/util/JavaGenerator.java b/jOOQ-codegen/src/main/java/org/jooq/util/JavaGenerator.java index 2e09e6c97d..0cbb40257b 100644 --- a/jOOQ-codegen/src/main/java/org/jooq/util/JavaGenerator.java +++ b/jOOQ-codegen/src/main/java/org/jooq/util/JavaGenerator.java @@ -2335,7 +2335,7 @@ public class JavaGenerator extends AbstractGenerator { out.println("public class %s extends %s[[before= implements ][%s]] {", className, SchemaImpl.class, interfaces); out.printSerial(); - out.tab(1).javadoc("The singleton instance of %s", schemaName); + out.tab(1).javadoc("The reference instance of %s", schemaName); out.tab(1).println("public static final %s %s = new %s();", className, schemaId, className); out.tab(1).javadoc(NO_FURTHER_INSTANCES_ALLOWED); @@ -2985,7 +2985,7 @@ public class JavaGenerator extends AbstractGenerator { final String className = getStrategy().getFullJavaClassName(definition); final String identifier = getStrategy().getJavaIdentifier(definition); - out.tab(1).javadoc("The singleton instance of %s", definition.getQualifiedOutputName()); + out.tab(1).javadoc("The reference instance of %s", definition.getQualifiedOutputName()); out.tab(1).println("public static final %s %s = new %s();", className, identifier, className); }