From 93fb7b01f7658088fda18da54f429b2449c59717 Mon Sep 17 00:00:00 2001 From: Michael Bayne Date: Sat, 26 Jul 2008 20:40:20 +0000 Subject: [PATCH] Fixed some unused variables, unused imports, type variable hiding, tricky generic array type handling and other niggling bits. git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@5267 542714f4-19e9-0310-aa3c-eee0fc999fb1 --- .../threerings/admin/client/DSetEditor.java | 36 ++++++++----------- .../presents/client/BlockingCommunicator.java | 2 +- .../presents/client/ClientDObjectMgr.java | 2 +- .../presents/client/InvocationDirector.java | 2 +- .../presents/dobj/DynamicListener.java | 1 - .../presents/server/PresentsClient.java | 1 - .../presents/server/ShutdownManager.java | 1 - .../presents/tools/ActionScriptSource.java | 2 +- .../presents/tools/GenStreamableTask.java | 1 - .../com/threerings/util/DependencyGraph.java | 16 ++++----- .../threerings/util/StreamableEnumSet.java | 2 +- 11 files changed, 27 insertions(+), 39 deletions(-) diff --git a/src/java/com/threerings/admin/client/DSetEditor.java b/src/java/com/threerings/admin/client/DSetEditor.java index 8e099c78c..129ebc0e9 100644 --- a/src/java/com/threerings/admin/client/DSetEditor.java +++ b/src/java/com/threerings/admin/client/DSetEditor.java @@ -47,16 +47,15 @@ import com.threerings.presents.dobj.SetListener; /** * Allows simple editing of DSets within a distributed object. */ -public class DSetEditor extends JPanel - implements AttributeChangeListener, SetListener, ActionListener +public class DSetEditor extends JPanel + implements AttributeChangeListener, SetListener, ActionListener { /** * Construct a DSet editor to merely display the specified set. * * @param setter The object that contains the set. * @param setName The name of the set in the object. - * @param entryClass the Class of the DSet.Entry elements contained in the - * set. + * @param entryClass the Class of the DSet.Entry elements contained in the set. */ public DSetEditor (DObject setter, String setName, Class entryClass) { @@ -68,10 +67,8 @@ public class DSetEditor extends JPanel * * @param setter The object that contains the set. * @param setName The name of the set in the object. - * @param entryClass the Class of the DSet.Entry elements contained in the - * set. - * @param editableFields the names of the fields in the entryClass that - * should be editable. + * @param entryClass the Class of the DSet.Entry elements contained in the set. + * @param editableFields the names of the fields in the entryClass that should be editable. */ public DSetEditor (DObject setter, String setName, Class entryClass, String[] editableFields) @@ -84,15 +81,12 @@ public class DSetEditor extends JPanel * * @param setter The object that contains the set. * @param setName The name of the set in the object. - * @param entryClass the Class of the DSet.Entry elements contained in the - * set. - * @param editableFields the names of the fields in the entryClass that - * should be editable. + * @param entryClass the Class of the DSet.Entry elements contained in the set. + * @param editableFields the names of the fields in the entryClass that should be editable. * @param interp The FieldInterpreter to use. */ public DSetEditor (DObject setter, String setName, Class entryClass, - String[] editableFields, - ObjectEditorTable.FieldInterpreter interp) + String[] editableFields, ObjectEditorTable.FieldInterpreter interp) { super(new BorderLayout()); @@ -149,10 +143,10 @@ public class DSetEditor extends JPanel } // documentation inherited from interface SetListener - public void entryAdded (EntryAddedEvent event) + public void entryAdded (EntryAddedEvent event) { if (event.getName().equals(_setName)) { - DSet.Entry entry = event.getEntry(); + E entry = event.getEntry(); @SuppressWarnings("unchecked") Comparable key = entry.getKey(); int index = _keys.insertSorted(key); _table.insertDatum(entry, index); @@ -160,7 +154,7 @@ public class DSetEditor extends JPanel } // documentation inherited from interface SetListener - public void entryRemoved (EntryRemovedEvent event) + public void entryRemoved (EntryRemovedEvent event) { if (event.getName().equals(_setName)) { Comparable key = event.getKey(); @@ -171,10 +165,10 @@ public class DSetEditor extends JPanel } // documentation inherited from interface SetListener - public void entryUpdated (EntryUpdatedEvent event) + public void entryUpdated (EntryUpdatedEvent event) { if (event.getName().equals(_setName)) { - DSet.Entry entry = event.getEntry(); + E entry = event.getEntry(); int index = _keys.indexOf(entry.getKey()); _table.updateDatum(entry, index); } @@ -200,7 +194,7 @@ public class DSetEditor extends JPanel protected void refreshData () { _keys = new ComparableArrayList>(); - DSet.Entry[] entries = new DSet.Entry[_set.size()]; + @SuppressWarnings("unchecked") E[] entries = (E[])new DSet.Entry[_set.size()]; _set.toArray(entries); for (int ii = 0; ii < entries.length; ii++) { @SuppressWarnings("unchecked") Comparable key = entries[ii].getKey(); @@ -216,7 +210,7 @@ public class DSetEditor extends JPanel protected String _setName; /** The set itself. */ - protected DSet _set; + protected DSet _set; /** An array we use to track our entries' positions by key. */ protected ComparableArrayList> _keys; diff --git a/src/java/com/threerings/presents/client/BlockingCommunicator.java b/src/java/com/threerings/presents/client/BlockingCommunicator.java index 6a14d614b..b3adfd8a9 100644 --- a/src/java/com/threerings/presents/client/BlockingCommunicator.java +++ b/src/java/com/threerings/presents/client/BlockingCommunicator.java @@ -827,7 +827,7 @@ public class BlockingCommunicator extends Communicator return false; // cancelled } else if (resp > 0) { - DownstreamMessage msg = receiveDatagram(); + receiveDatagram(); return true; } } diff --git a/src/java/com/threerings/presents/client/ClientDObjectMgr.java b/src/java/com/threerings/presents/client/ClientDObjectMgr.java index 1919c0d52..db13c27f4 100644 --- a/src/java/com/threerings/presents/client/ClientDObjectMgr.java +++ b/src/java/com/threerings/presents/client/ClientDObjectMgr.java @@ -439,7 +439,7 @@ public class ClientDObjectMgr for (Iterator> iter = _flushes.intEntrySet().iterator(); iter.hasNext(); ) { IntMap.IntEntry entry = iter.next(); - int oid = entry.getIntKey(); +// int oid = entry.getIntKey(); FlushRecord rec = entry.getValue(); if (rec.expire <= now) { iter.remove(); diff --git a/src/java/com/threerings/presents/client/InvocationDirector.java b/src/java/com/threerings/presents/client/InvocationDirector.java index e9aead617..2b5e5c0cf 100644 --- a/src/java/com/threerings/presents/client/InvocationDirector.java +++ b/src/java/com/threerings/presents/client/InvocationDirector.java @@ -154,7 +154,7 @@ public class InvocationDirector log.warning("Receiver unregistered for which we have no id to code mapping " + "[code=" + receiverCode + "]."); } else { - Object decoder = _receivers.remove(rreg.receiverId); +// Object decoder = _receivers.remove(rreg.receiverId); // Log.info("Cleared receiver " + StringUtil.shortClassName(decoder) + // " " + rreg + "."); } diff --git a/src/java/com/threerings/presents/dobj/DynamicListener.java b/src/java/com/threerings/presents/dobj/DynamicListener.java index 2b0899724..b73c38ab6 100644 --- a/src/java/com/threerings/presents/dobj/DynamicListener.java +++ b/src/java/com/threerings/presents/dobj/DynamicListener.java @@ -120,7 +120,6 @@ public class DynamicListener */ protected Method resolveMethod (String name, Object[] arguments) { - Class clazz = _target.getClass(); Class[] ptypes = new Class[arguments.length]; for (int ii = 0; ii < arguments.length; ii++) { ptypes[ii] = arguments[ii] == null ? diff --git a/src/java/com/threerings/presents/server/PresentsClient.java b/src/java/com/threerings/presents/server/PresentsClient.java index 05f98cdba..756d1dde5 100644 --- a/src/java/com/threerings/presents/server/PresentsClient.java +++ b/src/java/com/threerings/presents/server/PresentsClient.java @@ -36,7 +36,6 @@ import com.samskivert.util.Throttle; import com.threerings.util.Name; import com.threerings.presents.data.ClientObject; -import com.threerings.presents.data.InvocationMarshaller; import com.threerings.presents.dobj.DEvent; import com.threerings.presents.dobj.DObject; diff --git a/src/java/com/threerings/presents/server/ShutdownManager.java b/src/java/com/threerings/presents/server/ShutdownManager.java index 832c59a6c..6e8fc7092 100644 --- a/src/java/com/threerings/presents/server/ShutdownManager.java +++ b/src/java/com/threerings/presents/server/ShutdownManager.java @@ -21,7 +21,6 @@ package com.threerings.presents.server; - import com.google.inject.Inject; import com.google.inject.Singleton; diff --git a/src/java/com/threerings/presents/tools/ActionScriptSource.java b/src/java/com/threerings/presents/tools/ActionScriptSource.java index ca37b9c07..d31865ac4 100644 --- a/src/java/com/threerings/presents/tools/ActionScriptSource.java +++ b/src/java/com/threerings/presents/tools/ActionScriptSource.java @@ -737,7 +737,7 @@ public class ActionScriptSource line = slurpUntil(bin, line, ";", false); } - String fieldName = m.group(1); +// String fieldName = m.group(1); // TODO: update the comment? accum.setLength(0); diff --git a/src/java/com/threerings/presents/tools/GenStreamableTask.java b/src/java/com/threerings/presents/tools/GenStreamableTask.java index 55d780802..94a513c02 100644 --- a/src/java/com/threerings/presents/tools/GenStreamableTask.java +++ b/src/java/com/threerings/presents/tools/GenStreamableTask.java @@ -29,7 +29,6 @@ import java.lang.reflect.Modifier; import java.util.ArrayList; -import org.apache.tools.ant.BuildException; import org.apache.tools.ant.DirectoryScanner; import org.apache.tools.ant.Task; import org.apache.tools.ant.types.FileSet; diff --git a/src/java/com/threerings/util/DependencyGraph.java b/src/java/com/threerings/util/DependencyGraph.java index df78c4fbb..ab941cac4 100644 --- a/src/java/com/threerings/util/DependencyGraph.java +++ b/src/java/com/threerings/util/DependencyGraph.java @@ -51,9 +51,7 @@ public class DependencyGraph public T removeAvailableElement () { T elem = _orphans.get(0); - DependencyNode node = _nodes.get(elem); remove(elem); - return elem; } @@ -132,17 +130,17 @@ public class DependencyGraph protected ArrayList _orphans = new ArrayList(); /** Represents a node in our dependency graph. */ - protected class DependencyNode + protected class DependencyNode
{ - public T content; - public ArrayList> parents; - public ArrayList> children; + public DT content; + public ArrayList> parents; + public ArrayList> children; - public DependencyNode (T contents) + public DependencyNode (DT contents) { this.content = contents; - this.parents = new ArrayList>(); - this.children = new ArrayList>(); + this.parents = new ArrayList>(); + this.children = new ArrayList>(); } } } diff --git a/src/java/com/threerings/util/StreamableEnumSet.java b/src/java/com/threerings/util/StreamableEnumSet.java index 93cdef4fe..27c91ce4c 100644 --- a/src/java/com/threerings/util/StreamableEnumSet.java +++ b/src/java/com/threerings/util/StreamableEnumSet.java @@ -246,7 +246,7 @@ public class StreamableEnumSet> extends AbstractSet { try { // make a deep clone of the contents - StreamableEnumSet cset = (StreamableEnumSet)super.clone(); + @SuppressWarnings("unchecked") StreamableEnumSet cset = (StreamableEnumSet)super.clone(); cset._contents = _contents.clone(); return cset;