[Freecol-commits] SF.net SVN: freecol:[9881] freecol/trunk/src/net/sf/freecol/server/ai/ AIColony.java

[<mp...@us...>]

Revision: 9881
          http://freecol.svn.sourceforge.net/freecol/?rev=9881&view=rev
Author:   mpope
Date:     2012-06-07 09:50:30 +0000 (Thu, 07 Jun 2012)
Log Message:
-----------
Quash over-generous raw material export.

Modified Paths:
--------------
    freecol/trunk/src/net/sf/freecol/server/ai/AIColony.java

Modified: freecol/trunk/src/net/sf/freecol/server/ai/AIColony.java
===================================================================
--- freecol/trunk/src/net/sf/freecol/server/ai/AIColony.java	2012-06-05 11:14:06 UTC (rev 9880)
+++ freecol/trunk/src/net/sf/freecol/server/ai/AIColony.java	2012-06-07 09:50:30 UTC (rev 9881)
@@ -61,6 +61,7 @@
 import net.sf.freecol.common.model.UnitWas;
 import net.sf.freecol.common.model.WorkLocation;
 import net.sf.freecol.common.networking.NetworkConstants;
+import net.sf.freecol.common.util.Utils;
 import net.sf.freecol.server.ai.mission.BuildColonyMission;
 import net.sf.freecol.server.ai.mission.DefendSettlementMission;
 import net.sf.freecol.server.ai.mission.IdleAtSettlementMission;
@@ -524,7 +525,7 @@
                     && !g.isBuildingMaterial()
                     && !g.isMilitaryGoods()
                     && !g.isTradeGoods()) {
-                    if (g.isRawMaterial() && produce.contains(g)) {
+                    if (g.isRawMaterial()) {
                         partExport.add(g);
                     } else {
                         fullExport.add(g);
@@ -753,7 +754,7 @@
         Goods goods = (ag == null) ? null : ag.getGoods();
         int amount = (goods == null) ? -1 : goods.getAmount();
         String type = (goods == null) ? "(null)"
-            : ag.getGoods().getType().toString().substring(12);
+            : Utils.lastPart(ag.getGoods().getType().getId(), ".");
         logger.finest(String.format("%-20s %-10s %s %s %s",
                 colony.getName(), action,
                 ((ag == null) ? "(null)" : ag.getId()),

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