[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/02 16:58:16

  Modified:    core/plugins/org.jboss.ide.eclipse.packages.ui/src/main/org/jboss/ide/eclipse/packages/ui/views 
                        ProjectPackagesView.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.24      +56 -45    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.23
  retrieving revision 1.24
  diff -u -b -r1.23 -r1.24
  --- ProjectPackagesView.java	2 Mar 2007 03:41:50 -0000	1.23
  +++ ProjectPackagesView.java	2 Mar 2007 21:58:16 -0000	1.24
  @@ -232,7 +232,7 @@
   		buildPackageAction = new BuildPackagesAction();
   		buildPackageAction.init(getViewSite().getWorkbenchWindow());
   		
  -		newPackageContributions = new GroupMarker(IWorkbenchActionConstants.MB_ADDITIONS);
  +		newPackageContributions = new GroupMarker(NEW_PACKAGE_ADDITIONS);
   	}
   	
   	private void createToolbar ()
  @@ -251,13 +251,14 @@
   		newPackageManager.add(new Separator());
   		newPackageManager.add(newPackageContributions);
   		
  -		IMenuManager manager = getViewSite().getActionBars().getMenuManager();
  -		
  -		manager.add(newPackageManager);
  +//		IMenuManager manager = getViewSite().getActionBars().getMenuManager();
  +//		manager.add(newPackageContributions);
  +//		
   	}
   	
   	public static final String NEW_PACKAGE_MENU_ID = "org.jboss.ide.eclipse.packages.ui.newPackageMenu";
   	public static final String NODE_CONTEXT_MENU_ID = "org.jboss.ide.eclipse.packages.ui.nodeContextMenu";
  +	public static final String NEW_PACKAGE_ADDITIONS = "newPackageAdditions";
   		
   	private Link createPackageLink;
   	
  @@ -270,8 +271,16 @@
   				IStructuredSelection selection = (IStructuredSelection) packageTree.getSelection();
   				if (selection != null && !selection.isEmpty())
   				{
  -					if (!(selection.getFirstElement() instanceof IPackageNode)) return;
  +					Object element = selection.getFirstElement();
  +					
  +					if (!(element instanceof IPackageNode || element instanceof PackagesContentProvider.ProjectWrapper)) return;
   					
  +					if (element instanceof PackagesContentProvider.ProjectWrapper)
  +					{
  +						newJARAction.setEnabled(true);
  +						manager.add(newPackageManager);
  +					}
  +					else {
   					IPackageNode node = (IPackageNode) selection.getFirstElement();
   					
   					if (node.getNodeType() == IPackageNode.TYPE_PACKAGE
  @@ -309,21 +318,19 @@
   					
   					addContextMenuContributions(node);
   				}
  -				else {
  +				} else {
   					manager.add(newPackageManager);
   				}
  -				
  -				GroupMarker additions = new GroupMarker(IWorkbenchActionConstants.MB_ADDITIONS);
  -				manager.add(additions);
  +//				GroupMarker additions = new GroupMarker(IWorkbenchActionConstants.MB_ADDITIONS);
  +//				manager.add(additions);
   			}
   		});
   		
   		Menu treeContextMenu = contextMenuManager.createContextMenu(packageTree.getTree());
   		packageTree.getTree().setMenu(treeContextMenu);
   		
  +//		getViewSite().registerContextMenu(NODE_CONTEXT_MENU_ID, contextMenuManager, packageTree);
   		getViewSite().registerContextMenu(NEW_PACKAGE_MENU_ID, newPackageManager, packageTree);
  -		getViewSite().registerContextMenu(NODE_CONTEXT_MENU_ID, contextMenuManager, packageTree);
  -		
   //		Menu emptyContextMenu = manager.createContextMenu(createPackageLink);
   //		createPackageLink.setMenu(emptyContextMenu);
   	}
  @@ -387,7 +394,7 @@
   					
   					IPackage packages[] = PackagesCore.getProjectPackages(project, loadingProgress);
   					
  -					if (packages == null) {
  +					if (packages == null || packages.length == 0) {
   						showCreatePackageLink();
   					}
   					
  @@ -664,4 +671,8 @@
   	public IStructuredSelection getSelection() {
   		return (IStructuredSelection)packageTree.getSelection();
   	}
  +	
  +	public void dispose() {
  +		ProjectSelectionService.instance().removeProjectSelectionListener(this);
  +	}
   }