From: <th...@us...> - 2007-03-01 04:36:46
|
Revision: 2271 http://svn.sourceforge.net/pcgen/?rev=2271&view=rev Author: thpr Date: 2007-02-28 20:36:46 -0800 (Wed, 28 Feb 2007) Log Message: ----------- CDOM: Alter Visibility Tokens in code to line up with LST representation Modified Paths: -------------- branches/cdom/code/src/java/gmgen/plugin/PcgCombatant.java branches/cdom/code/src/java/pcgen/core/Ability.java branches/cdom/code/src/java/pcgen/core/EquipmentChoice.java branches/cdom/code/src/java/pcgen/core/Globals.java branches/cdom/code/src/java/pcgen/core/PCClass.java branches/cdom/code/src/java/pcgen/core/PCTemplate.java branches/cdom/code/src/java/pcgen/core/PObject.java branches/cdom/code/src/java/pcgen/core/PlayerCharacter.java branches/cdom/code/src/java/pcgen/core/Skill.java branches/cdom/code/src/java/pcgen/core/VariableProcessorPC.java branches/cdom/code/src/java/pcgen/core/chooser/SkillListChoiceManager.java branches/cdom/code/src/java/pcgen/core/chooser/SkillListNonClassChoiceManager.java branches/cdom/code/src/java/pcgen/core/chooser/SkillsNamedChoiceManager.java branches/cdom/code/src/java/pcgen/core/chooser/SkillsNamedToCCSkillChoiceManager.java branches/cdom/code/src/java/pcgen/core/npcgen/ClassDataParser.java branches/cdom/code/src/java/pcgen/core/npcgen/NPCGenerator.java branches/cdom/code/src/java/pcgen/gui/editor/ClassBasePanel.java branches/cdom/code/src/java/pcgen/gui/filter/FilterFactory.java branches/cdom/code/src/java/pcgen/gui/tabs/InfoClasses.java branches/cdom/code/src/java/pcgen/gui/tabs/InfoSkills.java branches/cdom/code/src/java/pcgen/gui/tabs/InfoSummary.java branches/cdom/code/src/java/pcgen/gui/tabs/InfoTemplates.java branches/cdom/code/src/java/pcgen/gui/tabs/ability/AbilityModel.java branches/cdom/code/src/java/pcgen/gui/tabs/ability/AbilitySelectionPanel.java branches/cdom/code/src/java/pcgen/io/ExportHandler.java branches/cdom/code/src/java/pcgen/io/exporttoken/AbilityToken.java branches/cdom/code/src/java/pcgen/io/exporttoken/SkillToken.java branches/cdom/code/src/java/pcgen/util/enumeration/Visibility.java branches/cdom/code/src/java/plugin/charactersheet/gui/SkillsPane.java branches/cdom/code/src/java/plugin/exporttokens/SkillSubsetToken.java branches/cdom/code/src/java/plugin/lsttokens/ability/VisibleToken.java branches/cdom/code/src/java/plugin/lsttokens/pcclass/VisibleToken.java branches/cdom/code/src/java/plugin/lsttokens/skill/VisibleToken.java branches/cdom/code/src/java/plugin/lsttokens/template/VisibleToken.java Modified: branches/cdom/code/src/java/gmgen/plugin/PcgCombatant.java =================================================================== --- branches/cdom/code/src/java/gmgen/plugin/PcgCombatant.java 2007-03-01 04:20:54 UTC (rev 2270) +++ branches/cdom/code/src/java/gmgen/plugin/PcgCombatant.java 2007-03-01 04:36:46 UTC (rev 2271) @@ -712,7 +712,7 @@ } ArrayList<Skill> skillList = pc.getSkillListInOutputOrder(pc - .getPartialSkillList(Visibility.OUTPUT_ONLY)); + .getPartialSkillList(Visibility.EXPORT)); boolean firstLine = true; for ( Skill skill : skillList ) Modified: branches/cdom/code/src/java/pcgen/core/Ability.java =================================================================== --- branches/cdom/code/src/java/pcgen/core/Ability.java 2007-03-01 04:20:54 UTC (rev 2270) +++ branches/cdom/code/src/java/pcgen/core/Ability.java 2007-03-01 04:36:46 UTC (rev 2271) @@ -420,19 +420,19 @@ switch (getVisibility()) { - case HIDDEN: + case NO: txt.append("EXPORT"); break; - case OUTPUT_ONLY: + case EXPORT: txt.append("EXPORT"); break; - case DISPLAY_ONLY: + case DISPLAY: txt.append("DISPLAY"); break; - case DEFAULT: + case YES: default: txt.append("YES"); break; Modified: branches/cdom/code/src/java/pcgen/core/EquipmentChoice.java =================================================================== --- branches/cdom/code/src/java/pcgen/core/EquipmentChoice.java 2007-03-01 04:20:54 UTC (rev 2270) +++ branches/cdom/code/src/java/pcgen/core/EquipmentChoice.java 2007-03-01 04:36:46 UTC (rev 2271) @@ -366,7 +366,7 @@ anAbility.isType(typeString) ); - if ((anAbility.getVisibility() == Visibility.DEFAULT) + if ((anAbility.getVisibility() == Visibility.YES) && !this.getAvailableList().contains(anAbility.getKeyName())) { if (matchesType && (anAbility.getChoiceString().length() == 0)) Modified: branches/cdom/code/src/java/pcgen/core/Globals.java =================================================================== --- branches/cdom/code/src/java/pcgen/core/Globals.java 2007-03-01 04:20:54 UTC (rev 2270) +++ branches/cdom/code/src/java/pcgen/core/Globals.java 2007-03-01 04:36:46 UTC (rev 2271) @@ -1677,8 +1677,8 @@ { final Visibility skillVis = skill.getVisibility(); - if (vis == Visibility.DEFAULT - || skillVis == Visibility.DEFAULT + if (vis == Visibility.YES + || skillVis == Visibility.YES || skillVis == vis) { aList.add(skill); Modified: branches/cdom/code/src/java/pcgen/core/PCClass.java =================================================================== --- branches/cdom/code/src/java/pcgen/core/PCClass.java 2007-03-01 04:20:54 UTC (rev 2270) +++ branches/cdom/code/src/java/pcgen/core/PCClass.java 2007-03-01 04:36:46 UTC (rev 2271) @@ -3311,7 +3311,7 @@ pccTxt.append("\tSTARTSKILLPTS:").append(skillPointFormula); } - if (!getVisibility().equals(Visibility.DEFAULT)) { + if (!getVisibility().equals(Visibility.YES)) { pccTxt.append("\tVISIBLE:" + getVisibility().toString()); } Modified: branches/cdom/code/src/java/pcgen/core/PCTemplate.java =================================================================== --- branches/cdom/code/src/java/pcgen/core/PCTemplate.java 2007-03-01 04:20:54 UTC (rev 2270) +++ branches/cdom/code/src/java/pcgen/core/PCTemplate.java 2007-03-01 04:36:46 UTC (rev 2271) @@ -689,17 +689,17 @@ switch (getVisibility()) { - case DISPLAY_ONLY: + case DISPLAY: txt.append("\tVISIBLE:DISPLAY"); break; - case OUTPUT_ONLY: + case EXPORT: txt.append("\tVISIBLE:EXPORT"); break; - case HIDDEN: + case NO: txt.append("\tVISIBLE:NO"); break; @@ -883,8 +883,8 @@ { boolean result = false; - if ((getVisibility() == Visibility.DEFAULT) - || (getVisibility() == Visibility.DISPLAY_ONLY)) + if ((getVisibility() == Visibility.YES) + || (getVisibility() == Visibility.DISPLAY)) { result = removable; } Modified: branches/cdom/code/src/java/pcgen/core/PObject.java =================================================================== --- branches/cdom/code/src/java/pcgen/core/PObject.java 2007-03-01 04:20:54 UTC (rev 2270) +++ branches/cdom/code/src/java/pcgen/core/PObject.java 2007-03-01 04:36:46 UTC (rev 2271) @@ -120,7 +120,7 @@ protected String displayName = Constants.EMPTY_STRING; /** Indicates if this object should be displayed to the user in the UI. */ - protected Visibility visibility = Visibility.DEFAULT; + protected Visibility visibility = Visibility.YES; /** Map of the bonuses for the object */ private HashMap<String, String> bonusMap = null; @@ -2970,8 +2970,8 @@ { switch (anAbility.getVisibility()) { - case HIDDEN: - case OUTPUT_ONLY: + case NO: + case EXPORT: canProcess = true; break; Modified: branches/cdom/code/src/java/pcgen/core/PlayerCharacter.java =================================================================== --- branches/cdom/code/src/java/pcgen/core/PlayerCharacter.java 2007-03-01 04:20:54 UTC (rev 2270) +++ branches/cdom/code/src/java/pcgen/core/PlayerCharacter.java 2007-03-01 04:36:46 UTC (rev 2271) @@ -415,7 +415,7 @@ { final Visibility skillVis = aSkill.getVisibility(); - if ((vis == Visibility.DEFAULT) || (skillVis == Visibility.DEFAULT) + if ((vis == Visibility.YES) || (skillVis == Visibility.YES) || (skillVis == vis)) { aList.add(aSkill); @@ -3412,8 +3412,8 @@ for (PCTemplate template : getTemplateList()) { - if ((template.getVisibility() == Visibility.DEFAULT) - || (template.getVisibility() == Visibility.OUTPUT_ONLY)) + if ((template.getVisibility() == Visibility.YES) + || (template.getVisibility() == Visibility.EXPORT)) { tl.add(template); } @@ -16792,8 +16792,8 @@ for (Ability feat : aggregateFeatList()) { - if ((feat.getVisibility() == Visibility.DEFAULT) - || (feat.getVisibility() == Visibility.OUTPUT_ONLY)) + if ((feat.getVisibility() == Visibility.YES) + || (feat.getVisibility() == Visibility.EXPORT)) { tempFeatList.add(feat); } @@ -16813,8 +16813,8 @@ final List<Ability> ret = new ArrayList<Ability>(abilities.size()); for (final Ability ability : abilities) { - if (ability.getVisibility() == Visibility.DEFAULT - || ability.getVisibility() == Visibility.OUTPUT_ONLY) + if (ability.getVisibility() == Visibility.YES + || ability.getVisibility() == Visibility.EXPORT) { ret.add(ability); } Modified: branches/cdom/code/src/java/pcgen/core/Skill.java =================================================================== --- branches/cdom/code/src/java/pcgen/core/Skill.java 2007-03-01 04:20:54 UTC (rev 2270) +++ branches/cdom/code/src/java/pcgen/core/Skill.java 2007-03-01 04:36:46 UTC (rev 2271) @@ -459,16 +459,16 @@ } } - if (getVisibility() != Visibility.DEFAULT) + if (getVisibility() != Visibility.YES) { txt.append("\tVISIBLE:"); switch (getVisibility()) { - case OUTPUT_ONLY: + case EXPORT: txt.append("EXPORT"); break; - case DISPLAY_ONLY: + case DISPLAY: txt.append("GUI"); break; Modified: branches/cdom/code/src/java/pcgen/core/VariableProcessorPC.java =================================================================== --- branches/cdom/code/src/java/pcgen/core/VariableProcessorPC.java 2007-03-01 04:20:54 UTC (rev 2270) +++ branches/cdom/code/src/java/pcgen/core/VariableProcessorPC.java 2007-03-01 04:36:46 UTC (rev 2271) @@ -136,7 +136,7 @@ if (countVisible) { - if ((feat.getVisibility() != Visibility.DISPLAY_ONLY) && (feat.getVisibility() != Visibility.HIDDEN)) + if ((feat.getVisibility() != Visibility.DISPLAY) && (feat.getVisibility() != Visibility.NO)) { if (onceOnly) { @@ -151,7 +151,7 @@ if (countHidden) { - if ((feat.getVisibility() == Visibility.DISPLAY_ONLY) || (feat.getVisibility() == Visibility.HIDDEN)) + if ((feat.getVisibility() == Visibility.DISPLAY) || (feat.getVisibility() == Visibility.NO)) { if (onceOnly) { @@ -1070,8 +1070,8 @@ { final Visibility vis = template.getVisibility(); - if ((vis == Visibility.DEFAULT) - || (vis == Visibility.OUTPUT_ONLY)) + if ((vis == Visibility.YES) + || (vis == Visibility.EXPORT)) { ++count; } Modified: branches/cdom/code/src/java/pcgen/core/chooser/SkillListChoiceManager.java =================================================================== --- branches/cdom/code/src/java/pcgen/core/chooser/SkillListChoiceManager.java 2007-03-01 04:20:54 UTC (rev 2270) +++ branches/cdom/code/src/java/pcgen/core/chooser/SkillListChoiceManager.java 2007-03-01 04:36:46 UTC (rev 2271) @@ -90,7 +90,7 @@ else // if it was LIST { - for ( Skill skill : Globals.getPartialSkillList(Visibility.DISPLAY_ONLY) ) + for ( Skill skill : Globals.getPartialSkillList(Visibility.DISPLAY) ) { final String rootName = skill.getRootName(); final int rootNameLength = rootName.length(); @@ -137,7 +137,7 @@ Ability ability = (Ability) pobject; if (rootArrayList.contains(item)) { - for ( Skill skill : Globals.getPartialSkillList(Visibility.DISPLAY_ONLY) ) + for ( Skill skill : Globals.getPartialSkillList(Visibility.DISPLAY) ) { if (skill.getRootName().equalsIgnoreCase(item)) { Modified: branches/cdom/code/src/java/pcgen/core/chooser/SkillListNonClassChoiceManager.java =================================================================== --- branches/cdom/code/src/java/pcgen/core/chooser/SkillListNonClassChoiceManager.java 2007-03-01 04:20:54 UTC (rev 2270) +++ branches/cdom/code/src/java/pcgen/core/chooser/SkillListNonClassChoiceManager.java 2007-03-01 04:36:46 UTC (rev 2271) @@ -85,7 +85,7 @@ else // if it was LIST { - for ( Skill skill : Globals.getPartialSkillList(Visibility.DISPLAY_ONLY) ) + for ( Skill skill : Globals.getPartialSkillList(Visibility.DISPLAY) ) { if ((skill.costForPCClassList(aPc.getClassList(), aPc) == Globals.getGameModeSkillCost_Class()) || skill.isExclusive()) { Modified: branches/cdom/code/src/java/pcgen/core/chooser/SkillsNamedChoiceManager.java =================================================================== --- branches/cdom/code/src/java/pcgen/core/chooser/SkillsNamedChoiceManager.java 2007-03-01 04:20:54 UTC (rev 2270) +++ branches/cdom/code/src/java/pcgen/core/chooser/SkillsNamedChoiceManager.java 2007-03-01 04:36:46 UTC (rev 2271) @@ -74,7 +74,7 @@ if (token.startsWith("TYPE.") || token.startsWith("TYPE=")) { - for ( Skill skill : Globals.getPartialSkillList(Visibility.DISPLAY_ONLY) ) + for ( Skill skill : Globals.getPartialSkillList(Visibility.DISPLAY) ) { if (skill.isType(token.substring(5))) { @@ -85,7 +85,7 @@ if ("ALL".equals(token)) { - for ( Skill skill : Globals.getPartialSkillList(Visibility.DISPLAY_ONLY) ) + for ( Skill skill : Globals.getPartialSkillList(Visibility.DISPLAY) ) { availableList.add(skill.getKeyName()); } @@ -93,7 +93,7 @@ if ("CLASS".equals(token)) { - for ( Skill skill : Globals.getPartialSkillList(Visibility.DISPLAY_ONLY) ) + for ( Skill skill : Globals.getPartialSkillList(Visibility.DISPLAY) ) { if (skill.costForPCClassList(aPc.getClassList(), aPc) == Globals.getGameModeSkillCost_Class()) { @@ -104,7 +104,7 @@ if ("CROSSCLASS".equals(token)) { - for ( Skill skill : Globals.getPartialSkillList(Visibility.DISPLAY_ONLY) ) + for ( Skill skill : Globals.getPartialSkillList(Visibility.DISPLAY) ) { if (skill.costForPCClassList(aPc.getClassList(), aPc) > Globals.getGameModeSkillCost_Class()) { @@ -115,7 +115,7 @@ if ("EXCLUSIVE".equals(token)) { - for ( Skill skill : Globals.getPartialSkillList(Visibility.DISPLAY_ONLY) ) + for ( Skill skill : Globals.getPartialSkillList(Visibility.DISPLAY) ) { if (skill.costForPCClassList(aPc.getClassList(), aPc) == Globals.getGameModeSkillCost_Exclusive()) { @@ -126,7 +126,7 @@ if ("NORANK".equals(token)) { - for ( Skill skill : Globals.getPartialSkillList(Visibility.DISPLAY_ONLY) ) + for ( Skill skill : Globals.getPartialSkillList(Visibility.DISPLAY) ) { final Skill pcSkill = aPc.getSkillKeyed(skill.getKeyName()); @@ -143,7 +143,7 @@ token = token.substring(0, token.length() - 1); } - for ( Skill skill : Globals.getPartialSkillList(Visibility.DISPLAY_ONLY) ) + for ( Skill skill : Globals.getPartialSkillList(Visibility.DISPLAY) ) { if (skill.getKeyName().equals(token) || (startsWith && skill.getKeyName().startsWith(token))) { Modified: branches/cdom/code/src/java/pcgen/core/chooser/SkillsNamedToCCSkillChoiceManager.java =================================================================== --- branches/cdom/code/src/java/pcgen/core/chooser/SkillsNamedToCCSkillChoiceManager.java 2007-03-01 04:20:54 UTC (rev 2270) +++ branches/cdom/code/src/java/pcgen/core/chooser/SkillsNamedToCCSkillChoiceManager.java 2007-03-01 04:36:46 UTC (rev 2271) @@ -74,7 +74,7 @@ if (pobject != null && pobject instanceof Ability) { Ability anAbility = (Ability) pobject; - for ( Skill skill : Globals.getPartialSkillList(Visibility.DISPLAY_ONLY) ) + for ( Skill skill : Globals.getPartialSkillList(Visibility.DISPLAY) ) { if (skill.getRootName().equalsIgnoreCase(item)) { Modified: branches/cdom/code/src/java/pcgen/core/npcgen/ClassDataParser.java =================================================================== --- branches/cdom/code/src/java/pcgen/core/npcgen/ClassDataParser.java 2007-03-01 04:20:54 UTC (rev 2270) +++ branches/cdom/code/src/java/pcgen/core/npcgen/ClassDataParser.java 2007-03-01 04:36:46 UTC (rev 2271) @@ -350,7 +350,7 @@ final List<Ability> subFeats = Globals.getAbilitiesByType(theCurrentCategory.getAbilityCategory(), key.substring(5)); for ( final Ability ability : subFeats ) { - if (ability.getVisibility() == Visibility.DEFAULT) + if (ability.getVisibility() == Visibility.YES) { if (weight > 0) { @@ -469,7 +469,7 @@ final List<Skill> allSkills = Globals.getSkillList(); for ( final Skill skill : allSkills ) { - if (skill.getVisibility() == Visibility.DEFAULT) + if (skill.getVisibility() == Visibility.YES) { theCurrentData.addSkill(skill.getKeyName(), remainingWeight); } @@ -491,7 +491,7 @@ for (Iterator<? extends Categorisable> i = Globals.getAbilityNameIterator(theCurrentCategory.getAbilityCategory()); i.hasNext(); ) { final Ability ability = (Ability)i.next(); - if ( ability.getVisibility() == Visibility.DEFAULT) + if ( ability.getVisibility() == Visibility.YES) { theCurrentData.addAbility(theCurrentCategory, ability, remainingWeight); } Modified: branches/cdom/code/src/java/pcgen/core/npcgen/NPCGenerator.java =================================================================== --- branches/cdom/code/src/java/pcgen/core/npcgen/NPCGenerator.java 2007-03-01 04:20:54 UTC (rev 2270) +++ branches/cdom/code/src/java/pcgen/core/npcgen/NPCGenerator.java 2007-03-01 04:36:46 UTC (rev 2271) @@ -161,7 +161,7 @@ // are 1/8 as likely to be selected. for ( Skill skill : Globals.getSkillList() ) { - if ( skill.getVisibility() == Visibility.DEFAULT ) + if ( skill.getVisibility() == Visibility.YES ) { if (skill.isClassSkill(aClass, aPC)) { @@ -333,7 +333,7 @@ { int weight = 1; Ability ability = (Ability)i.next(); - if (!(ability.getVisibility() == Visibility.DEFAULT)) + if (!(ability.getVisibility() == Visibility.YES)) { continue; } @@ -602,7 +602,7 @@ { break; } - if (aClass.getVisibility().equals(Visibility.DEFAULT) + if (aClass.getVisibility().equals(Visibility.YES) && PrereqHandler.passesAll(aClass.getPreReqList(), aPC, aClass) && aClass.isQualified(aPC)) { Modified: branches/cdom/code/src/java/pcgen/gui/editor/ClassBasePanel.java =================================================================== --- branches/cdom/code/src/java/pcgen/gui/editor/ClassBasePanel.java 2007-03-01 04:20:54 UTC (rev 2270) +++ branches/cdom/code/src/java/pcgen/gui/editor/ClassBasePanel.java 2007-03-01 04:36:46 UTC (rev 2271) @@ -122,7 +122,7 @@ obj.setHasSubClass(hasSubClass.getSelectedObjects() != null); obj.setModToSkills(modToSkills.getSelectedObjects() != null); obj.setMultiPreReqs(multiPreReq.getSelectedObjects() != null); - obj.setVisibility(chkVisible.getSelectedObjects() == null ? Visibility.HIDDEN : Visibility.DEFAULT); + obj.setVisibility(chkVisible.getSelectedObjects() == null ? Visibility.NO : Visibility.YES); Object[] sel = getTypesSelectedList(); thisPObject.setTypeInfo(".CLEAR"); @@ -196,7 +196,7 @@ hasSubClass.setSelected(obj.hasSubClass()); modToSkills.setSelected(obj.getModToSkills()); multiPreReq.setSelected(obj.multiPreReqs()); - chkVisible.setSelected(obj.getVisibility().equals(Visibility.DEFAULT)); + chkVisible.setSelected(obj.getVisibility().equals(Visibility.YES)); } private static GridBagConstraints buildConstraints(GridBagConstraints gridBagConstraints, int gridx, int gridy, Modified: branches/cdom/code/src/java/pcgen/gui/filter/FilterFactory.java =================================================================== --- branches/cdom/code/src/java/pcgen/gui/filter/FilterFactory.java 2007-03-01 04:20:54 UTC (rev 2270) +++ branches/cdom/code/src/java/pcgen/gui/filter/FilterFactory.java 2007-03-01 04:36:46 UTC (rev 2271) @@ -301,7 +301,7 @@ for ( final PCClass pcClass : Globals.getClassList() ) { - if (pcClass.getVisibility().equals(Visibility.DEFAULT) && filter.accept(null, pcClass)) + if (pcClass.getVisibility().equals(Visibility.YES) && filter.accept(null, pcClass)) { raceFilters.add(FilterFactory.createFavoredClassFilter(pcClass.getKeyName())); } Modified: branches/cdom/code/src/java/pcgen/gui/tabs/InfoClasses.java =================================================================== --- branches/cdom/code/src/java/pcgen/gui/tabs/InfoClasses.java 2007-03-01 04:20:54 UTC (rev 2270) +++ branches/cdom/code/src/java/pcgen/gui/tabs/InfoClasses.java 2007-03-01 04:36:46 UTC (rev 2271) @@ -2103,7 +2103,7 @@ } return (modelType == 1) - || (aClass.getVisibility().equals(Visibility.DEFAULT) && accept( + || (aClass.getVisibility().equals(Visibility.YES) && accept( pc, aClass)); } Modified: branches/cdom/code/src/java/pcgen/gui/tabs/InfoSkills.java =================================================================== --- branches/cdom/code/src/java/pcgen/gui/tabs/InfoSkills.java 2007-03-01 04:20:54 UTC (rev 2270) +++ branches/cdom/code/src/java/pcgen/gui/tabs/InfoSkills.java 2007-03-01 04:36:46 UTC (rev 2271) @@ -3043,7 +3043,7 @@ else { if (available - && (skill.getVisibility() == Visibility.OUTPUT_ONLY)) + && (skill.getVisibility() == Visibility.EXPORT)) { continue; } @@ -3249,8 +3249,8 @@ { skillList = available ? Globals - .getPartialSkillList(Visibility.DISPLAY_ONLY) : pc - .getPartialSkillList(Visibility.DISPLAY_ONLY); + .getPartialSkillList(Visibility.DISPLAY) : pc + .getPartialSkillList(Visibility.DISPLAY); listSize = skillList.size(); index = 0; Modified: branches/cdom/code/src/java/pcgen/gui/tabs/InfoSummary.java =================================================================== --- branches/cdom/code/src/java/pcgen/gui/tabs/InfoSummary.java 2007-03-01 04:20:54 UTC (rev 2270) +++ branches/cdom/code/src/java/pcgen/gui/tabs/InfoSummary.java 2007-03-01 04:36:46 UTC (rev 2271) @@ -3047,7 +3047,7 @@ continue; } - if (aClass.getVisibility().equals(Visibility.DEFAULT) + if (aClass.getVisibility().equals(Visibility.YES) && accept(pc, aClass)) { addElement(aClass); Modified: branches/cdom/code/src/java/pcgen/gui/tabs/InfoTemplates.java =================================================================== --- branches/cdom/code/src/java/pcgen/gui/tabs/InfoTemplates.java 2007-03-01 04:20:54 UTC (rev 2270) +++ branches/cdom/code/src/java/pcgen/gui/tabs/InfoTemplates.java 2007-03-01 04:36:46 UTC (rev 2271) @@ -1345,8 +1345,8 @@ */ private boolean shouldDisplayThis(final PCTemplate template) { - return ((template.getVisibility() == Visibility.DEFAULT || template - .getVisibility() == Visibility.DISPLAY_ONLY) && accept(getPc(), + return ((template.getVisibility() == Visibility.YES || template + .getVisibility() == Visibility.DISPLAY) && accept(getPc(), template)); } Modified: branches/cdom/code/src/java/pcgen/gui/tabs/ability/AbilityModel.java =================================================================== --- branches/cdom/code/src/java/pcgen/gui/tabs/ability/AbilityModel.java 2007-03-01 04:20:54 UTC (rev 2270) +++ branches/cdom/code/src/java/pcgen/gui/tabs/ability/AbilityModel.java 2007-03-01 04:36:46 UTC (rev 2271) @@ -128,8 +128,8 @@ // We will use the global lists for this for (final Ability ability : Globals.getAbilityList(theCategory)) { - if (!((ability.getVisibility() == Visibility.DEFAULT) || (ability - .getVisibility() == Visibility.DISPLAY_ONLY))) + if (!((ability.getVisibility() == Visibility.YES) || (ability + .getVisibility() == Visibility.DISPLAY))) { continue; } Modified: branches/cdom/code/src/java/pcgen/gui/tabs/ability/AbilitySelectionPanel.java =================================================================== --- branches/cdom/code/src/java/pcgen/gui/tabs/ability/AbilitySelectionPanel.java 2007-03-01 04:20:54 UTC (rev 2270) +++ branches/cdom/code/src/java/pcgen/gui/tabs/ability/AbilitySelectionPanel.java 2007-03-01 04:36:46 UTC (rev 2271) @@ -529,8 +529,8 @@ public boolean accept(@SuppressWarnings("unused") final ViewMode aMode, final Ability anAbility) { - if (!((anAbility.getVisibility() == Visibility.DEFAULT) || (anAbility - .getVisibility() == Visibility.DISPLAY_ONLY))) + if (!((anAbility.getVisibility() == Visibility.YES) || (anAbility + .getVisibility() == Visibility.DISPLAY))) { return false; } Modified: branches/cdom/code/src/java/pcgen/io/ExportHandler.java =================================================================== --- branches/cdom/code/src/java/pcgen/io/ExportHandler.java 2007-03-01 04:20:54 UTC (rev 2270) +++ branches/cdom/code/src/java/pcgen/io/ExportHandler.java 2007-03-01 04:36:46 UTC (rev 2271) @@ -1807,8 +1807,8 @@ } final PCTemplate template = tList.get(index); - if (template.getVisibility() != Visibility.DEFAULT - && template.getVisibility() != Visibility.OUTPUT_ONLY) + if (template.getVisibility() != Visibility.YES + && template.getVisibility() != Visibility.EXPORT) { canWrite = false; } Modified: branches/cdom/code/src/java/pcgen/io/exporttoken/AbilityToken.java =================================================================== --- branches/cdom/code/src/java/pcgen/io/exporttoken/AbilityToken.java 2007-03-01 04:20:54 UTC (rev 2270) +++ branches/cdom/code/src/java/pcgen/io/exporttoken/AbilityToken.java 2007-03-01 04:36:46 UTC (rev 2271) @@ -263,16 +263,16 @@ matchVisibilityDef = true; break; case ABILITY_HIDDEN: - if (aAbility.getVisibility() == Visibility.HIDDEN - || aAbility.getVisibility() == Visibility.DISPLAY_ONLY) + if (aAbility.getVisibility() == Visibility.NO + || aAbility.getVisibility() == Visibility.DISPLAY) { matchVisibilityDef = true; } break; case ABILITY_VISIBLE: // Fall thru intentional default: - if (aAbility.getVisibility() == Visibility.DEFAULT - || aAbility.getVisibility() == Visibility.OUTPUT_ONLY) + if (aAbility.getVisibility() == Visibility.YES + || aAbility.getVisibility() == Visibility.EXPORT) { matchVisibilityDef = true; } Modified: branches/cdom/code/src/java/pcgen/io/exporttoken/SkillToken.java =================================================================== --- branches/cdom/code/src/java/pcgen/io/exporttoken/SkillToken.java 2007-03-01 04:20:54 UTC (rev 2270) +++ branches/cdom/code/src/java/pcgen/io/exporttoken/SkillToken.java 2007-03-01 04:36:46 UTC (rev 2271) @@ -113,7 +113,7 @@ final int i = Integer.parseInt(details.skillId); final List<Skill> pcSkills = pc.getSkillListInOutputOrder(pc - .getPartialSkillList(Visibility.OUTPUT_ONLY)); + .getPartialSkillList(Visibility.EXPORT)); if ((i >= (pcSkills.size() - 1)) && eh != null && eh.getExistsOnly()) Modified: branches/cdom/code/src/java/pcgen/util/enumeration/Visibility.java =================================================================== --- branches/cdom/code/src/java/pcgen/util/enumeration/Visibility.java 2007-03-01 04:20:54 UTC (rev 2270) +++ branches/cdom/code/src/java/pcgen/util/enumeration/Visibility.java 2007-03-01 04:36:46 UTC (rev 2271) @@ -3,10 +3,11 @@ public enum Visibility { - HIDDEN("No"), // Does not show up either in the GUI or on the output sheet - DEFAULT("Yes"), // Shows up both in the GUI and on the output sheet - OUTPUT_ONLY("Export"), // Shows up on the output sheet, but not in the GUI - DISPLAY_ONLY("Display"); // Shows up in the GUI, but not on the output sheet + NO("No"), // Does not show up either in the GUI or on the output sheet + YES("Yes"), // Shows up both in the GUI and on the output sheet + EXPORT("Export"), // Shows up on the output sheet, but not in the GUI + DISPLAY("Display"), // Shows up in the GUI, but not on the output sheet + QUALIFY("Qualify"); // Shows up in a Customizer only when qualified private final String text; @@ -36,18 +37,23 @@ } if (view == View.HIDDEN) { - if (this == Visibility.HIDDEN || this == Visibility.DISPLAY_ONLY) + if (this == Visibility.NO || this == Visibility.DISPLAY) { return true; } } else { - if (this == Visibility.DEFAULT || this == Visibility.OUTPUT_ONLY) + if (this == Visibility.YES || this == Visibility.EXPORT) { return true; } } return false; } + + public CharSequence getLSTFormat() + { + return toString().toUpperCase(); + } } Modified: branches/cdom/code/src/java/plugin/charactersheet/gui/SkillsPane.java =================================================================== --- branches/cdom/code/src/java/plugin/charactersheet/gui/SkillsPane.java 2007-03-01 04:20:54 UTC (rev 2270) +++ branches/cdom/code/src/java/plugin/charactersheet/gui/SkillsPane.java 2007-03-01 04:36:46 UTC (rev 2271) @@ -343,7 +343,7 @@ List<Skill> skillList = pc.getSkillListInOutputOrder(pc - .getPartialSkillList(Visibility.OUTPUT_ONLY)); + .getPartialSkillList(Visibility.EXPORT)); // Remove only the skill lines, not the header block. for(int i = 0; i < componentList.size(); i++) Modified: branches/cdom/code/src/java/plugin/exporttokens/SkillSubsetToken.java =================================================================== --- branches/cdom/code/src/java/plugin/exporttokens/SkillSubsetToken.java 2007-03-01 04:20:54 UTC (rev 2270) +++ branches/cdom/code/src/java/plugin/exporttokens/SkillSubsetToken.java 2007-03-01 04:36:46 UTC (rev 2271) @@ -113,7 +113,7 @@ List<Skill> skillSubset = new ArrayList<Skill>(); final List<Skill> skills = pc.getSkillListInOutputOrder(pc - .getPartialSkillList(Visibility.OUTPUT_ONLY)); + .getPartialSkillList(Visibility.EXPORT)); for (Skill bSkill : skills) { Modified: branches/cdom/code/src/java/plugin/lsttokens/ability/VisibleToken.java =================================================================== --- branches/cdom/code/src/java/plugin/lsttokens/ability/VisibleToken.java 2007-03-01 04:20:54 UTC (rev 2270) +++ branches/cdom/code/src/java/plugin/lsttokens/ability/VisibleToken.java 2007-03-01 04:36:46 UTC (rev 2271) @@ -40,7 +40,7 @@ Logging.errorPrint(" using EXPORT"); Logging.errorPrint(" This will break after PCGen 5.12"); } - ability.setVisibility(Visibility.OUTPUT_ONLY); + ability.setVisibility(Visibility.EXPORT); } else if (visType.startsWith("NO")) { @@ -50,7 +50,7 @@ Logging.errorPrint(" using NO"); Logging.errorPrint(" This will break after PCGen 5.12"); } - ability.setVisibility(Visibility.HIDDEN); + ability.setVisibility(Visibility.NO); } else if (visType.startsWith("DISPLAY")) { @@ -60,11 +60,11 @@ Logging.errorPrint(" using DISPLAY"); Logging.errorPrint(" This will break after PCGen 5.12"); } - ability.setVisibility(Visibility.DISPLAY_ONLY); + ability.setVisibility(Visibility.DISPLAY); } else { - ability.setVisibility(Visibility.DEFAULT); + ability.setVisibility(Visibility.YES); } return true; } Modified: branches/cdom/code/src/java/plugin/lsttokens/pcclass/VisibleToken.java =================================================================== --- branches/cdom/code/src/java/plugin/lsttokens/pcclass/VisibleToken.java 2007-03-01 04:20:54 UTC (rev 2270) +++ branches/cdom/code/src/java/plugin/lsttokens/pcclass/VisibleToken.java 2007-03-01 04:36:46 UTC (rev 2271) @@ -19,7 +19,7 @@ { if (!value.toUpperCase().startsWith("Y")) { - pcclass.setVisibility(Visibility.HIDDEN); + pcclass.setVisibility(Visibility.NO); } //Assume DEFAULT is the DEFAULT :) return true; } Modified: branches/cdom/code/src/java/plugin/lsttokens/skill/VisibleToken.java =================================================================== --- branches/cdom/code/src/java/plugin/lsttokens/skill/VisibleToken.java 2007-03-01 04:20:54 UTC (rev 2270) +++ branches/cdom/code/src/java/plugin/lsttokens/skill/VisibleToken.java 2007-03-01 04:36:46 UTC (rev 2271) @@ -21,19 +21,19 @@ if (visType.startsWith("YES") || visType.startsWith("ALWAYS")) { - skill.setVisibility(Visibility.DEFAULT); + skill.setVisibility(Visibility.YES); } else if (visType.startsWith("GUI")) { - skill.setVisibility(Visibility.DISPLAY_ONLY); + skill.setVisibility(Visibility.DISPLAY); } else if (visType.startsWith("EXPORT") || visType.startsWith("CSHEET")) { - skill.setVisibility(Visibility.OUTPUT_ONLY); + skill.setVisibility(Visibility.EXPORT); } else { - skill.setVisibility(Visibility.DEFAULT); + skill.setVisibility(Visibility.YES); return false; } Modified: branches/cdom/code/src/java/plugin/lsttokens/template/VisibleToken.java =================================================================== --- branches/cdom/code/src/java/plugin/lsttokens/template/VisibleToken.java 2007-03-01 04:20:54 UTC (rev 2270) +++ branches/cdom/code/src/java/plugin/lsttokens/template/VisibleToken.java 2007-03-01 04:36:46 UTC (rev 2271) @@ -26,7 +26,7 @@ + "' is not valid, please use DISPLAY " + "(exact String, upper case)"); } - template.setVisibility(Visibility.DISPLAY_ONLY); + template.setVisibility(Visibility.DISPLAY); } else if (value.startsWith("EXPORT")) { @@ -36,7 +36,7 @@ + "' is not valid, please use EXPORT " + "(exact String, upper case)"); } - template.setVisibility(Visibility.OUTPUT_ONLY); + template.setVisibility(Visibility.EXPORT); } else if (value.startsWith("NO")) { @@ -46,7 +46,7 @@ + "' is not valid, please use NO " + "(exact String, upper case)"); } - template.setVisibility(Visibility.HIDDEN); + template.setVisibility(Visibility.NO); } else { @@ -56,7 +56,7 @@ + "' is not valid, please use ALWAYS " + "(exact String, upper case)"); } - template.setVisibility(Visibility.DEFAULT); + template.setVisibility(Visibility.YES); } return true; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |