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

Remove now spurious casts

Browse Source 
git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@873 ed5b42cb-e716-0410-a449-f6a68f950b19
This commit is contained in:
Dave Hoover
2010-01-13 19:20:13 +00:00
parent f0eaa44cab
commit fc187ae697
2 changed files with 14 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/java/com/threerings/media/tile/ObjectTileSet.java
+13 -21
View File
@@ -27,9 +27,8 @@ import com.samskivert.util.StringUtil;
import com.threerings.media.image.Colorization; import com.threerings.media.image.Colorization;
/** /**
* The object tileset supports the specification of object information for * The object tileset supports the specification of object information for object tiles in
* object tiles in addition to all of the features of the swiss army * addition to all of the features of the swiss army tileset.
* tileset.
* *
* @see ObjectTile * @see ObjectTile
*/ */
@@ -64,9 +63,8 @@ public class ObjectTileSet extends SwissArmyTileSet
public static final String LOW = "_LOW"; public static final String LOW = "_LOW";
/** /**
* Sets the widths (in unit tile count) of the objects in this * Sets the widths (in unit tile count) of the objects in this tileset. This must be
* tileset. This must be accompanied by a call to {@link * accompanied by a call to {@link #setObjectHeights}.
* #setObjectHeights}.
*/ */
public void setObjectWidths (int[] objectWidths) public void setObjectWidths (int[] objectWidths)
{ {
@@ -74,9 +72,8 @@ public class ObjectTileSet extends SwissArmyTileSet
} }
/** /**
* Sets the heights (in unit tile count) of the objects in this * Sets the heights (in unit tile count) of the objects in this tileset. This must be
* tileset. This must be accompanied by a call to {@link * accompanied by a call to {@link #setObjectWidths}.
* #setObjectWidths}.
*/ */
public void setObjectHeights (int[] objectHeights) public void setObjectHeights (int[] objectHeights)
{ {
@@ -108,8 +105,7 @@ public class ObjectTileSet extends SwissArmyTileSet
} }
/** /**
* Provides a set of colorization classes that apply to objects in * Provides a set of colorization classes that apply to objects in this tileset.
* this tileset.
*/ */
public void setColorizations (String[] zations) public void setColorizations (String[] zations)
{ {
@@ -150,8 +146,7 @@ public class ObjectTileSet extends SwissArmyTileSet
} }
/** /**
* Returns the x coordinate of the spot associated with the specified * Returns the x coordinate of the spot associated with the specified tile index.
* tile index.
*/ */
public int getXSpot (int tileIdx) public int getXSpot (int tileIdx)
{ {
@@ -159,8 +154,7 @@ public class ObjectTileSet extends SwissArmyTileSet
} }
/** /**
* Returns the y coordinate of the spot associated with the specified * Returns the y coordinate of the spot associated with the specified tile index.
* tile index.
*/ */
public int getYSpot (int tileIdx) public int getYSpot (int tileIdx)
{ {
@@ -168,8 +162,7 @@ public class ObjectTileSet extends SwissArmyTileSet
} }
/** /**
* Returns the orientation of the spot associated with the specified * Returns the orientation of the spot associated with the specified tile index.
* tile index.
*/ */
public int getSpotOrient (int tileIdx) public int getSpotOrient (int tileIdx)
{ {
@@ -177,8 +170,8 @@ public class ObjectTileSet extends SwissArmyTileSet
} }
/** /**
* Returns the list of constraints associated with the specified tile * Returns the list of constraints associated with the specified tile index, or
* index, or <code>null</code> if the index has no constraints. * <code>null</code> if the index has no constraints.
*/ */
public String[] getConstraints (int tileIdx) public String[] getConstraints (int tileIdx)
{ {
@@ -251,8 +244,7 @@ public class ObjectTileSet extends SwissArmyTileSet
otile.setPriority(_priorities[tileIndex]); otile.setPriority(_priorities[tileIndex]);
} }
if (_xspots != null) { if (_xspots != null) {
otile.setSpot(_xspots[tileIndex], _yspots[tileIndex], otile.setSpot(_xspots[tileIndex], _yspots[tileIndex], _sorients[tileIndex]);
_sorients[tileIndex]);
} }
if (_constraints != null) { if (_constraints != null) {
otile.setConstraints(_constraints[tileIndex]); otile.setConstraints(_constraints[tileIndex]);
src/java/com/threerings/miso/data/SparseMisoSceneModel.java
+1 -1
View File
@@ -459,7 +459,7 @@ public class SparseMisoSceneModel extends MisoSceneModel
model._sections = new StreamableHashIntMap<Section>(); model._sections = new StreamableHashIntMap<Section>();
for (Iterator<Section> iter = getSections(); iter.hasNext(); ) { for (Iterator<Section> iter = getSections(); iter.hasNext(); ) {
Section sect = iter.next(); Section sect = iter.next();
model.setSection((Section)sect.clone()); model.setSection(sect.clone());
} }
return model; return model;
} }