29f06663c6
Various tweaks to get import ordering to match the ooo convention of putting java and javax imports first, then threerings imports.
...
* Add importGroups template variable, set to the two groups: one for java, one for threerings.
* Omit Client import the client-side generated code. This was removed some time ago.
* Omit the blanket int -> Integer replacement, this was only needed for the marshaller
* Add the as boxing imports when generating the marshaller (this gets the Integer import for int types in marshaller signatures)
* Change the templates to put space between each group of imports.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6677 542714f4-19e9-0310-aa3c-eee0fc999fb1
2011-07-06 21:06:55 +00:00
3d1f57c14e
Extend import grouping functionality to allow groups to be specified.
...
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6676 542714f4-19e9-0310-aa3c-eee0fc999fb1
2011-07-06 19:09:41 +00:00
3c340a6033
Extend AS boxing functionality to also allow getting the imports togetherf
...
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6675 542714f4-19e9-0310-aa3c-eee0fc999fb1
2011-07-06 19:08:08 +00:00
23614ac71f
Consolidate actionscript import munging, add Map conversion.
...
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6674 542714f4-19e9-0310-aa3c-eee0fc999fb1
2011-07-06 17:55:20 +00:00
455eb55d90
Fix actionscript build.
...
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6673 542714f4-19e9-0310-aa3c-eee0fc999fb1
2011-07-06 17:51:47 +00:00
0505a7508e
Provide a method to control whether we want to filter each incoming message.
...
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6672 542714f4-19e9-0310-aa3c-eee0fc999fb1
2011-07-01 02:18:27 +00:00
de6d2aac57
Cleanup and edge case handling for peer locking bits. The specific problem
...
we were seeing in Spiral Knights was something like peer A created a handler
for B's acquisition of a lock, but then C would hijack the acquisition and
A would be left waiting indefinitely for B's acquisition. Now the handler
can detect the hijacking and notify its listeners.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6671 542714f4-19e9-0310-aa3c-eee0fc999fb1
2011-06-29 20:38:03 +00:00
155c281b18
Remove and ignore Eclipse files in favor of letting people generate their own using m2eclipse
...
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6670 542714f4-19e9-0310-aa3c-eee0fc999fb1
2011-06-27 20:53:02 +00:00
123f72eadd
Add a counterpart for aspirin's Equalable for use in generation
...
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6669 542714f4-19e9-0310-aa3c-eee0fc999fb1
2011-06-25 00:18:42 +00:00
2bcf59d1db
Whoops, didn't mean to get those guys as well
...
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6668 542714f4-19e9-0310-aa3c-eee0fc999fb1
2011-06-24 20:14:42 +00:00
85262d498d
Bump to ooo-build 2.5 since the maven-ant-tasks jar 2.1 uses is no longer available
...
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6667 542714f4-19e9-0310-aa3c-eee0fc999fb1
2011-06-24 20:12:08 +00:00
2820d6797a
Allow subclasses to configure the lock timeout.
...
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6666 542714f4-19e9-0310-aa3c-eee0fc999fb1
2011-06-22 18:25:55 +00:00
7862ac090a
We shouldn't call disconnectedFromPeer if we don't have a nodeobj yet,
...
because we wouldn't have called connectedToPeer.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6665 542714f4-19e9-0310-aa3c-eee0fc999fb1
2011-06-22 18:16:40 +00:00
23e5d5421f
Prevent NPE.
...
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6664 542714f4-19e9-0310-aa3c-eee0fc999fb1
2011-06-22 00:58:37 +00:00
b2df3a1fb6
Only set the default access controller when registering dobjects without an access controller
...
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6663 542714f4-19e9-0310-aa3c-eee0fc999fb1
2011-06-21 22:14:22 +00:00
27d06d1569
One empty array is as good as another.
...
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6662 542714f4-19e9-0310-aa3c-eee0fc999fb1
2011-06-21 19:33:06 +00:00
8f63caef6e
Add a super-interface containing just isApplicable for NodeRequest and NodeAction to let findApplicableNodes be used on both.
...
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6661 542714f4-19e9-0310-aa3c-eee0fc999fb1
2011-06-18 22:47:23 +00:00
2873c31f45
ArrayUtil --> Arrays.
...
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6660 542714f4-19e9-0310-aa3c-eee0fc999fb1
2011-06-17 22:18:08 +00:00
52023608c8
Allow downstream and upstream messages to be compounded
...
A client can collect a bunch of messages into a CompoundUpstreamMessage, which are unpacked and
dispatched in order by the server. The server collects any messages sent while processing that
compound message into a CompoundDownstreamMessage, which is unpacked and dispatched by the client.
This allows the client to indicate that it's going to send enough messages that it'd blow out the
throttle, but that it's doing so intentionally.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6659 542714f4-19e9-0310-aa3c-eee0fc999fb1
2011-06-16 03:37:08 +00:00
604e11e93e
That should be public; other entities use those values.
...
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6658 542714f4-19e9-0310-aa3c-eee0fc999fb1
2011-06-14 20:06:38 +00:00
004bd2b516
Allow subclasses to override the default warning times.
...
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6657 542714f4-19e9-0310-aa3c-eee0fc999fb1
2011-06-14 19:57:49 +00:00
87d9137cf8
Less obtuse and easier to read list of import groups.
...
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6656 542714f4-19e9-0310-aa3c-eee0fc999fb1
2011-06-14 16:19:33 +00:00
82bf9dcd75
Make actionscript streamable sort and gorup the imports according to the aspirin convention. This doesn't yet accomodate imports that were added for non-generated blocks, but is very close to not requiring any postprocessing for the streamable who code, i.e. touchin mah filez
...
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6655 542714f4-19e9-0310-aa3c-eee0fc999fb1
2011-06-14 08:25:12 +00:00
e9099dc415
Fix the streamable task to coordinate properly between source headers and preambles.
...
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6654 542714f4-19e9-0310-aa3c-eee0fc999fb1
2011-06-14 05:34:13 +00:00
d2cdd54595
Add the signals library to IDEA's module file.
...
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6653 542714f4-19e9-0310-aa3c-eee0fc999fb1
2011-06-09 15:16:02 +00:00
96bca10e59
A bit less boilerplate in the toString helpers.
...
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6652 542714f4-19e9-0310-aa3c-eee0fc999fb1
2011-06-05 18:22:28 +00:00
dfe4c2d01f
These simple geometry primitives have been removed from narya to elsewhere.
...
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6651 542714f4-19e9-0310-aa3c-eee0fc999fb1
2011-06-03 00:23:42 +00:00
bdcc8cf6fd
Bunyan-style
...
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6650 542714f4-19e9-0310-aa3c-eee0fc999fb1
2011-06-02 23:02:38 +00:00
5b1e29432b
Being able to easily log is good.
...
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6649 542714f4-19e9-0310-aa3c-eee0fc999fb1
2011-06-02 22:36:04 +00:00
a27291b430
It's useful to have our own friendly, simple rectangles and points independent from the various graphics systems that may or may not be available (e.g. java.awt)
...
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6648 542714f4-19e9-0310-aa3c-eee0fc999fb1
2011-06-02 22:31:44 +00:00
d18e1590a8
We've already checked the type of the required service, so don't require another cast
...
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6647 542714f4-19e9-0310-aa3c-eee0fc999fb1
2011-06-02 17:30:51 +00:00
85feb943f9
samskivert 1.4 shipped, so we can depend upon't.
...
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6646 542714f4-19e9-0310-aa3c-eee0fc999fb1
2011-05-31 17:31:05 +00:00
0891dca5cf
Unused import
...
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6645 542714f4-19e9-0310-aa3c-eee0fc999fb1
2011-05-26 17:31:26 +00:00
9952456bdd
GHFM autolinkifies, but doesn't know to ignore the period.
...
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6644 542714f4-19e9-0310-aa3c-eee0fc999fb1
2011-05-26 17:31:24 +00:00
df87333935
Samskivert api docs are over at github now
...
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6643 542714f4-19e9-0310-aa3c-eee0fc999fb1
2011-05-26 17:31:23 +00:00
dbb6d5ce22
We can't be refreshing the peers that we just shut down because they
...
stopped updating.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6642 542714f4-19e9-0310-aa3c-eee0fc999fb1
2011-05-20 03:21:27 +00:00
3a2d9d4aee
Move addExistingImports from GenActionScriptStreamableTask to ActionScriptUtils
...
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6641 542714f4-19e9-0310-aa3c-eee0fc999fb1
2011-05-19 00:52:29 +00:00
d2dd8c5b5d
ActionScriptUtils.java:
...
- expose addImportAndGetShortType() and toSimpleName()
- public methods before protected ones
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6640 542714f4-19e9-0310-aa3c-eee0fc999fb1
2011-05-19 00:39:17 +00:00
522194e592
Run genservice with my last change to placate Bamboo.
...
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6639 542714f4-19e9-0310-aa3c-eee0fc999fb1
2011-05-10 19:43:44 +00:00
c0a194c3cc
Like the Java version, prevent superfluous whitespace from being generated from empty args lists.
...
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6638 542714f4-19e9-0310-aa3c-eee0fc999fb1
2011-05-10 18:57:19 +00:00
0891b9cc58
Speeling.
...
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6637 542714f4-19e9-0310-aa3c-eee0fc999fb1
2011-05-10 18:52:43 +00:00
d0bde9d84d
Because we have had cases where peers have become unresponsive without
...
actually disconnecting (due to EC2 woes, e.g.), let's try shutting down peers
if they haven't checked in for a while.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6636 542714f4-19e9-0310-aa3c-eee0fc999fb1
2011-05-04 20:58:29 +00:00
ca678f6df8
Use the newly relocated Interval.Factory.
...
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6635 542714f4-19e9-0310-aa3c-eee0fc999fb1
2011-04-27 20:43:11 +00:00
cdff0031fe
Same pattern here: minimize the weirding (by having createMarshallers look like
...
a non-weird function that just returns a useful value), and comment the
weirding (in this case, only in CustomClassStreamer.{read|write}Object, since
that's the only place where a race condition may occur.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6634 542714f4-19e9-0310-aa3c-eee0fc999fb1
2011-04-26 23:24:44 +00:00
10df7639b2
Let's test and set _marshallers in the same place, and add a comment explaining
...
our no synchronization at the cost of possibly doing some trivial extra work.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6633 542714f4-19e9-0310-aa3c-eee0fc999fb1
2011-04-26 23:10:10 +00:00
90e395c7bf
Instead of syncrhonizing, Ray suggests just setting the shared member variable last. This should also work for our purposes and saves the overhead of the actual synchronization.
...
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6632 542714f4-19e9-0310-aa3c-eee0fc999fb1
2011-04-26 22:43:39 +00:00
a7334345fd
We need to synchronize here. Otherwise, when we could be in the middle of initializing our marshallers, perhaps for another client on the same JVM, and continue on with our streaming thinking our marshallers are ready to go, only to find that they are, in fact, not yet ready to go.
...
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6631 542714f4-19e9-0310-aa3c-eee0fc999fb1
2011-04-26 22:24:45 +00:00
7faeb29c4f
Open ourselves up a bit, to let subclasses pass their own data through ObjectInputStream's handy clientProps functionality. A prime example: sending along an injection context to streamed objects.
...
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6630 542714f4-19e9-0310-aa3c-eee0fc999fb1
2011-04-22 15:58:45 +00:00
b4e8609a95
PresentsConnection does not check that its handler is non-null before
...
processing messages, so let's put a (logging) NOOP handler in place when we
disconnect it from the PresentsSession.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6629 542714f4-19e9-0310-aa3c-eee0fc999fb1
2011-04-20 23:31:49 +00:00
69f8f4ef88
Break sendSpeak out into a separate method so that we can override it.
...
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6628 542714f4-19e9-0310-aa3c-eee0fc999fb1
2011-04-20 23:30:12 +00:00
Jamie Doornbos