[pcgen-commit-svn] SF.net SVN: pcgen:[12733] sandbox/cdomui/code/src/java/pcgen/gui2/facade

[<jde...@us...>]

Revision: 12733
          http://pcgen.svn.sourceforge.net/pcgen/?rev=12733&view=rev
Author:   jdempsey
Date:     2010-08-02 21:50:26 +0000 (Mon, 02 Aug 2010)

Log Message:
-----------
Show the full bonus language lists when first displayed.

Modified Paths:
--------------
    sandbox/cdomui/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java
    sandbox/cdomui/code/src/java/pcgen/gui2/facade/LanguageChooserFacadeImpl.java

Modified: sandbox/cdomui/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java
===================================================================
--- sandbox/cdomui/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java	2010-08-01 21:42:25 UTC (rev 12732)
+++ sandbox/cdomui/code/src/java/pcgen/gui2/facade/CharacterFacadeImpl.java	2010-08-02 21:50:26 UTC (rev 12733)
@@ -1492,12 +1492,12 @@
 	public ListFacade<LanguageChooserFacade> getLanguageChoosers()
 	{
 		DefaultListFacade<LanguageChooserFacade> chooserList = new DefaultListFacade<LanguageChooserFacade>();
-		chooserList.addElement(new LanguageChooserFacadeImpl(theCharacter, "Bonus", null));
+		chooserList.addElement(new LanguageChooserFacadeImpl(this, "Bonus", null));
 
 		SkillFacade speakLangSkill = dataSet.getSpeakLanguageSkill();
 		if (speakLangSkill != null)
 		{
-			chooserList.addElement(new LanguageChooserFacadeImpl(theCharacter, "Skill", (Skill) speakLangSkill));
+			chooserList.addElement(new LanguageChooserFacadeImpl(this, "Skill", (Skill) speakLangSkill));
 		}
 		return chooserList;
 	}
@@ -1893,4 +1893,12 @@
 		return todoList;
 	}
 
+	/**
+	 * @return the PlayerCharacter the facade is fronting for.
+	 */
+	PlayerCharacter getTheCharacter()
+	{
+		return theCharacter;
+	}
+
 }

Modified: sandbox/cdomui/code/src/java/pcgen/gui2/facade/LanguageChooserFacadeImpl.java
===================================================================
--- sandbox/cdomui/code/src/java/pcgen/gui2/facade/LanguageChooserFacadeImpl.java	2010-08-01 21:42:25 UTC (rev 12732)
+++ sandbox/cdomui/code/src/java/pcgen/gui2/facade/LanguageChooserFacadeImpl.java	2010-08-02 21:50:26 UTC (rev 12733)
@@ -26,6 +26,7 @@
 import java.util.List;
 
 import pcgen.cdom.base.CDOMObject;
+import pcgen.core.GameMode;
 import pcgen.core.Language;
 import pcgen.core.PlayerCharacter;
 import pcgen.core.facade.DefaultReferenceFacade;
@@ -55,10 +56,12 @@
 	private DefaultListFacade<LanguageFacade> availableList;
 	private DefaultListFacade<LanguageFacade> selectedList;
 	private DefaultReferenceFacade<Integer> numSelectionsRemain;
+	private CharacterFacadeImpl pcFacade;
 	
-	public LanguageChooserFacadeImpl(PlayerCharacter theCharacter, String name, CDOMObject source)
+	public LanguageChooserFacadeImpl(CharacterFacadeImpl pcFacade, String name, CDOMObject source)
 	{
-		this.theCharacter = theCharacter;
+		this.pcFacade = pcFacade;
+		this.theCharacter = pcFacade.getTheCharacter();
 		this.name = name;
 		this.source = source;
 		
@@ -66,7 +69,7 @@
 		selectedList = new DefaultListFacade<LanguageFacade>();
 		numSelectionsRemain = new DefaultReferenceFacade<Integer>(0);
 		
-		buildLanguageList();
+		//buildLanguageList();
 		
 	}
 	
@@ -100,12 +103,17 @@
 
 	private void buildObjectLangList()
 	{
-		
-		//CDOMObject skill = theCharacter.getSkillKeyed(speakLangSkill.getKeyName());
-		List<String> langList = theCharacter.getAssociationList(source);
-
-		int skillLangMax = theCharacter.languageNum(true) - theCharacter.languageNum(false);
-		//numSelectionsRemain.setReference(skillLangMax-selLangs.size());
+//		List<Language> availLangs = new ArrayList<Language>();
+//		GameMode gm = ((GameMode) pcFacade.getDataSet().getGameMode()).g;
+//		List<Language> selLangs = new ArrayList<Language>();
+//		
+//		//CDOMObject skill = theCharacter.getSkillKeyed(speakLangSkill.getKeyName());
+//		List<String> langList = theCharacter.getAssociationList(source);
+//
+//		refreshLangListContents(availLangs, availableList);
+//		refreshLangListContents(selLangs, selectedList);
+//		int skillLangMax = theCharacter.languageNum(true) - theCharacter.languageNum(false);
+//		numSelectionsRemain.setReference(skillLangMax-selLangs.size());
 	}
 
 	/**
@@ -150,6 +158,7 @@
 	 */
 	public ListFacade<LanguageFacade> getAvailableList()
 	{
+		buildLanguageList();
 		return availableList;
 	}
 


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