[jbosstools-commits] JBoss Tools SVN: r42659 - trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation.

[jbosstools-commits at lists.jboss.org]

Author: scabanovich
Date: 2012-07-19 18:25:37 -0400 (Thu, 19 Jul 2012)
New Revision: 42659

Modified:
   trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/FacesConfigValidator.java
Log:
JBIDE-11916
https://issues.jboss.org/browse/JBIDE-11916
Check that file referenced by from-view-id exists if it is not a pattern.

Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/FacesConfigValidator.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/FacesConfigValidator.java	2012-07-19 22:24:33 UTC (rev 42658)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/FacesConfigValidator.java	2012-07-19 22:25:37 UTC (rev 42659)
@@ -434,7 +434,7 @@
 
 }
 
-class JSFCheckFromViewId extends Check {
+class JSFCheckFromViewId extends JSFCheckToViewId {
 
 	public JSFCheckFromViewId(ValidationErrorManager manager) {
 		super(manager, JSFSeverityPreferences.INVALID_FROM_VIEW_ID, JSFConstants.ATT_FROM_VIEW_ID);
@@ -448,6 +448,9 @@
 		if(value != null && value.length() > 0 && !value.startsWith("*") && !value.startsWith("/")) {
 			fireMessage(object, JSFValidationMessage.VIEW_ID_NO_SLASH, attr);
 		}
+		if(value != null && value.length() > 0 && value.indexOf("*") < 0) {
+			checkEsists(object, value);
+		}
 	}
 }
 
@@ -456,6 +459,11 @@
 	public JSFCheckToViewId(ValidationErrorManager manager) {
 		super(manager, JSFSeverityPreferences.INVALID_TO_VIEW_ID, JSFConstants.ATT_TO_VIEW_ID);
 	}
+
+	public JSFCheckToViewId(ValidationErrorManager manager, String preference, String attr) {
+		super(manager, preference, attr);
+	}
+
 	
 	public void check(XModelObject object) {			
 		String value = object.getAttributeValue(attr);
@@ -490,8 +498,14 @@
 		if(o == null) {
 			JSFUrlPattern pattern = JSFWebProject.getInstance(model).getUrlPattern();
 			if(pattern != null && pattern.isJSFUrl(value)) {
-				value = pattern.getJSFPath(value);
-				o = model.getByPath(value);
+				List<String> vs = pattern.getJSFPaths(value);
+				for (String v: vs) {
+					o = model.getByPath(v);
+					if(o != null) break;
+				}
+				if(o == null) {
+					o = model.getByPath(pattern.getJSFPath(value));
+				}
 			}
 		}