Attachment 195768 Details for Bug 340565 – CompoundContributionItem patch v1

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

[patch] CompoundContributionItem patch v1

bug340565-patch-v1.txt (text/plain), 2.52 KB, created by Remy Suen

on 2011-05-16 13:36:22 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Remy Suen

Created: 2011-05-16 13:36:22 EDT

Size: 2.52 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.ui.workbench
>Index: Eclipse UI/org/eclipse/ui/actions/CompoundContributionItem.java
>===================================================================
>RCS file: /cvsroot/eclipse/e4/org.eclipse.e4.compatibility/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/actions/CompoundContributionItem.java,v
>retrieving revision 1.2
>diff -u -r1.2 CompoundContributionItem.java
>--- Eclipse UI/org/eclipse/ui/actions/CompoundContributionItem.java	12 Jul 2010 14:22:34 -0000	1.2
>+++ Eclipse UI/org/eclipse/ui/actions/CompoundContributionItem.java	16 May 2011 17:31:41 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2004, 2009 IBM Corporation and others.
>+ * Copyright (c) 2004, 2011 IBM Corporation and others.
>  * All rights reserved. This program and the accompanying materials
>  * are made available under the terms of the Eclipse Public License v1.0
>  * which accompanies this distribution, and is available at
>@@ -15,9 +15,7 @@
> import org.eclipse.jface.action.IContributionManager;
> import org.eclipse.jface.action.IMenuListener;
> import org.eclipse.jface.action.IMenuManager;
>-import org.eclipse.swt.SWT;
> import org.eclipse.swt.widgets.Menu;
>-import org.eclipse.swt.widgets.MenuItem;
> 
> /**
>  * A compound contribution is a contribution item consisting of a
>@@ -27,12 +25,9 @@
>  */
> public abstract class CompoundContributionItem extends ContributionItem {
> 
>-    private boolean dirty = true;
>-
>     private IMenuListener menuListener = new IMenuListener() {
>         public void menuAboutToShow(IMenuManager manager) {
>             manager.markDirty();
>-            dirty = true;
>         }
>     };
>     
>@@ -61,11 +56,6 @@
>         if (index == -1) {
> 			index = menu.getItemCount();
> 		}
>-        if (!dirty && menu.getParentItem() != null) {
>-            // insert a dummy item so that the parent item is not disabled
>-            new MenuItem(menu, SWT.NONE, index);
>-            return;
>-        }
>         
>         IContributionItem[] items = getContributionItemsToFill();
> 		if (index > menu.getItemCount()) {
>@@ -81,7 +71,6 @@
>             int numAdded = newItemCount - oldItemCount;
>             index += numAdded;
>         }
>-        dirty = false;
>     }
>     
>     /**
>@@ -109,7 +98,7 @@
>      * @see org.eclipse.jface.action.ContributionItem#isDirty()
>      */
>     public boolean isDirty() {
>-        return dirty;
>+		return true;
>     }
>     
>     /* (non-Javadoc)

Actions: View | Diff

Attachments on bug 340565: 195768