Attachment #196446 for bug #325768

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




 * @generated
 */
public interface MHandledToolItem extends MToolItem, MHandledItem {
	/**
	 * Returns the value of the '<em><b>Contribution Item</b></em>' attribute.
	 * <!-- begin-user-doc -->
	 * <p>
	 * If the meaning of the '<em>Contribution Item</em>' attribute isn't clear,
	 * there really should be more of a description here...
	 * </p>
	 * <!-- end-user-doc -->
	 * @return the value of the '<em>Contribution Item</em>' attribute.
	 * @see #setContributionItem(Object)
	 * @model transient="true"
	 * @generated
	 */
	Object getContributionItem();

	/**
	 * Sets the value of the '{@link org.eclipse.e4.ui.model.application.ui.menu.MRenderedMenuItem#getContributionItem <em>Contribution Item</em>}' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @param value the new value of the '<em>Contribution Item</em>' attribute.
	 * @see #getContributionItem()
	 * @generated
	 */
	void setContributionItem(Object value);
} // MHandledToolItem




	 * @ordered
	 */
	protected EList<MParameter> parameters;
	
	/**
	 * The default value of the '{@link #getContributionItem() <em>Contribution Item</em>}' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @see #getContributionItem()
	 * @generated
	 * @ordered
	 */
	protected static final Object CONTRIBUTION_ITEM_EDEFAULT = null;
	
	/**
	 * The cached value of the '{@link #getContributionItem() <em>Contribution Item</em>}' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @see #getContributionItem()
	 * @generated
	 * @ordered
	 */
	protected Object contributionItem = CONTRIBUTION_ITEM_EDEFAULT;

	/**
	 * <!-- begin-user-doc -->

		}
		return super.eInverseRemove(otherEnd, featureID, msgs);
	}
	
	/**
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 */
	public Object getContributionItem() {
		return contributionItem;
	}

	/**
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 */
	public void setContributionItem(Object newContributionItem) {
		Object oldContributionItem = contributionItem;
		contributionItem = newContributionItem;
		if (eNotificationRequired())
			eNotify(new ENotificationImpl(this, Notification.SET, MenuPackageImpl.HANDLED_TOOL_ITEM__CONTRIBUTION_MANAGER, oldContributionItem, contributionItem));
	}

	/**
	 * <!-- begin-user-doc -->

				return getWbCommand();
			case MenuPackageImpl.HANDLED_TOOL_ITEM__PARAMETERS:
				return getParameters();
			case MenuPackageImpl.HANDLED_TOOL_ITEM__CONTRIBUTION_MANAGER:
				return getContributionItem();
		}
		return super.eGet(featureID, resolve, coreType);
	}

				getParameters().clear();
				getParameters().addAll((Collection<? extends MParameter>)newValue);
				return;
			case MenuPackageImpl.HANDLED_TOOL_ITEM__CONTRIBUTION_MANAGER:
				setContributionItem(newValue);
				return;
		}
		super.eSet(featureID, newValue);
	}

			case MenuPackageImpl.HANDLED_TOOL_ITEM__PARAMETERS:
				getParameters().clear();
				return;
			case MenuPackageImpl.HANDLED_TOOL_ITEM__CONTRIBUTION_MANAGER:
				setContributionItem(CONTRIBUTION_ITEM_EDEFAULT);
				return;
		}
		super.eUnset(featureID);
	}

				return WB_COMMAND_EDEFAULT == null ? wbCommand != null : !WB_COMMAND_EDEFAULT.equals(wbCommand);
			case MenuPackageImpl.HANDLED_TOOL_ITEM__PARAMETERS:
				return parameters != null && !parameters.isEmpty();
			case MenuPackageImpl.HANDLED_TOOL_ITEM__CONTRIBUTION_MANAGER:
				return CONTRIBUTION_ITEM_EDEFAULT == null ? contributionItem != null : !CONTRIBUTION_ITEM_EDEFAULT.equals(contributionItem);
		}
		return super.eIsSet(featureID);
	}

Lines 3736-3741 Link Here

(-)src/org/eclipse/e4/ui/model/application/ui/menu/impl/MenuPackageImpl.java (-1 / +13 lines)
3736	* @ordered	3736	* @ordered
3737	*/	3737	*/
3738	public static final int HANDLED_TOOL_ITEM__PARAMETERS = TOOL_ITEM_FEATURE_COUNT + 2;	3738	public static final int HANDLED_TOOL_ITEM__PARAMETERS = TOOL_ITEM_FEATURE_COUNT + 2;
		3739
		3740	/**
		3741	* The feature id for the '<em><b>Contribution Manager</b></em>' attribute.
		3742	* <!-- begin-user-doc -->
		3743	* <!-- end-user-doc -->
		3744	* @generated
		3745	* @ordered
		3746	*/
		3747	public static final int HANDLED_TOOL_ITEM__CONTRIBUTION_MANAGER = TOOL_ITEM_FEATURE_COUNT + 3;
