[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: 07/02/13 15:16:10

  Modified:    core/plugins/org.jboss.ide.eclipse.packages.core/src/main/org/jboss/ide/eclipse/packages/core/model/internal 
                        PackagesModel.java
  Log:
  package types are now lazily loaded instead of initialized on model creation. this prevents circularity errors for plugins who want to initialize their listeners upon the start() of their plugin class. i'm looking at you as.core.
  
  Revision  Changes    Path
  1.15      +19 -12    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.14
  retrieving revision 1.15
  diff -u -b -r1.14 -r1.15
  --- PackagesModel.java	9 Feb 2007 23:10:22 -0000	1.14
  +++ PackagesModel.java	13 Feb 2007 20:16:10 -0000	1.15
  @@ -80,13 +80,10 @@
   	{
   		projectPackages = new Hashtable();
   		xbPackages = new Hashtable();
  -		packageTypes = new Hashtable();
   		buildListeners = new ArrayList();
   		modelListeners = new ArrayList();
   		projectBeingRegistered = null;
   		packageRefs = new Hashtable();
  -		
  -		loadPackageTypes();
   	}
   	
   	public static PackagesModel instance ()
  @@ -311,15 +308,15 @@
   		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 loadPackageTypes ()
  +//	{
  +//		IPackageType[] packageTypes = ExtensionManager.findPackageTypes();
  +//		
  +//		for (int i = 0; i < packageTypes.length; i++)
  +//		{
  +//			this.packageTypes.put(packageTypes[i].getId(), packageTypes[i]);
  +//		}
  +//	}
   	
   	protected void clearModel (IProject project)
   	{
  @@ -603,6 +600,16 @@
   	
   	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);
   	}