[Freecol-commits] SF.net SVN: freecol:[6654] freecol/branches/0.9.x/src/net/sf/freecol/client /gui/panel/ChoiceItem.java

[<and...@us...>]

Revision: 6654
          http://freecol.svn.sourceforge.net/freecol/?rev=6654&view=rev
Author:   andreala
Date:     2010-03-28 15:45:27 +0000 (Sun, 28 Mar 2010)

Log Message:
-----------
Partial backport of r6590 from Trunk. Fixing i18n in ChoiceItems for instances of AbstractGoods (test case: delivering gifts to naitives).

Modified Paths:
--------------
    freecol/branches/0.9.x/src/net/sf/freecol/client/gui/panel/ChoiceItem.java

Modified: freecol/branches/0.9.x/src/net/sf/freecol/client/gui/panel/ChoiceItem.java
===================================================================
--- freecol/branches/0.9.x/src/net/sf/freecol/client/gui/panel/ChoiceItem.java	2010-03-28 12:31:43 UTC (rev 6653)
+++ freecol/branches/0.9.x/src/net/sf/freecol/client/gui/panel/ChoiceItem.java	2010-03-28 15:45:27 UTC (rev 6654)
@@ -19,6 +19,11 @@
 
 package net.sf.freecol.client.gui.panel;
 
+import net.sf.freecol.client.gui.i18n.Messages;
+import net.sf.freecol.common.model.AbstractGoods;
+import net.sf.freecol.common.model.AbstractUnit;
+import net.sf.freecol.common.model.Player;
+
 /**
  * Can be used as a single choice for the
  * {@link FreeColDialog#createChoiceDialog(String, String, List) choice dialog}.
@@ -68,7 +73,12 @@
      *        choice.
      */
     public ChoiceItem(T object) {
-    	this(object.toString(), object, true);
+      this(Messages.message(object.toString()), object, true);
+      
+      // Check to see if we can improve upon object.toString()
+      if(object instanceof AbstractGoods) {
+          this.text = Messages.getLabel(((AbstractGoods)object).getType(), ((AbstractGoods)object).getAmount());
+      } 
     }
 
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.