Menu
▾
▴
[pcgen-commit-svn] SF.net SVN: pcgen: [1513] Trunk/pcgen/code/src/java/pcgen
|
From: <th...@us...> - 2006-10-22 18:27:13
|
Revision: 1513
http://svn.sourceforge.net/pcgen/?rev=1513&view=rev
Author: thpr
Date: 2006-10-22 11:26:26 -0700 (Sun, 22 Oct 2006)
Log Message:
-----------
Change in PCGen core:
new Integer() calls to Integer.valueOf()
new Integer().intValue() to Integer.parseInt()
Integer does not require deep copy in clone() - Integer is immutable
Refactor out use of Integer when only intValue() is called - use int
Modified Paths:
--------------
Trunk/pcgen/code/src/java/pcgen/core/BioSet.java
Trunk/pcgen/code/src/java/pcgen/core/Equipment.java
Trunk/pcgen/code/src/java/pcgen/core/GameMode.java
Trunk/pcgen/code/src/java/pcgen/core/Globals.java
Trunk/pcgen/code/src/java/pcgen/core/PCClass.java
Trunk/pcgen/code/src/java/pcgen/core/PCTemplate.java
Trunk/pcgen/code/src/java/pcgen/core/PlayerCharacter.java
Trunk/pcgen/code/src/java/pcgen/core/Race.java
Trunk/pcgen/code/src/java/pcgen/core/Skill.java
Trunk/pcgen/code/src/java/pcgen/core/SpellSupport.java
Trunk/pcgen/code/src/java/pcgen/core/SubstitutionClass.java
Trunk/pcgen/code/src/java/pcgen/core/WeaponEquipment.java
Trunk/pcgen/code/src/java/pcgen/core/bonus/BonusObj.java
Trunk/pcgen/code/src/java/pcgen/core/bonus/MultiTagBonusObj.java
Trunk/pcgen/code/src/java/pcgen/core/chooser/SpellLevelChoiceManager.java
Trunk/pcgen/code/src/java/pcgen/core/spell/PCSpellTracker.java
Trunk/pcgen/code/src/java/pcgen/core/spell/Spell.java
Trunk/pcgen/code/src/java/pcgen/gui/ChooseSpellDialog.java
Trunk/pcgen/code/src/java/pcgen/gui/LstConverter.java
Trunk/pcgen/code/src/java/pcgen/gui/MainHP.java
Trunk/pcgen/code/src/java/pcgen/gui/MainSource.java
Trunk/pcgen/code/src/java/pcgen/gui/NewWeaponInfoDialog.java
Trunk/pcgen/code/src/java/pcgen/gui/PurchaseModeFrame.java
Trunk/pcgen/code/src/java/pcgen/gui/UIFactory.java
Trunk/pcgen/code/src/java/pcgen/gui/editor/ClassAbilityPanel.java
Trunk/pcgen/code/src/java/pcgen/gui/editor/ClassLevelPanel.java
Trunk/pcgen/code/src/java/pcgen/gui/editor/NaturalAttacksPanel.java
Trunk/pcgen/code/src/java/pcgen/gui/editor/SourceBasePanel.java
Trunk/pcgen/code/src/java/pcgen/gui/tabs/InfoClasses.java
Trunk/pcgen/code/src/java/pcgen/gui/tabs/InfoDomain.java
Trunk/pcgen/code/src/java/pcgen/gui/tabs/InfoEquipping.java
Trunk/pcgen/code/src/java/pcgen/gui/tabs/InfoGear.java
Trunk/pcgen/code/src/java/pcgen/gui/tabs/InfoNaturalWeapons.java
Trunk/pcgen/code/src/java/pcgen/gui/tabs/InfoRaces.java
Trunk/pcgen/code/src/java/pcgen/gui/tabs/InfoResources.java
Trunk/pcgen/code/src/java/pcgen/gui/tabs/InfoSkills.java
Trunk/pcgen/code/src/java/pcgen/gui/tabs/InfoSummary.java
Trunk/pcgen/code/src/java/pcgen/gui/tabs/InfoTempMod.java
Trunk/pcgen/code/src/java/pcgen/gui/tabs/InfoTemplates.java
Trunk/pcgen/code/src/java/pcgen/gui/tabs/spells/SpellModel.java
Trunk/pcgen/code/src/java/pcgen/gui/utils/JComboBoxEditor.java
Trunk/pcgen/code/src/java/pcgen/gui/utils/JTreeTable.java
Trunk/pcgen/code/src/java/pcgen/io/ExportHandler.java
Trunk/pcgen/code/src/java/pcgen/io/PCGIOHandler.java
Trunk/pcgen/code/src/java/pcgen/io/PCGVer0Parser.java
Trunk/pcgen/code/src/java/pcgen/io/PCGVer2Parser.java
Trunk/pcgen/code/src/java/pcgen/persistence/lst/LstSystemLoader.java
Trunk/pcgen/code/src/java/pcgen/util/PJEP.java
Modified: Trunk/pcgen/code/src/java/pcgen/core/BioSet.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/core/BioSet.java 2006-10-22 17:15:05 UTC (rev 1512)
+++ Trunk/pcgen/code/src/java/pcgen/core/BioSet.java 2006-10-22 18:26:26 UTC (rev 1513)
@@ -603,7 +603,7 @@
for (int ageBracket = 0; (ageBracket < ageSets.size()) && iter.hasNext(); ageBracket++)
{
final String tagValue = (String) iter.next();
- final SortedMap races = (SortedMap) ageSets.get(new Integer(ageBracket));
+ final SortedMap races = (SortedMap) ageSets.get(Integer.valueOf(ageBracket));
SortedMap tags = (SortedMap) races.get(aRaceName);
if (tags == null)
@@ -617,7 +617,7 @@
}
else
{
- final SortedMap races = (SortedMap) ageSets.get(new Integer(0));
+ final SortedMap races = (SortedMap) ageSets.get(Integer.valueOf(0));
SortedMap tags = (SortedMap) races.get(aRaceName);
if (tags == null)
@@ -916,7 +916,7 @@
{
if (key.startsWith(region + "."))
{
- final Integer setNum = new Integer(key.substring(region.length() + 1));
+ final Integer setNum = Integer.valueOf(key.substring(region.length() + 1));
final String value = ageMap.get(key);
final SortedMap<String, String> races = new TreeMap<String, String>();
races.put("AGESET", value);
Modified: Trunk/pcgen/code/src/java/pcgen/core/Equipment.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/core/Equipment.java 2006-10-22 17:15:05 UTC (rev 1512)
+++ Trunk/pcgen/code/src/java/pcgen/core/Equipment.java 2006-10-22 18:26:26 UTC (rev 1513)
@@ -160,17 +160,17 @@
private int numberEquipped = 0;
private Float containerWeightCapacity = new Float(0);
- private Integer containerReduceWeight = new Integer(0);
+ private Integer containerReduceWeight = Integer.valueOf(0);
private boolean containerConstantWeight = false;
private boolean d_acceptsChildren = false;
- private Integer acCheck = new Integer(0);
+ private Integer acCheck = Integer.valueOf(0);
private String fumbleRange = "";
// effective DR vales for Armor
- private Integer eDR = new Integer(-1);
- private Integer maxDex = new Integer(100);
- private Integer spellFailure = new Integer(0);
+ private Integer eDR = Integer.valueOf(-1);
+ private Integer maxDex = Integer.valueOf(100);
+ private Integer spellFailure = Integer.valueOf(0);
private WeaponEquipment theWeaponStats = null;
private boolean isOnlyNaturalWeapon = false;
@@ -211,7 +211,7 @@
private double qty = 0.0;
private double weightInPounds = 0.0;
- //private Integer acMod = new Integer(0);
+ //private Integer acMod = Integer.valueOf(0);
private int outputIndex = 0;
private int outputSubindex = 0;
private int slots = 1;
@@ -619,11 +619,11 @@
{
try
{
- acCheck = new Integer(aString);
+ acCheck = Integer.valueOf(aString);
}
catch (NumberFormatException nfe)
{
- acCheck = new Integer(0);
+ acCheck = Integer.valueOf(0);
}
}
@@ -1603,7 +1603,7 @@
mdex = 0;
}
- return new Integer(mdex);
+ return Integer.valueOf(mdex);
}
/**
@@ -2714,7 +2714,7 @@
check = 0;
}
- return new Integer(check);
+ return Integer.valueOf(check);
}
/**
@@ -3396,7 +3396,7 @@
check = 0;
}
- return new Integer(check);
+ return Integer.valueOf(check);
}
/**
@@ -4067,11 +4067,11 @@
{
try
{
- eDR = new Integer(aString);
+ eDR = Integer.valueOf(aString);
}
catch (NumberFormatException nfe)
{
- eDR = new Integer(0);
+ eDR = Integer.valueOf(0);
// ignore
}
@@ -4101,7 +4101,7 @@
fail = 0;
}
- return new Integer(fail);
+ return Integer.valueOf(fail);
}
/**
@@ -5052,8 +5052,8 @@
if (iOffs > 10)
{
- Integer acCombatBonus = new Integer(aString.substring(10, iOffs));
- acCombatBonus = new Integer(new Float(acCombatBonus.doubleValue() * mult).intValue());
+ Integer acCombatBonus = Integer.valueOf(aString.substring(10, iOffs));
+ acCombatBonus = Integer.valueOf(new Float(acCombatBonus.doubleValue() * mult).intValue());
aString = aString.substring(0, 10) + acCombatBonus.toString() + aString.substring(iOffs);
addBonusList(aString);
}
@@ -6423,7 +6423,7 @@
int dbon = (int) bonusTo(aPC, "COMBAT", "AC", true);
dbon += (int) bonusTo(aPC, "EQMARMOR", "ACBONUS", true);
- return new Integer(dbon);
+ return Integer.valueOf(dbon);
}
/**
@@ -6437,7 +6437,7 @@
{
final int mod = (int) bonusTo(aPC, "EQMARMOR", "AC", true) + (int) bonusTo(aPC, "COMBAT", "AC", true);
- return new Integer(mod);
+ return Integer.valueOf(mod);
}
//
@@ -7063,12 +7063,12 @@
try
{
- containerReduceWeight = new Integer(redString);
+ containerReduceWeight = Integer.valueOf(redString);
}
catch (NumberFormatException ex)
{
Logging.errorPrint("Error in CONTAINS line: " + aString);
- containerReduceWeight = new Integer(0);
+ containerReduceWeight = Integer.valueOf(0);
}
}
Modified: Trunk/pcgen/code/src/java/pcgen/core/GameMode.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/core/GameMode.java 2006-10-22 17:15:05 UTC (rev 1512)
+++ Trunk/pcgen/code/src/java/pcgen/core/GameMode.java 2006-10-22 18:26:26 UTC (rev 1513)
@@ -2195,7 +2195,7 @@
pointBuyStatCosts = new TreeMap<Integer, PointBuyCost>(new ComparableComparator());
}
abilityScoreCost = null;
- pointBuyStatCosts.put(new Integer(pbc.getStatValue()), pbc);
+ pointBuyStatCosts.put(Integer.valueOf(pbc.getStatValue()), pbc);
}
/**
Modified: Trunk/pcgen/code/src/java/pcgen/core/Globals.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/core/Globals.java 2006-10-22 17:15:05 UTC (rev 1512)
+++ Trunk/pcgen/code/src/java/pcgen/core/Globals.java 2006-10-22 18:26:26 UTC (rev 1513)
@@ -2670,7 +2670,7 @@
for (int i = min; i <= max; ++i)
{
- rollChoices[i - min + 1] = new Integer(i);
+ rollChoices[i - min + 1] = Integer.valueOf(i);
}
while (min <= max)
@@ -2681,7 +2681,7 @@
"Randomly generate a number between " + min + " and " + max + "." + Constants.s_LINE_SEP
+ "Select it from the box below.",
Globals.getGameModeHitPointText() + " for " + CoreUtility.ordinal(level) + " level of " + name,
- MessageType.INFORMATION, rollChoices, new Integer(roll));
+ MessageType.INFORMATION, rollChoices, Integer.valueOf(roll));
if ((selectedValue != null) && (selectedValue instanceof Integer))
{
Modified: Trunk/pcgen/code/src/java/pcgen/core/PCClass.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/core/PCClass.java 2006-10-22 17:15:05 UTC (rev 1512)
+++ Trunk/pcgen/code/src/java/pcgen/core/PCClass.java 2006-10-22 18:26:26 UTC (rev 1513)
@@ -2594,7 +2594,7 @@
* to the CALLING method to do that... protecting against bad coding
* is a bad practice.
*/
- levelsPerFeat = new Integer(-1); // -1 to indicate it's not a
+ levelsPerFeat = Integer.valueOf(-1); // -1 to indicate it's not a
// 'set' value, this is to avoid
// null pointer errors
}
@@ -6228,7 +6228,7 @@
}
}
- final Integer zeroInt = new Integer(0);
+ final Integer zeroInt = Integer.valueOf(0);
final int newLevel = level - 1;
if (level > 0) {
@@ -7504,7 +7504,7 @@
}
roll += ((int) aPC.getTotalBonusTo("HP", "CURRENTMAXPERLEVEL"));
- setHitPoint(aLevel - 1, new Integer(roll));
+ setHitPoint(aLevel - 1, Integer.valueOf(roll));
aPC.setCurrentHP(aPC.hitPoints());
}
@@ -7701,7 +7701,7 @@
for (int x = featAutos.size() - 1; x >= 0; --x)
{
StringTokenizer aTok = new StringTokenizer(featAutos.get(x), "|", false);
- final int level = new Integer(aTok.nextToken()).intValue();
+ final int level = Integer.parseInt(aTok.nextToken());
if (level == aLevel)
{
Modified: Trunk/pcgen/code/src/java/pcgen/core/PCTemplate.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/core/PCTemplate.java 2006-10-22 17:15:05 UTC (rev 1512)
+++ Trunk/pcgen/code/src/java/pcgen/core/PCTemplate.java 2006-10-22 18:26:26 UTC (rev 1513)
@@ -2174,7 +2174,7 @@
*/
public void setHands(final int newHands)
{
- hands = new Integer(newHands);
+ hands = Integer.valueOf(newHands);
}
/**
@@ -2193,7 +2193,7 @@
*/
public void setLegs(final int argLegs)
{
- legs = new Integer(argLegs);
+ legs = Integer.valueOf(argLegs);
}
/**
@@ -2211,7 +2211,7 @@
*/
public void setReach(final int newReach)
{
- reach = new Integer(newReach);
+ reach = Integer.valueOf(newReach);
}
/**
Modified: Trunk/pcgen/code/src/java/pcgen/core/PlayerCharacter.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/core/PlayerCharacter.java 2006-10-22 17:15:05 UTC (rev 1512)
+++ Trunk/pcgen/code/src/java/pcgen/core/PlayerCharacter.java 2006-10-22 18:26:26 UTC (rev 1513)
@@ -4213,7 +4213,7 @@
// Assume a max of 10 attack cycles
for (int total = 0; total < 10; ++total)
{
- ab.add(new Integer(0));
+ ab.add(Integer.valueOf(0));
}
// Some classes (like the Monk or Ranged Sniper) use
@@ -4231,7 +4231,7 @@
final int d = ab.get(c).intValue() + b;
// set new value for iteration
- ab.set(c, new Integer(d));
+ ab.set(c, Integer.valueOf(d));
if (c != 3)
{
@@ -5739,7 +5739,7 @@
adjustFeats(race.getBonusInitialFeats());
int totalLevels = this.getTotalLevels();
-// final Integer zero = new Integer(0);
+// final Integer zero = Integer.valueOf(0);
for ( PCClass pcClass : existingClasses )
{
@@ -10305,7 +10305,7 @@
for (int i = 0; i < iCount; ++i)
{
toClass.setHitPoint(iToLevel + i, fromClass.getHitPoint(iFromLevel + i));
- fromClass.setHitPoint(iFromLevel + i, new Integer(0));
+ fromClass.setHitPoint(iFromLevel + i, Integer.valueOf(0));
}
rebuildLists(toClass, fromClass, iCount, this);
Modified: Trunk/pcgen/code/src/java/pcgen/core/Race.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/core/Race.java 2006-10-22 17:15:05 UTC (rev 1512)
+++ Trunk/pcgen/code/src/java/pcgen/core/Race.java 2006-10-22 18:26:26 UTC (rev 1513)
@@ -50,9 +50,9 @@
private ArrayList<String> monCSkillList = null;
// TODO - Why do we need a hit point map in the race?
private HashMap<String, Integer> hitPointMap = new HashMap<String, Integer>();
- private Integer initMod = new Integer(0);
- private Integer naturalAC = new Integer(0);
- private Integer startingAC = new Integer(10);
+ private Integer initMod = Integer.valueOf(0);
+ private Integer naturalAC = Integer.valueOf(0);
+ private Integer startingAC = Integer.valueOf(10);
private String hitDieLock = Constants.EMPTY_STRING;
private String ageString = Constants.EMPTY_STRING;
private String bonusSkillList = Constants.EMPTY_STRING;
@@ -370,7 +370,7 @@
if (aHP == null)
{
- return new Integer(0);
+ return Integer.valueOf(0);
}
return aHP;
@@ -933,9 +933,6 @@
aRace.heightString = heightString;
aRace.weightString = weightString;
aRace.featList = featList;
- aRace.startingAC = new Integer(startingAC.intValue());
- aRace.naturalAC = new Integer(naturalAC.intValue());
- aRace.initMod = new Integer(initMod.intValue());
aRace.langNum = langNum;
aRace.initialSkillMultiplier = initialSkillMultiplier;
aRace.levelAdjustment = levelAdjustment;
@@ -1003,7 +1000,7 @@
for (int x = 0; x < hitDice; ++x)
{
- setHitPoint(x, new Integer(Globals.rollHP(min, max, getKeyName(), x + 1)));
+ setHitPoint(x, Integer.valueOf(Globals.rollHP(min, max, getKeyName(), x + 1)));
}
}
Modified: Trunk/pcgen/code/src/java/pcgen/core/Skill.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/core/Skill.java 2006-10-22 17:15:05 UTC (rev 1512)
+++ Trunk/pcgen/code/src/java/pcgen/core/Skill.java 2006-10-22 18:26:26 UTC (rev 1513)
@@ -1077,7 +1077,7 @@
int bonus = 0;
if (aPC == null)
{
- return new Integer(0);
+ return Integer.valueOf(0);
}
final int stat = SettingsHandler.getGame().getStatFromAbbrev(keyStat);
@@ -1145,7 +1145,7 @@
bonus += aPC.getVariableValue(aString, "").intValue();
}
- return new Integer(bonus);
+ return Integer.valueOf(bonus);
}
/**
Modified: Trunk/pcgen/code/src/java/pcgen/core/SpellSupport.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/core/SpellSupport.java 2006-10-22 17:15:05 UTC (rev 1512)
+++ Trunk/pcgen/code/src/java/pcgen/core/SpellSupport.java 2006-10-22 18:26:26 UTC (rev 1513)
@@ -84,7 +84,7 @@
public void putLevel(String tagType, String className, String spellName,
String spellLevel)
{
- Integer lvl = new Integer(-1);
+ Integer lvl = Integer.valueOf(-1);
try
{
lvl = Integer.parseInt(spellLevel);
Modified: Trunk/pcgen/code/src/java/pcgen/core/SubstitutionClass.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/core/SubstitutionClass.java 2006-10-22 17:15:05 UTC (rev 1512)
+++ Trunk/pcgen/code/src/java/pcgen/core/SubstitutionClass.java 2006-10-22 18:26:26 UTC (rev 1513)
@@ -62,7 +62,7 @@
levelArray.add(arg);
- final Integer level = new Integer(arg.substring(0, arg.indexOf("\t")));
+ final Integer level = Integer.valueOf(arg.substring(0, arg.indexOf("\t")));
modLevels.add(level);
}
@@ -92,9 +92,9 @@
for (String aLine : levelArray)
{
- final Integer modLevel = new Integer(aLine.substring(0, aLine.indexOf("\t")));
+ final int modLevel = Integer.parseInt(aLine.substring(0, aLine.indexOf("\t")));
- if (aLevel == modLevel.intValue())
+ if (aLevel == modLevel)
{
final PCClassLoader classLoader = new PCClassLoader();
classLoader.parseLine(aClass, aLine, tempSource);
@@ -113,7 +113,7 @@
*/
public boolean hasLevelArrayModsForLevel(final int aLevel)
{
- return modLevels.contains(new Integer(aLevel));
+ return modLevels.contains(Integer.valueOf(aLevel));
}
Modified: Trunk/pcgen/code/src/java/pcgen/core/WeaponEquipment.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/core/WeaponEquipment.java 2006-10-22 17:15:05 UTC (rev 1512)
+++ Trunk/pcgen/code/src/java/pcgen/core/WeaponEquipment.java 2006-10-22 18:26:26 UTC (rev 1513)
@@ -16,7 +16,7 @@
private Equipment theEquipment;
private String theDamage = "";
private String theDamageMod = "";
- private Integer theRange = new Integer(0);
+ private Integer theRange = Integer.valueOf(0);
private String theCritRange = "";
private int theCritMult = 0;
private String theRateOfFire = "";
@@ -197,7 +197,7 @@
if (aRange.length() != 0)
{
- myRange = new Integer(aRange);
+ myRange = Integer.valueOf(aRange);
}
}
@@ -237,7 +237,7 @@
r = 10;
}
- return new Integer(r);
+ return Integer.valueOf(r);
}
/**
@@ -383,7 +383,7 @@
weapon = (WeaponEquipment) super.clone();
weapon.theDamage = new String(theDamage);
weapon.theDamageMod = new String(theDamageMod);
- weapon.theRange = new Integer(theRange);
+ weapon.theRange = Integer.valueOf(theRange);
weapon.theCritRange = new String(theCritRange);
weapon.theCritMult = theCritMult;
weapon.theRateOfFire = new String(theRateOfFire);
Modified: Trunk/pcgen/code/src/java/pcgen/core/bonus/BonusObj.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/core/bonus/BonusObj.java 2006-10-22 17:15:05 UTC (rev 1512)
+++ Trunk/pcgen/code/src/java/pcgen/core/bonus/BonusObj.java 2006-10-22 18:26:26 UTC (rev 1513)
@@ -368,7 +368,7 @@
{
try
{
- bonusValue = new Integer(bValue);
+ bonusValue = Integer.valueOf(bValue);
}
catch (NumberFormatException e1)
{
Modified: Trunk/pcgen/code/src/java/pcgen/core/bonus/MultiTagBonusObj.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/core/bonus/MultiTagBonusObj.java 2006-10-22 17:15:05 UTC (rev 1512)
+++ Trunk/pcgen/code/src/java/pcgen/core/bonus/MultiTagBonusObj.java 2006-10-22 18:26:26 UTC (rev 1513)
@@ -42,7 +42,7 @@
{
if (getBonusTag(i).equals(token))
{
- addBonusInfo(new Integer(i));
+ addBonusInfo(Integer.valueOf(i));
return true;
}
Modified: Trunk/pcgen/code/src/java/pcgen/core/chooser/SpellLevelChoiceManager.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/core/chooser/SpellLevelChoiceManager.java 2006-10-22 17:15:05 UTC (rev 1512)
+++ Trunk/pcgen/code/src/java/pcgen/core/chooser/SpellLevelChoiceManager.java 2006-10-22 18:26:26 UTC (rev 1513)
@@ -60,7 +60,7 @@
{
try
{
- numberOfChoices = new Integer(choices.get(1)).intValue();
+ numberOfChoices = Integer.parseInt(choices.get(1));
}
catch (NumberFormatException e)
{
Modified: Trunk/pcgen/code/src/java/pcgen/core/spell/PCSpellTracker.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/core/spell/PCSpellTracker.java 2006-10-22 17:15:05 UTC (rev 1512)
+++ Trunk/pcgen/code/src/java/pcgen/core/spell/PCSpellTracker.java 2006-10-22 18:26:26 UTC (rev 1513)
@@ -70,7 +70,7 @@
}
Map<String, Integer> newMap = buildSpellInfoMap(key1, key2);
spellMap.put(key1, key2, newMap);
- spellSerialMap.put(key1, key2, new Integer(pc.getSerial()));
+ spellSerialMap.put(key1, key2, Integer.valueOf(pc.getSerial()));
return newMap;
}
Modified: Trunk/pcgen/code/src/java/pcgen/core/spell/Spell.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/core/spell/Spell.java 2006-10-22 17:15:05 UTC (rev 1512)
+++ Trunk/pcgen/code/src/java/pcgen/core/spell/Spell.java 2006-10-22 18:26:26 UTC (rev 1513)
@@ -544,7 +544,7 @@
levelInfo = new HashMap<String, Integer>();
}
- levelInfo.put(key, new Integer(level));
+ levelInfo.put(key, Integer.valueOf(level));
}
}
}
@@ -1036,7 +1036,7 @@
public boolean isLevel(final int aLevel, final PlayerCharacter aPC)
{
final Map<String, Integer> wLevelInfo = getLevelInfo(aPC);
- final Integer levelKey = new Integer(aLevel);
+ final Integer levelKey = Integer.valueOf(aLevel);
for (String key : wLevelInfo.keySet())
{
if (wLevelInfo.get(key).equals(levelKey))
Modified: Trunk/pcgen/code/src/java/pcgen/gui/ChooseSpellDialog.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/gui/ChooseSpellDialog.java 2006-10-22 17:15:05 UTC (rev 1512)
+++ Trunk/pcgen/code/src/java/pcgen/gui/ChooseSpellDialog.java 2006-10-22 18:26:26 UTC (rev 1513)
@@ -230,7 +230,7 @@
}
else
{
- cmbCasterLevel.setSelectedItem(new Integer(casterLevel));
+ cmbCasterLevel.setSelectedItem(Integer.valueOf(casterLevel));
}
if (lblCasterLevel.isEnabled() != bEnabled)
@@ -1341,7 +1341,7 @@
for (int i = minimumLevel; i < levelList.size(); ++i)
{
- levelsForCasting[i] = new Integer(levelList.get(i));
+ levelsForCasting[i] = Integer.valueOf(levelList.get(i));
}
}
else
@@ -1350,7 +1350,7 @@
for (int i = minimumLevel; i <= maxLevel; i++)
{
- levelsForCasting[i - minimumLevel] = new Integer(i);
+ levelsForCasting[i - minimumLevel] = Integer.valueOf(i);
}
}
@@ -1363,7 +1363,7 @@
for (int i = 1; i <= 20; i++)
{
- levelsForCasting[i - 1] = new Integer(i);
+ levelsForCasting[i - 1] = Integer.valueOf(i);
}
cmbCasterLevel.setModel(new DefaultComboBoxModel(levelsForCasting));
Modified: Trunk/pcgen/code/src/java/pcgen/gui/LstConverter.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/gui/LstConverter.java 2006-10-22 17:15:05 UTC (rev 1512)
+++ Trunk/pcgen/code/src/java/pcgen/gui/LstConverter.java 2006-10-22 18:26:26 UTC (rev 1513)
@@ -1058,7 +1058,7 @@
return;
}
- final Integer i = new Integer(aValue.toString());
+ final Integer i = Integer.valueOf(aValue.toString());
switch (columnIndex)
{
@@ -1119,18 +1119,18 @@
final int x = lstTypeList.get(rowIndex);
- return new Integer(x);
+ return Integer.valueOf(x);
case 3:
int ok = okList.get(rowIndex);
- return new Integer(ok);
+ return Integer.valueOf(ok);
case 4:
ok = doneList.get(rowIndex);
- return new Integer(ok);
+ return Integer.valueOf(ok);
default:
Logging.errorPrint("In LstConverter.LstTableModel.getValueAt the column " + columnIndex
Modified: Trunk/pcgen/code/src/java/pcgen/gui/MainHP.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/gui/MainHP.java 2006-10-22 17:15:05 UTC (rev 1512)
+++ Trunk/pcgen/code/src/java/pcgen/gui/MainHP.java 2006-10-22 18:26:26 UTC (rev 1513)
@@ -179,7 +179,7 @@
{
if (iRow < aRace.hitDice(aPC))
{
- aRace.setHitPoint(iRow, new Integer(iRoll));
+ aRace.setHitPoint(iRow, Integer.valueOf(iRoll));
}
iRow -= aRace.hitDice(aPC);
@@ -192,7 +192,7 @@
if (aClass != null)
{
final int lvl = aPC.getLevelInfoClassLevel(iRow) - 1;
- aClass.setHitPoint(lvl, new Integer(iRoll));
+ aClass.setHitPoint(lvl, Integer.valueOf(iRoll));
}
}
@@ -452,7 +452,7 @@
//
if (iHp > iSides)
{
- aRace.setHitPoint(rowIndex, new Integer(iSides));
+ aRace.setHitPoint(rowIndex, Integer.valueOf(iSides));
iHp = iSides;
}
}
@@ -482,7 +482,7 @@
//
if (iHp > iSides)
{
- aClass.setHitPoint(lvl - 1, new Integer(iSides));
+ aClass.setHitPoint(lvl - 1, Integer.valueOf(iSides));
iHp = iSides;
}
}
@@ -503,7 +503,7 @@
case 2:
case 4:
- Integer iBonus = new Integer((int) aPC.getTotalBonusTo("HP", "CURRENTMAX"));
+ Integer iBonus = Integer.valueOf((int) aPC.getTotalBonusTo("HP", "CURRENTMAX"));
return iBonus;
@@ -539,7 +539,7 @@
iHp += ((Integer) getValueAt(i, 4)).intValue();
}
- return new Integer(iHp);
+ return Integer.valueOf(iHp);
default:
break;
@@ -559,16 +559,16 @@
return aClass.getDisplayName();
case 1: // Sides
- return new Integer(iSides);
+ return Integer.valueOf(iSides);
case 2: // Roll
- return new Integer(iHp);
+ return Integer.valueOf(iHp);
case 3: // Con
int iConMod = (int) aPC.getStatBonusTo("HP", "BONUS");
- return new Integer(iConMod);
+ return Integer.valueOf(iConMod);
case 4: // Total
iHp += (int) aPC.getStatBonusTo("HP", "BONUS");
@@ -578,7 +578,7 @@
iHp = 1;
}
- return new Integer(iHp);
+ return Integer.valueOf(iHp);
case 5:
return "+";
Modified: Trunk/pcgen/code/src/java/pcgen/gui/MainSource.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/gui/MainSource.java 2006-10-22 17:15:05 UTC (rev 1512)
+++ Trunk/pcgen/code/src/java/pcgen/gui/MainSource.java 2006-10-22 18:26:26 UTC (rev 1513)
@@ -310,7 +310,7 @@
if (saveViewMode == null)
{
- saveViewMode = new Integer(viewMode);
+ saveViewMode = Integer.valueOf(viewMode);
}
viewMode = VIEW_PRODUCT;
availableModel.resetModel(viewMode, true, false);
Modified: Trunk/pcgen/code/src/java/pcgen/gui/NewWeaponInfoDialog.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/gui/NewWeaponInfoDialog.java 2006-10-22 17:15:05 UTC (rev 1512)
+++ Trunk/pcgen/code/src/java/pcgen/gui/NewWeaponInfoDialog.java 2006-10-22 18:26:26 UTC (rev 1513)
@@ -375,34 +375,34 @@
for (int i = 0; i <= 9; i++)
{
- numbers[i] = new Integer(i);
+ numbers[i] = Integer.valueOf(i);
}
cmbDamageDieCount.setModel(new DefaultComboBoxModel(numbers));
numbers = new Integer[9];
- numbers[0] = new Integer(0);
- numbers[1] = new Integer(1);
- numbers[2] = new Integer(2);
- numbers[3] = new Integer(3);
- numbers[4] = new Integer(4);
- numbers[5] = new Integer(6);
- numbers[6] = new Integer(8);
- numbers[7] = new Integer(10);
- numbers[8] = new Integer(20);
+ numbers[0] = Integer.valueOf(0);
+ numbers[1] = Integer.valueOf(1);
+ numbers[2] = Integer.valueOf(2);
+ numbers[3] = Integer.valueOf(3);
+ numbers[4] = Integer.valueOf(4);
+ numbers[5] = Integer.valueOf(6);
+ numbers[6] = Integer.valueOf(8);
+ numbers[7] = Integer.valueOf(10);
+ numbers[8] = Integer.valueOf(20);
cmbDamageDieSides.setModel(new DefaultComboBoxModel(numbers));
numbers = new Integer[4];
- numbers[0] = new Integer(1);
- numbers[1] = new Integer(2);
- numbers[2] = new Integer(3);
- numbers[3] = new Integer(4);
+ numbers[0] = Integer.valueOf(1);
+ numbers[1] = Integer.valueOf(2);
+ numbers[2] = Integer.valueOf(3);
+ numbers[3] = Integer.valueOf(4);
cmbCritRange.setModel(new DefaultComboBoxModel(numbers));
numbers = new Integer[3];
- numbers[0] = new Integer(2);
- numbers[1] = new Integer(3);
- numbers[2] = new Integer(4);
+ numbers[0] = Integer.valueOf(2);
+ numbers[1] = Integer.valueOf(3);
+ numbers[2] = Integer.valueOf(4);
cmbCritMult.setModel(new DefaultComboBoxModel(numbers));
pack();
Modified: Trunk/pcgen/code/src/java/pcgen/gui/PurchaseModeFrame.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/gui/PurchaseModeFrame.java 2006-10-22 17:15:05 UTC (rev 1512)
+++ Trunk/pcgen/code/src/java/pcgen/gui/PurchaseModeFrame.java 2006-10-22 18:26:26 UTC (rev 1513)
@@ -572,7 +572,7 @@
if (updateOk)
{
- purchaseModel.setValueAt(new Integer(purchaseModel.predictNextPurchaseCostMax()),
+ purchaseModel.setValueAt(Integer.valueOf(purchaseModel.predictNextPurchaseCostMax()),
purchaseModel.getRowCount() - 1, 1);
}
}
@@ -619,7 +619,7 @@
if (updateOk)
{
- purchaseModel.setValueAt(new Integer(purchaseModel.predictNextPurchaseCostMin()), 0, 1);
+ purchaseModel.setValueAt(Integer.valueOf(purchaseModel.predictNextPurchaseCostMin()), 0, 1);
}
}
@@ -832,8 +832,8 @@
for (int i = savedPurchaseScoreMin, index; i <= savedPurchaseScoreMax; ++i)
{
index = i - savedPurchaseScoreMin;
- savedValues[index][0] = new Integer(i);
- savedValues[index][1] = new Integer(scoreCosts[index]);
+ savedValues[index][0] = Integer.valueOf(i);
+ savedValues[index][1] = Integer.valueOf(scoreCosts[index]);
}
}
else
@@ -845,8 +845,8 @@
scoreCosts[0] = 0;
savedValues = new Object[1][2];
- savedValues[0][0] = new Integer(10);
- savedValues[0][1] = new Integer(0);
+ savedValues[0][0] = Integer.valueOf(10);
+ savedValues[0][1] = Integer.valueOf(0);
}
//
@@ -960,14 +960,14 @@
{
final int score = (i + currentPurchaseScoreMax) - nrRows + 1;
int preVal = -1;
- newValues[i + preLength][0] = new Integer(score);
+ newValues[i + preLength][0] = Integer.valueOf(score);
if ((i + preLength) != 0)
{
preVal = ((Integer) newValues[(i + preLength) - 1][1]).intValue();
}
- newValues[i + preLength][1] = new Integer(preVal + 1);
+ newValues[i + preLength][1] = Integer.valueOf(preVal + 1);
}
}
@@ -1015,9 +1015,9 @@
for (int i = 0; i < nrRows; ++i)
{
final int score = i + currentPurchaseScoreMin;
- newValues[i][0] = new Integer(score);
+ newValues[i][0] = Integer.valueOf(score);
-// newValues[i][1] = new Integer(tblStart - nrRows + i);
+// newValues[i][1] = Integer.valueOf(tblStart - nrRows + i);
}
}
Modified: Trunk/pcgen/code/src/java/pcgen/gui/UIFactory.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/gui/UIFactory.java 2006-10-22 17:15:05 UTC (rev 1512)
+++ Trunk/pcgen/code/src/java/pcgen/gui/UIFactory.java 2006-10-22 18:26:26 UTC (rev 1513)
@@ -169,7 +169,7 @@
*/
public static void setLookAndFeel(int looknfeel)
{
- internalSetLookAndFeel(new Integer(looknfeel));
+ internalSetLookAndFeel(Integer.valueOf(looknfeel));
}
/**
@@ -240,7 +240,7 @@
{
if (SettingsHandler.getLookAndFeel() < lafData.length)
{
- internalSetLookAndFeel(new Integer(SettingsHandler.getLookAndFeel()));
+ internalSetLookAndFeel(Integer.valueOf(SettingsHandler.getLookAndFeel()));
}
else if (SettingsHandler.getLookAndFeel() == lafData.length)
{
Modified: Trunk/pcgen/code/src/java/pcgen/gui/editor/ClassAbilityPanel.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/gui/editor/ClassAbilityPanel.java 2006-10-22 17:15:05 UTC (rev 1512)
+++ Trunk/pcgen/code/src/java/pcgen/gui/editor/ClassAbilityPanel.java 2006-10-22 18:26:26 UTC (rev 1513)
@@ -113,7 +113,7 @@
if (a.length() > 0)
{
- obj.setLevelsPerFeat(new Integer(a));
+ obj.setLevelsPerFeat(Integer.valueOf(a));
}
a = castAs.getText().trim();
Modified: Trunk/pcgen/code/src/java/pcgen/gui/editor/ClassLevelPanel.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/gui/editor/ClassLevelPanel.java 2006-10-22 17:15:05 UTC (rev 1512)
+++ Trunk/pcgen/code/src/java/pcgen/gui/editor/ClassLevelPanel.java 2006-10-22 18:26:26 UTC (rev 1513)
@@ -903,7 +903,7 @@
switch (columnIndex)
{
case 0:
- return new Integer(lt.getLevel());
+ return Integer.valueOf(lt.getLevel());
case 1:
return lt.getTag();
Modified: Trunk/pcgen/code/src/java/pcgen/gui/editor/NaturalAttacksPanel.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/gui/editor/NaturalAttacksPanel.java 2006-10-22 17:15:05 UTC (rev 1512)
+++ Trunk/pcgen/code/src/java/pcgen/gui/editor/NaturalAttacksPanel.java 2006-10-22 18:26:26 UTC (rev 1513)
@@ -112,22 +112,22 @@
// Set the number of attacks
String attacksTxt = natWpn.nextToken();
- Integer anInt;
+ int anInt;
try
{
- anInt = new Integer(attacksTxt);
+ anInt = Integer.parseInt(attacksTxt);
}
catch (NumberFormatException exc)
{
Logging.errorPrint("Natural Weapons Editor: non-numeric value for number of attacks: '" + attacksTxt
+ "'");
- anInt = new Integer(1);
+ anInt = 1;
}
- if (anInt.intValue() > 1)
+ if (anInt > 1)
{
- String bonusString = "WEAPON|ATTACKS|" + (anInt.intValue() - 1);
+ String bonusString = "WEAPON|ATTACKS|" + (anInt - 1);
anEquip.addBonusList(bonusString);
}
Modified: Trunk/pcgen/code/src/java/pcgen/gui/editor/SourceBasePanel.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/gui/editor/SourceBasePanel.java 2006-10-22 17:15:05 UTC (rev 1512)
+++ Trunk/pcgen/code/src/java/pcgen/gui/editor/SourceBasePanel.java 2006-10-22 18:26:26 UTC (rev 1513)
@@ -85,7 +85,7 @@
public void updateData(PObject thisPObject)
{
- theCampaign.setRank(new Integer(rank.getValue().toString()).intValue());
+ theCampaign.setRank(Integer.parseInt(rank.getValue().toString()));
game = "";
StringBuffer tempBuff = new StringBuffer(30);
if (gm35e.isSelected())
@@ -180,7 +180,7 @@
theCampaign = (Campaign) thisPObject;
sourceModel.setLists(theCampaign.getOptionsList(), theCampaign.getLicenses(),
theCampaign.getSection15s());
- rank.setValue(new Integer(theCampaign.getRank()));
+ rank.setValue(Integer.valueOf(theCampaign.getRank()));
game = theCampaign.getGameModeString();
final StringTokenizer aTok = new StringTokenizer(game, ", ");
Modified: Trunk/pcgen/code/src/java/pcgen/gui/tabs/InfoClasses.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/gui/tabs/InfoClasses.java 2006-10-22 17:15:05 UTC (rev 1512)
+++ Trunk/pcgen/code/src/java/pcgen/gui/tabs/InfoClasses.java 2006-10-22 18:26:26 UTC (rev 1513)
@@ -1499,7 +1499,7 @@
if (saveViewMode == null)
{
- saveViewMode = new Integer(viewMode);
+ saveViewMode = Integer.valueOf(viewMode);
}
viewMode = GuiConstants.INFOCLASS_VIEW_NAME;
availableModel.resetModel(viewMode, true);
@@ -1677,7 +1677,7 @@
pcclass = (PCClass) fn.getItem();
}
- final Integer c = new Integer(0);
+ final Integer c = Integer.valueOf(0);
String retString = "";
switch (column)
@@ -1704,7 +1704,7 @@
case COL_LEVEL:
if (pcclass != null)
{
- return new Integer(pcclass.getLevel());
+ return Integer.valueOf(pcclass.getLevel());
}
return c;
Modified: Trunk/pcgen/code/src/java/pcgen/gui/tabs/InfoDomain.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/gui/tabs/InfoDomain.java 2006-10-22 17:15:05 UTC (rev 1512)
+++ Trunk/pcgen/code/src/java/pcgen/gui/tabs/InfoDomain.java 2006-10-22 18:26:26 UTC (rev 1513)
@@ -1351,7 +1351,7 @@
if (saveDeityViewMode == null)
{
- saveDeityViewMode = new Integer(viewMode);
+ saveDeityViewMode = Integer.valueOf(viewMode);
}
viewMode = GuiConstants.INFODOMAIN_VIEW_NAME;
clearDeityQFilterButton.setEnabled(true);
Modified: Trunk/pcgen/code/src/java/pcgen/gui/tabs/InfoEquipping.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/gui/tabs/InfoEquipping.java 2006-10-22 17:15:05 UTC (rev 1512)
+++ Trunk/pcgen/code/src/java/pcgen/gui/tabs/InfoEquipping.java 2006-10-22 18:26:26 UTC (rev 1513)
@@ -3880,7 +3880,7 @@
if (saveViewMode == null)
{
- saveViewMode = new Integer(viewMode);
+ saveViewMode = Integer.valueOf(viewMode);
}
viewMode = GuiConstants.INFOEQUIPPING_VIEW_NAME;
availableModel.resetModel(viewMode, MODEL_AVAIL);
@@ -4074,16 +4074,16 @@
switch (this.getSelectedIndex())
{
case 0: // Don't use Temp Bonuses
- return new Integer(0);
+ return Integer.valueOf(0);
case 1: // use selected Temp Bonuses
- return new Integer(1);
+ return Integer.valueOf(1);
case 2: // use Temp Bonuses
- return new Integer(2);
+ return Integer.valueOf(2);
default:
- return new Integer(0);
+ return Integer.valueOf(0);
}
}
Modified: Trunk/pcgen/code/src/java/pcgen/gui/tabs/InfoGear.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/gui/tabs/InfoGear.java 2006-10-22 17:15:05 UTC (rev 1512)
+++ Trunk/pcgen/code/src/java/pcgen/gui/tabs/InfoGear.java 2006-10-22 18:26:26 UTC (rev 1513)
@@ -2118,7 +2118,7 @@
for (int i = 0; i < 5; ++i)
{
- predefinedPercent[i] = new Integer(i * 50);
+ predefinedPercent[i] = Integer.valueOf(i * 50);
}
cmbBuyPercent.setEditable(true);
@@ -2126,8 +2126,8 @@
cmbBuyPercent.setModel(new DefaultComboBoxModel(predefinedPercent));
cmbSellPercent.setModel(new DefaultComboBoxModel(predefinedPercent));
- cmbBuyPercent.setSelectedItem(new Integer(SettingsHandler.getGearTab_BuyRate()));
- cmbSellPercent.setSelectedItem(new Integer(SettingsHandler.getGearTab_SellRate()));
+ cmbBuyPercent.setSelectedItem(Integer.valueOf(SettingsHandler.getGearTab_BuyRate()));
+ cmbSellPercent.setSelectedItem(Integer.valueOf(SettingsHandler.getGearTab_SellRate()));
cmbBuyPercent.addActionListener(new ActionListener()
{
@@ -2157,7 +2157,7 @@
if (rate < 0)
{
rate = SettingsHandler.getGearTab_BuyRate();
- cmbBuyPercent.setSelectedItem(new Integer(rate));
+ cmbBuyPercent.setSelectedItem(Integer.valueOf(rate));
}
SettingsHandler.setGearTab_BuyRate(rate);
@@ -2192,7 +2192,7 @@
if (rate < 0)
{
rate = SettingsHandler.getGearTab_SellRate();
- cmbSellPercent.setSelectedItem(new Integer(rate));
+ cmbSellPercent.setSelectedItem(Integer.valueOf(rate));
}
SettingsHandler.setGearTab_SellRate(rate);
@@ -2378,7 +2378,7 @@
if (saveAvailableViewMode == null)
{
- saveAvailableViewMode = new Integer(viewMode);
+ saveAvailableViewMode = Integer.valueOf(viewMode);
}
viewMode = GuiConstants.INFOINVENTORY_VIEW_NAME;
availableModel.resetModel(viewMode, true);
@@ -2401,7 +2401,7 @@
if (saveSelectedViewMode == null)
{
- saveSelectedViewMode = new Integer(viewSelectMode);
+ saveSelectedViewMode = Integer.valueOf(viewSelectMode);
}
viewSelectMode = GuiConstants.INFOINVENTORY_VIEW_NAME;
selectedModel.resetModel(viewMode, false);
@@ -3107,17 +3107,17 @@
switch (this.getSelectedIndex())
{
case 0: // First
- return new Integer(0);
+ return Integer.valueOf(0);
case 1: // Last
- return new Integer(1000);
+ return Integer.valueOf(1000);
case 2: // Hidden
- return new Integer(-1);
+ return Integer.valueOf(-1);
default: // A number
- return new Integer((String) getSelectedItem());
+ return Integer.valueOf((String) getSelectedItem());
}
}
@@ -3379,7 +3379,7 @@
case COL_INDEX: // Output index
if (eq != null)
{
- retVal = new Integer(eq.getOutputIndex());
+ retVal = Integer.valueOf(eq.getOutputIndex());
}
break;
Modified: Trunk/pcgen/code/src/java/pcgen/gui/tabs/InfoNaturalWeapons.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/gui/tabs/InfoNaturalWeapons.java 2006-10-22 17:15:05 UTC (rev 1512)
+++ Trunk/pcgen/code/src/java/pcgen/gui/tabs/InfoNaturalWeapons.java 2006-10-22 18:26:26 UTC (rev 1513)
@@ -279,7 +279,7 @@
Object[] newRow = new Object[7];
newRow[0] = eq.getName(); // Attack
- newRow[1] = new Integer((int) eq.qty()); // #
+ newRow[1] = Integer.valueOf((int) eq.qty()); // #
StringBuffer tohitStr = new StringBuffer(12);
int toHit = BAB + sizeAdj;
Modified: Trunk/pcgen/code/src/java/pcgen/gui/tabs/InfoRaces.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/gui/tabs/InfoRaces.java 2006-10-22 17:15:05 UTC (rev 1512)
+++ Trunk/pcgen/code/src/java/pcgen/gui/tabs/InfoRaces.java 2006-10-22 18:26:26 UTC (rev 1513)
@@ -895,7 +895,7 @@
if (saveViewMode == null)
{
- saveViewMode = new Integer(viewMode);
+ saveViewMode = Integer.valueOf(viewMode);
}
viewMode = GuiConstants.INFORACE_VIEW_NAME;
raceModel.resetModel(viewMode);
@@ -1109,7 +1109,7 @@
private Object getColumnLevel(PObjectNode fn) {
if (fn.getItem() instanceof Race) {
Race race = (Race) fn.getItem();
- return new Integer(race.getLevelAdjustment(getPc()));
+ return Integer.valueOf(race.getLevelAdjustment(getPc()));
}
return null;
}
Modified: Trunk/pcgen/code/src/java/pcgen/gui/tabs/InfoResources.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/gui/tabs/InfoResources.java 2006-10-22 17:15:05 UTC (rev 1512)
+++ Trunk/pcgen/code/src/java/pcgen/gui/tabs/InfoResources.java 2006-10-22 18:26:26 UTC (rev 1513)
@@ -1696,7 +1696,7 @@
if (saveViewMode == null)
{
- saveViewMode = new Integer(viewSortMode);
+ saveViewMode = Integer.valueOf(viewSortMode);
}
viewSortMode = 1;
availableModel.resetModel(viewSortMode);
Modified: Trunk/pcgen/code/src/java/pcgen/gui/tabs/InfoSkills.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/gui/tabs/InfoSkills.java 2006-10-22 17:15:05 UTC (rev 1512)
+++ Trunk/pcgen/code/src/java/pcgen/gui/tabs/InfoSkills.java 2006-10-22 18:26:26 UTC (rev 1513)
@@ -364,9 +364,9 @@
*/
public static SkillWrapper createSkillWrapper(boolean available, Skill skill, PlayerCharacter pc)
{
- return available ? new SkillWrapper(skill, new Integer(0), new Float(0), new Integer(0))
+ return available ? new SkillWrapper(skill, Integer.valueOf(0), new Float(0), Integer.valueOf(0))
: new SkillWrapper(skill, skill.modifier(pc), skill.getTotalRank(pc),
- new Integer(skill.getOutputIndex()));
+ Integer.valueOf(skill.getOutputIndex()));
}
/**
@@ -2177,7 +2177,7 @@
if (saveAvailableViewMode == null)
{
- saveAvailableViewMode = new Integer(viewMode);
+ saveAvailableViewMode = Integer.valueOf(viewMode);
}
viewMode = GuiConstants.INFOSKILLS_VIEW_NAME;
availableModel.resetModel(viewMode, true);
@@ -2200,7 +2200,7 @@
if (saveSelectedViewMode == null)
{
- saveSelectedViewMode = new Integer(viewSelectMode);
+ saveSelectedViewMode = Integer.valueOf(viewSelectMode);
}
viewSelectMode = GuiConstants.INFOSKILLS_VIEW_NAME;
selectedModel.resetModel(viewMode, false);
@@ -2294,17 +2294,17 @@
switch (this.getSelectedIndex())
{
case 0: // First
- return new Integer(0);
+ return Integer.valueOf(0);
case 1: // Last
- return new Integer(1000);
+ return Integer.valueOf(1000);
case 2: // Hidden
- return new Integer(-1);
+ return Integer.valueOf(-1);
default: // A number
- return new Integer((String) getSelectedItem());
+ return Integer.valueOf((String) getSelectedItem());
}
}
@@ -2657,7 +2657,7 @@
aSkill.setOutputIndex(outputIndex);
skillA = new SkillWrapper(aSkill, aSkill.modifier(pc), aSkill.getTotalRank(pc),
- new Integer(aSkill.getOutputIndex()));
+ Integer.valueOf(aSkill.getOutputIndex()));
fn.setItem(skillA);
if (needRefresh)
@@ -2736,13 +2736,13 @@
{
return gm.getSkillRankDisplayText(mods.intValue() + ranks.intValue());
}
- return new Integer(mods.intValue() + ranks.intValue());
+ return Integer.valueOf(mods.intValue() + ranks.intValue());
case COL_COST: // Cost to buy skill points
if (aSkill != null)
{
- return new Integer(aSkill.costForPCClass(getSelectedPCClass(), pc));
+ return Integer.valueOf(aSkill.costForPCClass(getSelectedPCClass(), pc));
}
return "0";
Modified: Trunk/pcgen/code/src/java/pcgen/gui/tabs/InfoSummary.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/gui/tabs/InfoSummary.java 2006-10-22 17:15:05 UTC (rev 1512)
+++ Trunk/pcgen/code/src/java/pcgen/gui/tabs/InfoSummary.java 2006-10-22 18:26:26 UTC (rev 1513)
@@ -3107,7 +3107,7 @@
return "*"; //$NON-NLS-1$
}
- return new Integer(pc.getStatList().getBaseStatFor(aStat));
+ return Integer.valueOf(pc.getStatList().getBaseStatFor(aStat));
case RACE_COLUMN:
@@ -3116,10 +3116,10 @@
return "*"; //$NON-NLS-1$
}
- //return new Integer(currentPC.getStatList().getTotalStatFor(aStat) - currentPC.getStatList().getBaseStatFor(aStat));
+ //return Integer.valueOf(currentPC.getStatList().getTotalStatFor(aStat) - currentPC.getStatList().getBaseStatFor(aStat));
int rBonus = (int) pc.getRaceBonusTo("STAT", aStat); //$NON-NLS-1$
- return new Integer(rBonus);
+ return Integer.valueOf(rBonus);
case OTHER_COLUMN:
@@ -3130,7 +3130,7 @@
int iRace = (int) pc.getRaceBonusTo("STAT", aStat); //$NON-NLS-1$
- return new Integer(pc.getStatList().getTotalStatFor(aStat)
+ return Integer.valueOf(pc.getStatList().getTotalStatFor(aStat)
- pc.getStatList().getBaseStatFor(aStat) - iRace);
case TOTAL_COLUMN:
@@ -3140,17 +3140,17 @@
return "*"; //$NON-NLS-1$
}
-// return new Integer(pc.getStatList().getTotalStatFor(aStat));
+// return Integer.valueOf(pc.getStatList().getTotalStatFor(aStat));
return SettingsHandler.getGame().getStatDisplayText(pc.getStatList().getTotalStatFor(aStat));
case MOD_COLUMN:
if (pc.isNonAbility(rowIndex))
{
- return new Integer(0);
+ return Integer.valueOf(0);
}
- return new Integer(pc.getStatList().getStatModFor(aStat));
+ return Integer.valueOf(pc.getStatList().getStatModFor(aStat));
case INC_COLUMN:
Modified: Trunk/pcgen/code/src/java/pcgen/gui/tabs/InfoTempMod.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/gui/tabs/InfoTempMod.java 2006-10-22 17:15:05 UTC (rev 1512)
+++ Trunk/pcgen/code/src/java/pcgen/gui/tabs/InfoTempMod.java 2006-10-22 18:26:26 UTC (rev 1513)
@@ -436,8 +436,7 @@
for (int i = min; i <= max; i++)
{
- final Integer anInt = new Integer(i);
- numberList.add(anInt.toString());
+ numberList.add(Integer.toString(i));
}
// let them choose the number from a radio list
Modified: Trunk/pcgen/code/src/java/pcgen/gui/tabs/InfoTemplates.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/gui/tabs/InfoTemplates.java 2006-10-22 17:15:05 UTC (rev 1512)
+++ Trunk/pcgen/code/src/java/pcgen/gui/tabs/InfoTemplates.java 2006-10-22 18:26:26 UTC (rev 1513)
@@ -768,7 +768,7 @@
if (saveViewMode == null)
{
- saveViewMode = new Integer(viewMode);
+ saveViewMode = Integer.valueOf(viewMode);
}
viewMode = GuiConstants.INFOTEMPLATE_VIEW_NAME;
availableModel.resetModel(viewMode, true);
@@ -1109,7 +1109,7 @@
return template.toString();
case COL_LEVEL:
- return new Integer(template.getLevelAdjustment(getPc()));
+ return Integer.valueOf(template.getLevelAdjustment(getPc()));
case COL_MODIFIER:
return template.modifierString(getPc());
Modified: Trunk/pcgen/code/src/java/pcgen/gui/tabs/spells/SpellModel.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/gui/tabs/spells/SpellModel.java 2006-10-22 17:15:05 UTC (rev 1512)
+++ Trunk/pcgen/code/src/java/pcgen/gui/tabs/spells/SpellModel.java 2006-10-22 18:26:26 UTC (rev 1513)
@@ -428,7 +428,7 @@
return (aSpell != null) ? aSpell.getDefaultSourceString() : null;
case COL_PPCOST:
- return (spellA != null) ? new Integer(((SpellInfo) fn.getItem()).getActualPPCost()) : null;
+ return (spellA != null) ? Integer.valueOf(((SpellInfo) fn.getItem()).getActualPPCost()) : null;
default:
return fn.getItem();
Modified: Trunk/pcgen/code/src/java/pcgen/gui/utils/JComboBoxEditor.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/gui/utils/JComboBoxEditor.java 2006-10-22 17:15:05 UTC (rev 1512)
+++ Trunk/pcgen/code/src/java/pcgen/gui/utils/JComboBoxEditor.java 2006-10-22 18:26:26 UTC (rev 1513)
@@ -55,7 +55,7 @@
public Object getCellEditorValue()
{
- return new Integer(getSelectedIndex());
+ return Integer.valueOf(getSelectedIndex());
}
public Component getTableCellEditorComponent(JTable jTable, Object value, boolean isSelected, int row, int column)
Modified: Trunk/pcgen/code/src/java/pcgen/gui/utils/JTreeTable.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/gui/utils/JTreeTable.java 2006-10-22 17:15:05 UTC (rev 1512)
+++ Trunk/pcgen/code/src/java/pcgen/gui/utils/JTreeTable.java 2006-10-22 18:26:26 UTC (rev 1513)
@@ -102,8 +102,8 @@
Added to pcgen by Scott Ellsworth
*/
UIManager.put("TreeTableUI", "javax.swing.plaf.metal.MetalTreeUI"); //$NON-NLS-1$ //$NON-NLS-2$
- UIManager.put("Tree.leftChildIndent", new Integer(3)); //$NON-NLS-1$
- UIManager.put("Tree.rightChildIndent", new Integer(8)); //$NON-NLS-1$
+ UIManager.put("Tree.leftChildIndent", Integer.valueOf(3)); //$NON-NLS-1$
+ UIManager.put("Tree.rightChildIndent", Integer.valueOf(8)); //$NON-NLS-1$
// Create the tree. It will be used as a renderer and editor.
tree = new TreeTableCellRenderer(treeTableModel);
Modified: Trunk/pcgen/code/src/java/pcgen/io/ExportHandler.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/io/ExportHandler.java 2006-10-22 17:15:05 UTC (rev 1512)
+++ Trunk/pcgen/code/src/java/pcgen/io/ExportHandler.java 2006-10-22 18:26:26 UTC (rev 1513)
@@ -720,7 +720,7 @@
if (children.get(y) instanceof FORNode)
{
FORNode nextFor = (FORNode) children.get(y);
- loopVariables.put(nextFor.var(), new Integer(0));
+ loopVariables.put(nextFor.var(), Integer.valueOf(0));
existsOnly = nextFor.exists();
String minString = nextFor.min();
@@ -826,13 +826,13 @@
*/
private boolean processLoop(FORNode node, BufferedWriter output, FileAccess fa, PlayerCharacter aPC, int index)
{
- loopVariables.put(node.var(), new Integer(index));
+ loopVariables.put(node.var(), Integer.valueOf(index));
for (int y = 0; y < node.children().size(); ++y)
{
if (node.children().get(y) instanceof FORNode)
{
FORNode nextFor = (FORNode) node.children().get(y);
- loopVariables.put(nextFor.var(), new Integer(0));
+ loopVariables.put(nextFor.var(), Integer.valueOf(0));
existsOnly = nextFor.exists();
String minString = nextFor.min();
@@ -1189,19 +1189,18 @@
if (endMode == SIGN_MODE)
{
- final Integer valInt = new Integer(total.intValue());
- return Delta.toString(valInt);
+ return Delta.toString(total.intValue());
}
if (endMode == NO_ZERO_MODE)
{
- final Integer valInt = new Integer(total.intValue());
- if (valInt.intValue() == 0)
+ final int totalIntValue = total.intValue();
+ if (totalIntValue == 0)
{
return "";
}
- return Delta.toString(valInt);
+ return Delta.toString(totalIntValue);
}
return total.toString();
@@ -2955,9 +2954,9 @@
int j = 0;
final PStringTokenizer pTok = new PStringTokenizer(aString.substring(4), ",",
"\\\\", "\\\\");
- Integer cMin = new Integer(0);
- Integer cMax = new Integer(100);
- Integer cStep = new Integer(1);
+ Integer cMin = Integer.valueOf(0);
+ Integer cMax = Integer.valueOf(100);
+ Integer cStep = Integer.valueOf(1);
String cString = "";
String cStartLineString = "";
String cEndLineString = "";
@@ -3018,7 +3017,7 @@
if ((cMax.intValue() >= PCs.length) && _existsOnly)
{
- cMax = new Integer(PCs.length);
+ cMax = Integer.valueOf(PCs.length);
}
for (int k = cMin.intValue(); k < cMax.intValue(); k++)
Modified: Trunk/pcgen/code/src/java/pcgen/io/PCGIOHandler.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/io/PCGIOHandler.java 2006-10-22 17:15:05 UTC (rev 1512)
+++ Trunk/pcgen/code/src/java/pcgen/io/PCGIOHandler.java 2006-10-22 18:26:26 UTC (rev 1513)
@@ -379,7 +379,7 @@
for (int i = 0; i <= aRace.hitDice(aPC); i++)
{
final int roll = RollingMethods.roll(iSides);
- aRace.setHitPoint(i, new Integer(roll));
+ aRace.setHitPoint(i, Integer.valueOf(roll));
}
warnings.add(
@@ -393,7 +393,7 @@
if (iRoll > iSides)
{
- aRace.setHitPoint(i, new Integer(iSides));
+ aRace.setHitPoint(i, Integer.valueOf(iSides));
bFixMade = true;
}
}
@@ -529,7 +529,7 @@
if (iRoll > iSides)
{
- pcClass.setHitPoint(i, new Integer(iSides));
+ pcClass.setHitPoint(i, Integer.valueOf(iSides));
bFixMade = true;
}
}
Modified: Trunk/pcgen/code/src/java/pcgen/io/PCGVer0Parser.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/io/PCGVer0Parser.java 2006-10-22 17:15:05 UTC (rev 1512)
+++ Trunk/pcgen/code/src/java/pcgen/io/PCGVer0Parser.java 2006-10-22 18:26:26 UTC (rev 1513)
@@ -555,7 +555,7 @@
{
PCLevelInfo levelInfo = aPC.saveLevelInfo(aClass.getKeyName());
aClass.addLevel(levelInfo, false, aPC);
- aClass.setHitPoint(i, new Integer(iHp));
+ aClass.setHitPoint(i, Integer.valueOf(iHp));
aPC.saveLevelInfo(aClass.getKeyName());
}
}
@@ -1739,7 +1739,7 @@
try
{
- hitPointMap.put(Integer.toString(x++), new Integer(token));
+ hitPointMap.put(Integer.toString(x++), Integer.valueOf(token));
}
catch (NumberFormatException ex)
{
@@ -1782,11 +1782,11 @@
// If newer version, we can load in the order in which the skills should be displayed
if (pcgVersion >= 268)
{
- outputIndex = new Integer(skillTokenizer.nextToken());
+ outputIndex = Integer.valueOf(skillTokenizer.nextToken());
}
else
{
- outputIndex = new Integer(0);
+ outputIndex = Integer.valueOf(0);
}
//
Modified: Trunk/pcgen/code/src/java/pcgen/io/PCGVer2Parser.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/io/PCGVer2Parser.java 2006-10-22 17:15:05 UTC (rev 1512)
+++ Trunk/pcgen/code/src/java/pcgen/io/PCGVer2Parser.java 2006-10-22 18:26:26 UTC (rev 1513)
@@ -1437,7 +1437,7 @@
{
try
{
- aPCClass.setHitPoint(level - 1, new Integer(element.getText()));
+ aPCClass.setHitPoint(level - 1, Integer.valueOf(element.getText()));
}
catch (NumberFormatException nfe)
{
@@ -2809,7 +2809,7 @@
try
{
- hitPointMap.put(Integer.toString(i++), new Integer(aTok.nextToken()));
+ hitPointMap.put(Integer.toString(i++), Integer.valueOf(aTok.nextToken()));
}
catch (NumberFormatException ex)
{
Modified: Trunk/pcgen/code/src/java/pcgen/persistence/lst/LstSystemLoader.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/persistence/lst/LstSystemLoader.java 2006-10-22 17:15:05 UTC (rev 1512)
+++ Trunk/pcgen/code/src/java/pcgen/persistence/lst/LstSystemLoader.java 2006-10-22 18:26:26 UTC (rev 1513)
@@ -414,7 +414,7 @@
// to load in total so that they can set up any
// progress meters that they want to.
setChanged();
- notifyObservers(new Integer(countTotalFilesToLoad()));
+ notifyObservers(Integer.valueOf(countTotalFilesToLoad()));
// Load using the new LstFileLoaders
@@ -2607,7 +2607,7 @@
{
public int compare(Campaign c1, Campaign c2)
{
- return new Integer(c1.getRank()).compareTo(new Integer(c2.getRank()));
+ return c1.getRank() - c2.getRank();
}
});
Modified: Trunk/pcgen/code/src/java/pcgen/util/PJEP.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/util/PJEP.java 2006-10-22 17:15:05 UTC (rev 1512)
+++ Trunk/pcgen/code/src/java/pcgen/util/PJEP.java 2006-10-22 18:26:26 UTC (rev 1513)
@@ -222,7 +222,7 @@
}
else if (param2 instanceof Double)
{
- param2 = new Integer(((Double) param2).intValue());
+ param2 = Integer.valueOf(((Double) param2).intValue());
}
else
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
