From: <th...@us...> - 2008-06-15 23:19:21
|
Revision: 6663 http://pcgen.svn.sourceforge.net/pcgen/?rev=6663&view=rev Author: thpr Date: 2008-06-15 16:19:18 -0700 (Sun, 15 Jun 2008) Log Message: ----------- Cleanup to remove direct references to integerChar Modified Paths: -------------- Trunk/pcgen/code/src/java/pcgen/cdom/base/CDOMObject.java Trunk/pcgen/code/src/java/pcgen/core/Campaign.java Trunk/pcgen/code/src/java/pcgen/core/character/CompanionMod.java Modified: Trunk/pcgen/code/src/java/pcgen/cdom/base/CDOMObject.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/cdom/base/CDOMObject.java 2008-06-15 23:18:08 UTC (rev 6662) +++ Trunk/pcgen/code/src/java/pcgen/cdom/base/CDOMObject.java 2008-06-15 23:19:18 UTC (rev 6663) @@ -46,8 +46,7 @@ */ /** A map to hold items keyed by Integers for the object */ // TODO make this final once clone() is no longer required... - // TODO Make this private once PObject is cleaned up - protected Map<IntegerKey, Integer> integerChar = new HashMap<IntegerKey, Integer>(); + private Map<IntegerKey, Integer> integerChar = new HashMap<IntegerKey, Integer>(); /** A map to hold items keyed by Strings for the object */ // TODO make this final once clone() is no longer required... Modified: Trunk/pcgen/code/src/java/pcgen/core/Campaign.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/core/Campaign.java 2008-06-15 23:18:08 UTC (rev 6662) +++ Trunk/pcgen/code/src/java/pcgen/core/Campaign.java 2008-06-15 23:19:18 UTC (rev 6663) @@ -1162,7 +1162,7 @@ */ public void setRank(final int rank) { - integerChar.put(IntegerKey.CAMPAIGN_RANK, rank); + put(IntegerKey.CAMPAIGN_RANK, rank); } /** Modified: Trunk/pcgen/code/src/java/pcgen/core/character/CompanionMod.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/core/character/CompanionMod.java 2008-06-15 23:18:08 UTC (rev 6662) +++ Trunk/pcgen/code/src/java/pcgen/core/character/CompanionMod.java 2008-06-15 23:19:18 UTC (rev 6663) @@ -87,6 +87,7 @@ * is less than, equal to, or greater than the specified object. * @see Comparable#compareTo(Object) */ + @Override public int compareTo(final Object obj) { int result = 0; @@ -259,7 +260,7 @@ */ public void setHitDie(final int hd) { - integerChar.put(IntegerKey.HIT_DIE, hd); + put(IntegerKey.HIT_DIE, hd); } /** @@ -268,7 +269,7 @@ */ public void setLevel(final int level) { - integerChar.put(IntegerKey.LEVEL, level); + put(IntegerKey.LEVEL, level); } /** This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |