Index: src/net/sf/freecol/client/gui/i18n/Messages.java
===================================================================
--- src/net/sf/freecol/client/gui/i18n/Messages.java (revision 10259)
+++ src/net/sf/freecol/client/gui/i18n/Messages.java (working copy)
@@ -43,6 +43,7 @@
import net.sf.freecol.common.model.Region.RegionType;
import net.sf.freecol.common.model.StringTemplate;
import net.sf.freecol.common.model.StringTemplate.TemplateType;
+import net.sf.freecol.common.model.Tension;
import net.sf.freecol.common.model.Unit;
import net.sf.freecol.common.model.UnitType;
import net.sf.freecol.common.option.Option;
@@ -666,6 +667,16 @@
}
/**
+ * Returns a string describing the given tension.
+ *
+ * @param tension The tension.
+ * @return A matching string.
+ */
+ public static String getTensionAsString(Tension tension) {
+ return message("tension." + tension.getKey());
+ }
+
+ /**
* Gets a string describing the number of turns left for a colony
* to finish building something.
*
Index: src/net/sf/freecol/common/model/IndianSettlement.java
===================================================================
--- src/net/sf/freecol/common/model/IndianSettlement.java (revision 10259)
+++ src/net/sf/freecol/common/model/IndianSettlement.java (working copy)
@@ -23,27 +23,21 @@
import java.util.Collections;
import java.util.Comparator;
import java.util.HashMap;
-import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Locale;
import java.util.Map.Entry;
import java.util.Random;
-import java.util.Set;
import java.util.logging.Logger;
-import net.sf.freecol.common.model.Goods;
-import net.sf.freecol.common.model.GoodsContainer;
-import net.sf.freecol.common.model.GoodsType;
-import net.sf.freecol.common.model.Settlement;
-import net.sf.freecol.common.util.Utils;
-
import javax.xml.stream.XMLStreamConstants;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
import javax.xml.stream.XMLStreamWriter;
+import net.sf.freecol.client.gui.i18n.Messages;
import net.sf.freecol.common.model.Tension.Level;
+import net.sf.freecol.common.util.Utils;
/**
@@ -581,7 +575,7 @@
*/
public String getShortAlarmLevelMessageId(Player player) {
return (!player.hasContacted(owner)) ? "tension.wary"
- : (hasContacted(player)) ? getAlarm(player).getKey()
+ : (hasContacted(player)) ?
Messages.getTensionAsString(getAlarm(player))
: "indianSettlement.tensionUnknown";
}
------------------------------------------------------------------------------
LogMeIn Central: Instant, anywhere, Remote PC access and management.
Stay in control, update software, and manage PCs from one command center
Diagnose problems and improve visibility into emerging IT issues
Automate, monitor and manage. Do more in less time with Central
http://p.sf.net/sfu/logmein12331_d2d
_______________________________________________
Freecol-developers mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freecol-developers
