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

[Marshall Culpepper]

  User: mculpepper
  Date: 07/02/21 14:35:14

  Modified:    core/plugins/org.jboss.ide.eclipse.packages.core/src/main/org/jboss/ide/eclipse/packages/core/model 
                        PackagesCore.java
  Log:
  bug fix for when getTopLevelPackage was called with a top level package (returns itself)
  
  Revision  Changes    Path
  1.15      +9 -2      jbosside/core/plugins/org.jboss.ide.eclipse.packages.core/src/main/org/jboss/ide/eclipse/packages/core/model/PackagesCore.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: PackagesCore.java
  ===================================================================
  RCS file: /cvsroot/jboss/jbosside/core/plugins/org.jboss.ide.eclipse.packages.core/src/main/org/jboss/ide/eclipse/packages/core/model/PackagesCore.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -b -r1.14 -r1.15
  --- PackagesCore.java	17 Feb 2007 00:02:44 -0000	1.14
  +++ PackagesCore.java	21 Feb 2007 19:35:14 -0000	1.15
  @@ -216,6 +216,11 @@
   	 */
   	public static IPackage getTopLevelPackage (IPackageNode node)
   	{
  +		if (node.getNodeType() == IPackageNode.TYPE_PACKAGE)
  +		{
  +			if (((IPackage)node).isTopLevel()) return (IPackage) node;
  +		}
  +		
   		IPackageNode tmp = node.getParent(), top = tmp;
   		while (tmp != null)
   		{
  @@ -348,7 +353,8 @@
   	{
   		if (monitor == null) monitor = new NullProgressMonitor();
   		
  -		PackageBuildDelegate delegate = new PackageBuildDelegate(project);
  +		PackageBuildDelegate delegate = PackageBuildDelegate.instance();
  +		delegate.setProject(project);
   		try {
   			delegate.build(buildType, null, monitor);
   		} catch (CoreException e) {
  @@ -364,7 +370,8 @@
   	{
   		if (monitor == null) monitor = new NullProgressMonitor();
   
  -		PackageBuildDelegate delegate = new PackageBuildDelegate(pkg.getProject());
  +		PackageBuildDelegate delegate = PackageBuildDelegate.instance();
  +		delegate.setProject(pkg.getProject());
   		
   		delegate.buildSinglePackage(pkg, monitor);
   	}