Revision: 13939
http://pcgen.svn.sourceforge.net/pcgen/?rev=13939&view=rev
Author: thpr
Date: 2010-11-21 04:13:07 +0000 (Sun, 21 Nov 2010)
Log Message:
-----------
Fix: Unable to remove a selected domain once it's assigned
Issue#: CODE-42
Modified Paths:
--------------
Trunk/pcgen/code/src/java/pcgen/gui/tabs/InfoDomain.java
Modified: Trunk/pcgen/code/src/java/pcgen/gui/tabs/InfoDomain.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/gui/tabs/InfoDomain.java 2010-11-21 03:23:28 UTC (rev 13938)
+++ Trunk/pcgen/code/src/java/pcgen/gui/tabs/InfoDomain.java 2010-11-21 04:13:07 UTC (rev 13939)
@@ -1421,33 +1421,35 @@
{
selectedDomainList.remove(addedDomain);
pc.removeDomain(addedDomain);
-
- pc.calcActiveBonuses();
}
-
- // Check selected domains vs Max number allowed
- if (pc.getDomainCount() >= pc.getMaxCharacterDomains())
+ else
{
- ShowMessageDelegate.showMessageDialog(PropertyFactory.getString("in_errorNoMoreDomains"),
- Constants.s_APPNAME, MessageType.INFORMATION);
-
- return;
+ // Check selected domains vs Max number allowed
+ if (pc.getDomainCount() >= pc.getMaxCharacterDomains())
+ {
+ ShowMessageDelegate.showMessageDialog(PropertyFactory.getString("in_errorNoMoreDomains"),
+ Constants.s_APPNAME, MessageType.INFORMATION);
+
+ return;
+ }
+
+ // space remains for another domain, so add it
+ pc.addDomain(addedDomain);
+ DomainApplication.applyDomain(pc, addedDomain);
+
+ if (!selectedDomainList.contains(addedDomain))
+ {
+ selectedDomainList.add(addedDomain);
+ }
}
- // space remains for another domain, so add it
- pc.addDomain(addedDomain);
- DomainApplication.applyDomain(pc, addedDomain);
-
- if (!selectedDomainList.contains(addedDomain))
- {
- selectedDomainList.add(addedDomain);
- }
-
pc.calcActiveBonuses();
// Update the displayed domain count,
// using star (*) to indicate selected domains
- domChosen.setText(Integer.toString(pc.getDomainCount()) + "*");
+ int domCount = pc.getDomainCount();
+ domChosen.setText(Integer.toString(domCount) + (domCount == 0 ? "" : "*"));
+
domainSorter.tableChanged(null);
domainModel.fireTableDataChanged();
forceUpdates();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|