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

[Marshall Culpepper]

  User: mculpepper
  Date: 07/03/02 16:58:16

  Modified:    core/plugins/org.jboss.ide.eclipse.packages.ui/src/main/org/jboss/ide/eclipse/packages/ui/providers  
                        PackagesLabelProvider.java
                        PackagesContentProvider.java
  Log:
  context menus should be working 100% again (removed the view menu for the time being until we can figure out how to add a single menu manager to  multiple parents). also added "New Package" menu to project nodes shown in the view (wrapped by ProjectWrapper objects so as not to pull in the full contributions of the entire workbench)
  
  Revision  Changes    Path
  1.7       +3 -4      jbosside/core/plugins/org.jboss.ide.eclipse.packages.ui/src/main/org/jboss/ide/eclipse/packages/ui/providers/PackagesLabelProvider.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: PackagesLabelProvider.java
  ===================================================================
  RCS file: /cvsroot/jboss/jbosside/core/plugins/org.jboss.ide.eclipse.packages.ui/src/main/org/jboss/ide/eclipse/packages/ui/providers/PackagesLabelProvider.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -b -r1.6 -r1.7
  --- PackagesLabelProvider.java	2 Mar 2007 05:28:52 -0000	1.6
  +++ PackagesLabelProvider.java	2 Mar 2007 21:58:16 -0000	1.7
  @@ -1,6 +1,5 @@
   package org.jboss.ide.eclipse.packages.ui.providers;
   
  -import org.eclipse.core.resources.IProject;
   import org.eclipse.jface.viewers.ILabelProvider;
   import org.eclipse.jface.viewers.ILabelProviderListener;
   import org.eclipse.swt.graphics.Image;
  @@ -39,7 +38,7 @@
   	}
   	
   	private Image internalGetImage(Object element) {
  -		if (element instanceof IProject)
  +		if (element instanceof PackagesContentProvider.ProjectWrapper)
   		{
   			return PlatformUI.getWorkbench().getSharedImages().getImage(IDE.SharedImages.IMG_OBJ_PROJECT);
   		}
  @@ -95,9 +94,9 @@
   	}
   
   	private String internalGetText(Object element) {
  -		if (element instanceof IProject)
  +		if (element instanceof PackagesContentProvider.ProjectWrapper)
   		{
  -			return ((IProject)element).getName();
  +			return ((PackagesContentProvider.ProjectWrapper)element).project.getName();
   		}
   		else if (element instanceof IPackageNode)
   		{
  
  
  
  1.5       +27 -3     jbosside/core/plugins/org.jboss.ide.eclipse.packages.ui/src/main/org/jboss/ide/eclipse/packages/ui/providers/PackagesContentProvider.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: PackagesContentProvider.java
  ===================================================================
  RCS file: /cvsroot/jboss/jbosside/core/plugins/org.jboss.ide.eclipse.packages.ui/src/main/org/jboss/ide/eclipse/packages/ui/providers/PackagesContentProvider.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -b -r1.4 -r1.5
  --- PackagesContentProvider.java	2 Mar 2007 03:41:50 -0000	1.4
  +++ PackagesContentProvider.java	2 Mar 2007 21:58:16 -0000	1.5
  @@ -29,6 +29,17 @@
   		return PackagesUIPlugin.getDefault().getPluginPreferences().getBoolean(PackagesUIPlugin.PREF_SHOW_PROJECT_ROOT);
   	}
   	
  +	public static class ProjectWrapper {
  +		public IProject project;
  +		public boolean equals(Object obj) {
  +			if (obj instanceof IProject)
  +			{
  +				return project.equals(obj);
  +			}
  +			return this == obj;
  +		}
  +	}
  +	
   	public static class FileSetProperty {
   		private IPackageFileSet fileset;
   		private String name;
  @@ -84,9 +95,9 @@
   	}
   	
   	public Object[] getChildren(Object parentElement) {
  -		if (parentElement instanceof IProject)
  +		if (parentElement instanceof ProjectWrapper)
   		{
  -			return PackagesCore.getProjectPackages((IProject)parentElement, null);
  +			return PackagesCore.getProjectPackages(((ProjectWrapper)parentElement).project, null);
   		}
   		else if (parentElement instanceof IPackageFileSet)
   		{
  @@ -122,7 +133,7 @@
   	}
   
   	public boolean hasChildren(Object element) {
  -		if (element instanceof IProject)
  +		if (element instanceof ProjectWrapper)
   		{
   			return true;
   		}
  @@ -139,6 +150,19 @@
   	}
   
   	public Object[] getElements(Object inputElement) {
  +		
  +		if (inputElement instanceof IProject[])
  +		{
  +			IProject[] projects = (IProject[]) inputElement;
  +			ProjectWrapper wrappers[] = new ProjectWrapper[projects.length];
  +			for (int i = 0; i < projects.length; i++)
  +			{
  +				wrappers[i] = new ProjectWrapper();
  +				wrappers[i].project = projects[i];
  +			}
  +			return wrappers;
  +		}
  +		
   		return (Object[]) inputElement;
   	}