Menu
▾
▴
[pcgen-commit-svn] SF.net SVN: pcgen:[8764] Trunk/pcgen/code/src/java/plugin/lsttokens
|
From: <th...@us...> - 2008-12-31 20:17:46
|
Revision: 8764
http://pcgen.svn.sourceforge.net/pcgen/?rev=8764&view=rev
Author: thpr
Date: 2008-12-31 20:17:37 +0000 (Wed, 31 Dec 2008)
Log Message:
-----------
followup on formula refactor
Modified Paths:
--------------
Trunk/pcgen/code/src/java/plugin/lsttokens/add/AbilityToken.java
Trunk/pcgen/code/src/java/plugin/lsttokens/add/ClassSkillsLevelToken.java
Trunk/pcgen/code/src/java/plugin/lsttokens/add/ClassSkillsToken.java
Trunk/pcgen/code/src/java/plugin/lsttokens/add/EquipToken.java
Trunk/pcgen/code/src/java/plugin/lsttokens/add/FeatToken.java
Trunk/pcgen/code/src/java/plugin/lsttokens/add/LanguageToken.java
Trunk/pcgen/code/src/java/plugin/lsttokens/add/SkillToken.java
Trunk/pcgen/code/src/java/plugin/lsttokens/add/SpellCasterToken.java
Trunk/pcgen/code/src/java/plugin/lsttokens/add/TemplateToken.java
Trunk/pcgen/code/src/java/plugin/lsttokens/add/VFeatToken.java
Trunk/pcgen/code/src/java/plugin/lsttokens/remove/FeatToken.java
Modified: Trunk/pcgen/code/src/java/plugin/lsttokens/add/AbilityToken.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/lsttokens/add/AbilityToken.java 2008-12-31 20:06:44 UTC (rev 8763)
+++ Trunk/pcgen/code/src/java/plugin/lsttokens/add/AbilityToken.java 2008-12-31 20:17:37 UTC (rev 8764)
@@ -335,11 +335,10 @@
+ " Count");
return null;
}
- String fString = f.toString();
StringBuilder sb = new StringBuilder();
- if (!"1".equals(fString))
+ if (!FormulaFactory.ONE.equals(f))
{
- sb.append(fString).append(Constants.PIPE);
+ sb.append(f).append(Constants.PIPE);
}
sb.append(ascs.getCategory().getKeyName());
sb.append(Constants.PIPE);
Modified: Trunk/pcgen/code/src/java/plugin/lsttokens/add/ClassSkillsLevelToken.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/lsttokens/add/ClassSkillsLevelToken.java 2008-12-31 20:06:44 UTC (rev 8763)
+++ Trunk/pcgen/code/src/java/plugin/lsttokens/add/ClassSkillsLevelToken.java 2008-12-31 20:17:37 UTC (rev 8764)
@@ -245,11 +245,10 @@
+ " Count");
return null;
}
- String fString = f.toString();
StringBuilder sb = new StringBuilder();
- if (!"1".equals(fString))
+ if (!FormulaFactory.ONE.equals(f))
{
- sb.append(fString).append(Constants.PIPE);
+ sb.append(f).append(Constants.PIPE);
}
sb.append(cs.getLSTformat());
ClassSkillChoiceActor actor = (ClassSkillChoiceActor) container
Modified: Trunk/pcgen/code/src/java/plugin/lsttokens/add/ClassSkillsToken.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/lsttokens/add/ClassSkillsToken.java 2008-12-31 20:06:44 UTC (rev 8763)
+++ Trunk/pcgen/code/src/java/plugin/lsttokens/add/ClassSkillsToken.java 2008-12-31 20:17:37 UTC (rev 8764)
@@ -241,11 +241,10 @@
+ " Count");
return null;
}
- String fString = f.toString();
StringBuilder sb = new StringBuilder();
- if (!"1".equals(fString))
+ if (!FormulaFactory.ONE.equals(f))
{
- sb.append(fString).append(Constants.PIPE);
+ sb.append(f).append(Constants.PIPE);
}
sb.append(cs.getLSTformat());
ClassSkillChoiceActor actor = (ClassSkillChoiceActor) container
Modified: Trunk/pcgen/code/src/java/plugin/lsttokens/add/EquipToken.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/lsttokens/add/EquipToken.java 2008-12-31 20:06:44 UTC (rev 8763)
+++ Trunk/pcgen/code/src/java/plugin/lsttokens/add/EquipToken.java 2008-12-31 20:17:37 UTC (rev 8764)
@@ -152,11 +152,10 @@
+ " Count");
return null;
}
- String fString = f.toString();
StringBuilder sb = new StringBuilder();
- if (!"1".equals(fString))
+ if (!FormulaFactory.ONE.equals(f))
{
- sb.append(fString).append(Constants.PIPE);
+ sb.append(f).append(Constants.PIPE);
}
sb.append(cs.getLSTformat());
addStrings.add(sb.toString());
Modified: Trunk/pcgen/code/src/java/plugin/lsttokens/add/FeatToken.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/lsttokens/add/FeatToken.java 2008-12-31 20:06:44 UTC (rev 8763)
+++ Trunk/pcgen/code/src/java/plugin/lsttokens/add/FeatToken.java 2008-12-31 20:17:37 UTC (rev 8764)
@@ -251,11 +251,10 @@
+ " Count");
return null;
}
- String fString = f.toString();
StringBuilder sb = new StringBuilder();
- if (!"1".equals(fString))
+ if (!FormulaFactory.ONE.equals(f))
{
- sb.append(fString).append(Constants.PIPE);
+ sb.append(f).append(Constants.PIPE);
}
if (container.allowsStacking())
{
Modified: Trunk/pcgen/code/src/java/plugin/lsttokens/add/LanguageToken.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/lsttokens/add/LanguageToken.java 2008-12-31 20:06:44 UTC (rev 8763)
+++ Trunk/pcgen/code/src/java/plugin/lsttokens/add/LanguageToken.java 2008-12-31 20:17:37 UTC (rev 8764)
@@ -169,11 +169,10 @@
+ " Count");
return null;
}
- String fString = f.toString();
StringBuilder sb = new StringBuilder();
- if (!"1".equals(fString))
+ if (!FormulaFactory.ONE.equals(f))
{
- sb.append(fString).append(Constants.PIPE);
+ sb.append(f).append(Constants.PIPE);
}
sb.append(cs.getLSTformat());
addStrings.add(sb.toString());
Modified: Trunk/pcgen/code/src/java/plugin/lsttokens/add/SkillToken.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/lsttokens/add/SkillToken.java 2008-12-31 20:06:44 UTC (rev 8763)
+++ Trunk/pcgen/code/src/java/plugin/lsttokens/add/SkillToken.java 2008-12-31 20:17:37 UTC (rev 8764)
@@ -166,11 +166,10 @@
+ " Count");
return null;
}
- String fString = f.toString();
StringBuilder sb = new StringBuilder();
- if (!"1".equals(fString))
+ if (!FormulaFactory.ONE.equals(f))
{
- sb.append(fString).append(Constants.PIPE);
+ sb.append(f).append(Constants.PIPE);
}
sb.append(cs.getLSTformat());
addStrings.add(sb.toString());
Modified: Trunk/pcgen/code/src/java/plugin/lsttokens/add/SpellCasterToken.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/lsttokens/add/SpellCasterToken.java 2008-12-31 20:06:44 UTC (rev 8763)
+++ Trunk/pcgen/code/src/java/plugin/lsttokens/add/SpellCasterToken.java 2008-12-31 20:17:37 UTC (rev 8764)
@@ -190,11 +190,10 @@
+ " Count");
return null;
}
- String fString = f.toString();
StringBuilder sb = new StringBuilder();
- if (!"1".equals(fString))
+ if (!FormulaFactory.ONE.equals(f))
{
- sb.append(fString).append(Constants.PIPE);
+ sb.append(f).append(Constants.PIPE);
}
sb.append(cs.getLSTformat());
addStrings.add(sb.toString());
Modified: Trunk/pcgen/code/src/java/plugin/lsttokens/add/TemplateToken.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/lsttokens/add/TemplateToken.java 2008-12-31 20:06:44 UTC (rev 8763)
+++ Trunk/pcgen/code/src/java/plugin/lsttokens/add/TemplateToken.java 2008-12-31 20:17:37 UTC (rev 8764)
@@ -139,11 +139,10 @@
+ " Count");
return null;
}
- String fString = f.toString();
StringBuilder sb = new StringBuilder();
- if (!"1".equals(fString))
+ if (!FormulaFactory.ONE.equals(f))
{
- sb.append(fString).append(Constants.PIPE);
+ sb.append(f).append(Constants.PIPE);
}
sb.append(cs.getLSTformat());
addStrings.add(sb.toString());
Modified: Trunk/pcgen/code/src/java/plugin/lsttokens/add/VFeatToken.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/lsttokens/add/VFeatToken.java 2008-12-31 20:06:44 UTC (rev 8763)
+++ Trunk/pcgen/code/src/java/plugin/lsttokens/add/VFeatToken.java 2008-12-31 20:17:37 UTC (rev 8764)
@@ -252,11 +252,10 @@
+ " Count");
return null;
}
- String fString = f.toString();
StringBuilder sb = new StringBuilder();
- if (!"1".equals(fString))
+ if (!FormulaFactory.ONE.equals(f))
{
- sb.append(fString).append(Constants.PIPE);
+ sb.append(f).append(Constants.PIPE);
}
if (container.allowsStacking())
{
Modified: Trunk/pcgen/code/src/java/plugin/lsttokens/remove/FeatToken.java
===================================================================
--- Trunk/pcgen/code/src/java/plugin/lsttokens/remove/FeatToken.java 2008-12-31 20:06:44 UTC (rev 8763)
+++ Trunk/pcgen/code/src/java/plugin/lsttokens/remove/FeatToken.java 2008-12-31 20:17:37 UTC (rev 8764)
@@ -245,11 +245,10 @@
+ " Count");
return null;
}
- String fString = f.toString();
StringBuilder sb = new StringBuilder();
- if (!"1".equals(fString))
+ if (!FormulaFactory.ONE.equals(f))
{
- sb.append(fString).append(Constants.PIPE);
+ sb.append(f).append(Constants.PIPE);
}
sb.append(cs.getLSTformat());
addStrings.add(sb.toString());
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
