From: <jde...@us...> - 2012-10-07 00:48:52
|
Revision: 17658 http://pcgen.svn.sourceforge.net/pcgen/?rev=17658&view=rev Author: jdempsey Date: 2012-10-07 00:48:45 +0000 (Sun, 07 Oct 2012) Log Message: ----------- FORWARDREF: Not suppressing association unconstructd reference warnings Issue#: CODE-1725 Modified Paths: -------------- Trunk/pcgen/code/src/java/pcgen/persistence/SourceFileLoader.java Trunk/pcgen/code/src/java/pcgen/persistence/lst/LstSystemLoader.java Trunk/pcgen/code/src/java/pcgen/rules/context/LoadContext.java Modified: Trunk/pcgen/code/src/java/pcgen/persistence/SourceFileLoader.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/persistence/SourceFileLoader.java 2012-10-06 23:33:49 UTC (rev 17657) +++ Trunk/pcgen/code/src/java/pcgen/persistence/SourceFileLoader.java 2012-10-07 00:48:45 UTC (rev 17658) @@ -637,7 +637,7 @@ context.ref.validate(validator); context.resolveReferences(validator); context.resolvePostDeferredTokens(); - context.validateAssociations(); + context.validateAssociations(validator); for (Equipment eq : context.ref.getConstructedCDOMObjects(Equipment.class)) { EqModAttachment.finishEquipment(eq); Modified: Trunk/pcgen/code/src/java/pcgen/persistence/lst/LstSystemLoader.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/persistence/lst/LstSystemLoader.java 2012-10-06 23:33:49 UTC (rev 17657) +++ Trunk/pcgen/code/src/java/pcgen/persistence/lst/LstSystemLoader.java 2012-10-07 00:48:45 UTC (rev 17658) @@ -623,7 +623,7 @@ context.ref.validate(validator); context.resolveReferences(validator); context.resolvePostDeferredTokens(); - context.validateAssociations(); + context.validateAssociations(validator); for (Equipment eq : context.ref .getConstructedCDOMObjects(Equipment.class)) { Modified: Trunk/pcgen/code/src/java/pcgen/rules/context/LoadContext.java =================================================================== --- Trunk/pcgen/code/src/java/pcgen/rules/context/LoadContext.java 2012-10-06 23:33:49 UTC (rev 17657) +++ Trunk/pcgen/code/src/java/pcgen/rules/context/LoadContext.java 2012-10-07 00:48:45 UTC (rev 17658) @@ -597,7 +597,11 @@ } } - public void validateAssociations() + /** + * Check the associations now that all the data is loaded. + * @param validator The helper object to track things such as FORWARDREF instances. + */ + public void validateAssociations(LoadValidator validator) { for (ReferenceManufacturer<?> rm : ref.getAllManufacturers()) { @@ -632,7 +636,8 @@ if (!mfg.containsObject(choice) && (ref.getAbbreviatedObject( clIdentity.getChoiceClass(), choice) == null) - && (TokenLibrary.getPrimitive(cl, choice) == null)) + && (TokenLibrary.getPrimitive(cl, choice) == null) + && !report(validator, clIdentity.getChoiceClass(), choice)) { Logging.errorPrint("Found " + rm.getReferenceDescription() + " " @@ -649,4 +654,11 @@ } } } + + + private boolean report(UnconstructedValidator validator, Class<?> cl, String key) + { + return validator != null && validator.allow(cl, key); + } + } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |