Some changes required for the new compiler.
- Import bleeding may be fixed, as I had to import a bunch of things I should have had to earlier. - NOW they make duplicate variable definitions bad (but without block scoping... yay). - Another hoopjump. git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@4233 542714f4-19e9-0310-aa3c-eee0fc999fb1
This commit is contained in:
@@ -30,9 +30,11 @@ import mx.collections.IList;
|
||||
import com.threerings.util.ClassUtil;
|
||||
import com.threerings.util.HashMap;
|
||||
|
||||
import com.threerings.presents.dobj.CompoundEvent;
|
||||
import com.threerings.presents.dobj.DEvent;
|
||||
import com.threerings.presents.dobj.DObject;
|
||||
import com.threerings.presents.dobj.DObjectManager;
|
||||
import com.threerings.presents.dobj.ObjectAccessError;
|
||||
import com.threerings.presents.dobj.ObjectDestroyedEvent;
|
||||
import com.threerings.presents.dobj.Subscriber;
|
||||
|
||||
@@ -214,8 +216,8 @@ public class ClientDObjectMgr
|
||||
}
|
||||
|
||||
} else if (obj is FailureResponse) {
|
||||
var oid :int = (obj as FailureResponse).getOid();
|
||||
notifyFailure(oid);
|
||||
var foid :int = (obj as FailureResponse).getOid();
|
||||
notifyFailure(foid);
|
||||
|
||||
} else if (obj is PongResponse) {
|
||||
_client.gotPong(obj as PongResponse);
|
||||
|
||||
@@ -14,6 +14,8 @@ import com.threerings.presents.dobj.DSet;
|
||||
import com.threerings.presents.dobj.EventListener;
|
||||
import com.threerings.presents.dobj.InvocationNotificationEvent;
|
||||
import com.threerings.presents.dobj.InvocationRequestEvent;
|
||||
import com.threerings.presents.dobj.InvocationResponseEvent;
|
||||
import com.threerings.presents.dobj.MessageEvent;
|
||||
import com.threerings.presents.dobj.ObjectAccessError;
|
||||
import com.threerings.presents.dobj.Subscriber;
|
||||
import com.threerings.presents.dobj.SubscriberAdapter;
|
||||
|
||||
@@ -25,6 +25,7 @@ import mx.utils.ObjectUtil;
|
||||
|
||||
import com.threerings.presents.dobj.DObject;
|
||||
import com.threerings.presents.dobj.DSet;
|
||||
import com.threerings.presents.dobj.DSet_Entry;
|
||||
|
||||
import com.threerings.io.ObjectInputStream;
|
||||
import com.threerings.io.ObjectOutputStream;
|
||||
|
||||
@@ -43,22 +43,19 @@ public class CompoundEvent extends DEvent
|
||||
public function CompoundEvent (
|
||||
target :DObject = null, omgr :DObjectManager = null)
|
||||
{
|
||||
if (target == null) {
|
||||
super();
|
||||
return;
|
||||
super((target == null) ? 0 : target.getOid());
|
||||
|
||||
if (target != null) {
|
||||
// sanity check
|
||||
if (omgr == null) {
|
||||
throw new ArgumentError(
|
||||
"Must receive non-null object manager reference");
|
||||
}
|
||||
|
||||
_omgr = omgr;
|
||||
_target = target;
|
||||
_events = new StreamableArrayList();
|
||||
}
|
||||
|
||||
super(target.getOid());
|
||||
|
||||
// sanity check
|
||||
if (omgr == null) {
|
||||
throw new ArgumentError(
|
||||
"Must receive non-null object manager reference");
|
||||
}
|
||||
|
||||
_omgr = omgr;
|
||||
_target = target;
|
||||
_events = new StreamableArrayList();
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user