[pcgen-commit-svn] SF.net SVN: pcgen: [1005] Branches/5.10.x/pcgen/code/src/java/pcgen/gui/tabs/InfoTempMod.java

[<boo...@us...>]

Revision: 1005
Author:   boomer70
Date:     2006-05-22 18:22:09 -0700 (Mon, 22 May 2006)
ViewCVS:  http://svn.sourceforge.net/pcgen/?rev=1005&view=rev

Log Message:
-----------
Fixed two NPE when using PREAPPLY with equipment and an other PREMULT.

Modified Paths:
--------------
    Branches/5.10.x/pcgen/code/src/java/pcgen/gui/tabs/InfoTempMod.java
Modified: Branches/5.10.x/pcgen/code/src/java/pcgen/gui/tabs/InfoTempMod.java
===================================================================
--- Branches/5.10.x/pcgen/code/src/java/pcgen/gui/tabs/InfoTempMod.java	2006-05-20 22:05:56 UTC (rev 1004)
+++ Branches/5.10.x/pcgen/code/src/java/pcgen/gui/tabs/InfoTempMod.java	2006-05-23 01:22:09 UTC (rev 1005)
@@ -191,7 +191,7 @@
 			serial = pc.getSerial();
 			forceRefresh();
 			// Commented out for [ 1461012 ] EquipSet temp bonuses setting
-			// as the currently selected equipset controls if temp mods 
+			// as the currently selected equipset controls if temp mods
 			// are applied or not.
 			//pc.setUseTempMods(true);
 		}
@@ -334,14 +334,14 @@
 		/* commented out until we fix temp mods, do not delete
 		useTempMods.setSelected(pc.getUseTempMods());
 		*/
-		
+
 		updateTempModDisabledWarning();
 
 		needsUpdate = false;
 	}
 
 	/**
-	 * Update the warning message displayed if temporary 
+	 * Update the warning message displayed if temporary
 	 * mods are turned off in the equipset.
 	 */
 	private void updateTempModDisabledWarning()
@@ -725,7 +725,7 @@
 		public void singleClickEvent() {
 			// Do Nothing
 		}
-		
+
 		public void doubleClickEvent()
 		{
 			applyBonusButton();
@@ -741,7 +741,7 @@
 		public void singleClickEvent() {
 			// Do Nothing
 		}
-		
+
 		public void doubleClickEvent()
 		{
 			removeBonusButton();
@@ -1038,7 +1038,7 @@
 					for (Iterator iter = aBonus.getPrereqList().iterator(); iter.hasNext();)
 					{
 						Prerequisite prereq = (Prerequisite) iter.next();
-						if (!prereq.getKind().equalsIgnoreCase("apply"))
+						if (prereq.getKind() == null || !prereq.getKind().equalsIgnoreCase("apply"))
 						{
 							newB.addPreReq(new Prerequisite(prereq));
 						}
@@ -1446,7 +1446,7 @@
 		removeBonusButton = new JButton("Remove");
 		removeBonusButton.setEnabled(false);
 
-		tempModsDisabledWarning = new JLabel("");		
+		tempModsDisabledWarning = new JLabel("");
 		/* commented out until we fix temp mods, do not delete
 		iPanel.add(useTempMods, BorderLayout.WEST);
 		*/
@@ -1672,7 +1672,7 @@
 		}
 
 		/**
-		 * Get the level 
+		 * Get the level
 		 * @return level
 		 */
 		public int getLevel()
@@ -2611,7 +2611,7 @@
 							for (Iterator iter = aBonus.getPrereqList().iterator(); iter.hasNext() && passesApply;)
 							{
 								Prerequisite element = (Prerequisite) iter.next();
-								if (element.getKind().equalsIgnoreCase("APPLY"))
+								if (element.getKind() != null && element.getKind().equalsIgnoreCase("APPLY"))
 								{
 									if (!PrereqHandler.passes(element, aEq, pc))
 										passesApply = false;


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