Wrapped some long lines, nixed unwanted blankness.

This commit is contained in:
Michael Bayne
2009-04-29 17:01:03 +00:00
parent 273b0b8fd0
commit 259da94d3f
2 changed files with 12 additions and 12 deletions
@@ -834,8 +834,8 @@ public class DepotMarshaller<T extends PersistentRecord>
if (hasPrimaryKey() && metaData.pkName == null) { if (hasPrimaryKey() && metaData.pkName == null) {
log.info("Adding primary key."); log.info("Adding primary key.");
ctx.invoke(new Modifier() { ctx.invoke(new Modifier() {
@Override @Override protected int invoke (Connection conn, DatabaseLiaison liaison)
protected int invoke (Connection conn, DatabaseLiaison liaison) throws SQLException { throws SQLException {
liaison.addPrimaryKey( liaison.addPrimaryKey(
conn, getTableName(), fieldsToColumns(getPrimaryKeyFields())); conn, getTableName(), fieldsToColumns(getPrimaryKeyFields()));
return 0; return 0;
@@ -846,8 +846,8 @@ public class DepotMarshaller<T extends PersistentRecord>
final String pkName = metaData.pkName; final String pkName = metaData.pkName;
log.info("Dropping primary key: " + pkName); log.info("Dropping primary key: " + pkName);
ctx.invoke(new Modifier() { ctx.invoke(new Modifier() {
@Override @Override protected int invoke (Connection conn, DatabaseLiaison liaison)
protected int invoke (Connection conn, DatabaseLiaison liaison) throws SQLException { throws SQLException {
liaison.dropPrimaryKey(conn, getTableName(), pkName); liaison.dropPrimaryKey(conn, getTableName(), pkName);
return 0; return 0;
} }
@@ -863,8 +863,8 @@ public class DepotMarshaller<T extends PersistentRecord>
// but this is a new, named index, so we create it // but this is a new, named index, so we create it
log.info("Creating new index: " + iclause.getName()); log.info("Creating new index: " + iclause.getName());
ctx.invoke(new Modifier() { ctx.invoke(new Modifier() {
@Override @Override protected int invoke (Connection conn, DatabaseLiaison liaison)
protected int invoke (Connection conn, DatabaseLiaison liaison) throws SQLException { throws SQLException {
execute(conn, builder, iclause); execute(conn, builder, iclause);
return 0; return 0;
} }
@@ -885,8 +885,8 @@ public class DepotMarshaller<T extends PersistentRecord>
// but not this one, so let's create it // but not this one, so let's create it
ctx.invoke(new Modifier() { ctx.invoke(new Modifier() {
@Override @Override protected int invoke (Connection conn, DatabaseLiaison liaison)
protected int invoke (Connection conn, DatabaseLiaison liaison) throws SQLException { throws SQLException {
builder.addFullTextSearch(conn, DepotMarshaller.this, recordFts); builder.addFullTextSearch(conn, DepotMarshaller.this, recordFts);
return 0; return 0;
} }
@@ -931,8 +931,8 @@ public class DepotMarshaller<T extends PersistentRecord>
// initialValue which will use the new column name to obtain the sequence name which // initialValue which will use the new column name to obtain the sequence name which
// ain't going to work either; we punt! // ain't going to work either; we punt!
ctx.invoke(new Modifier() { ctx.invoke(new Modifier() {
@Override @Override protected int invoke (Connection conn, DatabaseLiaison liaison)
protected int invoke (Connection conn, DatabaseLiaison liaison) throws SQLException { throws SQLException {
valgen.create(conn, liaison); valgen.create(conn, liaison);
return 0; return 0;
} }
@@ -1004,7 +1004,8 @@ public class DepotMarshaller<T extends PersistentRecord>
/** /**
* Checks that there are no database columns for which we no longer have Java fields. * Checks that there are no database columns for which we no longer have Java fields.
*/ */
protected void checkForStaleness (TableMetaData meta, PersistenceContext ctx, SQLBuilder builder) protected void checkForStaleness (
TableMetaData meta, PersistenceContext ctx, SQLBuilder builder)
throws DatabaseException throws DatabaseException
{ {
for (String fname : _columnFields) { for (String fname : _columnFields) {
@@ -409,7 +409,6 @@ public abstract class FieldMarshaller<T>
ByteBuffer bbuf = ByteBuffer.allocate(values.length * 4); ByteBuffer bbuf = ByteBuffer.allocate(values.length * 4);
bbuf.asIntBuffer().put(values); bbuf.asIntBuffer().put(values);
return bbuf.array(); return bbuf.array();
} }
@Override public byte[] getFromSet (ResultSet rs) @Override public byte[] getFromSet (ResultSet rs)
throws SQLException { throws SQLException {