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

Apparently EnumMap doesn't work with Retroweaver, so let's try

Browse Source 
using an array instead.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@5103 542714f4-19e9-0310-aa3c-eee0fc999fb1
This commit is contained in:
Andrzej Kapolka
2008-05-16 21:25:22 +00:00
parent 85b3b3114d
commit 817c7014b4
1 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/java/com/threerings/presents/net/Transport.java
+14 -11
View File
@@ -21,8 +21,6 @@
package com.threerings.presents.net; package com.threerings.presents.net;
import java.util.EnumMap;
import com.samskivert.util.HashIntMap; import com.samskivert.util.HashIntMap;
/** /**
@@ -141,23 +139,27 @@ public class Transport
// of instances and use Transport objects as keys (as in examples of the flyweight // of instances and use Transport objects as keys (as in examples of the flyweight
// pattern). however, doing it this way avoids the need to create a new object on lookup // pattern). however, doing it this way avoids the need to create a new object on lookup
if (_unordered == null) { if (_unordered == null) {
_unordered = new EnumMap<Type, Transport>(Type.class); int length = Type.values().length;
_ordered = new EnumMap<Type, HashIntMap<Transport>>(Type.class); _unordered = new Transport[length];
@SuppressWarnings("unchecked") HashIntMap<Transport>[] ordered =
(HashIntMap<Transport>[])new HashIntMap[length];
_ordered = ordered;
} }
// for unordered transport, we map on the type alone // for unordered transport, we map on the type alone
int idx = type.ordinal();
if (!type.isOrdered()) { if (!type.isOrdered()) {
Transport instance = _unordered.get(type); Transport instance = _unordered[idx];
if (instance == null) { if (instance == null) {
_unordered.put(type, instance = new Transport(type)); _unordered[idx] = instance = new Transport(type);
} }
return instance; return instance;
} }
// for ordered transport, we map on the type and channel // for ordered transport, we map on the type and channel
HashIntMap<Transport> instances = _ordered.get(type); HashIntMap<Transport> instances = _ordered[idx];
if (instances == null) { if (instances == null) {
_ordered.put(type, instances = new HashIntMap<Transport>()); _ordered[idx] = instances = new HashIntMap<Transport>();
} }
Transport instance = instances.get(channel); Transport instance = instances.get(channel);
if (instance == null) { if (instance == null) {
@@ -248,9 +250,10 @@ public class Transport
/** The transport channel. */ /** The transport channel. */
protected int _channel; protected int _channel;
/** Unordered instances mapped by type. */ /** Unordered instances mapped by type (would use {@link java.util.EnumMap}, but it doesn't
protected static EnumMap<Type, Transport> _unordered; * work with Retroweaver). */
protected static Transport[] _unordered;
/** Ordered instances mapped by type and channel. */ /** Ordered instances mapped by type and channel. */
protected static EnumMap<Type, HashIntMap<Transport>> _ordered; protected static HashIntMap<Transport>[] _ordered;
} }