[jbosstools-commits] JBoss Tools SVN: r34491 - trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation.
Author: akazakov
Date: 2011-09-01 16:19:10 -0400 (Thu, 01 Sep 2011)
New Revision: 34491
Modified:
trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/ValidatorManager.java
Log:
https://issues.jboss.org/browse/JBIDE-9637 On workspaces with complex dependencies between
CDI projects, CDI validation self-disables after full build.
Modified:
trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/ValidatorManager.java
===================================================================
---
trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/ValidatorManager.java 2011-09-01
20:15:51 UTC (rev 34490)
+++
trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/ValidatorManager.java 2011-09-01
20:19:10 UTC (rev 34491)
@@ -63,24 +63,30 @@
return OK_STATUS;
}
IValidationContextManager validationContextManager =
validationHelper.getValidationContextManager();
- Set<IProject> rootProjects = validationContextManager.getRootProjects();
+ Set<IProject> allRootProjects = validationContextManager.getRootProjects();
+ Set<IProject> rootProjects = new HashSet<IProject>();
IStatus status = OK_STATUS;
synchronized (validatingProjects) {
- for (IProject rootProject : rootProjects) {
- if(validatingProjects.contains(rootProject)) {
- return OK_STATUS;
+ for (IProject rootProject : allRootProjects) {
+ if(!validatingProjects.contains(rootProject)) {
+ // Validate root projects that is not being validated yet.
+ rootProjects.add(rootProject);
+ validatingProjects.add(rootProject);
}
- validatingProjects.add(rootProject);
}
+ if(rootProjects.isEmpty()) {
+ // We don't have projects to validate.
+ return OK_STATUS;
+ }
}
try {
validationContextManager.clearValidatedProjectsList();
Set<IFile> changedFiles = validationHelper.getChangedFiles();
if(!changedFiles.isEmpty()) {
- status = validate(changedFiles, validationHelper, reporter);
+ status = validate(changedFiles, validationHelper, reporter, rootProjects);
} else if(!validationContextManager.getRegisteredFiles().isEmpty()) {
validationContextManager.clearAllResourceLinks();
- status = validateAll(validationHelper, reporter);
+ status = validateAll(validationHelper, reporter, rootProjects);
}
} finally {
try {
@@ -106,10 +112,9 @@
}
}
- private IStatus validate(Set<IFile> changedFiles, ContextValidationHelper
validationHelper, IReporter reporter) throws ValidationException {
+ private IStatus validate(Set<IFile> changedFiles, ContextValidationHelper
validationHelper, IReporter reporter, Set<IProject> rootProjects) throws
ValidationException {
IValidationContextManager validationContextManager =
validationHelper.getValidationContextManager();
List<IValidator> validators = validationContextManager.getValidators();
- Set<IProject> rootProjects = validationContextManager.getRootProjects();
removeMarkers(changedFiles);
for (IValidator validator : validators) {
for (IProject rootProject : rootProjects) {
@@ -122,10 +127,9 @@
return OK_STATUS;
}
- private IStatus validateAll(ContextValidationHelper validationHelper, IReporter
reporter) throws ValidationException {
+ private IStatus validateAll(ContextValidationHelper validationHelper, IReporter
reporter, Set<IProject> rootProjects) throws ValidationException {
IValidationContextManager validationContextManager =
validationHelper.getValidationContextManager();
List<IValidator> validators = validationContextManager.getValidators();
- Set<IProject> rootProjects = validationContextManager.getRootProjects();
removeMarkers(validationHelper.getProjectSetRegisteredFiles());
for (IValidator validator : validators) {
for (IProject rootProject : rootProjects) {