[jbosstools-commits] JBoss Tools SVN: r30846 - in trunk/jsf: plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/jsf2 and 1 other directories.

[jbosstools-commits at lists.jboss.org]

Author: akazakov
Date: 2011-04-26 14:34:34 -0400 (Tue, 26 Apr 2011)
New Revision: 30846

Modified:
   trunk/jsf/plugins/org.jboss.tools.jsf/plugin.properties
   trunk/jsf/plugins/org.jboss.tools.jsf/plugin.xml
   trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/jsf2/JSF2ComponentsValidator.java
   trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/validation/JSF2ComponentsValidatorTest.java
Log:
https://issues.jboss.org/browse/JBIDE-8789

Modified: trunk/jsf/plugins/org.jboss.tools.jsf/plugin.properties
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/plugin.properties	2011-04-26 18:00:04 UTC (rev 30845)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/plugin.properties	2011-04-26 18:34:34 UTC (rev 30846)
@@ -9,6 +9,8 @@
 
 i18nProblemName = Externalization Problem
 
+I18nValidator.name  = Externalization Validator
+
 KBProblemName=JSF EL Problem
 
 KB_REQUIRED_FOR_JSF=JSF
\ No newline at end of file

Modified: trunk/jsf/plugins/org.jboss.tools.jsf/plugin.xml
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/plugin.xml	2011-04-26 18:00:04 UTC (rev 30845)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/plugin.xml	2011-04-26 18:34:34 UTC (rev 30846)
@@ -660,8 +660,8 @@
  </extension>
  
   <extension
-       id="jsf2"
-       name="%JSF2_ComponentsValidator.name"
+       id="i18n"
+       name="%I18nValidator.name"
        point="org.eclipse.wst.validation.validatorV2">
     <validator
           build="true"

Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/jsf2/JSF2ComponentsValidator.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/jsf2/JSF2ComponentsValidator.java	2011-04-26 18:00:04 UTC (rev 30845)
+++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/jsf2/JSF2ComponentsValidator.java	2011-04-26 18:34:34 UTC (rev 30846)
@@ -72,11 +72,16 @@
 	}
 
 	protected boolean isValidate(IFile file) {
-		boolean isValidate = false;
 		if (!file.isAccessible() || !file.isSynchronized(IResource.DEPTH_ZERO) || file.getProject() == null 
 				|| !file.getProject().isAccessible()) {
 			return false;
 		}
+		IProject project = file.getProject();
+		kbProject = KbProjectFactory.getKbProject(project, false);
+		if (kbProject == null) {
+			return false;
+		}
+		boolean isValidate = false;
 		try {
 			InputStream is = file.getContents();
 			Scanner scanner = new Scanner(is);
@@ -92,11 +97,6 @@
 			JSFModelPlugin.getPluginLog().logError(e);
 			return isValidate;
 		}
-		IProject project = file.getProject();
-		kbProject = KbProjectFactory.getKbProject(project, false);
-		if (kbProject == null) {
-			isValidate = false;
-		}
 		return isValidate;
 	}
 

Modified: trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/validation/JSF2ComponentsValidatorTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/validation/JSF2ComponentsValidatorTest.java	2011-04-26 18:00:04 UTC (rev 30845)
+++ trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/validation/JSF2ComponentsValidatorTest.java	2011-04-26 18:34:34 UTC (rev 30846)
@@ -24,6 +24,7 @@
 import org.eclipse.core.runtime.Path;
 import org.eclipse.wst.validation.ValidationFramework;
 import org.jboss.tools.jsf.jsf2.util.JSF2ResourceUtil;
+import org.jboss.tools.test.util.JobUtils;
 import org.jboss.tools.test.util.ProjectImportTestSetup;
 
 import junit.framework.TestCase;
@@ -47,6 +48,7 @@
 		project = ProjectImportTestSetup.loadProject(projectName);
 		project.build(IncrementalProjectBuilder.FULL_BUILD,
 				new NullProgressMonitor());
+		JobUtils.waitForIdle();
 	}
 	//junit test add to check JBIDE-7016 by Maksim Areshkau
 	public void testCreatingFile() throws CoreException, IOException{