From: <jde...@us...> - 2012-10-14 05:14:13
|
Revision: 17787 http://pcgen.svn.sourceforge.net/pcgen/?rev=17787&view=rev Author: jdempsey Date: 2012-10-14 05:14:06 +0000 (Sun, 14 Oct 2012) Log Message: ----------- Add some extra telemetry and detach some listeners Issue#: CODE-1709 Modified Paths: -------------- Trunk/pcgen/code/src/java/pcgen/gui2/dialog/DebugDialog.java Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java Trunk/pcgen/code/src/java/pcgen/gui2/tabs/AbilitiesInfoTab.java Modified: Trunk/pcgen/code/src/java/pcgen/gui2/dialog/DebugDialog.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/dialog/DebugDialog.java 2012-10-13 23:14:56 UTC (rev 17786) +++ Trunk/pcgen/code/src/java/pcgen/gui2/dialog/DebugDialog.java 2012-10-14 05:14:06 UTC (rev 17787) @@ -29,6 +29,7 @@ import java.lang.management.MemoryMXBean; import java.lang.management.MemoryUsage; import java.text.DecimalFormat; +import java.text.MessageFormat; import java.util.logging.Handler; import java.util.logging.LogRecord; import javax.swing.BorderFactory; @@ -192,6 +193,8 @@ if ("COLLECT".equals(e.getActionCommand())) { memoryBean.gc(); + Logging.log(Logging.INFO, MessageFormat.format("Memory used after manual GC, Heap: {0}, Non heap: {1}", + memoryBean.getHeapMemoryUsage().getUsed(), memoryBean.getNonHeapMemoryUsage().getUsed())); } else { Modified: Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java 2012-10-13 23:14:56 UTC (rev 17786) +++ Trunk/pcgen/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java 2012-10-14 05:14:06 UTC (rev 17787) @@ -486,6 +486,14 @@ pc.setCalcEquipSetId(id); } + // Detach listeners from old set + if (equipSet.getReference() != null) + { + EquipmentListFacade equippedItems = equipSet.getReference().getEquippedItems(); + equippedItems.removeListListener(this); + equippedItems.removeEquipmentListListener(this); + } + // Make facades for each root equipset. List<EquipmentSetFacade> eqSetList = new ArrayList<EquipmentSetFacade>(); EquipmentSetFacade currSet = null; Modified: Trunk/pcgen/code/src/java/pcgen/gui2/tabs/AbilitiesInfoTab.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/gui2/tabs/AbilitiesInfoTab.java 2012-10-13 23:14:56 UTC (rev 17786) +++ Trunk/pcgen/code/src/java/pcgen/gui2/tabs/AbilitiesInfoTab.java 2012-10-14 05:14:06 UTC (rev 17787) @@ -110,7 +110,6 @@ } typeMap.get(type).categoryList.addElement(category); } - activeCategories.addListListener(this); selectedTitle = tabs.get(0).title; } @@ -229,6 +228,7 @@ public void install() { + activeCategories.addListListener(this); for (TabInfo tabInfo : tabs) { addTab(tabInfo.title); @@ -244,6 +244,7 @@ abilityTab.storeState(typeMap.get(selectedTitle).tabData); removeChangeListener(this); removeAll(); + activeCategories.removeListListener(this); isInstalled = false; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |