[pcgen-commit-svn] SF.net SVN: pcgen:[10574] Trunk/pcgen/code/src/java/pcgen/core/analysis/ SkillLanguage.java

[<red...@us...>]

Revision: 10574
          http://pcgen.svn.sourceforge.net/pcgen/?rev=10574&view=rev
Author:   redwolf3
Date:     2009-09-23 05:37:14 +0000 (Wed, 23 Sep 2009)

Log Message:
-----------
Fixed issue with deselected languages not being saved properly.
Issue#: 2862482

Modified Paths:
--------------
    Trunk/pcgen/code/src/java/pcgen/core/analysis/SkillLanguage.java

Modified: Trunk/pcgen/code/src/java/pcgen/core/analysis/SkillLanguage.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/core/analysis/SkillLanguage.java	2009-09-23 00:53:20 UTC (rev 10573)
+++ Trunk/pcgen/code/src/java/pcgen/core/analysis/SkillLanguage.java	2009-09-23 05:37:14 UTC (rev 10574)
@@ -110,7 +110,7 @@
 				excludedLangs);
 
 			List<Language> origselected = new ArrayList<Language>(selected);
-			List<Language> origavailable = new ArrayList<Language>(available);
+//			List<Language> origavailable = new ArrayList<Language>(available);
 
 			Globals.sortChooserLists(available, selected);
 
@@ -122,19 +122,26 @@
 			lc.setPoolFlag(false);
 			lc.setVisible(true);
 
-			selected.removeAll(origselected); //Only new selections now
-			available.removeAll(origavailable); //Only old selections now
-
-			for (Language lang : selected)
+			// Calculate all the newly selected languages and add them
+			List<Language> newSelected = new ArrayList<Language>(selected);
+			newSelected.removeAll(origselected);
+			
+			for (Language lang : newSelected)
 			{
 				aPC.addSkillLanguage(lang, languageSkill);
 				aPC.addAssociation(languageSkill, lang.getKeyName());
 			}
-			for (Language lang : available)
+			
+			// Calculate all the newly de-selected languages, and remove them
+			List<Language> newRemoved = new ArrayList<Language>(origselected);
+			newRemoved.removeAll(selected);
+
+			for (Language lang : newRemoved)
 			{
 				aPC.removeSkillLanguage(lang, languageSkill);
 				aPC.removeAssociation(languageSkill, lang.getKeyName());
 			}
+			
 			aPC.setDirty(true);
 
 			return true;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.