From 74a8aa2b3099bfddd8d2871d609f913c04236ed7 Mon Sep 17 00:00:00 2001 From: Seva Safris Date: Sun, 25 Jun 2023 16:08:14 -0700 Subject: [PATCH] super -> $ --- .../java/org/jaxdb/runner/DBTestRunner.java | 6 +-- .../org/jaxdb/NumericFunctionDynamicTest.java | 5 +- .../org/jaxdb/runner/SchemaTestRunner.java | 4 +- .../java/org/jaxdb/jsql/OneToManyHashMap.java | 12 ++--- .../java/org/jaxdb/jsql/OneToManyTreeMap.java | 12 ++--- .../org/jaxdb/jsql/OneToOneHashTreeMap.java | 10 ++-- .../jaxdb/jsql/generator/ForeignRelation.java | 4 +- .../jsql/generator/ManyToManyRelation.java | 2 +- .../org/jaxdb/jsql/generator/Relation.java | 22 ++++----- .../org/jaxdb/jsql/generator/SchemaModel.java | 10 ++-- .../org/jaxdb/jsql/generator/TableModel.java | 48 +++++++++---------- 11 files changed, 69 insertions(+), 66 deletions(-) diff --git a/ddlx/src/test/java/org/jaxdb/runner/DBTestRunner.java b/ddlx/src/test/java/org/jaxdb/runner/DBTestRunner.java index a1beaf8e..d26e4b25 100644 --- a/ddlx/src/test/java/org/jaxdb/runner/DBTestRunner.java +++ b/ddlx/src/test/java/org/jaxdb/runner/DBTestRunner.java @@ -404,12 +404,12 @@ protected Object invokeExplosively(final VendorFrameworkMethod frameworkMethod, if (method.getParameterTypes().length == 1) { try (final Connection connection = executor.getConnection()) { if (logger.isInfoEnabled()) logger.info(toString(method) + " [" + vendor.getSimpleName() + "]"); - return frameworkMethod.invokeExplosivelySuper(target, connection); + return frameworkMethod.invokeExplosively$(target, connection); } } if (logger.isInfoEnabled()) logger.info(toString(method) + " [" + vendor.getSimpleName() + "]"); - return frameworkMethod.invokeExplosivelySuper(target); + return frameworkMethod.invokeExplosively$(target); } protected class VendorFrameworkMethod extends FrameworkMethod { @@ -458,7 +458,7 @@ public Object invokeExplosively(final Object target, final Object ... params) th return DBTestRunner.this.invokeExplosively(this, target, params); } - final Object invokeExplosivelySuper(final Object target, final Object ... params) throws Throwable { + final Object invokeExplosively$(final Object target, final Object ... params) throws Throwable { try { executor.sempaphore.acquire(); return super.invokeExplosively(target, params); diff --git a/jaxdb-maven-plugin/src/test/java/org/jaxdb/NumericFunctionDynamicTest.java b/jaxdb-maven-plugin/src/test/java/org/jaxdb/NumericFunctionDynamicTest.java index ba185b2e..3fc7f221 100644 --- a/jaxdb-maven-plugin/src/test/java/org/jaxdb/NumericFunctionDynamicTest.java +++ b/jaxdb-maven-plugin/src/test/java/org/jaxdb/NumericFunctionDynamicTest.java @@ -55,7 +55,10 @@ public static class RegressionTest extends NumericFunctionDynamicTest { } public static void assertBigDecimalEquals(final BigDecimal expected, final BigDecimal actual) { - assertEquals(0, expected.compareTo(actual)); + if (expected == null) + assertNull(actual); + else + assertEquals(0, expected.compareTo(actual)); } private static final MathContext mc = new MathContext(65, RoundingMode.DOWN); diff --git a/jaxdb-maven-plugin/src/test/java/org/jaxdb/runner/SchemaTestRunner.java b/jaxdb-maven-plugin/src/test/java/org/jaxdb/runner/SchemaTestRunner.java index 14ee93ed..08e10b98 100644 --- a/jaxdb-maven-plugin/src/test/java/org/jaxdb/runner/SchemaTestRunner.java +++ b/jaxdb-maven-plugin/src/test/java/org/jaxdb/runner/SchemaTestRunner.java @@ -96,7 +96,7 @@ protected Object invokeExplosively(final VendorFrameworkMethod frameworkMethod, TestCommand.Select.beforeInvokeExplosively(method); if (parameterTypes.length == 0) - return frameworkMethod.invokeExplosivelySuper(target); + return frameworkMethod.invokeExplosively$(target); final DBTestRunner.Executor executor = frameworkMethod.getExecutor(); params = new Object[parameterTypes.length]; @@ -124,7 +124,7 @@ else if (Schema.class.isAssignableFrom(parameterType)) final Object result; try { - result = frameworkMethod.invokeExplosivelySuper(target, params); + result = frameworkMethod.invokeExplosively$(target, params); } catch (final Throwable t) { if (transaction != null) { diff --git a/jsql/src/main/java/org/jaxdb/jsql/OneToManyHashMap.java b/jsql/src/main/java/org/jaxdb/jsql/OneToManyHashMap.java index f383a535..bc3004f8 100644 --- a/jsql/src/main/java/org/jaxdb/jsql/OneToManyHashMap.java +++ b/jsql/src/main/java/org/jaxdb/jsql/OneToManyHashMap.java @@ -1,11 +1,11 @@ /* Copyright (c) 2022 JAX-DB * - * Permission is hereby granted, final free of charge, final to any person obtaining a copy - * of this software and associated documentation files (the "Software"), final to deal - * in the Software without restriction, final including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, final and/or sell - * copies of the Software, final and to permit persons to whom the Software is - * furnished to do so, final subject to the following conditions: + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: * * The above copyright notice and this permission notice shall be included in * all copies or substantial portions of the Software. diff --git a/jsql/src/main/java/org/jaxdb/jsql/OneToManyTreeMap.java b/jsql/src/main/java/org/jaxdb/jsql/OneToManyTreeMap.java index 28749518..3ae8e0b8 100644 --- a/jsql/src/main/java/org/jaxdb/jsql/OneToManyTreeMap.java +++ b/jsql/src/main/java/org/jaxdb/jsql/OneToManyTreeMap.java @@ -1,11 +1,11 @@ /* Copyright (c) 2022 JAX-DB * - * Permission is hereby granted, final free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), final to deal - * in the Software without restriction, final including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, final and/or sell - * copies of the Software, final and to permit persons to whom the Software is - * furnished to do so, final subject to the following conditions: + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: * * The above copyright notice and this permission notice shall be included in * all copies or substantial portions of the Software. diff --git a/jsql/src/main/java/org/jaxdb/jsql/OneToOneHashTreeMap.java b/jsql/src/main/java/org/jaxdb/jsql/OneToOneHashTreeMap.java index c9ea1bcb..983333a8 100644 --- a/jsql/src/main/java/org/jaxdb/jsql/OneToOneHashTreeMap.java +++ b/jsql/src/main/java/org/jaxdb/jsql/OneToOneHashTreeMap.java @@ -1,11 +1,11 @@ /* Copyright (c) 2022 JAX-DB * - * Permission is hereby granted, final free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), final to deal - * in the Software without restriction, final including without limitation the rights + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights * to use, copy, modify, merge, publish, distribute, sublicense, final and/or sell - * copies of the Software, final and to permit persons to whom the Software is - * furnished to do so, final subject to the following conditions: + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: * * The above copyright notice and this permission notice shall be included in * all copies or substantial portions of the Software. diff --git a/jsql/src/main/java/org/jaxdb/jsql/generator/ForeignRelation.java b/jsql/src/main/java/org/jaxdb/jsql/generator/ForeignRelation.java index e9c6d1eb..f3ed4105 100644 --- a/jsql/src/main/java/org/jaxdb/jsql/generator/ForeignRelation.java +++ b/jsql/src/main/java/org/jaxdb/jsql/generator/ForeignRelation.java @@ -66,11 +66,11 @@ String writeDeclaration(final String classSimpleName) { final String writeDeclaration(final String classSimpleName, final String typeName, final String declaredName, final String suffix) { final StringBuilder out = new StringBuilder(); - out.append("\n public final ").append(typeName).append(' ').append(fieldName).append("_CACHED() {"); + out.append("\n public final ").append(typeName).append(' ').append(fieldName).append("_CACHED() { // ForeignRelation.writeDeclaration(String,String,String,String)"); out.append("\n final ").append(CacheMap.class.getName()).append('<').append(declaredName).append("> cache = ").append(referenceTable.singletonInstanceName).append('.').append(cacheMapFieldNameForeign).append(';'); out.append("\n return cache == null ? null : cache.get").append(suffix).append("(").append(keyClause(cacheIndexFieldNameForeign).replace("{1}", classSimpleName).replace("{2}", "Old")).append(");"); out.append("\n }\n"); - out.append("\n public final ").append(typeName).append(' ').append(fieldName).append("_SELECT() throws ").append(IOException.class.getName()).append(", ").append(SQLException.class.getName()).append(" {"); + out.append("\n public final ").append(typeName).append(' ').append(fieldName).append("_SELECT() throws ").append(IOException.class.getName()).append(", ").append(SQLException.class.getName()).append(" { // ForeignRelation.writeDeclaration(String,String,String,String)"); out.append("\n final ").append(CacheMap.class.getName()).append('<').append(declaredName).append("> cache = ").append(referenceTable.singletonInstanceName).append('.').append(cacheMapFieldNameForeign).append(';'); out.append("\n return cache == null ? null : cache.select").append(suffix).append("(").append(keyClause(cacheIndexFieldNameForeign).replace("{1}", classSimpleName).replace("{2}", "Old")).append(");"); out.append("\n }"); diff --git a/jsql/src/main/java/org/jaxdb/jsql/generator/ManyToManyRelation.java b/jsql/src/main/java/org/jaxdb/jsql/generator/ManyToManyRelation.java index 0fcc0c33..d067ef81 100644 --- a/jsql/src/main/java/org/jaxdb/jsql/generator/ManyToManyRelation.java +++ b/jsql/src/main/java/org/jaxdb/jsql/generator/ManyToManyRelation.java @@ -24,7 +24,7 @@ class ManyToManyRelation extends ForeignRelation { @Override String writeCacheInsert(final String classSimpleName, final CurOld curOld) { final String method = indexType.isUnique ? "put$" : "add$"; - return writeNullCheckClause(classSimpleName, curOld) + tableModel.singletonInstanceName + "." + cacheMapFieldName + "." + method + "(" + keyClause(cacheIndexFieldNameForeign).replace("{1}", classSimpleName).replace("{2}", curOld.toString()) + ", " + classSimpleName + ".this);"; + return writeNullCheckClause(classSimpleName, curOld) + tableModel.singletonInstanceName + "." + cacheMapFieldName + "." + method + "(" + keyClause(cacheIndexFieldNameForeign).replace("{1}", classSimpleName).replace("{2}", curOld.toString()) + ", " + classSimpleName + ".this); // ManyToManyRelation.writeCacheInsert(String,CurlOld)"; } @Override diff --git a/jsql/src/main/java/org/jaxdb/jsql/generator/Relation.java b/jsql/src/main/java/org/jaxdb/jsql/generator/Relation.java index 8b69318e..b9c5a823 100644 --- a/jsql/src/main/java/org/jaxdb/jsql/generator/Relation.java +++ b/jsql/src/main/java/org/jaxdb/jsql/generator/Relation.java @@ -115,10 +115,10 @@ private String writeGetRangeMethod(final String returnType) { return ""; return - "\n public " + SortedMap.class.getName() + "<" + data.Key.class.getCanonicalName() + "," + returnType + "> " + cacheMethodName + "_CACHED(" + rangeParams + ") {" + + "\n public " + SortedMap.class.getName() + "<" + data.Key.class.getCanonicalName() + "," + returnType + "> " + cacheMethodName + "_CACHED(" + rangeParams + ") { // Relation.writeGetRangeMethod(String)" + "\n return " + tableModel.singletonInstanceName + "." + cacheMapFieldName + ".subMap(" + rangeArgs + ");" + "\n }\n" + - "\n public " + SortedMap.class.getName() + "<" + data.Key.class.getCanonicalName() + "," + returnType + "> " + cacheMethodName + "_SELECT(" + rangeParams + ") throws " + IOException.class.getName() + ", " + SQLException.class.getName() + " {" + + "\n public " + SortedMap.class.getName() + "<" + data.Key.class.getCanonicalName() + "," + returnType + "> " + cacheMethodName + "_SELECT(" + rangeParams + ") throws " + IOException.class.getName() + ", " + SQLException.class.getName() + " { // Relation.writeGetRangeMethod(String)" + "\n return " + tableModel.singletonInstanceName + "." + cacheMapFieldName + ".select(" + rangeArgs + ");" + "\n }\n"; } @@ -154,26 +154,26 @@ final String writeCacheDeclare(final LinkedHashSet keyClauseColumnAssign keyClauseColumnAssignments(keyClauseColumnAssignments); final String returnType = indexType.isUnique ? declarationName : indexType.getInterfaceClass(declarationName); return - "\n private " + data.Column.class.getCanonicalName() + "[] " + cacheIndexFieldName + ";" + + "\n private " + data.Column.class.getCanonicalName() + "[] " + cacheIndexFieldName + "; // Relation.writeCacheDeclare(LinkedHashSet)" + "\n " + indexType.getConcreteClass(declarationName) + " " + cacheMapFieldName + ";\n" + - "\n public " + returnType + " " + cacheMethodName + "_CACHED(" + keyParams + ") {" + + "\n public " + returnType + " " + cacheMethodName + "_CACHED(" + keyParams + ") { // Relation.writeCacheDeclare(LinkedHashSet)" + "\n return " + tableModel.singletonInstanceName + "." + cacheMapFieldName + ".get(" + keyArgs + ");" + "\n }\n" + - "\n public " + returnType + " " + cacheMethodName + "_SELECT(" + keyParams + ") throws " + IOException.class.getName() + ", " + SQLException.class.getName() + " {" + + "\n public " + returnType + " " + cacheMethodName + "_SELECT(" + keyParams + ") throws " + IOException.class.getName() + ", " + SQLException.class.getName() + " { // Relation.writeCacheDeclare(LinkedHashSet)" + "\n return " + tableModel.singletonInstanceName + "." + cacheMapFieldName + ".select(" + keyArgs + ");" + "\n }\n" + writeGetRangeMethod(returnType) + - "\n public " + indexType.getInterfaceClass(returnType) + " " + cacheMethodName + "_CACHED() {" + + "\n public " + indexType.getInterfaceClass(returnType) + " " + cacheMethodName + "_CACHED() { // Relation.writeCacheDeclare(LinkedHashSet)" + "\n return " + tableModel.singletonInstanceName + "." + cacheMapFieldName + ";" + "\n }\n" + - "\n public " + indexType.getInterfaceClass(returnType) + " " + cacheMethodName + "_SELECT() throws " + IOException.class.getName() + ", " + SQLException.class.getName() + " {" + + "\n public " + indexType.getInterfaceClass(returnType) + " " + cacheMethodName + "_SELECT() throws " + IOException.class.getName() + ", " + SQLException.class.getName() + " { // Relation.writeCacheDeclare(LinkedHashSet)" + "\n " + tableModel.singletonInstanceName + "." + cacheMapFieldName + ".selectAll();" + "\n return " + tableModel.singletonInstanceName + "." + cacheMapFieldName + ";" + "\n }"; } final String writeCacheInit() { - return cacheMapFieldName + " = new " + indexType.getConcreteClass(null) + "<>(this);"; + return cacheMapFieldName + " = new " + indexType.getConcreteClass(null) + "<>(this); // Relation.writeCacheInit()"; } final String writeNullCheckClause(final String classSimpleName, final CurOld curOld) { @@ -182,15 +182,15 @@ final String writeNullCheckClause(final String classSimpleName, final CurOld cur String writeCacheInsert(final String classSimpleName, final CurOld curOld) { final String method = indexType.isUnique ? "put$" : "add$"; - return writeNullCheckClause(classSimpleName, curOld) + tableModel.singletonInstanceName + "." + cacheMapFieldName + "." + method + "(" + keyClause().replace("{1}", classSimpleName).replace("{2}", curOld.toString()) + ", " + classSimpleName + ".this);"; + return writeNullCheckClause(classSimpleName, curOld) + tableModel.singletonInstanceName + "." + cacheMapFieldName + "." + method + "(" + keyClause().replace("{1}", classSimpleName).replace("{2}", curOld.toString()) + ", " + classSimpleName + ".this); // Relation.writeCacheInsert(String,CurOld)"; } final String writeCacheSelectAll() { - return tableModel.singletonInstanceName + "." + cacheMapFieldName + ".addKey(" + data.Key.class.getCanonicalName() + ".ALL);"; + return tableModel.singletonInstanceName + "." + cacheMapFieldName + ".addKey(" + data.Key.class.getCanonicalName() + ".ALL); // Relation.writeCacheSelectAll()"; } final String writeOnChangeClearCache(final String classSimpleName, final CurOld curOld) { - return writeNullCheckClause(classSimpleName, curOld) + tableModel.singletonInstanceName + "." + cacheMapFieldName + ".remove$" + curOld + "(" + keyClause().replace("{1}", classSimpleName).replace("{2}", curOld.toString()) + (indexType.isUnique ? "" : ", " + classSimpleName + ".this") + ");"; + return writeNullCheckClause(classSimpleName, curOld) + tableModel.singletonInstanceName + "." + cacheMapFieldName + ".remove$" + curOld + "(" + keyClause().replace("{1}", classSimpleName).replace("{2}", curOld.toString()) + (indexType.isUnique ? "" : ", " + classSimpleName + ".this") + "); // Relation.writeOnChangeClearCache(String,CurlOld)"; } @Override diff --git a/jsql/src/main/java/org/jaxdb/jsql/generator/SchemaModel.java b/jsql/src/main/java/org/jaxdb/jsql/generator/SchemaModel.java index 40d56f6c..bf408e4e 100644 --- a/jsql/src/main/java/org/jaxdb/jsql/generator/SchemaModel.java +++ b/jsql/src/main/java/org/jaxdb/jsql/generator/SchemaModel.java @@ -155,27 +155,27 @@ String generate(final DDLx ddlx) throws GeneratorExecutionException { out.append('\n'); out.append("\n @").append(Override.class.getName()); - out.append("\n public ").append(type.Table$.class.getCanonicalName()).append("[] getTables() {"); + out.append("\n public ").append(type.Table$.class.getCanonicalName()).append("[] getTables() { // SchemaModel.generate(DDLx)"); out.append("\n return tables;"); out.append("\n }\n"); out.append("\n @").append(Override.class.getName()); - out.append("\n public ").append(type.Table$.class.getCanonicalName()).append(" getTable(final ").append(String.class.getName()).append(" name) {"); + out.append("\n public ").append(type.Table$.class.getCanonicalName()).append(" getTable(final ").append(String.class.getName()).append(" name) { // SchemaModel.generate(DDLx)"); out.append("\n final int index = ").append(Arrays.class.getName()).append(".binarySearch(names, name);"); out.append("\n return index < 0 ? null : tables[index];"); out.append("\n }\n"); out.append("\n @").append(Override.class.getName()); - out.append("\n public void setDefaultQueryConfig(final ").append(QueryConfig.class.getName()).append(" queryConfig) {"); + out.append("\n public void setDefaultQueryConfig(final ").append(QueryConfig.class.getName()).append(" queryConfig) { // SchemaModel.generate(DDLx)"); out.append("\n defaultQueryConfig = queryConfig;"); out.append("\n }\n"); out.append("\n @").append(Override.class.getName()); - out.append("\n public String getName() {"); + out.append("\n public String getName() { // SchemaModel.generate(DDLx)"); out.append("\n return \"").append(name).append("\";"); out.append("\n }\n"); - out.append("\n public ").append(schemaClassSimpleName).append("() {"); + out.append("\n public ").append(schemaClassSimpleName).append("() { // SchemaModel.generate(DDLx)"); out.append("\n }"); out.append("\n}"); diff --git a/jsql/src/main/java/org/jaxdb/jsql/generator/TableModel.java b/jsql/src/main/java/org/jaxdb/jsql/generator/TableModel.java index 12f7e13b..e28ddaf8 100644 --- a/jsql/src/main/java/org/jaxdb/jsql/generator/TableModel.java +++ b/jsql/src/main/java/org/jaxdb/jsql/generator/TableModel.java @@ -788,7 +788,7 @@ String makeTable() { final HashSet declared = new HashSet<>(); if (!isAbstract) { out.append("\n public final ").append(className).append("$ ").append(singletonInstanceName).append(" = new ").append(classSimpleName).append("$();\n"); - out.append("\n public final class ").append(classSimpleName).append("$ extends ").append(className).append(" implements ").append(type.Table$.class.getCanonicalName()).append(" {"); + out.append("\n public final class ").append(classSimpleName).append("$ extends ").append(className).append(" implements ").append(type.Table$.class.getCanonicalName()).append(" { // TableModel.makeTable()"); out.append("\n private ").append(singletonInstanceName).append("() {"); out.append("\n super(false, false);"); out.append("\n }\n"); @@ -822,7 +822,7 @@ String makeTable() { out.append("\n boolean _cacheEnabled$;\n"); out.append("\n @").append(Override.class.getName()); - out.append("\n void _initCache$() {"); + out.append("\n void _initCache$() { // TableModel.makeTable()"); out.append("\n if (_cacheEnabled$)"); out.append("\n return;\n"); out.append("\n super._initCache$();"); @@ -886,7 +886,7 @@ String makeTable() { declared.clear(); out.append("\n @").append(Override.class.getName()); - out.append("\n void _commitSelectAll$() {"); + out.append("\n void _commitSelectAll$() { // TableModel.makeTable()"); out.append("\n if (!").append(singletonInstanceName).append('.').append("_cacheEnabled$)"); out.append("\n return;\n"); out.append("\n getCache().addKey(").append(data.Key.class.getCanonicalName()).append(".ALL);"); @@ -905,7 +905,7 @@ String makeTable() { declared.clear(); out.append("\n @").append(Override.class.getName()); - out.append("\n void _commitInsert$() {\n"); + out.append("\n void _commitInsert$() { // TableModel.makeTable()\n"); if (allRelations.size() > 0) { out.append(" if (!").append(singletonInstanceName).append('.').append("_cacheEnabled$)"); out.append("\n return;\n"); @@ -926,7 +926,7 @@ String makeTable() { declared.clear(); out.append("\n @").append(Override.class.getName()); - out.append("\n void _commitDelete$() {\n"); + out.append("\n void _commitDelete$() { // TableModel.makeTable()\n"); // FIXME: Remove the re-addition of all Relation(s) to ArrayList final ArrayList onChangeRelations = new ArrayList<>(1); @@ -962,7 +962,7 @@ String makeTable() { if (!isAbstract) { out.append("\n /** Creates a new {@link ").append(className).append("}. */"); - out.append("\n public ").append(classSimpleName).append("() {"); + out.append("\n public ").append(classSimpleName).append("() { // TableModel.makeTable()"); out.append("\n this(true);"); out.append("\n }\n"); @@ -996,12 +996,12 @@ String makeTable() { // Copy constructor out.append("\n /** Creates a new {@link ").append(className).append("} as a copy of the provided {@link ").append(className).append("} instance. */"); - out.append("\n public ").append(classSimpleName).append("(final ").append(className).append(" copy) {"); + out.append("\n public ").append(classSimpleName).append("(final ").append(className).append(" copy) { // TableModel.makeTable()"); out.append("\n this(true, copy);"); out.append("\n }\n"); - out.append("\n ").append(classSimpleName).append("(final boolean _mutable$) {"); + out.append("\n ").append(classSimpleName).append("(final boolean _mutable$) { // TableModel.makeTable()"); out.append("\n this(_mutable$, false);"); out.append("\n }\n"); } @@ -1131,22 +1131,22 @@ String makeTable() { arguments.append(" != null ? ").append(columns[i].instanceCase).append(" : ").append(commitUpdates[i]); } - out.append("\n ").append(classSimpleName).append("(final boolean _mutable$, final boolean _wasSelected$) {"); + out.append("\n ").append(classSimpleName).append("(final boolean _mutable$, final boolean _wasSelected$) { // TableModel.makeTable()"); out.append("\n this(_mutable$, _wasSelected$, ").append(init).append(");"); out.append("\n }\n"); out.append("\n /** Creates a new {@link ").append(className).append("} as a copy of the provided {@link ").append(className).append("} instance. */"); - out.append("\n ").append(classSimpleName).append("(final boolean _mutable$, final ").append(className).append(" copy) {"); + out.append("\n ").append(classSimpleName).append("(final boolean _mutable$, final ").append(className).append(" copy) { // TableModel.makeTable()"); out.append("\n this(_mutable$, false, ").append(init0).append(", copy);"); out.append("\n }\n\n"); for (int x = 0; x < 2; ++x) { // [N] if (x == 0) { - out.append(" ").append(classSimpleName).append("(final boolean _mutable$, final boolean _wasSelected$, final ").append(data.Column.class.getCanonicalName()).append("[] _column$, final ").append(data.Column.class.getCanonicalName()).append("[] _primary$, final ").append(data.Column.class.getCanonicalName()).append("[] _keyForUpdate$, final ").append(data.Column.class.getCanonicalName()).append("[] _auto$").append(parameters).append(") {\n"); + out.append(" ").append(classSimpleName).append("(final boolean _mutable$, final boolean _wasSelected$, final ").append(data.Column.class.getCanonicalName()).append("[] _column$, final ").append(data.Column.class.getCanonicalName()).append("[] _primary$, final ").append(data.Column.class.getCanonicalName()).append("[] _keyForUpdate$, final ").append(data.Column.class.getCanonicalName()).append("[] _auto$").append(parameters).append(") { // TableModel.makeTable()\n"); out.append(" super(_mutable$, _wasSelected$, _column$, _primary$, _keyForUpdate$, _auto$").append(arguments).append(");\n"); } else { - out.append(" ").append(classSimpleName).append("(final boolean _mutable$, final boolean _wasSelected$, final ").append(data.Column.class.getCanonicalName()).append("[] _column$, final ").append(data.Column.class.getCanonicalName()).append("[] _primary$, final ").append(data.Column.class.getCanonicalName()).append("[] _keyForUpdate$, final ").append(data.Column.class.getCanonicalName()).append("[] _auto$, final ").append(className).append(" copy) {\n"); + out.append(" ").append(classSimpleName).append("(final boolean _mutable$, final boolean _wasSelected$, final ").append(data.Column.class.getCanonicalName()).append("[] _column$, final ").append(data.Column.class.getCanonicalName()).append("[] _primary$, final ").append(data.Column.class.getCanonicalName()).append("[] _keyForUpdate$, final ").append(data.Column.class.getCanonicalName()).append("[] _auto$, final ").append(className).append(" copy) { // TableModel.makeTable()\n"); out.append(" super(_mutable$, _wasSelected$, _column$, _primary$, _keyForUpdate$, _auto$"); if (superTable != null) out.append(", copy"); @@ -1208,7 +1208,7 @@ String makeTable() { } out.append(" @").append(Override.class.getName()).append('\n'); - out.append(" void _merge$(final ").append(data.Table.class.getCanonicalName()).append(" table) {\n"); + out.append(" void _merge$(final ").append(data.Table.class.getCanonicalName()).append(" table) { // TableModel.makeTable()\n"); if (superTable != null) out.append(" super._merge$(table);\n"); @@ -1229,11 +1229,11 @@ String makeTable() { } else { out.append("\n @").append(Override.class.getName()); - out.append("\n ").append(className).append(" clone(final boolean _mutable$) {"); + out.append("\n ").append(className).append(" clone(final boolean _mutable$) { // TableModel.makeTable()"); out.append("\n return new ").append(className).append("(_mutable$, this);"); out.append("\n }\n"); out.append("\n @").append(Override.class.getName()); - out.append("\n public ").append(className).append(" clone() {"); + out.append("\n public ").append(className).append(" clone() { // TableModel.makeTable()"); out.append("\n return clone(true);"); out.append("\n }"); } @@ -1247,7 +1247,7 @@ String makeTable() { out.append('\n'); out.append("\n @").append(Override.class.getName()); - out.append("\n public boolean equals(final ").append(Object.class.getName()).append(" obj) {"); + out.append("\n public boolean equals(final ").append(Object.class.getName()).append(" obj) { // TableModel.makeTable()"); out.append("\n if (obj == this)"); out.append("\n return true;\n"); out.append("\n if (!(obj instanceof ").append(className).append("))"); @@ -1271,7 +1271,7 @@ String makeTable() { } out.append(" @").append(Override.class.getName()).append('\n'); - out.append(" public int hashCode() {\n"); + out.append(" public int hashCode() { // TableModel.makeTable()\n"); if (superTable != null) out.append(" int hashCode = super.hashCode();"); else @@ -1295,7 +1295,7 @@ String makeTable() { } out.append(" @").append(Override.class.getName()).append('\n'); - out.append(" protected void toString(final boolean wasSetOnly, final ").append(StringBuilder.class.getName()).append(" s) {"); + out.append(" protected void toString(final boolean wasSetOnly, final ").append(StringBuilder.class.getName()).append(" s) { // TableModel.makeTable()"); if (superTable != null) out.append("\n super.toString(wasSetOnly, s);\n"); @@ -1308,7 +1308,7 @@ String makeTable() { declared.clear(); out.append("\n @").append(Override.class.getName()); - out.append("\n public ").append(String.class.getName()).append(" getName() {"); + out.append("\n public ").append(String.class.getName()).append(" getName() { // TableModel.makeTable()"); out.append("\n return \"").append(tableName).append("\";"); out.append("\n }\n"); @@ -1329,7 +1329,7 @@ String makeTable() { } out.append("};\n"); out.append("\n @").append(Override.class.getName()); - out.append("\n ").append(String.class.getName()).append("[] _columnName$() {"); + out.append("\n ").append(String.class.getName()).append("[] _columnName$() { // TableModel.makeTable()"); out.append("\n return _columnName$;"); out.append("\n }\n"); @@ -1345,24 +1345,24 @@ String makeTable() { } out.append("};\n"); out.append("\n @").append(Override.class.getName()); - out.append("\n byte[] _columnIndex$() {"); + out.append("\n byte[] _columnIndex$() { // TableModel.makeTable()"); out.append("\n return _columnIndex$;"); out.append("\n }\n"); out.append("\n @").append(Override.class.getName()); - out.append("\n ").append(className).append(" newInstance() {"); + out.append("\n ").append(className).append(" newInstance() { // TableModel.makeTable()"); out.append("\n return new ").append(className).append("(true, true);"); out.append("\n }\n"); out.append("\n @").append(Override.class.getName()); - out.append("\n ").append(singletonInstanceName).append(" singleton() {"); + out.append("\n ").append(singletonInstanceName).append(" singleton() { // TableModel.makeTable()"); out.append("\n return ").append(singletonInstanceName).append(';'); out.append("\n }\n"); } if (superTable == null) { out.append("\n @").append(Override.class.getName()); - out.append("\n final ").append(Schema.class.getName()).append(" getSchema() {"); + out.append("\n final ").append(Schema.class.getName()).append(" getSchema() { // TableModel.makeTable()"); out.append("\n return ").append(schemaModel.schemaClassSimpleName).append(".this;"); out.append("\n }\n"); }