Author: mareshkau Date: 2010-09-02 08:00:50 -0400 (Thu, 02 Sep 2010) New Revision: 24639 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/JSF2SourceValidator.java trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/jsf2/action/JSF2CompositeAttrsProposal.java trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/jsf2/action/JSF2CompositeComponentProposal.java trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/jsf2/action/JSF2QuickFixProcessor.java trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/jsf2/action/JSF2ResourcesFolderProposal.java Log: https://jira.jboss.org/browse/JBIDE-6965 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 2010-09-02 09:04:29 UTC (rev 24638) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/jsf2/JSF2ComponentsValidator.java 2010-09-02 12:00:50 UTC (rev 24639) @@ -37,6 +37,7 @@ /** * * @author yzhishko + * @author mareshkau * */ Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/jsf2/JSF2SourceValidator.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/jsf2/JSF2SourceValidator.java 2010-09-02 09:04:29 UTC (rev 24638) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/jsf2/JSF2SourceValidator.java 2010-09-02 12:00:50 UTC (rev 24639) @@ -13,12 +13,15 @@ import java.util.Locale; import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.IMarker; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; +import org.eclipse.core.runtime.CoreException; import org.eclipse.jface.text.IDocument; import org.eclipse.jface.text.IRegion; import org.eclipse.wst.sse.ui.internal.reconcile.validator.ISourceValidator; import org.eclipse.wst.sse.ui.internal.reconcile.validator.IncrementalHelper; +import org.eclipse.wst.validation.ValidatorMessage; import org.eclipse.wst.validation.internal.core.Message; import org.eclipse.wst.validation.internal.core.ValidationException; import org.eclipse.wst.validation.internal.provisional.core.IMessage; @@ -26,6 +29,7 @@ import org.eclipse.wst.validation.internal.provisional.core.IValidationContext; import org.eclipse.wst.validation.internal.provisional.core.IValidator; import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument; +import org.jboss.tools.jsf.JSFModelPlugin; import org.jboss.tools.jsf.jsf2.model.JSF2ComponentModelManager; import org.jboss.tools.jsf.jsf2.util.JSF2ResourceUtil; import org.jboss.tools.jsf.web.validation.jsf2.components.IJSF2ValidationComponent; @@ -36,6 +40,7 @@ /** * * @author yzhishko + * @author mareshkau * */ @@ -44,7 +49,7 @@ private IDOMDocument document; private IFile validateFile; - + public void cleanup(IReporter reporter) { } @@ -72,7 +77,7 @@ validateFile = (IFile) resource; reportProblems(reporter, JSF2XMLValidator.getValidationComponents(document, - (IFile) resource)); + (IFile) resource),resource); } } } @@ -93,11 +98,19 @@ } private void reportProblems(IReporter reporter, - IJSF2ValidationComponent[] validationComponents) { - for (int i = 0; i < validationComponents.length; i++) { - reporter.addMessage(this, new LocalizedMessage( - validationComponents[i], validateFile)); + IJSF2ValidationComponent[] validationComponents,IResource resource) { + try { + resource.deleteMarkers(JSF2XMLValidator.JSF2_PROBLEM_ID, false, IResource.DEPTH_INFINITE); + for (int i = 0; i < validationComponents.length; i++) { + Message locMessage = new LocalizedMessage(validationComponents[i], validateFile); + reporter.addMessage(this, locMessage); + IMarker marker = resource.createMarker(JSF2XMLValidator.JSF2_PROBLEM_ID); + marker.setAttributes(locMessage.getAttributes()); + } + } catch (CoreException e) { + JSFModelPlugin.getPluginLog().logError(e); } + } private static class LocalizedMessage extends Message { @@ -107,19 +120,23 @@ public LocalizedMessage(IJSF2ValidationComponent component, IFile validateFile) { this.component = component; - setAttribute("problemType", "org.jboss.tools.jsf.jsf2problemmarker"); //$NON-NLS-1$ //$NON-NLS-2$ + setAttribute("problemType", JSF2XMLValidator.JSF2_PROBLEM_ID); //$NON-NLS-1$ //$NON-NLS-2$ setAttribute(IJSF2ValidationComponent.JSF2_TYPE_KEY, component .getType()); setAttribute( "validateResourcePath", validateFile == null ? "" : validateFile.getFullPath().toString()); //$NON-NLS-1$//$NON-NLS-2$ setAttribute(JSF2ResourceUtil.COMPONENT_RESOURCE_PATH_KEY, component.getComponentResourceLocation()); + setAttribute("lineNumber", getLineNumber()); + setAttribute("severity", 1); + setAttribute(ValidatorMessage.ValidationId, "org.jboss.tools.jsf.jsf2.source"); if (component instanceof JSF2URITempComponent) { setAttribute(IJSF2ValidationComponent.JSF2_URI_NAME_KEY, ((JSF2URITempComponent) component).getURI()); } else if (component instanceof JSF2AttrTempComponent) { setAttribute(IJSF2ValidationComponent.JSF2_ATTR_NAME_KEY, ((JSF2AttrTempComponent) component).getName()); + setAttribute(JSF2ResourceUtil.JSF2_COMPONENT_NAME, ((JSF2AttrTempComponent) component).getElementName()); } else if (component instanceof JSF2CompositeTempComponent) { String[] attrNames = ((JSF2CompositeTempComponent) component) .getAttrNames(); @@ -129,8 +146,10 @@ IJSF2ValidationComponent.JSF2_ATTR_NAME_KEY + String.valueOf(i), attrNames[i]); } + setAttribute(JSF2ResourceUtil.JSF2_COMPONENT_NAME, ((JSF2CompositeTempComponent) component).getElement().getLocalName()); } } + setAttribute("message",getText()); } @Override Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/jsf2/action/JSF2CompositeAttrsProposal.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/jsf2/action/JSF2CompositeAttrsProposal.java 2010-09-02 09:04:29 UTC (rev 24638) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/jsf2/action/JSF2CompositeAttrsProposal.java 2010-09-02 12:00:50 UTC (rev 24639) @@ -51,10 +51,12 @@ } public JSF2CompositeAttrsProposal(IResource validateResource, - String compPath, String[] attrs) { + String compPath, String[] attrs,String attrName,String elementName) { super(validateResource); this.componentPath = compPath; this.attrs = attrs; + this.attrName = attrName; + this.elementName=elementName; } public String getDisplayString() { Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/jsf2/action/JSF2CompositeComponentProposal.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/jsf2/action/JSF2CompositeComponentProposal.java 2010-09-02 09:04:29 UTC (rev 24638) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/jsf2/action/JSF2CompositeComponentProposal.java 2010-09-02 12:00:50 UTC (rev 24639) @@ -11,25 +11,18 @@ package org.jboss.tools.jsf.web.validation.jsf2.action; -import java.io.File; import java.text.MessageFormat; import java.util.HashSet; import java.util.Map; import java.util.Map.Entry; import java.util.Set; -import org.eclipse.core.resources.IContainer; import org.eclipse.core.resources.IFile; -import org.eclipse.core.resources.IFolder; import org.eclipse.core.resources.IMarker; import org.eclipse.core.resources.IResource; -import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.Path; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.ide.IDE; -import org.eclipse.wst.common.componentcore.ComponentCore; -import org.eclipse.wst.common.componentcore.resources.IVirtualComponent; -import org.eclipse.wst.common.componentcore.resources.IVirtualFolder; import org.jboss.tools.jsf.JSFModelPlugin; import org.jboss.tools.jsf.jsf2.util.JSF2ResourceUtil; import org.jboss.tools.jsf.messages.JSFUIMessages; @@ -59,10 +52,11 @@ } public JSF2CompositeComponentProposal(IResource validateResource, - String compPath, String[] attrs) { + String compPath, String[] attrs, String elementName) { super(validateResource); this.componentPath = compPath; this.attrs = attrs; + this.elementName=elementName; } @SuppressWarnings("unchecked") Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/jsf2/action/JSF2QuickFixProcessor.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/jsf2/action/JSF2QuickFixProcessor.java 2010-09-02 09:04:29 UTC (rev 24638) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/jsf2/action/JSF2QuickFixProcessor.java 2010-09-02 12:00:50 UTC (rev 24639) @@ -57,18 +57,19 @@ String[] attrs = new String[] { (String) context .getAttribute(IJSF2ValidationComponent.JSF2_ATTR_NAME_KEY) }; ICompletionProposal proposal = new JSF2CompositeAttrsProposal( - resource, compPath, attrs); + resource, compPath, attrs,(String)context.getAttribute(IJSF2ValidationComponent.JSF2_ATTR_NAME_KEY), + (String)context.getAttribute(JSF2ResourceUtil.JSF2_COMPONENT_NAME)); return new ICompletionProposal[] { proposal }; } else if (type .equals(IJSF2ValidationComponent.JSF2_COMPOSITE_COMPONENT_TYPE)) { ICompletionProposal proposal = new JSF2CompositeComponentProposal( - resource, compPath, retriveAttrsFromContext(context)); + resource, compPath, retriveAttrsFromContext(context),(String)context.getAttribute(JSF2ResourceUtil.JSF2_COMPONENT_NAME)); return new ICompletionProposal[] { proposal }; } else if (type.equals(IJSF2ValidationComponent.JSF2_URI_TYPE)) { String uriPath = (String) context .getAttribute(IJSF2ValidationComponent.JSF2_URI_NAME_KEY); ICompletionProposal proposal = new JSF2ResourcesFolderProposal( - resource, uriPath); + resource, uriPath,(String)context.getAttribute(IJSF2ValidationComponent.JSF2_URI_NAME_KEY)); return new ICompletionProposal[] { proposal }; } } Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/jsf2/action/JSF2ResourcesFolderProposal.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/jsf2/action/JSF2ResourcesFolderProposal.java 2010-09-02 09:04:29 UTC (rev 24638) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/jsf2/action/JSF2ResourcesFolderProposal.java 2010-09-02 12:00:50 UTC (rev 24639) @@ -43,9 +43,10 @@ } } - public JSF2ResourcesFolderProposal(IResource validateResource, String compPath) { + public JSF2ResourcesFolderProposal(IResource validateResource, String compPath,String URL) { super(validateResource); this.componentPath = compPath; + this.URL = URL; } public String getDisplayString() {