3739		3748
3740	/**	3749	/**
3741	* The number of structural features of the '<em>Handled Tool Item</em>' class.	3750	* The number of structural features of the '<em>Handled Tool Item</em>' class.
Lines 3744-3750 Link Here
3744	* @generated	3753	* @generated
3745	* @ordered	3754	* @ordered
3746	*/	3755	*/
3747	public static final int HANDLED_TOOL_ITEM_FEATURE_COUNT = TOOL_ITEM_FEATURE_COUNT + 3;	3756	public static final int HANDLED_TOOL_ITEM_FEATURE_COUNT = TOOL_ITEM_FEATURE_COUNT + 4;
		3757
		3758
3748		3759
3749	/**	3760	/**
3750	* The operation id for the '<em>Get Localized Accessibility Phrase</em>' operation.	3761	* The operation id for the '<em>Get Localized Accessibility Phrase</em>' operation.
Lines 7630-7635 Link Here
7630	toolControlEClass = createEClass(TOOL_CONTROL);	7641	toolControlEClass = createEClass(TOOL_CONTROL);
7631		7642
7632	handledToolItemEClass = createEClass(HANDLED_TOOL_ITEM);	7643	handledToolItemEClass = createEClass(HANDLED_TOOL_ITEM);
		7644	createEAttribute(handledToolItemEClass, HANDLED_TOOL_ITEM__CONTRIBUTION_MANAGER);
7633		7645
7634	directToolItemEClass = createEClass(DIRECT_TOOL_ITEM);	7646	directToolItemEClass = createEClass(DIRECT_TOOL_ITEM);
7635		7647

Lines 228-233 Link Here

(-)src/org/eclipse/e4/ui/workbench/renderers/swt/HandledContributionItem.java (+1 lines)
228	return;	228	return;
229	}	229	}
230	model.setEnabled(canExecuteItem());	230	model.setEnabled(canExecuteItem());
		231	// model.setSelected(canExecuteItem());
231	update();	232	update();
232	}	233	}
233		234

Lines 19-24 Link Here

(-)src/org/eclipse/e4/ui/workbench/renderers/swt/ToolBarManagerRenderer.java (+9 lines)
19	import javax.annotation.PreDestroy;	19	import javax.annotation.PreDestroy;
20	import javax.inject.Inject;	20	import javax.inject.Inject;
21	import org.eclipse.e4.core.contexts.ContextInjectionFactory;	21	import org.eclipse.e4.core.contexts.ContextInjectionFactory;
		22	import org.eclipse.e4.core.contexts.IContextFunction;
22	import org.eclipse.e4.core.contexts.IEclipseContext;	23	import org.eclipse.e4.core.contexts.IEclipseContext;
23	import org.eclipse.e4.core.contexts.RunAndTrack;	24	import org.eclipse.e4.core.contexts.RunAndTrack;
24	import org.eclipse.e4.core.services.events.IEventBroker;	25	import org.eclipse.e4.core.services.events.IEventBroker;
Lines 694-699 Link Here
694	if (ici != null) {	695	if (ici != null) {
695	return;	696	return;
696	}	697	}
		698	Object obj = itemModel.getContributionItem();
		699	if (obj instanceof IContextFunction) {
		700	final IEclipseContext lclContext = getContext(itemModel);
		701	lclContext.set("copiedItemModel", itemModel); //$NON-NLS-1$
		702	ici = (IContributionItem) ((IContextFunction) obj)
		703	.compute(lclContext);
		704	itemModel.setContributionItem(ici);
		705	}
697	final IEclipseContext lclContext = getContext(itemModel);	706	final IEclipseContext lclContext = getContext(itemModel);
698	HandledContributionItem ci = ContextInjectionFactory.make(	707	HandledContributionItem ci = ContextInjectionFactory.make(
699	HandledContributionItem.class, lclContext);	708	HandledContributionItem.class, lclContext);

Lines 58-63 Link Here

(-)Eclipse UI/org/eclipse/ui/internal/menus/MenuHelper.java (+34 lines)
58	import org.eclipse.jface.action.IMenuCreator;	58	import org.eclipse.jface.action.IMenuCreator;
59	import org.eclipse.jface.action.MenuManager;	59	import org.eclipse.jface.action.MenuManager;
60	import org.eclipse.jface.resource.ImageDescriptor;	60	import org.eclipse.jface.resource.ImageDescriptor;
		61	import org.eclipse.jface.util.IPropertyChangeListener;
		62	import org.eclipse.jface.util.PropertyChangeEvent;
61	import org.eclipse.swt.widgets.Control;	63	import org.eclipse.swt.widgets.Control;
62	import org.eclipse.swt.widgets.Menu;	64	import org.eclipse.swt.widgets.Menu;
63	import org.eclipse.ui.IActionDelegate;	65	import org.eclipse.ui.IActionDelegate;
Lines 475-480 Link Here
475	item.setType(ItemType.PUSH);	477	item.setType(ItemType.PUSH);
476	} else if (IWorkbenchRegistryConstants.STYLE_TOGGLE.equals(style)) {	478	} else if (IWorkbenchRegistryConstants.STYLE_TOGGLE.equals(style)) {
477	item.setType(ItemType.CHECK);	479	item.setType(ItemType.CHECK);
		480	IContextFunction generator = new ContextFunction() {
		481	@Override
		482	public Object compute(IEclipseContext context) {
		483	IWorkbenchWindow window = context.get(IWorkbenchWindow.class);
		484	if (window == null) {
		485	return null;
		486	}
		487	ActionDescriptor desc = new ActionDescriptor(element,
		488	ActionDescriptor.T_WORKBENCH, window);
		489	final PluginAction action = desc.getAction();
		490	final MHandledToolItem copiedToolItem = (MHandledToolItem) context
		491	.get("copiedItemModel"); //$NON-NLS-1$
		492	action.addPropertyChangeListener(new IPropertyChangeListener() {
		493
		494	public void propertyChange(PropertyChangeEvent event) {
		495	if (event.getProperty().equals("checked")) { //$NON-NLS-1$
		496	Boolean checkedValue = (Boolean) event.getNewValue();
		497	copiedToolItem.setSelected(checkedValue);
		498	}
		499	}
		500	});
		501	return new ActionContributionItem(action) {
		502	@Override
		503	public void dispose() {
		504	super.dispose();
		505	action.disposeDelegate();
		506	}
		507	};
		508	}
		509	};
		510	item.setContributionItem(generator);
		511	// return item;
478	} else if (IWorkbenchRegistryConstants.STYLE_RADIO.equals(style)) {	512	} else if (IWorkbenchRegistryConstants.STYLE_RADIO.equals(style)) {
479	item.setType(ItemType.RADIO);	513	item.setType(ItemType.RADIO);
480	} else if (IWorkbenchRegistryConstants.STYLE_PULLDOWN.equals(style)) {	514	} else if (IWorkbenchRegistryConstants.STYLE_PULLDOWN.equals(style)) {

Return to bug 325768