AfflictionNetworks/narya
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Behold, TAPOAFTSM! The Awesome Power Of A Fully Type-Safe Mothership.

Browse Source 
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@4246 542714f4-19e9-0310-aa3c-eee0fc999fb1
This commit is contained in:
Michael Bayne
2006-07-05 00:56:16 +00:00
parent 8afd0316ec
commit bdadd2377e
10 changed files with 91 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/java/com/threerings/crowd/client/LocationDirector.java
+20 -20
View File
@@ -47,7 +47,7 @@ import com.threerings.crowd.util.CrowdContext;
* before actually issuing the request.
*/
public class LocationDirector extends BasicDirector
implements LocationCodes, Subscriber, LocationReceiver,
implements LocationCodes, Subscriber<PlaceObject>, LocationReceiver,
LocationService.MoveListener
{
/**
@@ -217,13 +217,12 @@ public class LocationDirector extends BasicDirector
* @return true if everyone is happy with the move, false if it was
* vetoed by one of the location observers.
*/
public boolean mayMoveTo (final int placeId, ResultListener rl)
public boolean mayMoveTo (final int placeId, ResultListener<Object> rl)
{
final boolean[] vetoed = new boolean[1];
_observers.apply(new ObserverOp() {
public boolean apply (Object obs) {
LocationObserver lobs = (LocationObserver)obs;
vetoed[0] = (vetoed[0] || !lobs.locationMayChange(placeId));
_observers.apply(new ObserverOp<LocationObserver>() {
public boolean apply (LocationObserver obs) {
vetoed[0] = (vetoed[0] || !obs.locationMayChange(placeId));
return true;
}
});
@@ -380,10 +379,10 @@ public class LocationDirector extends BasicDirector
super.clientDidLogon(client);
// subscribe to our body object
Subscriber sub = new Subscriber() {
public void objectAvailable (DObject object)
Subscriber<BodyObject> sub = new Subscriber<BodyObject>() {
public void objectAvailable (BodyObject object)
{
gotBodyObject((BodyObject)object);
gotBodyObject(object);
}
public void requestFailed (int oid, ObjectAccessException cause)
@@ -474,10 +473,10 @@ public class LocationDirector extends BasicDirector
* Called when we receive the place object to which we subscribed
* after a successful moveTo request.
*/
public void objectAvailable (DObject object)
public void objectAvailable (PlaceObject object)
{
// yay, we have our new place object
_plobj = (PlaceObject)object;
_plobj = object;
// let the place controller know that we're ready to roll
if (_controller != null) {
@@ -559,9 +558,9 @@ public class LocationDirector extends BasicDirector
protected void notifyFailure (final int placeId, final String reason)
{
_observers.apply(new ObserverOp() {
public boolean apply (Object obs) {
((LocationObserver)obs).locationChangeFailed(placeId, reason);
_observers.apply(new ObserverOp<LocationObserver>() {
public boolean apply (LocationObserver obs) {
obs.locationChangeFailed(placeId, reason);
return true;
}
});
@@ -585,8 +584,8 @@ public class LocationDirector extends BasicDirector
protected LocationService _lservice;
/** Our location observer list. */
protected ObserverList _observers =
new ObserverList(ObserverList.SAFE_IN_ORDER_NOTIFY);
protected ObserverList<LocationObserver> _observers =
new ObserverList<LocationObserver>(ObserverList.SAFE_IN_ORDER_NOTIFY);
/** The oid of the place we currently occupy. */
protected int _placeId = -1;
@@ -615,12 +614,13 @@ public class LocationDirector extends BasicDirector
/** A listener that wants to know if we succeeded or
* how we failed to move. */
protected ResultListener _moveListener;
protected ResultListener<Object> _moveListener;
/** The operation used to inform observers that the location changed. */
protected ObserverOp _didChangeOp = new ObserverOp() {
public boolean apply (Object obs) {
((LocationObserver)obs).locationDidChange(_plobj);
protected ObserverOp<LocationObserver> _didChangeOp =
new ObserverOp<LocationObserver>() {
public boolean apply (LocationObserver obs) {
obs.locationDidChange(_plobj);
return true;
}
};
src/java/com/threerings/crowd/client/OccupantDirector.java
+11 -11
View File
@@ -161,9 +161,9 @@ public class OccupantDirector extends BasicDirector
// now let the occupant observers know what's up
final OccupantInfo info = (OccupantInfo)event.getEntry();
_observers.apply(new ObserverList.ObserverOp() {
public boolean apply (Object observer) {
((OccupantObserver)observer).occupantEntered(info);
_observers.apply(new ObserverList.ObserverOp<OccupantObserver>() {
public boolean apply (OccupantObserver observer) {
observer.occupantEntered(info);
return true;
}
});
@@ -182,9 +182,9 @@ public class OccupantDirector extends BasicDirector
// now let the occupant observers know what's up
final OccupantInfo info = (OccupantInfo) event.getEntry();
final OccupantInfo oinfo = (OccupantInfo) event.getOldEntry();
_observers.apply(new ObserverList.ObserverOp() {
public boolean apply (Object observer) {
((OccupantObserver)observer).occupantUpdated(oinfo, info);
_observers.apply(new ObserverList.ObserverOp<OccupantObserver>() {
public boolean apply (OccupantObserver observer) {
observer.occupantUpdated(oinfo, info);
return true;
}
});
@@ -202,17 +202,17 @@ public class OccupantDirector extends BasicDirector
// let the occupant observers know what's up
final OccupantInfo oinfo = (OccupantInfo) event.getOldEntry();
_observers.apply(new ObserverList.ObserverOp() {
public boolean apply (Object observer) {
((OccupantObserver)observer).occupantLeft(oinfo);
_observers.apply(new ObserverList.ObserverOp<OccupantObserver>() {
public boolean apply (OccupantObserver observer) {
observer.occupantLeft(oinfo);
return true;
}
});
}
/** The occupant observers to keep abreast of occupant antics. */
protected ObserverList _observers =
new ObserverList(ObserverList.SAFE_IN_ORDER_NOTIFY);
protected ObserverList<OccupantObserver> _observers =
new ObserverList<OccupantObserver>(ObserverList.SAFE_IN_ORDER_NOTIFY);
/** The user's current location. */
protected PlaceObject _place;
src/java/com/threerings/crowd/client/PlaceController.java
+5 -6
View File
@@ -222,7 +222,7 @@ public abstract class PlaceController extends Controller
protected void addDelegate (PlaceControllerDelegate delegate)
{
if (_delegates == null) {
_delegates = new ArrayList();
_delegates = new ArrayList<PlaceControllerDelegate>();
}
_delegates.add(delegate);
}
@@ -243,7 +243,7 @@ public abstract class PlaceController extends Controller
if (_delegates != null) {
int dcount = _delegates.size();
for (int i = 0; i < dcount; i++) {
op.apply((PlaceControllerDelegate)_delegates.get(i));
op.apply(_delegates.get(i));
}
}
}
@@ -252,13 +252,12 @@ public abstract class PlaceController extends Controller
* Applies the supplied operation to the registered delegates that
* derive from the specified class.
*/
protected void applyToDelegates (Class dclass, DelegateOp op)
protected void applyToDelegates (Class<?> dclass, DelegateOp op)
{
if (_delegates != null) {
int dcount = _delegates.size();
for (int i = 0; i < dcount; i++) {
PlaceControllerDelegate delegate =
(PlaceControllerDelegate)_delegates.get(i);
PlaceControllerDelegate delegate = _delegates.get(i);
if (dclass.isAssignableFrom(delegate.getClass())) {
op.apply(delegate);
}
@@ -280,5 +279,5 @@ public abstract class PlaceController extends Controller
protected PlaceView _view;
/** A list of the delegates in use by this controller. */
protected ArrayList _delegates;
protected ArrayList<PlaceControllerDelegate> _delegates;
}