Author: rob.stryker(a)jboss.com Date: 2010-09-01 07:43:34 -0400 (Wed, 01 Sep 2010) New Revision: 24596 Removed: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/schema/referenceResolver.exsd Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/plugin.xml trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/vcf/ExportedClassFolderReferenceResolver.java trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/vcf/JBTVirtualComponent.java trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/vcf/OutputFolderReferenceResolver.java trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/vcf/ReferenceResolverUtil.java Log: JBIDE-6964 - output folder reference resolver changed to wtp 3.2 api Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/plugin.xml =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/plugin.xml 2010-09-01 11:34:03 UTC (rev 24595) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/plugin.xml 2010-09-01 11:43:34 UTC (rev 24596) @@ -1,9 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <?eclipse version="3.4"?> <plugin> - <extension-point id="referenceResolver" name="referenceResolver" schema="schema/referenceResolver.exsd"/> <extension - point="org.jboss.ide.eclipse.as.wtp.core.referenceResolver"> + point="org.eclipse.wst.common.modulecore.referenceResolver"> <resolver class="org.jboss.ide.eclipse.as.wtp.core.vcf.OutputFolderReferenceResolver" id="org.jboss.ide.eclipse.as.wtp.core.vcf.outputFolderReferenceResolver"> @@ -13,5 +12,4 @@ id="org.jboss.ide.eclipse.as.wtp.core.vcf.exportedClasspathFolderReferenceResolver"> </resolver> </extension> - </plugin> Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/schema/referenceResolver.exsd =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/schema/referenceResolver.exsd 2010-09-01 11:34:03 UTC (rev 24595) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/schema/referenceResolver.exsd 2010-09-01 11:43:34 UTC (rev 24596) @@ -1,116 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!-- Schema file written by PDE --> -<schema targetNamespace="org.eclipse.wst.common.modulecore" xmlns="http://www.w3.org/2001/XMLSchema"> -<annotation> - <appInfo> - <meta.schema plugin="org.eclipse.wst.common.modulecore" id="referenceResolver" name="referenceResolver"/> - </appInfo> - <documentation> - [Enter description of this extension point.] - </documentation> - </annotation> - - <element name="extension"> - <annotation> - <appInfo> - <meta.element /> - </appInfo> - </annotation> - <complexType> - <sequence minOccurs="1" maxOccurs="unbounded"> - <element ref="resolver"/> - </sequence> - <attribute name="point" type="string" use="required"> - <annotation> - <documentation> - - </documentation> - </annotation> - </attribute> - <attribute name="id" type="string"> - <annotation> - <documentation> - - </documentation> - </annotation> - </attribute> - <attribute name="name" type="string"> - <annotation> - <documentation> - - </documentation> - <appInfo> - <meta.attribute translatable="true"/> - </appInfo> - </annotation> - </attribute> - </complexType> - </element> - - <element name="resolver"> - <complexType> - <attribute name="id" type="string" use="required"> - <annotation> - <documentation> - A required id which can be used to reference this resolver - </documentation> - </annotation> - </attribute> - <attribute name="class" type="string" use="required"> - <annotation> - <documentation> - The implementation class of this extension - </documentation> - <appInfo> - <meta.attribute kind="java" basedOn=":org.eclipse.wst.common.componentcore.resolvers.IReferenceResolver"/> - </appInfo> - </annotation> - </attribute> - <attribute name="weight" type="string"> - <annotation> - <documentation> - The weight used for sorting the resolvers. Lighter weights float to the top and are tried first. - </documentation> - </annotation> - </attribute> - </complexType> - </element> - - <annotation> - <appInfo> - <meta.section type="since"/> - </appInfo> - <documentation> - [Enter the first release in which this extension point appears.] - </documentation> - </annotation> - - <annotation> - <appInfo> - <meta.section type="examples"/> - </appInfo> - <documentation> - [Enter extension point usage example here.] - </documentation> - </annotation> - - <annotation> - <appInfo> - <meta.section type="apiinfo"/> - </appInfo> - <documentation> - [Enter API information here.] - </documentation> - </annotation> - - <annotation> - <appInfo> - <meta.section type="implementation"/> - </appInfo> - <documentation> - [Enter information about supplied implementation of this extension point.] - </documentation> - </annotation> - - -</schema> Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/vcf/ExportedClassFolderReferenceResolver.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/vcf/ExportedClassFolderReferenceResolver.java 2010-09-01 11:34:03 UTC (rev 24595) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/vcf/ExportedClassFolderReferenceResolver.java 2010-09-01 11:43:34 UTC (rev 24596) @@ -10,7 +10,6 @@ ******************************************************************************/ package org.jboss.ide.eclipse.as.wtp.core.vcf; -import org.eclipse.core.internal.resources.Workspace; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.IPath; @@ -20,6 +19,7 @@ import org.eclipse.wst.common.componentcore.internal.DependencyType; import org.eclipse.wst.common.componentcore.internal.ReferencedComponent; import org.eclipse.wst.common.componentcore.internal.impl.PlatformURLModuleConnection; +import org.eclipse.wst.common.componentcore.resolvers.IReferenceResolver; import org.eclipse.wst.common.componentcore.resources.IVirtualComponent; import org.eclipse.wst.common.componentcore.resources.IVirtualReference; Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/vcf/JBTVirtualComponent.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/vcf/JBTVirtualComponent.java 2010-09-01 11:34:03 UTC (rev 24595) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/vcf/JBTVirtualComponent.java 2010-09-01 11:43:34 UTC (rev 24596) @@ -90,20 +90,20 @@ return DependencyGraphManager.getInstance().checkIfStillValid(depGraphModStamp); } - private static IVirtualReference[] getHardReferences(IVirtualComponent earComponent) { + private static IVirtualReference[] getHardReferences(IVirtualComponent component) { StructureEdit core = null; List hardReferences = new ArrayList(); try { - core = StructureEdit.getStructureEditForRead(earComponent.getProject()); + core = StructureEdit.getStructureEditForRead(component.getProject()); if (core != null && core.getComponent() != null) { - WorkbenchComponent component = core.getComponent(); + WorkbenchComponent component2 = core.getComponent(); if (component != null) { - List referencedComponents = component.getReferencedComponents(); + List referencedComponents = component2.getReferencedComponents(); for (Iterator iter = referencedComponents.iterator(); iter.hasNext();) { ReferencedComponent referencedComponent = (ReferencedComponent) iter.next(); if (referencedComponent == null) continue; - IVirtualReference vReference = createVirtualReference(earComponent, referencedComponent); + IVirtualReference vReference = StructureEdit.createVirtualReference(component, referencedComponent); if (vReference != null) { IVirtualComponent referencedIVirtualComponent = vReference.getReferencedComponent(); if (referencedIVirtualComponent != null && referencedIVirtualComponent.exists()) { @@ -193,145 +193,4 @@ } return uri; } - /* - - private static List getLooseArchiveReferences(JBTVirtualComponent component, List hardReferences) { - return getLooseArchiveReferences(component, hardReferences, null, (EARVirtualRootFolder)component.getRootFolder()); - } - - private static List getLooseArchiveReferences(JBTVirtualComponent component, List hardReferences, List dynamicReferences, EARVirtualRootFolder folder) { - return null; - } -*/ - - // Potentially to be overridden (awesome?) - protected static IVirtualReference createVirtualReference(IVirtualComponent context, ReferencedComponent referencedComponent) { - IReferenceResolver res = ReferenceResolverUtil.getDefault().getResolver(context, referencedComponent); - return res.resolve(context, referencedComponent); - } - - protected static ReferencedComponent createReferencedComponent(IVirtualReference reference) { - IReferenceResolver res = ReferenceResolverUtil.getDefault().getResolver(reference); - return res.resolve(reference); - } - - /* ******************************************* - * Overrides from VirtualComponent class - * These are mostly here because of the extrapolation - * of createVirtualReference into its own method. - * - * These can probably be removed in WTP 3.2 - * *******************************************/ - @Override - public IVirtualReference[] getAllReferences() { - StructureEdit core = null; - List references = new ArrayList(); - try { - core = StructureEdit.getStructureEditForRead(getProject()); - if (core!=null && core.getComponent()!=null) { - WorkbenchComponent component = core.getComponent(); - if (component!=null) { - List referencedComponents = component.getReferencedComponents(); - for (Iterator iter = referencedComponents.iterator(); iter.hasNext();) { - ReferencedComponent referencedComponent = (ReferencedComponent) iter.next(); - if (referencedComponent==null) - continue; - IVirtualReference vReference = createVirtualReference(this, referencedComponent); - if( vReference != null ){ - vReference.setArchiveName( referencedComponent.getArchiveName() ); - } - if (vReference != null && vReference.getReferencedComponent() != null) - references.add(vReference); - } - } - } - return (IVirtualReference[]) references.toArray(new IVirtualReference[references.size()]); - } finally { - if(core != null) - core.dispose(); - } - } - - @Override - protected ReferencedComponent getWorkbenchReferencedComponent(IVirtualReference aReference, WorkbenchComponent component) { - if (aReference == null || aReference.getReferencedComponent() == null || component == null) - return null; - List referencedComponents = component.getReferencedComponents(); - URI uri = createReferencedComponent(aReference).getHandle(); - for (int i=0; i<referencedComponents.size(); i++) { - ReferencedComponent ref = (ReferencedComponent) referencedComponents.get(i); - if( ref.getHandle().equals(uri)) - return ref; - } - return null; - } - - @Override - public void addReferences(IVirtualReference[] references) { - if (references==null || references.length==0) - return; - StructureEdit core = null; - try { - core = StructureEdit.getStructureEditForWrite(getProject()); - if (core == null) - return; - WorkbenchComponent component = core.getComponent(); - ReferencedComponent referencedComponent = null; - ComponentcoreFactory factory = ComponentcorePackage.eINSTANCE.getComponentcoreFactory(); - for (int i=0; i<references.length; i++) { - if (references[i] == null) - continue; - referencedComponent = createReferencedComponent(references[i]); - if( referencedComponent != null ) - component.getReferencedComponents().add(referencedComponent); - } - //clean up any old obsolete references - if (component != null){ - cleanUpReferences(component); - } - } finally { - if(core != null) { - core.saveIfNecessary(null); - core.dispose(); - } - } - } - - /* @Override */ - private void cleanUpReferences(WorkbenchComponent component) { - List referencedComponents = component.getReferencedComponents(); - for (Iterator iter = referencedComponents.iterator(); iter.hasNext();) { - ReferencedComponent referencedComponent = (ReferencedComponent) iter.next(); - if (referencedComponent==null) - continue; - IVirtualReference vReference = createVirtualReference(this, referencedComponent); - if (vReference == null || vReference.getReferencedComponent() == null || !vReference.getReferencedComponent().exists()){ - iter.remove(); - } - } - } - - @Override - public void setReferences(IVirtualReference[] references) { - StructureEdit core = null; - try { - core = StructureEdit.getStructureEditForWrite(getProject()); - WorkbenchComponent component = core.getComponent(); - ReferencedComponent referencedComponent = null; - - component.getReferencedComponents().clear(); - ComponentcoreFactory factory = ComponentcorePackage.eINSTANCE.getComponentcoreFactory(); - for (int i=0; i<references.length; i++) { - referencedComponent = createReferencedComponent(references[i]); - if( referencedComponent != null ) - component.getReferencedComponents().add(referencedComponent); - } - } finally { - if(core != null) { - core.saveIfNecessary(null); - core.dispose(); - } - } - } - } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/vcf/OutputFolderReferenceResolver.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/vcf/OutputFolderReferenceResolver.java 2010-09-01 11:34:03 UTC (rev 24595) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/vcf/OutputFolderReferenceResolver.java 2010-09-01 11:43:34 UTC (rev 24596) @@ -20,14 +20,16 @@ import org.eclipse.wst.common.componentcore.internal.DependencyType; import org.eclipse.wst.common.componentcore.internal.ReferencedComponent; import org.eclipse.wst.common.componentcore.internal.impl.PlatformURLModuleConnection; +import org.eclipse.wst.common.componentcore.resolvers.IReferenceResolver; import org.eclipse.wst.common.componentcore.resources.IVirtualComponent; import org.eclipse.wst.common.componentcore.resources.IVirtualReference; -public class OutputFolderReferenceResolver implements IReferenceResolver { +public class OutputFolderReferenceResolver implements IReferenceResolver { public static final String OUTPUT_FOLDER_SEGMENT = "org.jboss.ide.eclipse.as.wtp.core.vcf.outputFolders"; public static final String OUTPUT_FOLDER_PROTOCOL = PlatformURLModuleConnection.MODULE_PROTOCOL +IPath.SEPARATOR+ OUTPUT_FOLDER_SEGMENT + IPath.SEPARATOR; public OutputFolderReferenceResolver() { + } public boolean canResolve(IVirtualComponent context, Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/vcf/ReferenceResolverUtil.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/vcf/ReferenceResolverUtil.java 2010-09-01 11:34:03 UTC (rev 24595) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/vcf/ReferenceResolverUtil.java 2010-09-01 11:43:34 UTC (rev 24596) @@ -27,6 +27,7 @@ import org.eclipse.wst.common.componentcore.resources.IVirtualReference; import org.jboss.ide.eclipse.as.wtp.core.ASWTPToolsPlugin; +@Deprecated public class ReferenceResolverUtil { public static ReferenceResolverUtil instance = null; public static ReferenceResolverUtil getDefault() {