diff --git a/src/java/com/threerings/admin/Log.java b/src/java/com/threerings/admin/Log.java index 24346bbd1..f916a7b65 100644 --- a/src/java/com/threerings/admin/Log.java +++ b/src/java/com/threerings/admin/Log.java @@ -28,29 +28,29 @@ package com.threerings.admin; public class Log { public static com.samskivert.util.Log log = - new com.samskivert.util.Log("admin"); + new com.samskivert.util.Log("admin"); /** Convenience function. */ public static void debug (String message) { - log.debug(message); + log.debug(message); } /** Convenience function. */ public static void info (String message) { - log.info(message); + log.info(message); } /** Convenience function. */ public static void warning (String message) { - log.warning(message); + log.warning(message); } /** Convenience function. */ public static void logStackTrace (Throwable t) { - log.logStackTrace(com.samskivert.util.Log.WARNING, t); + log.logStackTrace(com.samskivert.util.Log.WARNING, t); } } diff --git a/src/java/com/threerings/admin/server/persist/ConfigRepository.java b/src/java/com/threerings/admin/server/persist/ConfigRepository.java index 1e3cf8ed9..3e3db6f8a 100644 --- a/src/java/com/threerings/admin/server/persist/ConfigRepository.java +++ b/src/java/com/threerings/admin/server/persist/ConfigRepository.java @@ -117,7 +117,7 @@ public class ConfigRepository extends JORARepository // documentation inherited protected void createTables () { - _ctable = new Table( + _ctable = new Table( ConfigDatum.class, "CONFIG", new String[] { "NODE", "OBJECT", "FIELD" }, true); } diff --git a/src/java/com/threerings/crowd/Log.java b/src/java/com/threerings/crowd/Log.java index 08287dfea..6586038b8 100644 --- a/src/java/com/threerings/crowd/Log.java +++ b/src/java/com/threerings/crowd/Log.java @@ -36,24 +36,24 @@ public class Log /** Convenience function. */ public static void debug (String message) { - log.fine(message); + log.fine(message); } /** Convenience function. */ public static void info (String message) { - log.info(message); + log.info(message); } /** Convenience function. */ public static void warning (String message) { - log.warning(message); + log.warning(message); } /** Convenience function. */ public static void logStackTrace (Throwable t) { - log.log(Level.WARNING, t.getMessage(), t); + log.log(Level.WARNING, t.getMessage(), t); } } diff --git a/src/java/com/threerings/io/FramedInputStream.java b/src/java/com/threerings/io/FramedInputStream.java index 81ee2da9b..378584762 100644 --- a/src/java/com/threerings/io/FramedInputStream.java +++ b/src/java/com/threerings/io/FramedInputStream.java @@ -266,7 +266,7 @@ public class FramedInputStream extends InputStream */ public int available () { - return _buffer.remaining(); + return _buffer.remaining(); } /** @@ -275,7 +275,7 @@ public class FramedInputStream extends InputStream */ public boolean markSupported () { - return false; + return false; } /** diff --git a/src/java/com/threerings/io/FramingOutputStream.java b/src/java/com/threerings/io/FramingOutputStream.java index 6e42685a8..65b786a60 100644 --- a/src/java/com/threerings/io/FramingOutputStream.java +++ b/src/java/com/threerings/io/FramingOutputStream.java @@ -74,12 +74,12 @@ public class FramingOutputStream extends OutputStream public void write (byte[] b, int off, int len) { // sanity check the arguments - if ((off < 0) || (off > b.length) || (len < 0) || + if ((off < 0) || (off > b.length) || (len < 0) || ((off + len) > b.length) || ((off + len) < 0)) { - throw new IndexOutOfBoundsException(); - } else if (len == 0) { - return; - } + throw new IndexOutOfBoundsException(); + } else if (len == 0) { + return; + } try { _buffer.put(b, off, len); @@ -96,13 +96,13 @@ public class FramingOutputStream extends OutputStream { int ocapacity = _buffer.capacity(); int ncapacity = _buffer.position() + needed; - if (ncapacity > ocapacity) { + if (ncapacity > ocapacity) { // increase the buffer size in large increments ncapacity = Math.max(ocapacity << 1, ncapacity); ByteBuffer newbuf = ByteBuffer.allocate(ncapacity); newbuf.put((ByteBuffer)_buffer.flip()); - _buffer = newbuf; - } + _buffer = newbuf; + } } /** @@ -119,9 +119,9 @@ public class FramingOutputStream extends OutputStream // buffer so that all the data is available int count = _buffer.limit(); _buffer.put((byte)((count >>> 24) & 0xFF)); - _buffer.put((byte)((count >>> 16) & 0xFF)); - _buffer.put((byte)((count >>> 8) & 0xFF)); - _buffer.put((byte)((count >>> 0) & 0xFF)); + _buffer.put((byte)((count >>> 16) & 0xFF)); + _buffer.put((byte)((count >>> 8) & 0xFF)); + _buffer.put((byte)((count >>> 0) & 0xFF)); _buffer.rewind(); return _buffer; diff --git a/src/java/com/threerings/presents/Log.java b/src/java/com/threerings/presents/Log.java index 909895ade..3638af3ae 100644 --- a/src/java/com/threerings/presents/Log.java +++ b/src/java/com/threerings/presents/Log.java @@ -35,24 +35,24 @@ public class Log /** Convenience function. */ public static void debug (String message) { - log.fine(message); + log.fine(message); } /** Convenience function. */ public static void info (String message) { - log.info(message); + log.info(message); } /** Convenience function. */ public static void warning (String message) { - log.warning(message); + log.warning(message); } /** Convenience function. */ public static void logStackTrace (Throwable t) { - log.log(Level.WARNING, t.getMessage(), t); + log.log(Level.WARNING, t.getMessage(), t); } } diff --git a/src/java/com/threerings/presents/dobj/DObject.java b/src/java/com/threerings/presents/dobj/DObject.java index dace12168..b8a46f5ee 100644 --- a/src/java/com/threerings/presents/dobj/DObject.java +++ b/src/java/com/threerings/presents/dobj/DObject.java @@ -830,20 +830,20 @@ public class DObject */ protected final Field getField (String name) { - int low = 0, high = _fields.length-1; - while (low <= high) { - int mid = (low + high) >> 1; - Field midVal = _fields[mid]; - int cmp = midVal.getName().compareTo(name); - if (cmp < 0) { - low = mid + 1; - } else if (cmp > 0) { - high = mid - 1; - } else { - return midVal; // key found + int low = 0, high = _fields.length-1; + while (low <= high) { + int mid = (low + high) >> 1; + Field midVal = _fields[mid]; + int cmp = midVal.getName().compareTo(name); + if (cmp < 0) { + low = mid + 1; + } else if (cmp > 0) { + high = mid - 1; + } else { + return midVal; // key found } - } - return null; // key not found. + } + return null; // key not found. } /** Our object id. */ diff --git a/src/java/com/threerings/presents/peer/server/persist/NodeRepository.java b/src/java/com/threerings/presents/peer/server/persist/NodeRepository.java index 603d46953..1105c706e 100644 --- a/src/java/com/threerings/presents/peer/server/persist/NodeRepository.java +++ b/src/java/com/threerings/presents/peer/server/persist/NodeRepository.java @@ -117,7 +117,7 @@ public class NodeRepository extends JORARepository @Override // documentation inherited protected void createTables () { - _ntable = new Table(NodeRecord.class, "NODES", "NODE_NAME", true); + _ntable = new Table(NodeRecord.class, "NODES", "NODE_NAME", true); } protected Table _ntable; diff --git a/src/java/com/threerings/presents/server/net/ConnectionManager.java b/src/java/com/threerings/presents/server/net/ConnectionManager.java index a6c91c1ca..68ccf8136 100644 --- a/src/java/com/threerings/presents/server/net/ConnectionManager.java +++ b/src/java/com/threerings/presents/server/net/ConnectionManager.java @@ -546,7 +546,7 @@ public class ConnectionManager extends LoopingThread int ncapacity = Math.max(_outbuf.capacity() << 1, data.length); log.info("Expanding output buffer size [nsize=" + ncapacity + "]."); _outbuf = ByteBuffer.allocateDirect(ncapacity); - } + } boolean fully = true; try { diff --git a/src/java/com/threerings/util/RandomUtil.java b/src/java/com/threerings/util/RandomUtil.java index c25df8cad..0eb45e772 100644 --- a/src/java/com/threerings/util/RandomUtil.java +++ b/src/java/com/threerings/util/RandomUtil.java @@ -40,7 +40,7 @@ public class RandomUtil @Deprecated public static int getInt (int high) { - return com.samskivert.util.RandomUtil.getInt(high); + return com.samskivert.util.RandomUtil.getInt(high); } /** @@ -49,7 +49,7 @@ public class RandomUtil @Deprecated public static int getInt (int high, int low) { - return com.samskivert.util.RandomUtil.getInt(high, low); + return com.samskivert.util.RandomUtil.getInt(high, low); } /** @@ -58,7 +58,7 @@ public class RandomUtil @Deprecated public static float getFloat (float high) { - return com.samskivert.util.RandomUtil.getFloat(high); + return com.samskivert.util.RandomUtil.getFloat(high); } /** @@ -67,7 +67,7 @@ public class RandomUtil @Deprecated public static int getWeightedIndex (int[] weights) { - return com.samskivert.util.RandomUtil.getWeightedIndex(weights); + return com.samskivert.util.RandomUtil.getWeightedIndex(weights); } /** @@ -76,7 +76,7 @@ public class RandomUtil @Deprecated public static int getWeightedIndex (float[] weights) { - return com.samskivert.util.RandomUtil.getWeightedIndex(weights); + return com.samskivert.util.RandomUtil.getWeightedIndex(weights); } /** @@ -85,7 +85,7 @@ public class RandomUtil @Deprecated public static T pickRandom (T[] values) { - return com.samskivert.util.RandomUtil.pickRandom(values); + return com.samskivert.util.RandomUtil.pickRandom(values); } /** @@ -94,7 +94,7 @@ public class RandomUtil @Deprecated public static T pickRandom (T[] values, T skip) { - return com.samskivert.util.RandomUtil.pickRandom(values, skip); + return com.samskivert.util.RandomUtil.pickRandom(values, skip); } /** @@ -103,7 +103,7 @@ public class RandomUtil @Deprecated public static T pickRandom (Collection values) { - return com.samskivert.util.RandomUtil.pickRandom(values); + return com.samskivert.util.RandomUtil.pickRandom(values); } /** @@ -112,7 +112,7 @@ public class RandomUtil @Deprecated public static T pickRandom (List values) { - return com.samskivert.util.RandomUtil.pickRandom(values); + return com.samskivert.util.RandomUtil.pickRandom(values); } /** @@ -121,7 +121,7 @@ public class RandomUtil @Deprecated public static T pickRandom (List values, T skip) { - return com.samskivert.util.RandomUtil.pickRandom(values, skip); + return com.samskivert.util.RandomUtil.pickRandom(values, skip); } /** @@ -130,7 +130,7 @@ public class RandomUtil @Deprecated public static T pickRandom (List values, T skip, Random r) { - return com.samskivert.util.RandomUtil.pickRandom(values, skip, r); + return com.samskivert.util.RandomUtil.pickRandom(values, skip, r); } /** @@ -139,7 +139,7 @@ public class RandomUtil @Deprecated public static T pickRandom (Iterator iter, int count) { - return com.samskivert.util.RandomUtil.pickRandom(iter, count); + return com.samskivert.util.RandomUtil.pickRandom(iter, count); } /** @@ -148,6 +148,6 @@ public class RandomUtil @Deprecated public static T pickRandom (Iterator iter, int count, T skip) { - return com.samskivert.util.RandomUtil.pickRandom(iter, count, skip); + return com.samskivert.util.RandomUtil.pickRandom(iter, count, skip); } }