Author: dgolovin Date: 2011-08-17 14:12:39 -0400 (Wed, 17 Aug 2011) New Revision: 34018 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java Log: not needed checks for null related to IResource handlers were removed. Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java 2011-08-17 17:56:31 UTC (rev 34017) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java 2011-08-17 18:12:39 UTC (rev 34018) @@ -177,8 +177,7 @@ */ public boolean shouldValidate(IProject project) { try { - return project != null - && project.isAccessible() + return project.isAccessible() && project.hasNature(CDICoreNature.NATURE_ID) && validateBuilderOrder(project) && isEnabled(project); @@ -238,7 +237,7 @@ if(dd != null) { for (IPath p: dd) { IFile f = root.getFile(p); - if(f != null && f.exists() && !changedFiles.contains(f)) { + if(f.exists() && !changedFiles.contains(f)) { resources.add(p); collectAllRelatedInjections(f, resources); } @@ -292,9 +291,9 @@ Set<IFile> filesToValidate = new HashSet<IFile>(); for (IPath linkedResource : resources) { IFile file = root.getFile(linkedResource); - if(file!=null && file.isAccessible()) { + if(file.isAccessible()) { IProject pr = file.getProject(); - if(pr!=null && !validationHelper.getValidationContextManager().projectHasBeenValidated(this, pr)) { + if(!validationHelper.getValidationContextManager().projectHasBeenValidated(this, pr)) { filesToValidate.add(file); // removeAllMessagesFromResource(file); } @@ -327,9 +326,6 @@ public IStatus validateAll(IProject project, ContextValidationHelper validationHelper, IProjectValidationContext context, ValidatorManager manager, IReporter reporter) throws ValidationException { init(project, validationHelper, context, manager, reporter); - if (cdiProject == null) { - return OK_STATUS; - } displaySubtask(CDIValidationMessages.VALIDATING_PROJECT, new String[] { projectName }); @@ -409,7 +405,7 @@ * @param file */ private void validateResource(IFile file) { - if (reporter.isCancelled() || file == null || !file.isAccessible()) { + if (reporter.isCancelled() || !file.isAccessible()) { return; } displaySubtask(CDIValidationMessages.VALIDATING_RESOURCE, new String[] {file.getProject().getName(), file.getName()});