From: <kar...@us...> - 2011-12-08 16:06:02
|
Revision: 15635 http://pcgen.svn.sourceforge.net/pcgen/?rev=15635&view=rev Author: karianna Date: 2011-12-08 16:05:50 +0000 (Thu, 08 Dec 2011) Log Message: ----------- CODE-1133 Fix Eclipse 3.7.0/1 compiler warning Modified Paths: -------------- sandbox/uisync/.classpath sandbox/uisync/code/src/java/pcgen/cdom/base/CDOMObject.java sandbox/uisync/code/src/java/pcgen/cdom/base/ConcretePrereqObject.java sandbox/uisync/code/src/java/pcgen/cdom/base/PrereqObject.java sandbox/uisync/code/src/java/pcgen/cdom/enumeration/IntegerKey.java sandbox/uisync/code/src/java/pcgen/cdom/reference/ReferenceManufacturer.java sandbox/uisync/code/src/java/pcgen/gui/tabs/ability/AbilityModel.java sandbox/uisync/code/src/java/pcgen/rules/context/AbstractReferenceContext.java sandbox/uisync/nbproject/project.xml Modified: sandbox/uisync/.classpath =================================================================== --- sandbox/uisync/.classpath 2011-12-08 16:04:10 UTC (rev 15634) +++ sandbox/uisync/.classpath 2011-12-08 16:05:50 UTC (rev 15635) @@ -1,39 +1,39 @@ -<?xml version="1.0" encoding="UTF-8"?> -<classpath> - <classpathentry excluding="**/.svn/*" kind="src" path="code/src/java"/> - <classpathentry excluding="**/.svn/*" kind="src" path="code/src/test"/> - <classpathentry kind="src" path="code/src/utest"/> - <classpathentry kind="src" path="code/src/itest"/> - <classpathentry kind="src" path="code/src/testcommon"/> - <classpathentry kind="lib" path="lib/test/junit-4.1.jar"/> - <classpathentry kind="lib" path="lib/lnf/kunststoff.jar"/> - <classpathentry kind="lib" path="lib/lnf/skinlf.jar"/> - <classpathentry kind="lib" path="lib/lnf/themes/aquathemepack.zip"/> - <classpathentry kind="lib" path="lib/lnf/themes/bbjthemepack.zip"/> - <classpathentry kind="lib" path="lib/lnf/themes/beosthemepack.zip"/> - <classpathentry kind="lib" path="lib/lnf/themes/macosthemepack.zip"/> - <classpathentry kind="lib" path="lib/lnf/themes/modernthemepack.zip"/> - <classpathentry kind="lib" path="lib/lnf/themes/themepack.zip"/> - <classpathentry kind="lib" path="lib/lnf/themes/whistlerthemepack.zip"/> - <classpathentry kind="lib" path="lib/lnf/themes/xplunathemepack.zip"/> - <classpathentry kind="lib" path="lib/jdom.jar"/> - <classpathentry kind="lib" path="lib/MRJ141Stubs.jar"/> - <classpathentry kind="lib" path="lib/test/xmlunit1.0.jar"/> - <classpathentry kind="lib" path="lib/javacc.jar"/> - <classpathentry kind="lib" path="lib/cobra/cobra.jar"/> - <classpathentry kind="lib" path="lib/cobra/js.jar"/> - <classpathentry kind="lib" path="lib/apache/commons-lang-2.4.jar"/> - <classpathentry kind="lib" path="lib/apache/commons-io-2.1.jar"/> - <classpathentry kind="lib" path="lib/jep/jep-2.4.1.jar"/> - <classpathentry kind="lib" path="lib/spring/commons-logging-1.1.1.jar"/> - <classpathentry kind="lib" path="lib/spring/spring-beans-2.5.6.SEC01.jar"/> - <classpathentry kind="lib" path="lib/spring/spring-core-2.5.6.SEC01.jar"/> - <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"/> - <classpathentry kind="lib" path="lib/fop/xalan-2.5.2.jar"/> - <classpathentry kind="lib" path="lib/fop/xercesImpl-2.5.0.jar"/> - <classpathentry kind="lib" path="lib/fop/xml-apis.jar"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.6.0_26"/> - <classpathentry kind="output" path="code/build.eclipse"/> -</classpath> +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry excluding="**/.svn/*" kind="src" path="code/src/java"/> + <classpathentry excluding="**/.svn/*" kind="src" path="code/src/test"/> + <classpathentry kind="src" path="code/src/utest"/> + <classpathentry kind="src" path="code/src/itest"/> + <classpathentry kind="src" path="code/src/testcommon"/> + <classpathentry kind="lib" path="lib/test/junit-4.1.jar"/> + <classpathentry kind="lib" path="lib/lnf/kunststoff.jar"/> + <classpathentry kind="lib" path="lib/lnf/skinlf.jar"/> + <classpathentry kind="lib" path="lib/lnf/themes/aquathemepack.zip"/> + <classpathentry kind="lib" path="lib/lnf/themes/bbjthemepack.zip"/> + <classpathentry kind="lib" path="lib/lnf/themes/beosthemepack.zip"/> + <classpathentry kind="lib" path="lib/lnf/themes/macosthemepack.zip"/> + <classpathentry kind="lib" path="lib/lnf/themes/modernthemepack.zip"/> + <classpathentry kind="lib" path="lib/lnf/themes/themepack.zip"/> + <classpathentry kind="lib" path="lib/lnf/themes/whistlerthemepack.zip"/> + <classpathentry kind="lib" path="lib/lnf/themes/xplunathemepack.zip"/> + <classpathentry kind="lib" path="lib/jdom.jar"/> + <classpathentry kind="lib" path="lib/MRJ141Stubs.jar"/> + <classpathentry kind="lib" path="lib/test/xmlunit1.0.jar"/> + <classpathentry kind="lib" path="lib/javacc.jar"/> + <classpathentry kind="lib" path="lib/cobra/js.jar"/> + <classpathentry kind="lib" path="lib/apache/commons-lang-2.4.jar"/> + <classpathentry kind="lib" path="lib/apache/commons-io-2.1.jar"/> + <classpathentry kind="lib" path="lib/jep/jep-2.4.1.jar"/> + <classpathentry kind="lib" path="lib/spring/commons-logging-1.1.1.jar"/> + <classpathentry kind="lib" path="lib/spring/spring-beans-2.5.6.SEC01.jar"/> + <classpathentry kind="lib" path="lib/spring/spring-core-2.5.6.SEC01.jar"/> + <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"/> + <classpathentry kind="lib" path="lib/fop/xalan-2.5.2.jar"/> + <classpathentry kind="lib" path="lib/fop/xercesImpl-2.5.0.jar"/> + <classpathentry kind="lib" path="lib/fop/xml-apis.jar"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/JVM 1.6.0 (MacOS X Default)"/> + <classpathentry kind="lib" path="lib/cobra/cobra.jar"/> + <classpathentry kind="output" path="code/build.eclipse"/> +</classpath> Modified: sandbox/uisync/code/src/java/pcgen/cdom/base/CDOMObject.java =================================================================== --- sandbox/uisync/code/src/java/pcgen/cdom/base/CDOMObject.java 2011-12-08 16:04:10 UTC (rev 15634) +++ sandbox/uisync/code/src/java/pcgen/cdom/base/CDOMObject.java 2011-12-08 16:05:50 UTC (rev 15635) @@ -46,6 +46,25 @@ import pcgen.core.analysis.BonusActivation; import pcgen.core.bonus.BonusObj; +/** + * A Character Domain Object Model (CDOM) Object is an abstract node in + * a acyclic directed graph. It provides base functionality to store and + * retrieve rules data for a particular aspect of a character and also + * deals with the up-front and ad-hoc storage and retrieval of Bonuses. + * + * It contains: + * + * <ul> + * <li>Where it came from (the <code>sourceURI</code>).</li> + * <li>A name for external display</li> + * <li>A series of <code>Map</code>s that hold key's to objects. These maps represent + * information held by this <code>CDOMObject</code>. Due to the complexity of + * the rule sets PCGen supports, there are several of these maps all with + * different keying strategies.</li> + * </ul> + * + * + */ public abstract class CDOMObject extends ConcretePrereqObject implements Cloneable, BonusContainer, Loadable { @@ -95,16 +114,36 @@ */ private DoubleKeyMapToList<CDOMReference<? extends CDOMList<? extends PrereqObject>>, CDOMReference<?>, AssociatedPrereqObject> cdomListMods = new DoubleKeyMapToList<CDOMReference<? extends CDOMList<? extends PrereqObject>>, CDOMReference<?>, AssociatedPrereqObject>(HashMap.class, LinkedHashMap.class); + /** + * Returns true if the <code>integerChar Map</code> contains the provided key. + * + * @param key - key to search for + * @return true if the <code>integerChar Map</code> contains the provided key. + */ public final boolean containsKey(IntegerKey key) { return integerChar.containsKey(key); } + /** + * Retrieves the value from the integerChar Map given a key + * + * @param key - key to retrieve value + * @return the value from the integerChar Map given a key + */ public final Integer get(IntegerKey key) { return integerChar.get(key); } + /** + * Retrieves the value from the integerChar Map given a key, + * if the value is null then a default value is used in its place + * + * @param key - key to retrieve value + * @return the value from the integerChar Map given a key, + * null values are replaced by a default + */ public final int getSafe(IntegerKey key) { Integer intValue = integerChar.get(key); @@ -419,12 +458,10 @@ public String getKeyName() { // FIXME TODO Patched for now to avoid NPEs, but this is wrong - // TODO Auto-generated method stub String returnKey = this.get(StringKey.KEY_NAME); if (returnKey == null) { returnKey = this.getDisplayName(); - //returnKey = this.get(StringKey.NAME); } return returnKey; } @@ -456,40 +493,26 @@ } if (!integerChar.equals(cdo.integerChar)) { - // System.err.println("CDOM Inequality Integer"); - // System.err.println(integerChar + " " + cdo.integerChar); return false; } if (!stringChar.equals(cdo.stringChar)) { - // System.err.println("CDOM Inequality String"); - // System.err.println(stringChar + " " + cdo.stringChar); return false; } if (!formulaChar.equals(cdo.formulaChar)) { - // System.err.println("CDOM Inequality Formula"); - // System.err.println(formulaChar + " " + cdo.formulaChar); return false; } if (!variableChar.equals(cdo.variableChar)) { - // System.err.println("CDOM Inequality Variable"); - // System.err.println(variableChar + " " + cdo.variableChar); return false; } if (!objectChar.equals(cdo.objectChar)) { - // System.err.println("CDOM Inequality Object"); - // System.err.println(objectChar + " " + cdo.objectChar); return false; } if (!listChar.equals(cdo.listChar)) { -// System.err.println("CDOM Inequality List"); -// System.err.println(listChar + " " + cdo.listChar); -// System.err.println(listChar.getKeySet() + " " -// + cdo.listChar.getKeySet()); return false; } if (!mapChar.equals(cdo.mapChar)) @@ -498,17 +521,6 @@ } if (!cdomListMods.equals(cdo.cdomListMods)) { - // System.err.println("CDOM Inequality ListMods"); - // System.err.println(cdomListMods + " " + cdo.cdomListMods); - // System.err.println(cdomListMods.getKeySet() + " " - // + cdo.cdomListMods.getKeySet()); - // for (CDOMReference<? extends CDOMList<? extends PrereqObject>> - // key : cdomListMods - // .getKeySet()) - // { - // System.err.println(cdomListMods.getSecondaryKeySet(key)); - // System.err.println(cdo.cdomListMods.getSecondaryKeySet(key)); - // } return false; } return true; Modified: sandbox/uisync/code/src/java/pcgen/cdom/base/ConcretePrereqObject.java =================================================================== --- sandbox/uisync/code/src/java/pcgen/cdom/base/ConcretePrereqObject.java 2011-12-08 16:04:10 UTC (rev 15634) +++ sandbox/uisync/code/src/java/pcgen/cdom/base/ConcretePrereqObject.java 2011-12-08 16:05:50 UTC (rev 15635) @@ -36,29 +36,37 @@ import pcgen.core.prereq.PrerequisiteUtilities; /** - * A ConcretePrereqObject is an object that contains a list of Prerequisites. - * This list of Prerequisites is designed to serve as a list of conditions that - * must be met before the PrereqObject can be "used" + * A <code>ConcretePrereqObject</code> is an object that contains a Set of + * <code>Prerequisite</code>s. * + * This Set of <code>Prerequisites is designed to serve as a Set of conditions + * that must be met before the PrereqObject can be "used" + * * ConcretePrereqObject is intended to provide a quick foundation class that * implements PrereqObject. */ public class ConcretePrereqObject implements Cloneable, PrereqObject { - /** The list of prerequisites */ + // The Set of prerequisites, typically implemented by a ListSet<Prerequisite> + // TODO the logic of this class (e.g. The not null checks) could be simplified + // if this Set was initialised to an empty ListSet<Prerequisite> + // TODO Oh and is ListSet really faster? Who measured this? + // private final Set<Prerequisite> thePrereqs = ListSet<Prerequisite>(); private Set<Prerequisite> thePrereqs = null; /** - * Returns a List of the Prerequisite objects contained in the PrereqObject. - * If the PrereqObject contains no Prerequisites, the return value may be - * null or an empty list, it is implementation-specific. + * Returns a List of the Prerequisite objects contained in this + * ConcretePrereqObject. * + * If the PrereqObject contains no Prerequisites, the return value is + * an empty list. + * * This method is value-semantic in that ownership of the returned List is * transferred to the class calling this method. Modification of the * returned List will not modify this ConcretePrereqObject and modification * of this ConcretePrereqObject will not modify the returned List. * - * @return A List of Prerequesite objects contained in the PrereqObject. + * @return A List of Prerequisite objects contained in the ConcretePrereqObject. */ public List<Prerequisite> getPrerequisiteList() { @@ -67,10 +75,13 @@ return Collections.emptyList(); } /* - * TODO This is an ugly facade, but required for easy compatibility with + * TODO This is a facade, but required for easy compatibility with * 5.14 - to be changed once 5.14 code is gone and this can be changed - * to return Collection or Set (or perhaps ListSet?) - */ + * to return Collection or a Set + * + * OK, so the real issue is at the interface level, do we really + * want to be returning a List? A Collection? Or a Set? + */ return Collections.unmodifiableList(new ArrayList<Prerequisite>( thePrereqs)); } @@ -87,8 +98,10 @@ * * @see pcgen.core.prereq.Prerequisite#getKind() */ - public final boolean hasPreReqTypeOf(final String matchType) + public final boolean hasAnyPreReqTypeOf(final String matchType) { + // TODO Fairly certain that as getPrerequisiteList() will return an + // empty list that this is an unnecessary check if (!hasPrerequisites()) { return false; @@ -203,6 +216,8 @@ * Returns true if this ConcretePrereqObject contains any Prerequisites; * false otherwise. * + * The empty Set case cannot occur @see addPrerequisite and add Prerequisites + * * @return true if this ConcretePrereqObject contains any Prerequisites; * false otherwise. */ @@ -230,12 +245,13 @@ { return true; } - boolean otherHas = other.hasPrerequisites(); + boolean otherHasPrerequisites = other.hasPrerequisites(); + // This is the equivalent of saying if they are both null... if (!hasPrerequisites()) { - return !otherHas; + return !otherHasPrerequisites; } - if (!otherHas) + if (!otherHasPrerequisites) { return false; } @@ -244,8 +260,11 @@ { return false; } - ArrayList<Prerequisite> removed = new ArrayList<Prerequisite>( - thePrereqs); + // TODO Hmm, this is interesting - basically take the Set, turn it into a + // List, remove the items that are in the other Set, if you're empty then + // you're equal. + // There must be a more readable way to do this :). + ArrayList<Prerequisite> removed = new ArrayList<Prerequisite>(thePrereqs); removed.removeAll(otherPRL); return removed.isEmpty(); } @@ -260,7 +279,10 @@ */ public boolean qualifies(final PlayerCharacter aPC, Loadable owner) { - return !hasPrerequisites() - || PrereqHandler.passesAll(getPrerequisiteList(), aPC, owner); + if (!hasPrerequisites()) + { + return false; + } + return PrereqHandler.passesAll(getPrerequisiteList(), aPC, owner); } } Modified: sandbox/uisync/code/src/java/pcgen/cdom/base/PrereqObject.java =================================================================== --- sandbox/uisync/code/src/java/pcgen/cdom/base/PrereqObject.java 2011-12-08 16:04:10 UTC (rev 15634) +++ sandbox/uisync/code/src/java/pcgen/cdom/base/PrereqObject.java 2011-12-08 16:05:50 UTC (rev 15635) @@ -69,7 +69,7 @@ * If the PrereqObject contains no Prerequisites, the return value may be * null or an empty list, it is implementation-specific. * - * @return A List of Prerequesite objects contained in the PrereqObject. + * @return A List of Prerequisite objects contained in the PrereqObject. */ public List<Prerequisite> getPrerequisiteList(); Modified: sandbox/uisync/code/src/java/pcgen/cdom/enumeration/IntegerKey.java =================================================================== --- sandbox/uisync/code/src/java/pcgen/cdom/enumeration/IntegerKey.java 2011-12-08 16:04:10 UTC (rev 15634) +++ sandbox/uisync/code/src/java/pcgen/cdom/enumeration/IntegerKey.java 2011-12-08 16:05:50 UTC (rev 15635) @@ -52,8 +52,7 @@ public static final IntegerKey ADD_SPELL_LEVEL = getConstant("ADD_SPELL_LEVEL"); - public static final IntegerKey BASE_QUANTITY = getConstant("BASE_QUANTITY", - 1); + public static final IntegerKey BASE_QUANTITY = getConstant("BASE_QUANTITY", 1); public static final IntegerKey BONUS_CLASS_SKILL_POINTS = getConstant("BONUS_CLASS_SKILL_POINTS"); Modified: sandbox/uisync/code/src/java/pcgen/cdom/reference/ReferenceManufacturer.java =================================================================== --- sandbox/uisync/code/src/java/pcgen/cdom/reference/ReferenceManufacturer.java 2011-12-08 16:04:10 UTC (rev 15634) +++ sandbox/uisync/code/src/java/pcgen/cdom/reference/ReferenceManufacturer.java 2011-12-08 16:05:50 UTC (rev 15635) @@ -184,12 +184,12 @@ * Remove the given object from this ReferenceManufacturer. Returns true if * the object was removed from this ReferenceManufacturer; false otherwise. * - * @param item + * @param obj * The object to be removed from this ReferenceManufacturer. * @return true if the object was removed from this ReferenceManufacturer; * false otherwise. */ - public boolean forgetObject(T item); + public boolean forgetObject(T obj); /** * Resolves the references that have been requested from this Modified: sandbox/uisync/code/src/java/pcgen/gui/tabs/ability/AbilityModel.java =================================================================== --- sandbox/uisync/code/src/java/pcgen/gui/tabs/ability/AbilityModel.java 2011-12-08 16:04:10 UTC (rev 15634) +++ sandbox/uisync/code/src/java/pcgen/gui/tabs/ability/AbilityModel.java 2011-12-08 16:05:50 UTC (rev 15635) @@ -547,8 +547,8 @@ { final Ability aFeat = fList.get(i); - if (!aFeat.hasPreReqTypeOf("FEAT") //$NON-NLS-1$ - && !aFeat.hasPreReqTypeOf("ABILITY")) //$NON-NLS-1$ + if (!aFeat.hasAnyPreReqTypeOf("FEAT") //$NON-NLS-1$ + && !aFeat.hasAnyPreReqTypeOf("ABILITY")) //$NON-NLS-1$ { fList.remove(aFeat); aList.add(aFeat); Modified: sandbox/uisync/code/src/java/pcgen/rules/context/AbstractReferenceContext.java =================================================================== --- sandbox/uisync/code/src/java/pcgen/rules/context/AbstractReferenceContext.java 2011-12-08 16:04:10 UTC (rev 15634) +++ sandbox/uisync/code/src/java/pcgen/rules/context/AbstractReferenceContext.java 2011-12-08 16:05:50 UTC (rev 15635) @@ -248,7 +248,8 @@ CategorizedCDOMObject cdo = (CategorizedCDOMObject) obj; if (hasManufacturer(cl, cdo.getCDOMCategory())) { - return getManufacturer(cl, cdo.getCDOMCategory()).forgetObject(obj); + // Work around a bug in the Eclipse 3.7.0/1 compiler by explicitly extracting a Category<?> + return getManufacturer(cl, (Category<?>)cdo.getCDOMCategory()).forgetObject(obj); } } else Modified: sandbox/uisync/nbproject/project.xml =================================================================== --- sandbox/uisync/nbproject/project.xml 2011-12-08 16:04:10 UTC (rev 15634) +++ sandbox/uisync/nbproject/project.xml 2011-12-08 16:05:50 UTC (rev 15635) @@ -1,171 +1,171 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://www.netbeans.org/ns/project/1"> - <type>org.netbeans.modules.ant.freeform</type> - <configuration> - <general-data xmlns="http://www.netbeans.org/ns/freeform-project/1"> - <name>pcgen-sync</name> - </general-data> - <general-data xmlns="http://www.netbeans.org/ns/freeform-project/2"> - <!-- Do not use Project Properties customizer when editing this file manually. --> - <name>pcgen-sync</name> - <properties/> - <folders> - <source-folder> - <label>pcgen-sync</label> - <location>.</location> - <encoding>UTF-8</encoding> - </source-folder> - <source-folder> - <label>code\src\java</label> - <type>java</type> - <location>code/src/java</location> - <encoding>UTF-8</encoding> - </source-folder> - <source-folder> - <label>code\src\test</label> - <type>java</type> - <location>code/src/test</location> - <encoding>UTF-8</encoding> - </source-folder> - <source-folder> - <label>code\src\itest</label> - <type>java</type> - <location>code/src/itest</location> - <encoding>UTF-8</encoding> - </source-folder> - <source-folder> - <label>code\src\testcommon</label> - <type>java</type> - <location>code/src/testcommon</location> - <encoding>UTF-8</encoding> - </source-folder> - <source-folder> - <label>code\src\utest</label> - <type>java</type> - <location>code/src/utest</location> - <encoding>UTF-8</encoding> - </source-folder> - </folders> - <ide-actions> - <action name="build"> - <script>nbproject/nbjdk.xml</script> - <target>build</target> - </action> - <action name="clean"> - <script>nbproject/nbjdk.xml</script> - <target>clean</target> - </action> - <action name="javadoc"> - <script>nbproject/nbjdk.xml</script> - <target>docs</target> - </action> - <action name="test"> - <script>nbproject/nbjdk.xml</script> - <target>test</target> - </action> - <action name="rebuild"> - <script>nbproject/nbjdk.xml</script> - <target>clean</target> - <target>build</target> - </action> - <action name="run.single"> - <script>nbproject/nbjdk.xml</script> - <target>run-selected-file-in-java</target> - <context> - <property>run.class</property> - <folder>code/src/java</folder> - <pattern>\.java$</pattern> - <format>java-name</format> - <arity> - <one-file-only/> - </arity> - </context> - </action> - <action name="debug.single"> - <script>nbproject/nbjdk.xml</script> - <target>debug-selected-file-in-java</target> - <context> - <property>debug.class</property> - <folder>code/src/java</folder> - <pattern>\.java$</pattern> - <format>java-name</format> - <arity> - <one-file-only/> - </arity> - </context> - </action> - </ide-actions> - <view> - <items> - <source-folder style="packages"> - <label>code\src\java</label> - <location>code/src/java</location> - </source-folder> - <source-folder style="packages"> - <label>code\src\test</label> - <location>code/src/test</location> - </source-folder> - <source-folder style="packages"> - <label>code\src\itest</label> - <location>code/src/itest</location> - </source-folder> - <source-folder style="packages"> - <label>code\src\testcommon</label> - <location>code/src/testcommon</location> - </source-folder> - <source-folder style="packages"> - <label>code\src\utest</label> - <location>code/src/utest</location> - </source-folder> - <source-file> - <location>build.xml</location> - </source-file> - </items> - <context-menu> - <ide-action name="build"/> - <ide-action name="rebuild"/> - <ide-action name="clean"/> - <ide-action name="javadoc"/> - <ide-action name="test"/> - </context-menu> - </view> - <subprojects/> - <project-license>pcgen</project-license> - </general-data> - <java-data xmlns="http://www.netbeans.org/ns/freeform-project-java/2"> - <compilation-unit> - <package-root>code/src/java</package-root> - <classpath mode="compile">lib/jep/jep-2.4.1.jar;lib/apache/commons-lang-2.4.jar;lib/cobra/cobra.jar;lib/jdom.jar;lib/fop/fop.jar;lib/lnf/skinlf.jar;lib/spring/spring-beans-2.5.6.SEC01.jar;lib/spring/spring-core-2.5.6.SEC01.jar;lib/MRJ141Stubs.jar;lib/apache/commons-io-2.1.jar</classpath> - <source-level>1.5</source-level> - </compilation-unit> - <compilation-unit> - <package-root>code/src/test</package-root> - <unit-tests/> - <classpath mode="compile">lib/test/clover.jar;lib/test/junit-4.1.jar;lib/test/xmlunit1.0.jar;lib/jep/jep-2.4.1.jar;code/src/java;code/build/classes;code/build/testclasses;code/src/testcommon</classpath> - <source-level>1.5</source-level> - </compilation-unit> - <compilation-unit> - <package-root>code/src/itest</package-root> - <unit-tests/> - <classpath mode="compile">lib/test/clover.jar;lib/test/junit-4.1.jar;lib/test/xmlunit1.0.jar;code/src/java;code/build/classes;code/build/testclasses;code/src/testcommon</classpath> - <source-level>1.5</source-level> - </compilation-unit> - <compilation-unit> - <package-root>code/src/testcommon</package-root> - <unit-tests/> - <classpath mode="compile">lib/test/clover.jar;lib/test/junit-4.1.jar;lib/test/xmlunit1.0.jar;code/src/java;code/build/classes;code/build/testclasses</classpath> - <source-level>1.5</source-level> - </compilation-unit> - <compilation-unit> - <package-root>code/src/utest</package-root> - <unit-tests/> - <classpath mode="compile">lib/test/clover.jar;lib/test/junit-4.1.jar;lib/test/xmlunit1.0.jar;code/src/java;code/build/classes;code/build/testclasses;code/src/testcommon</classpath> - <source-level>1.5</source-level> - </compilation-unit> - </java-data> - <preferences xmlns="http://www.netbeans.org/ns/auxiliary-configuration-preferences/1"> - <module name="org-netbeans-modules-editor-indent"/> - <module name="org-netbeans-modules-hudson"/> - </preferences> - </configuration> -</project> +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://www.netbeans.org/ns/project/1"> + <type>org.netbeans.modules.ant.freeform</type> + <configuration> + <general-data xmlns="http://www.netbeans.org/ns/freeform-project/1"> + <name>pcgen-sync</name> + </general-data> + <general-data xmlns="http://www.netbeans.org/ns/freeform-project/2"> + <!-- Do not use Project Properties customizer when editing this file manually. --> + <name>pcgen-sync</name> + <properties/> + <folders> + <source-folder> + <label>pcgen-sync</label> + <location>.</location> + <encoding>UTF-8</encoding> + </source-folder> + <source-folder> + <label>code\src\java</label> + <type>java</type> + <location>code/src/java</location> + <encoding>UTF-8</encoding> + </source-folder> + <source-folder> + <label>code\src\test</label> + <type>java</type> + <location>code/src/test</location> + <encoding>UTF-8</encoding> + </source-folder> + <source-folder> + <label>code\src\itest</label> + <type>java</type> + <location>code/src/itest</location> + <encoding>UTF-8</encoding> + </source-folder> + <source-folder> + <label>code\src\testcommon</label> + <type>java</type> + <location>code/src/testcommon</location> + <encoding>UTF-8</encoding> + </source-folder> + <source-folder> + <label>code\src\utest</label> + <type>java</type> + <location>code/src/utest</location> + <encoding>UTF-8</encoding> + </source-folder> + </folders> + <ide-actions> + <action name="build"> + <script>nbproject/nbjdk.xml</script> + <target>build</target> + </action> + <action name="clean"> + <script>nbproject/nbjdk.xml</script> + <target>clean</target> + </action> + <action name="javadoc"> + <script>nbproject/nbjdk.xml</script> + <target>docs</target> + </action> + <action name="test"> + <script>nbproject/nbjdk.xml</script> + <target>test</target> + </action> + <action name="rebuild"> + <script>nbproject/nbjdk.xml</script> + <target>clean</target> + <target>build</target> + </action> + <action name="run.single"> + <script>nbproject/nbjdk.xml</script> + <target>run-selected-file-in-java</target> + <context> + <property>run.class</property> + <folder>code/src/java</folder> + <pattern>\.java$</pattern> + <format>java-name</format> + <arity> + <one-file-only/> + </arity> + </context> + </action> + <action name="debug.single"> + <script>nbproject/nbjdk.xml</script> + <target>debug-selected-file-in-java</target> + <context> + <property>debug.class</property> + <folder>code/src/java</folder> + <pattern>\.java$</pattern> + <format>java-name</format> + <arity> + <one-file-only/> + </arity> + </context> + </action> + </ide-actions> + <view> + <items> + <source-folder style="packages"> + <label>code\src\java</label> + <location>code/src/java</location> + </source-folder> + <source-folder style="packages"> + <label>code\src\test</label> + <location>code/src/test</location> + </source-folder> + <source-folder style="packages"> + <label>code\src\itest</label> + <location>code/src/itest</location> + </source-folder> + <source-folder style="packages"> + <label>code\src\testcommon</label> + <location>code/src/testcommon</location> + </source-folder> + <source-folder style="packages"> + <label>code\src\utest</label> + <location>code/src/utest</location> + </source-folder> + <source-file> + <location>build.xml</location> + </source-file> + </items> + <context-menu> + <ide-action name="build"/> + <ide-action name="rebuild"/> + <ide-action name="clean"/> + <ide-action name="javadoc"/> + <ide-action name="test"/> + </context-menu> + </view> + <subprojects/> + <project-license>pcgen</project-license> + </general-data> + <java-data xmlns="http://www.netbeans.org/ns/freeform-project-java/3"> + <compilation-unit> + <package-root>code/src/java</package-root> + <classpath mode="compile">lib/jep/jep-2.4.1.jar;lib/apache/commons-lang-2.4.jar;lib/cobra/cobra.jar;lib/jdom.jar;lib/fop/fop.jar;lib/lnf/skinlf.jar;lib/spring/spring-beans-2.5.6.SEC01.jar;lib/spring/spring-core-2.5.6.SEC01.jar;lib/MRJ141Stubs.jar;lib/apache/commons-io-2.1.jar</classpath> + <source-level>1.6</source-level> + </compilation-unit> + <compilation-unit> + <package-root>code/src/test</package-root> + <unit-tests/> + <classpath mode="compile">lib/test/clover.jar;lib/test/junit-4.1.jar;lib/test/xmlunit1.0.jar;lib/jep/jep-2.4.1.jar;code/src/java;code/build/classes;code/build/testclasses;code/src/testcommon</classpath> + <source-level>1.6</source-level> + </compilation-unit> + <compilation-unit> + <package-root>code/src/itest</package-root> + <unit-tests/> + <classpath mode="compile">lib/test/clover.jar;lib/test/junit-4.1.jar;lib/test/xmlunit1.0.jar;code/src/java;code/build/classes;code/build/testclasses;code/src/testcommon</classpath> + <source-level>1.6</source-level> + </compilation-unit> + <compilation-unit> + <package-root>code/src/testcommon</package-root> + <unit-tests/> + <classpath mode="compile">lib/test/clover.jar;lib/test/junit-4.1.jar;lib/test/xmlunit1.0.jar;code/src/java;code/build/classes;code/build/testclasses</classpath> + <source-level>1.6</source-level> + </compilation-unit> + <compilation-unit> + <package-root>code/src/utest</package-root> + <unit-tests/> + <classpath mode="compile">lib/test/clover.jar;lib/test/junit-4.1.jar;lib/test/xmlunit1.0.jar;code/src/java;code/build/classes;code/build/testclasses;code/src/testcommon</classpath> + <source-level>1.6</source-level> + </compilation-unit> + </java-data> + <preferences xmlns="http://www.netbeans.org/ns/auxiliary-configuration-preferences/1"> + <module name="org-netbeans-modules-editor-indent"/> + <module name="org-netbeans-modules-hudson"/> + </preferences> + </configuration> +</project> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |