From df3be094a1cd6ebbbb596678bf4ce8de2ae2cbf1 Mon Sep 17 00:00:00 2001 From: jendave Date: Sat, 6 Aug 2011 03:52:00 +0000 Subject: [PATCH] - cleanups --- src/forge/Card.java | 4 +- src/forge/CardFactoryUtil.java | 53 +++++++++++--------------- src/forge/GameAction.java | 8 ++-- src/forge/Input_CombatDamage.java | 11 +++--- src/forge/Input_FirstStrikeDamage.java | 10 ++--- src/forge/TableModel.java | 4 +- 6 files changed, 40 insertions(+), 50 deletions(-) diff --git a/src/forge/Card.java b/src/forge/Card.java index 81bd8a433d1..2c56f73406b 100644 --- a/src/forge/Card.java +++ b/src/forge/Card.java @@ -820,9 +820,7 @@ public class Card extends MyObservable { public void addDamage(HashMap sourcesMap) { - Iterator> iter1 = sourcesMap.entrySet().iterator(); - while(iter1.hasNext()) { - Entry entry = iter1.next(); + for(Entry entry : sourcesMap.entrySet()) { this.addDamage(entry.getValue(), entry.getKey()); } diff --git a/src/forge/CardFactoryUtil.java b/src/forge/CardFactoryUtil.java index 7d2eed2ab84..7fb7f830fed 100644 --- a/src/forge/CardFactoryUtil.java +++ b/src/forge/CardFactoryUtil.java @@ -9,6 +9,7 @@ import java.util.Iterator; import java.util.Map; import java.util.Random; import java.util.StringTokenizer; +import java.util.Map.Entry; public class CardFactoryUtil { @@ -2994,10 +2995,8 @@ public class CardFactoryUtil { public static String getMostProminentCreatureType(CardList list) { Map map = new HashMap(); - String s = ""; - for(int i = 0; i < list.size(); i++) { - Card c = list.get(i); + for(Card c : list) { ArrayList typeList = c.getType(); for(String var:typeList) { @@ -3013,29 +3012,24 @@ public class CardFactoryUtil { int max = 0; String maxType = ""; - for(int i = 0; i < map.size(); i++) { - Iterator iter = map.keySet().iterator(); - while(iter.hasNext()) { - String type = iter.next(); - System.out.println(type + " - " + map.get(type)); - - if(max < map.get(type)) { - max = map.get(type); - maxType = type; - } + for(Entry entry : map.entrySet()){ + String type = entry.getKey(); + System.out.println(type + " - " + entry.getValue()); + + if(max < entry.getValue()) { + max = entry.getValue(); + maxType = type; } } - s = maxType; - return s; + + return maxType; } public static String getMostProminentColor(CardList list) { Map map = new HashMap(); - String s = ""; - for(int i = 0; i < list.size(); i++) { - Card c = list.get(i); + for(Card c : list) { ArrayList colorList = CardUtil.getColors(c); for(String color:colorList) { @@ -3049,21 +3043,18 @@ public class CardFactoryUtil { int max = 0; String maxColor = ""; - - for(int i = 0; i < map.size(); i++) { - Iterator iter = map.keySet().iterator(); - while(iter.hasNext()) { - String color = iter.next(); - System.out.println(color + " - " + map.get(color)); - - if(max < map.get(color)) { - max = map.get(color); - maxColor = color; - } + + for(Entry entry : map.entrySet()){ + String color = entry.getKey(); + System.out.println(color + " - " + entry.getValue()); + + if(max < entry.getValue()) { + max = entry.getValue(); + maxColor = color; } } - s = maxColor; - return s; + + return maxColor; } diff --git a/src/forge/GameAction.java b/src/forge/GameAction.java index dcfcdb7e9a4..4d6f484fa29 100644 --- a/src/forge/GameAction.java +++ b/src/forge/GameAction.java @@ -8,6 +8,7 @@ import java.util.Collections; import java.util.HashMap; import java.util.Iterator; import java.util.Random; +import java.util.Map.Entry; import javax.swing.JFrame; import javax.swing.JOptionPane; @@ -1375,11 +1376,10 @@ public class GameAction { //int totalDamage = 0; CardList list = new CardList(); - Iterator iter = map.keySet().iterator(); - while(iter.hasNext()) { - Card source = iter.next(); + for(Entry entry : map.entrySet()){ + Card source = entry.getKey(); list.add(source); - int damage = map.get(source); + int damage = entry.getValue(); int damageToAdd = damage; //AllZone.GameAction.addDamage(c, crd , assignedDamageMap.get(crd)); diff --git a/src/forge/Input_CombatDamage.java b/src/forge/Input_CombatDamage.java index df94dc81d6e..ac2c411dfd1 100644 --- a/src/forge/Input_CombatDamage.java +++ b/src/forge/Input_CombatDamage.java @@ -5,6 +5,7 @@ package forge; import java.util.ArrayList; import java.util.HashMap; import java.util.Iterator; +import java.util.Map.Entry; public class Input_CombatDamage extends Input { @@ -228,10 +229,10 @@ public class Input_CombatDamage extends Input { HashMap assignedDamageMap = c.getAssignedDamageHashMap(); HashMap damageMap = new HashMap(); - Iterator iter = assignedDamageMap.keySet().iterator(); - while(iter.hasNext()) { - Card crd = iter.next(); - //AllZone.GameAction.addDamage(c, crd , assignedDamageMap.get(crd)); + + for(Entry entry : assignedDamageMap.entrySet()){ + Card crd = entry.getKey(); + //AllZone.GameAction.addDamage(c, crd , entry.getValue()); /* for (String effect : AllZone.StateBasedEffects.getStateBasedMap().keySet() ) { Command com = GameActionUtil.commands.get(effect); @@ -241,7 +242,7 @@ public class Input_CombatDamage extends Input { GameActionUtil.executeCardStateEffects(); */ - damageMap.put(crd, assignedDamageMap.get(crd)); + damageMap.put(crd, entry.getValue()); } AllZone.GameAction.addDamage(c, damageMap); diff --git a/src/forge/Input_FirstStrikeDamage.java b/src/forge/Input_FirstStrikeDamage.java index 24026f56ff1..aafc3c1c017 100644 --- a/src/forge/Input_FirstStrikeDamage.java +++ b/src/forge/Input_FirstStrikeDamage.java @@ -5,6 +5,7 @@ package forge; import java.util.ArrayList; import java.util.HashMap; import java.util.Iterator; +import java.util.Map.Entry; //import java.util.ArrayList; //unused @@ -170,11 +171,10 @@ public class Input_FirstStrikeDamage extends Input { HashMap assignedDamageMap = c.getAssignedDamageHashMap(); HashMap damageMap = new HashMap(); - Iterator iter = assignedDamageMap.keySet().iterator(); - while(iter.hasNext()) { - Card crd = iter.next(); - //AllZone.GameAction.addDamage(c, crd , assignedDamageMap.get(crd)); - damageMap.put(crd, assignedDamageMap.get(crd)); + for(Entry entry : assignedDamageMap.entrySet()){ + Card crd = entry.getKey(); + //AllZone.GameAction.addDamage(c, crd , entry.getValue()); + damageMap.put(crd, entry.getValue()); } AllZone.GameAction.addDamage(c, damageMap); diff --git a/src/forge/TableModel.java b/src/forge/TableModel.java index fe6611d617d..5ad1adf1249 100644 --- a/src/forge/TableModel.java +++ b/src/forge/TableModel.java @@ -83,10 +83,10 @@ class TableModel extends AbstractTableModel { }//for - for(int j = 0; j < table.getColumnCount(); j++) { + /*for(int j = 0; j < table.getColumnCount(); j++) { column = table.getColumnModel().getColumn(j); //System.out.println("col Width:" + column.getPreferredWidth()); - } + }*/ } public void clear() {