From: <oli...@us...> - 2007-12-02 10:40:49
|
Revision: 3302 http://freecol.svn.sourceforge.net/freecol/?rev=3302&view=rev Author: olivierschmitt Date: 2007-12-02 02:40:53 -0800 (Sun, 02 Dec 2007) Log Message: ----------- Fixed xml parsing issue related to ModelMessage display object/icon Modified Paths: -------------- freecol/trunk/src/net/sf/freecol/common/model/ModelMessage.java Modified: freecol/trunk/src/net/sf/freecol/common/model/ModelMessage.java =================================================================== --- freecol/trunk/src/net/sf/freecol/common/model/ModelMessage.java 2007-12-02 10:01:10 UTC (rev 3301) +++ freecol/trunk/src/net/sf/freecol/common/model/ModelMessage.java 2007-12-02 10:40:53 UTC (rev 3302) @@ -407,8 +407,10 @@ type = getAttribute(in, "type", DEFAULT); beenDisplayed = Boolean.parseBoolean(in.getAttributeValue(null, "hasBeenDisplayed")); - source = game.getFreeColGameObject(in.getAttributeValue(null, "type")); - String displayString = in.getAttributeValue(null, "source"); + String sourceString = in.getAttributeValue(null, "source"); + source = game.getFreeColGameObject(sourceString); + + String displayString = in.getAttributeValue(null, "display"); if (displayString != null) { if (game.getFreeColGameObject(displayString) != null) { display = game.getFreeColGameObject(displayString); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |