From 1597fc938ac6ad3818dd696d852d5e76ada90e8f Mon Sep 17 00:00:00 2001 From: Jamie Doornbos Date: Fri, 23 May 2008 07:03:27 +0000 Subject: [PATCH] Regenerated vilya action script marshallers etc, preparing for abc build git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@604 c613c5cb-e716-0410-b11b-feb51c14d237 --- .../parlor/card/trick/client/TrickCardGameService.as | 3 --- .../card/trick/data/TrickCardGameMarshaller.as | 5 +---- .../com/threerings/parlor/client/ParlorReceiver.as | 1 - src/as/com/threerings/parlor/client/ParlorService.as | 6 ------ .../parlor/client/ParlorService_InviteListener.as | 12 ------------ src/as/com/threerings/parlor/client/TableService.as | 4 ---- .../com/threerings/parlor/data/ParlorMarshaller.as | 6 +----- .../parlor/data/ParlorMarshaller_InviteMarshaller.as | 9 --------- src/as/com/threerings/parlor/data/Table.as | 1 - src/as/com/threerings/parlor/data/TableMarshaller.as | 6 +----- src/as/com/threerings/whirled/client/SceneService.as | 9 --------- .../whirled/client/SceneService_SceneMoveListener.as | 10 +--------- .../com/threerings/whirled/data/SceneMarshaller.as | 10 +--------- .../data/SceneMarshaller_SceneMoveMarshaller.as | 9 +-------- .../threerings/whirled/spot/client/SpotService.as | 6 ------ .../threerings/whirled/spot/data/SpotMarshaller.as | 8 ++------ .../threerings/whirled/zone/client/ZoneService.as | 10 ---------- .../zone/client/ZoneService_ZoneMoveListener.as | 10 +--------- .../threerings/whirled/zone/data/ZoneMarshaller.as | 11 +---------- .../zone/data/ZoneMarshaller_ZoneMoveMarshaller.as | 9 +-------- 20 files changed, 11 insertions(+), 134 deletions(-) diff --git a/src/as/com/threerings/parlor/card/trick/client/TrickCardGameService.as b/src/as/com/threerings/parlor/card/trick/client/TrickCardGameService.as index db52c627..ebf16852 100644 --- a/src/as/com/threerings/parlor/card/trick/client/TrickCardGameService.as +++ b/src/as/com/threerings/parlor/card/trick/client/TrickCardGameService.as @@ -21,13 +21,10 @@ package com.threerings.parlor.card.trick.client { -import flash.utils.ByteArray; import com.threerings.io.TypedArray; import com.threerings.parlor.card.data.Card; -import com.threerings.parlor.card.trick.client.TrickCardGameService; import com.threerings.presents.client.Client; import com.threerings.presents.client.InvocationService; -import com.threerings.presents.client.InvocationService_InvocationListener; /** * An ActionScript version of the Java TrickCardGameService interface. diff --git a/src/as/com/threerings/parlor/card/trick/data/TrickCardGameMarshaller.as b/src/as/com/threerings/parlor/card/trick/data/TrickCardGameMarshaller.as index be770062..a4bcecc9 100644 --- a/src/as/com/threerings/parlor/card/trick/data/TrickCardGameMarshaller.as +++ b/src/as/com/threerings/parlor/card/trick/data/TrickCardGameMarshaller.as @@ -21,15 +21,12 @@ package com.threerings.parlor.card.trick.data { -import flash.utils.ByteArray; -import com.threerings.util.*; // for Float, Integer, etc. import com.threerings.io.TypedArray; - import com.threerings.parlor.card.data.Card; import com.threerings.parlor.card.trick.client.TrickCardGameService; import com.threerings.presents.client.Client; import com.threerings.presents.data.InvocationMarshaller; -import com.threerings.presents.data.InvocationMarshaller_ListenerMarshaller; +import com.threerings.util.Integer; /** * Provides the implementation of the {@link TrickCardGameService} interface diff --git a/src/as/com/threerings/parlor/client/ParlorReceiver.as b/src/as/com/threerings/parlor/client/ParlorReceiver.as index c10e80e8..5e19a155 100644 --- a/src/as/com/threerings/parlor/client/ParlorReceiver.as +++ b/src/as/com/threerings/parlor/client/ParlorReceiver.as @@ -25,7 +25,6 @@ import com.threerings.util.Name; import com.threerings.presents.client.InvocationReceiver; -import com.threerings.parlor.data.ParlorCodes; import com.threerings.parlor.game.data.GameConfig; /** diff --git a/src/as/com/threerings/parlor/client/ParlorService.as b/src/as/com/threerings/parlor/client/ParlorService.as index 7e497243..73644b80 100644 --- a/src/as/com/threerings/parlor/client/ParlorService.as +++ b/src/as/com/threerings/parlor/client/ParlorService.as @@ -21,17 +21,11 @@ package com.threerings.parlor.client { -import flash.utils.ByteArray; -import com.threerings.io.TypedArray; -import com.threerings.parlor.client.ParlorService; -import com.threerings.parlor.client.ParlorService_InviteListener; -import com.threerings.parlor.data.ParlorMarshaller_InviteMarshaller; import com.threerings.parlor.game.data.GameConfig; import com.threerings.presents.client.Client; import com.threerings.presents.client.InvocationService; import com.threerings.presents.client.InvocationService_ConfirmListener; import com.threerings.presents.client.InvocationService_InvocationListener; -import com.threerings.presents.data.InvocationMarshaller_ConfirmMarshaller; import com.threerings.util.Name; /** diff --git a/src/as/com/threerings/parlor/client/ParlorService_InviteListener.as b/src/as/com/threerings/parlor/client/ParlorService_InviteListener.as index 54ac8aee..1148e109 100644 --- a/src/as/com/threerings/parlor/client/ParlorService_InviteListener.as +++ b/src/as/com/threerings/parlor/client/ParlorService_InviteListener.as @@ -21,19 +21,7 @@ package com.threerings.parlor.client { -import flash.utils.ByteArray; -import com.threerings.util.*; // for Float, Integer, etc. -import com.threerings.io.TypedArray; - -import com.threerings.parlor.client.ParlorService; -import com.threerings.parlor.client.ParlorService_InviteListener; -import com.threerings.parlor.data.ParlorMarshaller_InviteMarshaller; -import com.threerings.parlor.game.data.GameConfig; -import com.threerings.presents.client.Client; -import com.threerings.presents.client.InvocationService_ConfirmListener; import com.threerings.presents.client.InvocationService_InvocationListener; -import com.threerings.presents.data.InvocationMarshaller_ConfirmMarshaller; -import com.threerings.util.Name; /** * An ActionScript version of the Java ParlorService_InviteListener interface. diff --git a/src/as/com/threerings/parlor/client/TableService.as b/src/as/com/threerings/parlor/client/TableService.as index 07352a68..34eac82d 100644 --- a/src/as/com/threerings/parlor/client/TableService.as +++ b/src/as/com/threerings/parlor/client/TableService.as @@ -21,16 +21,12 @@ package com.threerings.parlor.client { -import flash.utils.ByteArray; -import com.threerings.io.TypedArray; -import com.threerings.parlor.client.TableService; import com.threerings.parlor.data.TableConfig; import com.threerings.parlor.game.data.GameConfig; import com.threerings.presents.client.Client; import com.threerings.presents.client.InvocationService; import com.threerings.presents.client.InvocationService_InvocationListener; import com.threerings.presents.client.InvocationService_ResultListener; -import com.threerings.presents.data.InvocationMarshaller_ResultMarshaller; /** * An ActionScript version of the Java TableService interface. diff --git a/src/as/com/threerings/parlor/data/ParlorMarshaller.as b/src/as/com/threerings/parlor/data/ParlorMarshaller.as index 8a106254..a1b9e00b 100644 --- a/src/as/com/threerings/parlor/data/ParlorMarshaller.as +++ b/src/as/com/threerings/parlor/data/ParlorMarshaller.as @@ -21,13 +21,8 @@ package com.threerings.parlor.data { -import flash.utils.ByteArray; -import com.threerings.util.*; // for Float, Integer, etc. -import com.threerings.io.TypedArray; - import com.threerings.parlor.client.ParlorService; import com.threerings.parlor.client.ParlorService_InviteListener; -import com.threerings.parlor.data.ParlorMarshaller_InviteMarshaller; import com.threerings.parlor.game.data.GameConfig; import com.threerings.presents.client.Client; import com.threerings.presents.client.InvocationService_ConfirmListener; @@ -35,6 +30,7 @@ import com.threerings.presents.client.InvocationService_InvocationListener; import com.threerings.presents.data.InvocationMarshaller; import com.threerings.presents.data.InvocationMarshaller_ConfirmMarshaller; import com.threerings.presents.data.InvocationMarshaller_ListenerMarshaller; +import com.threerings.util.Integer; import com.threerings.util.Name; /** diff --git a/src/as/com/threerings/parlor/data/ParlorMarshaller_InviteMarshaller.as b/src/as/com/threerings/parlor/data/ParlorMarshaller_InviteMarshaller.as index b5f50f51..35a135cf 100644 --- a/src/as/com/threerings/parlor/data/ParlorMarshaller_InviteMarshaller.as +++ b/src/as/com/threerings/parlor/data/ParlorMarshaller_InviteMarshaller.as @@ -21,17 +21,8 @@ package com.threerings.parlor.data { -import flash.utils.ByteArray; -import com.threerings.util.*; // for Float, Integer, etc. -import com.threerings.io.TypedArray; - -import com.threerings.parlor.client.ParlorService; import com.threerings.parlor.client.ParlorService_InviteListener; -import com.threerings.parlor.game.data.GameConfig; -import com.threerings.presents.client.Client; -import com.threerings.presents.client.InvocationService; import com.threerings.presents.data.InvocationMarshaller_ListenerMarshaller; -import com.threerings.util.Name; /** * Marshalls instances of the ParlorService_InviteMarshaller interface. diff --git a/src/as/com/threerings/parlor/data/Table.as b/src/as/com/threerings/parlor/data/Table.as index be733810..db9bfbcf 100644 --- a/src/as/com/threerings/parlor/data/Table.as +++ b/src/as/com/threerings/parlor/data/Table.as @@ -36,7 +36,6 @@ import com.threerings.presents.dobj.DSet_Entry; import com.threerings.crowd.data.BodyObject; -import com.threerings.parlor.data.ParlorCodes; import com.threerings.parlor.game.data.GameConfig; /** diff --git a/src/as/com/threerings/parlor/data/TableMarshaller.as b/src/as/com/threerings/parlor/data/TableMarshaller.as index f16b1388..d15a279f 100644 --- a/src/as/com/threerings/parlor/data/TableMarshaller.as +++ b/src/as/com/threerings/parlor/data/TableMarshaller.as @@ -21,12 +21,7 @@ package com.threerings.parlor.data { -import flash.utils.ByteArray; -import com.threerings.util.*; // for Float, Integer, etc. -import com.threerings.io.TypedArray; - import com.threerings.parlor.client.TableService; -import com.threerings.parlor.data.TableConfig; import com.threerings.parlor.game.data.GameConfig; import com.threerings.presents.client.Client; import com.threerings.presents.client.InvocationService_InvocationListener; @@ -34,6 +29,7 @@ import com.threerings.presents.client.InvocationService_ResultListener; import com.threerings.presents.data.InvocationMarshaller; import com.threerings.presents.data.InvocationMarshaller_ListenerMarshaller; import com.threerings.presents.data.InvocationMarshaller_ResultMarshaller; +import com.threerings.util.Integer; /** * Provides the implementation of the {@link TableService} interface diff --git a/src/as/com/threerings/whirled/client/SceneService.as b/src/as/com/threerings/whirled/client/SceneService.as index ff79de19..bfb72848 100644 --- a/src/as/com/threerings/whirled/client/SceneService.as +++ b/src/as/com/threerings/whirled/client/SceneService.as @@ -21,17 +21,8 @@ package com.threerings.whirled.client { -import flash.utils.ByteArray; -import com.threerings.io.TypedArray; -import com.threerings.crowd.data.PlaceConfig; import com.threerings.presents.client.Client; import com.threerings.presents.client.InvocationService; -import com.threerings.presents.client.InvocationService_InvocationListener; -import com.threerings.whirled.client.SceneService; -import com.threerings.whirled.client.SceneService_SceneMoveListener; -import com.threerings.whirled.data.SceneMarshaller_SceneMoveMarshaller; -import com.threerings.whirled.data.SceneModel; -import com.threerings.whirled.data.SceneUpdate; /** * An ActionScript version of the Java SceneService interface. diff --git a/src/as/com/threerings/whirled/client/SceneService_SceneMoveListener.as b/src/as/com/threerings/whirled/client/SceneService_SceneMoveListener.as index 53de960d..91470293 100644 --- a/src/as/com/threerings/whirled/client/SceneService_SceneMoveListener.as +++ b/src/as/com/threerings/whirled/client/SceneService_SceneMoveListener.as @@ -21,18 +21,10 @@ package com.threerings.whirled.client { -import flash.utils.ByteArray; -import com.threerings.util.*; // for Float, Integer, etc. -import com.threerings.io.TypedArray; - import com.threerings.crowd.data.PlaceConfig; -import com.threerings.presents.client.Client; +import com.threerings.io.TypedArray; import com.threerings.presents.client.InvocationService_InvocationListener; -import com.threerings.whirled.client.SceneService; -import com.threerings.whirled.client.SceneService_SceneMoveListener; -import com.threerings.whirled.data.SceneMarshaller_SceneMoveMarshaller; import com.threerings.whirled.data.SceneModel; -import com.threerings.whirled.data.SceneUpdate; /** * An ActionScript version of the Java SceneService_SceneMoveListener interface. diff --git a/src/as/com/threerings/whirled/data/SceneMarshaller.as b/src/as/com/threerings/whirled/data/SceneMarshaller.as index 691542bb..1bab7169 100644 --- a/src/as/com/threerings/whirled/data/SceneMarshaller.as +++ b/src/as/com/threerings/whirled/data/SceneMarshaller.as @@ -21,19 +21,11 @@ package com.threerings.whirled.data { -import flash.utils.ByteArray; -import com.threerings.util.*; // for Float, Integer, etc. -import com.threerings.io.TypedArray; - -import com.threerings.crowd.data.PlaceConfig; import com.threerings.presents.client.Client; import com.threerings.presents.data.InvocationMarshaller; -import com.threerings.presents.data.InvocationMarshaller_ListenerMarshaller; +import com.threerings.util.Integer; import com.threerings.whirled.client.SceneService; import com.threerings.whirled.client.SceneService_SceneMoveListener; -import com.threerings.whirled.data.SceneMarshaller_SceneMoveMarshaller; -import com.threerings.whirled.data.SceneModel; -import com.threerings.whirled.data.SceneUpdate; /** * Provides the implementation of the {@link SceneService} interface diff --git a/src/as/com/threerings/whirled/data/SceneMarshaller_SceneMoveMarshaller.as b/src/as/com/threerings/whirled/data/SceneMarshaller_SceneMoveMarshaller.as index 4ee992f0..6e20cd42 100644 --- a/src/as/com/threerings/whirled/data/SceneMarshaller_SceneMoveMarshaller.as +++ b/src/as/com/threerings/whirled/data/SceneMarshaller_SceneMoveMarshaller.as @@ -21,17 +21,10 @@ package com.threerings.whirled.data { -import flash.utils.ByteArray; -import com.threerings.util.*; // for Float, Integer, etc. -import com.threerings.io.TypedArray; - import com.threerings.crowd.data.PlaceConfig; -import com.threerings.presents.client.Client; +import com.threerings.io.TypedArray; import com.threerings.presents.data.InvocationMarshaller_ListenerMarshaller; -import com.threerings.whirled.client.SceneService; import com.threerings.whirled.client.SceneService_SceneMoveListener; -import com.threerings.whirled.data.SceneModel; -import com.threerings.whirled.data.SceneUpdate; /** * Marshalls instances of the SceneService_SceneMoveMarshaller interface. diff --git a/src/as/com/threerings/whirled/spot/client/SpotService.as b/src/as/com/threerings/whirled/spot/client/SpotService.as index 7c496456..3a6a0283 100644 --- a/src/as/com/threerings/whirled/spot/client/SpotService.as +++ b/src/as/com/threerings/whirled/spot/client/SpotService.as @@ -21,16 +21,10 @@ package com.threerings.whirled.spot.client { -import flash.utils.ByteArray; -import com.threerings.io.TypedArray; import com.threerings.presents.client.Client; import com.threerings.presents.client.InvocationService; import com.threerings.presents.client.InvocationService_ConfirmListener; -import com.threerings.presents.client.InvocationService_InvocationListener; -import com.threerings.presents.data.InvocationMarshaller_ConfirmMarshaller; import com.threerings.whirled.client.SceneService_SceneMoveListener; -import com.threerings.whirled.data.SceneMarshaller_SceneMoveMarshaller; -import com.threerings.whirled.spot.client.SpotService; import com.threerings.whirled.spot.data.Location; /** diff --git a/src/as/com/threerings/whirled/spot/data/SpotMarshaller.as b/src/as/com/threerings/whirled/spot/data/SpotMarshaller.as index 2dba633b..5e668af7 100644 --- a/src/as/com/threerings/whirled/spot/data/SpotMarshaller.as +++ b/src/as/com/threerings/whirled/spot/data/SpotMarshaller.as @@ -21,19 +21,15 @@ package com.threerings.whirled.spot.data { -import flash.utils.ByteArray; -import com.threerings.util.*; // for Float, Integer, etc. -import com.threerings.io.TypedArray; - import com.threerings.presents.client.Client; import com.threerings.presents.client.InvocationService_ConfirmListener; import com.threerings.presents.data.InvocationMarshaller; import com.threerings.presents.data.InvocationMarshaller_ConfirmMarshaller; -import com.threerings.presents.data.InvocationMarshaller_ListenerMarshaller; +import com.threerings.util.Byte; +import com.threerings.util.Integer; import com.threerings.whirled.client.SceneService_SceneMoveListener; import com.threerings.whirled.data.SceneMarshaller_SceneMoveMarshaller; import com.threerings.whirled.spot.client.SpotService; -import com.threerings.whirled.spot.data.Location; /** * Provides the implementation of the {@link SpotService} interface diff --git a/src/as/com/threerings/whirled/zone/client/ZoneService.as b/src/as/com/threerings/whirled/zone/client/ZoneService.as index e624a7cd..3c279e4d 100644 --- a/src/as/com/threerings/whirled/zone/client/ZoneService.as +++ b/src/as/com/threerings/whirled/zone/client/ZoneService.as @@ -21,18 +21,8 @@ package com.threerings.whirled.zone.client { -import flash.utils.ByteArray; -import com.threerings.io.TypedArray; -import com.threerings.crowd.data.PlaceConfig; import com.threerings.presents.client.Client; import com.threerings.presents.client.InvocationService; -import com.threerings.presents.client.InvocationService_InvocationListener; -import com.threerings.whirled.data.SceneModel; -import com.threerings.whirled.data.SceneUpdate; -import com.threerings.whirled.zone.client.ZoneService; -import com.threerings.whirled.zone.client.ZoneService_ZoneMoveListener; -import com.threerings.whirled.zone.data.ZoneMarshaller_ZoneMoveMarshaller; -import com.threerings.whirled.zone.data.ZoneSummary; /** * An ActionScript version of the Java ZoneService interface. diff --git a/src/as/com/threerings/whirled/zone/client/ZoneService_ZoneMoveListener.as b/src/as/com/threerings/whirled/zone/client/ZoneService_ZoneMoveListener.as index 825c5e50..e8c17c0a 100644 --- a/src/as/com/threerings/whirled/zone/client/ZoneService_ZoneMoveListener.as +++ b/src/as/com/threerings/whirled/zone/client/ZoneService_ZoneMoveListener.as @@ -21,18 +21,10 @@ package com.threerings.whirled.zone.client { -import flash.utils.ByteArray; -import com.threerings.util.*; // for Float, Integer, etc. -import com.threerings.io.TypedArray; - import com.threerings.crowd.data.PlaceConfig; -import com.threerings.presents.client.Client; +import com.threerings.io.TypedArray; import com.threerings.presents.client.InvocationService_InvocationListener; import com.threerings.whirled.data.SceneModel; -import com.threerings.whirled.data.SceneUpdate; -import com.threerings.whirled.zone.client.ZoneService; -import com.threerings.whirled.zone.client.ZoneService_ZoneMoveListener; -import com.threerings.whirled.zone.data.ZoneMarshaller_ZoneMoveMarshaller; import com.threerings.whirled.zone.data.ZoneSummary; /** diff --git a/src/as/com/threerings/whirled/zone/data/ZoneMarshaller.as b/src/as/com/threerings/whirled/zone/data/ZoneMarshaller.as index a1283ce4..8cd85cd0 100644 --- a/src/as/com/threerings/whirled/zone/data/ZoneMarshaller.as +++ b/src/as/com/threerings/whirled/zone/data/ZoneMarshaller.as @@ -21,20 +21,11 @@ package com.threerings.whirled.zone.data { -import flash.utils.ByteArray; -import com.threerings.util.*; // for Float, Integer, etc. -import com.threerings.io.TypedArray; - -import com.threerings.crowd.data.PlaceConfig; import com.threerings.presents.client.Client; import com.threerings.presents.data.InvocationMarshaller; -import com.threerings.presents.data.InvocationMarshaller_ListenerMarshaller; -import com.threerings.whirled.data.SceneModel; -import com.threerings.whirled.data.SceneUpdate; +import com.threerings.util.Integer; import com.threerings.whirled.zone.client.ZoneService; import com.threerings.whirled.zone.client.ZoneService_ZoneMoveListener; -import com.threerings.whirled.zone.data.ZoneMarshaller_ZoneMoveMarshaller; -import com.threerings.whirled.zone.data.ZoneSummary; /** * Provides the implementation of the {@link ZoneService} interface diff --git a/src/as/com/threerings/whirled/zone/data/ZoneMarshaller_ZoneMoveMarshaller.as b/src/as/com/threerings/whirled/zone/data/ZoneMarshaller_ZoneMoveMarshaller.as index d3d49440..8678d6d0 100644 --- a/src/as/com/threerings/whirled/zone/data/ZoneMarshaller_ZoneMoveMarshaller.as +++ b/src/as/com/threerings/whirled/zone/data/ZoneMarshaller_ZoneMoveMarshaller.as @@ -21,18 +21,11 @@ package com.threerings.whirled.zone.data { -import flash.utils.ByteArray; -import com.threerings.util.*; // for Float, Integer, etc. -import com.threerings.io.TypedArray; - import com.threerings.crowd.data.PlaceConfig; -import com.threerings.presents.client.Client; +import com.threerings.io.TypedArray; import com.threerings.presents.data.InvocationMarshaller_ListenerMarshaller; import com.threerings.whirled.data.SceneModel; -import com.threerings.whirled.data.SceneUpdate; -import com.threerings.whirled.zone.client.ZoneService; import com.threerings.whirled.zone.client.ZoneService_ZoneMoveListener; -import com.threerings.whirled.zone.data.ZoneSummary; /** * Marshalls instances of the ZoneService_ZoneMoveMarshaller interface.