From: <juj...@us...> - 2007-01-12 23:01:13
|
Revision: 1937 http://svn.sourceforge.net/pcgen/?rev=1937&view=rev Author: jujutsunerd Date: 2007-01-12 15:01:11 -0800 (Fri, 12 Jan 2007) Log Message: ----------- More typesafety work. (Pretty much the only thing left are the Choosers and the SpellMap. At least the Choosers doesn't seem to be easy to fix.) Fixed other warnings (mostly casts, imports and dead code.) Updated the Intellij IDEA settings (it seems the old settings didn't work anymore, but I hope I haven't broken things for anyone.) Modified Paths: -------------- Trunk/pcgen/.classpath Trunk/pcgen/code/PCGen.iml Trunk/pcgen/code/PCGen.ipr Trunk/pcgen/code/src/java/pcgen/core/AbilityStore.java Trunk/pcgen/code/src/java/pcgen/core/AbilityUtilities.java Trunk/pcgen/code/src/java/pcgen/core/Equipment.java Trunk/pcgen/code/src/java/pcgen/core/EquipmentList.java Trunk/pcgen/code/src/java/pcgen/core/EquipmentUtilities.java Trunk/pcgen/code/src/java/pcgen/core/PObject.java Trunk/pcgen/code/src/java/pcgen/core/PlayerCharacter.java Trunk/pcgen/code/src/java/pcgen/core/PrereqObject.java Trunk/pcgen/code/src/java/pcgen/core/SettingsHandler.java Trunk/pcgen/code/src/java/pcgen/core/SpellSupport.java Trunk/pcgen/code/src/java/pcgen/core/VariableProcessor.java Trunk/pcgen/code/src/java/pcgen/core/character/EquipSet.java Trunk/pcgen/code/src/java/pcgen/core/character/SpellBook.java Trunk/pcgen/code/src/java/pcgen/core/chooser/AbstractComplexChoiceManager.java Trunk/pcgen/code/src/java/pcgen/core/chooser/ChooserUtilities.java Trunk/pcgen/code/src/java/pcgen/core/chooser/DomainChoiceManager.java Trunk/pcgen/code/src/java/pcgen/core/chooser/FeatAddChoiceManager.java Trunk/pcgen/code/src/java/pcgen/core/chooser/ProficiencyChoiceManager.java Trunk/pcgen/code/src/java/pcgen/core/chooser/SkillListChoiceManager.java Trunk/pcgen/code/src/java/pcgen/core/kit/KitAbilities.java Trunk/pcgen/code/src/java/pcgen/core/kit/KitGear.java Trunk/pcgen/code/src/java/pcgen/core/kit/KitSkill.java Trunk/pcgen/code/src/java/pcgen/core/kit/KitSpellBook.java Trunk/pcgen/code/src/java/pcgen/core/kit/KitStat.java Trunk/pcgen/code/src/java/pcgen/core/kit/KitTemplate.java Trunk/pcgen/code/src/java/pcgen/core/levelability/LevelAbilityAbility.java Trunk/pcgen/code/src/java/pcgen/core/levelability/LevelAbilityEquipment.java Trunk/pcgen/code/src/java/pcgen/core/levelability/LevelAbilityLanguage.java Trunk/pcgen/code/src/java/pcgen/core/npcgen/ClassData.java Trunk/pcgen/code/src/java/pcgen/core/npcgen/ClassDataParser.java Trunk/pcgen/code/src/java/pcgen/core/npcgen/EqmodTable.java Trunk/pcgen/code/src/java/pcgen/core/npcgen/EquipmentItem.java Trunk/pcgen/code/src/java/pcgen/core/npcgen/EquipmentTable.java Trunk/pcgen/code/src/java/pcgen/core/npcgen/EquipmentTableParser.java Trunk/pcgen/code/src/java/pcgen/core/npcgen/NPCGenerator.java Trunk/pcgen/code/src/java/pcgen/core/npcgen/OptionsParser.java Trunk/pcgen/code/src/java/pcgen/core/party/Party.java Trunk/pcgen/code/src/java/pcgen/gui/EqBuilder.java Trunk/pcgen/code/src/java/pcgen/gui/LstEditorMain.java Trunk/pcgen/code/src/java/pcgen/gui/PCGen_Frame1.java Trunk/pcgen/code/src/java/pcgen/gui/editor/EditorMainForm.java Trunk/pcgen/code/src/java/pcgen/gui/editor/SpellBasePanel.java Trunk/pcgen/code/src/java/pcgen/gui/tabs/InfoEquipping.java Trunk/pcgen/code/src/java/pcgen/gui/tabs/InfoGear.java Trunk/pcgen/code/src/java/pcgen/gui/tabs/InfoTempMod.java Trunk/pcgen/code/src/java/pcgen/gui/tabs/TabUtils.java Trunk/pcgen/code/src/java/pcgen/io/PCGVer0Parser.java Trunk/pcgen/code/src/java/pcgen/io/PCGVer2Parser.java Trunk/pcgen/code/src/java/pcgen/persistence/lst/LstObjectFileLoader.java Trunk/pcgen/code/src/java/pcgen/persistence/lst/LstSystemLoader.java Trunk/pcgen/code/src/java/pcgen/util/BigDecimalHelper.java Trunk/pcgen/code/src/java/pcgen/util/WeightedList.java Trunk/pcgen/code/src/java/plugin/encounter/EncounterPlugin.java Trunk/pcgen/code/src/test/pcgen/core/EquipmentTest.java Trunk/pcgen/code/src/test/pcgen/core/GlobalsTest.java Trunk/pcgen/code/src/test/pcgen/core/PCClassTest.java Modified: Trunk/pcgen/.classpath =================================================================== --- Trunk/pcgen/.classpath 2007-01-12 21:58:25 UTC (rev 1936) +++ Trunk/pcgen/.classpath 2007-01-12 23:01:11 UTC (rev 1937) @@ -3,7 +3,7 @@ <classpathentry excluding="**/.svn/*" kind="src" path="code/build/src"/> <classpathentry excluding="**/.svn/*" kind="src" path="code/src/java"/> <classpathentry excluding="**/.svn/*" kind="src" path="code/src/test"/> - <classpathentry sourcepath="JRE_SRC" kind="var" path="JRE_LIB"/> + <classpathentry kind="var" path="JRE_LIB" sourcepath="JRE_SRC"/> <classpathentry kind="lib" path="lib/fop/avalon-framework-cvs-20020806.jar"/> <classpathentry kind="lib" path="lib/fop/batik.jar"/> <classpathentry kind="lib" path="lib/fop/fop.jar"/> Modified: Trunk/pcgen/code/PCGen.iml =================================================================== --- Trunk/pcgen/code/PCGen.iml 2007-01-12 21:58:25 UTC (rev 1936) +++ Trunk/pcgen/code/PCGen.iml 2007-01-12 23:01:11 UTC (rev 1937) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <module version="4" relativePaths="true" type="JAVA_MODULE"> <component name="ModuleRootManager" /> - <component name="NewModuleRootManager"> + <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5" inherit-compiler-output="false"> <output url="file://$MODULE_DIR$/build/classes" /> <exclude-output /> <output-test url="file://$MODULE_DIR$/build/testclasses" /> @@ -11,12 +11,12 @@ <sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" /> <excludeFolder url="file://$MODULE_DIR$/target" /> </content> - <orderEntry type="inheritedJdk" /> + <orderEntry type="jdk" jdkName="1.5" jdkType="JavaSDK" /> <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/lib/jep-2.24.jar!/" /> + <root url="jar://$MODULE_DIR$/../lib/jep/jep-2.3.1.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -25,7 +25,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/lib/djep-2.24.jar!/" /> + <root url="jar://$MODULE_DIR$/../lib/jep/djep-2.24.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -34,7 +34,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/lib/jdom.jar!/" /> + <root url="jar://$MODULE_DIR$/../lib/jep/RngPack-1.1a.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -43,7 +43,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/lib/fop.jar!/" /> + <root url="jar://$MODULE_DIR$/../lib/javacc.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -52,7 +52,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/lib/junit.jar!/" /> + <root url="jar://$MODULE_DIR$/../lib/jdom.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -61,7 +61,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/lib/skinlf.jar!/" /> + <root url="jar://$MODULE_DIR$/../lib/MRJ141Stubs.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -70,7 +70,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/lib/MRJ141Stubs.jar!/" /> + <root url="jar://$MODULE_DIR$/../lib/lnf/wraplf.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -79,7 +79,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/lib/xmlunit1.0.jar!/" /> + <root url="jar://$MODULE_DIR$/../lib/lnf/skinlf.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -88,7 +88,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/lib/wraplf.jar!/" /> + <root url="jar://$MODULE_DIR$/../lib/lnf/kunststoff.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -97,7 +97,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/lib/xercesImpl-2.5.0.jar!/" /> + <root url="jar://$MODULE_DIR$/../lib/fop/avalon-framework-cvs-20020806.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -106,7 +106,7 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/lib/xml-apis.jar!/" /> + <root url="jar://$MODULE_DIR$/../lib/fop/xercesImpl-2.5.0.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -115,14 +115,75 @@ <orderEntry type="module-library"> <library> <CLASSES> - <root url="jar://$MODULE_DIR$/lib/xalan-2.5.2.jar!/" /> + <root url="jar://$MODULE_DIR$/../lib/fop/fop.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> - <orderEntry type="library" name="JUnit" level="application" /> - <orderEntry type="library" name="Emma" level="application" /> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/../lib/fop/xalan-2.5.2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/../lib/fop/batik.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/../lib/fop/xml-apis.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/../lib/test/junit.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/../lib/test/xmlunit1.0.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/../lib/emma/emma.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library> + <CLASSES> + <root url="jar://$MODULE_DIR$/../lib/emma/emma_ant.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> <orderEntryProperties /> </component> <component name="Struts Module Component" /> Modified: Trunk/pcgen/code/PCGen.ipr =================================================================== --- Trunk/pcgen/code/PCGen.ipr 2007-01-12 21:58:25 UTC (rev 1936) +++ Trunk/pcgen/code/PCGen.ipr 2007-01-12 23:01:11 UTC (rev 1937) @@ -2,14 +2,14 @@ <project version="4" relativePaths="false"> <component name="AntConfiguration"> <defaultAnt bundledAnt="true" /> - <buildFile url="file://$PROJECT_DIR$/build.xml"> - <additionalClassPath /> - <antReference projectDefault="true" /> - <customJdkName value="" /> - <maximumHeapSize value="128" /> - <properties /> - </buildFile> </component> + <component name="BuildJarProjectSettings"> + <option name="BUILD_JARS_ON_MAKE" value="false" /> + </component> + <component name="CodeStyleProjectProfileManger"> + <option name="PROJECT_PROFILE" /> + <option name="USE_PROJECT_LEVEL_SETTINGS" value="false" /> + </component> <component name="CodeStyleSettingsManager"> <option name="PER_PROJECT_SETTINGS"> <value> @@ -84,7 +84,6 @@ </component> <component name="CompilerConfiguration"> <option name="DEFAULT_COMPILER" value="Javac" /> - <option name="CLEAR_OUTPUT_DIRECTORY" value="true" /> <option name="DEPLOY_AFTER_MAKE" value="0" /> <resourceExtensions> <entry name=".+\.(properties|xml|html|dtd|tld)" /> @@ -107,6 +106,20 @@ <option name="myForwardDirection" value="false" /> </component> <component name="DependencyValidationManager" /> + <component name="EclipseCompilerSettings"> + <option name="DEBUGGING_INFO" value="true" /> + <option name="GENERATE_NO_WARNINGS" value="true" /> + <option name="DEPRECATION" value="false" /> + <option name="ADDITIONAL_OPTIONS_STRING" value="" /> + <option name="MAXIMUM_HEAP_SIZE" value="128" /> + </component> + <component name="EclipseEmbeddedCompilerSettings"> + <option name="DEBUGGING_INFO" value="true" /> + <option name="GENERATE_NO_WARNINGS" value="true" /> + <option name="DEPRECATION" value="false" /> + <option name="ADDITIONAL_OPTIONS_STRING" value="" /> + <option name="MAXIMUM_HEAP_SIZE" value="128" /> + </component> <component name="EntryPointsManager"> <entry_points /> </component> @@ -116,6 +129,278 @@ <option name="OUTPUT_DIRECTORY" value="/home/binkley/tmp" /> </component> <component name="GUI Designer component loader factory" /> + <component name="IdProvider" IDEtalkID="8F41ADCE2ACC16CD27DD9026F4CC5FB6" /> + <component name="InspectionProjectProfileManager"> + <option name="PROJECT_PROFILE" value="Project Default" /> + <option name="USE_PROJECT_LEVEL_SETTINGS" value="false" /> + <scopes /> + <profiles> + <profile version="1.0" is_locked="false"> + <option name="myName" value="Project Default" /> + <option name="myLocal" value="false" /> + <used_levels> + <error> + <option name="myName" value="ERROR" /> + <option name="myVal" value="400" /> + </error> + <warning> + <option name="myName" value="WARNING" /> + <option name="myVal" value="300" /> + </warning> + <information> + <option name="myName" value="INFO" /> + <option name="myVal" value="200" /> + </information> + <server> + <option name="myName" value="SERVER PROBLEM" /> + <option name="myVal" value="100" /> + </server> + </used_levels> + <inspection_tool class="Glassfish" level="ERROR" enabled="false" /> + <inspection_tool class="JBoss" level="ERROR" enabled="false" /> + <inspection_tool class="Weblogic" level="ERROR" enabled="false" /> + <inspection_tool class="DeclareCollectionAsInterface" level="WARNING" enabled="true"> + <option name="ignoreLocalVariables" value="false" /> + <option name="ignorePrivateMethodsAndFields" value="false" /> + </inspection_tool> + <inspection_tool class="OverlyStrongTypeCast" level="WARNING" enabled="true" /> + <inspection_tool class="MethodOnlyUsedFromInnerClass" level="WARNING" enabled="true"> + <option name="ignoreMethodsAccessedFromAnonymousClass" value="true" /> + </inspection_tool> + <inspection_tool class="StaticMethodOnlyUsedInOneClass" level="WARNING" enabled="true" /> + <inspection_tool class="InstanceofChain" level="WARNING" enabled="true" /> + <inspection_tool class="ClassReferencesSubclass" level="WARNING" enabled="true" /> + <inspection_tool class="SillyAssignmentJS" level="WARNING" enabled="false" /> + <inspection_tool class="IncompatibleMaskJS" level="WARNING" enabled="false" /> + <inspection_tool class="PointlessBitwiseExpressionJS" level="WARNING" enabled="false"> + <option name="m_ignoreExpressionsContainingConstants" value="false" /> + </inspection_tool> + <inspection_tool class="ShiftOutOfRangeJS" level="WARNING" enabled="false" /> + <inspection_tool class="ClassMayBeInterface" level="WARNING" enabled="true" /> + <inspection_tool class="MissingDeprecatedAnnotation" level="WARNING" enabled="true" /> + <inspection_tool class="MissingOverrideAnnotation" level="WARNING" enabled="true" /> + <inspection_tool class="CloneCallsConstructors" level="WARNING" enabled="true" /> + <inspection_tool class="CloneInNonCloneableClass" level="WARNING" enabled="true" /> + <inspection_tool class="CloneableImplementsClone" level="WARNING" enabled="true"> + <option name="m_ignoreCloneableDueToInheritance" value="false" /> + </inspection_tool> + <inspection_tool class="ObsoleteCollection" level="WARNING" enabled="true" /> + <inspection_tool class="CStyleArrayDeclaration" level="WARNING" enabled="true" /> + <inspection_tool class="ControlFlowStatementWithoutBraces" level="WARNING" enabled="true" /> + <inspection_tool class="MissortedModifiers" level="WARNING" enabled="true"> + <option name="m_requireAnnotationsFirst" value="true" /> + </inspection_tool> + <inspection_tool class="UnnecessaryFullyQualifiedName" level="WARNING" enabled="true"> + <option name="m_ignoreJavadoc" value="false" /> + </inspection_tool> + <inspection_tool class="UnnecessaryQualifierForThis" level="WARNING" enabled="true" /> + <inspection_tool class="DoubleNegation" level="WARNING" enabled="true" /> + <inspection_tool class="DuplicateCondition" level="WARNING" enabled="true"> + <option name="ignoreMethodCalls" value="false" /> + </inspection_tool> + <inspection_tool class="DuplicateBooleanBranch" level="WARNING" enabled="true" /> + <inspection_tool class="EnumSwitchStatementWhichMissesCases" level="WARNING" enabled="true"> + <option name="ignoreSwitchStatementsWithDefault" value="false" /> + </inspection_tool> + <inspection_tool class="ForLoopReplaceableByWhile" level="WARNING" enabled="true"> + <option name="m_ignoreLoopsWithoutConditions" value="false" /> + </inspection_tool> + <inspection_tool class="IfStatementWithIdenticalBranches" level="WARNING" enabled="true" /> + <inspection_tool class="LoopConditionNotUpdatedInsideLoop" level="WARNING" enabled="true" /> + <inspection_tool class="PointlessIndexOfComparison" level="WARNING" enabled="true" /> + <inspection_tool class="ConstantConditionalExpressionJS" level="WARNING" enabled="false" /> + <inspection_tool class="ConstantIfStatementJS" level="WARNING" enabled="false" /> + <inspection_tool class="FallthroughInSwitchStatementJS" level="WARNING" enabled="false" /> + <inspection_tool class="LoopStatementThatDoesntLoopJS" level="WARNING" enabled="false" /> + <inspection_tool class="PointlessBooleanExpressionJS" level="WARNING" enabled="false" /> + <inspection_tool class="TrivialIfJS" level="WARNING" enabled="false" /> + <inspection_tool class="TrivialConditionalJS" level="WARNING" enabled="false" /> + <inspection_tool class="UnnecessaryContinueJS" level="WARNING" enabled="false" /> + <inspection_tool class="UnnecessaryReturnJS" level="WARNING" enabled="false" /> + <inspection_tool class="UnnecessaryLabelJS" level="WARNING" enabled="false" /> + <inspection_tool class="UnnecessaryLabelOnBreakStatementJS" level="WARNING" enabled="false" /> + <inspection_tool class="UnnecessaryLabelOnContinueStatementJS" level="WARNING" enabled="false" /> + <inspection_tool class="CssNoGenericFontName" level="WARNING" enabled="false" /> + <inspection_tool class="CssOverwrittenProperties" level="WARNING" enabled="false" /> + <inspection_tool class="CssUnitlessNumber" level="WARNING" enabled="false" /> + <inspection_tool class="ReuseOfLocalVariable" level="WARNING" enabled="true" /> + <inspection_tool class="TooBroadScope" level="WARNING" enabled="true"> + <option name="m_allowConstructorAsInitializer" value="false" /> + <option name="m_onlyLookAtBlocks" value="false" /> + </inspection_tool> + <inspection_tool class="UnnecessaryLocalVariableJS" level="WARNING" enabled="false"> + <option name="m_ignoreImmediatelyReturnedVariables" value="false" /> + <option name="m_ignoreAnnotatedVariables" value="false" /> + </inspection_tool> + <inspection_tool class="ContinueOrBreakFromFinallyBlockJS" level="WARNING" enabled="false" /> + <inspection_tool class="ExceptionCaughtLocallyJS" level="WARNING" enabled="false" /> + <inspection_tool class="ReturnFromFinallyBlockJS" level="WARNING" enabled="false" /> + <inspection_tool class="ThrowFromFinallyBlockJS" level="WARNING" enabled="false" /> + <inspection_tool class="CatchGenericClass" level="WARNING" enabled="true" /> + <inspection_tool class="InstanceofCatchParameter" level="WARNING" enabled="true" /> + <inspection_tool class="ErrorRethrown" level="WARNING" enabled="true" /> + <inspection_tool class="ThreadDeathRethrown" level="WARNING" enabled="true" /> + <inspection_tool class="NonFinalFieldOfException" level="WARNING" enabled="true" /> + <inspection_tool class="TooBroadCatch" level="WARNING" enabled="true" /> + <inspection_tool class="ThrowCaughtLocally" level="WARNING" enabled="true"> + <option name="ignoreRethrownExceptions" value="false" /> + </inspection_tool> + <inspection_tool class="ExceptionFromCatchWhichDoesntWrap" level="WARNING" enabled="true"> + <option name="ignoreGetMessage" value="false" /> + </inspection_tool> + <inspection_tool class="UnhandledExceptionInJSP" level="WARNING" enabled="false" /> + <inspection_tool class="FacesModelInspection" level="ERROR" enabled="false" /> + <inspection_tool class="FinalizeNotProtected" level="WARNING" enabled="true" /> + <inspection_tool class="BooleanMethodIsAlwaysInverted" level="WARNING" enabled="true" /> + <inspection_tool class="EqualsAndHashcode" level="WARNING" enabled="true" /> + <inspection_tool class="RedundantThrowsDeclaration" level="WARNING" enabled="true" /> + <inspection_tool class="NonJREEmulationClassesInClientCode" level="ERROR" enabled="false" /> + <inspection_tool class="GwtServiceNotRegistered" level="ERROR" enabled="false" /> + <inspection_tool class="GwtInconsistentI18nInterface" level="ERROR" enabled="false" /> + <inspection_tool class="GWTRemoteServiceAsyncCheck" level="ERROR" enabled="false" /> + <inspection_tool class="NonSerializableServiceParameters" level="ERROR" enabled="false" /> + <inspection_tool class="GWTStyleCheck" level="ERROR" enabled="false" /> + <inspection_tool class="GwtToHtmlReferences" level="ERROR" enabled="false" /> + <inspection_tool class="CheckEmptyScriptTag" level="WARNING" enabled="false" /> + <inspection_tool class="HTML" level="WARNING" enabled="false"> + <option name="myAdditionalHtmlTags" value="embed,nobr,noembed,comment,script" /> + <option name="myAdditionalHtmlAttributes" value="type,wmode,src,width,height" /> + <option name="myCheckHtmlTags" value="true" /> + <option name="myCheckHtmlAttributes" value="true" /> + </inspection_tool> + <inspection_tool class="CheckImageSize" level="WARNING" enabled="false" /> + <inspection_tool class="RequiredAttributes" level="WARNING" enabled="false"> + <option name="myAdditionalRequiredHtmlAttributes" value="" /> + </inspection_tool> + <inspection_tool class="CheckValidXmlInScriptTagBody" level="ERROR" enabled="false" /> + <inspection_tool class="ExtendsUtilityClass" level="WARNING" enabled="true" /> + <inspection_tool class="StaticInheritance" level="WARNING" enabled="true" /> + <inspection_tool class="RefusedBequest" level="WARNING" enabled="true"> + <option name="ignoreEmptySuperMethods" value="false" /> + </inspection_tool> + <inspection_tool class="StringTokenizer" level="WARNING" enabled="true" /> + <inspection_tool class="IndexOfReplaceableByContains" level="WARNING" enabled="true" /> + <inspection_tool class="RawUseOfParameterizedType" level="WARNING" enabled="true"> + <option name="ignoreObjectConstruction" value="true" /> + <option name="ignoreTypeCasts" value="false" /> + </inspection_tool> + <inspection_tool class="PersistenceDataSourceORMInspection" level="ERROR" enabled="false" /> + <inspection_tool class="PersistenceDataSourceORMDomInspection" level="ERROR" enabled="false" /> + <inspection_tool class="EjbErrorInspection" level="ERROR" enabled="false" /> + <inspection_tool class="EjbWarningInspection" level="WARNING" enabled="false" /> + <inspection_tool class="EjbDomInspection" level="ERROR" enabled="false" /> + <inspection_tool class="EjbQlInspection" level="ERROR" enabled="false" /> + <inspection_tool class="PersistenceORMDomInspection" level="ERROR" enabled="false" /> + <inspection_tool class="PersistenceModelErrorInspection" level="ERROR" enabled="false" /> + <inspection_tool class="PersistenceModelWarningInspection" level="WARNING" enabled="false" /> + <inspection_tool class="PersistenceQlInspection" level="ERROR" enabled="false" /> + <inspection_tool class="PersistenceDomInspection" level="ERROR" enabled="false" /> + <inspection_tool class="ReferencesToClassesFromDefaultPackagesInJSPFile" level="ERROR" enabled="false" /> + <inspection_tool class="SelfIncludingJspFiles" level="ERROR" enabled="false" /> + <inspection_tool class="WebProperties" level="ERROR" enabled="false" /> + <inspection_tool class="JSUndeclaredVariable" level="INFO" enabled="false" /> + <inspection_tool class="JSUnresolvedFunction" level="INFO" enabled="false" /> + <inspection_tool class="JSUnresolvedVariable" level="INFO" enabled="false" /> + <inspection_tool class="DuplicateCaseLabelJS" level="WARNING" enabled="false" /> + <inspection_tool class="DuplicatePropertyOnObjectJS" level="WARNING" enabled="false" /> + <inspection_tool class="BadExpressionStatementJS" level="WARNING" enabled="false" /> + <inspection_tool class="FunctionWithInconsistentReturnsJS" level="WARNING" enabled="false" /> + <inspection_tool class="ReservedWordUsedAsNameJS" level="WARNING" enabled="false" /> + <inspection_tool class="ThisExpressionReferencesGlobalObjectJS" level="WARNING" enabled="false" /> + <inspection_tool class="UnreachableCodeJS" level="WARNING" enabled="false" /> + <inspection_tool class="ELValidationInJSP" level="WARNING" enabled="false" /> + <inspection_tool class="CheckJsfComponentUnderViewTag" level="INFO" enabled="false" /> + <inspection_tool class="MisspelledSetUp" level="WARNING" enabled="true" /> + <inspection_tool class="SetupIsPublicVoidNoArg" level="WARNING" enabled="true" /> + <inspection_tool class="TestMethodIsPublicVoidNoArg" level="WARNING" enabled="true" /> + <inspection_tool class="ZeroLengthArrayInitialization" level="WARNING" enabled="true" /> + <inspection_tool class="DollarSignInName" level="WARNING" enabled="true" /> + <inspection_tool class="ComparisonOfShortAndChar" level="WARNING" enabled="true" /> + <inspection_tool class="ComparisonToNaN" level="WARNING" enabled="true" /> + <inspection_tool class="ConfusingFloatingPointLiteral" level="WARNING" enabled="true" /> + <inspection_tool class="DivideByZero" level="WARNING" enabled="true" /> + <inspection_tool class="BigDecimalEquals" level="WARNING" enabled="true" /> + <inspection_tool class="FloatingPointEquality" level="WARNING" enabled="true" /> + <inspection_tool class="IntegerDivisionInFloatingPointContext" level="WARNING" enabled="true" /> + <inspection_tool class="IntegerMultiplicationImplicitCastToLong" level="WARNING" enabled="true" /> + <inspection_tool class="LongLiteralsEndingWithLowercaseL" level="WARNING" enabled="true" /> + <inspection_tool class="CachedNumberConstructorCall" level="WARNING" enabled="true" /> + <inspection_tool class="BadOddness" level="WARNING" enabled="true" /> + <inspection_tool class="UnaryPlus" level="WARNING" enabled="true" /> + <inspection_tool class="MapReplaceableByEnumMap" level="WARNING" enabled="true" /> + <inspection_tool class="SubstringZero" level="WARNING" enabled="true" /> + <inspection_tool class="SetReplaceableByEnumSet" level="WARNING" enabled="true" /> + <inspection_tool class="SizeReplaceableByIsEmpty" level="WARNING" enabled="true" /> + <inspection_tool class="StringBufferReplaceableByStringBuilder" level="WARNING" enabled="true" /> + <inspection_tool class="ComponentRegistrationProblems" level="ERROR" enabled="false"> + <option name="CHECK_PLUGIN_XML" value="true" /> + <option name="CHECK_JAVA_CODE" value="true" /> + <option name="CHECK_ACTIONS" value="true" /> + </inspection_tool> + <inspection_tool class="ComponentNotRegistered" level="WARNING" enabled="false"> + <option name="CHECK_ACTIONS" value="true" /> + <option name="IGNORE_NON_PUBLIC" value="true" /> + </inspection_tool> + <inspection_tool class="HardcodedFileSeparators" level="WARNING" enabled="true"> + <option name="m_recognizeExampleMediaType" value="false" /> + </inspection_tool> + <inspection_tool class="HardcodedLineSeparators" level="WARNING" enabled="true" /> + <inspection_tool class="PointlessArithmeticExpressionJS" level="WARNING" enabled="false" /> + <inspection_tool class="EmptyStatementBodyJS" level="WARNING" enabled="false"> + <option name="m_reportEmptyBlocks" value="false" /> + </inspection_tool> + <inspection_tool class="ReplaceAllDot" level="WARNING" enabled="true" /> + <inspection_tool class="CastConflictsWithInstanceof" level="WARNING" enabled="true" /> + <inspection_tool class="CastToIncompatibleInterface" level="WARNING" enabled="true" /> + <inspection_tool class="CollectionAddedToSelf" level="WARNING" enabled="true" /> + <inspection_tool class="MisspelledCompareTo" level="WARNING" enabled="true" /> + <inspection_tool class="CovariantCompareTo" level="WARNING" enabled="true" /> + <inspection_tool class="CovariantEquals" level="WARNING" enabled="true" /> + <inspection_tool class="MisspelledEquals" level="WARNING" enabled="true" /> + <inspection_tool class="EqualsBetweenInconvertibleTypes" level="WARNING" enabled="true" /> + <inspection_tool class="MisspelledHashcode" level="WARNING" enabled="true" /> + <inspection_tool class="InstanceofIncompatibleInterface" level="WARNING" enabled="true" /> + <inspection_tool class="ObjectEquality" level="WARNING" enabled="true"> + <option name="m_ignoreEnums" value="true" /> + <option name="m_ignoreClassObjects" value="false" /> + <option name="m_ignorePrivateConstructors" value="false" /> + </inspection_tool> + <inspection_tool class="SuspiciousToArrayCall" level="WARNING" enabled="true" /> + <inspection_tool class="SuspiciousSystemArraycopy" level="WARNING" enabled="true" /> + <inspection_tool class="MisspelledToString" level="WARNING" enabled="true" /> + <inspection_tool class="TextLabelInSwitchStatement" level="WARNING" enabled="true" /> + <inspection_tool class="UseOfPropertiesAsHashtable" level="WARNING" enabled="true" /> + <inspection_tool class="InfiniteLoopJS" level="WARNING" enabled="false" /> + <inspection_tool class="InfiniteRecursionJS" level="WARNING" enabled="false" /> + <inspection_tool class="ComparatorNotSerializable" level="WARNING" enabled="true" /> + <inspection_tool class="NonSerializableWithSerializationMethods" level="WARNING" enabled="true" /> + <inspection_tool class="NonSerializableWithSerialVersionUIDField" level="WARNING" enabled="true" /> + <inspection_tool class="NonSerializableFieldInSerializableClass" level="WARNING" enabled="true"> + <option name="ignoreSerializableDueToInheritance" value="true" /> + </inspection_tool> + <inspection_tool class="ReadObjectAndWriteObjectPrivate" level="WARNING" enabled="true" /> + <inspection_tool class="ReadResolveAndWriteReplaceProtected" level="WARNING" enabled="true" /> + <inspection_tool class="SerializableWithUnconstructableAncestor" level="WARNING" enabled="true" /> + <inspection_tool class="SerializableHasSerialVersionUIDField" level="WARNING" enabled="true"> + <option name="m_ignoreSerializableDueToInheritance" value="true" /> + </inspection_tool> + <inspection_tool class="SerializableInnerClassHasSerialVersionUIDField" level="WARNING" enabled="true"> + <option name="m_ignoreSerializableDueToInheritance" value="true" /> + </inspection_tool> + <inspection_tool class="SerialPersistentFieldsWithWrongSignature" level="WARNING" enabled="true" /> + <inspection_tool class="SerialVersionUIDNotStaticFinal" level="WARNING" enabled="true" /> + <inspection_tool class="StrutsInspection" level="ERROR" enabled="false" /> + <inspection_tool class="StrutsValidatorFormInspection" level="ERROR" enabled="false" /> + <inspection_tool class="StrutsTilesInspection" level="ERROR" enabled="false" /> + <inspection_tool class="StrutsValidatorInspection" level="ERROR" enabled="false" /> + <inspection_tool class="SimplifiableIfStatement" level="WARNING" enabled="false" /> + <inspection_tool class="UnnecessaryLocalVariable" level="WARNING" enabled="true"> + <option name="m_ignoreImmediatelyReturnedVariables" value="true" /> + <option name="m_ignoreAnnotatedVariables" value="true" /> + </inspection_tool> + </profile> + </profiles> + </component> <component name="JavacSettings"> <option name="DEBUGGING_INFO" value="true" /> <option name="GENERATE_NO_WARNINGS" value="false" /> @@ -137,6 +422,7 @@ <option name="OPTION_DEPRECATED_LIST" value="true" /> <option name="OTHER_OPTIONS" value="" /> <option name="HEAP_SIZE" /> + <option name="LOCALE" /> <option name="OPEN_IN_BROWSER" value="true" /> </component> <component name="JikesSettings"> @@ -147,108 +433,131 @@ <option name="IS_EMACS_ERRORS_MODE" value="true" /> <option name="ADDITIONAL_OPTIONS_STRING" value="" /> </component> + <component name="LogConsolePreferences"> + <option name="FILTER_ERRORS" value="false" /> + <option name="FILTER_WARNINGS" value="false" /> + <option name="FILTER_INFO" value="true" /> + <option name="CUSTOM_FILTER" /> + </component> <component name="Palette2"> <group name="Swing"> - <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false"> + <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false"> <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" /> </item> - <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false"> + <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false"> <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" /> </item> - <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false"> + <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false"> <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" /> </item> - <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false"> + <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true"> <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" /> </item> - <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false"> + <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false"> <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" /> <initial-values> <property name="text" value="Button" /> </initial-values> </item> - <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false"> + <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false"> <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" /> <initial-values> <property name="text" value="RadioButton" /> </initial-values> </item> - <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false"> + <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false"> <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" /> <initial-values> <property name="text" value="CheckBox" /> </initial-values> </item> - <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false"> + <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false"> <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" /> <initial-values> <property name="text" value="Label" /> </initial-values> </item> - <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false"> + <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true"> <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1"> <preferred-size width="150" height="-1" /> </default-constraints> </item> - <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false"> + <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true"> <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1"> <preferred-size width="150" height="-1" /> </default-constraints> </item> - <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false"> + <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true"> <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1"> <preferred-size width="150" height="-1" /> </default-constraints> </item> - <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false"> + <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true"> <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3"> <preferred-size width="150" height="50" /> </default-constraints> </item> - <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false"> + <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true"> <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3"> <preferred-size width="150" height="50" /> </default-constraints> </item> - <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false"> + <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true"> <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3"> <preferred-size width="150" height="50" /> </default-constraints> </item> - <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false"> + <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true"> <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" /> </item> - <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false"> + <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false"> <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3"> <preferred-size width="150" height="50" /> </default-constraints> </item> - <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false"> + <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false"> <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3"> <preferred-size width="150" height="50" /> </default-constraints> </item> - <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false"> + <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false"> <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3"> <preferred-size width="150" height="50" /> </default-constraints> </item> - <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false"> + <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false"> <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3"> <preferred-size width="200" height="200" /> </default-constraints> </item> - <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false"> + <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false"> <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3"> <preferred-size width="200" height="200" /> </default-constraints> </item> - <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false"> + <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true"> <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" /> </item> - <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false"> + <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false"> <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" /> </item> + <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false"> + <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" /> + </item> + <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false"> + <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" /> + </item> + <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false"> + <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1"> + <preferred-size width="-1" height="20" /> + </default-constraints> + </item> + <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false"> + <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" /> + </item> + <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false"> + <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" /> + </item> </group> </component> <component name="ProjectModuleManager"> @@ -257,6 +566,7 @@ </modules> </component> <component name="ProjectRootManager" version="2" assert-keyword="true" jdk-15="false" project-jdk-name="1.5" /> + <component name="ProjectRunConfigurationManager" /> <component name="RmicSettings"> <option name="IS_EANABLED" value="false" /> <option name="DEBUGGING_INFO" value="true" /> @@ -264,11 +574,21 @@ <option name="GENERATE_IIOP_STUBS" value="false" /> <option name="ADDITIONAL_OPTIONS_STRING" value="" /> </component> + <component name="StarteamVcsAdapter" /> + <component name="VssVcs" /> + <component name="com.intellij.jsf.UserDefinedFacesConfigs"> + <option name="USER_DEFINED_CONFIGS"> + <value> + <list size="0" /> + </value> + </option> + </component> <component name="libraryTable" /> <component name="org.tmatesoft.tmate.projectComponent" /> <component name="uidesigner-configuration"> <option name="INSTRUMENT_CLASSES" value="false" /> <option name="COPY_FORMS_RUNTIME_TO_OUTPUT" value="true" /> + <option name="DEFAULT_LAYOUT_MANAGER" value="GridLayoutManager" /> </component> <UsedPathMacros /> </project> Modified: Trunk/pcgen/code/src/java/pcgen/core/AbilityStore.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/core/AbilityStore.java 2007-01-12 21:58:25 UTC (rev 1936) +++ Trunk/pcgen/code/src/java/pcgen/core/AbilityStore.java 2007-01-12 23:01:11 UTC (rev 1937) @@ -133,8 +133,8 @@ */ private void addAsPerParsedInfo(boolean getAbility, String cat, final String token) { Categorisable toAdd = (getAbility) - ? (Categorisable) AbilityUtilities.retrieveAbilityKeyed(cat, token) - : (Categorisable) new AbilityInfo(cat, token); + ? AbilityUtilities.retrieveAbilityKeyed(cat, token) + : new AbilityInfo(cat, token); if (toAdd == null) { Modified: Trunk/pcgen/code/src/java/pcgen/core/AbilityUtilities.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/core/AbilityUtilities.java 2007-01-12 21:58:25 UTC (rev 1936) +++ Trunk/pcgen/code/src/java/pcgen/core/AbilityUtilities.java 2007-01-12 23:01:11 UTC (rev 1937) @@ -25,8 +25,6 @@ import pcgen.core.pclevelinfo.PCLevelInfo; import pcgen.core.utils.ListKey; -import pcgen.core.utils.MessageType; -import pcgen.core.utils.ShowMessageDelegate; import pcgen.util.Logging; import java.util.ArrayList; @@ -234,7 +232,7 @@ * @param second * @return true if the same object is represented */ - static public boolean areSameAbility( + public static boolean areSameAbility( final Categorisable first, final Categorisable second) { @@ -285,7 +283,7 @@ * @param second * @return true if the same object is represented */ - static public boolean areSameAbility( + public static boolean areSameAbility( final Categorisable first, final String second) { @@ -305,7 +303,7 @@ * @param second * @return true if the same object is represented */ - static public boolean areSameAbility( + public static boolean areSameAbility( final String category, final String first, final String second) Modified: Trunk/pcgen/code/src/java/pcgen/core/Equipment.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/core/Equipment.java 2007-01-12 21:58:25 UTC (rev 1936) +++ Trunk/pcgen/code/src/java/pcgen/core/Equipment.java 2007-01-12 23:01:11 UTC (rev 1937) @@ -2655,7 +2655,7 @@ // only make a copy if we need to // add qualifiers to modifier if (eqMod.getChoiceString().length() != 0) { - eqMod = (EquipmentModifier) eqMod.clone(); + eqMod = eqMod.clone(); } addToEqModifierList(eqMod, bPrimary); @@ -2783,7 +2783,7 @@ // only make a copy if we need to add qualifiers to modifier // if (eqMod.getChoiceString().length() != 0) { - aMod = (EquipmentModifier) eqMod.clone(); + aMod = eqMod.clone(); if (aMod == null) { return; @@ -4834,7 +4834,7 @@ // only make a copy if we need to add qualifiers to modifier // if (eqMod.getChoiceString().length() != 0) { - eqMod = (EquipmentModifier) eqMod.clone(); + eqMod = eqMod.clone(); } clonedList.add(eqMod); Modified: Trunk/pcgen/code/src/java/pcgen/core/EquipmentList.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/core/EquipmentList.java 2007-01-12 21:58:25 UTC (rev 1936) +++ Trunk/pcgen/code/src/java/pcgen/core/EquipmentList.java 2007-01-12 23:01:11 UTC (rev 1937) @@ -300,7 +300,7 @@ if (eq != null) { boolean bModified = false; boolean bError = false; - eq = (Equipment) eq.clone(); + eq = eq.clone(); // // Now attempt to add all the modifiers. @@ -613,7 +613,7 @@ final Iterator<String> equipIter = equipChoice.getChoiceIterator(true); for (; equipIter.hasNext();) { final String mwChoice = equipIter.next(); - eq = (Equipment) eq.clone(); + eq = eq.clone(); eq.addEqModifier(eqMod, true, null, mwChoice, equipChoice); if (eq.isWeapon() && eq.isDouble()) { @@ -811,7 +811,7 @@ || (eq.isArmor() && (eq.getACMod(aPC).intValue() == 0) && ((eqMod != null) && !eqMod.getDisplayName() .equalsIgnoreCase("MASTERWORK")))) { return; } - eq = (Equipment) eq.clone(); + eq = eq.clone(); if (eq == null) { Logging.errorPrint("could not clone item"); Modified: Trunk/pcgen/code/src/java/pcgen/core/EquipmentUtilities.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/core/EquipmentUtilities.java 2007-01-12 21:58:25 UTC (rev 1936) +++ Trunk/pcgen/code/src/java/pcgen/core/EquipmentUtilities.java 2007-01-12 23:01:11 UTC (rev 1937) @@ -128,7 +128,7 @@ // create a temporary list to merge with for ( Equipment tempEq : aList ) { - final Equipment eq = (Equipment) tempEq.clone(); + final Equipment eq = tempEq.clone(); eq1List.add(eq); eq2List.add(eq); } Modified: Trunk/pcgen/code/src/java/pcgen/core/PObject.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/core/PObject.java 2007-01-12 21:58:25 UTC (rev 1936) +++ Trunk/pcgen/code/src/java/pcgen/core/PObject.java 2007-01-12 23:01:11 UTC (rev 1937) @@ -1894,7 +1894,7 @@ public List<String> getTypeList(final boolean visibleOnly) { final List<String> ret = getSafeListFor(ListKey.TYPE); - if ( visibleOnly == true ) + if (visibleOnly ) { for ( int i = getMyTypeCount(); i >= 0; --i ) { @@ -2095,7 +2095,7 @@ { AssociatedChoice<String> choice = i.next(); ret = choice.removeDefaultChoice( associated ); - if ( ret == true ) + if (ret ) { if ( choice.size() == 0 ) { @@ -3264,7 +3264,7 @@ if (aEq != null) { - final Equipment newEq = (Equipment) aEq.clone(); + final Equipment newEq = aEq.clone(); newEq.setQty(1); newEq.setAutomatic(true); newEq.setOutputIndex(aList.size()); Modified: Trunk/pcgen/code/src/java/pcgen/core/PlayerCharacter.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/core/PlayerCharacter.java 2007-01-12 21:58:25 UTC (rev 1936) +++ Trunk/pcgen/code/src/java/pcgen/core/PlayerCharacter.java 2007-01-12 23:01:11 UTC (rev 1937) @@ -302,7 +302,7 @@ { final PCStat stat = SettingsHandler.getGame() .getUnmodifiableStatList().get(i); - statList.addStat((PCStat) stat.clone()); + statList.addStat(stat.clone()); } setRace(Globals.s_EMPTYRACE); @@ -2220,7 +2220,7 @@ { // familiar doesn't have skill, // but master does, so add it - final Skill newSkill = (Skill) Globals.getSkillKeyed(skillKey) + final Skill newSkill = Globals.getSkillKeyed(skillKey) .clone(); final double sr = mPC.getSkillKeyed(skillKey).getRank() .doubleValue(); @@ -5359,7 +5359,7 @@ if (equip.isDouble() && (equip.getLocation() == Equipment.EQUIPPED_TWO_HANDS)) { - Equipment eqm = (Equipment) equip.clone(); + Equipment eqm = equip.clone(); eqm.removeType("Double"); eqm.setTypeInfo("Head1"); @@ -5377,7 +5377,7 @@ PlayerCharacterUtilities.setProf(equip, eqm); weapList.add(idx + 1, eqm); - eqm = (Equipment) equip.clone(); + eqm = equip.clone(); final String altType = eqm.getType(false); @@ -5421,7 +5421,7 @@ // // Strip off the Ranged portion, set range to 0 // - Equipment eqm = (Equipment) equip.clone(); + Equipment eqm = equip.clone(); eqm.setTypeInfo("Both"); eqm.removeType("Ranged.Thrown"); eqm.setRange("0"); @@ -5469,7 +5469,7 @@ // // Add thrown portion, strip Melee // - eqm = (Equipment) equip.clone(); + eqm = equip.clone(); eqm.setTypeInfo("Ranged.Thrown.Both"); eqm.removeType("Melee"); @@ -6064,7 +6064,7 @@ if (aRace != null) { - race = (Race) aRace.clone(); + race = aRace.clone(); } if (race != null) @@ -7549,7 +7549,7 @@ // // Skill not found, add to list // - retSkill = (Skill) addSkill.clone(); + retSkill = addSkill.clone(); getSkillList().add(retSkill); setDirty(true); @@ -7934,7 +7934,7 @@ final PCTemplate inTmpl; try { - inTmpl = (PCTemplate) inTemplate.clone(); + inTmpl = inTemplate.clone(); templateList.add(inTmpl); } catch (CloneNotSupportedException e) @@ -8016,7 +8016,7 @@ } List<String> templates; - if (doChoose == true) + if (doChoose) { templates = inTmpl.getTemplates(isImporting(), this); } @@ -9640,7 +9640,7 @@ return; } - bClass = (PCClass) bClass.clone(); + bClass = bClass.clone(); rebuildLists(bClass, aClass, aClass.getLevel(), this); @@ -11969,7 +11969,7 @@ if (PrereqHandler.passesAll(pcSpell.getPreReqList(), this, pcSpell)) { - final Spell newSpell = (Spell) aSpell.clone(); + final Spell newSpell = aSpell.clone(); aSpell.setFixedCasterLevel(pcSpell.getCasterLevelFormula()); aSpell.setFixedDC(pcSpell.getDcFormula()); final List<CharacterSpell> sList = owner.getSpellSupport() @@ -12702,7 +12702,7 @@ && (Globals.binarySearchPObject(getSkillList(), aSkill .getKeyName()) == null)) { - addItems.add((Skill) (aSkill.clone())); + addItems.add((aSkill.clone())); } } @@ -13771,7 +13771,7 @@ // Make sure the character qualifies for the class if adding it if (numberOfLevels > 0) { - if (bypassPrereqs == false && !globalClass.isQualified(this)) + if (!bypassPrereqs && !globalClass.isQualified(this)) { return; } @@ -13804,7 +13804,7 @@ if (numberOfLevels >= 0) { // Get a clone of the class so we don't modify the globals! - pcClassClone = (PCClass) globalClass.clone(); + pcClassClone = globalClass.clone(); // Make sure the clone was successful if (pcClassClone == null) @@ -14185,7 +14185,7 @@ break; } } - if (aSortedFlag == true) + if (aSortedFlag) { Arrays.sort(rolls); } @@ -14712,7 +14712,7 @@ aClone.shieldProfList.addAll(getShieldProfList()); for (Skill skill : getSkillList()) { - aClone.skillList.add((Skill) (skill.clone())); + aClone.skillList.add((skill.clone())); } aClone.specialAbilityList.addAll(getSpecialAbilityList()); aClone.templateList.addAll(getTemplateList()); @@ -14727,7 +14727,7 @@ aClone.characterDomainList.addAll(characterDomainList); for (PCClass pcClass : classList) { - aClone.classList.add((PCClass) (pcClass.clone())); + aClone.classList.add((pcClass.clone())); } aClone.companionModList.addAll(companionModList); aClone.qualifyArrayMap.addAllLists(qualifyArrayMap); @@ -14762,7 +14762,7 @@ aClone.statList.clear(); for (PCStat stat : statList) { - aClone.statList.addStat((PCStat) stat.clone()); + aClone.statList.addStat(stat.clone()); } if (kitList != null) { @@ -15679,7 +15679,7 @@ aggregateFeatsStable = stable; setVirtualFeatsStable(stable); setAutomaticFeatsStable(stable); - if (stable == false) + if (!stable) { cachedWeaponProfs = null; } @@ -15689,7 +15689,7 @@ public void setAggregateAbilitiesStable(final AbilityCategory aCategory, final boolean stable) { - if (stable == false) + if (!stable) { cachedWeaponProfs = null; } @@ -15700,7 +15700,7 @@ } if (aCategory == null) { - if (stable == false) + if (!stable) { // Clear all the categories for (final AbilityCategory cat : theAbilities.getKeySet()) @@ -15711,7 +15711,7 @@ setAggregateFeatsStable(stable); return; } - if (stable == false) + if (!stable) { theAbilities.put(aCategory, Ability.Nature.AUTOMATIC, null); // TODO - Deal with non-aggregate virtual abilities (i.e. from ADD:) @@ -15749,7 +15749,7 @@ */ private void setAutomaticFeatsStable(final boolean stable) { - if (stable == false) + if (!stable) { stableAutomaticFeatList = null; } @@ -15760,7 +15760,7 @@ { if (aCategory == null) { - if (stable == false) + if (!stable) { for (final AbilityCategory cat : theAbilities.getKeySet()) { @@ -15775,7 +15775,7 @@ setAutomaticFeatsStable(stable); return; } - if (stable == false) + if (!stable) { theAbilities.put(aCategory, Ability.Nature.AUTOMATIC, null); } @@ -16107,7 +16107,7 @@ hasIt = true; } } - i... [truncated message content] |