From 10eeeca31b0ac73e5d9c2b64975e977727ef4ac8 Mon Sep 17 00:00:00 2001 From: mdb Date: Sat, 26 Jul 2008 22:02:39 +0000 Subject: [PATCH] Nixed a bunch of unused variables. git-svn-id: https://samskivert.googlecode.com/svn/trunk@2347 6335cc39-0255-0410-8fd6-9bcaacd3b74c --- src/java/com/samskivert/jdbc/JDBCUtil.java | 1 - src/java/com/samskivert/net/cddb/CDDBTest.java | 2 +- src/java/com/samskivert/swing/tests/LabelDemo.java | 2 +- src/java/com/samskivert/swing/util/SwingUtil.java | 2 +- src/java/com/samskivert/util/Histogram.java | 1 - src/java/com/samskivert/util/ObserverList.java | 2 +- src/java/com/samskivert/util/Predicate.java | 2 +- src/java/com/samskivert/util/tests/HashIntMapTest.java | 2 +- src/java/com/samskivert/util/tests/ObserverListTest.java | 4 ++-- src/java/com/samskivert/util/tests/SystemInfoDemo.java | 2 +- 10 files changed, 9 insertions(+), 11 deletions(-) diff --git a/src/java/com/samskivert/jdbc/JDBCUtil.java b/src/java/com/samskivert/jdbc/JDBCUtil.java index daa0ed64..30485cb1 100644 --- a/src/java/com/samskivert/jdbc/JDBCUtil.java +++ b/src/java/com/samskivert/jdbc/JDBCUtil.java @@ -376,7 +376,6 @@ public class JDBCUtil String column) throws SQLException { - boolean matched = false; ResultSet rs = conn.getMetaData().getIndexInfo("", "", table, false, true); while (rs.next()) { String tname = rs.getString("TABLE_NAME"); diff --git a/src/java/com/samskivert/net/cddb/CDDBTest.java b/src/java/com/samskivert/net/cddb/CDDBTest.java index de651f5d..61defc76 100644 --- a/src/java/com/samskivert/net/cddb/CDDBTest.java +++ b/src/java/com/samskivert/net/cddb/CDDBTest.java @@ -32,7 +32,7 @@ public class CDDBTest CDDB cddb = new CDDB(); try { - String rsp = cddb.connect(hostname); + /* String rsp = */ cddb.connect(hostname); // set the timeout to 30 seconds cddb.setTimeout(30*1000); diff --git a/src/java/com/samskivert/swing/tests/LabelDemo.java b/src/java/com/samskivert/swing/tests/LabelDemo.java index fa4dd522..2665d1c3 100644 --- a/src/java/com/samskivert/swing/tests/LabelDemo.java +++ b/src/java/com/samskivert/swing/tests/LabelDemo.java @@ -33,7 +33,7 @@ public class LabelDemo extends JPanel // create our labels String text = "The quick brown fox jumped over the lazy dog. " + "He then popped into the butcher's and picked up some mutton."; - Font font = new Font("Courier", Font.PLAIN, 10); + // Font font = new Font("Courier", Font.PLAIN, 10); int idx = 0; _labels[idx] = new Label("\u307e\u305b\u3002Amores\u30d1\u30a4\u30e9"); diff --git a/src/java/com/samskivert/swing/util/SwingUtil.java b/src/java/com/samskivert/swing/util/SwingUtil.java index 152a23fc..c6d59b0a 100644 --- a/src/java/com/samskivert/swing/util/SwingUtil.java +++ b/src/java/com/samskivert/swing/util/SwingUtil.java @@ -554,7 +554,7 @@ public class SwingUtil int w = img.getWidth(null); int h = img.getHeight(null); Dimension d = tk.getBestCursorSize(w, h); - int colors = tk.getMaximumCursorColors(); +// int colors = tk.getMaximumCursorColors(); // Log.debug("Creating custom cursor [desiredSize=" + w + "x" + h + // ", bestSize=" + d.width + "x" + d.height + // ", maxcolors=" + colors + "]."); diff --git a/src/java/com/samskivert/util/Histogram.java b/src/java/com/samskivert/util/Histogram.java index 2651f29a..0c1e7f54 100644 --- a/src/java/com/samskivert/util/Histogram.java +++ b/src/java/com/samskivert/util/Histogram.java @@ -90,7 +90,6 @@ public class Histogram */ public String summarize () { - long total = 0; StringBuilder buf = new StringBuilder(); buf.append(_count).append(":"); for (int ii = 0; ii < _buckets.length; ii++) { diff --git a/src/java/com/samskivert/util/ObserverList.java b/src/java/com/samskivert/util/ObserverList.java index f7fdac55..e14c810d 100644 --- a/src/java/com/samskivert/util/ObserverList.java +++ b/src/java/com/samskivert/util/ObserverList.java @@ -265,7 +265,7 @@ public class ObserverList extends ArrayList _snap.length > (ocount << 3)) { _snap = (T[])new Object[ocount]; } - Object[] obs = toArray(_snap); + toArray(_snap); for (int ii = 0; ii < ocount; ii++) { if (!checkedApply(obop, _snap[ii])) { remove(_snap[ii]); diff --git a/src/java/com/samskivert/util/Predicate.java b/src/java/com/samskivert/util/Predicate.java index f00c9419..6d662a68 100644 --- a/src/java/com/samskivert/util/Predicate.java +++ b/src/java/com/samskivert/util/Predicate.java @@ -260,7 +260,7 @@ public abstract class Predicate { // oh god, oh god: we iterate and count int size = 0; - for (E elem : this) { + for (Iterator iter = iterator(); iter.hasNext(); ) { size++; } return size; diff --git a/src/java/com/samskivert/util/tests/HashIntMapTest.java b/src/java/com/samskivert/util/tests/HashIntMapTest.java index e20f23cf..de6f3a2a 100644 --- a/src/java/com/samskivert/util/tests/HashIntMapTest.java +++ b/src/java/com/samskivert/util/tests/HashIntMapTest.java @@ -75,7 +75,7 @@ public class HashIntMapTest extends TestCase // check the table contents for (int i = 10; i < 20; i++) { - Integer val = table.get(i); + Integer val = map.get(i); assertTrue("get(" + i + ") == " + i, val.intValue() == i); } diff --git a/src/java/com/samskivert/util/tests/ObserverListTest.java b/src/java/com/samskivert/util/tests/ObserverListTest.java index 33d5fdf8..8467860a 100644 --- a/src/java/com/samskivert/util/tests/ObserverListTest.java +++ b/src/java/com/samskivert/util/tests/ObserverListTest.java @@ -38,8 +38,8 @@ public class ObserverListTest extends TestCase public void runTest () { // Log.info("Testing safe list."); - ObserverList list; - testList(list = ObserverList.newSafeInOrder()); + ObserverList list = ObserverList.newSafeInOrder(); + testList(list); // Log.info("Testing unsafe list."); testList(list = ObserverList.newFastUnsafe()); diff --git a/src/java/com/samskivert/util/tests/SystemInfoDemo.java b/src/java/com/samskivert/util/tests/SystemInfoDemo.java index 589998dd..9ef32f90 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++) { - int[] data = new int[100]; + @SuppressWarnings("unused") int[] data = new int[100]; } // update and output the latest system information