Author: rob.stryker(a)jboss.com Date: 2009-02-24 05:12:55 -0500 (Tue, 24 Feb 2009) New Revision: 13751 Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/ArchivesModelModuleContributor.java trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/ArchivesModuleModelListener.java trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/PackageModuleFactory.java Log: JBIDE-3848 Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/ArchivesModelModuleContributor.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/ArchivesModelModuleContributor.java 2009-02-24 09:09:14 UTC (rev 13750) +++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/ArchivesModelModuleContributor.java 2009-02-24 10:12:55 UTC (rev 13751) @@ -26,7 +26,6 @@ import org.jboss.ide.eclipse.archives.core.model.IArchive; import org.jboss.ide.eclipse.archives.core.util.ModelUtil; import org.jboss.ide.eclipse.archives.webtools.IntegrationPlugin; -import org.jboss.ide.eclipse.archives.webtools.modules.PackageModuleFactory.IModuleContributor; import org.jboss.ide.eclipse.archives.webtools.modules.PackageModuleFactory.PackagedModuleDelegate; /** @@ -34,23 +33,15 @@ * @author Rob Stryker rob.stryker(a)jboss.com * */ -public class ArchivesModelModuleContributor implements IModuleContributor { +public class ArchivesModelModuleContributor { - private static ArchivesModelModuleContributor instance; - public static ArchivesModelModuleContributor getInstance() { - if( instance == null ) { - instance = new ArchivesModelModuleContributor(PackageModuleFactory.getFactory()); - } - return instance; - } - private PackageModuleFactory factory; protected ArrayList<IModule> modules = null; protected HashMap<IPath, ArrayList<IModule>> projectToModules = new HashMap<IPath, ArrayList<IModule>>(5); //IPath to IModule protected HashMap<IModule, Object> moduleDelegates = new HashMap<IModule, Object>(5); protected HashMap<IArchive, IModule> packageToModule = new HashMap<IArchive, IModule>(5); - private ArchivesModelModuleContributor(PackageModuleFactory factory) { + ArchivesModelModuleContributor(PackageModuleFactory factory) { this.factory = factory; } @@ -169,8 +160,8 @@ for( int i = 0; i < archives.length; i++ ) { if( PackageModuleFactory.getStamp(archives[i]) == null ) { requiresSave = true; - archives[i].setProperty(PackageModuleFactory.MODULE_ID_PROPERTY_KEY, - PackageModuleFactory.getStamp(archives[i], true)); + archives[i].setProperty(factory.MODULE_ID_PROPERTY_KEY, + factory.getStamp(archives[i], true)); } } return requiresSave; Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/ArchivesModuleModelListener.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/ArchivesModuleModelListener.java 2009-02-24 09:09:14 UTC (rev 13750) +++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/ArchivesModuleModelListener.java 2009-02-24 10:12:55 UTC (rev 13751) @@ -152,6 +152,6 @@ else p = delta.getPreNode().getProjectPath(); - ArchivesModelModuleContributor.getInstance().refreshProject(p); + PackageModuleFactory.getFactory().refreshProject(p); } } Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/PackageModuleFactory.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/PackageModuleFactory.java 2009-02-24 09:09:14 UTC (rev 13750) +++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/PackageModuleFactory.java 2009-02-24 10:12:55 UTC (rev 13751) @@ -146,13 +146,14 @@ - protected ArchivesModelModuleContributor moduleContributor; + protected final ArchivesModelModuleContributor moduleContributor + = new ArchivesModelModuleContributor(this); public PackageModuleFactory() { super(); } - - public void initialize() { - moduleContributor = ArchivesModelModuleContributor.getInstance(); + + public void refreshProject(IPath projectLoc) { + moduleContributor.refreshProject(projectLoc); } protected IModule createModule2(IArchive pack, IProject project) { @@ -171,12 +172,6 @@ return moduleContributor.getModuleDelegate(module); } - public static interface IModuleContributor { - public IModule[] getModules(); - public boolean containsModule(IModule module); - public PackagedModuleDelegate getModuleDelegate(IModule module); - } - public static interface IExtendedModuleResource extends IModuleResource { public IPath getSourcePath(); public IArchiveNode getNode();