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

[Marshall Culpepper]

  User: mculpepper
  Date: 07/03/01 22:41:50

  Modified:    core/plugins/org.jboss.ide.eclipse.packages.ui/src/main/org/jboss/ide/eclipse/packages/ui/views 
                        ProjectPackagesView.java
  Log:
  fixed a stack overflow error (stupid content provider error), viewing "all projects" should work now from a fresh startup.
  
  Revision  Changes    Path
  1.23      +37 -29    jbosside/core/plugins/org.jboss.ide.eclipse.packages.ui/src/main/org/jboss/ide/eclipse/packages/ui/views/ProjectPackagesView.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ProjectPackagesView.java
  ===================================================================
  RCS file: /cvsroot/jboss/jbosside/core/plugins/org.jboss.ide.eclipse.packages.ui/src/main/org/jboss/ide/eclipse/packages/ui/views/ProjectPackagesView.java,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -b -r1.22 -r1.23
  --- ProjectPackagesView.java	1 Mar 2007 23:48:28 -0000	1.22
  +++ ProjectPackagesView.java	2 Mar 2007 03:41:50 -0000	1.23
  @@ -379,8 +379,6 @@
   		
   		if (PackagesCore.projectHasPackages(project))
   		{
  -			if (!showAllProjects())
  -			{
   				pageBook.showPage(loadingPackagesComposite);
   				getSite().getShell().getDisplay().asyncExec(new Runnable () {
   					public void run ()
  @@ -399,8 +397,23 @@
   							{
   								if (showProjectRoot())
   								{
  +
  +								if (showAllProjects())
  +								{
  +									IProject[] projects = PackagesCore.getPackageProjects();
  +									loadingProgress.beginTask("Loading...", projects.length);
  +									for (int i = 0; i < projects.length; i++)
  +									{
  +										PackagesCore.getProjectPackages(projects[i], null);
  +									}
  +									
  +									pageBook.showPage(mainPage);
  +									packageTree.setInput(projects);
  +									packageTree.expandToLevel(currentProject, 1);
  +								} else {
   									packageTree.setInput(new IProject[] { project });
   									packageTree.expandToLevel(2);
  +								}
   								} else {
   									packageTree.setInput(PackagesCore.getProjectPackages(project, null));
   								}
  @@ -411,11 +424,6 @@
   						loading = false;
   					}
   				});
  -			} else {
  -				pageBook.showPage(mainPage);
  -				packageTree.setInput(PackagesCore.getPackageProjects());
  -				packageTree.expandToLevel(currentProject, 1);
  -			}
   		}
   		else {
   			showCreatePackageLink();