From: <jde...@us...> - 2012-02-09 11:58:47
|
Revision: 16122 http://pcgen.svn.sourceforge.net/pcgen/?rev=16122&view=rev Author: jdempsey Date: 2012-02-09 11:58:36 +0000 (Thu, 09 Feb 2012) Log Message: ----------- Keep height and weight display updated. Modified Paths: -------------- Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java Modified: Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java 2012-02-09 10:51:37 UTC (rev 16121) +++ Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java 2012-02-09 11:58:36 UTC (rev 16122) @@ -617,6 +617,8 @@ xpTableName.setReference(theCharacter.getXPTableName()); hpRef.setReference(theCharacter.hitPoints()); age.setReference(theCharacter.getAge()); + weightRef.setReference(theCharacter.getWeight()); + heightRef.setReference(theCharacter.getHeight()); updateLevelTodo(); buildAvailableDomainsList(); @@ -1502,6 +1504,8 @@ } age.setReference(theCharacter.getAge()); updateAgeCategoryForAge(); + weightRef.setReference(theCharacter.getWeight()); + heightRef.setReference(theCharacter.getHeight()); refreshClassLevelModel(); characterAbilities.rebuildAbilityLists(); currentXP.setReference(theCharacter.getXP()); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jde...@us...> - 2012-02-11 00:32:07
|
Revision: 16138 http://pcgen.svn.sourceforge.net/pcgen/?rev=16138&view=rev Author: jdempsey Date: 2012-02-11 00:32:01 +0000 (Sat, 11 Feb 2012) Log Message: ----------- Fix bug: Summary Tab - Select ability scores to do showing when already rolled Issue#: CODE-1232 Modified Paths: -------------- Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java Modified: Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java 2012-02-11 00:20:07 UTC (rev 16137) +++ Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java 2012-02-11 00:32:01 UTC (rev 16138) @@ -799,9 +799,9 @@ */ private boolean allAbilitiesAreZero() { - for (StatFacade stat : statScoreMap.keySet()) + for (StatFacade stat : dataSet.getStats()) { - DefaultReferenceFacade<Integer> facade = statScoreMap.get(stat); + ReferenceFacade<Integer> facade = getScoreBaseRef(stat); if (facade.getReference() != 0) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jde...@us...> - 2012-02-17 10:55:41
|
Revision: 16222 http://pcgen.svn.sourceforge.net/pcgen/?rev=16222&view=rev Author: jdempsey Date: 2012-02-17 10:55:34 +0000 (Fri, 17 Feb 2012) Log Message: ----------- Make roll button work in all roll modes. Modified Paths: -------------- Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java Modified: Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java 2012-02-17 08:47:41 UTC (rev 16221) +++ Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java 2012-02-17 10:55:34 UTC (rev 16222) @@ -1372,11 +1372,18 @@ public void rollStats() { GameMode game = (GameMode) dataSet.getGameMode(); - if (game.getCurrentRollingMethod() == null) + int rollMethod = game.getRollMethod(); + if (rollMethod == Constants.CHARACTER_STAT_METHOD_ROLLED + && game.getCurrentRollingMethod() == null) { return; } - theCharacter.rollStats(Constants.CHARACTER_STAT_METHOD_ROLLED); + if (rollMethod == Constants.CHARACTER_STAT_METHOD_USER) + { + // If a user asks to roll in user mode, set it to the current all same value. + rollMethod = Constants.CHARACTER_STAT_METHOD_ALL_THE_SAME; + } + theCharacter.rollStats(rollMethod); //XXX This is here to stop the stat mod from being stale. Can be removed once we merge with CDOM theCharacter.calcActiveBonuses(); for (StatFacade stat : statScoreMap.keySet()) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jde...@us...> - 2012-03-03 22:07:49
|
Revision: 16424 http://pcgen.svn.sourceforge.net/pcgen/?rev=16424&view=rev Author: jdempsey Date: 2012-03-03 22:07:42 +0000 (Sat, 03 Mar 2012) Log Message: ----------- Fix bug: TEMPLATE - Selected / Granted Pane not displaying Templates granted by other objects Issue#: CODE-1327 Modified Paths: -------------- Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java Modified: Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java 2012-03-03 12:46:58 UTC (rev 16423) +++ Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java 2012-03-03 22:07:42 UTC (rev 16424) @@ -556,6 +556,7 @@ characterAbilities.addAbility(category, ability); refreshLanguageList(); refreshKitList(); + refreshTemplates(); } /* (non-Javadoc) @@ -698,6 +699,7 @@ characterAbilities.rebuildAbilityLists(); refreshLanguageList(); refreshKitList(); + refreshTemplates(); currentXP.setReference(theCharacter.getXP()); xpForNextlevel.setReference(theCharacter.minXPForNextECL()); xpTableName.setReference(theCharacter.getXPTableName()); @@ -1793,6 +1795,7 @@ xpForNextlevel.setReference(theCharacter.minXPForNextECL()); xpTableName.setReference(theCharacter.getXPTableName()); hpRef.setReference(theCharacter.hitPoints()); + refreshTemplates(); updateLevelTodo(); buildAvailableDomainsList(); @@ -3700,6 +3703,26 @@ } } + private void refreshTemplates() + { + Collection<PCTemplate> pcTemplates = theCharacter.getTemplateSet(); + for (PCTemplate template : pcTemplates) + { + if (!templates.containsElement(template)) + { + templates.addElement(template); + } + } + for (Iterator<TemplateFacade> iterator = templates.iterator(); iterator.hasNext();) + { + PCTemplate pcTemplate = (PCTemplate) iterator.next(); + if (!pcTemplates.contains(pcTemplate)) + { + iterator.remove(); + } + } + } + /* (non-Javadoc) * @see pcgen.core.facade.CharacterFacade#getTemplates() */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jde...@us...> - 2012-03-18 00:05:07
|
Revision: 16534 http://pcgen.svn.sourceforge.net/pcgen/?rev=16534&view=rev Author: jdempsey Date: 2012-03-18 00:05:00 +0000 (Sun, 18 Mar 2012) Log Message: ----------- Fix bug: ADD:LEVEL not displaying on the Skills Tab or Classes Tab as granted Issue#: CODE-1384 Modified Paths: -------------- Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java Modified: Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java 2012-03-17 23:56:30 UTC (rev 16533) +++ Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java 2012-03-18 00:05:00 UTC (rev 16534) @@ -3735,8 +3735,15 @@ if (!theCharacter.hasTemplate(template)) { + int oldLevel = charLevelsFacade.getSize(); templates.addElement(template); theCharacter.addTemplate(template); + refreshRaceRelatedFields(); + + if (oldLevel != charLevelsFacade.getSize()) + { + delegate.showLevelUpInfo(this, oldLevel); + } } else { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jde...@us...> - 2012-03-18 01:11:39
|
Revision: 16536 http://pcgen.svn.sourceforge.net/pcgen/?rev=16536&view=rev Author: jdempsey Date: 2012-03-18 01:11:32 +0000 (Sun, 18 Mar 2012) Log Message: ----------- Fix bug: IndexOutOfBoundsException Increasing beyond allowed Monster HD error Issue#: CODE-1343 Modified Paths: -------------- Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java Modified: Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java 2012-03-18 00:37:04 UTC (rev 16535) +++ Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java 2012-03-18 01:11:32 UTC (rev 16536) @@ -676,11 +676,17 @@ { if (classFacade instanceof PCClass) { + int totalLevels = theCharacter.getTotalLevels(); if (!validateAddLevel((PCClass) classFacade)) { return; } theCharacter.incrementClassLevel(1, (PCClass) classFacade); + if (totalLevels == theCharacter.getTotalLevels()) + { + // The level change was rejected - no further processing needed. + return; + } } if (!pcClasses.contains(classFacade)) { @@ -781,9 +787,11 @@ public int getClassLevel(ClassFacade c) { int clsLevel = 0; + // We have to compare by class key as classes get cloned and we may have multiple instances of the same class in our level list + String classKey = c.getKeyName(); for (CharacterLevelFacade charLevel : pcClassLevels) { - if (charLevelsFacade.getClassTaken(charLevel) == c) + if (charLevelsFacade.getClassTaken(charLevel).getKeyName().equals(classKey)) { clsLevel++; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jde...@us...> - 2012-03-19 20:49:54
|
Revision: 16573 http://pcgen.svn.sourceforge.net/pcgen/?rev=16573&view=rev Author: jdempsey Date: 2012-03-19 20:49:47 +0000 (Mon, 19 Mar 2012) Log Message: ----------- Deactivate temp mods for alpha release Modified Paths: -------------- Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java Modified: Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java 2012-03-19 20:43:28 UTC (rev 16572) +++ Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java 2012-03-19 20:49:47 UTC (rev 16573) @@ -1047,7 +1047,8 @@ } Globals.sortPObjectListByName(tempBonuses); - availTempBonuses.setContents(tempBonuses); + //TODO Reactivate after release and implement bonus application. + //availTempBonuses.setContents(tempBonuses); } private void scanForAnyPcTempBonuses(List<CDOMObject> tempBonuses, CDOMObject obj) @@ -1096,6 +1097,7 @@ @Override public void addTempBonus(TempBonusFacade bonus) { + //TODO: Apply to character appliedTempBonuses.addElement(bonus); refreshLanguageList(); } @@ -1103,6 +1105,7 @@ @Override public void removeTempBonus(TempBonusFacade bonus) { + //TODO: Remove character appliedTempBonuses.removeElement(bonus); refreshLanguageList(); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jde...@us...> - 2012-03-26 11:20:06
|
Revision: 16619 http://pcgen.svn.sourceforge.net/pcgen/?rev=16619&view=rev Author: jdempsey Date: 2012-03-26 11:19:56 +0000 (Mon, 26 Mar 2012) Log Message: ----------- Fix bug: NATURALATTACKS Not showing up when granted by TEMPLATE or RACE Issue#: CODE-1350 Modified Paths: -------------- Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java Modified: Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java 2012-03-26 00:40:29 UTC (rev 16618) +++ Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java 2012-03-26 11:19:56 UTC (rev 16619) @@ -1817,6 +1817,7 @@ buildAvailableDomainsList(); spellSupportFacade.refreshAvailableKnownSpells(); updateScorePurchasePool(false); + refreshEquipment(); if (theCharacter.getRace() == null || Constants.NONESELECTED.equals(theCharacter.getRace() @@ -4000,7 +4001,6 @@ characterType.setReference(theCharacter.getCharacterType()); alignment.setReference(theCharacter.getPCAlignment()); refreshStatScores(); - refreshEquipment(); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jde...@us...> - 2012-06-11 04:11:21
|
Revision: 16851 http://pcgen.svn.sourceforge.net/pcgen/?rev=16851&view=rev Author: jdempsey Date: 2012-06-11 04:11:15 +0000 (Mon, 11 Jun 2012) Log Message: ----------- Fix bug: When updating Race on summary screen, racial stat adjustment in ability scores table doesn't update Issue#: CODE-1417 Modified Paths: -------------- Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java Modified: Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java 2012-06-11 04:05:23 UTC (rev 16850) +++ Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java 2012-06-11 04:11:15 UTC (rev 16851) @@ -1847,7 +1847,7 @@ } } } - + refreshStatScores(); age.setReference(theCharacter.getAge()); updateAgeCategoryForAge(); weightRef.setReference(theCharacter.getWeight()); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jde...@us...> - 2012-06-11 04:05:29
|
Revision: 16850 http://pcgen.svn.sourceforge.net/pcgen/?rev=16850&view=rev Author: jdempsey Date: 2012-06-11 04:05:23 +0000 (Mon, 11 Jun 2012) Log Message: ----------- Fix bug: Purchased Spellbook does not show up in "Purchase" subtab Issue#: CODE-1495 Modified Paths: -------------- Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java Modified: Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java 2012-06-11 03:40:04 UTC (rev 16849) +++ Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java 2012-06-11 04:05:23 UTC (rev 16850) @@ -697,6 +697,7 @@ refreshKitList(); refreshTemplates(); refreshAvailableTempBonuses(); + refreshEquipment(); currentXP.setReference(theCharacter.getXP()); xpForNextlevel.setReference(theCharacter.minXPForNextECL()); xpTableName.setReference(theCharacter.getXPTableName()); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <spr...@us...> - 2012-09-11 07:42:48
|
Revision: 17228 http://pcgen.svn.sourceforge.net/pcgen/?rev=17228&view=rev Author: spraynpray Date: 2012-09-11 07:42:41 +0000 (Tue, 11 Sep 2012) Log Message: ----------- OPEN - issue CODE-1598: Tests fails on non English system * Removed unused private member Issue#: CODE-1598 Modified Paths: -------------- Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java Modified: Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java 2012-09-11 07:16:01 UTC (rev 17227) +++ Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java 2012-09-11 07:42:41 UTC (rev 17228) @@ -172,7 +172,7 @@ /** * The Class <code>CharacterFacadeImpl</code> is an implementation of - * the CharacterFacade interface for the new user interface. It is + * the {@link CharacterFacade} interface for the new user interface. It is * intended to provide a full implementation of the new ui/core * interaction layer. * <p> @@ -243,7 +243,6 @@ private DefaultReferenceFacade<File> portrait; private RectangleReference cropRect; private String selectedGender; - private String selectedHandedness; // XXX remove? private List<Language> currBonusLangs; private DefaultReferenceFacade<String> skinColor; private DefaultReferenceFacade<String> hairColor; @@ -2630,7 +2629,6 @@ public void setHanded(HandedFacade handedness) { Logging.log(Logging.ERROR, "CharacterFacadeImpl @ setHanded to "+((Handed) handedness).name()); //$NON-NLS-1$ - this.selectedHandedness = handedness.toString(); this.handedness.setReference(handedness); theCharacter.setHanded((Handed) handedness); // XXX Needed? copied from #setGender This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jde...@us...> - 2012-09-13 13:15:10
|
Revision: 17257 http://pcgen.svn.sourceforge.net/pcgen/?rev=17257&view=rev Author: jdempsey Date: 2012-09-13 13:14:59 +0000 (Thu, 13 Sep 2012) Log Message: ----------- Fix bug: After removing energy drain, the skills are not updated Issue#: CODE-1579 Modified Paths: -------------- Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java Modified: Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java 2012-09-13 13:06:37 UTC (rev 17256) +++ Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java 2012-09-13 13:14:59 UTC (rev 17257) @@ -1164,6 +1164,7 @@ } appliedTempBonuses.addElement(appliedTempBonus); + refreshStatScores(); postLevellingUpdates(); } @@ -1188,6 +1189,7 @@ TempBonusHelper.removeBonusFromCharacter(theCharacter, aEq, originObj); appliedTempBonuses.removeElement(tempBonus); + refreshStatScores(); postLevellingUpdates(); } @@ -1213,6 +1215,7 @@ } tempBonus.setActive(active); appliedTempBonuses.modifyElement(tempBonus); + refreshStatScores(); } /** This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jde...@us...> - 2012-09-13 23:08:28
|
Revision: 17262 http://pcgen.svn.sourceforge.net/pcgen/?rev=17262&view=rev Author: jdempsey Date: 2012-09-13 23:08:22 +0000 (Thu, 13 Sep 2012) Log Message: ----------- Fix bug: [TEST-69] TEMPLATE with REMOVABLE:NO is able to be removed. Issue#: CODE-1158 Modified Paths: -------------- Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java Modified: Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java 2012-09-13 22:38:11 UTC (rev 17261) +++ Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java 2012-09-13 23:08:22 UTC (rev 17262) @@ -3811,7 +3811,7 @@ PCTemplate template = (PCTemplate) templateFacade; - if (theCharacter.hasTemplate(template)) + if (theCharacter.hasTemplate(template) && template.isRemovable()) { theCharacter.removeTemplate(template); templates.removeElement(template); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jde...@us...> - 2012-09-14 13:15:43
|
Revision: 17267 http://pcgen.svn.sourceforge.net/pcgen/?rev=17267&view=rev Author: jdempsey Date: 2012-09-14 13:15:32 +0000 (Fri, 14 Sep 2012) Log Message: ----------- Fix bug: [Pathfinder] Druid Domain non-functional Issue#: CODE-194 Modified Paths: -------------- Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java Modified: Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java 2012-09-14 09:28:39 UTC (rev 17266) +++ Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java 2012-09-14 13:15:32 UTC (rev 17267) @@ -63,6 +63,7 @@ import pcgen.cdom.enumeration.SkillCost; import pcgen.cdom.enumeration.StringKey; import pcgen.cdom.enumeration.Type; +import pcgen.cdom.helper.ClassSource; import pcgen.cdom.inst.PCClassLevel; import pcgen.cdom.reference.CDOMDirectSingleRef; import pcgen.cdom.reference.CDOMSingleRef; @@ -567,6 +568,7 @@ refreshKitList(); refreshTemplates(); refreshAvailableTempBonuses(); + buildAvailableDomainsList(); companionSupportFacade.refreshCompanionData(); } @@ -2138,6 +2140,15 @@ return; } + if (!theCharacter.hasDefaultDomainSource()) + { + // No source for the domain yet? Default to the last added class level + int level = theCharacter.getLevelInfoSize(); + PCLevelInfo highestLevelInfo = theCharacter.getLevelInfo(level - 1); + PCClass cls = theCharacter.getClassKeyed(highestLevelInfo.getClassKeyName()); + theCharacter.setDefaultDomainSource(new ClassSource(cls, highestLevelInfo.getClassLevel())); + } + domains.addElement(domainFI); theCharacter.addDomain(domain); DomainApplication.applyDomain(theCharacter, domain); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jde...@us...> - 2012-09-15 13:07:22
|
Revision: 17284 http://pcgen.svn.sourceforge.net/pcgen/?rev=17284&view=rev Author: jdempsey Date: 2012-09-15 13:07:15 +0000 (Sat, 15 Sep 2012) Log Message: ----------- Fix bug: Error message while levelling character. Issue#: CODE-1566 Modified Paths: -------------- Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java Modified: Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java 2012-09-15 12:40:40 UTC (rev 17283) +++ Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java 2012-09-15 13:07:15 UTC (rev 17284) @@ -2565,7 +2565,7 @@ return; } catch (ConcurrentModificationException e) { - Logging.log(Logging.INFO, "Retrying export after ConcurrentModificationException", e); + Logging.debugPrint("Retrying export after ConcurrentModificationException"); try { Thread.sleep(1000); @@ -2577,6 +2577,9 @@ } } } + Logging.errorPrint("Unable to export using " + + theHandler.getTemplateFile() + + " due to concurrent modifications."); } /** This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jde...@us...> - 2012-09-25 13:36:44
|
Revision: 17463 http://pcgen.svn.sourceforge.net/pcgen/?rev=17463&view=rev Author: jdempsey Date: 2012-09-25 13:36:33 +0000 (Tue, 25 Sep 2012) Log Message: ----------- Fix bug: Feat Added Kit GEAR Item not displaying in Inventory Correctly Issue#: CODE-1640 Modified Paths: -------------- Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java Modified: Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java 2012-09-25 13:15:28 UTC (rev 17462) +++ Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java 2012-09-25 13:36:33 UTC (rev 17463) @@ -573,6 +573,7 @@ refreshAvailableTempBonuses(); buildAvailableDomainsList(); companionSupportFacade.refreshCompanionData(); + refreshEquipment(); } /* (non-Javadoc) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jde...@us...> - 2012-09-28 21:55:22
|
Revision: 17504 http://pcgen.svn.sourceforge.net/pcgen/?rev=17504&view=rev Author: jdempsey Date: 2012-09-28 21:55:16 +0000 (Fri, 28 Sep 2012) Log Message: ----------- Fix bug: Big performance drop in 5.17.18 when loading characters Issue#: CODE-1683 Modified Paths: -------------- Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java Modified: Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java 2012-09-28 20:18:24 UTC (rev 17503) +++ Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java 2012-09-28 21:55:16 UTC (rev 17504) @@ -262,6 +262,9 @@ private TodoManager todoManager; private boolean allowDebt; + private int lastExportCharSerial = 0; + private PlayerCharacter lastExportChar = null; + /** * Create a new character facade for an existing character. * @@ -2558,6 +2561,27 @@ theCharacter.setFileName(file.getName()); } + + /** + * Retrieve a copy of the current character suitable for export. This + * attempts to minimise the expensive cloning function, by returning the + * previously cloned character if the base character has not changed in + * the meantime. + * @return A copy of the current character. + */ + private synchronized PlayerCharacter getExportCharacter() + { + PlayerCharacter exportPc = lastExportChar; + if (exportPc == null + || theCharacter.getSerial() != lastExportCharSerial) + { + exportPc = (PlayerCharacter) theCharacter.clone(); + lastExportChar = exportPc; + lastExportCharSerial = theCharacter.getSerial(); + } + return exportPc; + } + /* (non-Javadoc) * @see pcgen.core.facade.CharacterFacade#export(pcgen.io.ExportHandler, java.io.BufferedWriter) */ @@ -2569,8 +2593,10 @@ { try { - PlayerCharacter exportPc = (PlayerCharacter) theCharacter.clone(); + Logging.log(Logging.INFO, "Starting export at serial " + theCharacter.getSerial() + " to " + theHandler.getTemplateFile()); + PlayerCharacter exportPc = getExportCharacter(); theHandler.write(exportPc, buf); + Logging.log(Logging.INFO, "Finished export at serial " + theCharacter.getSerial() + " to " + theHandler.getTemplateFile()); return; } catch (ConcurrentModificationException e) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jde...@us...> - 2012-09-30 23:53:40
|
Revision: 17559 http://pcgen.svn.sourceforge.net/pcgen/?rev=17559&view=rev Author: jdempsey Date: 2012-09-30 23:53:33 +0000 (Sun, 30 Sep 2012) Log Message: ----------- Fix bug: PCGen 5.17.18 (only) can't load Pathfinder Summoner's Eidolon Issue#: CODE-1691 Modified Paths: -------------- Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java Modified: Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java 2012-09-30 23:39:17 UTC (rev 17558) +++ Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java 2012-09-30 23:53:33 UTC (rev 17559) @@ -2560,7 +2560,15 @@ public void setFile(File file) { this.file.setReference(file); - theCharacter.setFileName(file.getName()); + try + { + theCharacter.setFileName(file.getCanonicalPath()); + } + catch (IOException e) + { + Logging.errorPrint("CharacterFacadeImpl.setFile failed for " + file, e); + theCharacter.setFileName(file.getPath()); + } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jde...@us...> - 2012-10-07 02:17:38
|
Revision: 17660 http://pcgen.svn.sourceforge.net/pcgen/?rev=17660&view=rev Author: jdempsey Date: 2012-10-07 02:17:32 +0000 (Sun, 07 Oct 2012) Log Message: ----------- Fix bug: COMPANIONLIST with PRExxx doesn't refresh properly if a PRExxx Target is altered Issue#: CODE-1720 Modified Paths: -------------- Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java Modified: Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java 2012-10-07 01:42:12 UTC (rev 17659) +++ Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java 2012-10-07 02:17:32 UTC (rev 17660) @@ -1911,6 +1911,7 @@ hpRef.setReference(theCharacter.hitPoints()); refreshTemplates(); refreshAvailableTempBonuses(); + companionSupportFacade.refreshCompanionData(); updateLevelTodo(); buildAvailableDomainsList(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jde...@us...> - 2012-10-13 08:47:13
|
Revision: 17771 http://pcgen.svn.sourceforge.net/pcgen/?rev=17771&view=rev Author: jdempsey Date: 2012-10-13 08:47:06 +0000 (Sat, 13 Oct 2012) Log Message: ----------- Hide export log messages Modified Paths: -------------- Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java Modified: Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java 2012-10-13 08:46:45 UTC (rev 17770) +++ Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java 2012-10-13 08:47:06 UTC (rev 17771) @@ -478,7 +478,7 @@ private void initEquipSet(PlayerCharacter pc) { // Setup the default EquipSet if not already present - if (pc.getEquipSet().size() == 0) + if (!pc.hasEquipSet()) { String id = EquipmentSetFacadeImpl.getNewIdPath(pc, null); EquipSet eSet = new EquipSet(id, LanguageBundle.getString("in_ieDefault")); @@ -2629,14 +2629,14 @@ { try { - Logging.log(Logging.INFO, "Starting export at serial " + theCharacter.getSerial() + " to " + theHandler.getTemplateFile()); + Logging.log(Logging.DEBUG, "Starting export at serial " + theCharacter.getSerial() + " to " + theHandler.getTemplateFile()); PlayerCharacter exportPc = getExportCharacter(); theHandler.write(exportPc, buf); - Logging.log(Logging.INFO, "Finished export at serial " + theCharacter.getSerial() + " to " + theHandler.getTemplateFile()); + Logging.log(Logging.DEBUG, "Finished export at serial " + theCharacter.getSerial() + " to " + theHandler.getTemplateFile()); return; } catch (ConcurrentModificationException e) { - Logging.log(Logging.WARNING, "Retrying export after ConcurrentModificationException"); + Logging.log(Logging.DEBUG, "Retrying export after ConcurrentModificationException"); try { Thread.sleep(1000); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jde...@us...> - 2012-10-18 21:54:02
|
Revision: 17879 http://pcgen.svn.sourceforge.net/pcgen/?rev=17879&view=rev Author: jdempsey Date: 2012-10-18 21:53:56 +0000 (Thu, 18 Oct 2012) Log Message: ----------- Fix bug: Summary HP not updated when BONUS'd Issue#: CODE-1767 Modified Paths: -------------- Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java Modified: Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java 2012-10-18 14:03:13 UTC (rev 17878) +++ Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java 2012-10-18 21:53:56 UTC (rev 17879) @@ -600,6 +600,7 @@ buildAvailableDomainsList(); companionSupportFacade.refreshCompanionData(); refreshEquipment(); + hpRef.setReference(theCharacter.hitPoints()); } /* (non-Javadoc) @@ -611,6 +612,7 @@ characterAbilities.removeAbility(category, ability); refreshKitList(); companionSupportFacade.refreshCompanionData(); + hpRef.setReference(theCharacter.hitPoints()); } /* (non-Javadoc) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jde...@us...> - 2012-10-21 01:22:12
|
Revision: 17921 http://pcgen.svn.sourceforge.net/pcgen/?rev=17921&view=rev Author: jdempsey Date: 2012-10-21 01:22:05 +0000 (Sun, 21 Oct 2012) Log Message: ----------- Fix bug: Companion Choice not available after animal domain taken by level 4 cleric Issue#: CODE-1777 Modified Paths: -------------- Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java Modified: Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java 2012-10-20 22:56:56 UTC (rev 17920) +++ Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java 2012-10-21 01:22:05 UTC (rev 17921) @@ -2209,6 +2209,7 @@ remainingDomains.setReference(theCharacter.getMaxCharacterDomains() - theCharacter.getDomainCount()); updateDomainTodo(); spellSupportFacade.refreshAvailableKnownSpells(); + companionSupportFacade.refreshCompanionData(); } /* (non-Javadoc) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jde...@us...> - 2012-10-21 01:44:03
|
Revision: 17922 http://pcgen.svn.sourceforge.net/pcgen/?rev=17922&view=rev Author: jdempsey Date: 2012-10-21 01:43:56 +0000 (Sun, 21 Oct 2012) Log Message: ----------- Fix bug: Export to PDF isn't remembering the output sheet Issue#: CODE-1772 Modified Paths: -------------- Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java Modified: Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java 2012-10-21 01:22:05 UTC (rev 17921) +++ Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java 2012-10-21 01:43:56 UTC (rev 17922) @@ -2704,11 +2704,19 @@ UIPropertyContext context = UIPropertyContext.getInstance(); if (context.getBoolean(UIPropertyContext.SAVE_OUTPUT_SHEET_WITH_PC)) { + String sheet; if (pdf) { - return theCharacter.getSelectedCharacterPDFOutputSheet(); + sheet = theCharacter.getSelectedCharacterPDFOutputSheet(); } - return theCharacter.getSelectedCharacterHTMLOutputSheet(); + else + { + sheet = theCharacter.getSelectedCharacterHTMLOutputSheet(); + } + if (StringUtils.isNotEmpty(sheet)) + { + return sheet; + } } if (pdf) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jde...@us...> - 2012-10-24 07:21:42
|
Revision: 17995 http://pcgen.svn.sourceforge.net/pcgen/?rev=17995&view=rev Author: jdempsey Date: 2012-10-24 07:21:31 +0000 (Wed, 24 Oct 2012) Log Message: ----------- Fix bug: Stat Updates aren't always showing up. Issue#: CODE-1790 Modified Paths: -------------- Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java Modified: Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java 2012-10-24 06:13:29 UTC (rev 17994) +++ Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java 2012-10-24 07:21:31 UTC (rev 17995) @@ -2623,13 +2623,13 @@ if (exportPc == null || theCharacter.getSerial() != lastExportCharSerial) { + lastExportCharSerial = theCharacter.getSerial(); exportPc = (PlayerCharacter) theCharacter.clone(); // Get the PC all up to date, (equipment and active bonuses etc) exportPc.preparePCForOutput(); lastExportChar = exportPc; - lastExportCharSerial = theCharacter.getSerial(); } return exportPc; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jde...@us...> - 2012-10-28 12:12:51
|
Revision: 18050 http://pcgen.svn.sourceforge.net/pcgen/?rev=18050&view=rev Author: jdempsey Date: 2012-10-28 12:12:43 +0000 (Sun, 28 Oct 2012) Log Message: ----------- Fix bug: Description Tab - Height and Weight don't stick in metric unit set Issue#: CODE-1812 Modified Paths: -------------- Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java Modified: Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java 2012-10-28 11:06:11 UTC (rev 18049) +++ Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java 2012-10-28 12:12:43 UTC (rev 18050) @@ -379,8 +379,9 @@ skinColor = new DefaultReferenceFacade<String>(theCharacter.getDisplay().getSkinColor()); hairColor = new DefaultReferenceFacade<String>(theCharacter.getDisplay().getHairColor()); eyeColor = new DefaultReferenceFacade<String>(theCharacter.getDisplay().getEyeColor()); - weightRef = new DefaultReferenceFacade<Integer>(theCharacter.getWeight()); - heightRef = new DefaultReferenceFacade<Integer>(theCharacter.getHeight()); + weightRef = new DefaultReferenceFacade<Integer>(); + heightRef = new DefaultReferenceFacade<Integer>(); + refreshHeightWeight(); purchasedEquip = new EquipmentListFacadeImpl(theCharacter.getEquipmentMasterList()); carriedWeightRef = new DefaultReferenceFacade<String>(); @@ -765,8 +766,7 @@ xpTableName.setReference(theCharacter.getXPTableName()); hpRef.setReference(theCharacter.hitPoints()); age.setReference(theCharacter.getAge()); - weightRef.setReference(theCharacter.getWeight()); - heightRef.setReference(theCharacter.getHeight()); + refreshHeightWeight(); updateLevelTodo(); buildAvailableDomainsList(); @@ -774,6 +774,14 @@ updateScorePurchasePool(false); } + private void refreshHeightWeight() + { + weightRef.setReference(Globals.getGameModeUnitSet() + .convertWeightToUnitSet(theCharacter.getWeight())); + heightRef.setReference((int) Math.round(Globals.getGameModeUnitSet() + .convertHeightToUnitSet(theCharacter.getHeight()))); + } + /* (non-Javadoc) * @see pcgen.core.facade.CharacterFacade#removeCharacterLevels(int) */ @@ -1941,8 +1949,7 @@ refreshStatScores(); age.setReference(theCharacter.getAge()); updateAgeCategoryForAge(); - weightRef.setReference(theCharacter.getWeight()); - heightRef.setReference(theCharacter.getHeight()); + refreshHeightWeight(); refreshClassLevelModel(); characterAbilities.rebuildAbilityLists(); currentXP.setReference(theCharacter.getXP()); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |