diff --git a/src/java/com/threerings/admin/server/ConfigRegistry.java b/src/java/com/threerings/admin/server/ConfigRegistry.java index b425545bd..92424c1e5 100644 --- a/src/java/com/threerings/admin/server/ConfigRegistry.java +++ b/src/java/com/threerings/admin/server/ConfigRegistry.java @@ -33,6 +33,7 @@ import com.samskivert.util.StringUtil; import com.threerings.io.ObjectInputStream; import com.threerings.io.ObjectOutputStream; import com.threerings.io.Streamable; +import com.threerings.presents.dobj.AccessController; import com.threerings.presents.dobj.AttributeChangeListener; import com.threerings.presents.dobj.AttributeChangedEvent; import com.threerings.presents.dobj.DObject; @@ -152,13 +153,13 @@ public abstract class ConfigRegistry Class cclass = object.getClass(); try { Field[] fields = cclass.getFields(); - for (int ii = 0; ii < fields.length; ii++) { - int mods = fields[ii].getModifiers(); + for (Field field : fields) { + int mods = field.getModifiers(); if ((mods & Modifier.STATIC) != 0 || (mods & Modifier.PUBLIC) == 0 || (mods & Modifier.TRANSIENT) != 0) { continue; } - initField(fields[ii]); + initField(field); } // listen for attribute updates diff --git a/src/java/com/threerings/admin/server/PrefsConfigRegistry.java b/src/java/com/threerings/admin/server/PrefsConfigRegistry.java index 9646ec32c..dc52aefc2 100644 --- a/src/java/com/threerings/admin/server/PrefsConfigRegistry.java +++ b/src/java/com/threerings/admin/server/PrefsConfigRegistry.java @@ -23,6 +23,7 @@ package com.threerings.admin.server; import com.google.inject.Singleton; +import com.samskivert.util.Config; import com.samskivert.util.PrefsConfig; import com.threerings.presents.dobj.DObject; diff --git a/src/java/com/threerings/bureau/client/BureauClient.java b/src/java/com/threerings/bureau/client/BureauClient.java index 1eca5b42a..b3c92c0a2 100644 --- a/src/java/com/threerings/bureau/client/BureauClient.java +++ b/src/java/com/threerings/bureau/client/BureauClient.java @@ -35,7 +35,6 @@ public abstract class BureauClient extends Client { /** * Creates a new client. - * @param creds the credentials supplied during connection * @param runQueue the place to post tasks required by clients */ public BureauClient (String token, String bureauId, RunQueue runQueue) diff --git a/src/java/com/threerings/bureau/client/BureauDirector.java b/src/java/com/threerings/bureau/client/BureauDirector.java index 86f5e8c5d..aeddfb229 100644 --- a/src/java/com/threerings/bureau/client/BureauDirector.java +++ b/src/java/com/threerings/bureau/client/BureauDirector.java @@ -5,6 +5,7 @@ import com.threerings.bureau.data.BureauCodes; import com.samskivert.util.IntMap; import com.samskivert.util.IntMaps; import com.threerings.bureau.data.AgentObject; +import com.threerings.bureau.server.BureauRegistry; import com.threerings.bureau.util.BureauContext; import com.threerings.presents.client.Client; import com.threerings.presents.dobj.Subscriber; diff --git a/src/java/com/threerings/bureau/client/BureauReceiver.java b/src/java/com/threerings/bureau/client/BureauReceiver.java index 73286eb5d..03ac33fbc 100644 --- a/src/java/com/threerings/bureau/client/BureauReceiver.java +++ b/src/java/com/threerings/bureau/client/BureauReceiver.java @@ -21,6 +21,7 @@ package com.threerings.bureau.client; +import com.threerings.bureau.data.AgentObject; import com.threerings.presents.client.InvocationReceiver; /** @@ -32,7 +33,6 @@ public interface BureauReceiver extends InvocationReceiver * Creates a new agent. Implementors should create a new {@link Agent} and give it access to * the {@link AgentObject} referred to by the agentId parameter and must notify * the service that the agent has been created using {@link BureauService#agentCreated}. - * @param client the client receiving the request * @param agentId the id of the AgentObject that needs an Agent */ void createAgent (int agentId); @@ -41,7 +41,6 @@ public interface BureauReceiver extends InvocationReceiver * Destroys a previously created agent. Implementors should destroy the agent that was created * by the call to createAgent with the same agent id and must notify * the service that the agent has been created using {@link BureauService#agentDestroyed}. - * @param client the client receiving the request * @param agentId the id of the AgentObject whose Agent * should be destroyed */ diff --git a/src/java/com/threerings/bureau/server/BureauSender.java b/src/java/com/threerings/bureau/server/BureauSender.java index 9fd1061f7..e3bed6091 100644 --- a/src/java/com/threerings/bureau/server/BureauSender.java +++ b/src/java/com/threerings/bureau/server/BureauSender.java @@ -22,6 +22,7 @@ package com.threerings.bureau.server; import com.threerings.bureau.client.BureauDecoder; +import com.threerings.bureau.client.BureauReceiver; import com.threerings.presents.data.ClientObject; import com.threerings.presents.server.InvocationSender; diff --git a/src/java/com/threerings/crowd/chat/server/SpeakHandler.java b/src/java/com/threerings/crowd/chat/server/SpeakHandler.java index b2973c089..245707f80 100644 --- a/src/java/com/threerings/crowd/chat/server/SpeakHandler.java +++ b/src/java/com/threerings/crowd/chat/server/SpeakHandler.java @@ -27,6 +27,7 @@ import com.threerings.presents.data.ClientObject; import com.threerings.presents.dobj.DObject; import com.threerings.presents.server.InvocationManager; +import com.threerings.crowd.chat.client.SpeakService; import com.threerings.crowd.chat.data.ChatCodes; import com.threerings.crowd.data.BodyObject; diff --git a/src/java/com/threerings/crowd/server/LocationManager.java b/src/java/com/threerings/crowd/server/LocationManager.java index 65acec8a2..f3ffe64dc 100644 --- a/src/java/com/threerings/crowd/server/LocationManager.java +++ b/src/java/com/threerings/crowd/server/LocationManager.java @@ -74,7 +74,7 @@ public class LocationManager * * @return the config object for the new location. * - * @exception ServiceFaildException thrown if the move was not successful for some reason + * @exception InvocationException thrown if the move was not successful for some reason * (which will be communicated as an error code in the exception's message data). */ public PlaceConfig moveTo (BodyObject source, int placeOid) diff --git a/src/java/com/threerings/crowd/server/LocationSender.java b/src/java/com/threerings/crowd/server/LocationSender.java index 0f80d2ce0..6ef8333c4 100644 --- a/src/java/com/threerings/crowd/server/LocationSender.java +++ b/src/java/com/threerings/crowd/server/LocationSender.java @@ -22,6 +22,7 @@ package com.threerings.crowd.server; import com.threerings.crowd.client.LocationDecoder; +import com.threerings.crowd.client.LocationReceiver; import com.threerings.presents.data.ClientObject; import com.threerings.presents.server.InvocationSender; diff --git a/src/java/com/threerings/presents/client/Client.java b/src/java/com/threerings/presents/client/Client.java index 8a39f9b08..e8a78551f 100644 --- a/src/java/com/threerings/presents/client/Client.java +++ b/src/java/com/threerings/presents/client/Client.java @@ -451,7 +451,7 @@ public class Client * user of the failure and then simply call {@link #logon} to attempt to reconnect to the old * server. * - * @param observer an observer that will be notified when we have successfully logged onto the + * @param obs an observer that will be notified when we have successfully logged onto the * other server, or if the move failed. */ public void moveToServer (String hostname, int[] ports, InvocationService.ConfirmListener obs) @@ -470,7 +470,7 @@ public class Client * user of the failure and then simply call {@link #logon} to attempt to reconnect to the old * server. * - * @param observer an observer that will be notified when we have successfully logged onto the + * @param obs an observer that will be notified when we have successfully logged onto the * other server, or if the move failed. */ public void moveToServer ( diff --git a/src/java/com/threerings/presents/data/ClientObject.java b/src/java/com/threerings/presents/data/ClientObject.java index 0782c99fe..f9aa99362 100644 --- a/src/java/com/threerings/presents/data/ClientObject.java +++ b/src/java/com/threerings/presents/data/ClientObject.java @@ -74,7 +74,7 @@ public class ClientObject extends DObject } /** - * A version of {@link #checkAccess(Permission,Object} that provides no context. + * A version of {@link #checkAccess(Permission,Object)} that provides no context. */ public String checkAccess (Permission perm) { diff --git a/src/java/com/threerings/presents/data/InvocationMarshaller.java b/src/java/com/threerings/presents/data/InvocationMarshaller.java index 986f03a4b..e3d8452a9 100644 --- a/src/java/com/threerings/presents/data/InvocationMarshaller.java +++ b/src/java/com/threerings/presents/data/InvocationMarshaller.java @@ -136,7 +136,7 @@ public class InvocationMarshaller } /** - * Defines a marshaller for the standard {@link ConfirmListener}. + * Defines a marshaller for the standard {@link InvocationService.ConfirmListener}. */ public static class ConfirmMarshaller extends ListenerMarshaller implements ConfirmListener @@ -167,7 +167,7 @@ public class InvocationMarshaller } /** - * Defines a marshaller for the standard {@link ResultListener}. + * Defines a marshaller for the standard {@link InvocationService.ResultListener}. */ public static class ResultMarshaller extends ListenerMarshaller implements ResultListener diff --git a/src/java/com/threerings/presents/dobj/DObject.java b/src/java/com/threerings/presents/dobj/DObject.java index 8a63bd59a..cf558528f 100644 --- a/src/java/com/threerings/presents/dobj/DObject.java +++ b/src/java/com/threerings/presents/dobj/DObject.java @@ -453,8 +453,7 @@ public class DObject return; } - for (int ii = 0, ll = _subs.length; ii < ll; ii++) { - Object sub = _subs[ii]; + for (Object sub : _subs) { try { if (sub != null && sub instanceof ProxySubscriber) { ((ProxySubscriber)sub).eventReceived(event); @@ -569,7 +568,7 @@ public class DObject * distributed object manager. This is called by the distributed object manager when an object * is created and registered with the system. * - * @see DObjectManager#createObject + * @see RootDObjectManager#registerObject(DObject) */ public void setManager (DObjectManager omgr) { @@ -580,7 +579,7 @@ public class DObject * Don't call this function. It is called by the distributed object manager when an object is * created and registered with the system. * - * @see DObjectManager#createObject + * @see RootDObjectManager#registerObject(DObject) */ public void setOid (int oid) { diff --git a/src/java/com/threerings/presents/dobj/ElementUpdatedEvent.java b/src/java/com/threerings/presents/dobj/ElementUpdatedEvent.java index 4df64f14f..4d526d95b 100644 --- a/src/java/com/threerings/presents/dobj/ElementUpdatedEvent.java +++ b/src/java/com/threerings/presents/dobj/ElementUpdatedEvent.java @@ -45,7 +45,7 @@ public class ElementUpdatedEvent extends NamedEvent * @param name the name of the attribute (data member) for which an element has changed. * @param value the new value of the element (in the case of primitive types, the * reflection-defined object-alternative is used). - * @param oldValue the previous value of the element (in the case of primitive types, the + * @param ovalue the previous value of the element (in the case of primitive types, the * reflection-defined object-alternative is used). * @param index the index in the array of the updated element. */ @@ -62,7 +62,7 @@ public class ElementUpdatedEvent extends NamedEvent * @param name the name of the attribute (data member) for which an element has changed. * @param value the new value of the element (in the case of primitive types, the * reflection-defined object-alternative is used). - * @param oldValue the previous value of the element (in the case of primitive types, the + * @param ovalue the previous value of the element (in the case of primitive types, the * reflection-defined object-alternative is used). * @param index the index in the array of the updated element. * @param transport a hint as to the type of transport desired for the event. diff --git a/src/java/com/threerings/presents/server/ChainedAuthenticator.java b/src/java/com/threerings/presents/server/ChainedAuthenticator.java index ee90c6cb4..bdd455531 100644 --- a/src/java/com/threerings/presents/server/ChainedAuthenticator.java +++ b/src/java/com/threerings/presents/server/ChainedAuthenticator.java @@ -25,6 +25,7 @@ import com.samskivert.util.Invoker; import com.samskivert.util.ResultListener; import com.threerings.presents.server.net.AuthingConnection; +import com.threerings.presents.server.net.ConnectionManager; /** * Handles certain special kinds of authentications and passes the remainder through to the default diff --git a/src/java/com/threerings/presents/server/ClientManager.java b/src/java/com/threerings/presents/server/ClientManager.java index 9aca1bccf..2c6aa2cc6 100644 --- a/src/java/com/threerings/presents/server/ClientManager.java +++ b/src/java/com/threerings/presents/server/ClientManager.java @@ -547,7 +547,7 @@ public class ClientManager protected ClientOp _clop; } - /** Used to resolve dependencies in {@link PresentClient} instances that we create. */ + /** Used to resolve dependencies in {@link PresentsClient} instances that we create. */ protected Injector _injector; /** A mapping from auth username to client instances. */ diff --git a/src/java/com/threerings/presents/server/PresentsDObjectMgr.java b/src/java/com/threerings/presents/server/PresentsDObjectMgr.java index 645b62953..f40ed253d 100644 --- a/src/java/com/threerings/presents/server/PresentsDObjectMgr.java +++ b/src/java/com/threerings/presents/server/PresentsDObjectMgr.java @@ -73,7 +73,7 @@ public class PresentsDObjectMgr implements RootDObjectManager, RunQueue, ReportManager.Reporter { /** Contains operational statistics that are tracked by the distributed object manager between - * {@link ReportManager#Reporter} intervals. The snapshot for the most recently completed + * {@link ReportManager.Reporter} intervals. The snapshot for the most recently completed * period can be requested via {@link #getStats()}. . */ public static class Stats { @@ -380,13 +380,12 @@ public class PresentsDObjectMgr // deal with any remaining oid lists that reference this object Reference[] refs = _refs.remove(oid); if (refs != null) { - for (int i = 0; i < refs.length; i++) { + for (Reference ref : refs) { // skip empty spots - if (refs[i] == null) { + if (ref == null) { continue; } - Reference ref = refs[i]; DObject reffer = _objects.get(ref.reffingOid); // ensure that the referencing object is still around @@ -405,9 +404,7 @@ public class PresentsDObjectMgr // to clear out those references Class oclass = target.getClass(); Field[] fields = oclass.getFields(); - for (int f = 0; f < fields.length; f++) { - Field field = fields[f]; - + for (Field field : fields) { // ignore static and non-public fields int mods = field.getModifiers(); if ((mods & Modifier.STATIC) != 0 || (mods & Modifier.PUBLIC) == 0) { diff --git a/src/java/com/threerings/presents/server/PresentsServer.java b/src/java/com/threerings/presents/server/PresentsServer.java index c80040246..68f4486aa 100644 --- a/src/java/com/threerings/presents/server/PresentsServer.java +++ b/src/java/com/threerings/presents/server/PresentsServer.java @@ -36,6 +36,7 @@ import com.threerings.presents.annotation.EventQueue; import com.threerings.presents.annotation.MainInvoker; import com.threerings.presents.client.Client; import com.threerings.presents.dobj.AccessController; +import com.threerings.presents.dobj.DObject; import com.threerings.presents.dobj.DObjectManager; import com.threerings.presents.dobj.RootDObjectManager; import com.threerings.presents.server.net.ConnectionManager; diff --git a/src/java/com/threerings/presents/tools/GenReceiverTask.java b/src/java/com/threerings/presents/tools/GenReceiverTask.java index c183ff6ac..35b0ffb2a 100644 --- a/src/java/com/threerings/presents/tools/GenReceiverTask.java +++ b/src/java/com/threerings/presents/tools/GenReceiverTask.java @@ -69,8 +69,7 @@ public class GenReceiverTask extends InvocationTask // look through and locate our receiver methods Method[] methdecls = receiver.getDeclaredMethods(); - for (int ii = 0; ii < methdecls.length; ii++) { - Method m = methdecls[ii]; + for (Method m : methdecls) { // receiver interface methods must be public and abstract if (!Modifier.isPublic(m.getModifiers()) && !Modifier.isAbstract(m.getModifiers())) { @@ -104,6 +103,7 @@ public class GenReceiverTask extends InvocationTask checkedAdd(implist, InvocationSender.class.getName()); String dname = StringUtil.replace(rname, "Receiver", "Decoder"); checkedAdd(implist, rpackage + "." + dname); + checkedAdd(implist, rpackage + "." + rname); implist.sort(); VelocityContext ctx = new VelocityContext(); diff --git a/src/java/com/threerings/presents/util/ConfirmAdapter.java b/src/java/com/threerings/presents/util/ConfirmAdapter.java index 6e3dd9b96..0e5928981 100644 --- a/src/java/com/threerings/presents/util/ConfirmAdapter.java +++ b/src/java/com/threerings/presents/util/ConfirmAdapter.java @@ -21,11 +21,16 @@ package com.threerings.presents.util; +import com.samskivert.util.ResultListener; + import com.threerings.presents.client.InvocationService; +import com.threerings.presents.client.InvocationService.ConfirmListener; +import com.threerings.presents.data.InvocationCodes; +import com.threerings.presents.server.InvocationException; /** * Adapts the response from a {@link ResultListener} to a {@link ConfirmListener} if the failure is - * an instance fo {@link InvocationException} the message will be passed on to the confirm + * an instance of {@link InvocationException} the message will be passed on to the confirm * listener, otherwise they will be provided with {@link InvocationCodes#INTERNAL_ERROR}. */ public class ConfirmAdapter extends IgnoreConfirmAdapter diff --git a/src/java/com/threerings/presents/util/IgnoreConfirmAdapter.java b/src/java/com/threerings/presents/util/IgnoreConfirmAdapter.java index 6f1732946..b94e46f71 100644 --- a/src/java/com/threerings/presents/util/IgnoreConfirmAdapter.java +++ b/src/java/com/threerings/presents/util/IgnoreConfirmAdapter.java @@ -24,6 +24,7 @@ package com.threerings.presents.util; import com.samskivert.util.ResultListener; import com.threerings.presents.client.InvocationService; +import com.threerings.presents.client.InvocationService.ConfirmListener; import com.threerings.presents.data.InvocationCodes; import com.threerings.presents.server.InvocationException; diff --git a/tests/src/java/com/threerings/crowd/client/JabberClient.java b/tests/src/java/com/threerings/crowd/client/JabberClient.java index ebc50f2d7..4b1d00182 100644 --- a/tests/src/java/com/threerings/crowd/client/JabberClient.java +++ b/tests/src/java/com/threerings/crowd/client/JabberClient.java @@ -130,7 +130,7 @@ public class JabberClient } /** - * Creates the {@link JabberContext} implementation that will be + * Creates the {@link CrowdContext} implementation that will be * passed around to all of the client code. Derived classes may wish * to override this and create some extended context implementation. */ diff --git a/tests/src/java/com/threerings/presents/data/TestMarshaller.java b/tests/src/java/com/threerings/presents/data/TestMarshaller.java index 90ad7dd64..e7604bb53 100644 --- a/tests/src/java/com/threerings/presents/data/TestMarshaller.java +++ b/tests/src/java/com/threerings/presents/data/TestMarshaller.java @@ -37,7 +37,7 @@ public class TestMarshaller extends InvocationMarshaller implements TestService { /** - * Marshalls results to implementations of {@link TestFuncListener}. + * Marshalls results to implementations of {@link TestService.TestFuncListener}. */ public static class TestFuncMarshaller extends ListenerMarshaller implements TestFuncListener @@ -72,7 +72,7 @@ public class TestMarshaller extends InvocationMarshaller } /** - * Marshalls results to implementations of {@link TestOidListener}. + * Marshalls results to implementations of {@link TestService.TestOidListener}. */ public static class TestOidMarshaller extends ListenerMarshaller implements TestOidListener