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

[Robert Stryker]

  User: rawb    
  Date: 07/02/23 16:43:30

  Modified:    core/plugins/org.jboss.ide.eclipse.packages.core/src/main/org/jboss/ide/eclipse/packages/core/model/internal  
                        PackagesModel.java PackageImpl.java
  Log:
  Moved packageType cache from "model" to extension manager
  
  Revision  Changes    Path
  1.23      +0 -16     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.22
  retrieving revision 1.23
  diff -u -b -r1.22 -r1.23
  --- PackagesModel.java	23 Feb 2007 21:17:11 -0000	1.22
  +++ PackagesModel.java	23 Feb 2007 21:43:30 -0000	1.23
  @@ -69,7 +69,6 @@
   	public static final String PROJECT_PACKAGES_FILE = ".packages";
   	
   	private Hashtable projectPackages;
  -	private Hashtable packageTypes;
   	private Hashtable xbPackages;
   	private ArrayList buildListeners;
   	private ArrayList modelListeners;
  @@ -618,21 +617,6 @@
   		}
   	}
   	
  -	public IPackageType getPackageType (String packageType)
  -	{
  -		if (packageTypes == null)
  -		{
  -			packageTypes = new Hashtable();
  -			IPackageType[] registeredTypes = ExtensionManager.findPackageTypes();
  -			for (int i = 0; i < registeredTypes.length; i++)	
  -			{
  -				packageTypes.put(registeredTypes[i].getId(), registeredTypes[i]);
  -			}
  -		}
  -		
  -		return (IPackageType) packageTypes.get(packageType);
  -	}
  -
   	public IPackage createDetachedPackage (IProject project, boolean isTopLevel)
   	{
   		IPackage pkg = createPackage(project, isTopLevel);
  
  
  
  1.17      +3 -2      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.16
  retrieving revision 1.17
  diff -u -b -r1.16 -r1.17
  --- PackageImpl.java	23 Feb 2007 18:38:28 -0000	1.16
  +++ PackageImpl.java	23 Feb 2007 21:43:30 -0000	1.17
  @@ -33,6 +33,7 @@
   import org.eclipse.core.runtime.IPath;
   import org.eclipse.core.runtime.Path;
   import org.jboss.ide.eclipse.core.util.ResourceUtil;
  +import org.jboss.ide.eclipse.packages.core.ExtensionManager;
   import org.jboss.ide.eclipse.packages.core.model.IPackage;
   import org.jboss.ide.eclipse.packages.core.model.IPackageFileSet;
   import org.jboss.ide.eclipse.packages.core.model.IPackageFolder;
  @@ -46,7 +47,7 @@
    * A Package.
    * 
    * @author <a href="marshall at jboss.org">Marshall Culpepper</a>
  - * @version $Revision: 1.16 $
  + * @version $Revision: 1.17 $
    */
   public class PackageImpl extends PackageNodeImpl implements IPackage {
   
  @@ -118,7 +119,7 @@
   	}
   
   	public IPackageType  getPackageType() {
  -		return PackagesModel.instance().getPackageType(packageDelegate.getPackageType());
  +		return ExtensionManager.getPackageType(packageDelegate.getPackageType());
   	}
   	
   	public IFile getPackageFile() {