[jbosstools-commits] JBoss Tools SVN: r41817 - trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/java.

[jbosstools-commits at lists.jboss.org]

Author: vrubezhny
Date: 2012-06-08 10:19:35 -0400 (Fri, 08 Jun 2012)
New Revision: 41817

Modified:
   trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/java/JavaDirtyRegionProcessor.java
Log:
JBIDE-10738
As-you-type EL validation

Avoided validation on binary Java classes

Modified: trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/java/JavaDirtyRegionProcessor.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/java/JavaDirtyRegionProcessor.java	2012-06-08 14:14:36 UTC (rev 41816)
+++ trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/java/JavaDirtyRegionProcessor.java	2012-06-08 14:19:35 UTC (rev 41817)
@@ -111,11 +111,10 @@
 		Map<Annotation, Position> fAnnotations = new HashMap<Annotation, Position>();
 
 		public void update() {
-			getAnnotationModel();
+			clearAllAnnotations();
+			getAnnotationModel(); // This updates saved annotation model if needed
 			fFile = (fEditor != null && fEditor.getEditorInput() instanceof IFileEditorInput ? ((IFileEditorInput)fEditor.getEditorInput()).getFile() : null);
-			if(fFile != null) {
-				fCompilationUnit = EclipseUtil.getCompilationUnit(fFile);
-			}
+			fCompilationUnit = (fFile != null ? EclipseUtil.getCompilationUnit(fFile) : null);
 		}
 
 		protected IAnnotationModel getAnnotationModel() {
@@ -125,7 +124,6 @@
 			}
 			IAnnotationModel newModel = documentProvider.getAnnotationModel(fEditor.getEditorInput());
 			if (fAnnotationModel != newModel) {
-				clearAllAnnotations();
 				fAnnotationModel = newModel;
 			}
 			return fAnnotationModel;
@@ -138,7 +136,8 @@
 			Annotation[] annotations = fAnnotations.keySet().toArray(new Annotation[0]);
 			for (Annotation annotation : annotations) {
 				fAnnotations.remove(annotation);
-				fAnnotationModel.removeAnnotation(annotation);
+				if(fAnnotationModel != null)
+					fAnnotationModel.removeAnnotation(annotation);
 			}
 		}
 
@@ -180,7 +179,6 @@
 					Position position = new Position(valMessage.getOffset(), valMessage.getLength());
 					CoreELProblem problem= new CoreELProblem(valMessage, 
 							editorInput.getName());
-					fCompilationUnit = EclipseUtil.getCompilationUnit(fFile);
 					if (fCompilationUnit != null) {
 						ProblemAnnotation problemAnnotation = new ProblemAnnotation(problem, fCompilationUnit);
 						addAnnotation(problemAnnotation, position);