[jbosstools-commits] JBoss Tools SVN: r41758 - in trunk/common/plugins/org.jboss.tools.common.validation: src/org/jboss/tools/common/validation and 1 other directories.

Author: akazakov Date: 2012-06-06 19:24:02 -0400 (Wed, 06 Jun 2012) New Revision: 41758 Added: trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/java/ 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/JavaEditorTracker.java Modified: trunk/common/plugins/org.jboss.tools.common.validation/META-INF/MANIFEST.MF trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/CommonValidationPlugin.java Log: https://issues.jboss.org/browse/JBIDE-10738 As-you-type EL validation Modified: trunk/common/plugins/org.jboss.tools.common.validation/META-INF/MANIFEST.MF =================================================================== --- trunk/common/plugins/org.jboss.tools.common.validation/META-INF/MANIFEST.MF 2012-06-06 23:15:45 UTC (rev 41757) +++ trunk/common/plugins/org.jboss.tools.common.validation/META-INF/MANIFEST.MF 2012-06-06 23:24:02 UTC (rev 41758) @@ -18,6 +18,7 @@ org.eclipse.ui;bundle-version="3.7.0", org.eclipse.wst.validation.ui;bundle-version="1.2.204", org.eclipse.jdt.core;bundle-version="3.7.0", + org.eclipse.jdt.ui;bundle-version="3.7.0", org.eclipse.wst.sse.ui;bundle-version="1.3.0";visibility:=reexport Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Modified: trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/CommonValidationPlugin.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/CommonValidationPlugin.java 2012-06-06 23:15:45 UTC (rev 41757) +++ trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/CommonValidationPlugin.java 2012-06-06 23:24:02 UTC (rev 41758) @@ -15,7 +15,10 @@ import org.eclipse.core.resources.IProjectDescription; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.NullProgressMonitor; +import org.eclipse.swt.widgets.Display; import org.jboss.tools.common.log.BaseUIPlugin; +import org.jboss.tools.common.validation.java.JavaEditorTracker; +import org.osgi.framework.BundleContext; /** * @author Alexey Kazakov @@ -62,4 +65,14 @@ } return updated; } + + @Override + public void start(BundleContext context) throws Exception { + super.start(context); + Display.getDefault().asyncExec(new Runnable() { + public void run() { + JavaEditorTracker.getInstance(); + } + }); + } } \ No newline at end of file Added: 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 (rev 0) +++ trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/java/JavaDirtyRegionProcessor.java 2012-06-06 23:24:02 UTC (rev 41758) @@ -0,0 +1,462 @@ +/******************************************************************************* + * Copyright (c) 2012 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributor: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.common.validation.java; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import org.eclipse.core.resources.IFile; +import org.eclipse.jdt.core.ICompilationUnit; +import org.eclipse.jdt.core.compiler.CategorizedProblem; +import org.eclipse.jdt.internal.ui.javaeditor.CompilationUnitDocumentProvider.ProblemAnnotation; +import org.eclipse.jdt.ui.text.IJavaPartitions; +import org.eclipse.jface.text.BadLocationException; +import org.eclipse.jface.text.BadPartitioningException; +import org.eclipse.jface.text.DocumentRewriteSessionEvent; +import org.eclipse.jface.text.IDocument; +import org.eclipse.jface.text.IDocumentExtension3; +import org.eclipse.jface.text.IDocumentExtension4; +import org.eclipse.jface.text.IDocumentRewriteSessionListener; +import org.eclipse.jface.text.ITextViewer; +import org.eclipse.jface.text.ITypedRegion; +import org.eclipse.jface.text.Position; +import org.eclipse.jface.text.reconciler.DirtyRegion; +import org.eclipse.jface.text.source.Annotation; +import org.eclipse.jface.text.source.IAnnotationModel; +import org.eclipse.ui.IEditorInput; +import org.eclipse.ui.IFileEditorInput; +import org.eclipse.ui.texteditor.IDocumentProvider; +import org.eclipse.ui.texteditor.ITextEditor; +import org.eclipse.wst.sse.ui.internal.reconcile.DirtyRegionProcessor; +import org.eclipse.wst.validation.internal.provisional.core.IMessage; +import org.eclipse.wst.validation.internal.provisional.core.IReporter; +import org.eclipse.wst.validation.internal.provisional.core.IValidationContext; +import org.eclipse.wst.validation.internal.provisional.core.IValidator; +import org.jboss.tools.common.EclipseUtil; +import org.jboss.tools.common.log.LogHelper; +import org.jboss.tools.common.validation.AsYouTypeValidatorManager; +import org.jboss.tools.common.validation.CommonValidationPlugin; +import org.jboss.tools.common.validation.ValidationMessage; + +/** + * As-You-Type validation for EL in Java Strings + * + * @author Victor V. Rubezhny + * + */ +@SuppressWarnings("restriction") +final class JavaDirtyRegionProcessor extends + DirtyRegionProcessor { + private ITextEditor fEditor; + private IDocument fDocument; + private IValidationContext fHelper; + private JavaELProblemReporter fReporter; + private AsYouTypeValidatorManager fValidatorManager; + + private boolean fIsCanceled = false; + private boolean fInRewriteSession = false; + private IDocumentRewriteSessionListener fDocumentRewriteSessionListener = new DocumentRewriteSessionListener(); + + public final class JavaELProblemReporter implements IReporter { + public static final String MARKER_TYPE= "org.jboss.tools.common.validation.el"; //$NON-NLS-1$ + private IFile fFile; + private ICompilationUnit fCompilationUnit; + private IAnnotationModel fAnnotationModel; + private boolean fIsCanceled = false; + + @Override + public void removeMessageSubset(IValidator validator, Object obj, + String groupName) { + // Does nothing + } + + @Override + public void removeAllMessages(IValidator origin, Object object) { + // Does nothing + } + + @Override + public void removeAllMessages(IValidator origin) { + // Does nothing + } + + public void setCanceled(boolean set) { + this.fIsCanceled = set; + } + + @Override + public boolean isCancelled() { + return this.fIsCanceled; + } + + @SuppressWarnings("rawtypes") + @Override + public List getMessages() { + return null; + } + + @Override + public void displaySubtask(IValidator validator, IMessage message) { + // Does nothing + } + + Map<Annotation, Position> fAnnotations = new HashMap<Annotation, Position>(); + + public void update() { + getAnnotationModel(); + fFile = (fEditor != null && fEditor.getEditorInput() instanceof IFileEditorInput ? ((IFileEditorInput)fEditor.getEditorInput()).getFile() : null); + fCompilationUnit = EclipseUtil.getCompilationUnit(fFile); + } + + protected IAnnotationModel getAnnotationModel() { + final IDocumentProvider documentProvider= fEditor.getDocumentProvider(); + if (documentProvider == null) + return null; + IAnnotationModel newModel = documentProvider.getAnnotationModel(fEditor.getEditorInput()); + if (fAnnotationModel != newModel) { + clearAllAnnotations(); + fAnnotationModel = newModel; + } + return fAnnotationModel; + } + + private void clearAllAnnotations() { + if (fAnnotations.isEmpty()) + return; + Annotation[] annotations = fAnnotations.keySet().toArray(new Annotation[0]); + for (Annotation annotation : annotations) { + fAnnotations.remove(annotation); + fAnnotationModel.removeAnnotation(annotation); + } + } + + public void clearAnnotations(int start, int end) { + if (fAnnotations.isEmpty()) + return; + Annotation[] annotations = fAnnotations.keySet().toArray(new Annotation[0]); + for (Annotation annotation : annotations) { + Position position = fAnnotations.get(annotation); + if (position.getOffset() >= start && + position.getOffset() < end) { + // remove annotation from managed annotations map as well as from the model + fAnnotations.remove(annotation); + getAnnotationModel().removeAnnotation(annotation); + } + } + } + + public void addAnnotation(Annotation annotation, Position position) { + if (isCancelled()) + return; + + fAnnotations.put(annotation, position); + getAnnotationModel().addAnnotation(annotation, position); + } + + @Override + public void addMessage(IValidator origin, IMessage message) { + if (isCancelled()) + return; + if (message instanceof ValidationMessage && getAnnotationModel() != null) { + ValidationMessage valMessage = (ValidationMessage)message; + + IEditorInput editorInput= fEditor.getEditorInput(); + if (editorInput != null) { + 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); + } + } + } + } + } + + class DocumentRewriteSessionListener implements IDocumentRewriteSessionListener { + public void documentRewriteSessionChanged(DocumentRewriteSessionEvent event) { + fInRewriteSession = event != null && event.getChangeType().equals(DocumentRewriteSessionEvent.SESSION_START); + } + } + + class CoreELProblem extends CategorizedProblem { + + // spelling 'marker type' name. Only virtual as spelling problems are never persisted in markers. + // marker type is used in the quickFixProcessor extension point + public static final String MARKER_TYPE= "org.jboss.tools.common.validation.el"; //$NON-NLS-1$ + + /** The end offset of the problem */ + private int fSourceEnd= 0; + + /** The line number of the problem */ + private int fLineNumber= 1; + + /** The start offset of the problem */ + private int fSourceStart= 0; + + /** The description of the problem */ + private String fMessage; + + private boolean fIsError; + + /** The originating file name */ + private String fOrigin; + + public static final int EL_PROBLEM_ID= 0x88000000; + + /** + * Initialize with the given parameters. + * + * @param message ValidationMessage + * @param document the document + * @param origin the originating file name + */ + public CoreELProblem(ValidationMessage message, String origin) { + super(); + fSourceStart= message.getOffset(); + fSourceEnd= message.getOffset() + message.getLength() - 1; + fLineNumber= message.getLineNumber(); + fMessage= message.getText(); + fOrigin= origin; + fIsError = (IMessage.NORMAL_SEVERITY != message.getSeverity()); + } + /* + * @see org.eclipse.jdt.core.compiler.IProblem#getArguments() + */ + public String[] getArguments() { + return new String[0]; + } + + /* + * @see org.eclipse.jdt.core.compiler.IProblem#getID() + */ + public int getID() { + return EL_PROBLEM_ID; + } + + /* + * @see org.eclipse.jdt.core.compiler.IProblem#getMessage() + */ + public String getMessage() { + return fMessage; + } + + /* + * @see org.eclipse.jdt.core.compiler.IProblem#getOriginatingFileName() + */ + public char[] getOriginatingFileName() { + return fOrigin.toCharArray(); + } + + /* + * @see org.eclipse.jdt.core.compiler.IProblem#getSourceEnd() + */ + public int getSourceEnd() { + return fSourceEnd; + } + + /* + * @see org.eclipse.jdt.core.compiler.IProblem#getSourceLineNumber() + */ + public int getSourceLineNumber() { + return fLineNumber; + } + + /* + * @see org.eclipse.jdt.core.compiler.IProblem#getSourceStart() + */ + public int getSourceStart() { + return fSourceStart; + } + + /* + * @see org.eclipse.jdt.core.compiler.IProblem#isError() + */ + public boolean isError() { + return fIsError; + } + + /* + * @see org.eclipse.jdt.core.compiler.IProblem#isWarning() + */ + public boolean isWarning() { + return !fIsError; + } + + /* + * @see org.eclipse.jdt.core.compiler.IProblem#setSourceStart(int) + */ + public void setSourceStart(int sourceStart) { + fSourceStart= sourceStart; + } + + /* + * @see org.eclipse.jdt.core.compiler.IProblem#setSourceEnd(int) + */ + public void setSourceEnd(int sourceEnd) { + fSourceEnd= sourceEnd; + } + + /* + * @see org.eclipse.jdt.core.compiler.IProblem#setSourceLineNumber(int) + */ + public void setSourceLineNumber(int lineNumber) { + fLineNumber= lineNumber; + } + + /* + * @see org.eclipse.jdt.core.compiler.CategorizedProblem#getCategoryID() + */ + @Override + public int getCategoryID() { + return CAT_SYNTAX; + } + + /* + * @see org.eclipse.jdt.core.compiler.CategorizedProblem#getMarkerType() + */ + @Override + public String getMarkerType() { + return MARKER_TYPE; + } + } + + public JavaDirtyRegionProcessor(ITextEditor editor) { + this.fEditor = editor; + fHelper = createValidationContext(); + fReporter = createProblemReporter(); + } + + private IValidationContext createValidationContext() { + return new IValidationContext() { + + @Override + public Object loadModel(String arg0, Object[] arg1) { + return null; + } + + @Override + public Object loadModel(String arg0) { + return null; + } + + @Override + public String[] getURIs() { + IFile file = (fEditor != null && fEditor.getEditorInput() instanceof IFileEditorInput ? ((IFileEditorInput)fEditor.getEditorInput()).getFile() : null); + String URI = file == null ? null : file.getFullPath().toPortableString(); + return URI == null ? new String[0] : new String[] {URI}; + } + }; + } + + private JavaELProblemReporter createProblemReporter() { + JavaELProblemReporter reporter = new JavaELProblemReporter(); + reporter.update(); + return reporter; + } + + @Override + public synchronized void startReconciling() { + super.startReconciling(); + } + + private boolean isInRewrite() { + return fInRewriteSession; + } + + @Override + public void setDocument(IDocument doc) { + if (fDocument != null) { + if (fDocument instanceof IDocumentExtension4) { + ((IDocumentExtension4) fDocument).removeDocumentRewriteSessionListener(fDocumentRewriteSessionListener); + } + if (fValidatorManager != null && fDocument != null) { + fValidatorManager.disconnect(fDocument); + } + } + + fDocument = doc; + super.setDocument(doc); + + if (fDocument != null) { + if (fDocument instanceof IDocumentExtension4) { + ((IDocumentExtension4) fDocument).addDocumentRewriteSessionListener(fDocumentRewriteSessionListener); + } + if (fValidatorManager == null) + fValidatorManager = new AsYouTypeValidatorManager(); + + fValidatorManager.connect(fDocument); + + if (fReporter != null) { + fReporter.update(); + } + } + } + + @Override + public void install(ITextViewer textViewer) { + super.install(textViewer); + } + + @Override + public void uninstall() { + fIsCanceled = true; + if(fReporter != null) + fReporter.setCanceled(true); + + super.uninstall(); + } + + protected void process(DirtyRegion dirtyRegion) { + if (!isInstalled() || isInRewrite() || dirtyRegion == null || getDocument() == null || fIsCanceled) { + return; + } + /* + * Expand dirtyRegion to partitions boundaries + */ + int start = dirtyRegion.getOffset(); + int end = dirtyRegion.getOffset() + dirtyRegion.getLength(); + + try { + ITypedRegion startPartition = (fDocument instanceof IDocumentExtension3) ? + ((IDocumentExtension3)fDocument).getPartition(IJavaPartitions.JAVA_PARTITIONING, start, true) : + fDocument.getPartition(start); + if (startPartition != null && start > startPartition.getOffset()) + start = startPartition.getOffset(); + + ITypedRegion endPartition = (fDocument instanceof IDocumentExtension3) ? + ((IDocumentExtension3)fDocument).getPartition(IJavaPartitions.JAVA_PARTITIONING, end, false) : + fDocument.getPartition(end); + if (endPartition != null && end < endPartition.getOffset() + endPartition.getLength()) + end = endPartition.getOffset() + endPartition.getLength(); + + } catch (BadLocationException e) { + LogHelper.logError(CommonValidationPlugin.getDefault(), e); + } catch (BadPartitioningException e) { + LogHelper.logError(CommonValidationPlugin.getDefault(), e); + } + + ITypedRegion[] partitions = computePartitioning(start, end - start); + + if (fReporter != null) { + fReporter.clearAnnotations(start, end); + } + for (int i = 0; i < partitions.length; i++) { + if (partitions[i] != null && !fIsCanceled && IJavaPartitions.JAVA_STRING.equals(partitions[i].getType())) { + if (fValidatorManager != null) + fValidatorManager.validate(partitions[i], fHelper, fReporter); + } + } + } +} \ No newline at end of file Property changes on: trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/java/JavaDirtyRegionProcessor.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/java/JavaEditorTracker.java =================================================================== --- trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/java/JavaEditorTracker.java (rev 0) +++ trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/java/JavaEditorTracker.java 2012-06-06 23:24:02 UTC (rev 41758) @@ -0,0 +1,180 @@ +/******************************************************************************* + * Copyright (c) 2012 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributor: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.common.validation.java; + +import java.util.HashMap; +import java.util.Map; + +import org.eclipse.core.runtime.Assert; +import org.eclipse.jdt.internal.ui.javaeditor.JavaEditor; +import org.eclipse.jdt.internal.ui.javaeditor.JavaSourceViewer; +import org.eclipse.jdt.ui.text.IJavaPartitions; +import org.eclipse.ui.IEditorPart; +import org.eclipse.ui.IEditorReference; +import org.eclipse.ui.IPageListener; +import org.eclipse.ui.IPartListener; +import org.eclipse.ui.IWindowListener; +import org.eclipse.ui.IWorkbench; +import org.eclipse.ui.IWorkbenchPage; +import org.eclipse.ui.IWorkbenchPart; +import org.eclipse.ui.IWorkbenchWindow; +import org.jboss.tools.common.validation.CommonValidationPlugin; + +/** + * Installer for As-You-Type validation for EL in Java Strings + * + * @author Victor V. Rubezhny + * + */ +@SuppressWarnings("restriction") +public class JavaEditorTracker implements IWindowListener, IPageListener, IPartListener { + static JavaEditorTracker INSTANCE; + + Map<JavaEditor, JavaDirtyRegionProcessor> fAsYouTypeValidators = new HashMap<JavaEditor, JavaDirtyRegionProcessor>(); + + private JavaEditorTracker() { + init(); + } + + public static JavaEditorTracker getInstance() { + if(INSTANCE == null) { + INSTANCE = new JavaEditorTracker(); + } + return INSTANCE; + } + + private void init() { + IWorkbench workbench = CommonValidationPlugin.getDefault().getWorkbench(); + if(workbench != null) { + IWorkbenchWindow[] windows = workbench.getWorkbenchWindows(); + for (IWorkbenchWindow window: windows) { + windowOpened(window); + } + CommonValidationPlugin.getDefault().getWorkbench().addWindowListener(this); + } + } + + @Override + public void windowActivated(IWorkbenchWindow window) { + } + + @Override + public void windowDeactivated(IWorkbenchWindow window) { + } + + @Override + public void windowClosed(IWorkbenchWindow window) { + IWorkbenchPage[] pages = window.getPages(); + for (IWorkbenchPage page: pages) { + pageClosed(page); + } + window.removePageListener(this); + } + + @Override + public void windowOpened(IWorkbenchWindow window) { + if(window.getShell() != null) { + IWorkbenchPage[] pages = window.getPages(); + for (IWorkbenchPage page: pages) { + pageOpened(page); + } + window.addPageListener(this); + } + } + + @Override + public void pageActivated(IWorkbenchPage page) { + } + + @Override + public void pageClosed(IWorkbenchPage page) { + IEditorReference[] rs = page.getEditorReferences(); + for (IEditorReference r: rs) { + IEditorPart part = r.getEditor(false); + if(part != null) { + editorClosed(part); + } + } + page.removePartListener(this); + } + + @Override + public void pageOpened(IWorkbenchPage page) { + IEditorReference[] rs = page.getEditorReferences(); + for (IEditorReference r: rs) { + IEditorPart part = r.getEditor(false); + if(part != null) { + editorOpened(part); + } + } + page.addPartListener(this); + } + + @Override + public void partActivated(IWorkbenchPart part) { + } + + @Override + public void partBroughtToTop(IWorkbenchPart part) { + } + + @Override + public void partClosed(IWorkbenchPart part) { + if (part instanceof IEditorPart) { + editorClosed((IEditorPart)part); + } + } + + @Override + public void partDeactivated(IWorkbenchPart part) { + } + + @Override + public void partOpened(IWorkbenchPart part) { + if (part instanceof IEditorPart) { + editorOpened((IEditorPart)part); + } + } + + private void editorOpened(IEditorPart part) { + if (part instanceof JavaEditor) { + JavaEditor javaEditor = (JavaEditor)part; + JavaSourceViewer javaSourceViewer = (JavaSourceViewer)javaEditor.getViewer(); + + JavaDirtyRegionProcessor processor = fAsYouTypeValidators.get(javaEditor); + if (processor != null) { + // Emulate editor closed due to uninstall the old processor + editorClosed(part); + Assert.isTrue(null == fAsYouTypeValidators.get(javaEditor), "An old JavaDirtyRegionProcessor is not un-installed on Java Editor instance"); + } + + processor = new JavaDirtyRegionProcessor(javaEditor); + processor.install(javaSourceViewer); + processor.setDocument(javaSourceViewer.getDocument()); + processor.setDocumentPartitioning(IJavaPartitions.JAVA_PARTITIONING); + processor.startReconciling(); + fAsYouTypeValidators.put(javaEditor, processor); + } + } + + private void editorClosed(IEditorPart part) { + if (part instanceof JavaEditor) { + JavaEditor javaEditor = (JavaEditor)part; + + JavaDirtyRegionProcessor processor = fAsYouTypeValidators.remove(javaEditor); + if (processor != null) { + processor.uninstall(); + Assert.isTrue(null == fAsYouTypeValidators.get(javaEditor), "An old JavaDirtyRegionProcessor is not un-installed on Java Editor instance"); + } + } + } +} + Property changes on: trunk/common/plugins/org.jboss.tools.common.validation/src/org/jboss/tools/common/validation/java/JavaEditorTracker.java ___________________________________________________________________ Added: svn:mime-type + text/plain