From 420df9105641c4bd097c769a1c5023bcbeebfc4f Mon Sep 17 00:00:00 2001
From: samskivert <samskivert@6335cc39-0255-0410-8fd6-9bcaacd3b74c>
Date: Wed, 10 Feb 2010 00:53:15 +0000
Subject: [PATCH] More FindBugs inspired hygeine.

git-svn-id: https://samskivert.googlecode.com/svn/trunk@2739 6335cc39-0255-0410-8fd6-9bcaacd3b74c
---
 src/java/com/samskivert/util/CountMap.java               | 2 +-
 src/java/com/samskivert/util/Crypt.java                  | 2 +-
 src/java/com/samskivert/util/tests/ObserverListTest.java | 2 +-
 src/java/com/samskivert/util/tests/SystemInfoDemo.java   | 4 +++-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/java/com/samskivert/util/CountMap.java b/src/java/com/samskivert/util/CountMap.java
index 91858050..706317f4 100644
--- a/src/java/com/samskivert/util/CountMap.java
+++ b/src/java/com/samskivert/util/CountMap.java
@@ -58,7 +58,7 @@ public class CountMap<K> extends AbstractMap<K, Integer>
     {
         CountEntry<K> entry = _backing.get(key);
         if (entry == null) {
-            _backing.put(key, entry = new CountEntry<K>(key, amount));
+            _backing.put(key, new CountEntry<K>(key, amount));
             return amount;
         }
         return (entry.count += amount);
diff --git a/src/java/com/samskivert/util/Crypt.java b/src/java/com/samskivert/util/Crypt.java
index 37288058..c869b8ca 100644
--- a/src/java/com/samskivert/util/Crypt.java
+++ b/src/java/com/samskivert/util/Crypt.java
@@ -654,7 +654,7 @@ public class Crypt
             System.out.println("Did " + ccount + " crypt()s in " +
                                duration + "ms.");
             System.out.println("crypt()s per second: " +
-                               (ccount*1000)/duration);
+                               (ccount*1000L)/duration);
         }
     }
 }
diff --git a/src/java/com/samskivert/util/tests/ObserverListTest.java b/src/java/com/samskivert/util/tests/ObserverListTest.java
index fa3d2c74..da645d82 100644
--- a/src/java/com/samskivert/util/tests/ObserverListTest.java
+++ b/src/java/com/samskivert/util/tests/ObserverListTest.java
@@ -43,7 +43,7 @@ public class ObserverListTest extends TestCase
         testList(list);
 
 //         Log.info("Testing unsafe list.");
-        testList(list = ObserverList.newFastUnsafe());
+        testList(ObserverList.<TestObserver>newFastUnsafe());
     }
 
     public void testList (final ObserverList<TestObserver> list)
diff --git a/src/java/com/samskivert/util/tests/SystemInfoDemo.java b/src/java/com/samskivert/util/tests/SystemInfoDemo.java
index 3e9d117b..8442468a 100644
--- a/src/java/com/samskivert/util/tests/SystemInfoDemo.java
+++ b/src/java/com/samskivert/util/tests/SystemInfoDemo.java
@@ -34,7 +34,7 @@ public class SystemInfoDemo
         // allocate a bit of data
         System.out.println("\nAllocating test data.");
         for (int ii = 0; ii < 10000; ii++) {
-            @SuppressWarnings("unused") int[] data = new int[100];
+            _counter += new int[100].length;
         }
 
         // update and output the latest system information
@@ -42,4 +42,6 @@ public class SystemInfoDemo
         System.out.println("\nUpdated system info:");
         System.out.println(info.toString());
     }
+
+    protected static long _counter;
 }