[pcgen-commit-svn] SF.net SVN: pcgen: [3846] branches/cdom/code/src/java/pcgen/cdom

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

Revision: 3846
          http://pcgen.svn.sourceforge.net/pcgen/?rev=3846&view=rev
Author:   thpr
Date:     2007-08-21 13:54:30 -0700 (Tue, 21 Aug 2007)

Log Message:
-----------
CDOM: Bug fix on SpecialProperty (equality)
      Created AttackCycle to rebuild PCClass token that inappropriately skips context

Modified Paths:
--------------
    branches/cdom/code/src/java/pcgen/cdom/content/SpecialProperty.java
    branches/cdom/code/src/java/pcgen/cdom/enumeration/ListKey.java

Added Paths:
-----------
    branches/cdom/code/src/java/pcgen/cdom/helper/AttackCycle.java

Removed Paths:
-------------
    branches/cdom/code/src/java/pcgen/cdom/enumeration/AttackType.java

Modified: branches/cdom/code/src/java/pcgen/cdom/content/SpecialProperty.java
===================================================================
--- branches/cdom/code/src/java/pcgen/cdom/content/SpecialProperty.java	2007-08-21 09:58:38 UTC (rev 3845)
+++ branches/cdom/code/src/java/pcgen/cdom/content/SpecialProperty.java	2007-08-21 20:54:30 UTC (rev 3846)
@@ -55,7 +55,8 @@
 		}
 		SpecialProperty other = (SpecialProperty) o;
 		return property.equals(other.property)
-			&& super.matchesFormulaList(other);
+			&& super.matchesFormulaList(other)
+			&& super.equalsPrereqObject(other);
 	}
 
 	public String getLSTformat()

Deleted: branches/cdom/code/src/java/pcgen/cdom/enumeration/AttackType.java
===================================================================
--- branches/cdom/code/src/java/pcgen/cdom/enumeration/AttackType.java	2007-08-21 09:58:38 UTC (rev 3845)
+++ branches/cdom/code/src/java/pcgen/cdom/enumeration/AttackType.java	2007-08-21 20:54:30 UTC (rev 3846)
@@ -1,55 +0,0 @@
-/*
- * Copyright 2007 (C) Tom Parker <th...@us...>
- * 
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
- * any later version.
- * 
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
- * 
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library; if not, write to the Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-package pcgen.cdom.enumeration;
-
-public enum AttackType
-{
-
-	MELEE("BAB"),
-
-	RANGED("RAB"),
-
-	UNARMED("UAB"),
-
-	GRAPPLE("GAB");
-
-	private final String identifier;
-
-	private AttackType(String ident)
-	{
-		identifier = ident;
-	}
-
-	public String getIdentifier()
-	{
-		return identifier;
-	}
-
-	public static AttackType getInstance(String ident)
-	{
-		for (AttackType at : AttackType.values())
-		{
-			if (at.identifier.equals(ident))
-			{
-				return at;
-			}
-		}
-		throw new IllegalArgumentException("Illegal AttackType identifier: "
-			+ ident);
-	}
-}

Modified: branches/cdom/code/src/java/pcgen/cdom/enumeration/ListKey.java
===================================================================
--- branches/cdom/code/src/java/pcgen/cdom/enumeration/ListKey.java	2007-08-21 09:58:38 UTC (rev 3845)
+++ branches/cdom/code/src/java/pcgen/cdom/enumeration/ListKey.java	2007-08-21 20:54:30 UTC (rev 3846)
@@ -32,6 +32,7 @@
 import pcgen.base.util.CaseInsensitiveMap;
 import pcgen.cdom.base.CDOMReference;
 import pcgen.cdom.base.CDOMSimpleSingleRef;
+import pcgen.cdom.helper.AttackCycle;
 import pcgen.cdom.helper.Capacity;
 import pcgen.cdom.helper.FollowerLimit;
 import pcgen.cdom.helper.Qualifier;
@@ -111,6 +112,8 @@
 
 	public static final ListKey<BonusObj> BONUSES = new ListKey<BonusObj>();
 
+	public static final ListKey<AttackCycle> ATTACK_CYCLE = new ListKey<AttackCycle>();
+
 	/** Private constructor to prevent instantiation of this class */
 	private ListKey()
 	{

Added: branches/cdom/code/src/java/pcgen/cdom/helper/AttackCycle.java
===================================================================
--- branches/cdom/code/src/java/pcgen/cdom/helper/AttackCycle.java	                        (rev 0)
+++ branches/cdom/code/src/java/pcgen/cdom/helper/AttackCycle.java	2007-08-21 20:54:30 UTC (rev 3846)
@@ -0,0 +1,27 @@
+package pcgen.cdom.helper;
+
+import pcgen.util.enumeration.AttackType;
+
+public class AttackCycle
+{
+
+	private final AttackType quality;
+	private final String value;
+
+	public AttackCycle(AttackType key, String val)
+	{
+		quality = key;
+		value = val;
+	}
+
+	public AttackType getAttackType()
+	{
+		return quality;
+	}
+
+	public String getValue()
+	{
+		return value;
+	}
+
+}


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