From: <th...@us...> - 2009-03-13 01:15:07
|
Revision: 9636 http://pcgen.svn.sourceforge.net/pcgen/?rev=9636&view=rev Author: thpr Date: 2009-03-13 01:14:50 +0000 (Fri, 13 Mar 2009) Log Message: ----------- unparse tokens in write for Ability objects Modified Paths: -------------- Trunk/pcgen/code/src/java/pcgen/core/Ability.java Modified: Trunk/pcgen/code/src/java/pcgen/core/Ability.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/core/Ability.java 2009-03-10 21:46:36 UTC (rev 9635) +++ Trunk/pcgen/code/src/java/pcgen/core/Ability.java 2009-03-13 01:14:50 UTC (rev 9636) @@ -20,6 +20,7 @@ package pcgen.core; +import pcgen.base.lang.StringUtil; import pcgen.cdom.base.CDOMReference; import pcgen.cdom.base.CategorizedCDOMObject; import pcgen.cdom.base.Category; @@ -158,6 +159,10 @@ final StringBuffer txt = new StringBuffer(200); txt.append(getDisplayName()); txt.append("\tCATEGORY:").append(getCategory()); + txt.append("\t"); + txt.append(StringUtil.joinToStringBuffer(Globals.getContext().unparse( + this), "\t")); + txt.append("\t"); txt.append(super.getPCCText(false)); return txt.toString(); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jde...@us...> - 2013-11-13 14:11:30
|
Revision: 22207 http://sourceforge.net/p/pcgen/code/22207 Author: jdempsey Date: 2013-11-13 14:11:26 +0000 (Wed, 13 Nov 2013) Log Message: ----------- Fix bug: Fame duplicated on remove Issue#: CODE-2349 Modified Paths: -------------- Trunk/pcgen/code/src/java/pcgen/core/Ability.java Modified: Trunk/pcgen/code/src/java/pcgen/core/Ability.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/core/Ability.java 2013-11-13 14:09:19 UTC (rev 22206) +++ Trunk/pcgen/code/src/java/pcgen/core/Ability.java 2013-11-13 14:11:26 UTC (rev 22207) @@ -301,8 +301,11 @@ StringBuilder buff = new StringBuilder(); List<Aspect> aspects = this.get(MapKey.ASPECT, key); Aspect aspect = lastPassingAspect(aspects, pc); - buff.append(aspect.getName()).append(": "); - buff.append(aspect.getAspectText(pc, this)); + if (aspect != null) + { + buff.append(aspect.getName()).append(": "); + buff.append(aspect.getAspectText(pc, this)); + } return buff.toString(); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <th...@us...> - 2014-03-05 04:50:24
|
Revision: 23410 http://sourceforge.net/p/pcgen/code/23410 Author: thpr Date: 2014-03-05 04:50:21 +0000 (Wed, 05 Mar 2014) Log Message: ----------- Change AbilityFacade methods on Ability to use getSafe so that they use recognized defaults Issue#: CODE-2426 Modified Paths: -------------- Trunk/pcgen/code/src/java/pcgen/core/Ability.java Modified: Trunk/pcgen/code/src/java/pcgen/core/Ability.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/core/Ability.java 2014-03-05 03:43:41 UTC (rev 23409) +++ Trunk/pcgen/code/src/java/pcgen/core/Ability.java 2014-03-05 04:50:21 UTC (rev 23410) @@ -217,13 +217,7 @@ @Override public boolean isMult() { - Boolean mult = get(ObjectKey.MULTIPLE_ALLOWED); - //Why is a null a valid return value? - if (mult != null && mult) - { - return true; - } - return false; + return getSafe(ObjectKey.MULTIPLE_ALLOWED); } /* (non-Javadoc) @@ -232,17 +226,10 @@ @Override public boolean isStackable() { - Boolean mult = get(ObjectKey.STACKS); - //Why is a null a valid return value? - if (mult != null && mult) - { - return true; - } - return false; + return getSafe(ObjectKey.STACKS); } public double getCost() { - // TODO Auto-generated method stub return getSafe(ObjectKey.SELECTION_COST).doubleValue(); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |