Author: rob.stryker(a)jboss.com Date: 2010-09-01 04:25:52 -0400 (Wed, 01 Sep 2010) New Revision: 24589 Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/META-INF/MANIFEST.MF trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/plugin.xml trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/filesets/vcf/FilesetComponentResolver.java trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/filesets/vcf/FilesetVCLabelProvider.java trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/ui/FilesetReferenceWizardFragment.java trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/vcf/AbstractFilesetVirtualComponent.java Log: JBIDE-6961 - fileset references disappeared Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/META-INF/MANIFEST.MF =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/META-INF/MANIFEST.MF 2010-09-01 04:40:21 UTC (rev 24588) +++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/META-INF/MANIFEST.MF 2010-09-01 08:25:52 UTC (rev 24589) @@ -27,11 +27,11 @@ org.jboss.ide.eclipse.as.wtp.core, org.jboss.ide.eclipse.as.wtp.ui, org.eclipse.emf.common;bundle-version="2.5.0", - org.eclipse.emf.ecore;bundle-version="2.5.0" + org.eclipse.emf.ecore;bundle-version="2.5.0", + org.eclipse.wst.common.modulecore.ui;bundle-version="1.0.1" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 -Export-Package: org.jboss.ide.eclipse.archives, - org.jboss.ide.eclipse.archives.webtools, +Export-Package: org.jboss.ide.eclipse.archives.webtools, org.jboss.ide.eclipse.archives.webtools.archivetypes, org.jboss.ide.eclipse.archives.webtools.filesets, org.jboss.ide.eclipse.archives.webtools.filesets.vcf, Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/plugin.xml =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/plugin.xml 2010-09-01 04:40:21 UTC (rev 24588) +++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/plugin.xml 2010-09-01 08:25:52 UTC (rev 24589) @@ -171,14 +171,28 @@ <keywordReference id="org.eclipse.wst.server.preferenceKeywords"/> </page> </extension> + <extension + point="org.eclipse.wst.common.modulecore.referenceResolver"> + <resolver + class="org.jboss.ide.eclipse.archives.webtools.filesets.vcf.FilesetComponentResolver" + id="org.jboss.ide.eclipse.archives.webtools.filesets.vcf.FilesetComponentResolver"> + </resolver> + </extension> + <extension + point="org.eclipse.wst.common.modulecore.ui.referenceWizardFragment"> + <referenceFragment + class="org.jboss.ide.eclipse.archives.webtools.ui.FilesetReferenceWizardFragment" + icon="$nl$/icons/multiple_files.gif" + id="org.jboss.ide.eclipse.archives.webtools.FilesetReferenceWizardFragment" + name="Fileset"> + </referenceFragment> + </extension> - <!-- Fileset integration for WTP Projects --> - <extension - point="org.jboss.ide.eclipse.as.wtp.core.referenceResolver"> - <resolver - class="org.jboss.ide.eclipse.archives.webtools.filesets.vcf.FilesetComponentResolver" - id="org.jboss.ide.eclipse.archives.webtools.filesets.vcf.FilesetComponentResolver"> - </resolver> - </extension> - + <extension + point="org.eclipse.wst.common.modulecore.ui.virtualComponentLabelProvider"> + <provider + class="org.jboss.ide.eclipse.archives.webtools.filesets.vcf.FilesetVCLabelProvider" + weight="5"> + </provider> + </extension> </plugin> Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/filesets/vcf/FilesetComponentResolver.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/filesets/vcf/FilesetComponentResolver.java 2010-09-01 04:40:21 UTC (rev 24588) +++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/filesets/vcf/FilesetComponentResolver.java 2010-09-01 08:25:52 UTC (rev 24589) @@ -5,7 +5,6 @@ import java.net.URLEncoder; import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.IPath; import org.eclipse.emf.common.util.URI; import org.eclipse.wst.common.componentcore.ComponentCore; @@ -13,10 +12,9 @@ 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; -import org.jboss.ide.eclipse.as.wtp.core.vcf.IReferenceResolver; -import org.jboss.ide.eclipse.as.wtp.core.vcf.OutputFoldersVirtualComponent; public class FilesetComponentResolver implements IReferenceResolver { public static final String FILESET_SEGMENT = "org.jboss.ide.eclipse.archives.webtools.filesets.vcf.FilesetComponentResolver"; //$NON-NLS-1$ Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/filesets/vcf/FilesetVCLabelProvider.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/filesets/vcf/FilesetVCLabelProvider.java 2010-09-01 04:40:21 UTC (rev 24588) +++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/filesets/vcf/FilesetVCLabelProvider.java 2010-09-01 08:25:52 UTC (rev 24589) @@ -2,8 +2,8 @@ import org.eclipse.swt.graphics.Image; import org.eclipse.wst.common.componentcore.resources.IVirtualComponent; +import org.eclipse.wst.common.componentcore.ui.internal.propertypage.IVirtualComponentLabelProvider; import org.jboss.ide.eclipse.archives.webtools.SharedImages; -import org.jboss.ide.eclipse.as.wtp.ui.propertypage.IVirtualComponentLabelProvider; public class FilesetVCLabelProvider implements IVirtualComponentLabelProvider { @@ -28,4 +28,6 @@ return base; } + public void dispose() { + } } Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/ui/FilesetReferenceWizardFragment.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/ui/FilesetReferenceWizardFragment.java 2010-09-01 04:40:21 UTC (rev 24588) +++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/ui/FilesetReferenceWizardFragment.java 2010-09-01 08:25:52 UTC (rev 24589) @@ -21,13 +21,16 @@ import org.eclipse.swt.widgets.Text; import org.eclipse.ui.dialogs.ContainerSelectionDialog; import org.eclipse.wst.common.componentcore.internal.DependencyType; +import org.eclipse.wst.common.componentcore.internal.resources.VirtualReference; import org.eclipse.wst.common.componentcore.resources.IVirtualComponent; -import org.eclipse.wst.server.ui.wizard.IWizardHandle; -import org.eclipse.wst.server.ui.wizard.WizardFragment; +import org.eclipse.wst.common.componentcore.resources.IVirtualReference; +import org.eclipse.wst.common.componentcore.ui.internal.propertypage.IReferenceEditor; +import org.eclipse.wst.common.componentcore.ui.internal.propertypage.NewReferenceWizard; +import org.eclipse.wst.common.componentcore.ui.internal.taskwizard.IWizardHandle; +import org.eclipse.wst.common.componentcore.ui.internal.taskwizard.WizardFragment; +import org.eclipse.wst.common.componentcore.ui.propertypage.IReferenceWizardConstants; import org.jboss.ide.eclipse.archives.webtools.Messages; import org.jboss.ide.eclipse.archives.webtools.filesets.vcf.WorkspaceFilesetVirtualComponent; -import org.jboss.ide.eclipse.as.wtp.ui.propertypage.IReferenceEditor; -import org.jboss.ide.eclipse.as.wtp.ui.propertypage.NewReferenceWizard; public class FilesetReferenceWizardFragment extends WizardFragment implements IReferenceEditor { public boolean hasComposite() { @@ -136,9 +139,12 @@ } public void performFinish(IProgressMonitor monitor) throws CoreException { - getTaskModel().putObject(NewReferenceWizard.COMPONENT, getFilesetComponent()); - getTaskModel().putObject(NewReferenceWizard.COMPONENT_PATH, "/"); //$NON-NLS-1$ - getTaskModel().putObject(NewReferenceWizard.DEPENDENCY_TYPE, DependencyType.CONSUMES_LITERAL); + IVirtualComponent comp = getFilesetComponent(); + IVirtualComponent rootComponent = (IVirtualComponent)getTaskModel().getObject(IReferenceWizardConstants.ROOT_COMPONENT); + VirtualReference ref = new VirtualReference(rootComponent, comp); + ref.setDependencyType(DependencyType.CONSUMES); + ref.setRuntimePath(new Path("/")); //$NON-NLS-1$ + getTaskModel().putObject(NewReferenceWizard.FINAL_REFERENCE, ref); } protected IVirtualComponent getFilesetComponent() { @@ -151,10 +157,10 @@ } private WorkspaceFilesetVirtualComponent original; - public boolean canEdit(IVirtualComponent vc) { + public boolean canEdit(IVirtualReference vr) { + IVirtualComponent vc = vr.getReferencedComponent(); if( vc instanceof WorkspaceFilesetVirtualComponent) original = (WorkspaceFilesetVirtualComponent)vc; return original != null; } - } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/vcf/AbstractFilesetVirtualComponent.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/vcf/AbstractFilesetVirtualComponent.java 2010-09-01 04:40:21 UTC (rev 24588) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/vcf/AbstractFilesetVirtualComponent.java 2010-09-01 08:25:52 UTC (rev 24589) @@ -101,7 +101,7 @@ public IVirtualReference[] getReferences(Map<String, Object> options) { // ignore - return null; + return new IVirtualReference[]{}; } public IVirtualReference[] getReferences() {