Whitespace
git-svn-id: svn+ssh://src.earth.threerings.net/vilya/trunk@985 c613c5cb-e716-0410-b11b-feb51c14d237
This commit is contained in:
@@ -132,8 +132,7 @@ public abstract class DropBoardView extends PuzzleBoardView
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Creates a new piece sprite and places it directly in its correct
|
* Creates a new piece sprite and places it directly in its correct position.
|
||||||
* position.
|
|
||||||
*/
|
*/
|
||||||
public void createPiece (int piece, int sx, int sy)
|
public void createPiece (int piece, int sx, int sy)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -62,19 +62,16 @@ public abstract class SpotSceneRuleSet implements NestableRuleSet
|
|||||||
// create EditablePortal instances when we see <portal>
|
// create EditablePortal instances when we see <portal>
|
||||||
digester.addRule(prefix + "/portal", new PortalCreateRule(this));
|
digester.addRule(prefix + "/portal", new PortalCreateRule(this));
|
||||||
digester.addRule(prefix + "/portal", new PortalFieldsRule());
|
digester.addRule(prefix + "/portal", new PortalFieldsRule());
|
||||||
digester.addSetNext(prefix + "/portal", "addPortal",
|
digester.addSetNext(prefix + "/portal", "addPortal", Portal.class.getName());
|
||||||
Portal.class.getName());
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Create a new instance of the Location class that should be used
|
* Create a new instance of the Location class that should be used with Portals.
|
||||||
* with Portals.
|
|
||||||
*/
|
*/
|
||||||
protected abstract Location createLocation ();
|
protected abstract Location createLocation ();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* A rule used to create the portal but also initialize the Location
|
* A rule used to create the portal but also initialize the Location property within it.
|
||||||
* property within it.
|
|
||||||
*/
|
*/
|
||||||
protected static class PortalCreateRule extends ObjectCreateRule
|
protected static class PortalCreateRule extends ObjectCreateRule
|
||||||
{
|
{
|
||||||
@@ -99,9 +96,8 @@ public abstract class SpotSceneRuleSet implements NestableRuleSet
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Set fields in the Portal, or in the Location object
|
* Set fields in the Portal, or in the Location object contained therein. If there are
|
||||||
* contained therein. If there are ambiguous attribute names then..
|
* ambiguous attribute names then...well. yeah.
|
||||||
* well. yeah.
|
|
||||||
*/
|
*/
|
||||||
protected static class PortalFieldsRule extends Rule
|
protected static class PortalFieldsRule extends Rule
|
||||||
{
|
{
|
||||||
@@ -129,16 +125,14 @@ public abstract class SpotSceneRuleSet implements NestableRuleSet
|
|||||||
container = portal;
|
container = portal;
|
||||||
|
|
||||||
} catch (NoSuchFieldException nsfe) {
|
} catch (NoSuchFieldException nsfe) {
|
||||||
// if we didn't find the field in the Portal, maybe it's
|
// if we didn't find the field in the Portal, maybe it's in the Location
|
||||||
// in the Location
|
|
||||||
try {
|
try {
|
||||||
field = locClass.getField(lname);
|
field = locClass.getField(lname);
|
||||||
container = loc;
|
container = loc;
|
||||||
|
|
||||||
} catch (NoSuchFieldException nsfe2) {
|
} catch (NoSuchFieldException nsfe2) {
|
||||||
digester.getLogger().warn(
|
digester.getLogger().warn(
|
||||||
"Skipping property '" + lname +
|
"Skipping property '" + lname + "' for which there is no field.");
|
||||||
"' for which there is no field.");
|
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user