From: <th...@us...> - 2006-10-30 03:52:43
|
Revision: 1561 http://svn.sourceforge.net/pcgen/?rev=1561&view=rev Author: thpr Date: 2006-10-29 19:52:08 -0800 (Sun, 29 Oct 2006) Log Message: ----------- Some minor changes, mainly in exporttoken: Use Boolean.TRUE and Boolean.FALSE, not Boolean.valueOf(true), etc. Avoid .toString() on Objects which are already Strings Eliminate Generics issues Use Java 1.5 loops Make inner classes static where possible Use StringBuffer.append not String += String in loops Modified Paths: -------------- Trunk/pcgen/code/src/java/pcgen/gui/tabs/InfoNaturalWeapons.java Trunk/pcgen/code/src/java/pcgen/io/exporttoken/BonusToken.java Trunk/pcgen/code/src/java/pcgen/io/exporttoken/CheckToken.java Trunk/pcgen/code/src/java/pcgen/io/exporttoken/EqToken.java Trunk/pcgen/code/src/java/pcgen/io/exporttoken/EqTypeToken.java Trunk/pcgen/code/src/java/pcgen/io/exporttoken/FeatListToken.java Trunk/pcgen/code/src/java/pcgen/io/exporttoken/MovementToken.java Trunk/pcgen/code/src/java/pcgen/io/exporttoken/SkillToken.java Trunk/pcgen/code/src/java/pcgen/io/exporttoken/SkillpointsToken.java Trunk/pcgen/code/src/java/pcgen/io/exporttoken/SpellListToken.java Trunk/pcgen/code/src/java/pcgen/io/exporttoken/VarToken.java Trunk/pcgen/code/src/java/pcgen/io/exporttoken/WeaponToken.java Trunk/pcgen/code/src/java/pcgen/util/chooser/ChooserFactory.java Modified: Trunk/pcgen/code/src/java/pcgen/gui/tabs/InfoNaturalWeapons.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui/tabs/InfoNaturalWeapons.java 2006-10-30 02:27:02 UTC (rev 1560) +++ Trunk/pcgen/code/src/java/pcgen/gui/tabs/InfoNaturalWeapons.java 2006-10-30 03:52:08 UTC (rev 1561) @@ -345,9 +345,9 @@ newRow[3] = damage.toString(); // Damage - newRow[4] = Boolean.valueOf(false); // Excludes Weapons - newRow[5] = Boolean.valueOf(false); // Iterative BAB - newRow[6] = Boolean.valueOf(true); // Enabled + newRow[4] = Boolean.FALSE; // Excludes Weapons + newRow[5] = Boolean.FALSE; // Iterative BAB + newRow[6] = Boolean.TRUE; // Enabled tblModel.addRow(newRow); } } Modified: Trunk/pcgen/code/src/java/pcgen/io/exporttoken/BonusToken.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/io/exporttoken/BonusToken.java 2006-10-30 02:27:02 UTC (rev 1560) +++ Trunk/pcgen/code/src/java/pcgen/io/exporttoken/BonusToken.java 2006-10-30 03:52:08 UTC (rev 1561) @@ -35,8 +35,6 @@ import pcgen.persistence.lst.prereq.PreParserFactory; import pcgen.util.Logging; -import java.util.Iterator; -import java.util.List; import java.util.StringTokenizer; /** @@ -176,15 +174,9 @@ restOfBucket = bucket.substring(7); } - List aList = pc.getEquipmentOfType(restOfBucket, "", 1); - - if (!aList.isEmpty()) + for (Equipment eq : pc.getEquipmentOfType(restOfBucket, "", 1)) { - for (Iterator e = aList.iterator(); e.hasNext();) - { - Equipment eq = (Equipment) e.next(); - lastValue += eq.bonusTo(pc, aType, aName, true); - } + lastValue += eq.bonusTo(pc, aType, aName, true); } } else Modified: Trunk/pcgen/code/src/java/pcgen/io/exporttoken/CheckToken.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/io/exporttoken/CheckToken.java 2006-10-30 02:27:02 UTC (rev 1560) +++ Trunk/pcgen/code/src/java/pcgen/io/exporttoken/CheckToken.java 2006-10-30 03:52:08 UTC (rev 1561) @@ -62,21 +62,21 @@ String saveType = aTok.nextToken(); - String saveMods = ""; + StringBuffer saveMods = new StringBuffer(); while (aTok.hasMoreTokens()) { if (saveMods.length() > 0) { - saveMods += "."; + saveMods.append("."); } - saveMods += aTok.nextToken(); + saveMods.append(aTok.nextToken()); } if ("NAME".equals(saveMods)) { return getNameToken(saveType); } - return Delta.toString(getCheckToken(pc, saveType, saveMods)); + return Delta.toString(getCheckToken(pc, saveType, saveMods.toString())); } /** @@ -88,13 +88,8 @@ */ public static int getCheckToken(PlayerCharacter pc, String saveType, String saveMods) { - saveType = getNameToken(saveType); - - if ("".equals(saveMods)) - { - saveMods = "TOTAL"; - } - return pc.calculateSaveBonus(1, saveType, saveMods); + String type = getNameToken(saveType); + return pc.calculateSaveBonus(1, type, "".equals(saveMods) ? "TOTAL" : saveMods); } /** @@ -110,7 +105,7 @@ if ((i >= 0) && (i < SettingsHandler.getGame().getUnmodifiableCheckList().size())) { - saveType = SettingsHandler.getGame().getUnmodifiableCheckList().get(i).toString(); + return SettingsHandler.getGame().getUnmodifiableCheckList().get(i).toString(); } } catch (NumberFormatException e) Modified: Trunk/pcgen/code/src/java/pcgen/io/exporttoken/EqToken.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/io/exporttoken/EqToken.java 2006-10-30 02:27:02 UTC (rev 1560) +++ Trunk/pcgen/code/src/java/pcgen/io/exporttoken/EqToken.java 2006-10-30 03:52:08 UTC (rev 1561) @@ -26,7 +26,6 @@ package pcgen.io.exporttoken; import java.util.ArrayList; -import java.util.Iterator; import java.util.List; import java.util.StringTokenizer; @@ -47,7 +46,7 @@ /** Token Name */ public static final String TOKENNAME = "EQ"; private static String cachedString=null; - private static List cachedList=null; + private static List<Equipment> cachedList=null; private static int cachedSerial=0; private static PlayerCharacter cachedPC=null; @@ -116,7 +115,7 @@ // check to see if this was the same as the last list we were asked to export. // String comparatorString = tokenSource.split("[0-9]+")[0]; - List eqList = null; + List<Equipment> eqList = null; StringTokenizer aTok = null; int temp=-1; if (comparatorString.equals(cachedString) && pc==cachedPC && pc.getSerial()==cachedSerial) @@ -166,10 +165,9 @@ // Get the list of equipment - eqList = new ArrayList(); - for (Iterator e = pc.getEquipmentListInOutputOrder(merge).iterator(); e.hasNext();) + eqList = new ArrayList<Equipment>(); + for (Equipment eq : pc.getEquipmentListInOutputOrder(merge)) { - Equipment eq = (Equipment) e.next(); eqList.add(eq); } @@ -222,7 +220,7 @@ if ((temp >= 0) && (temp < eqList.size())) { - Equipment eq = (Equipment)eqList.get(temp); + Equipment eq = eqList.get(temp); retString = getEqToken(pc, eq, tempString, aTok); // Starting EQ.%.NAME.MAGIC,befTrue,aftTrue,befFalse,aftFalse treatment @@ -963,7 +961,7 @@ * @param type * @return List */ - public static List listNotType(PlayerCharacter pc, List eqList, String type) + public static List<Equipment> listNotType(PlayerCharacter pc, List<Equipment> eqList, String type) { return EquipmentUtilities.removeEqType(eqList, type); } @@ -975,7 +973,7 @@ * @param type * @return List */ - public static List listAddType(PlayerCharacter pc, List eqList, String type) + public static List<Equipment> listAddType(PlayerCharacter pc, List<Equipment> eqList, String type) { return pc.addEqType(eqList, type); } @@ -987,7 +985,7 @@ * @param type * @return List */ - public static List listIsType(PlayerCharacter pc, List eqList, String type) + public static List<Equipment> listIsType(PlayerCharacter pc, List<Equipment> eqList, String type) { return EquipmentUtilities.removeNotEqType(eqList, type); } Modified: Trunk/pcgen/code/src/java/pcgen/io/exporttoken/EqTypeToken.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/io/exporttoken/EqTypeToken.java 2006-10-30 02:27:02 UTC (rev 1560) +++ Trunk/pcgen/code/src/java/pcgen/io/exporttoken/EqTypeToken.java 2006-10-30 03:52:08 UTC (rev 1561) @@ -31,7 +31,6 @@ import pcgen.io.ExportHandler; import java.util.ArrayList; -import java.util.Iterator; import java.util.List; import java.util.StringTokenizer; @@ -69,13 +68,11 @@ } //Get List - List eqList = new ArrayList(); + List<Equipment> eqList = new ArrayList<Equipment>(); if ("Container".equals(token)) { - for (Iterator e = pc.getEquipmentListInOutputOrder(merge).iterator(); e.hasNext();) + for (Equipment eq : pc.getEquipmentListInOutputOrder(merge)) { - Equipment eq = (Equipment) e.next(); - if (eq.acceptsChildren()) { eqList.add(eq); @@ -128,7 +125,7 @@ if ((temp >= 0) && (temp < eqList.size())) { - Equipment eq = (Equipment)eqList.get(temp); + Equipment eq = eqList.get(temp); return getEqToken(pc, eq, tempString, aTok); } return ""; Modified: Trunk/pcgen/code/src/java/pcgen/io/exporttoken/FeatListToken.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/io/exporttoken/FeatListToken.java 2006-10-30 02:27:02 UTC (rev 1560) +++ Trunk/pcgen/code/src/java/pcgen/io/exporttoken/FeatListToken.java 2006-10-30 03:52:08 UTC (rev 1561) @@ -38,7 +38,7 @@ */ public String getToken(String tokenSource, PlayerCharacter pc, ExportHandler eh) { - String retString = ""; + StringBuffer retString = new StringBuffer(); delim = getDelimiter(tokenSource); @@ -62,13 +62,13 @@ } catch (StringIndexOutOfBoundsException e) { - return retString; + return ""; } } delim = ", "; - - int i = 0; + boolean needComma = false; + int dotpos = aString.indexOf('.'); String typeStr = ""; @@ -123,18 +123,18 @@ if ((aFeat.getVisibility() == Visibility.DEFAULT) || (aFeat.getVisibility() == Visibility.OUTPUT_ONLY)) { - if (i > 0) + if (needComma) { - retString += delim; + retString.append(delim); } + needComma = true; - retString += aFeat.qualifiedName(); - ++i; + retString.append(aFeat.qualifiedName()); } } } - return retString; + return retString.toString(); } protected String getDelimiter(final String tokenSource) Modified: Trunk/pcgen/code/src/java/pcgen/io/exporttoken/MovementToken.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/io/exporttoken/MovementToken.java 2006-10-30 02:27:02 UTC (rev 1560) +++ Trunk/pcgen/code/src/java/pcgen/io/exporttoken/MovementToken.java 2006-10-30 03:52:08 UTC (rev 1561) @@ -86,23 +86,23 @@ public static String getMovementToken(PlayerCharacter pc) { - String retString = ""; + StringBuffer retString = new StringBuffer(); boolean firstLine = true; for (int i = 0; i < pc.getNumberOfMovements(); i++) { if (!firstLine) { - retString += ", "; + retString.append(", "); } firstLine = false; - retString += (pc.getMovementType(i) + " "); - retString += getRateToken(pc, i); + retString.append(pc.getMovementType(i)).append(" "); + retString.append(getRateToken(pc, i)); } - return retString; + return retString.toString(); } public static String getRateToken(PlayerCharacter pc, int moveNumber) Modified: Trunk/pcgen/code/src/java/pcgen/io/exporttoken/SkillToken.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/io/exporttoken/SkillToken.java 2006-10-30 02:27:02 UTC (rev 1560) +++ Trunk/pcgen/code/src/java/pcgen/io/exporttoken/SkillToken.java 2006-10-30 03:52:08 UTC (rev 1561) @@ -529,7 +529,7 @@ * instances of this class are immutable. * */ - final protected class SkillDetails + final protected static class SkillDetails { /** The id of the skill - normally an index or a skill name. */ final protected String skillId; Modified: Trunk/pcgen/code/src/java/pcgen/io/exporttoken/SkillpointsToken.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/io/exporttoken/SkillpointsToken.java 2006-10-30 02:27:02 UTC (rev 1560) +++ Trunk/pcgen/code/src/java/pcgen/io/exporttoken/SkillpointsToken.java 2006-10-30 03:52:08 UTC (rev 1561) @@ -30,7 +30,6 @@ import pcgen.core.Skill; import pcgen.io.ExportHandler; -import java.util.Iterator; import java.util.StringTokenizer; /** @@ -98,10 +97,8 @@ { float usedPoints = 0; - for (Iterator it = pc.getClassList().iterator(); it.hasNext();) + for (PCClass pcClass : pc.getClassList()) { - PCClass pcClass = (PCClass) it.next(); - if (pcClass.getSkillPool(pc) > 0) { usedPoints += pcClass.getSkillPool(pc); @@ -119,26 +116,15 @@ public static int getUsedSkillPoints(PlayerCharacter pc) { float usedPoints = 0; - Skill aSkill; - - for (Iterator it = pc.getSkillList().iterator(); it.hasNext();) + for (Skill aSkill : pc.getSkillList()) { - aSkill = (Skill) it.next(); - if ((aSkill.getRank().doubleValue() > 0) || (aSkill.getOutputIndex() != 0)) { - float ranks; - String className; - String classRanks; - - for (Iterator it2 = aSkill.getRankList().iterator(); it2.hasNext();) + for (String classRanks : aSkill.getRankList()) { - classRanks = (String) it2.next(); - int index = classRanks.indexOf(':'); - className = classRanks.substring(0, index); - ranks = Float.valueOf(classRanks.substring(index + 1)).floatValue(); - + String className = classRanks.substring(0, index); + float ranks = Float.valueOf(classRanks.substring(index + 1)).floatValue(); PCClass pcClass = pc.getClassKeyed(className); usedPoints += (ranks * aSkill.costForPCClass(pcClass, pc)); Modified: Trunk/pcgen/code/src/java/pcgen/io/exporttoken/SpellListToken.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/io/exporttoken/SpellListToken.java 2006-10-30 02:27:02 UTC (rev 1560) +++ Trunk/pcgen/code/src/java/pcgen/io/exporttoken/SpellListToken.java 2006-10-30 03:52:08 UTC (rev 1561) @@ -53,7 +53,7 @@ * <code>SpellListTokenParams</code> is ... * */ - protected final class SpellListTokenParams + protected final static class SpellListTokenParams { private int classNum = 0; private int level = 0; Modified: Trunk/pcgen/code/src/java/pcgen/io/exporttoken/VarToken.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/io/exporttoken/VarToken.java 2006-10-30 02:27:02 UTC (rev 1560) +++ Trunk/pcgen/code/src/java/pcgen/io/exporttoken/VarToken.java 2006-10-30 03:52:08 UTC (rev 1561) @@ -84,30 +84,30 @@ StringTokenizer aTok = new StringTokenizer(tokenSource, "."); aTok.nextToken(); //this should be VAR - String varName = ""; + StringBuffer varName = new StringBuffer(); if (aTok.hasMoreElements()) { - varName = aTok.nextToken(); + varName.append(aTok.nextToken()); } while (aTok.hasMoreElements()) { - varName += "." + aTok.nextToken(); + varName.append(".").append(aTok.nextToken()); } if(isInt) { if(isSign) { - return Delta.toString(getIntVarToken(pc, varName, isMin)); + return Delta.toString(getIntVarToken(pc, varName.toString(), isMin)); } - return getIntVarToken(pc, varName, isMin) + ""; + return getIntVarToken(pc, varName.toString(), isMin) + ""; } if(isSign) { - return Delta.toString(getVarToken(pc, varName, isMin)); + return Delta.toString(getVarToken(pc, varName.toString(), isMin)); } - return getVarToken(pc, varName, isMin) + ""; + return getVarToken(pc, varName.toString(), isMin) + ""; } /** Modified: Trunk/pcgen/code/src/java/pcgen/io/exporttoken/WeaponToken.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/io/exporttoken/WeaponToken.java 2006-10-30 02:27:02 UTC (rev 1560) +++ Trunk/pcgen/code/src/java/pcgen/io/exporttoken/WeaponToken.java 2006-10-30 03:52:08 UTC (rev 1561) @@ -1882,7 +1882,7 @@ if (range > -1) { int rangeSize = eq.getRangeList(true, pc).size(); - int thisRange = Integer.parseInt(eq.getRangeList(true, pc).get(range).toString()); + int thisRange = Integer.parseInt(eq.getRangeList(true, pc).get(range)); int shortRange = SettingsHandler.getGame().getShortRangeDistance(); /* range here is an index that represents a number of range Modified: Trunk/pcgen/code/src/java/pcgen/util/chooser/ChooserFactory.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/util/chooser/ChooserFactory.java 2006-10-30 02:27:02 UTC (rev 1560) +++ Trunk/pcgen/code/src/java/pcgen/util/chooser/ChooserFactory.java 2006-10-30 03:52:08 UTC (rev 1561) @@ -49,7 +49,7 @@ public static ChooserInterface getChooserInstance() { try { - Class c = Class.forName(interfaceClassname); + Class<?> c = Class.forName(interfaceClassname); ChooserInterface ci = (ChooserInterface) c.newInstance(); return ci; } @@ -72,7 +72,7 @@ public static ChooserRadio getRadioInstance() { try { - Class c = Class.forName(radioInterfaceClassname); + Class<?> c = Class.forName(radioInterfaceClassname); ChooserRadio ci = (ChooserRadio) c.newInstance(); return ci; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |