Commit Graph

6213 Commits

Author SHA1 Message Date
Charlie Groves 2268aae388 Handle primitive arrays
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6084 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-06-22 03:04:53 +00:00
Dave Hoover 3b266edcd6 That should be private.
If it's public, we try to shadow it in a subclass & wind up still
getting THIS one.

git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6083 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-06-18 23:40:16 +00:00
Dave Hoover c54c82da55 Slay some cyclopian variables.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6082 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-06-15 17:26:29 +00:00
Dave Hoover 9b1624ced6 Whitespace
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6081 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-06-15 17:26:27 +00:00
Dave Hoover 0583a92100 Speeling
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6080 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-06-15 17:26:26 +00:00
Michael Bayne 5a02c42c21 Use our standard loop idioms.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6079 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-06-14 23:30:47 +00:00
Andrzej Kapolka 129023182c Remove WeakListenerWrapper in favor of simply storing the WeakReference
directly in the array.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6078 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-06-14 20:12:16 +00:00
Andrzej Kapolka 06a7d265a7 Simplify the API by using a parameter to control whether we retain a weak or
strong reference to the listener.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6077 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-06-13 02:36:16 +00:00
Andrzej Kapolka 852c66497e Allow adding/removing listeners by weak reference so as not to prevent
garbage collection.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6076 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-06-12 01:15:22 +00:00
Dave Hoover b072941003 Whitespace
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6075 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-06-11 22:57:20 +00:00
Dave Hoover 1f292a5184 Fix syntax
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6074 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-06-11 22:57:19 +00:00
Ray Greenwell 22d586dc89 Use aspirin.swc.
Removed corelib and ooolib (aspirin) from our included libraries.
That ain't right. But they were also in the external libraries
and that seems to have been what was happening.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6073 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-06-09 20:47:49 +00:00
Andrzej Kapolka d7e5d3cf85 Broke out the places where we actually read from/write to the channels into
separate methods so that we can override them to do crazy stuff like simulate
latency/dropped packets for debugging.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6072 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-06-09 03:27:27 +00:00
Mike Thomas 079269a825 Handle short[]'s on the actionscript side of streaming. This gets a little ugly given the lack of a primitive short on the actionscript side...
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6071 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-06-08 01:37:08 +00:00
Mike Thomas 7101012413 A new type of general communication between peers - the NodeRequest - it's a lot like a NodeAction but produces a result which is sent back via the ResultListener.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6070 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-06-01 23:48:50 +00:00
Andrzej Kapolka 3c2c86da60 Use the InetAddress obtained for the TCP socket for the datagram
channel as well, instead of re-resolving the hostname.  This is because
we plan to use round-robin resolution for the game server, and I don't
want to chance getting different IPs for TCP and UDP.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6069 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-05-28 23:12:17 +00:00
Mike Thomas f7a828e0c4 Move this convenience method up here to the ClientObject because it's... well... convenient.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6068 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-05-27 20:29:12 +00:00
Charlie Groves 4ab52e1c1e Pull in imports from added methods and fields, and kill the extra space between fields
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6067 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-05-11 22:05:09 +00:00
Andrzej Kapolka 9043e99f7a Separated TCP and UDP bind hostnames (we want to be able to bind to the
wildcard address for TCP in order to accept connections on both the
public hostname and the internal hostname used for peers, but bind to the
public hostname for UDP because binding to the wildcard address seems to
cause problems receiving packets).


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6066 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-05-07 01:12:55 +00:00
Tom Conkling 45694bc0f0 This ActionScript constructor generator doesn't seem particularly useful, since it requires the developer to fill in the body
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6065 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-05-01 02:40:29 +00:00
Tom Conkling f2f88f5e3c Get rid of debugging code
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6064 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-05-01 02:37:31 +00:00
Tom Conkling f4bc4a2680 - Properly parse out ActionScript member variables, and insert them back into the generated code
- Eclipse keeps rejiggering my imports

git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6063 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-05-01 02:35:39 +00:00
Tom Conkling 98b63122d4 Properly handle getter and setter methods
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6062 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-05-01 00:38:34 +00:00
Mike Thomas 50fb782b03 Slightly scary change, but this makes Name more "correct" - Since equals() cares about the class of the Name and not just the normal string, make compareTo() care about that too. I've set it up so that the specific class of the Name has priority in the sort and thus all the "BuildingName" entries will group together.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6061 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-04-27 01:03:33 +00:00
Ray Greenwell 401e71fa51 Nixed this commented out alternate code.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6060 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-04-20 21:00:20 +00:00
Jamie Doornbos 19b6edcc98 Fix service generation for classes that use java.lang.Integer. Some day I will clean this up and fix the big TODO. It probably isn't actually that hard now I know more.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6059 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-04-19 18:58:54 +00:00
Ray Greenwell 406344529a Updated deprecated usage.
Added alternate implementation in comments. One copies the array,
the other creates two wrapper Lists.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6058 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-04-13 21:00:52 +00:00
Dave Hoover 6fe5ae9238 Include jar for JSR-250
The @Generated annotation showed up in JSR-250 and then was bundled into
Java 1.6. For those of us stuck in a 1.5 world, there's fortunately a
nice tiny little jar with the necessary classes, so slurp that in.

