Compare commits
3 Commits
vilya-1.7
...
vilya-1.7.1
| Author | SHA1 | Date | |
|---|---|---|---|
| d4a1665550 | |||
| 4b3598093c | |||
| b23d91cfd4 |
+1
-1
@@ -4,7 +4,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>com.threerings</groupId>
|
<groupId>com.threerings</groupId>
|
||||||
<artifactId>vilya-parent</artifactId>
|
<artifactId>vilya-parent</artifactId>
|
||||||
<version>1.7</version>
|
<version>1.7.1</version>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<artifactId>vilya</artifactId>
|
<artifactId>vilya</artifactId>
|
||||||
|
|||||||
@@ -22,9 +22,12 @@
|
|||||||
package com.threerings.whirled.spot.data;
|
package com.threerings.whirled.spot.data;
|
||||||
|
|
||||||
import java.awt.Rectangle;
|
import java.awt.Rectangle;
|
||||||
|
import java.io.IOException;
|
||||||
|
|
||||||
import com.samskivert.util.StringUtil;
|
import com.samskivert.util.StringUtil;
|
||||||
|
|
||||||
|
import com.threerings.io.ObjectInputStream;
|
||||||
|
import com.threerings.io.ObjectOutputStream;
|
||||||
import com.threerings.util.ActionScript;
|
import com.threerings.util.ActionScript;
|
||||||
|
|
||||||
import com.threerings.presents.dobj.DSet;
|
import com.threerings.presents.dobj.DSet;
|
||||||
@@ -48,6 +51,31 @@ public class Cluster extends Rectangle
|
|||||||
return _key;
|
return _key;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Writes our streamable fields. This is needed because we can no longer reflectively access the
|
||||||
|
* internals of java.awt.Rectangle.
|
||||||
|
*/
|
||||||
|
public void writeObject (ObjectOutputStream out)
|
||||||
|
throws IOException
|
||||||
|
{
|
||||||
|
out.writeInt(this.x);
|
||||||
|
out.writeInt(this.y);
|
||||||
|
out.writeInt(this.width);
|
||||||
|
out.writeInt(this.height);
|
||||||
|
out.writeInt(this.clusterOid);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Reads our streamable fields. This is needed because we can no longer reflectively access the
|
||||||
|
* internals of java.awt.Rectangle.
|
||||||
|
*/
|
||||||
|
public void readObject (ObjectInputStream in)
|
||||||
|
throws IOException, ClassNotFoundException
|
||||||
|
{
|
||||||
|
this.setBounds(in.readInt(), in.readInt(), in.readInt(), in.readInt());
|
||||||
|
this.clusterOid = in.readInt();
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@ActionScript(omit=true)
|
@ActionScript(omit=true)
|
||||||
public boolean equals (Object other)
|
public boolean equals (Object other)
|
||||||
|
|||||||
@@ -5,7 +5,7 @@
|
|||||||
<groupId>com.threerings</groupId>
|
<groupId>com.threerings</groupId>
|
||||||
<artifactId>vilya-parent</artifactId>
|
<artifactId>vilya-parent</artifactId>
|
||||||
<packaging>pom</packaging>
|
<packaging>pom</packaging>
|
||||||
<version>1.7</version>
|
<version>1.7.1</version>
|
||||||
|
|
||||||
<name>Vilya</name>
|
<name>Vilya</name>
|
||||||
<description>Facilities for making networked multiplayer games.</description>
|
<description>Facilities for making networked multiplayer games.</description>
|
||||||
@@ -34,7 +34,7 @@
|
|||||||
<connection>scm:git:git://github.com/threerings/vilya.git</connection>
|
<connection>scm:git:git://github.com/threerings/vilya.git</connection>
|
||||||
<developerConnection>scm:git:git@github.com:threerings/vilya.git</developerConnection>
|
<developerConnection>scm:git:git@github.com:threerings/vilya.git</developerConnection>
|
||||||
<url>https://github.com/threerings/vilya/</url>
|
<url>https://github.com/threerings/vilya/</url>
|
||||||
<tag>vilya-1.7</tag>
|
<tag>vilya-1.7.1</tag>
|
||||||
</scm>
|
</scm>
|
||||||
|
|
||||||
<modules>
|
<modules>
|
||||||
|
|||||||
Reference in New Issue
Block a user