Author: rob.stryker(a)jboss.com Date: 2009-12-21 18:29:53 -0500 (Mon, 21 Dec 2009) New Revision: 19507 Modified: branches/jbosstools-3.1.0.RC1/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/modules/JBTProjectModuleFactory.java branches/jbosstools-3.1.0.RC1/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/module/BPELModuleFactoryDelegate.java branches/jbosstools-3.1.0.RC1/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/module/JBossESBModuleFactory.java Log: JBIDE-5087 - to cr1 Modified: branches/jbosstools-3.1.0.RC1/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/modules/JBTProjectModuleFactory.java =================================================================== --- branches/jbosstools-3.1.0.RC1/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/modules/JBTProjectModuleFactory.java 2009-12-21 23:13:41 UTC (rev 19506) +++ branches/jbosstools-3.1.0.RC1/as/plugins/org.jboss.ide.eclipse.as.wtp.core/src/org/jboss/ide/eclipse/as/wtp/core/modules/JBTProjectModuleFactory.java 2009-12-21 23:29:53 UTC (rev 19507) @@ -57,6 +57,15 @@ this.moduleType = moduleType; this.facetType = facetType; } + + protected JBTProjectModuleFactory factoryDelegate; + protected JBTProjectModuleFactory getFactory() { + if (factoryDelegate == null) + factoryDelegate = (JBTProjectModuleFactory)getFactory(getFactoryId()); + return factoryDelegate; + } + + protected abstract String getFactoryId(); @Override protected void clearCache(IProject project) { @@ -66,10 +75,31 @@ @Override public ModuleDelegate getModuleDelegate(IModule module) { + // override for eclipse bug 251813 + String id = module.getId(); + if( id.startsWith(getFactoryId() + ":") && !id.startsWith(getFactoryId() + ":" + this.facetType)) { + // This is probably coming from ProjectRefactorOperation, bad news there + IModule tempModule = internalCreateModule(module.getProject()); + if( moduleToDelegate.get(tempModule) != null) + return moduleToDelegate.get(tempModule); + } return moduleToDelegate.get(module); } protected IModule[] createModules(IProject project) { + IModule module = internalCreateModule(project); + if( module != null ) { + JBTProjectModuleDelegate delegate = createDelegate(project); + moduleToDelegate.put(module, delegate); + + createBinaryModules(ComponentCore.createComponent(project), delegate); + // TODO - create children!!! see JEEDeployableFactory + return new IModule[] { module }; + } + return null; + } + + protected IModule internalCreateModule(IProject project) { IFacetedProject facetProject; try { facetProject = ProjectFacetsManager.create(project); @@ -87,12 +117,7 @@ moduleType, version.getVersionString(), project); - JBTProjectModuleDelegate delegate = createDelegate(project); - moduleToDelegate.put(module, delegate); - - createBinaryModules(ComponentCore.createComponent(project), delegate); - // TODO - create children!!! see JEEDeployableFactory - return new IModule[] { module }; + return module; } } catch (CoreException e) { ASWTPToolsPlugin.getDefault().getLog().log(e.getStatus()); Modified: branches/jbosstools-3.1.0.RC1/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/module/BPELModuleFactoryDelegate.java =================================================================== --- branches/jbosstools-3.1.0.RC1/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/module/BPELModuleFactoryDelegate.java 2009-12-21 23:13:41 UTC (rev 19506) +++ branches/jbosstools-3.1.0.RC1/bpel/plugins/org.jboss.tools.bpel.runtimes/src/org/jboss/tools/bpel/runtimes/module/BPELModuleFactoryDelegate.java 2009-12-21 23:29:53 UTC (rev 19507) @@ -18,12 +18,9 @@ public class BPELModuleFactoryDelegate extends JBTProjectModuleFactory { public static final String FACTORY_ID = "org.jboss.tools.bpel.runtimes.module.moduleFactory"; public static final String MODULE_TYPE = IBPELModuleFacetConstants.BPEL_MODULE_TYPE; - private static BPELModuleFactoryDelegate factDelegate; - public static BPELModuleFactoryDelegate getFactory() { - if (factDelegate == null) - factDelegate = (BPELModuleFactoryDelegate)getFactory(FACTORY_ID); - return factDelegate; + public String getFactoryId() { + return FACTORY_ID; } public BPELModuleFactoryDelegate() { Modified: branches/jbosstools-3.1.0.RC1/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/module/JBossESBModuleFactory.java =================================================================== --- branches/jbosstools-3.1.0.RC1/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/module/JBossESBModuleFactory.java 2009-12-21 23:13:41 UTC (rev 19506) +++ branches/jbosstools-3.1.0.RC1/esb/plugins/org.jboss.tools.esb.project.core/src/org/jboss/tools/esb/core/module/JBossESBModuleFactory.java 2009-12-21 23:29:53 UTC (rev 19507) @@ -19,14 +19,11 @@ public class JBossESBModuleFactory extends JBTProjectModuleFactory { public static final String FACTORY_ID = "org.jboss.tools.esb.project.core.moduleFactory"; public static final String MODULE_TYPE = IJBossESBFacetDataModelProperties.JBOSS_ESB_FACET_ID; - private static JBossESBModuleFactory factDelegate; - public static JBossESBModuleFactory getFactory() { - if (factDelegate == null) - factDelegate = (JBossESBModuleFactory)getFactory(FACTORY_ID); - return factDelegate; + public String getFactoryId() { + return FACTORY_ID; } - + public JBossESBModuleFactory() { super(MODULE_TYPE, ESBProjectConstant.ESB_PROJECT_FACET); }