|
From: <juj...@us...> - 2007-02-02 20:50:52
|
Revision: 2112
http://svn.sourceforge.net/pcgen/?rev=2112&view=rev
Author: jujutsunerd
Date: 2007-02-02 12:48:59 -0800 (Fri, 02 Feb 2007)
Log Message:
-----------
Fix bad uses of Collections.emptyList() (some caused by earlier refactorings). Make sure that SettingsHandler.getPcgenSystemDir() is used rather than building one's own version of it. Adding some TODOs for strange code. Fix a null-pointer.
Modified Paths:
--------------
Trunk/pcgen/code/src/java/pcgen/core/PCClass.java
Trunk/pcgen/code/src/java/pcgen/core/PObject.java
Trunk/pcgen/code/src/java/pcgen/core/npcgen/ClassDataParser.java
Trunk/pcgen/code/src/java/pcgen/core/npcgen/Configuration.java
Trunk/pcgen/code/src/java/pcgen/core/npcgen/TreasureGenerator.java
Trunk/pcgen/code/src/java/pcgen/core/pclevelinfo/PCLevelInfo.java
Trunk/pcgen/code/src/java/pcgen/io/filters/CharacterFilter.java
Trunk/pcgen/code/src/java/pcgen/io/filters/PatternFilter.java
Trunk/pcgen/code/src/java/pcgen/util/ComparableComparator.java
Trunk/pcgen/code/src/java/pcgen/util/DecimalNumberField.java
Trunk/pcgen/code/src/java/pcgen/util/FOPResourceChecker.java
Trunk/pcgen/code/src/java/pcgen/util/FileHelper.java
Trunk/pcgen/code/src/java/pcgen/util/JEPResourceChecker.java
Trunk/pcgen/code/src/java/pcgen/util/PJEP.java
Trunk/pcgen/code/src/java/pcgen/util/PropertyFactory.java
Trunk/pcgen/code/src/java/pcgen/util/ResetableListIterator.java
Trunk/pcgen/code/src/java/pcgen/util/SkinLFResourceChecker.java
Trunk/pcgen/code/src/java/pcgen/util/StringComparator.java
Trunk/pcgen/code/src/java/pcgen/util/StringIgnoreCaseComparator.java
Trunk/pcgen/code/src/java/pcgen/util/StringPClassUtil.java
Trunk/pcgen/code/src/java/pcgen/util/WeightedList.java
Trunk/pcgen/code/src/java/pcgen/util/enumeration/VisionType.java
Modified: Trunk/pcgen/code/src/java/pcgen/core/PCClass.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/core/PCClass.java 2007-02-02 09:24:07 UTC (rev 2111)
+++ Trunk/pcgen/code/src/java/pcgen/core/PCClass.java 2007-02-02 20:48:59 UTC (rev 2112)
@@ -2242,7 +2242,7 @@
public List<SpellFilter> getKnownSpellsList() {
if (knownSpellsList == null) {
final List<SpellFilter> ret = Collections.emptyList();
- return Collections.unmodifiableList(ret);
+ return ret;
}
return Collections.unmodifiableList(knownSpellsList);
}
@@ -2545,7 +2545,7 @@
public List<LevelProperty<String>> getTemplates() {
if (templates == null) {
final List<LevelProperty<String>> ret = Collections.emptyList();
- return Collections.unmodifiableList(ret);
+ return ret;
}
return Collections.unmodifiableList(templates);
}
Modified: Trunk/pcgen/code/src/java/pcgen/core/PObject.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/core/PObject.java 2007-02-02 09:24:07 UTC (rev 2111)
+++ Trunk/pcgen/code/src/java/pcgen/core/PObject.java 2007-02-02 20:48:59 UTC (rev 2112)
@@ -3348,7 +3348,7 @@
{
final String bString = bTok.nextToken();
final List<WeaponProf> pcWeapProfList = Globals.getWeaponProfs(bString, aPC);
- final List<Equipment> pcWeaponList = Collections.emptyList();
+ final List<Equipment> pcWeaponList = new ArrayList<Equipment>();
if (pcWeapProfList.size() == 0)
{
pcWeaponList.addAll(EquipmentList.getEquipmentOfType("Weapon." + bString, ""));
Modified: Trunk/pcgen/code/src/java/pcgen/core/npcgen/ClassDataParser.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/core/npcgen/ClassDataParser.java 2007-02-02 09:24:07 UTC (rev 2111)
+++ Trunk/pcgen/code/src/java/pcgen/core/npcgen/ClassDataParser.java 2007-02-02 20:48:59 UTC (rev 2112)
@@ -374,7 +374,7 @@
if (ability == null)
{
Logging.debugPrint("Ability (" + key + ") not found"); //$NON-NLS-1$ //$NON-NLS-2$
- }
+ } else
if (weight > 0)
{
theCurrentData.addAbility(theCurrentCategory, ability, weight);
Modified: Trunk/pcgen/code/src/java/pcgen/core/npcgen/Configuration.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/core/npcgen/Configuration.java 2007-02-02 09:24:07 UTC (rev 2111)
+++ Trunk/pcgen/code/src/java/pcgen/core/npcgen/Configuration.java 2007-02-02 20:48:59 UTC (rev 2112)
@@ -38,6 +38,7 @@
import pcgen.core.Globals;
import pcgen.core.PCClass;
import pcgen.core.Race;
+import pcgen.core.SettingsHandler;
import pcgen.core.spell.Spell;
import pcgen.util.WeightedList;
@@ -56,15 +57,23 @@
private List<GeneratorOption> theGeneratorOptions = new ArrayList<GeneratorOption>();
private Map<String, ClassData> theClassData = new HashMap<String, ClassData>();
- private static File optionsDir = new File(Globals.getDefaultPath()
- + File.separator + "system" //$NON-NLS-1$
- + File.separator + "npcgen" //$NON-NLS-1$
- + File.separator + "options"); //$NON-NLS-1$
+ private static File optionsDir = new File(SettingsHandler.getPcgenSystemDir()
+ + File.separator + "npcgen" //$NON-NLS-1$
+ + File.separator + "options"); //$NON-NLS-1$
+
+// private static File optionsDir = new File(Globals.getDefaultPath()
+// + File.separator + "system" //$NON-NLS-1$
+// + File.separator + "npcgen" //$NON-NLS-1$
+// + File.separator + "options"); //$NON-NLS-1$
- private static File classDataDir = new File(Globals.getDefaultPath()
- + File.separator + "system" //$NON-NLS-1$
- + File.separator + "npcgen" //$NON-NLS-1$
- + File.separator + "classdata"); //$NON-NLS-1$
+ private static File classDataDir = new File(SettingsHandler.getPcgenSystemDir()
+ + File.separator + "npcgen" //$NON-NLS-1$
+ + File.separator + "classdata"); //$NON-NLS-1$
+
+// private static File classDataDir = new File(Globals.getDefaultPath()
+// + File.separator + "system" //$NON-NLS-1$
+// + File.separator + "npcgen" //$NON-NLS-1$
+// + File.separator + "classdata"); //$NON-NLS-1$
public static Configuration get( final GameMode aMode )
{
@@ -124,6 +133,7 @@
}
catch (Exception ex)
{
+ ex.printStackTrace();
return theDefaultConfiguration;
}
Modified: Trunk/pcgen/code/src/java/pcgen/core/npcgen/TreasureGenerator.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/core/npcgen/TreasureGenerator.java 2007-02-02 09:24:07 UTC (rev 2111)
+++ Trunk/pcgen/code/src/java/pcgen/core/npcgen/TreasureGenerator.java 2007-02-02 20:48:59 UTC (rev 2112)
@@ -8,6 +8,7 @@
import pcgen.core.GameMode;
import pcgen.core.Globals;
+import pcgen.core.SettingsHandler;
import pcgen.util.Logging;
public class TreasureGenerator
@@ -16,11 +17,15 @@
private static HashMap<GameMode, List<EquipmentTable>> theTreasureTables = new HashMap<GameMode,List<EquipmentTable>>();
- private static File tablesDir = new File(Globals.getDefaultPath()
- + File.separator + "system" //$NON-NLS-1$
+ private static File tablesDir = new File(SettingsHandler.getPcgenSystemDir()
+ File.separator + "npcgen" //$NON-NLS-1$
+ File.separator + "treasure"); //$NON-NLS-1$
+// private static File tablesDir = new File(Globals.getDefaultPath()
+// + File.separator + "system" //$NON-NLS-1$
+// + File.separator + "npcgen" //$NON-NLS-1$
+// + File.separator + "treasure"); //$NON-NLS-1$
+
private TreasureGenerator()
{
// Private so it can't be constructed.
Modified: Trunk/pcgen/code/src/java/pcgen/core/pclevelinfo/PCLevelInfo.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/core/pclevelinfo/PCLevelInfo.java 2007-02-02 09:24:07 UTC (rev 2111)
+++ Trunk/pcgen/code/src/java/pcgen/core/pclevelinfo/PCLevelInfo.java 2007-02-02 20:48:59 UTC (rev 2112)
@@ -49,6 +49,7 @@
private int skillPointsGained = 0;
private int skillPointsRemaining = 0;
private PlayerCharacter aPC;
+ //TODO objects should really be a list of Abilities, shouldn't it? JK070115
private List<PObject> objects = new ArrayList<PObject>(1);
/**
@@ -322,7 +323,7 @@
/**
* Get any Abilites added at this level
- *
+ *
* @return List
*/
public List<? extends PObject> getObjects()
Modified: Trunk/pcgen/code/src/java/pcgen/io/filters/CharacterFilter.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/io/filters/CharacterFilter.java 2007-02-02 09:24:07 UTC (rev 2111)
+++ Trunk/pcgen/code/src/java/pcgen/io/filters/CharacterFilter.java 2007-02-02 20:48:59 UTC (rev 2112)
@@ -2,6 +2,7 @@
import pcgen.core.Globals;
import pcgen.core.Constants;
+import pcgen.core.SettingsHandler;
import pcgen.core.utils.CoreUtility;
import pcgen.util.Delta;
import pcgen.util.Logging;
@@ -37,7 +38,7 @@
outputFilter = null;
filterName =
- Globals.getDefaultPath() + File.separator + "system"
+ SettingsHandler.getPcgenSystemDir()
+ File.separator + "outputFilters" + File.separator
+ filterName + Constants.s_PCGEN_LIST_EXTENSION;
Modified: Trunk/pcgen/code/src/java/pcgen/io/filters/PatternFilter.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/io/filters/PatternFilter.java 2007-02-02 09:24:07 UTC (rev 2111)
+++ Trunk/pcgen/code/src/java/pcgen/io/filters/PatternFilter.java 2007-02-02 20:48:59 UTC (rev 2112)
@@ -13,6 +13,7 @@
import pcgen.core.Constants;
import pcgen.core.Globals;
+import pcgen.core.SettingsHandler;
import pcgen.core.utils.CoreUtility;
import pcgen.util.Logging;
@@ -48,7 +49,7 @@
}
filterName =
- Globals.getDefaultPath() + File.separator + "system"
+ SettingsHandler.getPcgenSystemDir()
+ File.separator + "outputFilters" + File.separator + "re"
+ filterName + Constants.s_PCGEN_LIST_EXTENSION;
Logging.debugPrint("Creating filter from " + filterName);
Modified: Trunk/pcgen/code/src/java/pcgen/util/ComparableComparator.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/util/ComparableComparator.java 2007-02-02 09:24:07 UTC (rev 2111)
+++ Trunk/pcgen/code/src/java/pcgen/util/ComparableComparator.java 2007-02-02 20:48:59 UTC (rev 2112)
@@ -22,6 +22,7 @@
package pcgen.util;
import java.util.Comparator;
+import java.io.Serializable;
/**
* A <code>Comparator</code> to compare objects as
@@ -32,7 +33,7 @@
* @author <a href="mailto:bi...@al...">B. K. Oxley (binkley)</a>
* @version $Revision$
*/
-public final class ComparableComparator<T extends Comparable<T>> implements Comparator<T>
+public final class ComparableComparator<T extends Comparable<T>> implements Comparator<T>, Serializable
{
/** Constructs a <code>ComparableComparator</code>. */
public ComparableComparator()
Modified: Trunk/pcgen/code/src/java/pcgen/util/DecimalNumberField.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/util/DecimalNumberField.java 2007-02-02 09:24:07 UTC (rev 2111)
+++ Trunk/pcgen/code/src/java/pcgen/util/DecimalNumberField.java 2007-02-02 20:48:59 UTC (rev 2112)
@@ -40,7 +40,7 @@
*/
public class DecimalNumberField extends JTextField
{
- static final long serialVersionUID = 8756733358669554185L;
+ private static final long serialVersionUID = 8756733358669554185L;
private DecimalFormat doubleFormatter;
private Toolkit toolkit;
private boolean allowSign = false;
Modified: Trunk/pcgen/code/src/java/pcgen/util/FOPResourceChecker.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/util/FOPResourceChecker.java 2007-02-02 09:24:07 UTC (rev 2111)
+++ Trunk/pcgen/code/src/java/pcgen/util/FOPResourceChecker.java 2007-02-02 20:48:59 UTC (rev 2112)
@@ -37,7 +37,7 @@
static final String getItHereMsg =
PropertyFactory.getString("in_FollowLink");
static final String missingLibMsg =
- PropertyFactory.getString("MissingLibMessage").replace('|', '\n');
+ PropertyFactory.getString("MissingLibMessage").replace('|', '\n'); //TODO Why does this have a hardcoded line separator? JK070115
/**
*
@@ -69,7 +69,7 @@
if (missingResourceCount != 0)
{
return resourceBuffer.toString() + "\n" + getItHereMsg
- + whereToGetIt + "\n" + missingLibMsg;
+ + whereToGetIt + "\n" + missingLibMsg; //TODO Why does this have hardcoded line separators? JK070115
}
return "";
@@ -93,12 +93,12 @@
}
catch (ClassNotFoundException cnfex)
{
- sb.append("Missing resource: ").append(jarName).append('\n');
+ sb.append("Missing resource: ").append(jarName).append('\n');//TODO Why does this have a hardcoded line separator? JK070115
}
catch (NoClassDefFoundError ncdfer)
{
sb.append("Missing dependency of resource: ").append(jarName)
- .append('\n');
+ .append('\n');//TODO Why does this have a hardcoded line separator? JK070115
Logging.errorPrint("Error loading class " + forName + ": "
+ ncdfer.toString(), ncdfer);
}
Modified: Trunk/pcgen/code/src/java/pcgen/util/FileHelper.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/util/FileHelper.java 2007-02-02 09:24:07 UTC (rev 2111)
+++ Trunk/pcgen/code/src/java/pcgen/util/FileHelper.java 2007-02-02 20:48:59 UTC (rev 2112)
@@ -70,7 +70,7 @@
return dots.append(pieceToKeep).toString();
}
- dots.append("../");
+ dots.append("../"); //TODO Why does this have a hardcoded file separator? JK070115
testFile = testFile.getParentFile();
}
Modified: Trunk/pcgen/code/src/java/pcgen/util/JEPResourceChecker.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/util/JEPResourceChecker.java 2007-02-02 09:24:07 UTC (rev 2111)
+++ Trunk/pcgen/code/src/java/pcgen/util/JEPResourceChecker.java 2007-02-02 20:48:59 UTC (rev 2112)
@@ -63,7 +63,7 @@
{
return resourceBuffer.toString() + "\n"
+ FOPResourceChecker.getItHereMsg + whereToGetIt + "\n"
- + FOPResourceChecker.missingLibMsg;
+ + FOPResourceChecker.missingLibMsg;//TODO Why does this have hardcoded file separators? JK070115
}
return "";
Modified: Trunk/pcgen/code/src/java/pcgen/util/PJEP.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/util/PJEP.java 2007-02-02 09:24:07 UTC (rev 2111)
+++ Trunk/pcgen/code/src/java/pcgen/util/PJEP.java 2007-02-02 20:48:59 UTC (rev 2112)
@@ -181,6 +181,7 @@
* Runs classlevel on the inStack. The parameter is popped
* off the <code>inStack</code>, and the variable's value is
* pushed back to the top of <code>inStack</code>.
+ * \nTODO is it intentional that this method does not call PostfixMathCommand.run()?
* @param inStack
* @throws ParseException
*/
Modified: Trunk/pcgen/code/src/java/pcgen/util/PropertyFactory.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/util/PropertyFactory.java 2007-02-02 09:24:07 UTC (rev 2111)
+++ Trunk/pcgen/code/src/java/pcgen/util/PropertyFactory.java 2007-02-02 20:48:59 UTC (rev 2112)
@@ -143,6 +143,7 @@
try
{
+ //TODO Why does this have hardcoded file separators? JK070115
bundle =
ResourceBundle.getBundle(
"pcgen/gui/prop/LanguageBundle", locale); //$NON-NLS-1$
Modified: Trunk/pcgen/code/src/java/pcgen/util/ResetableListIterator.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/util/ResetableListIterator.java 2007-02-02 09:24:07 UTC (rev 2111)
+++ Trunk/pcgen/code/src/java/pcgen/util/ResetableListIterator.java 2007-02-02 20:48:59 UTC (rev 2112)
@@ -30,7 +30,7 @@
* @author <a href="mailto:bi...@al...">B. K. Oxley (binkley)</a>
* @version $Revision$
*/
-public interface ResetableListIterator extends ListIterator
+public interface ResetableListIterator<E> extends ListIterator<E>
{
/**
* Return iterator to original state after construction.
Modified: Trunk/pcgen/code/src/java/pcgen/util/SkinLFResourceChecker.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/util/SkinLFResourceChecker.java 2007-02-02 09:24:07 UTC (rev 2111)
+++ Trunk/pcgen/code/src/java/pcgen/util/SkinLFResourceChecker.java 2007-02-02 20:48:59 UTC (rev 2112)
@@ -63,7 +63,7 @@
{
return resourceBuffer.toString() + "\n"
+ FOPResourceChecker.getItHereMsg + whereToGetIt + "\n"
- + FOPResourceChecker.missingLibMsg;
+ + FOPResourceChecker.missingLibMsg;//TODO Why does this have hardcoded file separators? JK070115
}
return "";
Modified: Trunk/pcgen/code/src/java/pcgen/util/StringComparator.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/util/StringComparator.java 2007-02-02 09:24:07 UTC (rev 2111)
+++ Trunk/pcgen/code/src/java/pcgen/util/StringComparator.java 2007-02-02 20:48:59 UTC (rev 2112)
@@ -22,6 +22,7 @@
package pcgen.util;
import java.util.Comparator;
+import java.io.Serializable;
/**
* A <code>Comparator</code> to compare objects as
@@ -31,7 +32,7 @@
* @author <a href="mailto:bi...@al...">B. K. Oxley (binkley)</a>
* @version $Revision$
*/
-public final class StringComparator implements Comparator
+public final class StringComparator<E> implements Comparator<E>, Serializable
{
/** Constructs a <code>StringComparator</code>. */
public StringComparator()
@@ -40,7 +41,7 @@
}
/** {@inheritDoc} */
- public int compare(Object o1, Object o2)
+ public int compare(E o1, E o2)
{
// Treat null as the empty string.
return ((o1 == null) ? "" : o1.toString()).compareTo((o2 == null) ? ""
Modified: Trunk/pcgen/code/src/java/pcgen/util/StringIgnoreCaseComparator.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/util/StringIgnoreCaseComparator.java 2007-02-02 09:24:07 UTC (rev 2111)
+++ Trunk/pcgen/code/src/java/pcgen/util/StringIgnoreCaseComparator.java 2007-02-02 20:48:59 UTC (rev 2112)
@@ -22,6 +22,7 @@
package pcgen.util;
import java.util.Comparator;
+import java.io.Serializable;
/**
* A <code>Comparator</code> to compare objects as
@@ -32,7 +33,7 @@
* @author <a href="mailto:bi...@al...">B. K. Oxley (binkley)</a>
* @version $Revision$
*/
-public final class StringIgnoreCaseComparator implements Comparator<Object>
+public final class StringIgnoreCaseComparator implements Comparator<Object>, Serializable
{
/** Constructs a <code>StringIgnoreCaseComparator</code>. */
public StringIgnoreCaseComparator()
Modified: Trunk/pcgen/code/src/java/pcgen/util/StringPClassUtil.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/util/StringPClassUtil.java 2007-02-02 09:24:07 UTC (rev 2111)
+++ Trunk/pcgen/code/src/java/pcgen/util/StringPClassUtil.java 2007-02-02 20:48:59 UTC (rev 2112)
@@ -18,12 +18,12 @@
public class StringPClassUtil {
- private static Map<String, Class> classMap;
- private static Map<Class, String> stringMap;
+ private static Map<String, Class<?>> classMap;
+ private static Map<Class<?>, String> stringMap;
static {
- classMap = new HashMap<String, Class>();
- stringMap = new HashMap<Class, String>();
+ classMap = new HashMap<String, Class<?>>();
+ stringMap = new HashMap<Class<?>, String>();
classMap.put("DEITY", Deity.class);
classMap.put("DOMAIN", Domain.class);
Modified: Trunk/pcgen/code/src/java/pcgen/util/WeightedList.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/util/WeightedList.java 2007-02-02 09:24:07 UTC (rev 2111)
+++ Trunk/pcgen/code/src/java/pcgen/util/WeightedList.java 2007-02-02 20:48:59 UTC (rev 2112)
@@ -451,7 +451,7 @@
{
final WeightedItem<E> o = i.next();
final E data = o.getElement();
- buf.append(data == this ? "(this list)" : String.valueOf(data));
+ buf.append(data == this ? "(this list)" : String.valueOf(data)); //TODO Is this use of object identity comparison intentional? JK070115
buf.append(" (").append(o.getWeight()).append(")");
hasNext = i.hasNext();
if (hasNext)
@@ -677,7 +677,7 @@
/**
* Returns <tt>true</tt> if the objects this item wraps compare equal
* using the objects <code>equal</code> method.
- *
+ * \n TODO Surely it's not intentional that this class doesn't override hashCode?
* @param o Object to compare.
* @return <tt>true</tt> if the element this item contains equals the
* object passed in.
Modified: Trunk/pcgen/code/src/java/pcgen/util/enumeration/VisionType.java
===================================================================
--- Trunk/pcgen/code/src/java/pcgen/util/enumeration/VisionType.java 2007-02-02 09:24:07 UTC (rev 2111)
+++ Trunk/pcgen/code/src/java/pcgen/util/enumeration/VisionType.java 2007-02-02 20:48:59 UTC (rev 2112)
@@ -56,10 +56,12 @@
}
catch (IllegalArgumentException e)
{
+ //TODO Why throw an InternalError? Wouldn't an assert false be better? JK070115
throw new InternalError();
}
catch (IllegalAccessException e)
{
+ //TODO Why throw an InternalError? Wouldn't an assert false be better? JK070115
throw new InternalError();
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|