Trimmed trailing whitespace.

This commit is contained in:
Michael Bayne
2008-08-04 12:37:23 +00:00
parent f07694895e
commit a0731b34c1
29 changed files with 51 additions and 51 deletions
@@ -3,7 +3,7 @@
// //
// samskivert library - useful routines for java programs // samskivert library - useful routines for java programs
// Copyright (C) 2006-2007 Michael Bayne, Pär Winzell // Copyright (C) 2006-2007 Michael Bayne, Pär Winzell
// //
// This library is free software; you can redistribute it and/or modify it // 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 // 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 // by the Free Software Foundation; either version 2.1 of the License, or
@@ -3,7 +3,7 @@
// //
// samskivert library - useful routines for java programs // samskivert library - useful routines for java programs
// Copyright (C) 2006-2007 Michael Bayne, Pär Winzell // Copyright (C) 2006-2007 Michael Bayne, Pär Winzell
// //
// This library is free software; you can redistribute it and/or modify it // 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 // 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 // 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 * 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). * {@link DepotRepository#deleteAll).
*/ */
public interface CacheInvalidator public interface CacheInvalidator
@@ -3,7 +3,7 @@
// //
// samskivert library - useful routines for java programs // samskivert library - useful routines for java programs
// Copyright (C) 2006-2007 Michael Bayne, Pär Winzell // Copyright (C) 2006-2007 Michael Bayne, Pär Winzell
// //
// This library is free software; you can redistribute it and/or modify it // 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 // 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 // by the Free Software Foundation; either version 2.1 of the License, or
@@ -205,7 +205,7 @@ public class DepotTypes
protected Map<Class<?>, Integer> _classIx = new HashMap<Class<?>, Integer>(); protected Map<Class<?>, Integer> _classIx = new HashMap<Class<?>, Integer>();
/** Classes mapped to marshallers, used for table names and field lists. */ /** Classes mapped to marshallers, used for table names and field lists. */
protected Map<Class<?>, DepotMarshaller<?>> _classMap = protected Map<Class<?>, DepotMarshaller<?>> _classMap =
new HashMap<Class<?>, DepotMarshaller<?>>(); new HashMap<Class<?>, DepotMarshaller<?>>();
/** When false, override the normal table abbreviations and return full table names instead. */ /** When false, override the normal table abbreviations and return full table names instead. */
+1 -1
View File
@@ -3,7 +3,7 @@
// //
// samskivert library - useful routines for java programs // samskivert library - useful routines for java programs
// Copyright (C) 2006-2007 Michael Bayne, Pär Winzell // Copyright (C) 2006-2007 Michael Bayne, Pär Winzell
// //
// This library is free software; you can redistribute it and/or modify it // 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 // 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 // by the Free Software Foundation; either version 2.1 of the License, or
@@ -3,7 +3,7 @@
// //
// samskivert library - useful routines for java programs // samskivert library - useful routines for java programs
// Copyright (C) 2006-2007 Michael Bayne, Pär Winzell // Copyright (C) 2006-2007 Michael Bayne, Pär Winzell
// //
// This library is free software; you can redistribute it and/or modify it // 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 // 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 // by the Free Software Foundation; either version 2.1 of the License, or
@@ -3,7 +3,7 @@
// //
// samskivert library - useful routines for java programs // samskivert library - useful routines for java programs
// Copyright (C) 2006-2007 Michael Bayne, Pär Winzell // Copyright (C) 2006-2007 Michael Bayne, Pär Winzell
// //
// This library is free software; you can redistribute it and/or modify it // 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 // 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 // by the Free Software Foundation; either version 2.1 of the License, or
@@ -46,7 +46,7 @@ public class MultiKey<T extends PersistentRecord> extends WhereClause
/** /**
* Constructs a new two-column {@code MultiKey} with the given value range. * Constructs a new two-column {@code MultiKey} with the given value range.
*/ */
public MultiKey (Class<T> pClass, String ix1, Comparable<?> val1, String ix2, public MultiKey (Class<T> pClass, String ix1, Comparable<?> val1, String ix2,
Comparable<?>... val2) Comparable<?>... val2)
{ {
this(pClass, new String[] { ix1 }, new Comparable[] { val1 }, ix2, val2); this(pClass, new String[] { ix1 }, new Comparable[] { val1 }, ix2, val2);
@@ -3,7 +3,7 @@
// //
// samskivert library - useful routines for java programs // samskivert library - useful routines for java programs
// Copyright (C) 2006-2007 Michael Bayne, Pär Winzell // Copyright (C) 2006-2007 Michael Bayne, Pär Winzell
// //
// This library is free software; you can redistribute it and/or modify it // 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 // 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 // by the Free Software Foundation; either version 2.1 of the License, or
@@ -3,7 +3,7 @@
// //
// samskivert library - useful routines for java programs // samskivert library - useful routines for java programs
// Copyright (C) 2006-2007 Michael Bayne, Pär Winzell // Copyright (C) 2006-2007 Michael Bayne, Pär Winzell
// //
// This library is free software; you can redistribute it and/or modify it // 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 // 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 // by the Free Software Foundation; either version 2.1 of the License, or
@@ -3,7 +3,7 @@
// //
// samskivert library - useful routines for java programs // samskivert library - useful routines for java programs
// Copyright (C) 2001-2007 Michael Bayne // Copyright (C) 2001-2007 Michael Bayne
// //
// This library is free software; you can redistribute it and/or modify it // 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 // 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 // by the Free Software Foundation; either version 2.1 of the License, or
@@ -3,7 +3,7 @@
// //
// samskivert library - useful routines for java programs // samskivert library - useful routines for java programs
// Copyright (C) 2006-2007 Michael Bayne, Pär Winzell // Copyright (C) 2006-2007 Michael Bayne, Pär Winzell
// //
// This library is free software; you can redistribute it and/or modify it // 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 // 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 // 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 * 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 * fields -- in other words, when you use a computed entity to query only some of the columns
* from a table. * from a table.
* *
* The shadowed class must have been brought into the query using e.g. {@link FromOverride} * 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; * or {@link Join} clauses. The referenced fields must be simple concrete columns in a table;
* they must themselves be computed or overridden or shadowing. * they must themselves be computed or overridden or shadowing.
* *
* TODO: Do in fact let the shadowed field be computed, overriden or shadowing. * TODO: Do in fact let the shadowed field be computed, overriden or shadowing.
*/ */
Class<? extends PersistentRecord> shadowOf () default PersistentRecord.class; Class<? extends PersistentRecord> shadowOf () default PersistentRecord.class;
@@ -3,7 +3,7 @@
// //
// samskivert library - useful routines for java programs // samskivert library - useful routines for java programs
// Copyright (C) 2007 Michael Bayne, Pär Winzell // Copyright (C) 2007 Michael Bayne, Pär Winzell
// //
// This library is free software; you can redistribute it and/or modify it // 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 // 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 // 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. * An array of the field names that should be indexed.
*/ */
public String[] fields (); public String[] fields ();
} }
@@ -3,7 +3,7 @@
// //
// samskivert library - useful routines for java programs // samskivert library - useful routines for java programs
// Copyright (C) 2006-2007 Michael Bayne, Pär Winzell // Copyright (C) 2006-2007 Michael Bayne, Pär Winzell
// //
// This library is free software; you can redistribute it and/or modify it // 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 // 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 // by the Free Software Foundation; either version 2.1 of the License, or
@@ -3,7 +3,7 @@
// //
// samskivert library - useful routines for java programs // samskivert library - useful routines for java programs
// Copyright (C) 2006-2007 Michael Bayne, Pär Winzell // Copyright (C) 2006-2007 Michael Bayne, Pär Winzell
// //
// This library is free software; you can redistribute it and/or modify it // 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 // 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 // by the Free Software Foundation; either version 2.1 of the License, or
@@ -3,7 +3,7 @@
// //
// samskivert library - useful routines for java programs // samskivert library - useful routines for java programs
// Copyright (C) 2006-2007 Michael Bayne, Pär Winzell // Copyright (C) 2006-2007 Michael Bayne, Pär Winzell
// //
// This library is free software; you can redistribute it and/or modify it // 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 // 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 // by the Free Software Foundation; either version 2.1 of the License, or
@@ -40,7 +40,7 @@ public @interface TableGenerator
* generator for id values. * generator for id values.
*/ */
String name (); String name ();
/** /**
* Name of table that stores the generated id values. Defaults to a name chosen by persistence * Name of table that stores the generated id values. Defaults to a name chosen by persistence
* provider. * provider.
@@ -54,13 +54,13 @@ public @interface TableGenerator
/** /**
* Name of the column that stores the last value generated Defaults to a provider-chosen name. * Name of the column that stores the last value generated Defaults to a provider-chosen name.
*/ */
String valueColumnName () default ""; String valueColumnName () default "";
/** /**
* The primary key value in the generator table that distinguishes this set of generated values * 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 * 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 * the primary key column of the generator table
*/ */
String pkColumnValue () default ""; String pkColumnValue () default "";
} }
@@ -3,7 +3,7 @@
// //
// samskivert library - useful routines for java programs // samskivert library - useful routines for java programs
// Copyright (C) 2006-2007 Michael Bayne, Pär Winzell // Copyright (C) 2006-2007 Michael Bayne, Pär Winzell
// //
// This library is free software; you can redistribute it and/or modify it // 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 // 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 // by the Free Software Foundation; either version 2.1 of the License, or
@@ -3,7 +3,7 @@
// //
// samskivert library - useful routines for java programs // samskivert library - useful routines for java programs
// Copyright (C) 2006-2007 Michael Bayne, Pär Winzell // Copyright (C) 2006-2007 Michael Bayne, Pär Winzell
// //
// This library is free software; you can redistribute it and/or modify it // 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 // 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 // by the Free Software Foundation; either version 2.1 of the License, or
@@ -3,7 +3,7 @@
// //
// samskivert library - useful routines for java programs // samskivert library - useful routines for java programs
// Copyright (C) 2006-2007 Michael Bayne, Pär Winzell // Copyright (C) 2006-2007 Michael Bayne, Pär Winzell
// //
// This library is free software; you can redistribute it and/or modify it // 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 // 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 // by the Free Software Foundation; either version 2.1 of the License, or
@@ -3,7 +3,7 @@
// //
// samskivert library - useful routines for java programs // samskivert library - useful routines for java programs
// Copyright (C) 2006-2007 Michael Bayne, Pär Winzell // Copyright (C) 2006-2007 Michael Bayne, Pär Winzell
// //
// This library is free software; you can redistribute it and/or modify it // 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 // 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 // by the Free Software Foundation; either version 2.1 of the License, or
@@ -3,7 +3,7 @@
// //
// samskivert library - useful routines for java programs // samskivert library - useful routines for java programs
// Copyright (C) 2006-2007 Michael Bayne, Pär Winzell // Copyright (C) 2006-2007 Michael Bayne, Pär Winzell
// //
// This library is free software; you can redistribute it and/or modify it // 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 // 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 // by the Free Software Foundation; either version 2.1 of the License, or
@@ -40,7 +40,7 @@ public class Limit extends QueryClause
{ {
return _offset; return _offset;
} }
public int getCount () public int getCount ()
{ {
return _count; return _count;
@@ -51,12 +51,12 @@ public class Limit extends QueryClause
{ {
builder.visit(this); builder.visit(this);
} }
// from SQLExpression // from SQLExpression
public void addClasses (Collection<Class<? extends PersistentRecord>> classSet) public void addClasses (Collection<Class<? extends PersistentRecord>> classSet)
{ {
} }
/** The first row of the result set to return. */ /** The first row of the result set to return. */
protected int _offset; protected int _offset;
@@ -3,7 +3,7 @@
// //
// samskivert library - useful routines for java programs // samskivert library - useful routines for java programs
// Copyright (C) 2006-2007 Michael Bayne, Pär Winzell // Copyright (C) 2006-2007 Michael Bayne, Pär Winzell
// //
// This library is free software; you can redistribute it and/or modify it // 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 // 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 // by the Free Software Foundation; either version 2.1 of the License, or
@@ -69,7 +69,7 @@ public class OrderBy extends QueryClause
{ {
return _values; return _values;
} }
public Order[] getOrders () public Order[] getOrders ()
{ {
return _orders; return _orders;
@@ -88,7 +88,7 @@ public class OrderBy extends QueryClause
expression.addClasses(classSet); expression.addClasses(classSet);
} }
} }
/** The expressions that are generated for the clause. */ /** The expressions that are generated for the clause. */
protected SQLExpression[] _values; protected SQLExpression[] _values;
@@ -3,7 +3,7 @@
// //
// samskivert library - useful routines for java programs // samskivert library - useful routines for java programs
// Copyright (C) 2006-2007 Michael Bayne, Pär Winzell // Copyright (C) 2006-2007 Michael Bayne, Pär Winzell
// //
// This library is free software; you can redistribute it and/or modify it // 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 // 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 // by the Free Software Foundation; either version 2.1 of the License, or
@@ -41,7 +41,7 @@ public class UpdateClause<T extends PersistentRecord> extends QueryClause
_values = null; _values = null;
_pojo = pojo; _pojo = pojo;
} }
public UpdateClause (Class<? extends PersistentRecord> pClass, WhereClause where, public UpdateClause (Class<? extends PersistentRecord> pClass, WhereClause where,
String[] fields, SQLExpression[] values) String[] fields, SQLExpression[] values)
{ {
@@ -51,7 +51,7 @@ public class UpdateClause<T extends PersistentRecord> extends QueryClause
_values = values; _values = values;
_pojo = null; _pojo = null;
} }
public WhereClause getWhereClause () public WhereClause getWhereClause ()
{ {
return _where; return _where;
@@ -105,10 +105,10 @@ public class UpdateClause<T extends PersistentRecord> extends QueryClause
/** The persistent fields to update. */ /** The persistent fields to update. */
protected String[] _fields; protected String[] _fields;
/** The field values, or null. */ /** The field values, or null. */
protected SQLExpression[] _values; protected SQLExpression[] _values;
/** The object from which to fetch values, or null. */ /** The object from which to fetch values, or null. */
protected Object _pojo; protected Object _pojo;
} }
@@ -3,7 +3,7 @@
// //
// samskivert library - useful routines for java programs // samskivert library - useful routines for java programs
// Copyright (C) 2006-2007 Michael Bayne, Pär Winzell // Copyright (C) 2006-2007 Michael Bayne, Pär Winzell
// //
// This library is free software; you can redistribute it and/or modify it // 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 // 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 // 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); _condition.addClasses(classSet);
} }
protected static SQLExpression toCondition (ColumnExp[] columns, Comparable<?>[] values) protected static SQLExpression toCondition (ColumnExp[] columns, Comparable<?>[] values)
{ {
SQLExpression[] comparisons = new SQLExpression[columns.length]; SQLExpression[] comparisons = new SQLExpression[columns.length];
@@ -3,7 +3,7 @@
// //
// samskivert library - useful routines for java programs // samskivert library - useful routines for java programs
// Copyright (C) 2006-2007 Michael Bayne, Pär Winzell // Copyright (C) 2006-2007 Michael Bayne, Pär Winzell
// //
// This library is free software; you can redistribute it and/or modify it // 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 // 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 // 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 * Most uses of this class have been implemented with a visitor pattern. Create your own
* {@link ExpressionVisitor} and call this method with it. * {@link ExpressionVisitor} and call this method with it.
* *
* @see SQLBuilder * @see SQLBuilder
*/ */
public void accept (ExpressionVisitor builder) public void accept (ExpressionVisitor builder)
@@ -3,7 +3,7 @@
// //
// samskivert library - useful routines for java programs // samskivert library - useful routines for java programs
// Copyright (C) 2006-2007 Michael Bayne, Pär Winzell // Copyright (C) 2006-2007 Michael Bayne, Pär Winzell
// //
// This library is free software; you can redistribute it and/or modify it // 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 // 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 // by the Free Software Foundation; either version 2.1 of the License, or
@@ -3,7 +3,7 @@
// //
// samskivert library - useful routines for java programs // samskivert library - useful routines for java programs
// Copyright (C) 2006-2007 Michael Bayne, Pär Winzell // Copyright (C) 2006-2007 Michael Bayne, Pär Winzell
// //
// This library is free software; you can redistribute it and/or modify it // 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 // 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 // by the Free Software Foundation; either version 2.1 of the License, or
@@ -86,7 +86,7 @@ public abstract class Logic
{ {
_condition = condition; _condition = condition;
} }
public SQLExpression getCondition () public SQLExpression getCondition ()
{ {
return _condition; return _condition;
@@ -103,7 +103,7 @@ public abstract class Logic
{ {
_condition.addClasses(classSet); _condition.addClasses(classSet);
} }
protected SQLExpression _condition; protected SQLExpression _condition;
} }
} }
@@ -3,7 +3,7 @@
// //
// samskivert library - useful routines for java programs // samskivert library - useful routines for java programs
// Copyright (C) 2006-2007 Michael Bayne, Pär Winzell // Copyright (C) 2006-2007 Michael Bayne, Pär Winzell
// //
// This library is free software; you can redistribute it and/or modify it // 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 // 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 // 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); builder.visit(this);
} }
// from SQLExpression // from SQLExpression
public void addClasses (Collection<Class<? extends PersistentRecord>> classSet) public void addClasses (Collection<Class<? extends PersistentRecord>> classSet)
{ {
@@ -100,7 +100,7 @@ public interface SQLOperator extends SQLExpression
_lhs.addClasses(classSet); _lhs.addClasses(classSet);
_rhs.addClasses(classSet); _rhs.addClasses(classSet);
} }
/** /**
* Returns the string representation of the operator. * Returns the string representation of the operator.
*/ */
@@ -3,7 +3,7 @@
// //
// samskivert library - useful routines for java programs // samskivert library - useful routines for java programs
// Copyright (C) 2006-2007 Michael Bayne, Pär Winzell // Copyright (C) 2006-2007 Michael Bayne, Pär Winzell
// //
// This library is free software; you can redistribute it and/or modify it // 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 // 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 // by the Free Software Foundation; either version 2.1 of the License, or