From 0ef8cf1c58e339c48c0a0049cae2bd012d55c2cd Mon Sep 17 00:00:00 2001
From: Michael Bayne <mdb@threerings.net>
Date: Wed, 10 Jun 2009 18:54:46 +0000
Subject: [PATCH] Fluency++, imports--.

git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@856 c613c5cb-e716-0410-b11b-feb51c14d237
---
 .../server/persist/RatingRepository.java      | 21 ++++++++-----------
 .../stats/server/persist/StatRepository.java  |  3 +--
 2 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/src/java/com/threerings/parlor/rating/server/persist/RatingRepository.java b/src/java/com/threerings/parlor/rating/server/persist/RatingRepository.java
index fcfa9048..dfaafe46 100644
--- a/src/java/com/threerings/parlor/rating/server/persist/RatingRepository.java
+++ b/src/java/com/threerings/parlor/rating/server/persist/RatingRepository.java
@@ -46,9 +46,6 @@ import com.samskivert.depot.clause.QueryClause;
 import com.samskivert.depot.clause.Where;
 import com.samskivert.depot.expression.SQLExpression;
 import com.samskivert.depot.operator.And;
-import com.samskivert.depot.operator.Equals;
-import com.samskivert.depot.operator.GreaterThan;
-import com.samskivert.depot.operator.In;
 
 import com.threerings.parlor.rating.util.Percentiler;
 
@@ -86,8 +83,8 @@ public class RatingRepository extends DepotRepository
             return Collections.emptyList();
         }
         return findAll(RatingRecord.class,
-                       new Where(new And(new Equals(RatingRecord.GAME_ID, gameId),
-                                         new In(RatingRecord.PLAYER_ID, players))));
+                       new Where(new And(RatingRecord.GAME_ID.eq(gameId),
+                                         RatingRecord.PLAYER_ID.in(players))));
     }
 
     /**
@@ -103,8 +100,8 @@ public class RatingRepository extends DepotRepository
         ArrayList<QueryClause> clauses = Lists.newArrayList();
         if (since > 0L) {
             Timestamp when = new Timestamp(System.currentTimeMillis() - since);
-            clauses.add(new Where(new And(new Equals(RatingRecord.PLAYER_ID, playerId),
-                                          new GreaterThan(RatingRecord.LAST_UPDATED, when))));
+            clauses.add(new Where(new And(RatingRecord.PLAYER_ID.eq(playerId),
+                                          RatingRecord.LAST_UPDATED.greaterThan(when))));
         } else {
             clauses.add(new Where(RatingRecord.PLAYER_ID, playerId));
         }
@@ -127,13 +124,13 @@ public class RatingRepository extends DepotRepository
     public List<RatingRecord> getTopRatings (int gameId, int limit, long since, IntSet playerIds)
     {
         List<SQLExpression> where = Lists.newArrayList();
-        where.add(new Equals(RatingRecord.GAME_ID, gameId));
+        where.add(RatingRecord.GAME_ID.eq(gameId));
         if (since > 0L) {
-            where.add(new GreaterThan(RatingRecord.LAST_UPDATED,
-                                      new Timestamp(System.currentTimeMillis() - since)));
+            where.add(RatingRecord.LAST_UPDATED.greaterThan(
+                          new Timestamp(System.currentTimeMillis() - since)));
         }
         if (playerIds != null) {
-            where.add(new In(RatingRecord.PLAYER_ID, playerIds));
+            where.add(RatingRecord.PLAYER_ID.in(playerIds));
         }
 
         OrderBy ob = new OrderBy(
@@ -218,7 +215,7 @@ public class RatingRepository extends DepotRepository
      */
     public void purgePlayers (Collection<Integer> playerIds)
     {
-        deleteAll(RatingRecord.class, new Where(new In(RatingRecord.PLAYER_ID, playerIds)), null);
+        deleteAll(RatingRecord.class, new Where(RatingRecord.PLAYER_ID.in(playerIds)), null);
     }
 
     @Override
diff --git a/src/java/com/threerings/stats/server/persist/StatRepository.java b/src/java/com/threerings/stats/server/persist/StatRepository.java
index 1be80e21..ab862a98 100644
--- a/src/java/com/threerings/stats/server/persist/StatRepository.java
+++ b/src/java/com/threerings/stats/server/persist/StatRepository.java
@@ -31,7 +31,6 @@ import com.samskivert.depot.clause.FromOverride;
 import com.samskivert.depot.clause.QueryClause;
 import com.samskivert.depot.clause.Where;
 import com.samskivert.depot.expression.FunctionExp;
-import com.samskivert.depot.operator.In;
 
 import com.threerings.io.ObjectInputStream;
 import com.threerings.io.ObjectOutputStream;
@@ -188,7 +187,7 @@ public class StatRepository extends DepotRepository
      */
     public void purgePlayers (Collection<Integer> playerIds)
     {
-        deleteAll(StatRecord.class, new Where(new In(StatRecord.PLAYER_ID, playerIds)));
+        deleteAll(StatRecord.class, new Where(StatRecord.PLAYER_ID.in(playerIds)));
     }
 
     /**