Prune unneeded imports, nuke some unneeded casts, rerun code generators.
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@687 c613c5cb-e716-0410-b11b-feb51c14d237
This commit is contained in:
@@ -21,7 +21,6 @@
|
||||
|
||||
package com.threerings.parlor.card.client;
|
||||
|
||||
import com.threerings.parlor.card.client.CardGameReceiver;
|
||||
import com.threerings.parlor.card.data.Card;
|
||||
import com.threerings.parlor.card.data.Hand;
|
||||
import com.threerings.presents.client.InvocationDecoder;
|
||||
|
||||
@@ -22,7 +22,6 @@
|
||||
package com.threerings.parlor.card.server;
|
||||
|
||||
import com.threerings.parlor.card.client.CardGameDecoder;
|
||||
import com.threerings.parlor.card.client.CardGameReceiver;
|
||||
import com.threerings.parlor.card.data.Card;
|
||||
import com.threerings.parlor.card.data.Hand;
|
||||
import com.threerings.presents.data.ClientObject;
|
||||
|
||||
@@ -56,21 +56,19 @@ public class TrickCardGameDispatcher extends InvocationDispatcher<TrickCardGameM
|
||||
switch (methodId) {
|
||||
case TrickCardGameMarshaller.PLAY_CARD:
|
||||
((TrickCardGameProvider)provider).playCard(
|
||||
source,
|
||||
(Card)args[0], ((Integer)args[1]).intValue()
|
||||
source, (Card)args[0], ((Integer)args[1]).intValue()
|
||||
);
|
||||
return;
|
||||
|
||||
case TrickCardGameMarshaller.REQUEST_REMATCH:
|
||||
((TrickCardGameProvider)provider).requestRematch(
|
||||
source
|
||||
source
|
||||
);
|
||||
return;
|
||||
|
||||
case TrickCardGameMarshaller.SEND_CARDS_TO_PLAYER:
|
||||
((TrickCardGameProvider)provider).sendCardsToPlayer(
|
||||
source,
|
||||
((Integer)args[0]).intValue(), (Card[])args[1]
|
||||
source, ((Integer)args[0]).intValue(), (Card[])args[1]
|
||||
);
|
||||
return;
|
||||
|
||||
|
||||
@@ -22,6 +22,7 @@
|
||||
package com.threerings.parlor.card.trick.server;
|
||||
|
||||
import com.threerings.parlor.card.data.Card;
|
||||
import com.threerings.parlor.card.trick.client.TrickCardGameService;
|
||||
import com.threerings.presents.data.ClientObject;
|
||||
import com.threerings.presents.server.InvocationProvider;
|
||||
|
||||
|
||||
@@ -21,7 +21,6 @@
|
||||
|
||||
package com.threerings.parlor.client;
|
||||
|
||||
import com.threerings.parlor.client.ParlorReceiver;
|
||||
import com.threerings.parlor.game.data.GameConfig;
|
||||
import com.threerings.presents.client.InvocationDecoder;
|
||||
import com.threerings.util.Name;
|
||||
|
||||
@@ -59,29 +59,25 @@ public class ParlorDispatcher extends InvocationDispatcher<ParlorMarshaller>
|
||||
switch (methodId) {
|
||||
case ParlorMarshaller.CANCEL:
|
||||
((ParlorProvider)provider).cancel(
|
||||
source,
|
||||
((Integer)args[0]).intValue(), (InvocationService.InvocationListener)args[1]
|
||||
source, ((Integer)args[0]).intValue(), (InvocationService.InvocationListener)args[1]
|
||||
);
|
||||
return;
|
||||
|
||||
case ParlorMarshaller.INVITE:
|
||||
((ParlorProvider)provider).invite(
|
||||
source,
|
||||
(Name)args[0], (GameConfig)args[1], (ParlorService.InviteListener)args[2]
|
||||
source, (Name)args[0], (GameConfig)args[1], (ParlorService.InviteListener)args[2]
|
||||
);
|
||||
return;
|
||||
|
||||
case ParlorMarshaller.RESPOND:
|
||||
((ParlorProvider)provider).respond(
|
||||
source,
|
||||
((Integer)args[0]).intValue(), ((Integer)args[1]).intValue(), args[2], (InvocationService.InvocationListener)args[3]
|
||||
source, ((Integer)args[0]).intValue(), ((Integer)args[1]).intValue(), args[2], (InvocationService.InvocationListener)args[3]
|
||||
);
|
||||
return;
|
||||
|
||||
case ParlorMarshaller.START_SOLITAIRE:
|
||||
((ParlorProvider)provider).startSolitaire(
|
||||
source,
|
||||
(GameConfig)args[0], (InvocationService.ConfirmListener)args[1]
|
||||
source, (GameConfig)args[0], (InvocationService.ConfirmListener)args[1]
|
||||
);
|
||||
return;
|
||||
|
||||
|
||||
@@ -22,7 +22,6 @@
|
||||
package com.threerings.parlor.server;
|
||||
|
||||
import com.threerings.parlor.client.ParlorDecoder;
|
||||
import com.threerings.parlor.client.ParlorReceiver;
|
||||
import com.threerings.parlor.game.data.GameConfig;
|
||||
import com.threerings.presents.data.ClientObject;
|
||||
import com.threerings.presents.server.InvocationSender;
|
||||
|
||||
@@ -58,29 +58,25 @@ public class TableDispatcher extends InvocationDispatcher<TableMarshaller>
|
||||
switch (methodId) {
|
||||
case TableMarshaller.CREATE_TABLE:
|
||||
((TableProvider)provider).createTable(
|
||||
source,
|
||||
(TableConfig)args[0], (GameConfig)args[1], (InvocationService.ResultListener)args[2]
|
||||
source, (TableConfig)args[0], (GameConfig)args[1], (InvocationService.ResultListener)args[2]
|
||||
);
|
||||
return;
|
||||
|
||||
case TableMarshaller.JOIN_TABLE:
|
||||
((TableProvider)provider).joinTable(
|
||||
source,
|
||||
((Integer)args[0]).intValue(), ((Integer)args[1]).intValue(), (InvocationService.InvocationListener)args[2]
|
||||
source, ((Integer)args[0]).intValue(), ((Integer)args[1]).intValue(), (InvocationService.InvocationListener)args[2]
|
||||
);
|
||||
return;
|
||||
|
||||
case TableMarshaller.LEAVE_TABLE:
|
||||
((TableProvider)provider).leaveTable(
|
||||
source,
|
||||
((Integer)args[0]).intValue(), (InvocationService.InvocationListener)args[1]
|
||||
source, ((Integer)args[0]).intValue(), (InvocationService.InvocationListener)args[1]
|
||||
);
|
||||
return;
|
||||
|
||||
case TableMarshaller.START_TABLE_NOW:
|
||||
((TableProvider)provider).startTableNow(
|
||||
source,
|
||||
((Integer)args[0]).intValue(), (InvocationService.InvocationListener)args[1]
|
||||
source, ((Integer)args[0]).intValue(), (InvocationService.InvocationListener)args[1]
|
||||
);
|
||||
return;
|
||||
|
||||
|
||||
@@ -21,6 +21,7 @@
|
||||
|
||||
package com.threerings.parlor.server;
|
||||
|
||||
import com.threerings.parlor.client.TableService;
|
||||
import com.threerings.parlor.data.TableConfig;
|
||||
import com.threerings.parlor.game.data.GameConfig;
|
||||
import com.threerings.presents.client.InvocationService;
|
||||
|
||||
@@ -181,10 +181,10 @@ public class TourneyObject extends DObject
|
||||
* change. Proxied copies of this object (on clients) will apply the
|
||||
* value change when they received the attribute changed notification.
|
||||
*/
|
||||
public void setParticipants (DSet<com.threerings.parlor.tourney.data.Participant> value)
|
||||
public void setParticipants (DSet<Participant> value)
|
||||
{
|
||||
requestAttributeChange(PARTICIPANTS, value, this.participants);
|
||||
@SuppressWarnings("unchecked") DSet<com.threerings.parlor.tourney.data.Participant> clone =
|
||||
@SuppressWarnings("unchecked") DSet<Participant> clone =
|
||||
(value == null) ? null : value.typedClone();
|
||||
this.participants = clone;
|
||||
}
|
||||
|
||||
@@ -56,22 +56,19 @@ public class TourneyDispatcher extends InvocationDispatcher<TourneyMarshaller>
|
||||
switch (methodId) {
|
||||
case TourneyMarshaller.CANCEL:
|
||||
((TourneyProvider)provider).cancel(
|
||||
source,
|
||||
(InvocationService.ConfirmListener)args[0]
|
||||
source, (InvocationService.ConfirmListener)args[0]
|
||||
);
|
||||
return;
|
||||
|
||||
case TourneyMarshaller.JOIN:
|
||||
((TourneyProvider)provider).join(
|
||||
source,
|
||||
(InvocationService.ConfirmListener)args[0]
|
||||
source, (InvocationService.ConfirmListener)args[0]
|
||||
);
|
||||
return;
|
||||
|
||||
case TourneyMarshaller.LEAVE:
|
||||
((TourneyProvider)provider).leave(
|
||||
source,
|
||||
(InvocationService.ConfirmListener)args[0]
|
||||
source, (InvocationService.ConfirmListener)args[0]
|
||||
);
|
||||
return;
|
||||
|
||||
|
||||
@@ -21,6 +21,7 @@
|
||||
|
||||
package com.threerings.parlor.tourney.server;
|
||||
|
||||
import com.threerings.parlor.tourney.client.TourneyService;
|
||||
import com.threerings.presents.client.InvocationService;
|
||||
import com.threerings.presents.data.ClientObject;
|
||||
import com.threerings.presents.server.InvocationException;
|
||||
|
||||
@@ -57,8 +57,7 @@ public class TourniesDispatcher extends InvocationDispatcher<TourniesMarshaller>
|
||||
switch (methodId) {
|
||||
case TourniesMarshaller.CREATE_TOURNEY:
|
||||
((TourniesProvider)provider).createTourney(
|
||||
source,
|
||||
(TourneyConfig)args[0], (InvocationService.ResultListener)args[1]
|
||||
source, (TourneyConfig)args[0], (InvocationService.ResultListener)args[1]
|
||||
);
|
||||
return;
|
||||
|
||||
|
||||
@@ -21,6 +21,7 @@
|
||||
|
||||
package com.threerings.parlor.tourney.server;
|
||||
|
||||
import com.threerings.parlor.tourney.client.TourniesService;
|
||||
import com.threerings.parlor.tourney.data.TourneyConfig;
|
||||
import com.threerings.presents.client.InvocationService;
|
||||
import com.threerings.presents.data.ClientObject;
|
||||
|
||||
Reference in New Issue
Block a user