[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/02/09 18:20:09

  Modified:    core/plugins/org.jboss.ide.eclipse.packages.ui/src/main/org/jboss/ide/eclipse/packages/ui/views 
                        ProjectPackagesView.java
  Log:
  the packages view main menu and context menu are attempting to use the same actions.. for now only the context menu works until we figure out how to solve the dilemma
  
  Revision  Changes    Path
  1.10      +38 -20    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.9
  retrieving revision 1.10
  diff -u -b -r1.9 -r1.10
  --- ProjectPackagesView.java	29 Jan 2007 20:53:28 -0000	1.9
  +++ ProjectPackagesView.java	9 Feb 2007 23:20:09 -0000	1.10
  @@ -2,7 +2,9 @@
   
   import org.eclipse.core.resources.IProject;
   import org.eclipse.jface.action.Action;
  +import org.eclipse.jface.action.ActionContributionItem;
   import org.eclipse.jface.action.GroupMarker;
  +import org.eclipse.jface.action.IAction;
   import org.eclipse.jface.action.IContributionItem;
   import org.eclipse.jface.action.IMenuListener;
   import org.eclipse.jface.action.IMenuManager;
  @@ -256,8 +258,11 @@
   			}
   		});
   		
  -		Menu contextMenu = manager.createContextMenu(packageTree.getTree());
  -		packageTree.getTree().setMenu(contextMenu);
  +		Menu treeContextMenu = manager.createContextMenu(packageTree.getTree());
  +		packageTree.getTree().setMenu(treeContextMenu);
  +		
  +//		Menu emptyContextMenu = manager.createContextMenu(createPackageLink);
  +//		createPackageLink.setMenu(emptyContextMenu);
   	}
   	
   	public void projectSelected(final IProject project)
  @@ -301,26 +306,39 @@
   		newJARAction.setEnabled(true);
   	}
   
  -	private MenuManager createLinkMenuManager;
  -	private Menu createLinkMenu;
  -	
   	private void createPackagePressed ()
   	{
  -//		newJARAction.run();
  -		if (createLinkMenuManager == null)
  -		{
  -			createLinkMenuManager = new MenuManager();
  -			
  -			// Add the newPackageManager's contributions at the top level so we can avoid redundancy in the UI
  -			IContributionItem items[] = newPackageManager.getItems();
  -			for (int i = 0; i < items.length; i++)
  -			{
  -				createLinkMenuManager.add(items[i]);
  -			}
  -			createLinkMenu = createLinkMenuManager.createContextMenu(createPackageLink);
  -		}
  -		
  -		createLinkMenu.setVisible(true);
  +		newJARAction.run();
  +//		if (createLinkMenuManager == null)
  +//		{
  +//			createLinkMenuManager = new MenuManager();
  +//			createLinkMenuManager.setRemoveAllWhenShown(true);
  +//			
  +//			createLinkMenuManager.addMenuListener(new IMenuListener () {
  +//				public void menuAboutToShow(IMenuManager manager) {
  +//					//	Add the newPackageManager's contributions at the top level so we can avoid redundancy in the UI
  +//					createLinkMenuManager.add(newPackageContributions);
  +//					
  +//					IContributionItem items[] = newPackageManager.getItems();
  +//					for (int i = 0; i < items.length; i++)
  +//					{
  +//						if (items[i] instanceof ActionContributionItem)
  +//						{
  +//							IAction action = ((ActionContributionItem)items[i]).getAction();
  +//							createLinkMenuManager.add(action);
  +//						}
  +//						else if (items[i] instanceof Separator)
  +//						{
  +//							createLinkMenuManager.add(new Separator());
  +//						}
  +//					}
  +//				}
  +//			});
  +//			
  +//			createLinkMenu = createLinkMenuManager.createContextMenu(createPackageLink);
  +//		}
  +//		
  +//		createLinkMenu.setVisible(true);
   	}
   	
   	private void createFolder ()