diff --git a/src/java/com/samskivert/jdbc/depot/ByteEnum.java b/src/java/com/samskivert/jdbc/depot/ByteEnum.java index 477a284..77df323 100644 --- a/src/java/com/samskivert/jdbc/depot/ByteEnum.java +++ b/src/java/com/samskivert/jdbc/depot/ByteEnum.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2006-2007 Michael Bayne, Pär Winzell -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/jdbc/depot/CacheInvalidator.java b/src/java/com/samskivert/jdbc/depot/CacheInvalidator.java index 034fdc3..3f11f38 100644 --- a/src/java/com/samskivert/jdbc/depot/CacheInvalidator.java +++ b/src/java/com/samskivert/jdbc/depot/CacheInvalidator.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2006-2007 Michael Bayne, Pär Winzell -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or @@ -24,7 +24,7 @@ import java.io.Serializable; /** * Implementors of this interface performs perform cache invalidation for calls to - * {@link DepotRepository#updateLiteral}, {@link DepotRepository#updatePartial} and + * {@link DepotRepository#updateLiteral}, {@link DepotRepository#updatePartial} and * {@link DepotRepository#deleteAll). */ public interface CacheInvalidator diff --git a/src/java/com/samskivert/jdbc/depot/CacheKey.java b/src/java/com/samskivert/jdbc/depot/CacheKey.java index 8b828e2..271d528 100644 --- a/src/java/com/samskivert/jdbc/depot/CacheKey.java +++ b/src/java/com/samskivert/jdbc/depot/CacheKey.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2006-2007 Michael Bayne, Pär Winzell -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/jdbc/depot/DepotTypes.java b/src/java/com/samskivert/jdbc/depot/DepotTypes.java index d99f69c..ac1e18d 100644 --- a/src/java/com/samskivert/jdbc/depot/DepotTypes.java +++ b/src/java/com/samskivert/jdbc/depot/DepotTypes.java @@ -205,7 +205,7 @@ public class DepotTypes protected Map, Integer> _classIx = new HashMap, Integer>(); /** Classes mapped to marshallers, used for table names and field lists. */ - protected Map, DepotMarshaller> _classMap = + protected Map, DepotMarshaller> _classMap = new HashMap, DepotMarshaller>(); /** When false, override the normal table abbreviations and return full table names instead. */ diff --git a/src/java/com/samskivert/jdbc/depot/Log.java b/src/java/com/samskivert/jdbc/depot/Log.java index 09fbee3..4721b80 100644 --- a/src/java/com/samskivert/jdbc/depot/Log.java +++ b/src/java/com/samskivert/jdbc/depot/Log.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2006-2007 Michael Bayne, Pär Winzell -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/jdbc/depot/Modifier.java b/src/java/com/samskivert/jdbc/depot/Modifier.java index 7924965..b6aa3a1 100644 --- a/src/java/com/samskivert/jdbc/depot/Modifier.java +++ b/src/java/com/samskivert/jdbc/depot/Modifier.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2006-2007 Michael Bayne, Pär Winzell -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/jdbc/depot/MultiKey.java b/src/java/com/samskivert/jdbc/depot/MultiKey.java index c9f0a0d..3e796e0 100644 --- a/src/java/com/samskivert/jdbc/depot/MultiKey.java +++ b/src/java/com/samskivert/jdbc/depot/MultiKey.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2006-2007 Michael Bayne, Pär Winzell -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or @@ -46,7 +46,7 @@ public class MultiKey extends WhereClause /** * Constructs a new two-column {@code MultiKey} with the given value range. */ - public MultiKey (Class pClass, String ix1, Comparable val1, String ix2, + public MultiKey (Class pClass, String ix1, Comparable val1, String ix2, Comparable... val2) { this(pClass, new String[] { ix1 }, new Comparable[] { val1 }, ix2, val2); diff --git a/src/java/com/samskivert/jdbc/depot/PersistentRecord.java b/src/java/com/samskivert/jdbc/depot/PersistentRecord.java index 5fa2f0c..604123a 100644 --- a/src/java/com/samskivert/jdbc/depot/PersistentRecord.java +++ b/src/java/com/samskivert/jdbc/depot/PersistentRecord.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2006-2007 Michael Bayne, Pär Winzell -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/jdbc/depot/SimpleCacheKey.java b/src/java/com/samskivert/jdbc/depot/SimpleCacheKey.java index 823b86f..1b40b3e 100644 --- a/src/java/com/samskivert/jdbc/depot/SimpleCacheKey.java +++ b/src/java/com/samskivert/jdbc/depot/SimpleCacheKey.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2006-2007 Michael Bayne, Pär Winzell -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/jdbc/depot/ValidatingCacheInvalidator.java b/src/java/com/samskivert/jdbc/depot/ValidatingCacheInvalidator.java index 0d51f56..96094f5 100644 --- a/src/java/com/samskivert/jdbc/depot/ValidatingCacheInvalidator.java +++ b/src/java/com/samskivert/jdbc/depot/ValidatingCacheInvalidator.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2001-2007 Michael Bayne -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/jdbc/depot/annotation/Computed.java b/src/java/com/samskivert/jdbc/depot/annotation/Computed.java index 5c11585..879ed0a 100644 --- a/src/java/com/samskivert/jdbc/depot/annotation/Computed.java +++ b/src/java/com/samskivert/jdbc/depot/annotation/Computed.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2006-2007 Michael Bayne, Pär Winzell -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or @@ -50,11 +50,11 @@ public @interface Computed * querying for objects that that contain large subsets of some other persistent object's * fields -- in other words, when you use a computed entity to query only some of the columns * from a table. - * + * * The shadowed class must have been brought into the query using e.g. {@link FromOverride} * or {@link Join} clauses. The referenced fields must be simple concrete columns in a table; * they must themselves be computed or overridden or shadowing. - * + * * TODO: Do in fact let the shadowed field be computed, overriden or shadowing. */ Class shadowOf () default PersistentRecord.class; diff --git a/src/java/com/samskivert/jdbc/depot/annotation/FullTextIndex.java b/src/java/com/samskivert/jdbc/depot/annotation/FullTextIndex.java index d35bdc5..98c5341 100644 --- a/src/java/com/samskivert/jdbc/depot/annotation/FullTextIndex.java +++ b/src/java/com/samskivert/jdbc/depot/annotation/FullTextIndex.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2007 Michael Bayne, Pär Winzell -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or @@ -40,5 +40,5 @@ public @interface FullTextIndex /** * An array of the field names that should be indexed. */ - public String[] fields (); + public String[] fields (); } diff --git a/src/java/com/samskivert/jdbc/depot/annotation/GenerationType.java b/src/java/com/samskivert/jdbc/depot/annotation/GenerationType.java index d1cf47e..789030e 100644 --- a/src/java/com/samskivert/jdbc/depot/annotation/GenerationType.java +++ b/src/java/com/samskivert/jdbc/depot/annotation/GenerationType.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2006-2007 Michael Bayne, Pär Winzell -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/jdbc/depot/annotation/Id.java b/src/java/com/samskivert/jdbc/depot/annotation/Id.java index 82ab079..754130c 100644 --- a/src/java/com/samskivert/jdbc/depot/annotation/Id.java +++ b/src/java/com/samskivert/jdbc/depot/annotation/Id.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2006-2007 Michael Bayne, Pär Winzell -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/jdbc/depot/annotation/TableGenerator.java b/src/java/com/samskivert/jdbc/depot/annotation/TableGenerator.java index 78e014b..82bfca6 100644 --- a/src/java/com/samskivert/jdbc/depot/annotation/TableGenerator.java +++ b/src/java/com/samskivert/jdbc/depot/annotation/TableGenerator.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2006-2007 Michael Bayne, Pär Winzell -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or @@ -40,7 +40,7 @@ public @interface TableGenerator * generator for id values. */ String name (); - + /** * Name of table that stores the generated id values. Defaults to a name chosen by persistence * provider. @@ -54,13 +54,13 @@ public @interface TableGenerator /** * Name of the column that stores the last value generated Defaults to a provider-chosen name. - */ + */ String valueColumnName () default ""; /** * The primary key value in the generator table that distinguishes this set of generated values * from others that may be stored in the table Defaults to a provider-chosen value to store in * the primary key column of the generator table - */ + */ String pkColumnValue () default ""; } diff --git a/src/java/com/samskivert/jdbc/depot/annotation/Transient.java b/src/java/com/samskivert/jdbc/depot/annotation/Transient.java index 0559f86..26a37da 100644 --- a/src/java/com/samskivert/jdbc/depot/annotation/Transient.java +++ b/src/java/com/samskivert/jdbc/depot/annotation/Transient.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2006-2007 Michael Bayne, Pär Winzell -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/jdbc/depot/annotation/UniqueConstraint.java b/src/java/com/samskivert/jdbc/depot/annotation/UniqueConstraint.java index 1cbb8d2..f6d6a66 100644 --- a/src/java/com/samskivert/jdbc/depot/annotation/UniqueConstraint.java +++ b/src/java/com/samskivert/jdbc/depot/annotation/UniqueConstraint.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2006-2007 Michael Bayne, Pär Winzell -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/jdbc/depot/clause/FromOverride.java b/src/java/com/samskivert/jdbc/depot/clause/FromOverride.java index 4263069..a447339 100644 --- a/src/java/com/samskivert/jdbc/depot/clause/FromOverride.java +++ b/src/java/com/samskivert/jdbc/depot/clause/FromOverride.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2006-2007 Michael Bayne, Pär Winzell -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/jdbc/depot/clause/Join.java b/src/java/com/samskivert/jdbc/depot/clause/Join.java index dbbcbf3..80edd07 100644 --- a/src/java/com/samskivert/jdbc/depot/clause/Join.java +++ b/src/java/com/samskivert/jdbc/depot/clause/Join.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2006-2007 Michael Bayne, Pär Winzell -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/jdbc/depot/clause/Limit.java b/src/java/com/samskivert/jdbc/depot/clause/Limit.java index 3da4b3a..6cc135f 100644 --- a/src/java/com/samskivert/jdbc/depot/clause/Limit.java +++ b/src/java/com/samskivert/jdbc/depot/clause/Limit.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2006-2007 Michael Bayne, Pär Winzell -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or @@ -40,7 +40,7 @@ public class Limit extends QueryClause { return _offset; } - + public int getCount () { return _count; @@ -51,12 +51,12 @@ public class Limit extends QueryClause { builder.visit(this); } - + // from SQLExpression public void addClasses (Collection> classSet) { } - + /** The first row of the result set to return. */ protected int _offset; diff --git a/src/java/com/samskivert/jdbc/depot/clause/OrderBy.java b/src/java/com/samskivert/jdbc/depot/clause/OrderBy.java index a362321..66d92c6 100644 --- a/src/java/com/samskivert/jdbc/depot/clause/OrderBy.java +++ b/src/java/com/samskivert/jdbc/depot/clause/OrderBy.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2006-2007 Michael Bayne, Pär Winzell -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or @@ -69,7 +69,7 @@ public class OrderBy extends QueryClause { return _values; } - + public Order[] getOrders () { return _orders; @@ -88,7 +88,7 @@ public class OrderBy extends QueryClause expression.addClasses(classSet); } } - + /** The expressions that are generated for the clause. */ protected SQLExpression[] _values; diff --git a/src/java/com/samskivert/jdbc/depot/clause/QueryClause.java b/src/java/com/samskivert/jdbc/depot/clause/QueryClause.java index 37a653c..89f229e 100644 --- a/src/java/com/samskivert/jdbc/depot/clause/QueryClause.java +++ b/src/java/com/samskivert/jdbc/depot/clause/QueryClause.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2006-2007 Michael Bayne, Pär Winzell -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/jdbc/depot/clause/UpdateClause.java b/src/java/com/samskivert/jdbc/depot/clause/UpdateClause.java index 986fa56..ba89baa 100644 --- a/src/java/com/samskivert/jdbc/depot/clause/UpdateClause.java +++ b/src/java/com/samskivert/jdbc/depot/clause/UpdateClause.java @@ -41,7 +41,7 @@ public class UpdateClause extends QueryClause _values = null; _pojo = pojo; } - + public UpdateClause (Class pClass, WhereClause where, String[] fields, SQLExpression[] values) { @@ -51,7 +51,7 @@ public class UpdateClause extends QueryClause _values = values; _pojo = null; } - + public WhereClause getWhereClause () { return _where; @@ -105,10 +105,10 @@ public class UpdateClause extends QueryClause /** The persistent fields to update. */ protected String[] _fields; - + /** The field values, or null. */ protected SQLExpression[] _values; - + /** The object from which to fetch values, or null. */ protected Object _pojo; } diff --git a/src/java/com/samskivert/jdbc/depot/clause/Where.java b/src/java/com/samskivert/jdbc/depot/clause/Where.java index 71ff4b3..19d7588 100644 --- a/src/java/com/samskivert/jdbc/depot/clause/Where.java +++ b/src/java/com/samskivert/jdbc/depot/clause/Where.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2006-2007 Michael Bayne, Pär Winzell -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or @@ -83,7 +83,7 @@ public class Where extends WhereClause { _condition.addClasses(classSet); } - + protected static SQLExpression toCondition (ColumnExp[] columns, Comparable[] values) { SQLExpression[] comparisons = new SQLExpression[columns.length]; diff --git a/src/java/com/samskivert/jdbc/depot/expression/SQLExpression.java b/src/java/com/samskivert/jdbc/depot/expression/SQLExpression.java index fd3dd42..0b24ffb 100644 --- a/src/java/com/samskivert/jdbc/depot/expression/SQLExpression.java +++ b/src/java/com/samskivert/jdbc/depot/expression/SQLExpression.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2006-2007 Michael Bayne, Pär Winzell -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or @@ -33,7 +33,7 @@ public interface SQLExpression /** * Most uses of this class have been implemented with a visitor pattern. Create your own * {@link ExpressionVisitor} and call this method with it. - * + * * @see SQLBuilder */ public void accept (ExpressionVisitor builder) diff --git a/src/java/com/samskivert/jdbc/depot/operator/Arithmetic.java b/src/java/com/samskivert/jdbc/depot/operator/Arithmetic.java index d5a807e..830a060 100644 --- a/src/java/com/samskivert/jdbc/depot/operator/Arithmetic.java +++ b/src/java/com/samskivert/jdbc/depot/operator/Arithmetic.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2006-2007 Michael Bayne, Pär Winzell -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or diff --git a/src/java/com/samskivert/jdbc/depot/operator/Logic.java b/src/java/com/samskivert/jdbc/depot/operator/Logic.java index 817a4df..651e685 100644 --- a/src/java/com/samskivert/jdbc/depot/operator/Logic.java +++ b/src/java/com/samskivert/jdbc/depot/operator/Logic.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2006-2007 Michael Bayne, Pär Winzell -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or @@ -86,7 +86,7 @@ public abstract class Logic { _condition = condition; } - + public SQLExpression getCondition () { return _condition; @@ -103,7 +103,7 @@ public abstract class Logic { _condition.addClasses(classSet); } - + protected SQLExpression _condition; } } diff --git a/src/java/com/samskivert/jdbc/depot/operator/SQLOperator.java b/src/java/com/samskivert/jdbc/depot/operator/SQLOperator.java index 7f4e4ce..5c4ee15 100644 --- a/src/java/com/samskivert/jdbc/depot/operator/SQLOperator.java +++ b/src/java/com/samskivert/jdbc/depot/operator/SQLOperator.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2006-2007 Michael Bayne, Pär Winzell -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or @@ -50,7 +50,7 @@ public interface SQLOperator extends SQLExpression { builder.visit(this); } - + // from SQLExpression public void addClasses (Collection> classSet) { @@ -100,7 +100,7 @@ public interface SQLOperator extends SQLExpression _lhs.addClasses(classSet); _rhs.addClasses(classSet); } - + /** * Returns the string representation of the operator. */ diff --git a/src/java/com/samskivert/jdbc/depot/tools/GenRecordTask.java b/src/java/com/samskivert/jdbc/depot/tools/GenRecordTask.java index d076116..401e641 100644 --- a/src/java/com/samskivert/jdbc/depot/tools/GenRecordTask.java +++ b/src/java/com/samskivert/jdbc/depot/tools/GenRecordTask.java @@ -3,7 +3,7 @@ // // samskivert library - useful routines for java programs // Copyright (C) 2006-2007 Michael Bayne, Pär Winzell -// +// // This library is free software; you can redistribute it and/or modify it // under the terms of the GNU Lesser General Public License as published // by the Free Software Foundation; either version 2.1 of the License, or