[pcgen-commit-svn] SF.net SVN: pcgen: [2868] Trunk/pcgen/code/src/java/plugin/initiative/gui/ Initiative.java

[<th...@us...>]

Revision: 2868
          http://svn.sourceforge.net/pcgen/?rev=2868&view=rev
Author:   thpr
Date:     2007-05-06 16:32:24 -0700 (Sun, 06 May 2007)

Log Message:
-----------
[ 1565846 ] GMGen initiative bugs
Issue#: 1565846

Modified Paths:
--------------
    Trunk/pcgen/code/src/java/plugin/initiative/gui/Initiative.java

Modified: Trunk/pcgen/code/src/java/plugin/initiative/gui/Initiative.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/initiative/gui/Initiative.java	2007-05-06 22:36:41 UTC (rev 2867)
+++ Trunk/pcgen/code/src/java/plugin/initiative/gui/Initiative.java	2007-05-06 23:32:24 UTC (rev 2868)
@@ -2445,7 +2445,17 @@
 
 	private void editTable(int row, int column)
 	{
-		InitHolder iH = initList.get(row);
+		int activeRow = 0;
+		for (int i = 0; i < initList.size(); i++)
+		{
+			InitHolder c = initList.get(i);
+			if ((!c.getStatus().equals("Dead") || showDead.isSelected())
+				&& (!(c instanceof Event) || showEvents.isSelected()))
+			{
+				activeRow++;
+			}
+		}
+		InitHolder iH = initList.get(activeRow);
 		Object data = combatantTable.getValueAt(row, column);
 		boolean atTop = (currentInit == initList.getMaxInit());
 		iH.editRow(columnList, column, data);


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