Author: rob.stryker(a)jboss.com Date: 2011-08-12 05:08:20 -0400 (Fri, 12 Aug 2011) New Revision: 33830 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui.mbeans/META-INF/MANIFEST.MF trunk/as/plugins/org.jboss.ide.eclipse.as.ui.mbeans/src/org/jboss/ide/eclipse/as/ui/mbeans/project/JBossSARModuleDelegate.java trunk/as/plugins/org.jboss.ide.eclipse.as.ui.mbeans/src/org/jboss/ide/eclipse/as/ui/mbeans/project/JBossSARModuleFactory.java Log: /JBIDE-9497 - Fixes for fbricon's bug report Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui.mbeans/META-INF/MANIFEST.MF =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui.mbeans/META-INF/MANIFEST.MF 2011-08-12 08:59:08 UTC (rev 33829) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui.mbeans/META-INF/MANIFEST.MF 2011-08-12 09:08:20 UTC (rev 33830) @@ -41,6 +41,7 @@ org.eclipse.jst.j2ee.ui;bundle-version="1.1.500", org.eclipse.jst.common.frameworks;bundle-version="1.1.500" Bundle-ActivationPolicy: lazy -Export-Package: org.jboss.ide.eclipse.as.ui.mbeans.editors.proposals +Export-Package: org.jboss.ide.eclipse.as.ui.mbeans.editors.proposals, + org.jboss.ide.eclipse.as.ui.mbeans.project Bundle-Vendor: %Bundle-Vendor.0 Bundle-RequiredExecutionEnvironment: J2SE-1.5 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui.mbeans/src/org/jboss/ide/eclipse/as/ui/mbeans/project/JBossSARModuleDelegate.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui.mbeans/src/org/jboss/ide/eclipse/as/ui/mbeans/project/JBossSARModuleDelegate.java 2011-08-12 08:59:08 UTC (rev 33829) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui.mbeans/src/org/jboss/ide/eclipse/as/ui/mbeans/project/JBossSARModuleDelegate.java 2011-08-12 09:08:20 UTC (rev 33830) @@ -15,26 +15,21 @@ import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.Path; -import org.eclipse.jst.common.internal.modulecore.AddClasspathFoldersParticipant; -import org.eclipse.jst.common.internal.modulecore.AddClasspathLibReferencesParticipant; import org.eclipse.jst.common.internal.modulecore.AddMappedOutputFoldersParticipant; import org.eclipse.jst.common.internal.modulecore.IgnoreJavaInSourceFolderParticipant; -import org.eclipse.jst.common.internal.modulecore.ReplaceManifestExportParticipant; -import org.eclipse.jst.common.internal.modulecore.SingleRootExportParticipant; -import org.eclipse.jst.j2ee.internal.J2EEConstants; -import org.eclipse.jst.j2ee.internal.classpathdep.ClasspathDependencyEnablement; import org.eclipse.jst.j2ee.internal.common.exportmodel.JEEHeirarchyExportParticipant; -import org.eclipse.jst.j2ee.internal.common.exportmodel.JavaEESingleRootCallback; import org.eclipse.wst.common.componentcore.internal.flat.IFlattenParticipant; +import org.eclipse.wst.common.componentcore.resources.IVirtualComponent; import org.eclipse.wst.server.core.model.IModuleResource; -import org.eclipse.wst.web.internal.deployables.FlatComponentDeployable; import org.jboss.ide.eclipse.as.wtp.core.modules.IJBTModule; +import org.jboss.ide.eclipse.as.wtp.core.modules.JBTFlatModuleDelegate; +import org.jboss.ide.eclipse.as.wtp.core.modules.JBTFlatProjectModuleFactory; -public class JBossSARModuleDelegate extends FlatComponentDeployable implements IJBTModule { +public class JBossSARModuleDelegate extends JBTFlatModuleDelegate implements IJBTModule { - public JBossSARModuleDelegate(IProject project){ - super(project); + public JBossSARModuleDelegate(IProject project, + IVirtualComponent aComponent, JBTFlatProjectModuleFactory myFactory) { + super(project, aComponent, myFactory); } public IModuleResource[] members() throws CoreException { Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui.mbeans/src/org/jboss/ide/eclipse/as/ui/mbeans/project/JBossSARModuleFactory.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui.mbeans/src/org/jboss/ide/eclipse/as/ui/mbeans/project/JBossSARModuleFactory.java 2011-08-12 08:59:08 UTC (rev 33829) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui.mbeans/src/org/jboss/ide/eclipse/as/ui/mbeans/project/JBossSARModuleFactory.java 2011-08-12 09:08:20 UTC (rev 33830) @@ -15,11 +15,13 @@ import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.CoreException; import org.eclipse.wst.common.componentcore.internal.flat.IChildModuleReference; +import org.eclipse.wst.common.componentcore.resources.IVirtualComponent; import org.eclipse.wst.common.project.facet.core.IFacetedProject; import org.eclipse.wst.common.project.facet.core.IProjectFacet; import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager; import org.eclipse.wst.server.core.IModule; import org.eclipse.wst.web.internal.deployables.FlatComponentDeployable; +import org.jboss.ide.eclipse.as.wtp.core.modules.JBTFlatModuleDelegate; import org.jboss.ide.eclipse.as.wtp.core.modules.JBTFlatProjectModuleFactory; public class JBossSARModuleFactory extends JBTFlatProjectModuleFactory { @@ -34,8 +36,8 @@ super(); } - protected FlatComponentDeployable createDelegate(IProject project) { - return new JBossSARModuleDelegate(project); + protected FlatComponentDeployable createModuleDelegate(IProject project, IVirtualComponent component) { + return new JBossSARModuleDelegate(project, component, this); } @Override