[jboss-cvs] jbosside/core/plugins/org.jboss.ide.eclipse.packages.core/src/main/org/jboss/ide/eclipse/packages/core/model/internal ...

[Marshall Culpepper]

  User: mculpepper
  Date: 06/11/20 16:06:03

  Modified:    core/plugins/org.jboss.ide.eclipse.packages.core/src/main/org/jboss/ide/eclipse/packages/core/model/internal  
                        PackagesModel.java PackageImpl.java
  Log:
  Added initial support for IPackageType for rob to start playing.. needs more testing
  
  Revision  Changes    Path
  1.7       +21 -0     jbosside/core/plugins/org.jboss.ide.eclipse.packages.core/src/main/org/jboss/ide/eclipse/packages/core/model/internal/PackagesModel.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: PackagesModel.java
  ===================================================================
  RCS file: /cvsroot/jboss/jbosside/core/plugins/org.jboss.ide.eclipse.packages.core/src/main/org/jboss/ide/eclipse/packages/core/model/internal/PackagesModel.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -b -r1.6 -r1.7
  --- PackagesModel.java	19 Nov 2006 01:09:58 -0000	1.6
  +++ PackagesModel.java	20 Nov 2006 21:06:03 -0000	1.7
  @@ -41,6 +41,7 @@
   import org.eclipse.core.runtime.IProgressMonitor;
   import org.eclipse.core.runtime.NullProgressMonitor;
   import org.jboss.ide.eclipse.core.util.ProjectUtil;
  +import org.jboss.ide.eclipse.packages.core.ExtensionManager;
   import org.jboss.ide.eclipse.packages.core.Trace;
   import org.jboss.ide.eclipse.packages.core.model.IPackage;
   import org.jboss.ide.eclipse.packages.core.model.IPackageFileSet;
  @@ -54,6 +55,7 @@
   import org.jboss.ide.eclipse.packages.core.model.internal.xb.XbPackage;
   import org.jboss.ide.eclipse.packages.core.model.internal.xb.XbPackageNode;
   import org.jboss.ide.eclipse.packages.core.model.internal.xb.XbPackages;
  +import org.jboss.ide.eclipse.packages.core.model.types.IPackageType;
   import org.jboss.ide.eclipse.packages.core.project.PackagesNature;
   
   public class PackagesModel {
  @@ -64,6 +66,7 @@
   	
   	private Hashtable modelBridge;
   	private Hashtable projectPackages;
  +	private Hashtable packageTypes;
   	private Hashtable xbPackages;
   	private ArrayList buildListeners;
   	private ArrayList modelListeners;
  @@ -73,8 +76,11 @@
   		modelBridge = new Hashtable();
   		projectPackages = new Hashtable();
   		xbPackages = new Hashtable();
  +		packageTypes = new Hashtable();
   		buildListeners = new ArrayList();
   		modelListeners = new ArrayList();
  +		
  +		loadPackageTypes();
   	}
   	
   	public static PackagesModel instance ()
  @@ -241,6 +247,16 @@
   		return scanner;
   	}
   	
  +	protected void loadPackageTypes ()
  +	{
  +		IPackageType[] packageTypes = ExtensionManager.findPackageTypes();
  +		
  +		for (int i = 0; i < packageTypes.length; i++)
  +		{
  +			this.packageTypes.put(packageTypes[i].getId(), packageTypes[i]);
  +		}
  +	}
  +	
   	protected void saveAndRegister (PackageNodeImpl node)
   	{
   		if (node.getNodeType() == IPackageNode.TYPE_PACKAGE)
  @@ -492,4 +508,9 @@
   	{
   		return (XbPackageNode) modelBridge.get(nodeImpl);
   	}
  +
  +	public IPackageType getPackageType(String packageType)
  +	{
  +		return (IPackageType) packageTypes.get(packageType);
  +	}
   }
  
  
  
  1.4       +6 -5      jbosside/core/plugins/org.jboss.ide.eclipse.packages.core/src/main/org/jboss/ide/eclipse/packages/core/model/internal/PackageImpl.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: PackageImpl.java
  ===================================================================
  RCS file: /cvsroot/jboss/jbosside/core/plugins/org.jboss.ide.eclipse.packages.core/src/main/org/jboss/ide/eclipse/packages/core/model/internal/PackageImpl.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -b -r1.3 -r1.4
  --- PackageImpl.java	16 Nov 2006 20:56:58 -0000	1.3
  +++ PackageImpl.java	20 Nov 2006 21:06:03 -0000	1.4
  @@ -39,12 +39,13 @@
   import org.jboss.ide.eclipse.packages.core.model.IPackageWorkingCopy;
   import org.jboss.ide.eclipse.packages.core.model.internal.xb.XbPackage;
   import org.jboss.ide.eclipse.packages.core.model.internal.xb.XbPackages;
  +import org.jboss.ide.eclipse.packages.core.model.types.IPackageType;
   
   /**
    * A Package.
    * 
    * @author <a href="marshall at jboss.org">Marshall Culpepper</a>
  - * @version $Revision: 1.3 $
  + * @version $Revision: 1.4 $
    */
   public class PackageImpl extends PackageNodeImpl implements IPackage, IPackageWorkingCopy {
   
  @@ -112,8 +113,8 @@
   		return pkgs;
   	}
   
  -	public String getPackageType() {
  -		return packageDelegate.getPackageType();
  +	public IPackageType  getPackageType() {
  +		return PackagesModel.instance().getPackageType(packageDelegate.getPackageType());
   	}
   	
   	public IFile getPackageFile() {
  @@ -221,8 +222,8 @@
   		packageDelegate.setName(name);
   	}
   
  -	public void setPackageType(String type) {
  -		packageDelegate.setPackageType(type);
  +	public void setPackageType(IPackageType type) {
  +		packageDelegate.setPackageType(type.getId());
   	}
   	
   	public IPackageNode getOriginal() {