[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 18:48:28

  Modified:    core/plugins/org.jboss.ide.eclipse.packages.ui/src/main/org/jboss/ide/eclipse/packages/ui/views 
                        ProjectPackagesView.java
  Log:
  2 new preferences for showing the project root in the packages project view (true by default), and showing "all" package projects (false by default)
  
  Revision  Changes    Path
  1.22      +56 -31    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.21
  retrieving revision 1.22
  diff -u -b -r1.21 -r1.22
  --- ProjectPackagesView.java	1 Mar 2007 17:05:50 -0000	1.21
  +++ ProjectPackagesView.java	1 Mar 2007 23:48:28 -0000	1.22
  @@ -18,8 +18,6 @@
   import org.eclipse.jface.dialogs.IInputValidator;
   import org.eclipse.jface.dialogs.InputDialog;
   import org.eclipse.jface.resource.ImageDescriptor;
  -import org.eclipse.jface.resource.JFaceColors;
  -import org.eclipse.jface.resource.JFaceResources;
   import org.eclipse.jface.viewers.ISelectionChangedListener;
   import org.eclipse.jface.viewers.IStructuredSelection;
   import org.eclipse.jface.viewers.SelectionChangedEvent;
  @@ -27,12 +25,8 @@
   import org.eclipse.jface.wizard.ProgressMonitorPart;
   import org.eclipse.jface.wizard.WizardDialog;
   import org.eclipse.swt.SWT;
  -import org.eclipse.swt.events.PaintEvent;
  -import org.eclipse.swt.events.PaintListener;
   import org.eclipse.swt.events.SelectionAdapter;
   import org.eclipse.swt.events.SelectionEvent;
  -import org.eclipse.swt.graphics.Color;
  -import org.eclipse.swt.graphics.Rectangle;
   import org.eclipse.swt.layout.FillLayout;
   import org.eclipse.swt.layout.GridData;
   import org.eclipse.swt.layout.GridLayout;
  @@ -44,7 +38,6 @@
   import org.eclipse.ui.ISharedImages;
   import org.eclipse.ui.IWorkbenchActionConstants;
   import org.eclipse.ui.PlatformUI;
  -import org.eclipse.ui.ide.IDE;
   import org.eclipse.ui.part.PageBook;
   import org.eclipse.ui.part.ViewPart;
   import org.jboss.ide.eclipse.packages.core.model.IPackage;
  @@ -386,6 +379,8 @@
   		
   		if (PackagesCore.projectHasPackages(project))
   		{
  +			if (!showAllProjects())
  +			{
   			pageBook.showPage(loadingPackagesComposite);
   			getSite().getShell().getDisplay().asyncExec(new Runnable () {
   				public void run ()
  @@ -402,7 +397,13 @@
   						pageBook.showPage(mainPage);
   						if (packageTree.getInput() != packages)
   						{
  -							packageTree.setInput(packages);
  +								if (showProjectRoot())
  +								{
  +									packageTree.setInput(new IProject[] { project });
  +									packageTree.expandToLevel(2);
  +								} else {
  +									packageTree.setInput(PackagesCore.getProjectPackages(project, null));
  +								}
   						}
   						collapseAllAction.setEnabled(true);
   					}
  @@ -410,6 +411,11 @@
   					loading = false;
   				}
   			});
  +			} else {
  +				pageBook.showPage(mainPage);
  +				packageTree.setInput(PackagesCore.getPackageProjects());
  +				packageTree.expandToLevel(currentProject, 1);
  +			}
   		}
   		else {
   			showCreatePackageLink();
  @@ -572,6 +578,16 @@
   		}
   	}
   	
  +	private boolean showProjectRoot ()
  +	{
  +		return PackagesUIPlugin.getDefault().getPluginPreferences().getBoolean(PackagesUIPlugin.PREF_SHOW_PROJECT_ROOT);
  +	}
  +	
  +	private boolean showAllProjects ()
  +	{
  +		return PackagesUIPlugin.getDefault().getPluginPreferences().getBoolean(PackagesUIPlugin.PREF_SHOW_ALL_PROJECTS);
  +	}
  +	
   	public void setFocus() {
   		// TODO Auto-generated method stub
   
  @@ -581,11 +597,20 @@
   	}
   	
   	public void packageNodeAdded(IPackageNode added) {
  -		if (!loading && !packageTree.getTree().isDisposed())
  +		if (!loading && !packageTree.getTree().isDisposed() && added.getProject().equals(currentProject))
   		{
   			pageBook.showPage(packageTree.getTree());
   			if (added.getParent() == null) {
  +				if (!showProjectRoot())
  +				{
   				packageTree.setInput(PackagesCore.getProjectPackages(added.getProject(), null));
  +				} else {
  +					if (showAllProjects())
  +					{
  +						packageTree.setInput(PackagesCore.getPackageProjects());
  +					}
  +				}
  +				
   				packageTree.refresh();
   			}
   			else {