Attachment 138602 Details for Bug 279132 – Patch for menu items disability and visibility

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

[patch] Patch for menu items disability and visibility

menuBarItemVisibility (text/plain), 4.45 KB, created by Holger Staudacher

on 2009-06-08 15:35:16 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Holger Staudacher

Created: 2009-06-08 15:35:16 EDT

Size: 4.45 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.rap.design.example
>Index: src/org/eclipse/rap/internal/design/example/business/popups/MenuBarPopup.java
>===================================================================
>RCS file: /cvsroot/rt/org.eclipse.rap/runtime.ui/org.eclipse.rap.design.example/src/org/eclipse/rap/internal/design/example/business/popups/MenuBarPopup.java,v
>retrieving revision 1.1
>diff -u -r1.1 MenuBarPopup.java
>--- src/org/eclipse/rap/internal/design/example/business/popups/MenuBarPopup.java	28 May 2009 13:18:24 -0000	1.1
>+++ src/org/eclipse/rap/internal/design/example/business/popups/MenuBarPopup.java	8 Jun 2009 19:33:12 -0000
>@@ -14,6 +14,7 @@
> 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;
>@@ -118,21 +119,23 @@
>     
>     for( int i = 0; i < items.length; i++ ) {
>       IContributionItem item = items[ i ];
>-      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 );
>+      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 );
>+        }
>       }
>     }
> 
>@@ -266,24 +269,26 @@
>     MenuItem[] menuItems = menu.getItems();
>     for( int j = 0; j < menuItems.length; j++ ) {
>       final MenuItem item = menuItems[ j ];
>-      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 );
>-        }
>-      } );
>+      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 );
>+          }
>+        } );
>+      }
>     }
>     
>   }

Actions: View | Diff

Attachments on bug 279132: 138602 | 138705 | 139187