[Freecol-developers] [PATCH 100/182] common: model: SimpleCombatModel: optimize list copy / aggregation

[enrico . weigelt]

From: "Enrico Weigelt, metux IT consult" <enrico.weig...@gr13.net>

---
 src/net/sf/freecol/common/model/SimpleCombatModel.java | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/net/sf/freecol/common/model/SimpleCombatModel.java 
b/src/net/sf/freecol/common/model/SimpleCombatModel.java
index a536559adcb..ed992f0ff23 100644
--- a/src/net/sf/freecol/common/model/SimpleCombatModel.java
+++ b/src/net/sf/freecol/common/model/SimpleCombatModel.java
@@ -298,9 +298,8 @@ public class SimpleCombatModel extends CombatModel {
         // Goods penalty always applies
         int goodsCount = attacker.getGoodsSpaceTaken();
         if (goodsCount > 0) {
-            result.addAll(transform(spec.getModifiers(Modifier.CARGO_PENALTY),
-                    alwaysTrue(),
-                    m -> new Modifier(m).setValue(m.getValue() * goodsCount)));
+            for (Modifier m : spec.getModifiers(Modifier.CARGO_PENALTY))
+                result.add(new Modifier(m).setValue(m.getValue() * 
goodsCount));
         }
     }
 
@@ -489,9 +488,8 @@ public class SimpleCombatModel extends CombatModel {
         // Cargo penalty always applies
         int goodsCount = defender.getVisibleGoodsCount();
         if (goodsCount > 0) {
-            result.addAll(transform(spec.getModifiers(Modifier.CARGO_PENALTY),
-                    alwaysTrue(),
-                    m -> new Modifier(m).setValue(m.getValue() * goodsCount)));
+            for (Modifier m : spec.getModifiers(Modifier.CARGO_PENALTY))
+                result.add(new Modifier(m).setValue(m.getValue() * 
goodsCount));
         }
     }
 
-- 
2.11.0.rc0.7.gbe5a750


------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, SlashDot.org! http://sdm.link/slashdot
_______________________________________________
Freecol-developers mailing list
Freecol-developers@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/freecol-developers