[jboss-cvs] jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/module ...

[Robert Stryker]

  User: rawb    
  Date: 07/02/23 16:57:32

  Modified:    as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/module  
                        PackagedArtifactAdapter.java
                        PackageModuleFactory.java
  Log:
  
  
  Revision  Changes    Path
  1.3       +11 -5     jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/module/PackagedArtifactAdapter.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: PackagedArtifactAdapter.java
  ===================================================================
  RCS file: /cvsroot/jboss/jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/module/PackagedArtifactAdapter.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- PackagedArtifactAdapter.java	15 Feb 2007 14:52:03 -0000	1.2
  +++ PackagedArtifactAdapter.java	23 Feb 2007 21:57:32 -0000	1.3
  @@ -9,6 +9,8 @@
   import org.eclipse.wst.server.core.internal.ModuleFactory;
   import org.eclipse.wst.server.core.internal.ServerPlugin;
   import org.eclipse.wst.server.core.model.ModuleArtifactAdapterDelegate;
  +import org.jboss.ide.eclipse.packages.core.model.IPackage;
  +import org.jboss.ide.eclipse.packages.core.model.PackagesCore;
   
   public class PackagedArtifactAdapter extends ModuleArtifactAdapterDelegate {
   
  @@ -25,15 +27,17 @@
   				if( projects2[i].getName().equals(jpName)) {
   					done = true;
   					obj = projects2[i];
  +					break;
   				}
   			}
   		} 
  +		
   		if( obj instanceof IProject ) {
   			PackageModuleFactory factory = getFactory();
   			if( factory != null ) {
  -				IModule mod = factory.getModuleFromProject((IProject)obj);
  -				if( mod != null ) {
  -					return getArtifact(mod);
  +				IModule[] mods = factory.getModulesFromProject((IProject)obj);
  +				if( mods != null && mods.length != 0) {
  +					return getArtifact(mods);
   				}
   			}
   		}
  @@ -58,8 +62,10 @@
   		return null;
   	}
   	
  -	protected IModuleArtifact getArtifact(IModule mod) {
  -		return new PackagedArtifact(mod);
  +	protected IModuleArtifact getArtifact(IModule[] mod) {
  +		//return new PackagedArtifact(mod);
  +		// TODO Blocking on eclipse bug 174372 
  +		return null;
   	}
   	
   	public class PackagedArtifact implements IModuleArtifact{
  
  
  
  1.2       +21 -7     jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/module/PackageModuleFactory.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: PackageModuleFactory.java
  ===================================================================
  RCS file: /cvsroot/jboss/jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/module/PackageModuleFactory.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- PackageModuleFactory.java	15 Feb 2007 14:52:03 -0000	1.1
  +++ PackageModuleFactory.java	23 Feb 2007 21:57:32 -0000	1.2
  @@ -47,7 +47,7 @@
    */
   public class PackageModuleFactory extends ProjectModuleFactoryDelegate {
   	protected Map moduleDelegates = new HashMap(5);
  -	protected HashMap projectsToModule = new HashMap(5);
  +	protected HashMap packageToModule = new HashMap(5);
   	
   	public static final String FACTORY_TYPE_ID = "org.jboss.ide.eclipse.as.core.PackageModuleFactory";
   	public static final String MODULE_TYPE = "jboss.package";
  @@ -66,9 +66,9 @@
   				module = createModule(getID(packages[i]), getName(packages[i]),						 
   						MODULE_TYPE, VERSION, project);
   				list.add(module);
  -				Object moduleDelegate = new PackagedModuleDelegate();
  +				Object moduleDelegate = new PackagedModuleDelegate(packages[i]);
   				moduleDelegates.put(module, moduleDelegate);
  -				projectsToModule.put(project, module);
  +				packageToModule.put(packages[i], module);
   			}
   			return (IModule[]) list.toArray(new IModule[list.size()]);
   		}
  @@ -91,12 +91,22 @@
   
   	protected void clearCache() {
   		moduleDelegates = new HashMap(5);
  -		projectsToModule = new HashMap(5);
  +		packageToModule = new HashMap(5);
   	}
   	
  -	public IModule getModuleFromProject(IProject project) {
  +	public IModule getModuleFromPackage(IPackage pack) {
   		getModules(); // prime it
  -		return (IModule)projectsToModule.get(project);
  +		return (IModule)packageToModule.get(pack);
  +	}
  +	
  +	public IModule[] getModulesFromProject(IProject project) {
  +		ArrayList mods = new ArrayList();
  +		IPackage[] packs = PackagesCore.getProjectPackages(project, new NullProgressMonitor());
  +		for( int i = 0; i < packs.length; i++ ) {
  +			IModule mod = getModuleFromPackage(packs[i]);
  +			if( mod != null ) mods.add(mod);
  +		}
  +		return (IModule[]) mods.toArray(new IModule[mods.size()]);
   	}
   	
   	/**
  @@ -111,7 +121,11 @@
   	}
   
   	public class PackagedModuleDelegate extends ModuleDelegate {
  -
  +		private IPackage pack;
  +		public PackagedModuleDelegate(IPackage pack) {
  +			this.pack = pack;
  +		}
  +		public IPackage getPackage() {return pack;}
   		public IModule[] getChildModules() {
   			return new IModule[0];
   		}