Menu
▾
▴
[pcgen-commit-svn] SF.net SVN: pcgen: [1616] Trunk/pcgen/code/src/java/pcgen
|
From: <jde...@us...> - 2006-11-11 01:53:55
|
Revision: 1616
http://svn.sourceforge.net/pcgen/?rev=1616&view=rev
Author: jdempsey
Date: 2006-11-10 17:53:34 -0800 (Fri, 10 Nov 2006)
Log Message:
-----------
Remove and/or replace direct references to plugin classes. These must be done via the tokenmap as the plugin classes are not in the classpath in the app when deployed.
Modified Paths:
--------------
Trunk/pcgen/code/src/java/pcgen/gui/editor/DeityBasePanel.java
Trunk/pcgen/code/src/java/pcgen/gui/editor/DomainBasePanel.java
Trunk/pcgen/code/src/java/pcgen/gui/editor/FeatBasePanel.java
Trunk/pcgen/code/src/java/pcgen/gui/editor/SpellBasePanel.java
Trunk/pcgen/code/src/java/pcgen/io/PCGVer0Parser.java
Trunk/pcgen/code/src/java/pcgen/io/PCGVer2Parser.java
Modified: Trunk/pcgen/code/src/java/pcgen/gui/editor/DeityBasePanel.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/gui/editor/DeityBasePanel.java 2006-11-11 01:29:50 UTC (rev 1615)
+++ Trunk/pcgen/code/src/java/pcgen/gui/editor/DeityBasePanel.java 2006-11-11 01:53:34 UTC (rev 1616)
@@ -22,15 +22,6 @@
*/
package pcgen.gui.editor;
-import pcgen.core.*;
-import pcgen.gui.utils.JComboBoxEx;
-import pcgen.util.PropertyFactory;
-import plugin.lsttokens.DescLst;
-
-import javax.swing.DefaultComboBoxModel;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-import javax.swing.JTextField;
import java.awt.Dimension;
import java.awt.GridBagConstraints;
import java.awt.GridBagLayout;
@@ -38,8 +29,28 @@
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
+import java.util.Map;
import java.util.StringTokenizer;
+import javax.swing.DefaultComboBoxModel;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JTextField;
+
+import pcgen.core.Constants;
+import pcgen.core.Deity;
+import pcgen.core.Description;
+import pcgen.core.Globals;
+import pcgen.core.PCAlignment;
+import pcgen.core.PObject;
+import pcgen.core.SettingsHandler;
+import pcgen.core.WeaponProf;
+import pcgen.gui.utils.JComboBoxEx;
+import pcgen.persistence.lst.DeityLstToken;
+import pcgen.persistence.lst.LstToken;
+import pcgen.persistence.lst.TokenStore;
+import pcgen.util.PropertyFactory;
+
/**
* <code>DeityBasePanel</code>
*
@@ -203,13 +214,18 @@
((Deity) thisPObject).setAlignment(getDeityAlignment());
final String desc = getDescriptionText();
- final DescLst tokenParser = new DescLst();
-
- final StringTokenizer tok = new StringTokenizer(desc, "\t");
- while ( tok.hasMoreTokens() )
+ Map<String, LstToken> tokenMap = TokenStore.inst().getTokenMap(
+ DeityLstToken.class);
+ DeityLstToken tokenParser = (DeityLstToken) tokenMap.get("DESC");
+ if (tokenParser != null)
{
- thisPObject.addDescription(tokenParser.parseDescription(tok.nextToken()));
+ final StringTokenizer tok = new StringTokenizer(desc, "\t");
+ while (tok.hasMoreTokens())
+ {
+ tokenParser.parse((Deity) thisPObject, tok.nextToken());
+ }
}
+
thisPObject.setDescIsPI(getDescIsPI());
//
Modified: Trunk/pcgen/code/src/java/pcgen/gui/editor/DomainBasePanel.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/gui/editor/DomainBasePanel.java 2006-11-11 01:29:50 UTC (rev 1615)
+++ Trunk/pcgen/code/src/java/pcgen/gui/editor/DomainBasePanel.java 2006-11-11 01:53:34 UTC (rev 1616)
@@ -22,15 +22,18 @@
*/
package pcgen.gui.editor;
-import pcgen.core.Constants;
-import pcgen.core.Description;
-import pcgen.core.PObject;
-import plugin.lsttokens.DescLst;
-
import java.awt.GridBagConstraints;
import java.awt.GridBagLayout;
+import java.util.Map;
import java.util.StringTokenizer;
+import pcgen.core.Description;
+import pcgen.core.Domain;
+import pcgen.core.PObject;
+import pcgen.persistence.lst.DomainLstToken;
+import pcgen.persistence.lst.LstToken;
+import pcgen.persistence.lst.TokenStore;
+
/**
* <code>DomainBasePanel</code>
*
@@ -86,12 +89,16 @@
public void updateData(PObject thisPObject)
{
final String desc = getDescriptionText();
- final DescLst tokenParser = new DescLst();
-
- final StringTokenizer tok = new StringTokenizer(desc, "\t");
- while ( tok.hasMoreTokens() )
+ Map<String, LstToken> tokenMap = TokenStore.inst().getTokenMap(
+ DomainLstToken.class);
+ DomainLstToken tokenParser = (DomainLstToken) tokenMap.get("DESC");
+ if (tokenParser != null)
{
- thisPObject.addDescription(tokenParser.parseDescription(tok.nextToken()));
+ final StringTokenizer tok = new StringTokenizer(desc, "\t");
+ while (tok.hasMoreTokens())
+ {
+ tokenParser.parse((Domain) thisPObject, tok.nextToken());
+ }
}
thisPObject.setDescIsPI(getDescIsPI());
}
Modified: Trunk/pcgen/code/src/java/pcgen/gui/editor/FeatBasePanel.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/gui/editor/FeatBasePanel.java 2006-11-11 01:29:50 UTC (rev 1615)
+++ Trunk/pcgen/code/src/java/pcgen/gui/editor/FeatBasePanel.java 2006-11-11 01:53:34 UTC (rev 1616)
@@ -22,19 +22,21 @@
*/
package pcgen.gui.editor;
-import javax.swing.DefaultComboBoxModel;
-import javax.swing.JCheckBox;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
import java.awt.GridBagConstraints;
import java.awt.GridBagLayout;
import java.awt.Insets;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
+import java.util.Map;
import java.util.StringTokenizer;
import java.util.Vector;
+import javax.swing.DefaultComboBoxModel;
+import javax.swing.JCheckBox;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+
import pcgen.core.Ability;
import pcgen.core.Constants;
import pcgen.core.Description;
@@ -42,10 +44,12 @@
import pcgen.core.PObject;
import pcgen.gui.utils.JComboBoxEx;
import pcgen.gui.utils.WholeNumberField;
+import pcgen.persistence.lst.AbilityLstToken;
+import pcgen.persistence.lst.LstToken;
+import pcgen.persistence.lst.TokenStore;
import pcgen.util.DecimalNumberField;
import pcgen.util.PropertyFactory;
import pcgen.util.enumeration.Visibility;
-import plugin.lsttokens.DescLst;
/**
* <code>FeatBasePanel</code>
@@ -236,13 +240,18 @@
{
Ability thisFeat = (Ability) thisPObject;
final String desc = getDescriptionText();
- final DescLst tokenParser = new DescLst();
-
- final StringTokenizer tok = new StringTokenizer(desc, "\t");
- while ( tok.hasMoreTokens() )
+ Map<String, LstToken> tokenMap = TokenStore.inst().getTokenMap(
+ AbilityLstToken.class);
+ AbilityLstToken tokenParser = (AbilityLstToken) tokenMap.get("DESC");
+ if (tokenParser != null)
{
- thisPObject.addDescription(tokenParser.parseDescription(tok.nextToken()));
+ final StringTokenizer tok = new StringTokenizer(desc, "\t");
+ while (tok.hasMoreTokens())
+ {
+ tokenParser.parse(thisFeat, tok.nextToken());
+ }
}
+
thisFeat.setDescIsPI(getDescIsPI());
thisFeat.setMultiples(getMultiples() ? "Y" : "N");
thisFeat.setStacks(getStacks() ? "Y" : "N");
Modified: Trunk/pcgen/code/src/java/pcgen/gui/editor/SpellBasePanel.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/gui/editor/SpellBasePanel.java 2006-11-11 01:29:50 UTC (rev 1615)
+++ Trunk/pcgen/code/src/java/pcgen/gui/editor/SpellBasePanel.java 2006-11-11 01:53:34 UTC (rev 1616)
@@ -22,6 +22,33 @@
*/
package pcgen.gui.editor;
+import java.awt.BorderLayout;
+import java.awt.Dimension;
+import java.awt.FlowLayout;
+import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
+import java.awt.Insets;
+import java.awt.event.ActionEvent;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.StringTokenizer;
+
+import javax.swing.AbstractAction;
+import javax.swing.DefaultComboBoxModel;
+import javax.swing.JButton;
+import javax.swing.JCheckBox;
+import javax.swing.JComponent;
+import javax.swing.JDialog;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JTextField;
+import javax.swing.SwingConstants;
+import javax.swing.border.TitledBorder;
+
import pcgen.core.Description;
import pcgen.core.Globals;
import pcgen.core.PObject;
@@ -29,21 +56,12 @@
import pcgen.core.spell.Spell;
import pcgen.gui.utils.JComboBoxEx;
import pcgen.gui.utils.WholeNumberField;
+import pcgen.persistence.lst.LstToken;
+import pcgen.persistence.lst.SpellLstToken;
+import pcgen.persistence.lst.TokenStore;
import pcgen.util.DecimalNumberField;
import pcgen.util.PropertyFactory;
-import plugin.lsttokens.DescLst;
-import javax.swing.*;
-import javax.swing.border.TitledBorder;
-import java.awt.*;
-import java.awt.event.ActionEvent;
-import java.awt.event.WindowAdapter;
-import java.awt.event.WindowEvent;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.StringTokenizer;
-
/**
* <code>SpellBasePanel</code>
*
@@ -103,12 +121,16 @@
final Spell s = (Spell) thisPObject;
final String desc = pnlDescription.getText();
- final DescLst tokenParser = new DescLst();
-
- final StringTokenizer tok = new StringTokenizer(desc, "\t");
- while ( tok.hasMoreTokens() )
+ Map<String, LstToken> tokenMap = TokenStore.inst().getTokenMap(
+ SpellLstToken.class);
+ SpellLstToken tokenParser = (SpellLstToken) tokenMap.get("DESC");
+ if (tokenParser != null)
{
- thisPObject.addDescription(tokenParser.parseDescription(tok.nextToken()));
+ final StringTokenizer tok = new StringTokenizer(desc, "\t");
+ while (tok.hasMoreTokens())
+ {
+ tokenParser.parse(s, tok.nextToken());
+ }
}
s.setDescIsPI(pnlDescription.getDescIsPI());
Modified: Trunk/pcgen/code/src/java/pcgen/io/PCGVer0Parser.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/io/PCGVer0Parser.java 2006-11-11 01:29:50 UTC (rev 1615)
+++ Trunk/pcgen/code/src/java/pcgen/io/PCGVer0Parser.java 2006-11-11 01:53:34 UTC (rev 1616)
@@ -25,7 +25,33 @@
*/
package pcgen.io;
-import pcgen.core.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.StringTokenizer;
+
+import pcgen.core.Ability;
+import pcgen.core.AbilityUtilities;
+import pcgen.core.Campaign;
+import pcgen.core.CharacterDomain;
+import pcgen.core.Constants;
+import pcgen.core.Deity;
+import pcgen.core.Domain;
+import pcgen.core.Equipment;
+import pcgen.core.EquipmentList;
+import pcgen.core.Globals;
+import pcgen.core.NoteItem;
+import pcgen.core.PCClass;
+import pcgen.core.PCTemplate;
+import pcgen.core.PObject;
+import pcgen.core.PlayerCharacter;
+import pcgen.core.Race;
+import pcgen.core.SettingsHandler;
+import pcgen.core.Skill;
+import pcgen.core.SpecialAbility;
+import pcgen.core.SpecialProperty;
import pcgen.core.character.CharacterSpell;
import pcgen.core.character.EquipSet;
import pcgen.core.character.Follower;
@@ -41,10 +67,7 @@
import pcgen.persistence.lst.TokenStore;
import pcgen.util.Logging;
import pcgen.util.PropertyFactory;
-import plugin.lsttokens.pcclass.ProhibitedToken;
-import java.util.*;
-
/**
* <code>PCGVer0Parser</code>
* @author Thomas Behr
Modified: Trunk/pcgen/code/src/java/pcgen/io/PCGVer2Parser.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/io/PCGVer2Parser.java 2006-11-11 01:29:50 UTC (rev 1615)
+++ Trunk/pcgen/code/src/java/pcgen/io/PCGVer2Parser.java 2006-11-11 01:53:34 UTC (rev 1616)
@@ -25,7 +25,40 @@
*/
package pcgen.io;
-import pcgen.core.*;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+import java.util.StringTokenizer;
+
+import pcgen.core.Ability;
+import pcgen.core.AbilityCategory;
+import pcgen.core.AbilityUtilities;
+import pcgen.core.Campaign;
+import pcgen.core.CharacterDomain;
+import pcgen.core.Constants;
+import pcgen.core.Deity;
+import pcgen.core.Domain;
+import pcgen.core.Equipment;
+import pcgen.core.EquipmentList;
+import pcgen.core.FeatMultipleChoice;
+import pcgen.core.GameMode;
+import pcgen.core.Globals;
+import pcgen.core.Kit;
+import pcgen.core.NoteItem;
+import pcgen.core.PCClass;
+import pcgen.core.PCSpell;
+import pcgen.core.PCTemplate;
+import pcgen.core.PObject;
+import pcgen.core.PlayerCharacter;
+import pcgen.core.Race;
+import pcgen.core.SettingsHandler;
+import pcgen.core.Skill;
+import pcgen.core.SpecialAbility;
+import pcgen.core.SubstitutionClass;
import pcgen.core.bonus.Bonus;
import pcgen.core.bonus.BonusObj;
import pcgen.core.character.CharacterSpell;
@@ -45,11 +78,7 @@
import pcgen.persistence.lst.TokenStore;
import pcgen.util.Logging;
import pcgen.util.PropertyFactory;
-import plugin.lsttokens.pcclass.ProhibitedToken;
-import java.math.BigDecimal;
-import java.util.*;
-
/**
* <code>PCGVer2Parser</code>
* Parses a line oriented format.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
