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

Author: mareshkau Date: 2010-08-13 08:02:21 -0400 (Fri, 13 Aug 2010) New Revision: 24144 Removed: trunk/usage/tests/org.jboss.tools.usage.test/bin/org/ 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/action/JSF2ResourcesFolderProposal.java trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/jsf2/components/JSF2URITempComponent.java trunk/usage/tests/org.jboss.tools.usage.test/bin/ 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-13 10:53:09 UTC (rev 24143) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/jsf2/util/JSF2ResourceUtil.java 2010-08-13 12:02:21 UTC (rev 24144) @@ -11,6 +11,7 @@ package org.jboss.tools.jsf.jsf2.util; +import java.io.File; import java.util.zip.ZipEntry; import org.eclipse.core.resources.IContainer; import org.eclipse.core.resources.IFile; @@ -251,5 +252,26 @@ return JSF2ComponentModelManager.getManager() .updateJSF2CompositeComponentFile(jsf2ResFile, attrNames); } + /** + * Calculates workspace relative jsf2 resources string + * @return workspace relative resource string + * @author mareshkau + */ + + public static String calculateProjectRelativeJSF2ResourceProposal( IProject project){ + IVirtualComponent component = ComponentCore.createComponent(project); + String projectResourceRelativePath = ""; + 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=project.getName()+File.separator+resourcesFolder.getProjectRelativePath().toString(); + } + return projectResourceRelativePath; + } } 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-13 10:53:09 UTC (rev 24143) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/messages/messages.properties 2010-08-13 12:02:21 UTC (rev 24144) @@ -105,7 +105,7 @@ 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=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 +Create_JSF_2_Resources_Folder=Create a folder "{0}" container for JSF 2 resources for URL "{1}" Rename_JSF_2_Composite_Components=Rename JSF 2 composite components Refactoring_JSF_2_resources=Refactoring JSF 2 resources Refactoring_JSF_2_Rename_Action=Refactoring is not available in the current place 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-13 10:53:09 UTC (rev 24143) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/jsf2/JSF2ComponentsValidator.java 2010-08-13 12:02:21 UTC (rev 24144) @@ -137,6 +137,8 @@ IJSF2ValidationComponent.JSF2_URI_TYPE); message.setAttribute(IJSF2ValidationComponent.JSF2_URI_NAME_KEY, component.getURI()); + message.setAttribute(JSF2ResourceUtil.COMPONENT_RESOURCE_PATH_KEY, + component.getResourcesFolder()); } } 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-13 10:53:09 UTC (rev 24143) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/jsf2/action/JSF2ComponentResolutionGenerator.java 2010-08-13 12:02:21 UTC (rev 24144) @@ -40,15 +40,13 @@ String fixType = (String) marker .getAttribute(IJSF2ValidationComponent.JSF2_TYPE_KEY); 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)) }; + return new IMarkerResolution[] { new JSF2CompositeComponentProposal(marker) }; } if (IJSF2ValidationComponent.JSF2_FIXABLE_ATTR_TYPE.equals(fixType)) { return new IMarkerResolution[] { new JSF2CompositeAttrsProposal() }; } if (IJSF2ValidationComponent.JSF2_URI_TYPE.equals(fixType)) { - return new IMarkerResolution[] { new JSF2ResourcesFolderProposal() }; + return new IMarkerResolution[] { new JSF2ResourcesFolderProposal(marker) }; } } 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-13 10:53:09 UTC (rev 24143) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/jsf2/action/JSF2CompositeComponentProposal.java 2010-08-13 12:02:21 UTC (rev 24144) @@ -30,6 +30,7 @@ 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; import org.jboss.tools.jsf.web.validation.jsf2.JSF2XMLValidator; @@ -47,10 +48,14 @@ private String[] attrs = null; private String elementName; - public JSF2CompositeComponentProposal(IResource validateResource, String elementName,String componentPath) { - super(validateResource); - this.elementName=elementName; - this.componentPath=componentPath; + public JSF2CompositeComponentProposal(IMarker marker) { + super(marker.getResource()); + try { + this.elementName=(String) marker.getAttribute(JSF2ResourceUtil.JSF2_COMPONENT_NAME); + this.componentPath=(String) marker.getAttribute(JSF2ResourceUtil.COMPONENT_RESOURCE_PATH_KEY); + } catch (CoreException e) { + JSFModelPlugin.getPluginLog().logError(e); + } } public JSF2CompositeComponentProposal(IResource validateResource, @@ -78,18 +83,8 @@ } public String getDisplayString() { - 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; - } + String projectResourceRelativePath = JSF2ResourceUtil.calculateProjectRelativeJSF2ResourceProposal(validateResource.getProject()) + +componentPath; return MessageFormat.format(JSFUIMessages.Create_JSF_2_Composite_Component,elementName, projectResourceRelativePath); } 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-08-13 10:53:09 UTC (rev 24143) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/jsf2/action/JSF2ResourcesFolderProposal.java 2010-08-13 12:02:21 UTC (rev 24144) @@ -11,9 +11,12 @@ package org.jboss.tools.jsf.web.validation.jsf2.action; +import java.text.MessageFormat; + import org.eclipse.core.resources.IMarker; import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.CoreException; +import org.jboss.tools.jsf.JSFModelPlugin; import org.jboss.tools.jsf.jsf2.util.JSF2ResourceUtil; import org.jboss.tools.jsf.messages.JSFUIMessages; import org.jboss.tools.jsf.web.validation.jsf2.JSF2XMLValidator; @@ -28,9 +31,16 @@ public class JSF2ResourcesFolderProposal extends JSF2AbstractProposal { private String componentPath = null; + private String URL=null; - public JSF2ResourcesFolderProposal() { - super(); + public JSF2ResourcesFolderProposal(IMarker marker) { + super(marker.getResource()); + try { + this.componentPath=(String) marker.getAttribute(JSF2ResourceUtil.COMPONENT_RESOURCE_PATH_KEY); + this.URL = (String) marker.getAttribute(IJSF2ValidationComponent.JSF2_URI_NAME_KEY); + } catch (CoreException e) { + JSFModelPlugin.getPluginLog().logError(e); + } } public JSF2ResourcesFolderProposal(IResource validateResource, String compPath) { @@ -39,7 +49,8 @@ } public String getDisplayString() { - return JSFUIMessages.Create_JSF_2_Resources_Folder; + return MessageFormat.format(JSFUIMessages.Create_JSF_2_Resources_Folder, + JSF2ResourceUtil.calculateProjectRelativeJSF2ResourceProposal(validateResource.getProject())+componentPath,URL); } @Override Modified: trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/jsf2/components/JSF2URITempComponent.java =================================================================== --- trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/jsf2/components/JSF2URITempComponent.java 2010-08-13 10:53:09 UTC (rev 24143) +++ trunk/jsf/plugins/org.jboss.tools.jsf/src/org/jboss/tools/jsf/web/validation/jsf2/components/JSF2URITempComponent.java 2010-08-13 12:02:21 UTC (rev 24144) @@ -32,10 +32,13 @@ } public void createValidationMessage() { - String mesParam = "/resources" + URI.replaceAll(JSF2ResourceUtil.JSF2_URI_PREFIX, ""); //$NON-NLS-1$ //$NON-NLS-2$ this.validationMessage = MessageFormat.format( - JSFUIMessages.Missing_JSF_2_Resources_Folder, mesParam); + JSFUIMessages.Missing_JSF_2_Resources_Folder, getResourcesFolder()); } + + public String getResourcesFolder(){ + return "/resources" + URI.replaceAll(JSF2ResourceUtil.JSF2_URI_PREFIX, ""); //$NON-NLS-1$ //$NON-NLS-2$ + } public String getValidationMessage() { return validationMessage; Property changes on: trunk/usage/tests/org.jboss.tools.usage.test/bin ___________________________________________________________________ Name: svn:ignore + target