Attachment #138602 for bug #279132

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.




import org.eclipse.jface.action.IContributionItem;
import org.eclipse.jface.action.MenuManager;
import org.eclipse.jface.dialogs.PopupDialog;
import org.eclipse.rap.internal.design.example.business.CommandUtil;
import org.eclipse.rap.internal.design.example.business.builder.DummyBuilder;
import org.eclipse.rap.internal.design.example.business.builder.MenuBarPopupBilder;
import org.eclipse.rap.internal.design.example.business.layoutsets.MenuBarInitializer;

    
    for( int i = 0; i < items.length; i++ ) {
      IContributionItem item = items[ i ];
      if( item.isVisible() ) {
        if( item instanceof ActionContributionItem ) {
          // Actions
          ActionContributionItem actionItem = ( ActionContributionItem ) item;
          makeActionEntry( actionItem.getAction(), content );
        } else if( item instanceof MenuManager ) {
          // MenuManagers
          MenuManager manager = ( MenuManager ) item;
          makeMenuManagerEntry( manager, content );
        } else if( item instanceof CommandContributionItem ) {
          // Commands                
          CommandContributionItem command = ( CommandContributionItem ) item;
          makeCommandEntry( command, content );
        } else if( item instanceof ShowViewMenu ) {
          // ViewMenu
          makeViewEntries( content );
        }
      }
    }


    MenuItem[] menuItems = menu.getItems();
    for( int j = 0; j < menuItems.length; j++ ) {
      final MenuItem item = menuItems[ j ];
      if( command.isEnabled() && command.isVisible() ) {
        Button button = new Button( content, SWT.PUSH | SWT.FLAT );
        button.setData( WidgetUtil.CUSTOM_VARIANT, "menuBar" );
        button.setText( item.getText() );     
        button.addSelectionListener( new SelectionAdapter() {
          public void widgetSelected( SelectionEvent e ) {          
            Event ev = new Event();
            ev.widget = ( Button ) e.getSource();
            item.notifyListeners( SWT.Selection, ev );
            menu.dispose();
            destroyItem( item );          
            close();
          };
        } );
        content.addDisposeListener( new DisposeListener() {      
          public void widgetDisposed( DisposeEvent event ) {
            destroyItem( item );
          }
        } );
      }
    }
    
  }

Return to bug 279132

Lines 14-19 Link Here

(-)src/org/eclipse/rap/internal/design/example/business/popups/MenuBarPopup.java (-33 / +38 lines)
14	import org.eclipse.jface.action.IContributionItem;	14	import org.eclipse.jface.action.IContributionItem;
15	import org.eclipse.jface.action.MenuManager;	15	import org.eclipse.jface.action.MenuManager;
16	import org.eclipse.jface.dialogs.PopupDialog;	16	import org.eclipse.jface.dialogs.PopupDialog;
		17	import org.eclipse.rap.internal.design.example.business.CommandUtil;
17	import org.eclipse.rap.internal.design.example.business.builder.DummyBuilder;	18	import org.eclipse.rap.internal.design.example.business.builder.DummyBuilder;
18	import org.eclipse.rap.internal.design.example.business.builder.MenuBarPopupBilder;	19	import org.eclipse.rap.internal.design.example.business.builder.MenuBarPopupBilder;
19	import org.eclipse.rap.internal.design.example.business.layoutsets.MenuBarInitializer;	20	import org.eclipse.rap.internal.design.example.business.layoutsets.MenuBarInitializer;
Lines 118-138 Link Here
118		119
119	for( int i = 0; i < items.length; i++ ) {	120	for( int i = 0; i < items.length; i++ ) {
120	IContributionItem item = items[ i ];	121	IContributionItem item = items[ i ];
121	if( item instanceof ActionContributionItem ) {	122	if( item.isVisible() ) {
122	// Actions	123	if( item instanceof ActionContributionItem ) {
123	ActionContributionItem actionItem = ( ActionContributionItem ) item;	124	// Actions
124	makeActionEntry( actionItem.getAction(), content );	125	ActionContributionItem actionItem = ( ActionContributionItem ) item;
125	} else if( item instanceof MenuManager ) {	126	makeActionEntry( actionItem.getAction(), content );
126	// MenuManagers	127	} else if( item instanceof MenuManager ) {
127	MenuManager manager = ( MenuManager ) item;	128	// MenuManagers
128	makeMenuManagerEntry( manager, content );	129	MenuManager manager = ( MenuManager ) item;
129	} else if( item instanceof CommandContributionItem ) {	130	makeMenuManagerEntry( manager, content );
130	// Commands	131	} else if( item instanceof CommandContributionItem ) {
131	CommandContributionItem command = ( CommandContributionItem ) item;	132	// Commands
132	makeCommandEntry( command, content );	133	CommandContributionItem command = ( CommandContributionItem ) item;
133	} else if( item instanceof ShowViewMenu ) {	134	makeCommandEntry( command, content );
134	// ViewMenu	135	} else if( item instanceof ShowViewMenu ) {
135	makeViewEntries( content );	136	// ViewMenu
		137	makeViewEntries( content );
		138	}
136	}	139	}
137	}	140	}
138		141
Lines 266-289 Link Here
266	MenuItem[] menuItems = menu.getItems();	269	MenuItem[] menuItems = menu.getItems();
267	for( int j = 0; j < menuItems.length; j++ ) {	270	for( int j = 0; j < menuItems.length; j++ ) {
268	final MenuItem item = menuItems[ j ];	271	final MenuItem item = menuItems[ j ];
269	Button button = new Button( content, SWT.PUSH \| SWT.FLAT );	272	if( command.isEnabled() && command.isVisible() ) {
270	button.setData( WidgetUtil.CUSTOM_VARIANT, "menuBar" );	273	Button button = new Button( content, SWT.PUSH \| SWT.FLAT );
271	button.setText( item.getText() );	274	button.setData( WidgetUtil.CUSTOM_VARIANT, "menuBar" );
272	button.addSelectionListener( new SelectionAdapter() {	275	button.setText( item.getText() );
273	public void widgetSelected( SelectionEvent e ) {	276	button.addSelectionListener( new SelectionAdapter() {
274	Event ev = new Event();	277	public void widgetSelected( SelectionEvent e ) {
275	ev.widget = ( Button ) e.getSource();	278	Event ev = new Event();
276	item.notifyListeners( SWT.Selection, ev );	279	ev.widget = ( Button ) e.getSource();
277	menu.dispose();	280	item.notifyListeners( SWT.Selection, ev );
278	destroyItem( item );	281	menu.dispose();
279	close();	282	destroyItem( item );
280	};	283	close();
281	} );	284	};
282	content.addDisposeListener( new DisposeListener() {	285	} );
283	public void widgetDisposed( DisposeEvent event ) {	286	content.addDisposeListener( new DisposeListener() {
284	destroyItem( item );	287	public void widgetDisposed( DisposeEvent event ) {
285	}	288	destroyItem( item );
286	} );	289	}
		290	} );
		291	}
287	}	292	}
288		293
289	}	294	}