From: <jde...@us...> - 2008-04-24 10:22:32
|
Revision: 6095 http://pcgen.svn.sourceforge.net/pcgen/?rev=6095&view=rev Author: jdempsey Date: 2008-04-24 03:22:37 -0700 (Thu, 24 Apr 2008) Log Message: ----------- Fix bug: [5.13.5] Gear-Ignore Cost applying to all Issue#: 1846790 Modified Paths: -------------- Trunk/pcgen/code/src/java/pcgen/core/PlayerCharacter.java Trunk/pcgen/code/src/java/pcgen/gui/prop/LanguageBundle.properties Trunk/pcgen/code/src/java/pcgen/gui/tabs/InfoGear.java Trunk/pcgen/code/src/java/pcgen/io/IOConstants.java Trunk/pcgen/code/src/java/pcgen/io/PCGVer2Creator.java Trunk/pcgen/code/src/java/pcgen/io/PCGVer2Parser.java Modified: Trunk/pcgen/code/src/java/pcgen/core/PlayerCharacter.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/core/PlayerCharacter.java 2008-04-24 09:28:07 UTC (rev 6094) +++ Trunk/pcgen/code/src/java/pcgen/core/PlayerCharacter.java 2008-04-24 10:22:37 UTC (rev 6095) @@ -231,6 +231,15 @@ // Should we sort the gear automatically? private boolean autoSortGear = true; + // Should we ignore cost for gear? + private boolean ignoreCost = SettingsHandler.getGearTab_IgnoreCost(); + + // Should we allow the character to go into debt? + private boolean allowDebt = SettingsHandler.getGearTab_AllowDebt(); + + // Should we resize the gear automatically? + private boolean autoResize = SettingsHandler.getGearTab_AutoResize(); + private final boolean useMonsterDefault = SettingsHandler.isMonsterDefault(); @@ -4571,6 +4580,22 @@ setDirty(true); } + /** + * @return the allowDebt + */ + public boolean isAllowDebt() + { + return allowDebt; + } + + /** + * @param allowDebt the allowDebt to set + */ + public void setAllowDebt(boolean allowDebt) + { + this.allowDebt = allowDebt; + } + public String getAttackString(AttackType at) { return getAttackString(at, 0); @@ -4828,6 +4853,22 @@ } /** + * @return the autoResize + */ + public boolean isAutoResize() + { + return autoResize; + } + + /** + * @param autoResize the autoResize to set + */ + public void setAutoResize(boolean autoResize) + { + this.autoResize = autoResize; + } + + /** * Sets the autoSortGear. * * @param autoSortGear @@ -4866,6 +4907,22 @@ } /** + * @return the ignoreCost + */ + public boolean isIgnoreCost() + { + return ignoreCost; + } + + /** + * @param ignoreCost the ignoreCost to set + */ + public void setIgnoreCost(boolean ignoreCost) + { + this.ignoreCost = ignoreCost; + } + + /** * Determine whether higher level known spell slots can be used for lower * level spells, or if known spells are restricted to their own level only. * Modified: Trunk/pcgen/code/src/java/pcgen/gui/prop/LanguageBundle.properties =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui/prop/LanguageBundle.properties 2008-04-24 09:28:07 UTC (rev 6094) +++ Trunk/pcgen/code/src/java/pcgen/gui/prop/LanguageBundle.properties 2008-04-24 10:22:37 UTC (rev 6095) @@ -2256,6 +2256,8 @@ in_igAutoSort=Auto-sort output +in_igAutoSortTip=Force the equipment to be sorted alphabetically when output. + in_igIgnoreCost=Ignore Cost in_igCopyItemMenuTitle=Copy Item To Modified: Trunk/pcgen/code/src/java/pcgen/gui/tabs/InfoGear.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui/tabs/InfoGear.java 2008-04-24 09:28:07 UTC (rev 6094) +++ Trunk/pcgen/code/src/java/pcgen/gui/tabs/InfoGear.java 2008-04-24 10:22:37 UTC (rev 6095) @@ -407,6 +407,9 @@ } autoSort.setSelected(pc.isAutoSortGear()); + costBox.setSelected(pc.isIgnoreCost()); + allowDebtBox.setSelected(pc.isAllowDebt()); + autoResize.setSelected(pc.isAutoResize()); pc.aggregateFeatList(); updateAvailableModel(); updateSelectedModel(); @@ -1249,11 +1252,11 @@ riPanel.setLayout(new FlowLayout(FlowLayout.CENTER, 5, 1)); riPanel.add(removeButton); - autoSort.setSelected(pc.getAutoSpells()); + autoSort.setSelected(pc.isAutoSortGear()); riPanel.add(autoSort); Utility.setDescription(autoSort, PropertyFactory - .getString("InfoSpells.add.selected")); //$NON-NLS-1$ + .getString("in_igAutoSortTip")); //$NON-NLS-1$ autoSort.setEnabled(true); autoSort.setMargin(new Insets(1, 14, 1, 14)); @@ -1867,21 +1870,33 @@ { public void actionPerformed(ActionEvent evt) { - SettingsHandler.setGearTab_IgnoreCost(costBox.isSelected()); + if (pc != null) + { + pc.setDirty(true); + pc.setIgnoreCost(costBox.isSelected()); + } } }); allowDebtBox.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent evt) { - SettingsHandler.setGearTab_AllowDebt(allowDebtBox.isSelected()); + if (pc != null) + { + pc.setDirty(true); + pc.setAllowDebt(allowDebtBox.isSelected()); + } } }); autoResize.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent evt) { - SettingsHandler.setGearTab_AutoResize(autoResize.isSelected()); + if (pc != null) + { + pc.setDirty(true); + pc.setAutoResize(autoResize.isSelected()); + } } }); autoSort.addActionListener(new ActionListener() Modified: Trunk/pcgen/code/src/java/pcgen/io/IOConstants.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/io/IOConstants.java 2008-04-24 09:28:07 UTC (rev 6094) +++ Trunk/pcgen/code/src/java/pcgen/io/IOConstants.java 2008-04-24 10:22:37 UTC (rev 6095) @@ -81,6 +81,15 @@ /** AUTOSPELLS */ String TAG_AUTOSPELLS = "AUTOSPELLS"; + /** IGNORECOST */ + String TAG_IGNORECOST = "IGNORECOST"; + + /** ALLOWDEBT */ + String TAG_ALLOWDEBT = "ALLOWDEBT"; + + /** AUTORESIZEGEAR */ + String TAG_AUTORESIZEGEAR = "AUTORESIZEGEAR"; + /** AUTOADDKNOWN */ String TAG_AUTOADDKNOWN = "AUTOADDKNOWN"; Modified: Trunk/pcgen/code/src/java/pcgen/io/PCGVer2Creator.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/io/PCGVer2Creator.java 2008-04-24 09:28:07 UTC (rev 6094) +++ Trunk/pcgen/code/src/java/pcgen/io/PCGVer2Creator.java 2008-04-24 10:22:37 UTC (rev 6095) @@ -158,6 +158,7 @@ appendUseTempModsLine(buffer); appendOutputSheetsLines(buffer); appendAutoSortLines(buffer); + appendGearCostSizeLines(buffer); /* * #Character Bio @@ -1736,6 +1737,19 @@ buffer.append(LINE_SEP); } + private void appendGearCostSizeLines(StringBuffer buffer) + { + buffer.append(TAG_IGNORECOST).append(':'); + buffer.append(thePC.isIgnoreCost() ? 'Y' : 'N'); + buffer.append(LINE_SEP); + buffer.append(TAG_ALLOWDEBT).append(':'); + buffer.append(thePC.isAllowDebt() ? 'Y' : 'N'); + buffer.append(LINE_SEP); + buffer.append(TAG_AUTORESIZEGEAR).append(':'); + buffer.append(thePC.isAutoResize() ? 'Y' : 'N'); + buffer.append(LINE_SEP); + } + private void appendAutoSpellsLine(StringBuffer buffer) { buffer.append(TAG_AUTOSPELLS).append(':'); Modified: Trunk/pcgen/code/src/java/pcgen/io/PCGVer2Parser.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/io/PCGVer2Parser.java 2008-04-24 09:28:07 UTC (rev 6094) +++ Trunk/pcgen/code/src/java/pcgen/io/PCGVer2Parser.java 2008-04-24 10:22:37 UTC (rev 6095) @@ -491,15 +491,43 @@ } /** - * # Auto sort gear - * @param line + * Auto sort gear (Y/N) + * @param line Line of saved data to be processed. **/ private void parseAutoSortGearLine(String line) { thePC.setAutoSortGear(line.endsWith(VALUE_Y)); } + /** + * Ignore cost for gear (Y/N) + * @param line Line of saved data to be processed. + **/ + private void parseIgnoreCostLine(String line) + { + thePC.setIgnoreCost(line.endsWith(VALUE_Y)); + } + + /** + * Allow debt for gear (Y/N) + * @param line Line of saved data to be processed. + **/ + private void parseAllowDebtLine(String line) + { + thePC.setAllowDebt(line.endsWith(VALUE_Y)); + } + + /** + * Auto resize gear (Y/N) + * @param line Line of saved data to be processed. + **/ + private void parseAutoResizeGearLine(String line) + { + thePC.setAutoResize(line.endsWith(VALUE_Y)); + } + + /** * # Auto sort skills - transition only, line is no longer saved * @param line **/ @@ -704,6 +732,21 @@ parseAutoSortGearLine(cache.get(TAG_AUTOSORTGEAR).get(0)); } + if (cache.containsKey(TAG_IGNORECOST)) + { + parseIgnoreCostLine(cache.get(TAG_IGNORECOST).get(0)); + } + + if (cache.containsKey(TAG_ALLOWDEBT)) + { + parseAllowDebtLine(cache.get(TAG_ALLOWDEBT).get(0)); + } + + if (cache.containsKey(TAG_AUTORESIZEGEAR)) + { + parseAutoResizeGearLine(cache.get(TAG_AUTORESIZEGEAR).get(0)); + } + if (cache.containsKey(TAG_AUTOSORTSKILLS)) { parseAutoSortSkillsLine(cache.get(TAG_AUTOSORTSKILLS).get(0)); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |