From: <jde...@us...> - 2011-04-17 04:08:05
|
Revision: 14808 http://pcgen.svn.sourceforge.net/pcgen/?rev=14808&view=rev Author: jdempsey Date: 2011-04-17 04:07:59 +0000 (Sun, 17 Apr 2011) Log Message: ----------- Hide internal abilities from the UI Modified Paths: -------------- sandbox/uisync/code/src/java/pcgen/core/DataSet.java sandbox/uisync/code/src/java/pcgen/core/facade/util/DefaultListFacade.java Modified: sandbox/uisync/code/src/java/pcgen/core/DataSet.java =================================================================== --- sandbox/uisync/code/src/java/pcgen/core/DataSet.java 2011-04-17 03:39:06 UTC (rev 14807) +++ sandbox/uisync/code/src/java/pcgen/core/DataSet.java 2011-04-17 04:07:59 UTC (rev 14808) @@ -23,6 +23,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; +import java.util.Iterator; import java.util.List; import java.util.Map; @@ -135,9 +136,23 @@ if (category.isVisible()) { categories.addElement(category); - abilityMap.put(category, new DefaultListFacade<AbilityFacade>( + DefaultListFacade<AbilityFacade> abilityList = new DefaultListFacade<AbilityFacade>( Globals.getContext().ref.getManufacturer(Ability.class, - category).getAllObjects())); + category).getAllObjects()); + for (Iterator<AbilityFacade> iterator = abilityList.iterator(); iterator + .hasNext();) + { + AbilityFacade facade = iterator.next(); + if (facade instanceof Ability) + { + Ability ability = (Ability) facade; + if (!(ability.getSafe(ObjectKey.VISIBILITY).isVisibleTo(View.VISIBLE, false))) + { + iterator.remove(); + } + } + } + abilityMap.put(category, abilityList); } } Map<String, BodyStructure> structMap = Modified: sandbox/uisync/code/src/java/pcgen/core/facade/util/DefaultListFacade.java =================================================================== --- sandbox/uisync/code/src/java/pcgen/core/facade/util/DefaultListFacade.java 2011-04-17 03:39:06 UTC (rev 14807) +++ sandbox/uisync/code/src/java/pcgen/core/facade/util/DefaultListFacade.java 2011-04-17 04:07:59 UTC (rev 14808) @@ -66,7 +66,9 @@ public void remove() { - removeElement(index); + E element = getElementAt(index); + iterator.remove(); + fireElementRemoved(this, element, index); } }; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |