From ed7bea986de3110cfd684903d0b1b27857ceb41d Mon Sep 17 00:00:00 2001 From: Charlie Groves Date: Thu, 9 Dec 2010 21:57:33 +0000 Subject: [PATCH] depot-1.0 doesn't have its .tmpl files, which causes genrecord to crash and burn. Bump to 1.1 and commit genrecord results. git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6357 542714f4-19e9-0310-aa3c-eee0fc999fb1 --- pom.xml | 2 +- .../com/threerings/admin/server/persist/ConfigRecord.java | 8 ++++---- .../presents/peer/server/persist/NodeRecord.java | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pom.xml b/pom.xml index b20a951fe..5529985ed 100644 --- a/pom.xml +++ b/pom.xml @@ -77,7 +77,7 @@ com.samskivert depot - 1.0 + 1.1 compile true diff --git a/src/main/java/com/threerings/admin/server/persist/ConfigRecord.java b/src/main/java/com/threerings/admin/server/persist/ConfigRecord.java index d32e6d8f5..8e011863d 100644 --- a/src/main/java/com/threerings/admin/server/persist/ConfigRecord.java +++ b/src/main/java/com/threerings/admin/server/persist/ConfigRecord.java @@ -83,10 +83,10 @@ public class ConfigRecord extends PersistentRecord */ public static Key getKey (String node, String object, String field) { - return new Key( - ConfigRecord.class, - new ColumnExp[] { NODE, OBJECT, FIELD }, - new Comparable[] { node, object, field }); + return newKey(_R, node, object, field); } + + /** Register the key fields in an order matching the getKey() factory. */ + static { registerKeyFields(NODE, OBJECT, FIELD); } // AUTO-GENERATED: METHODS END } diff --git a/src/main/java/com/threerings/presents/peer/server/persist/NodeRecord.java b/src/main/java/com/threerings/presents/peer/server/persist/NodeRecord.java index 90b485d89..474a6ebc9 100644 --- a/src/main/java/com/threerings/presents/peer/server/persist/NodeRecord.java +++ b/src/main/java/com/threerings/presents/peer/server/persist/NodeRecord.java @@ -105,10 +105,10 @@ public class NodeRecord extends PersistentRecord */ public static Key getKey (String nodeName) { - return new Key( - NodeRecord.class, - new ColumnExp[] { NODE_NAME }, - new Comparable[] { nodeName }); + return newKey(_R, nodeName); } + + /** Register the key fields in an order matching the getKey() factory. */ + static { registerKeyFields(NODE_NAME); } // AUTO-GENERATED: METHODS END }