[jbosstools-commits] JBoss Tools SVN: r24097 - in trunk/jsf: plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/messages and 5 other directories.

Author: mareshkau Date: 2010-08-12 08:20:53 -0400 (Thu, 12 Aug 2010) New Revision: 24097 Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/jsf2/util/JSF2ResourceUtil.java trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/messages/messages.properties 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/action/JSF2ComponentResolutionGenerator.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/components/JSF2CompositeTempComponent.java trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/validation/JSF2ComponentsValidatorTest.java trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE788Test.java Log: https://jira.jboss.org/browse/JBIDE-6685 Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/jsf2/util/JSF2ResourceUtil.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/jsf2/util/JSF2ResourceUtil.java 2010-08-12 12:08:31 UTC (rev 24096) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/jsf2/util/JSF2ResourceUtil.java 2010-08-12 12:20:53 UTC (rev 24097) @@ -51,6 +51,8 @@ public static final String COMPONENT_RESOURCE_PATH_KEY = "component_resource_path_key"; //$NON-NLS-1$ + public static final String JSF2_COMPONENT_NAME = "jsf2_resource_name"; //$NON-NLS-1$ + public static final int JAR_FILE_RESOURCE_TYPE = 1; public static final int JAR_DIRECTORY_RESOURCE_TYPE = JAR_FILE_RESOURCE_TYPE << 1; Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/messages/messages.properties =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/messages/messages.properties 2010-08-12 12:08:31 UTC (rev 24096) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/messages/messages.properties 2010-08-12 12:20:53 UTC (rev 24097) @@ -100,11 +100,11 @@ DeleteManagedBeanHandler_Failure=Failure DeleteManagedPropertyHandler_Delete=Delete {0} DeleteManagedPropertyHandler_DeleteJavaProperty=Delete java property -Create_JSF_2_Composite_Component=Create JSF 2 composite component in a project resources folder +Create_JSF_2_Composite_Component=Create JSF 2 composite component named "{0}" in "{1}" Missing_JSF_2_Composite_Component=Composite component "{0}" was not found in a project resources directory Missing_JSF_2_Component_Attr=Attribute "{0}" is not defined for "{1}" composite component Create_JSF_2_Interface_Attr=Create attribute in an interface declaration of a composite component -Missing_JSF_2_Resources_Folder=Resources folder "{0}" is missing in a project root directory +Missing_JSF_2_Resources_Folder=JSF 2 Resources folder "{0}" is missing in a project root directory Create_JSF_2_Resources_Folder=Create a folder container for JSF 2 resources Rename_JSF_2_Composite_Components=Rename JSF 2 composite components Refactoring_JSF_2_resources=Refactoring JSF 2 resources 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-08-12 12:08:31 UTC (rev 24096) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/jsf2/JSF2ComponentsValidator.java 2010-08-12 12:20:53 UTC (rev 24097) @@ -110,6 +110,7 @@ component.getType()); message.setAttribute(JSF2ResourceUtil.COMPONENT_RESOURCE_PATH_KEY, component.getComponentResourceLocation()); + message.setAttribute(JSF2ResourceUtil.JSF2_COMPONENT_NAME, component.getElement().getLocalName()); String[] attrNames = component.getAttrNames(); if (attrNames != null) { for (int i = 0; i < attrNames.length; i++) { Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/jsf2/action/JSF2ComponentResolutionGenerator.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/jsf2/action/JSF2ComponentResolutionGenerator.java 2010-08-12 12:08:31 UTC (rev 24096) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/jsf2/action/JSF2ComponentResolutionGenerator.java 2010-08-12 12:20:53 UTC (rev 24097) @@ -15,7 +15,9 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.ui.IMarkerResolution; import org.eclipse.ui.IMarkerResolutionGenerator; +import org.eclipse.wst.xml.core.internal.document.ElementImpl; import org.jboss.tools.jsf.JSFModelPlugin; +import org.jboss.tools.jsf.jsf2.util.JSF2ResourceUtil; import org.jboss.tools.jsf.web.validation.jsf2.JSF2XMLValidator; import org.jboss.tools.jsf.web.validation.jsf2.components.IJSF2ValidationComponent; @@ -37,19 +39,17 @@ } String fixType = (String) marker .getAttribute(IJSF2ValidationComponent.JSF2_TYPE_KEY); - if (fixType != null) { - if (fixType - .equals(IJSF2ValidationComponent.JSF2_COMPOSITE_COMPONENT_TYPE)) { - return new IMarkerResolution[] { new JSF2CompositeComponentProposal() }; + if (IJSF2ValidationComponent.JSF2_COMPOSITE_COMPONENT_TYPE.equals(fixType)) { + return new IMarkerResolution[] { new JSF2CompositeComponentProposal(marker.getResource(), + (String) marker.getAttribute(JSF2ResourceUtil.JSF2_COMPONENT_NAME), + (String) marker.getAttribute(JSF2ResourceUtil.COMPONENT_RESOURCE_PATH_KEY)) }; } - if (fixType - .equals(IJSF2ValidationComponent.JSF2_FIXABLE_ATTR_TYPE)) { + if (IJSF2ValidationComponent.JSF2_FIXABLE_ATTR_TYPE.equals(fixType)) { return new IMarkerResolution[] { new JSF2CompositeAttrsProposal() }; } - if (fixType.equals(IJSF2ValidationComponent.JSF2_URI_TYPE)) { + if (IJSF2ValidationComponent.JSF2_URI_TYPE.equals(fixType)) { return new IMarkerResolution[] { new JSF2ResourcesFolderProposal() }; } - } } catch (CoreException e) { JSFModelPlugin.getPluginLog().logError(e); } 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-08-12 12:08:31 UTC (rev 24096) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/jsf2/action/JSF2CompositeComponentProposal.java 2010-08-12 12:20:53 UTC (rev 24097) @@ -11,17 +11,25 @@ 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 java.util.Map.Entry; +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.jsf2.util.JSF2ResourceUtil; import org.jboss.tools.jsf.messages.JSFUIMessages; import org.jboss.tools.jsf.web.validation.jsf2.JSF2XMLValidator; @@ -37,9 +45,12 @@ private String componentPath = null; private String[] attrs = null; + private String elementName; - public JSF2CompositeComponentProposal() { - super(); + public JSF2CompositeComponentProposal(IResource validateResource, String elementName,String componentPath) { + super(validateResource); + this.elementName=elementName; + this.componentPath=componentPath; } public JSF2CompositeComponentProposal(IResource validateResource, @@ -67,7 +78,20 @@ } public String getDisplayString() { - return JSFUIMessages.Create_JSF_2_Composite_Component; + IVirtualComponent component = ComponentCore.createComponent(validateResource.getProject()); + String projectResourceRelativePath = componentPath; + if (component != null) { + IVirtualFolder webRootFolder = component.getRootFolder().getFolder( + new Path("/")); //$NON-NLS-1$ + IContainer folder = webRootFolder.getUnderlyingFolder(); + IFolder webFolder = ResourcesPlugin.getWorkspace().getRoot() + .getFolder(folder.getFullPath()); + IFolder resourcesFolder = webFolder.getFolder("resources"); + resourcesFolder.getProjectRelativePath().toString(); + projectResourceRelativePath=validateResource.getProject().getName()+File.separator+resourcesFolder.getProjectRelativePath().toString()+componentPath; + } + return MessageFormat.format(JSFUIMessages.Create_JSF_2_Composite_Component,elementName, + projectResourceRelativePath); } @SuppressWarnings("unchecked") Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/jsf2/components/JSF2CompositeTempComponent.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/jsf2/components/JSF2CompositeTempComponent.java 2010-08-12 12:08:31 UTC (rev 24096) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/jsf2/components/JSF2CompositeTempComponent.java 2010-08-12 12:20:53 UTC (rev 24097) @@ -79,4 +79,11 @@ return componentResLoc; } + /** + * @return the element + */ + public ElementImpl getElement() { + return element; + } + } 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 2010-08-12 12:08:31 UTC (rev 24096) +++ trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/validation/JSF2ComponentsValidatorTest.java 2010-08-12 12:20:53 UTC (rev 24097) @@ -52,14 +52,13 @@ IMarker[] markers = resource.findMarkers( "org.jboss.tools.jsf.jsf2problemmarker", false, 1); //$NON-NLS-1$ assertNotNull(markers); - assertTrue(markers.length == 4); assertTrue(isMarkerExist(markers, "Composite component \"echo\" was not found in a project resources directory")); //$NON-NLS-1$ assertTrue(isMarkerExist(markers, "Attribute \"anknownAttr\" is not defined for \"echo\" composite component")); //$NON-NLS-1$ assertTrue(isMarkerExist( markers, - "Resources folder \"/resources/jarPage1\" is missing in a project root directory")); //$NON-NLS-1$ + "JSF 2 Resources folder \"/resources/jarPage1\" is missing in a project root directory")); //$NON-NLS-1$ assertTrue(isMarkerExist(markers, "Composite component \"echo1\" was not found in a project resources directory")); //$NON-NLS-1$ } Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE788Test.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE788Test.java 2010-08-12 12:08:31 UTC (rev 24096) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE788Test.java 2010-08-12 12:20:53 UTC (rev 24097) @@ -14,7 +14,6 @@ import org.eclipse.core.resources.IFile; import org.eclipse.core.runtime.CoreException; -import org.eclipse.jdt.core.CompletionProposal; import org.eclipse.jface.text.ITextViewer; import org.eclipse.jface.text.contentassist.ICompletionProposal; import org.eclipse.jface.text.contentassist.IContentAssistProcessor;