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:
@@ -85,10 +85,10 @@ public class SpotSceneObject extends SceneObject
|
||||
* change. Proxied copies of this object (on clients) will apply the
|
||||
* value change when they received the attribute changed notification.
|
||||
*/
|
||||
public void setOccupantLocs (DSet<com.threerings.whirled.spot.data.SceneLocation> value)
|
||||
public void setOccupantLocs (DSet<SceneLocation> value)
|
||||
{
|
||||
requestAttributeChange(OCCUPANT_LOCS, value, this.occupantLocs);
|
||||
@SuppressWarnings("unchecked") DSet<com.threerings.whirled.spot.data.SceneLocation> clone =
|
||||
@SuppressWarnings("unchecked") DSet<SceneLocation> clone =
|
||||
(value == null) ? null : value.typedClone();
|
||||
this.occupantLocs = clone;
|
||||
}
|
||||
@@ -133,10 +133,10 @@ public class SpotSceneObject extends SceneObject
|
||||
* change. Proxied copies of this object (on clients) will apply the
|
||||
* value change when they received the attribute changed notification.
|
||||
*/
|
||||
public void setClusters (DSet<com.threerings.whirled.spot.data.Cluster> value)
|
||||
public void setClusters (DSet<Cluster> value)
|
||||
{
|
||||
requestAttributeChange(CLUSTERS, value, this.clusters);
|
||||
@SuppressWarnings("unchecked") DSet<com.threerings.whirled.spot.data.Cluster> clone =
|
||||
@SuppressWarnings("unchecked") DSet<Cluster> clone =
|
||||
(value == null) ? null : value.typedClone();
|
||||
this.clusters = clone;
|
||||
}
|
||||
|
||||
@@ -58,29 +58,25 @@ public class SpotDispatcher extends InvocationDispatcher<SpotMarshaller>
|
||||
switch (methodId) {
|
||||
case SpotMarshaller.CHANGE_LOCATION:
|
||||
((SpotProvider)provider).changeLocation(
|
||||
source,
|
||||
((Integer)args[0]).intValue(), (Location)args[1], (InvocationService.ConfirmListener)args[2]
|
||||
source, ((Integer)args[0]).intValue(), (Location)args[1], (InvocationService.ConfirmListener)args[2]
|
||||
);
|
||||
return;
|
||||
|
||||
case SpotMarshaller.CLUSTER_SPEAK:
|
||||
((SpotProvider)provider).clusterSpeak(
|
||||
source,
|
||||
(String)args[0], ((Byte)args[1]).byteValue()
|
||||
source, (String)args[0], ((Byte)args[1]).byteValue()
|
||||
);
|
||||
return;
|
||||
|
||||
case SpotMarshaller.JOIN_CLUSTER:
|
||||
((SpotProvider)provider).joinCluster(
|
||||
source,
|
||||
((Integer)args[0]).intValue(), (InvocationService.ConfirmListener)args[1]
|
||||
source, ((Integer)args[0]).intValue(), (InvocationService.ConfirmListener)args[1]
|
||||
);
|
||||
return;
|
||||
|
||||
case SpotMarshaller.TRAVERSE_PORTAL:
|
||||
((SpotProvider)provider).traversePortal(
|
||||
source,
|
||||
((Integer)args[0]).intValue(), ((Integer)args[1]).intValue(), ((Integer)args[2]).intValue(), (SceneService.SceneMoveListener)args[3]
|
||||
source, ((Integer)args[0]).intValue(), ((Integer)args[1]).intValue(), ((Integer)args[2]).intValue(), (SceneService.SceneMoveListener)args[3]
|
||||
);
|
||||
return;
|
||||
|
||||
|
||||
@@ -26,6 +26,7 @@ import com.threerings.presents.data.ClientObject;
|
||||
import com.threerings.presents.server.InvocationException;
|
||||
import com.threerings.presents.server.InvocationProvider;
|
||||
import com.threerings.whirled.client.SceneService;
|
||||
import com.threerings.whirled.spot.client.SpotService;
|
||||
import com.threerings.whirled.spot.data.Location;
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user