git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6057 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-04-08 21:24:35 +00:00
Ray Greenwell b34cf47668 Whoops.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6056 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-04-07 21:24:06 +00:00
Ray Greenwell 2f855ff35e When generating dobj files, add or remove the Generated import depending
on whether we need it.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6055 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-04-07 21:22:53 +00:00
Dave Hoover 4b61decebb Remove trailing whitespace/unused imports
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6054 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-04-07 20:32:47 +00:00
Dave Hoover fefff841c3 Fix typoo
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6053 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-04-07 20:32:46 +00:00
Ray Greenwell 528a9d1f66 @Generated, going stag (without a date).
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6052 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-04-07 16:12:43 +00:00
Ray Greenwell 4496ec9ae4 Mdb dislikes the date and points out that our tasks regenerate these
files every time, so it'll get in the way of version control. Mrmph.
So: make the date optional, and leave it out for now.

Other comments?


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6051 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-04-07 16:12:04 +00:00
Ray Greenwell 43e556fb59 @Generated annotation.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6050 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-04-07 05:33:54 +00:00
Ray Greenwell e5b45f2ef0 Add the @Generated annotation to Marshaller/Receiver classes
and various dobj bits. The @Generated annotation is "@Documented" and
retained at source only.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6049 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-04-07 05:32:11 +00:00
Charlie Groves d5d9b7f9ea RootDObjectManager already implements RunQueue and Executor
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6048 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-03-31 19:26:46 +00:00
Andrzej Kapolka bd6a35677a Track datagrams received out of order and missed datagrams.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6047 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-03-18 20:36:25 +00:00
Mike Thomas 5ecfff4bcb Some types of DSet may be okay with larger sizes before warning, break out the cutoff so we can override.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6046 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-03-18 16:49:38 +00:00
Michael Bayne 7eb35b5dc1 Some code hygiene.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6045 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-03-16 23:57:28 +00:00
Michael Bayne c77ff81160 Should be no harm in compiling against Guava instead of GC as they have the
exact same API. So if you ship with GC instead of Guava, nothing will break.

Eventually we'll want to ship with Guava instead of GC so that we can use
Guava-specific methods, but projects can make that switch at their leisure.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6044 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-03-16 23:52:58 +00:00
Michael Bayne 772cda0a58 Should be no harm in compiling against Guava instead of GC as they have the
exact same API. So if you ship with GC instead of Guava, nothing will break.

Eventually we'll want to ship with Guava instead of GC so that we can use
Guava-specific methods, but projects can make that switch at their leisure.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6043 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-03-16 23:52:54 +00:00
Ray Greenwell 90a6d78a3c Revert. We'll roll something together when Zell's not trying to release.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6042 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-02-22 20:26:31 +00:00
Ray Greenwell 90ff35b3a0 In theory, this should work as well to read strings.
It could be more effecient w/r/t generating garbage.

I would have just replaced readUTF() in ObjectInputStream and switch
us to unmodified-UTF8 for all streaming needs. Wouldn't that be
simpler?


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6041 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-02-22 20:03:45 +00:00
Par Winzell 42dbe1e11d Java's built-in read/writeUTF() methods in ObjectInput/OutputStream use 'Modified UTF-8' for its encoding, which is cleverly designed to be almost exactly like UTF-8, until it's not and it bites you in the behind. Two new methods read/writeUnmodifiedUTF() may be used when real UTF-8 is required. At the current time Narya provides no further wiring-in of this functionality. See Whirled for a brilliant hack that does make use of it.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6040 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-02-22 14:12:50 +00:00
Ray Greenwell cbaa8e480e Using finalizers like this is a bad idea. I did this years ago.
At least call super() in a finally block, but I'll see if this can
be cleaned.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6039 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-02-17 02:38:11 +00:00
Dave Hoover 83f71c606e @Override gets the point across
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6038 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-02-10 20:32:51 +00:00
Dave Hoover 3414612462 Nix unused imports
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6037 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-02-10 20:32:49 +00:00
Dave Hoover 3aff1b60b9 Pngcrush
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6036 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-02-10 20:32:44 +00:00
Michael Bayne 0b90f21fe3 No need for this null check. We already dereferenced _client earlier to obtain
our connection id.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6035 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-02-09 19:55:22 +00:00