From 259da94d3f424e097b3f036334cf8e1809b5446d Mon Sep 17 00:00:00 2001 From: Michael Bayne Date: Wed, 29 Apr 2009 17:01:03 +0000 Subject: [PATCH] Wrapped some long lines, nixed unwanted blankness. --- .../depot/impl/DepotMarshaller.java | 23 ++++++++++--------- .../depot/impl/FieldMarshaller.java | 1 - 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/java/com/samskivert/depot/impl/DepotMarshaller.java b/src/java/com/samskivert/depot/impl/DepotMarshaller.java index 6b0d525..5fb1452 100644 --- a/src/java/com/samskivert/depot/impl/DepotMarshaller.java +++ b/src/java/com/samskivert/depot/impl/DepotMarshaller.java @@ -834,8 +834,8 @@ public class DepotMarshaller if (hasPrimaryKey() && metaData.pkName == null) { log.info("Adding primary key."); ctx.invoke(new Modifier() { - @Override - protected int invoke (Connection conn, DatabaseLiaison liaison) throws SQLException { + @Override protected int invoke (Connection conn, DatabaseLiaison liaison) + throws SQLException { liaison.addPrimaryKey( conn, getTableName(), fieldsToColumns(getPrimaryKeyFields())); return 0; @@ -846,8 +846,8 @@ public class DepotMarshaller final String pkName = metaData.pkName; log.info("Dropping primary key: " + pkName); ctx.invoke(new Modifier() { - @Override - protected int invoke (Connection conn, DatabaseLiaison liaison) throws SQLException { + @Override protected int invoke (Connection conn, DatabaseLiaison liaison) + throws SQLException { liaison.dropPrimaryKey(conn, getTableName(), pkName); return 0; } @@ -863,8 +863,8 @@ public class DepotMarshaller // but this is a new, named index, so we create it log.info("Creating new index: " + iclause.getName()); ctx.invoke(new Modifier() { - @Override - protected int invoke (Connection conn, DatabaseLiaison liaison) throws SQLException { + @Override protected int invoke (Connection conn, DatabaseLiaison liaison) + throws SQLException { execute(conn, builder, iclause); return 0; } @@ -885,8 +885,8 @@ public class DepotMarshaller // but not this one, so let's create it ctx.invoke(new Modifier() { - @Override - protected int invoke (Connection conn, DatabaseLiaison liaison) throws SQLException { + @Override protected int invoke (Connection conn, DatabaseLiaison liaison) + throws SQLException { builder.addFullTextSearch(conn, DepotMarshaller.this, recordFts); return 0; } @@ -931,8 +931,8 @@ public class DepotMarshaller // initialValue which will use the new column name to obtain the sequence name which // ain't going to work either; we punt! ctx.invoke(new Modifier() { - @Override - protected int invoke (Connection conn, DatabaseLiaison liaison) throws SQLException { + @Override protected int invoke (Connection conn, DatabaseLiaison liaison) + throws SQLException { valgen.create(conn, liaison); return 0; } @@ -1004,7 +1004,8 @@ public class DepotMarshaller /** * 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 { for (String fname : _columnFields) { diff --git a/src/java/com/samskivert/depot/impl/FieldMarshaller.java b/src/java/com/samskivert/depot/impl/FieldMarshaller.java index b09b8eb..1e15556 100644 --- a/src/java/com/samskivert/depot/impl/FieldMarshaller.java +++ b/src/java/com/samskivert/depot/impl/FieldMarshaller.java @@ -409,7 +409,6 @@ public abstract class FieldMarshaller ByteBuffer bbuf = ByteBuffer.allocate(values.length * 4); bbuf.asIntBuffer().put(values); return bbuf.array(); - } @Override public byte[] getFromSet (ResultSet rs) throws SQLException {