[371021] Incorrect validation of resource across web projectsR3_3_maintenance

4 files changed, 6 insertions, 10 deletions

diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/preferences/HTMLCorePreferenceInitializer.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/preferences/HTMLCorePreferenceInitializer.java
index 6eb852a6b1..7258b0e03c 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/preferences/HTMLCorePreferenceInitializer.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/preferences/HTMLCorePreferenceInitializer.java
@@ -81,7 +81,7 @@ public class HTMLCorePreferenceInitializer extends AbstractPreferenceInitializer
 		node.putInt(HTMLCorePreferenceNames.ATTRIBUTE_DUPLICATE, ValidationMessage.WARNING);
 		node.putInt(HTMLCorePreferenceNames.ATTRIBUTE_VALUE_MISMATCH, ValidationMessage.ERROR);
 		node.putInt(HTMLCorePreferenceNames.ATTRIBUTE_VALUE_UNCLOSED, ValidationMessage.WARNING);
-		node.putInt(HTMLCorePreferenceNames.ATTRIBUTE_VALUE_RESOURCE_NOT_FOUND, ValidationMessage.WARNING);
+		node.putInt(HTMLCorePreferenceNames.ATTRIBUTE_VALUE_RESOURCE_NOT_FOUND, ValidationMessage.IGNORE);
 		node.putInt(HTMLCorePreferenceNames.ATTRIBUTE_OBSOLETE_NAME, ValidationMessage.WARNING);
 		node.putInt(HTMLCorePreferenceNames.ATTRIBUTE_VALUE_EQUALS_MISSING, ValidationMessage.WARNING);
 		
diff --git a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/HTMLAttributeValidator.java b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/HTMLAttributeValidator.java
index c8863cbd6e..f288b0dada 100644
--- a/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/HTMLAttributeValidator.java
+++ b/bundles/org.eclipse.wst.html.core/src/org/eclipse/wst/html/core/internal/validate/HTMLAttributeValidator.java
@@ -223,11 +223,7 @@ public class HTMLAttributeValidator extends PrimeValidator {
 									if (basePath.segmentCount() > 1) {
 										IPath path = ModuleCoreSupport.resolve(basePath, actualValue);
 										IResource found = ResourcesPlugin.getWorkspace().getRoot().findMember(path);
-										if (found == null) {
-											rgnType = REGION_VALUE;
-											state = ErrorState.RESOURCE_NOT_FOUND;
-										}
-										else {
+										if (found != null) {
 											dependencies.add(found);
 										}
 									}
diff --git a/bundles/org.eclipse.wst.html.ui/src-html-validation/org/eclipse/wst/html/internal/validation/HTMLValidator.java b/bundles/org.eclipse.wst.html.ui/src-html-validation/org/eclipse/wst/html/internal/validation/HTMLValidator.java
index 0c2643f73a..f46b610f1c 100644
--- a/bundles/org.eclipse.wst.html.ui/src-html-validation/org/eclipse/wst/html/internal/validation/HTMLValidator.java
+++ b/bundles/org.eclipse.wst.html.ui/src-html-validation/org/eclipse/wst/html/internal/validation/HTMLValidator.java
@@ -502,12 +502,12 @@ public class HTMLValidator extends AbstractValidator implements IValidatorJob, I
 			if (model.getDocument() instanceof NodeImpl) {
 				document = (NodeImpl) model.getDocument();
 			}
-			if (result != null) {
+			if (result != null && document != null) {
 				dependencies = new HashSet();
 				document.setUserData(HTMLValidationAdapterFactory.DEPENDENCIES, dependencies, null);
 			}
 			validate(reporter, file, model);
-			if (result != null) {
+			if (result != null && document != null) {
 				document.setUserData(HTMLValidationAdapterFactory.DEPENDENCIES, null, null);
 				result.setDependsOn((IResource[]) dependencies.toArray(new IResource[dependencies.size()]));
 			}
diff --git a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/preferences/ui/HTMLValidationPreferencePage.java b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/preferences/ui/HTMLValidationPreferencePage.java
index e3db43c07c..f2ff43fe29 100644
--- a/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/preferences/ui/HTMLValidationPreferencePage.java
+++ b/bundles/org.eclipse.wst.html.ui/src/org/eclipse/wst/html/ui/internal/preferences/ui/HTMLValidationPreferencePage.java
@@ -173,8 +173,8 @@ public class HTMLValidationPreferencePage extends AbstractValidationSettingsPage
 		label = HTMLUIMessages.HTMLValidationPreferencePage_37;
 		addComboBox(inner, label, HTMLCorePreferenceNames.ATTRIBUTE_VALUE_EQUALS_MISSING, SEVERITIES, errorWarningIgnoreLabel, 0);
 		
-		label = HTMLUIMessages.HTMLValidationPreferencePage_35;
-		 addComboBox(inner, label, HTMLCorePreferenceNames.ATTRIBUTE_VALUE_RESOURCE_NOT_FOUND, SEVERITIES, errorWarningIgnoreLabel, 0);
+		//label = HTMLUIMessages.HTMLValidationPreferencePage_35;
+		// addComboBox(inner, label, HTMLCorePreferenceNames.ATTRIBUTE_VALUE_RESOURCE_NOT_FOUND, SEVERITIES, errorWarningIgnoreLabel, 0);
 
 		// End Attribute section