Attachment #186844 for bug #331260

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




<?xml version="1.0" encoding="ASCII"?>
<application:Application xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:application="http://www.eclipse.org/ui/2010/UIModel/application" xmlns:basic="http://www.eclipse.org/ui/2010/UIModel/application/ui/basic" xmlns:menu="http://www.eclipse.org/ui/2010/UIModel/application/ui/menu" xsi:schemaLocation="http://www.eclipse.org/ui/2010/UIModel/application/ui/basic http://www.eclipse.org/ui/2010/UIModel/application#//ui/basic http://www.eclipse.org/ui/2010/UIModel/application/ui/menu http://www.eclipse.org/ui/2010/UIModel/application#//ui/menu" xmi:id="_GRxcMXk5Ed-55voCTyIpVQ">
  <children xsi:type="basic:TrimmedWindow" xmi:id="_SeXUAe8EEd6FC9cDb6iV7g" elementId="_SeXUAe8EEd6FC9cDb6iV7g" label="%windowTitle" x="20" y="20" width="700" height="480">
    <children xsi:type="basic:PartSashContainer" xmi:id="_SeXUCu8EEd6FC9cDb6iV7g" elementId="_SeXUCu8EEd6FC9cDb6iV7g" horizontal="true">
      <children xsi:type="basic:PartStack" xmi:id="_SeXUC-8EEd6FC9cDb6iV7g" elementId="_SeXUC-8EEd6FC9cDb6iV7g" containerData="30">
        <children xsi:type="basic:Part" xmi:id="_SeXUDO8EEd6FC9cDb6iV7g" elementId="ContactsView" contributionURI="platform:/plugin/org.eclipse.e4.demo.contacts/org.eclipse.e4.demo.contacts.views.ListView" label="%contactsList" iconURI="platform:/plugin/org.eclipse.e4.demo.contacts/icons/silk/folder_user.png" tooltip="%contactsTooltip"/>
      </children>
      <children xsi:type="basic:PartStack" xmi:id="_SeXUDe8EEd6FC9cDb6iV7g" elementId="org.eclipse.e4.demo.contacts.partstacks.second" containerData="70">
        <children xsi:type="basic:Part" xmi:id="DetailsView" elementId="DetailsView" contributionURI="platform:/plugin/org.eclipse.e4.demo.contacts/org.eclipse.e4.demo.contacts.views.DetailsView" label="%partDetails" iconURI="platform:/plugin/org.eclipse.e4.demo.contacts/icons/silk/report_user.png" tooltip="%detailsTooltip"/>
      </children>
    </children>
    <mainMenu xmi:id="menu:org.eclipse.ui.main.menu" elementId="menu:org.eclipse.ui.main.menu">
      <children xsi:type="menu:Menu" xmi:id="_SeXUD-8EEd6FC9cDb6iV7g" elementId="_SeXUD-8EEd6FC9cDb6iV7g" label="%fileMenu">
        <children xsi:type="menu:HandledMenuItem" xmi:id="_SeXUEO8EEd6FC9cDb6iV7g" elementId="_SeXUEO8EEd6FC9cDb6iV7g" label="%menuLabelSave" iconURI="platform:/plugin/org.eclipse.e4.demo.contacts/icons/silk/disk.png" command="contacts.save"/>
        <children xsi:type="menu:HandledMenuItem" xmi:id="_SeXUEe8EEd6FC9cDb6iV7g" elementId="_SeXUEe8EEd6FC9cDb6iV7g" label="%menuLabelDelete" iconURI="platform:/plugin/org.eclipse.e4.demo.contacts/icons/silk/user_delete.png" command="contacts.delete"/>
        <children xsi:type="menu:DirectMenuItem" xmi:id="_SeXUEu8EEd6FC9cDb6iV7g" elementId="_SeXUEu8EEd6FC9cDb6iV7g" label="%menuLabelDirectExit" contributionURI="platform:/plugin/org.eclipse.e4.demo.contacts/org.eclipse.e4.demo.contacts.handlers.ExitHandler"/>
        <children xsi:type="menu:HandledMenuItem" xmi:id="_SeXUE-8EEd6FC9cDb6iV7g" elementId="_SeXUE-8EEd6FC9cDb6iV7g" label="%menuLabelExit" command="contacts.exit"/>
      </children>
    </mainMenu>
    <trimBars xmi:id="_SeXUAu8EEd6FC9cDb6iV7g" elementId="_SeXUAu8EEd6FC9cDb6iV7g">
      <children xsi:type="menu:ToolBar" xmi:id="toolbar:org.eclipse.ui.main.toolbar" elementId="toolbar:org.eclipse.ui.main.toolbar">
        <children xsi:type="menu:DirectToolItem" xmi:id="_SeXUBO8EEd6FC9cDb6iV7g" elementId="_SeXUBO8EEd6FC9cDb6iV7g" label="" iconURI="platform:/plugin/org.eclipse.e4.demo.contacts/icons/silk/disk.png" tooltip="%toolbarSaveTooltip" contributionURI="platform:/plugin/org.eclipse.e4.demo.contacts/org.eclipse.e4.demo.contacts.handlers.SaveHandler"/>
      </children>
    </trimBars>
  </children>

Lines 10-13 Link Here

(-)build.properties (-1 / +3 lines)
10	css/,\	10	css/,\
11	splash.bmp,\	11	splash.bmp,\
12	plugin_customization.ini,\	12	plugin_customization.ini,\
13	vcards/	13	vcards/,\
		14	plugin_ru.properties,\
		15	plugin.properties




 org.eclipse.e4.ui.bindings;bundle-version="0.9.0",
 org.eclipse.e4.ui.css.swt.theme;bundle-version="0.9.0",
 org.eclipse.e4.ui.css.swt;bundle-version="0.9.1",
 org.eclipse.e4.ui.di;bundle-version="0.9.0",
 org.eclipse.e4.core.services;bundle-version="0.9.1"
Bundle-ActivationPolicy: lazy
Bundle-Vendor: Eclipse.org
Import-Package: javax.annotation;version="1.0.0",
 javax.inject;version="1.0.0"
Bundle-Activator: org.eclipse.e4.demo.contacts.BundleActivatorImpl
Export-Package: org.eclipse.e4.demo.contacts.model
Bundle-Localization: plugin






###############################################################################
# Copyright (c) 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
# http://www.eclipse.org/legal/epl-v10.html
# 
# Contributors:
#     IBM Corporation - initial API and implementation
###############################################################################
fileMenu = &File
partDetails = Details
contactsList = Contacts List
menuLabelSave = &Save
menuLabelDelete = &Delete
menuLabelDirectExit = Direct E&xit
menuLabelExit = &Exit
windowTitle = e4 Contacts Demo
contactsTooltip = List of Contacts
detailsTooltip = Contact Details
toolbarSaveTooltip = Save




###############################################################################
# Copyright (c) 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
# http://www.eclipse.org/legal/epl-v10.html
# 
# Contributors:
#     IBM Corporation - initial API and implementation
###############################################################################
fileMenu = &\u0424\u0430\u0439\u043B
partDetails = \u041F\u043E\u0434\u0440\u043E\u0431\u043D\u043E
contactsList = \u041A\u043E\u043D\u0442\u0430\u043A\u0442\u044B
menuLabelSave = &\u0421\u043E\u0445\u0440\u0430\u043D\u0438\u0442\u044C
menuLabelDelete = &\u0423\u0434\u0430\u043B\u0438\u0442\u044C
menuLabelDirectExit = &\u0411\u044B\u0441\u0442\u0440\u044B\u0439 \u0432\u044B\u0445\u043E\u0434
menuLabelExit = &\u0412\u044B\u0445\u043E\u0434
windowTitle = e4 \u0417\u0430\u043F\u0438\u0441\u043D\u0430\u044F \u043A\u043D\u0438\u0436\u043A\u0430
contactsTooltip = \u0421\u043F\u0438\u0441\u043E\u043A \u043A\u043E\u043D\u0442\u0430\u043A\u0442\u043E\u0432
detailsTooltip = \u041F\u043E\u0434\u0440\u043E\u0431\u043D\u0430\u044F \u0438\u043D\u0444\u043E\u0440\u043C\u0430\u0446\u0438\u044F \u043E \u043A\u043E\u043D\u0442\u0430\u043A\u0442\u0435
toolbarSaveTooltip = \u0421\u043E\u0445\u0440\u0430\u043D\u0438\u0442\u044C





/*******************************************************************************
 * Copyright (c) 2010 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
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *******************************************************************************/
package org.eclipse.e4.demo.contacts.model.internal;

import org.eclipse.e4.core.services.translation.TranslationService;

public class BinaryTranslatorProvider extends TranslationService {

	@Override
	public String translate(String key, String contributorURI) {
		if (key == null)
			return null;
		char[] charArray = key.toCharArray();
		StringBuffer tmp = new StringBuffer();
		tmp.append("0x");
		for(int i = 0; i < charArray.length; i++) {
			int value = charArray[i];
			tmp.append(Integer.toHexString(value));
		}
		return tmp.toString();
	}

}




/*******************************************************************************
 * Copyright (c) 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
 * http://www.eclipse.org/legal/epl-v10.html
 * 
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *******************************************************************************/
package org.eclipse.e4.demo.contacts.model.internal;

import javax.inject.Inject;
import org.eclipse.e4.core.contexts.ContextInjectionFactory;
import org.eclipse.e4.core.contexts.IEclipseContext;
import org.eclipse.e4.core.services.translation.TranslationService;
import org.eclipse.e4.ui.model.application.MApplication;
import org.eclipse.e4.ui.workbench.lifecycle.ProcessRemovals;

public class ModelLifeCycleExtension {
	
	@Inject
	public ModelLifeCycleExtension() {
		// placeholder
	}

	@ProcessRemovals
	public void overrideTranslation(MApplication application) {
		IEclipseContext appContext = application.getContext();
		BinaryTranslatorProvider translationService = ContextInjectionFactory.make(BinaryTranslatorProvider.class, appContext);
		appContext.set(TranslationService.class, translationService);
	}

}

Lines 8-14 Link Here

(-)META-INF/MANIFEST.MF (-2 / +3 lines)
8	Bundle-Vendor: %providerName	8	Bundle-Vendor: %providerName
9	Bundle-Localization: plugin	9	Bundle-Localization: plugin
10	Bundle-RequiredExecutionEnvironment: J2SE-1.5	10	Bundle-RequiredExecutionEnvironment: J2SE-1.5
11	Export-Package: org.eclipse.e4.ui.model.application;	11	Export-Package: org.eclipse.e4.ui.model;x-friends:="org.eclipse.e4.ui.workbench,org.eclipse.e4.ui.workbench.swt,org.eclipse.ui.workbench",
		12	org.eclipse.e4.ui.model.application;
12	x-friends:="org.eclipse.e4.ui.workbench,	13	x-friends:="org.eclipse.e4.ui.workbench,
13	org.eclipse.e4.ui.workbench.addons.swt,	14	org.eclipse.e4.ui.workbench.addons.swt,
14	org.eclipse.e4.ui.workbench.renderers.swt,	15	org.eclipse.e4.ui.workbench.renderers.swt,
Lines 87-93 Link Here
87	org.eclipse.e4.ui.model.fragment;x-friends:="org.eclipse.e4.ui.workbench",	88	org.eclipse.e4.ui.model.fragment;x-friends:="org.eclipse.e4.ui.workbench",
88	org.eclipse.e4.ui.model.fragment.impl;x-friends:="org.eclipse.e4.ui.workbench",	89	org.eclipse.e4.ui.model.fragment.impl;x-friends:="org.eclipse.e4.ui.workbench",
89	org.eclipse.e4.ui.model.fragment.util;x-internal:=true,	90	org.eclipse.e4.ui.model.fragment.util;x-internal:=true,
90	org.eclipse.e4.ui.model.internal;x-internal:=true	91	org.eclipse.e4.ui.model.internal;x-friends:="org.eclipse.e4.ui.workbench"
91	Require-Bundle: org.eclipse.core.runtime,	92	Require-Bundle: org.eclipse.core.runtime,
92	org.eclipse.emf.ecore;visibility:=reexport,	93	org.eclipse.emf.ecore;visibility:=reexport,
93	org.eclipse.emf.ecore.xmi;visibility:=reexport,	94	org.eclipse.emf.ecore.xmi;visibility:=reexport,




          eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
    </eClassifiers>
    <eClassifiers xsi:type="ecore:EClass" name="UILabel" abstract="true" interface="true">
      <eOperations name="getLocalizedLabel" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
      <eOperations name="getLocalizedTooltip" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
      <eStructuralFeatures xsi:type="ecore:EAttribute" name="label" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
      <eStructuralFeatures xsi:type="ecore:EAttribute" name="iconURI" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
      <eStructuralFeatures xsi:type="ecore:EAttribute" name="tooltip" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
      <eStructuralFeatures xsi:type="ecore:EAttribute" name="localLabel" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
          transient="true"/>
      <eStructuralFeatures xsi:type="ecore:EAttribute" name="localTooltip" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
          transient="true"/>
      <eStructuralFeatures xsi:type="ecore:EAttribute" name="localImage" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"
          transient="true"/>
    </eClassifiers>
    <eClassifiers xsi:type="ecore:EClass" name="ElementContainer" abstract="true"
        eSuperTypes="#//ui/UIElement">




/*******************************************************************************
 * Copyright (c) 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
 * http://www.eclipse.org/legal/epl-v10.html
 * 
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *******************************************************************************/
package org.eclipse.e4.ui.model;

import org.eclipse.e4.core.contexts.IEclipseContext;
import org.eclipse.e4.core.services.translation.TranslationService;
import org.eclipse.e4.ui.model.application.MApplicationElement;
import org.eclipse.e4.ui.model.application.ui.MUIElement;
import org.eclipse.e4.ui.model.application.ui.MUILabel;
import org.eclipse.e4.ui.model.internal.ModelUtils;

/**
 * This class provides set of utility method that can be useful in typical
 * localization scenarios.
 */
final public class LocalizationHelper {
	
	private LocalizationHelper() {
		// prevents instantiation
	}
	
	/**
	 * Returns localized label for the specified element using locale information 
	 * from its context.
	 * @param element the element
	 * @return localized element's label, or <code>null</code> if no label can be found
	 */
	public static String getLocalizedLabel(MUIElement element) {
		if (!(element instanceof MUILabel))
			return null;
		String key = ((MUILabel)element).getLabel();
		if (key == null)
			return null;
		return getLocalized(key, element);
	}

	/**
	 * Returns localized tooltip for the specified element using locale information 
	 * from its context.
	 * @param element the element
	 * @return localized element's tooltip, or <code>null</code> if no tooltip can be found
	 */
	public static String getLocalizedTooltip(MUIElement element) {
		if (!(element instanceof MUILabel))
			return null;
		String key = ((MUILabel)element).getTooltip();
		if (key == null)
			return null;
		return getLocalized(key, element);
	}

	/**
	 * Returns localized string for the key using locale information specified
	 * in the element's context.
	 * <p>
	 * This method may return <code>null</code> if the context can not be found
	 * for the model element.
	 * </p>
	 * @param key the key
	 * @param element the model element
	 * @return localized key, or <code>null</code> if context information can not
	 * be found for the model element
	 */
	public static String getLocalized(String key, MUIElement element) {
		IEclipseContext context = ModelUtils.getContainingContext(element);
		if (context == null)
			return null;
		return getLocalized(key, element, context);
	}

	/**
	 * Returns localized string for the key from the application element using translation 
	 * service from the context.
	 * @param key the key
	 * @param element the model element
	 * @param context the context
	 * @return localized key
	 */
	public static String getLocalized(String key, MApplicationElement element, IEclipseContext context) {
		TranslationService translation = context.get(TranslationService.class);
		if (translation == null)
			return key;
		return translation.translate(key, element.getContributorURI());
	}

}




	public static final int PART_DESCRIPTOR__TOOLTIP = ApplicationPackageImpl.APPLICATION_ELEMENT_FEATURE_COUNT + 2;

	/**
	 * The feature id for the '<em><b>Local Label</b></em>' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 * @ordered
	 */
	public static final int PART_DESCRIPTOR__LOCAL_LABEL = ApplicationPackageImpl.APPLICATION_ELEMENT_FEATURE_COUNT + 3;

	/**
	 * The feature id for the '<em><b>Local Tooltip</b></em>' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 * @ordered
	 */
	public static final int PART_DESCRIPTOR__LOCAL_TOOLTIP = ApplicationPackageImpl.APPLICATION_ELEMENT_FEATURE_COUNT + 4;

	/**
	 * The feature id for the '<em><b>Local Image</b></em>' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 * @ordered
	 */
	public static final int PART_DESCRIPTOR__LOCAL_IMAGE = ApplicationPackageImpl.APPLICATION_ELEMENT_FEATURE_COUNT + 5;

	/**
	 * The feature id for the '<em><b>Handlers</b></em>' containment reference list.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 * @ordered
	 */
	public static final int PART_DESCRIPTOR__HANDLERS = ApplicationPackageImpl.APPLICATION_ELEMENT_FEATURE_COUNT + 3;

	/**
	 * The feature id for the '<em><b>Binding Contexts</b></em>' attribute list.

	 * @generated
	 * @ordered
	 */
	public static final int PART_DESCRIPTOR__BINDING_CONTEXTS = ApplicationPackageImpl.APPLICATION_ELEMENT_FEATURE_COUNT + 4;

	/**
	 * The feature id for the '<em><b>Allow Multiple</b></em>' attribute.

	 * @generated
	 * @ordered
	 */
	public static final int PART_DESCRIPTOR__ALLOW_MULTIPLE = ApplicationPackageImpl.APPLICATION_ELEMENT_FEATURE_COUNT + 5;

	/**
	 * The feature id for the '<em><b>Category</b></em>' attribute.

	 * @generated
	 * @ordered
	 */
	public static final int PART_DESCRIPTOR__CATEGORY = ApplicationPackageImpl.APPLICATION_ELEMENT_FEATURE_COUNT + 6;

	/**
	 * The feature id for the '<em><b>Menus</b></em>' containment reference list.

	 * @generated
	 * @ordered
	 */
	public static final int PART_DESCRIPTOR__MENUS = ApplicationPackageImpl.APPLICATION_ELEMENT_FEATURE_COUNT + 7;

	/**
	 * The feature id for the '<em><b>Toolbar</b></em>' containment reference.

	 * @generated
	 * @ordered
	 */
	public static final int PART_DESCRIPTOR__TOOLBAR = ApplicationPackageImpl.APPLICATION_ELEMENT_FEATURE_COUNT + 8;

	/**
	 * The feature id for the '<em><b>Closeable</b></em>' attribute.

	 * @generated
	 * @ordered
	 */
	public static final int PART_DESCRIPTOR__CLOSEABLE = ApplicationPackageImpl.APPLICATION_ELEMENT_FEATURE_COUNT + 9;

	/**
	 * The feature id for the '<em><b>Dirtyable</b></em>' attribute.

	 * @generated
	 * @ordered
	 */
	public static final int PART_DESCRIPTOR__DIRTYABLE = ApplicationPackageImpl.APPLICATION_ELEMENT_FEATURE_COUNT + 10;

	/**
	 * The feature id for the '<em><b>Contribution URI</b></em>' attribute.

	 * @generated
	 * @ordered
	 */
	public static final int PART_DESCRIPTOR__CONTRIBUTION_URI = ApplicationPackageImpl.APPLICATION_ELEMENT_FEATURE_COUNT + 11;

	/**
	 * The feature id for the '<em><b>Description</b></em>' attribute.

	 * @generated
	 * @ordered
	 */
	public static final int PART_DESCRIPTOR__DESCRIPTION = ApplicationPackageImpl.APPLICATION_ELEMENT_FEATURE_COUNT + 12;

	/**
	 * The number of structural features of the '<em>Part Descriptor</em>' class.

	 * @generated
	 * @ordered
	 */
	public static final int PART_DESCRIPTOR_FEATURE_COUNT = ApplicationPackageImpl.APPLICATION_ELEMENT_FEATURE_COUNT + 13;

	/**
	 * The meta object id for the '{@link org.eclipse.e4.ui.model.application.descriptor.basic.MPartDescriptorContainer <em>Part Descriptor Container</em>}' class.




 *   <li>{@link org.eclipse.e4.ui.model.application.descriptor.basic.impl.PartDescriptorImpl#getLabel <em>Label</em>}</li>
 *   <li>{@link org.eclipse.e4.ui.model.application.descriptor.basic.impl.PartDescriptorImpl#getIconURI <em>Icon URI</em>}</li>
 *   <li>{@link org.eclipse.e4.ui.model.application.descriptor.basic.impl.PartDescriptorImpl#getTooltip <em>Tooltip</em>}</li>
 *   <li>{@link org.eclipse.e4.ui.model.application.descriptor.basic.impl.PartDescriptorImpl#getLocalLabel <em>Local Label</em>}</li>
 *   <li>{@link org.eclipse.e4.ui.model.application.descriptor.basic.impl.PartDescriptorImpl#getLocalTooltip <em>Local Tooltip</em>}</li>
 *   <li>{@link org.eclipse.e4.ui.model.application.descriptor.basic.impl.PartDescriptorImpl#getLocalImage <em>Local Image</em>}</li>
 *   <li>{@link org.eclipse.e4.ui.model.application.descriptor.basic.impl.PartDescriptorImpl#getHandlers <em>Handlers</em>}</li>
 *   <li>{@link org.eclipse.e4.ui.model.application.descriptor.basic.impl.PartDescriptorImpl#getBindingContexts <em>Binding Contexts</em>}</li>
 *   <li>{@link org.eclipse.e4.ui.model.application.descriptor.basic.impl.PartDescriptorImpl#isAllowMultiple <em>Allow Multiple</em>}</li>

	protected String tooltip = TOOLTIP_EDEFAULT;

	/**
	 * The default value of the '{@link #getLocalLabel() <em>Local Label</em>}' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @see #getLocalLabel()
	 * @generated
	 * @ordered
	 */
	protected static final String LOCAL_LABEL_EDEFAULT = null;

	/**
	 * The cached value of the '{@link #getLocalLabel() <em>Local Label</em>}' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @see #getLocalLabel()
	 * @generated
	 * @ordered
	 */
	protected String localLabel = LOCAL_LABEL_EDEFAULT;

	/**
	 * The default value of the '{@link #getLocalTooltip() <em>Local Tooltip</em>}' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @see #getLocalTooltip()
	 * @generated
	 * @ordered
	 */
	protected static final String LOCAL_TOOLTIP_EDEFAULT = null;

	/**
	 * The cached value of the '{@link #getLocalTooltip() <em>Local Tooltip</em>}' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @see #getLocalTooltip()
	 * @generated
	 * @ordered
	 */
	protected String localTooltip = LOCAL_TOOLTIP_EDEFAULT;

	/**
	 * The default value of the '{@link #getLocalImage() <em>Local Image</em>}' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @see #getLocalImage()
	 * @generated
	 * @ordered
	 */
	protected static final Object LOCAL_IMAGE_EDEFAULT = null;

	/**
	 * The cached value of the '{@link #getLocalImage() <em>Local Image</em>}' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @see #getLocalImage()
	 * @generated
	 * @ordered
	 */
	protected Object localImage = LOCAL_IMAGE_EDEFAULT;

	/**
	 * The cached value of the '{@link #getHandlers() <em>Handlers</em>}' containment reference list.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->

	 * <!-- end-user-doc -->
	 * @generated
	 */
	public String getLocalLabel() {
		return localLabel;
	}

	/**
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 */
	public void setLocalLabel(String newLocalLabel) {
		String oldLocalLabel = localLabel;
		localLabel = newLocalLabel;
		if (eNotificationRequired())
			eNotify(new ENotificationImpl(this, Notification.SET, BasicPackageImpl.PART_DESCRIPTOR__LOCAL_LABEL, oldLocalLabel, localLabel));
	}

	/**
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 */
	public String getLocalTooltip() {
		return localTooltip;
	}

	/**
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 */
	public void setLocalTooltip(String newLocalTooltip) {
		String oldLocalTooltip = localTooltip;
		localTooltip = newLocalTooltip;
		if (eNotificationRequired())
			eNotify(new ENotificationImpl(this, Notification.SET, BasicPackageImpl.PART_DESCRIPTOR__LOCAL_TOOLTIP, oldLocalTooltip, localTooltip));
	}

	/**
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 */
	public Object getLocalImage() {
		return localImage;
	}

	/**
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 */
	public void setLocalImage(Object newLocalImage) {
		Object oldLocalImage = localImage;
		localImage = newLocalImage;
		if (eNotificationRequired())
			eNotify(new ENotificationImpl(this, Notification.SET, BasicPackageImpl.PART_DESCRIPTOR__LOCAL_IMAGE, oldLocalImage, localImage));
	}

	/**
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 */
	public List<MHandler> getHandlers() {
		if (handlers == null) {
			handlers = new EObjectContainmentEList<MHandler>(MHandler.class, this, BasicPackageImpl.PART_DESCRIPTOR__HANDLERS);

	/**
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 */
	public String getLocalizedLabel() {
		throw new UnsupportedOperationException("Please use LocalizationHelper");
	}

	/**
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 */
	public String getLocalizedTooltip() {
		throw new UnsupportedOperationException("Please use LocalizationHelper");
	}

	/**
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 */
	@Override

				return getIconURI();
			case BasicPackageImpl.PART_DESCRIPTOR__TOOLTIP:
				return getTooltip();
			case BasicPackageImpl.PART_DESCRIPTOR__LOCAL_LABEL:
				return getLocalLabel();
			case BasicPackageImpl.PART_DESCRIPTOR__LOCAL_TOOLTIP:
				return getLocalTooltip();
			case BasicPackageImpl.PART_DESCRIPTOR__LOCAL_IMAGE:
				return getLocalImage();
			case BasicPackageImpl.PART_DESCRIPTOR__HANDLERS:
				return getHandlers();
			case BasicPackageImpl.PART_DESCRIPTOR__BINDING_CONTEXTS:

			case BasicPackageImpl.PART_DESCRIPTOR__TOOLTIP:
				setTooltip((String)newValue);
				return;
			case BasicPackageImpl.PART_DESCRIPTOR__LOCAL_LABEL:
				setLocalLabel((String)newValue);
				return;
			case BasicPackageImpl.PART_DESCRIPTOR__LOCAL_TOOLTIP:
				setLocalTooltip((String)newValue);
				return;
			case BasicPackageImpl.PART_DESCRIPTOR__LOCAL_IMAGE:
				setLocalImage(newValue);
				return;
			case BasicPackageImpl.PART_DESCRIPTOR__HANDLERS:
				getHandlers().clear();
				getHandlers().addAll((Collection<? extends MHandler>)newValue);

			case BasicPackageImpl.PART_DESCRIPTOR__TOOLTIP:
				setTooltip(TOOLTIP_EDEFAULT);
				return;
			case BasicPackageImpl.PART_DESCRIPTOR__LOCAL_LABEL:
				setLocalLabel(LOCAL_LABEL_EDEFAULT);
				return;
			case BasicPackageImpl.PART_DESCRIPTOR__LOCAL_TOOLTIP:
				setLocalTooltip(LOCAL_TOOLTIP_EDEFAULT);
				return;
			case BasicPackageImpl.PART_DESCRIPTOR__LOCAL_IMAGE:
				setLocalImage(LOCAL_IMAGE_EDEFAULT);
				return;
			case BasicPackageImpl.PART_DESCRIPTOR__HANDLERS:
				getHandlers().clear();
				return;

				return ICON_URI_EDEFAULT == null ? iconURI != null : !ICON_URI_EDEFAULT.equals(iconURI);
			case BasicPackageImpl.PART_DESCRIPTOR__TOOLTIP:
				return TOOLTIP_EDEFAULT == null ? tooltip != null : !TOOLTIP_EDEFAULT.equals(tooltip);
			case BasicPackageImpl.PART_DESCRIPTOR__LOCAL_LABEL:
				return LOCAL_LABEL_EDEFAULT == null ? localLabel != null : !LOCAL_LABEL_EDEFAULT.equals(localLabel);
			case BasicPackageImpl.PART_DESCRIPTOR__LOCAL_TOOLTIP:
				return LOCAL_TOOLTIP_EDEFAULT == null ? localTooltip != null : !LOCAL_TOOLTIP_EDEFAULT.equals(localTooltip);
			case BasicPackageImpl.PART_DESCRIPTOR__LOCAL_IMAGE:
				return LOCAL_IMAGE_EDEFAULT == null ? localImage != null : !LOCAL_IMAGE_EDEFAULT.equals(localImage);
			case BasicPackageImpl.PART_DESCRIPTOR__HANDLERS:
				return handlers != null && !handlers.isEmpty();
			case BasicPackageImpl.PART_DESCRIPTOR__BINDING_CONTEXTS:

				case BasicPackageImpl.PART_DESCRIPTOR__LABEL: return UiPackageImpl.UI_LABEL__LABEL;
				case BasicPackageImpl.PART_DESCRIPTOR__ICON_URI: return UiPackageImpl.UI_LABEL__ICON_URI;
				case BasicPackageImpl.PART_DESCRIPTOR__TOOLTIP: return UiPackageImpl.UI_LABEL__TOOLTIP;
				case BasicPackageImpl.PART_DESCRIPTOR__LOCAL_LABEL: return UiPackageImpl.UI_LABEL__LOCAL_LABEL;
				case BasicPackageImpl.PART_DESCRIPTOR__LOCAL_TOOLTIP: return UiPackageImpl.UI_LABEL__LOCAL_TOOLTIP;
				case BasicPackageImpl.PART_DESCRIPTOR__LOCAL_IMAGE: return UiPackageImpl.UI_LABEL__LOCAL_IMAGE;
				default: return -1;
			}
		}

				case UiPackageImpl.UI_LABEL__LABEL: return BasicPackageImpl.PART_DESCRIPTOR__LABEL;
				case UiPackageImpl.UI_LABEL__ICON_URI: return BasicPackageImpl.PART_DESCRIPTOR__ICON_URI;
				case UiPackageImpl.UI_LABEL__TOOLTIP: return BasicPackageImpl.PART_DESCRIPTOR__TOOLTIP;
				case UiPackageImpl.UI_LABEL__LOCAL_LABEL: return BasicPackageImpl.PART_DESCRIPTOR__LOCAL_LABEL;
				case UiPackageImpl.UI_LABEL__LOCAL_TOOLTIP: return BasicPackageImpl.PART_DESCRIPTOR__LOCAL_TOOLTIP;
				case UiPackageImpl.UI_LABEL__LOCAL_IMAGE: return BasicPackageImpl.PART_DESCRIPTOR__LOCAL_IMAGE;
				default: return -1;
			}
		}

		result.append(iconURI);
		result.append(", tooltip: "); //$NON-NLS-1$
		result.append(tooltip);
		result.append(", localLabel: "); //$NON-NLS-1$
		result.append(localLabel);
		result.append(", localTooltip: "); //$NON-NLS-1$
		result.append(localTooltip);
		result.append(", localImage: "); //$NON-NLS-1$
		result.append(localImage);
		result.append(", bindingContexts: "); //$NON-NLS-1$
		result.append(bindingContexts);
		result.append(", allowMultiple: "); //$NON-NLS-1$




 *   <li>{@link org.eclipse.e4.ui.model.application.ui.MUILabel#getLabel <em>Label</em>}</li>
 *   <li>{@link org.eclipse.e4.ui.model.application.ui.MUILabel#getIconURI <em>Icon URI</em>}</li>
 *   <li>{@link org.eclipse.e4.ui.model.application.ui.MUILabel#getTooltip <em>Tooltip</em>}</li>
 *   <li>{@link org.eclipse.e4.ui.model.application.ui.MUILabel#getLocalLabel <em>Local Label</em>}</li>
 *   <li>{@link org.eclipse.e4.ui.model.application.ui.MUILabel#getLocalTooltip <em>Local Tooltip</em>}</li>
 *   <li>{@link org.eclipse.e4.ui.model.application.ui.MUILabel#getLocalImage <em>Local Image</em>}</li>
 * </ul>
 * </p>
 *

	void setTooltip(String value);

	/**
	 * Returns the value of the '<em><b>Local Label</b></em>' attribute.
	 * <!-- begin-user-doc -->
	 * <p>
	 * If the meaning of the '<em>Local Label</em>' attribute isn't clear,
	 * there really should be more of a description here...
	 * </p>
	 * <!-- end-user-doc -->
	 * @return the value of the '<em>Local Label</em>' attribute.
	 * @see #setLocalLabel(String)
	 * @model transient="true"
	 * @generated
	 */
	String getLocalLabel();

	/**
	 * Sets the value of the '{@link org.eclipse.e4.ui.model.application.ui.MUILabel#getLocalLabel <em>Local Label</em>}' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @param value the new value of the '<em>Local Label</em>' attribute.
	 * @see #getLocalLabel()
	 * @generated
	 */
	void setLocalLabel(String value);

	/**
	 * Returns the value of the '<em><b>Local Tooltip</b></em>' attribute.
	 * <!-- begin-user-doc -->
	 * <p>
	 * If the meaning of the '<em>Local Tooltip</em>' attribute isn't clear,
	 * there really should be more of a description here...
	 * </p>
	 * <!-- end-user-doc -->
	 * @return the value of the '<em>Local Tooltip</em>' attribute.
	 * @see #setLocalTooltip(String)
	 * @model transient="true"
	 * @generated
	 */
	String getLocalTooltip();

	/**
	 * Sets the value of the '{@link org.eclipse.e4.ui.model.application.ui.MUILabel#getLocalTooltip <em>Local Tooltip</em>}' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @param value the new value of the '<em>Local Tooltip</em>' attribute.
	 * @see #getLocalTooltip()
	 * @generated
	 */
	void setLocalTooltip(String value);

	/**
	 * Returns the value of the '<em><b>Local Image</b></em>' attribute.
	 * <!-- begin-user-doc -->
	 * <p>
	 * If the meaning of the '<em>Local Image</em>' attribute isn't clear,
	 * there really should be more of a description here...
	 * </p>
	 * <!-- end-user-doc -->
	 * @model kind="operation"
	 * @see #setLocalImage(Object)
	 * @model transient="true"
	 * @generated
	 */
	String getLocalizedLabel();

	/**
	 * Sets the value of the '{@link org.eclipse.e4.ui.model.application.ui.MUILabel#getLocalImage <em>Local Image</em>}' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @model kind="operation"
	 * @see #getLocalImage()
	 * @generated
	 */
	String getLocalizedTooltip();

} // MUILabel




	public static final int PERSPECTIVE__TOOLTIP = UiPackageImpl.ELEMENT_CONTAINER_FEATURE_COUNT + 2;

	/**
	 * The feature id for the '<em><b>Local Label</b></em>' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 * @ordered
	 */
	public static final int PERSPECTIVE__LOCAL_LABEL = UiPackageImpl.ELEMENT_CONTAINER_FEATURE_COUNT + 3;

	/**
	 * The feature id for the '<em><b>Local Tooltip</b></em>' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 * @ordered
	 */
	public static final int PERSPECTIVE__LOCAL_TOOLTIP = UiPackageImpl.ELEMENT_CONTAINER_FEATURE_COUNT + 4;

	/**
	 * The feature id for the '<em><b>Local Image</b></em>' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 * @ordered
	 */
	public static final int PERSPECTIVE__LOCAL_IMAGE = UiPackageImpl.ELEMENT_CONTAINER_FEATURE_COUNT + 5;

	/**
	 * The feature id for the '<em><b>Context</b></em>' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 * @ordered
	 */
	public static final int PERSPECTIVE__CONTEXT = UiPackageImpl.ELEMENT_CONTAINER_FEATURE_COUNT + 3;

	/**
	 * The feature id for the '<em><b>Variables</b></em>' attribute list.

	 * @generated
	 * @ordered
	 */
	public static final int PERSPECTIVE__VARIABLES = UiPackageImpl.ELEMENT_CONTAINER_FEATURE_COUNT + 4;

	/**
	 * The feature id for the '<em><b>Properties</b></em>' map.

	 * @generated
	 * @ordered
	 */
	public static final int PERSPECTIVE__PROPERTIES = UiPackageImpl.ELEMENT_CONTAINER_FEATURE_COUNT + 5;

	/**
	 * The feature id for the '<em><b>Windows</b></em>' containment reference list.

	 * @generated
	 * @ordered
	 */
	public static final int PERSPECTIVE__WINDOWS = UiPackageImpl.ELEMENT_CONTAINER_FEATURE_COUNT + 6;

	/**
	 * The number of structural features of the '<em>Perspective</em>' class.

	 * @generated
	 * @ordered
	 */
	public static final int PERSPECTIVE_FEATURE_COUNT = UiPackageImpl.ELEMENT_CONTAINER_FEATURE_COUNT + 7;

	/**
	 * The meta object id for the '{@link org.eclipse.e4.ui.model.application.ui.advanced.impl.PerspectiveStackImpl <em>Perspective Stack</em>}' class.

	public static final int AREA__TOOLTIP = BasicPackageImpl.PART_SASH_CONTAINER_FEATURE_COUNT + 2;

	/**
	 * The feature id for the '<em><b>Local Label</b></em>' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 * @ordered
	 */
	public static final int AREA__LOCAL_LABEL = BasicPackageImpl.PART_SASH_CONTAINER_FEATURE_COUNT + 3;

	/**
	 * The feature id for the '<em><b>Local Tooltip</b></em>' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 * @ordered
	 */
	public static final int AREA__LOCAL_TOOLTIP = BasicPackageImpl.PART_SASH_CONTAINER_FEATURE_COUNT + 4;

	/**
	 * The feature id for the '<em><b>Local Image</b></em>' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 * @ordered
	 */
	public static final int AREA__LOCAL_IMAGE = BasicPackageImpl.PART_SASH_CONTAINER_FEATURE_COUNT + 5;

	/**
	 * The number of structural features of the '<em>Area</em>' class.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 * @ordered
	 */
	public static final int AREA_FEATURE_COUNT = BasicPackageImpl.PART_SASH_CONTAINER_FEATURE_COUNT + 3;

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




 */
package org.eclipse.e4.ui.model.application.ui.advanced.impl;

import org.eclipse.e4.ui.model.LocalizationHelper;
import org.eclipse.e4.ui.model.application.ui.MUILabel;
import org.eclipse.e4.ui.model.application.ui.advanced.MArea;
import org.eclipse.e4.ui.model.application.ui.basic.impl.PartSashContainerImpl;

 *   <li>{@link org.eclipse.e4.ui.model.application.ui.advanced.impl.AreaImpl#getLabel <em>Label</em>}</li>
 *   <li>{@link org.eclipse.e4.ui.model.application.ui.advanced.impl.AreaImpl#getIconURI <em>Icon URI</em>}</li>
 *   <li>{@link org.eclipse.e4.ui.model.application.ui.advanced.impl.AreaImpl#getTooltip <em>Tooltip</em>}</li>
 *   <li>{@link org.eclipse.e4.ui.model.application.ui.advanced.impl.AreaImpl#getLocalLabel <em>Local Label</em>}</li>
 *   <li>{@link org.eclipse.e4.ui.model.application.ui.advanced.impl.AreaImpl#getLocalTooltip <em>Local Tooltip</em>}</li>
 *   <li>{@link org.eclipse.e4.ui.model.application.ui.advanced.impl.AreaImpl#getLocalImage <em>Local Image</em>}</li>
 * </ul>
 * </p>
 *

	protected String tooltip = TOOLTIP_EDEFAULT;

	/**
	 * The default value of the '{@link #getLocalLabel() <em>Local Label</em>}' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @see #getLocalLabel()
	 * @generated
	 * @ordered
	 */
	protected static final String LOCAL_LABEL_EDEFAULT = null;

	/**
	 * The cached value of the '{@link #getLocalLabel() <em>Local Label</em>}' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @see #getLocalLabel()
	 * @generated
	 * @ordered
	 */
	protected String localLabel = LOCAL_LABEL_EDEFAULT;

	/**
	 * The default value of the '{@link #getLocalTooltip() <em>Local Tooltip</em>}' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @see #getLocalTooltip()
	 * @generated
	 * @ordered
	 */
	protected static final String LOCAL_TOOLTIP_EDEFAULT = null;

	/**
	 * The cached value of the '{@link #getLocalTooltip() <em>Local Tooltip</em>}' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @see #getLocalTooltip()
	 * @generated
	 * @ordered
	 */
	protected String localTooltip = LOCAL_TOOLTIP_EDEFAULT;

	/**
	 * The default value of the '{@link #getLocalImage() <em>Local Image</em>}' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @see #getLocalImage()
	 * @generated
	 * @ordered
	 */
	protected static final Object LOCAL_IMAGE_EDEFAULT = null;

	/**
	 * The cached value of the '{@link #getLocalImage() <em>Local Image</em>}' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @see #getLocalImage()
	 * @generated
	 * @ordered
	 */
	protected Object localImage = LOCAL_IMAGE_EDEFAULT;

	/**
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated

	/**
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 */
	public String getLocalLabel() {
		return localLabel;
	}

	/**
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 */
	public void setLocalLabel(String newLocalLabel) {
		String oldLocalLabel = localLabel;
		localLabel = newLocalLabel;
		if (eNotificationRequired())
			eNotify(new ENotificationImpl(this, Notification.SET, AdvancedPackageImpl.AREA__LOCAL_LABEL, oldLocalLabel, localLabel));
	}

	/**
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 */
	public String getLocalTooltip() {
		return localTooltip;
	}

	/**
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 */
	public void setLocalTooltip(String newLocalTooltip) {
		String oldLocalTooltip = localTooltip;
		localTooltip = newLocalTooltip;
		if (eNotificationRequired())
			eNotify(new ENotificationImpl(this, Notification.SET, AdvancedPackageImpl.AREA__LOCAL_TOOLTIP, oldLocalTooltip, localTooltip));
	}

	/**
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 */
	public String getLocalizedLabel() {
		return LocalizationHelper.getLocalizedLabel(this);
	}

	/**
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 */
	public String getLocalizedTooltip() {
		return LocalizationHelper.getLocalizedTooltip(this);
		localImage = newLocalImage;
		if (eNotificationRequired())
			eNotify(new ENotificationImpl(this, Notification.SET, AdvancedPackageImpl.AREA__LOCAL_IMAGE, oldLocalImage, localImage));
	}

	/**

				return getIconURI();
			case AdvancedPackageImpl.AREA__TOOLTIP:
				return getTooltip();
			case AdvancedPackageImpl.AREA__LOCAL_LABEL:
				return getLocalLabel();
			case AdvancedPackageImpl.AREA__LOCAL_TOOLTIP:
				return getLocalTooltip();
			case AdvancedPackageImpl.AREA__LOCAL_IMAGE:
				return getLocalImage();
		}
		return super.eGet(featureID, resolve, coreType);
	}

			case AdvancedPackageImpl.AREA__TOOLTIP:
				setTooltip((String)newValue);
				return;
			case AdvancedPackageImpl.AREA__LOCAL_LABEL:
				setLocalLabel((String)newValue);
				return;
			case AdvancedPackageImpl.AREA__LOCAL_TOOLTIP:
				setLocalTooltip((String)newValue);
				return;
			case AdvancedPackageImpl.AREA__LOCAL_IMAGE:
				setLocalImage(newValue);
				return;
		}
		super.eSet(featureID, newValue);
	}

			case AdvancedPackageImpl.AREA__TOOLTIP:
				setTooltip(TOOLTIP_EDEFAULT);
				return;
			case AdvancedPackageImpl.AREA__LOCAL_LABEL:
				setLocalLabel(LOCAL_LABEL_EDEFAULT);
				return;
			case AdvancedPackageImpl.AREA__LOCAL_TOOLTIP:
				setLocalTooltip(LOCAL_TOOLTIP_EDEFAULT);
				return;
			case AdvancedPackageImpl.AREA__LOCAL_IMAGE:
				setLocalImage(LOCAL_IMAGE_EDEFAULT);
				return;
		}
		super.eUnset(featureID);
	}

				return ICON_URI_EDEFAULT == null ? iconURI != null : !ICON_URI_EDEFAULT.equals(iconURI);
			case AdvancedPackageImpl.AREA__TOOLTIP:
				return TOOLTIP_EDEFAULT == null ? tooltip != null : !TOOLTIP_EDEFAULT.equals(tooltip);
			case AdvancedPackageImpl.AREA__LOCAL_LABEL:
				return LOCAL_LABEL_EDEFAULT == null ? localLabel != null : !LOCAL_LABEL_EDEFAULT.equals(localLabel);
			case AdvancedPackageImpl.AREA__LOCAL_TOOLTIP:
				return LOCAL_TOOLTIP_EDEFAULT == null ? localTooltip != null : !LOCAL_TOOLTIP_EDEFAULT.equals(localTooltip);
			case AdvancedPackageImpl.AREA__LOCAL_IMAGE:
				return LOCAL_IMAGE_EDEFAULT == null ? localImage != null : !LOCAL_IMAGE_EDEFAULT.equals(localImage);
		}
		return super.eIsSet(featureID);
	}

				case AdvancedPackageImpl.AREA__LABEL: return UiPackageImpl.UI_LABEL__LABEL;
				case AdvancedPackageImpl.AREA__ICON_URI: return UiPackageImpl.UI_LABEL__ICON_URI;
				case AdvancedPackageImpl.AREA__TOOLTIP: return UiPackageImpl.UI_LABEL__TOOLTIP;
				case AdvancedPackageImpl.AREA__LOCAL_LABEL: return UiPackageImpl.UI_LABEL__LOCAL_LABEL;
				case AdvancedPackageImpl.AREA__LOCAL_TOOLTIP: return UiPackageImpl.UI_LABEL__LOCAL_TOOLTIP;
				case AdvancedPackageImpl.AREA__LOCAL_IMAGE: return UiPackageImpl.UI_LABEL__LOCAL_IMAGE;
				default: return -1;
			}
		}

				case UiPackageImpl.UI_LABEL__LABEL: return AdvancedPackageImpl.AREA__LABEL;
				case UiPackageImpl.UI_LABEL__ICON_URI: return AdvancedPackageImpl.AREA__ICON_URI;
				case UiPackageImpl.UI_LABEL__TOOLTIP: return AdvancedPackageImpl.AREA__TOOLTIP;
				case UiPackageImpl.UI_LABEL__LOCAL_LABEL: return AdvancedPackageImpl.AREA__LOCAL_LABEL;
				case UiPackageImpl.UI_LABEL__LOCAL_TOOLTIP: return AdvancedPackageImpl.AREA__LOCAL_TOOLTIP;
				case UiPackageImpl.UI_LABEL__LOCAL_IMAGE: return AdvancedPackageImpl.AREA__LOCAL_IMAGE;
				default: return -1;
			}
		}

		result.append(iconURI);
		result.append(", tooltip: "); //$NON-NLS-1$
		result.append(tooltip);
		result.append(", localLabel: "); //$NON-NLS-1$
		result.append(localLabel);
		result.append(", localTooltip: "); //$NON-NLS-1$
		result.append(localTooltip);
		result.append(", localImage: "); //$NON-NLS-1$
		result.append(localImage);
		result.append(')');
		return result.toString();
	}




import java.util.List;
import java.util.Map;
import org.eclipse.e4.core.contexts.IEclipseContext;
import org.eclipse.e4.ui.model.LocalizationHelper;
import org.eclipse.e4.ui.model.application.impl.ApplicationPackageImpl;
import org.eclipse.e4.ui.model.application.impl.StringToStringMapImpl;
import org.eclipse.e4.ui.model.application.ui.MContext;

 *   <li>{@link org.eclipse.e4.ui.model.application.ui.advanced.impl.PerspectiveImpl#getLabel <em>Label</em>}</li>
 *   <li>{@link org.eclipse.e4.ui.model.application.ui.advanced.impl.PerspectiveImpl#getIconURI <em>Icon URI</em>}</li>
 *   <li>{@link org.eclipse.e4.ui.model.application.ui.advanced.impl.PerspectiveImpl#getTooltip <em>Tooltip</em>}</li>
 *   <li>{@link org.eclipse.e4.ui.model.application.ui.advanced.impl.PerspectiveImpl#getLocalLabel <em>Local Label</em>}</li>
 *   <li>{@link org.eclipse.e4.ui.model.application.ui.advanced.impl.PerspectiveImpl#getLocalTooltip <em>Local Tooltip</em>}</li>
 *   <li>{@link org.eclipse.e4.ui.model.application.ui.advanced.impl.PerspectiveImpl#getLocalImage <em>Local Image</em>}</li>
 *   <li>{@link org.eclipse.e4.ui.model.application.ui.advanced.impl.PerspectiveImpl#getContext <em>Context</em>}</li>
 *   <li>{@link org.eclipse.e4.ui.model.application.ui.advanced.impl.PerspectiveImpl#getVariables <em>Variables</em>}</li>
 *   <li>{@link org.eclipse.e4.ui.model.application.ui.advanced.impl.PerspectiveImpl#getProperties <em>Properties</em>}</li>

	protected String tooltip = TOOLTIP_EDEFAULT;

	/**
	 * The default value of the '{@link #getLocalLabel() <em>Local Label</em>}' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @see #getLocalLabel()
	 * @generated
	 * @ordered
	 */
	protected static final String LOCAL_LABEL_EDEFAULT = null;

	/**
	 * The cached value of the '{@link #getLocalLabel() <em>Local Label</em>}' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @see #getLocalLabel()
	 * @generated
	 * @ordered
	 */
	protected String localLabel = LOCAL_LABEL_EDEFAULT;

	/**
	 * The default value of the '{@link #getLocalTooltip() <em>Local Tooltip</em>}' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @see #getLocalTooltip()
	 * @generated
	 * @ordered
	 */
	protected static final String LOCAL_TOOLTIP_EDEFAULT = null;

	/**
	 * The cached value of the '{@link #getLocalTooltip() <em>Local Tooltip</em>}' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @see #getLocalTooltip()
	 * @generated
	 * @ordered
	 */
	protected String localTooltip = LOCAL_TOOLTIP_EDEFAULT;

	/**
	 * The default value of the '{@link #getLocalImage() <em>Local Image</em>}' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @see #getLocalImage()
	 * @generated
	 * @ordered
	 */
	protected static final Object LOCAL_IMAGE_EDEFAULT = null;

	/**
	 * The cached value of the '{@link #getLocalImage() <em>Local Image</em>}' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @see #getLocalImage()
	 * @generated
	 * @ordered
	 */
	protected Object localImage = LOCAL_IMAGE_EDEFAULT;

	/**
	 * The default value of the '{@link #getContext() <em>Context</em>}' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->

	 * <!-- end-user-doc -->
	 * @generated
	 */
	public String getLocalLabel() {
		return localLabel;
	}

	/**
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 */
	public void setLocalLabel(String newLocalLabel) {
		String oldLocalLabel = localLabel;
		localLabel = newLocalLabel;
		if (eNotificationRequired())
			eNotify(new ENotificationImpl(this, Notification.SET, AdvancedPackageImpl.PERSPECTIVE__LOCAL_LABEL, oldLocalLabel, localLabel));
	}

	/**
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 */
	public String getLocalTooltip() {
		return localTooltip;
	}

	/**
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 */
	public void setLocalTooltip(String newLocalTooltip) {
		String oldLocalTooltip = localTooltip;
		localTooltip = newLocalTooltip;
		if (eNotificationRequired())
			eNotify(new ENotificationImpl(this, Notification.SET, AdvancedPackageImpl.PERSPECTIVE__LOCAL_TOOLTIP, oldLocalTooltip, localTooltip));
	}

	/**
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 */
	public Object getLocalImage() {
		return localImage;
	}

	/**
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 */
	public void setLocalImage(Object newLocalImage) {
		Object oldLocalImage = localImage;
		localImage = newLocalImage;
		if (eNotificationRequired())
			eNotify(new ENotificationImpl(this, Notification.SET, AdvancedPackageImpl.PERSPECTIVE__LOCAL_IMAGE, oldLocalImage, localImage));
	}

	/**
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 */
	public IEclipseContext getContext() {
		return context;
	}

	/**
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 */
	public String getLocalizedLabel() {
		return LocalizationHelper.getLocalizedLabel(this);		
	}

	/**
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 */
	public String getLocalizedTooltip() {
		return LocalizationHelper.getLocalizedTooltip(this);
	}

	/**
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 */
	@Override

				return getIconURI();
			case AdvancedPackageImpl.PERSPECTIVE__TOOLTIP:
				return getTooltip();
			case AdvancedPackageImpl.PERSPECTIVE__LOCAL_LABEL:
				return getLocalLabel();
			case AdvancedPackageImpl.PERSPECTIVE__LOCAL_TOOLTIP:
				return getLocalTooltip();
			case AdvancedPackageImpl.PERSPECTIVE__LOCAL_IMAGE:
				return getLocalImage();
			case AdvancedPackageImpl.PERSPECTIVE__CONTEXT:
				return getContext();
			case AdvancedPackageImpl.PERSPECTIVE__VARIABLES:

			case AdvancedPackageImpl.PERSPECTIVE__TOOLTIP:
				setTooltip((String)newValue);
				return;
			case AdvancedPackageImpl.PERSPECTIVE__LOCAL_LABEL:
				setLocalLabel((String)newValue);
				return;
			case AdvancedPackageImpl.PERSPECTIVE__LOCAL_TOOLTIP:
				setLocalTooltip((String)newValue);
				return;
			case AdvancedPackageImpl.PERSPECTIVE__LOCAL_IMAGE:
				setLocalImage(newValue);
				return;
			case AdvancedPackageImpl.PERSPECTIVE__CONTEXT:
				setContext((IEclipseContext)newValue);
				return;

			case AdvancedPackageImpl.PERSPECTIVE__TOOLTIP:
				setTooltip(TOOLTIP_EDEFAULT);
				return;
			case AdvancedPackageImpl.PERSPECTIVE__LOCAL_LABEL:
				setLocalLabel(LOCAL_LABEL_EDEFAULT);
				return;
			case AdvancedPackageImpl.PERSPECTIVE__LOCAL_TOOLTIP:
				setLocalTooltip(LOCAL_TOOLTIP_EDEFAULT);
				return;
			case AdvancedPackageImpl.PERSPECTIVE__LOCAL_IMAGE:
				setLocalImage(LOCAL_IMAGE_EDEFAULT);
				return;
			case AdvancedPackageImpl.PERSPECTIVE__CONTEXT:
				setContext(CONTEXT_EDEFAULT);
				return;

				return ICON_URI_EDEFAULT == null ? iconURI != null : !ICON_URI_EDEFAULT.equals(iconURI);
			case AdvancedPackageImpl.PERSPECTIVE__TOOLTIP:
				return TOOLTIP_EDEFAULT == null ? tooltip != null : !TOOLTIP_EDEFAULT.equals(tooltip);
			case AdvancedPackageImpl.PERSPECTIVE__LOCAL_LABEL:
				return LOCAL_LABEL_EDEFAULT == null ? localLabel != null : !LOCAL_LABEL_EDEFAULT.equals(localLabel);
			case AdvancedPackageImpl.PERSPECTIVE__LOCAL_TOOLTIP:
				return LOCAL_TOOLTIP_EDEFAULT == null ? localTooltip != null : !LOCAL_TOOLTIP_EDEFAULT.equals(localTooltip);
			case AdvancedPackageImpl.PERSPECTIVE__LOCAL_IMAGE:
				return LOCAL_IMAGE_EDEFAULT == null ? localImage != null : !LOCAL_IMAGE_EDEFAULT.equals(localImage);
			case AdvancedPackageImpl.PERSPECTIVE__CONTEXT:
				return CONTEXT_EDEFAULT == null ? context != null : !CONTEXT_EDEFAULT.equals(context);
			case AdvancedPackageImpl.PERSPECTIVE__VARIABLES:

				case AdvancedPackageImpl.PERSPECTIVE__LABEL: return UiPackageImpl.UI_LABEL__LABEL;
				case AdvancedPackageImpl.PERSPECTIVE__ICON_URI: return UiPackageImpl.UI_LABEL__ICON_URI;
				case AdvancedPackageImpl.PERSPECTIVE__TOOLTIP: return UiPackageImpl.UI_LABEL__TOOLTIP;
				case AdvancedPackageImpl.PERSPECTIVE__LOCAL_LABEL: return UiPackageImpl.UI_LABEL__LOCAL_LABEL;
				case AdvancedPackageImpl.PERSPECTIVE__LOCAL_TOOLTIP: return UiPackageImpl.UI_LABEL__LOCAL_TOOLTIP;
				case AdvancedPackageImpl.PERSPECTIVE__LOCAL_IMAGE: return UiPackageImpl.UI_LABEL__LOCAL_IMAGE;
				default: return -1;
			}
		}

				case UiPackageImpl.UI_LABEL__LABEL: return AdvancedPackageImpl.PERSPECTIVE__LABEL;
				case UiPackageImpl.UI_LABEL__ICON_URI: return AdvancedPackageImpl.PERSPECTIVE__ICON_URI;
				case UiPackageImpl.UI_LABEL__TOOLTIP: return AdvancedPackageImpl.PERSPECTIVE__TOOLTIP;
				case UiPackageImpl.UI_LABEL__LOCAL_LABEL: return AdvancedPackageImpl.PERSPECTIVE__LOCAL_LABEL;
				case UiPackageImpl.UI_LABEL__LOCAL_TOOLTIP: return AdvancedPackageImpl.PERSPECTIVE__LOCAL_TOOLTIP;
				case UiPackageImpl.UI_LABEL__LOCAL_IMAGE: return AdvancedPackageImpl.PERSPECTIVE__LOCAL_IMAGE;
				default: return -1;
			}
		}

		result.append(iconURI);
		result.append(", tooltip: "); //$NON-NLS-1$
		result.append(tooltip);
		result.append(", localLabel: "); //$NON-NLS-1$
		result.append(localLabel);
		result.append(", localTooltip: "); //$NON-NLS-1$
		result.append(localTooltip);
		result.append(", localImage: "); //$NON-NLS-1$
		result.append(localImage);
		result.append(", context: "); //$NON-NLS-1$
		result.append(context);
		result.append(", variables: "); //$NON-NLS-1$




	public static final int PART__TOOLTIP = UiPackageImpl.UI_ELEMENT_FEATURE_COUNT + 8;

	/**
	 * The feature id for the '<em><b>Local Label</b></em>' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 * @ordered
	 */
	public static final int PART__LOCAL_LABEL = UiPackageImpl.UI_ELEMENT_FEATURE_COUNT + 9;

	/**
	 * The feature id for the '<em><b>Local Tooltip</b></em>' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 * @ordered
	 */
	public static final int PART__LOCAL_TOOLTIP = UiPackageImpl.UI_ELEMENT_FEATURE_COUNT + 10;

	/**
	 * The feature id for the '<em><b>Local Image</b></em>' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 * @ordered
	 */
	public static final int PART__LOCAL_IMAGE = UiPackageImpl.UI_ELEMENT_FEATURE_COUNT + 11;

	/**
	 * The feature id for the '<em><b>Handlers</b></em>' containment reference list.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 * @ordered
	 */
	public static final int PART__HANDLERS = UiPackageImpl.UI_ELEMENT_FEATURE_COUNT + 9;

	/**
	 * The feature id for the '<em><b>Dirty</b></em>' attribute.

	 * @generated
	 * @ordered
	 */
	public static final int PART__DIRTY = UiPackageImpl.UI_ELEMENT_FEATURE_COUNT + 10;

	/**
	 * The feature id for the '<em><b>Binding Contexts</b></em>' attribute list.

	 * @generated
	 * @ordered
	 */
	public static final int PART__BINDING_CONTEXTS = UiPackageImpl.UI_ELEMENT_FEATURE_COUNT + 11;

	/**
	 * The feature id for the '<em><b>Menus</b></em>' containment reference list.

	 * @generated
	 * @ordered
	 */
	public static final int PART__MENUS = UiPackageImpl.UI_ELEMENT_FEATURE_COUNT + 12;

	/**
	 * The feature id for the '<em><b>Toolbar</b></em>' containment reference.

	 * @generated
	 * @ordered
	 */
	public static final int PART__TOOLBAR = UiPackageImpl.UI_ELEMENT_FEATURE_COUNT + 13;

	/**
	 * The feature id for the '<em><b>Closeable</b></em>' attribute.

	 * @generated
	 * @ordered
	 */
	public static final int PART__CLOSEABLE = UiPackageImpl.UI_ELEMENT_FEATURE_COUNT + 14;

	/**
	 * The feature id for the '<em><b>Description</b></em>' attribute.

	 * @generated
	 * @ordered
	 */
	public static final int PART__DESCRIPTION = UiPackageImpl.UI_ELEMENT_FEATURE_COUNT + 15;

	/**
	 * The number of structural features of the '<em>Part</em>' class.

	 * @generated
	 * @ordered
	 */
	public static final int PART_FEATURE_COUNT = UiPackageImpl.UI_ELEMENT_FEATURE_COUNT + 16;

	/**
	 * The feature id for the '<em><b>Element Id</b></em>' attribute.

	public static final int INPUT_PART__TOOLTIP = PART__TOOLTIP;

	/**
	 * The feature id for the '<em><b>Local Label</b></em>' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 * @ordered
	 */
	public static final int INPUT_PART__LOCAL_LABEL = PART__LOCAL_LABEL;

	/**
	 * The feature id for the '<em><b>Local Tooltip</b></em>' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 * @ordered
	 */
	public static final int INPUT_PART__LOCAL_TOOLTIP = PART__LOCAL_TOOLTIP;

	/**
	 * The feature id for the '<em><b>Local Image</b></em>' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 * @ordered
	 */
	public static final int INPUT_PART__LOCAL_IMAGE = PART__LOCAL_IMAGE;

	/**
	 * The feature id for the '<em><b>Handlers</b></em>' containment reference list.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->

	public static final int WINDOW__TOOLTIP = UiPackageImpl.ELEMENT_CONTAINER_FEATURE_COUNT + 2;

	/**
	 * The feature id for the '<em><b>Local Label</b></em>' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 * @ordered
	 */
	public static final int WINDOW__LOCAL_LABEL = UiPackageImpl.ELEMENT_CONTAINER_FEATURE_COUNT + 3;

	/**
	 * The feature id for the '<em><b>Local Tooltip</b></em>' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 * @ordered
	 */
	public static final int WINDOW__LOCAL_TOOLTIP = UiPackageImpl.ELEMENT_CONTAINER_FEATURE_COUNT + 4;

	/**
	 * The feature id for the '<em><b>Local Image</b></em>' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 * @ordered
	 */
	public static final int WINDOW__LOCAL_IMAGE = UiPackageImpl.ELEMENT_CONTAINER_FEATURE_COUNT + 5;

	/**
	 * The feature id for the '<em><b>Context</b></em>' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 * @ordered
	 */
	public static final int WINDOW__CONTEXT = UiPackageImpl.ELEMENT_CONTAINER_FEATURE_COUNT + 3;

	/**
	 * The feature id for the '<em><b>Variables</b></em>' attribute list.

	 * @generated
	 * @ordered
	 */
	public static final int WINDOW__VARIABLES = UiPackageImpl.ELEMENT_CONTAINER_FEATURE_COUNT + 4;

	/**
	 * The feature id for the '<em><b>Properties</b></em>' map.

	 * @generated
	 * @ordered
	 */
	public static final int WINDOW__PROPERTIES = UiPackageImpl.ELEMENT_CONTAINER_FEATURE_COUNT + 5;

	/**
	 * The feature id for the '<em><b>Handlers</b></em>' containment reference list.

	 * @generated
	 * @ordered
	 */
	public static final int WINDOW__HANDLERS = UiPackageImpl.ELEMENT_CONTAINER_FEATURE_COUNT + 6;

	/**
	 * The feature id for the '<em><b>Binding Contexts</b></em>' attribute list.

	 * @generated
	 * @ordered
	 */
	public static final int WINDOW__BINDING_CONTEXTS = UiPackageImpl.ELEMENT_CONTAINER_FEATURE_COUNT + 7;

	/**
	 * The feature id for the '<em><b>Main Menu</b></em>' containment reference.

	 * @generated
	 * @ordered
	 */
	public static final int WINDOW__MAIN_MENU = UiPackageImpl.ELEMENT_CONTAINER_FEATURE_COUNT + 8;

	/**
	 * The feature id for the '<em><b>X</b></em>' attribute.

	 * @generated
	 * @ordered
	 */
	public static final int WINDOW__X = UiPackageImpl.ELEMENT_CONTAINER_FEATURE_COUNT + 9;

	/**
	 * The feature id for the '<em><b>Y</b></em>' attribute.

	 * @generated
	 * @ordered
	 */
	public static final int WINDOW__Y = UiPackageImpl.ELEMENT_CONTAINER_FEATURE_COUNT + 10;

	/**
	 * The feature id for the '<em><b>Width</b></em>' attribute.

	 * @generated
	 * @ordered
	 */
	public static final int WINDOW__WIDTH = UiPackageImpl.ELEMENT_CONTAINER_FEATURE_COUNT + 11;

	/**
	 * The feature id for the '<em><b>Height</b></em>' attribute.

	 * @generated
	 * @ordered
	 */
	public static final int WINDOW__HEIGHT = UiPackageImpl.ELEMENT_CONTAINER_FEATURE_COUNT + 12;

	/**
	 * The feature id for the '<em><b>Windows</b></em>' containment reference list.

	 * @generated
	 * @ordered
	 */
	public static final int WINDOW__WINDOWS = UiPackageImpl.ELEMENT_CONTAINER_FEATURE_COUNT + 13;

	/**
	 * The feature id for the '<em><b>Shared Elements</b></em>' containment reference list.

	 * @generated
	 * @ordered
	 */
	public static final int WINDOW__SHARED_ELEMENTS = UiPackageImpl.ELEMENT_CONTAINER_FEATURE_COUNT + 14;

	/**
	 * The number of structural features of the '<em>Window</em>' class.

	 * @generated
	 * @ordered
	 */
	public static final int WINDOW_FEATURE_COUNT = UiPackageImpl.ELEMENT_CONTAINER_FEATURE_COUNT + 15;

	/**
	 * The feature id for the '<em><b>Element Id</b></em>' attribute.

	public static final int TRIMMED_WINDOW__TOOLTIP = WINDOW__TOOLTIP;

	/**
	 * The feature id for the '<em><b>Local Label</b></em>' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 * @ordered
	 */
	public static final int TRIMMED_WINDOW__LOCAL_LABEL = WINDOW__LOCAL_LABEL;

	/**
	 * The feature id for the '<em><b>Local Tooltip</b></em>' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 * @ordered
	 */
	public static final int TRIMMED_WINDOW__LOCAL_TOOLTIP = WINDOW__LOCAL_TOOLTIP;

	/**
	 * The feature id for the '<em><b>Local Image</b></em>' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 * @ordered
	 */
	public static final int TRIMMED_WINDOW__LOCAL_IMAGE = WINDOW__LOCAL_IMAGE;

	/**
	 * The feature id for the '<em><b>Context</b></em>' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->




import java.util.List;
import java.util.Map;
import org.eclipse.e4.core.contexts.IEclipseContext;
import org.eclipse.e4.ui.model.LocalizationHelper;
import org.eclipse.e4.ui.model.application.MContribution;
import org.eclipse.e4.ui.model.application.commands.MBindings;
import org.eclipse.e4.ui.model.application.commands.MHandler;

 *   <li>{@link org.eclipse.e4.ui.model.application.ui.basic.impl.PartImpl#getLabel <em>Label</em>}</li>
 *   <li>{@link org.eclipse.e4.ui.model.application.ui.basic.impl.PartImpl#getIconURI <em>Icon URI</em>}</li>
 *   <li>{@link org.eclipse.e4.ui.model.application.ui.basic.impl.PartImpl#getTooltip <em>Tooltip</em>}</li>
 *   <li>{@link org.eclipse.e4.ui.model.application.ui.basic.impl.PartImpl#getLocalLabel <em>Local Label</em>}</li>
 *   <li>{@link org.eclipse.e4.ui.model.application.ui.basic.impl.PartImpl#getLocalTooltip <em>Local Tooltip</em>}</li>
 *   <li>{@link org.eclipse.e4.ui.model.application.ui.basic.impl.PartImpl#getLocalImage <em>Local Image</em>}</li>
 *   <li>{@link org.eclipse.e4.ui.model.application.ui.basic.impl.PartImpl#getHandlers <em>Handlers</em>}</li>
 *   <li>{@link org.eclipse.e4.ui.model.application.ui.basic.impl.PartImpl#isDirty <em>Dirty</em>}</li>
 *   <li>{@link org.eclipse.e4.ui.model.application.ui.basic.impl.PartImpl#getBindingContexts <em>Binding Contexts</em>}</li>

	protected String tooltip = TOOLTIP_EDEFAULT;

	/**
	 * The default value of the '{@link #getLocalLabel() <em>Local Label</em>}' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @see #getLocalLabel()
	 * @generated
	 * @ordered
	 */
	protected static final String LOCAL_LABEL_EDEFAULT = null;

	/**
	 * The cached value of the '{@link #getLocalLabel() <em>Local Label</em>}' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @see #getLocalLabel()
	 * @generated
	 * @ordered
	 */
	protected String localLabel = LOCAL_LABEL_EDEFAULT;

	/**
	 * The default value of the '{@link #getLocalTooltip() <em>Local Tooltip</em>}' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @see #getLocalTooltip()
	 * @generated
	 * @ordered
	 */
	protected static final String LOCAL_TOOLTIP_EDEFAULT = null;

	/**
	 * The cached value of the '{@link #getLocalTooltip() <em>Local Tooltip</em>}' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @see #getLocalTooltip()
	 * @generated
	 * @ordered
	 */
	protected String localTooltip = LOCAL_TOOLTIP_EDEFAULT;

	/**
	 * The default value of the '{@link #getLocalImage() <em>Local Image</em>}' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @see #getLocalImage()
	 * @generated
	 * @ordered
	 */
	protected static final Object LOCAL_IMAGE_EDEFAULT = null;

	/**
	 * The cached value of the '{@link #getLocalImage() <em>Local Image</em>}' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @see #getLocalImage()
	 * @generated
	 * @ordered
	 */
	protected Object localImage = LOCAL_IMAGE_EDEFAULT;

	/**
	 * The cached value of the '{@link #getHandlers() <em>Handlers</em>}' containment reference list.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->

	 * <!-- end-user-doc -->
	 * @generated
	 */
	public String getLocalLabel() {
		return localLabel;
	}

	/**
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 */
	public void setLocalLabel(String newLocalLabel) {
		String oldLocalLabel = localLabel;
		localLabel = newLocalLabel;
		if (eNotificationRequired())
			eNotify(new ENotificationImpl(this, Notification.SET, BasicPackageImpl.PART__LOCAL_LABEL, oldLocalLabel, localLabel));
	}

	/**
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 */
	public String getLocalTooltip() {
		return localTooltip;
	}

	/**
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 */
	public void setLocalTooltip(String newLocalTooltip) {
		String oldLocalTooltip = localTooltip;
		localTooltip = newLocalTooltip;
		if (eNotificationRequired())
			eNotify(new ENotificationImpl(this, Notification.SET, BasicPackageImpl.PART__LOCAL_TOOLTIP, oldLocalTooltip, localTooltip));
	}

	/**
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 */
	public Object getLocalImage() {
		return localImage;
	}

	/**
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 */
	public void setLocalImage(Object newLocalImage) {
		Object oldLocalImage = localImage;
		localImage = newLocalImage;
		if (eNotificationRequired())
			eNotify(new ENotificationImpl(this, Notification.SET, BasicPackageImpl.PART__LOCAL_IMAGE, oldLocalImage, localImage));
	}

	/**
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 */
	public List<MHandler> getHandlers() {
		if (handlers == null) {
			handlers = new EObjectContainmentEList<MHandler>(MHandler.class, this, BasicPackageImpl.PART__HANDLERS);

	/**
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 */
	public String getLocalizedLabel() {
		return LocalizationHelper.getLocalizedLabel(this);		
	}

	/**
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 */
	public String getLocalizedTooltip() {
		return LocalizationHelper.getLocalizedTooltip(this);
	}

	/**
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 */
	@Override

				return getIconURI();
			case BasicPackageImpl.PART__TOOLTIP:
				return getTooltip();
			case BasicPackageImpl.PART__LOCAL_LABEL:
				return getLocalLabel();
			case BasicPackageImpl.PART__LOCAL_TOOLTIP:
				return getLocalTooltip();
			case BasicPackageImpl.PART__LOCAL_IMAGE:
				return getLocalImage();
			case BasicPackageImpl.PART__HANDLERS:
				return getHandlers();
			case BasicPackageImpl.PART__DIRTY:

			case BasicPackageImpl.PART__TOOLTIP:
				setTooltip((String)newValue);
				return;
			case BasicPackageImpl.PART__LOCAL_LABEL:
				setLocalLabel((String)newValue);
				return;
			case BasicPackageImpl.PART__LOCAL_TOOLTIP:
				setLocalTooltip((String)newValue);
				return;
			case BasicPackageImpl.PART__LOCAL_IMAGE:
				setLocalImage(newValue);
				return;
			case BasicPackageImpl.PART__HANDLERS:
				getHandlers().clear();
				getHandlers().addAll((Collection<? extends MHandler>)newValue);

			case BasicPackageImpl.PART__TOOLTIP:
				setTooltip(TOOLTIP_EDEFAULT);
				return;
			case BasicPackageImpl.PART__LOCAL_LABEL:
				setLocalLabel(LOCAL_LABEL_EDEFAULT);
				return;
			case BasicPackageImpl.PART__LOCAL_TOOLTIP:
				setLocalTooltip(LOCAL_TOOLTIP_EDEFAULT);
				return;
			case BasicPackageImpl.PART__LOCAL_IMAGE:
				setLocalImage(LOCAL_IMAGE_EDEFAULT);
				return;
			case BasicPackageImpl.PART__HANDLERS:
				getHandlers().clear();
				return;

				return ICON_URI_EDEFAULT == null ? iconURI != null : !ICON_URI_EDEFAULT.equals(iconURI);
			case BasicPackageImpl.PART__TOOLTIP:
				return TOOLTIP_EDEFAULT == null ? tooltip != null : !TOOLTIP_EDEFAULT.equals(tooltip);
			case BasicPackageImpl.PART__LOCAL_LABEL:
				return LOCAL_LABEL_EDEFAULT == null ? localLabel != null : !LOCAL_LABEL_EDEFAULT.equals(localLabel);
			case BasicPackageImpl.PART__LOCAL_TOOLTIP:
				return LOCAL_TOOLTIP_EDEFAULT == null ? localTooltip != null : !LOCAL_TOOLTIP_EDEFAULT.equals(localTooltip);
			case BasicPackageImpl.PART__LOCAL_IMAGE:
				return LOCAL_IMAGE_EDEFAULT == null ? localImage != null : !LOCAL_IMAGE_EDEFAULT.equals(localImage);
			case BasicPackageImpl.PART__HANDLERS:
				return handlers != null && !handlers.isEmpty();
			case BasicPackageImpl.PART__DIRTY:

				case BasicPackageImpl.PART__LABEL: return UiPackageImpl.UI_LABEL__LABEL;
				case BasicPackageImpl.PART__ICON_URI: return UiPackageImpl.UI_LABEL__ICON_URI;
				case BasicPackageImpl.PART__TOOLTIP: return UiPackageImpl.UI_LABEL__TOOLTIP;
				case BasicPackageImpl.PART__LOCAL_LABEL: return UiPackageImpl.UI_LABEL__LOCAL_LABEL;
				case BasicPackageImpl.PART__LOCAL_TOOLTIP: return UiPackageImpl.UI_LABEL__LOCAL_TOOLTIP;
				case BasicPackageImpl.PART__LOCAL_IMAGE: return UiPackageImpl.UI_LABEL__LOCAL_IMAGE;
				default: return -1;
			}
		}

				case UiPackageImpl.UI_LABEL__LABEL: return BasicPackageImpl.PART__LABEL;
				case UiPackageImpl.UI_LABEL__ICON_URI: return BasicPackageImpl.PART__ICON_URI;
				case UiPackageImpl.UI_LABEL__TOOLTIP: return BasicPackageImpl.PART__TOOLTIP;
				case UiPackageImpl.UI_LABEL__LOCAL_LABEL: return BasicPackageImpl.PART__LOCAL_LABEL;
				case UiPackageImpl.UI_LABEL__LOCAL_TOOLTIP: return BasicPackageImpl.PART__LOCAL_TOOLTIP;
				case UiPackageImpl.UI_LABEL__LOCAL_IMAGE: return BasicPackageImpl.PART__LOCAL_IMAGE;
				default: return -1;
			}
		}

		result.append(iconURI);
		result.append(", tooltip: "); //$NON-NLS-1$
		result.append(tooltip);
		result.append(", localLabel: "); //$NON-NLS-1$
		result.append(localLabel);
		result.append(", localTooltip: "); //$NON-NLS-1$
		result.append(localTooltip);
		result.append(", localImage: "); //$NON-NLS-1$
		result.append(localImage);
		result.append(", dirty: "); //$NON-NLS-1$
		result.append(dirty);
		result.append(", bindingContexts: "); //$NON-NLS-1$




import java.util.List;
import java.util.Map;
import org.eclipse.e4.core.contexts.IEclipseContext;
import org.eclipse.e4.ui.model.LocalizationHelper;
import org.eclipse.e4.ui.model.application.commands.MBindings;
import org.eclipse.e4.ui.model.application.commands.MHandler;
import org.eclipse.e4.ui.model.application.commands.MHandlerContainer;

 *   <li>{@link org.eclipse.e4.ui.model.application.ui.basic.impl.WindowImpl#getLabel <em>Label</em>}</li>
 *   <li>{@link org.eclipse.e4.ui.model.application.ui.basic.impl.WindowImpl#getIconURI <em>Icon URI</em>}</li>
 *   <li>{@link org.eclipse.e4.ui.model.application.ui.basic.impl.WindowImpl#getTooltip <em>Tooltip</em>}</li>
 *   <li>{@link org.eclipse.e4.ui.model.application.ui.basic.impl.WindowImpl#getLocalLabel <em>Local Label</em>}</li>
 *   <li>{@link org.eclipse.e4.ui.model.application.ui.basic.impl.WindowImpl#getLocalTooltip <em>Local Tooltip</em>}</li>
 *   <li>{@link org.eclipse.e4.ui.model.application.ui.basic.impl.WindowImpl#getLocalImage <em>Local Image</em>}</li>
 *   <li>{@link org.eclipse.e4.ui.model.application.ui.basic.impl.WindowImpl#getContext <em>Context</em>}</li>
 *   <li>{@link org.eclipse.e4.ui.model.application.ui.basic.impl.WindowImpl#getVariables <em>Variables</em>}</li>
 *   <li>{@link org.eclipse.e4.ui.model.application.ui.basic.impl.WindowImpl#getProperties <em>Properties</em>}</li>

	protected String tooltip = TOOLTIP_EDEFAULT;

	/**
	 * The default value of the '{@link #getLocalLabel() <em>Local Label</em>}' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @see #getLocalLabel()
	 * @generated
	 * @ordered
	 */
	protected static final String LOCAL_LABEL_EDEFAULT = null;

	/**
	 * The cached value of the '{@link #getLocalLabel() <em>Local Label</em>}' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @see #getLocalLabel()
	 * @generated
	 * @ordered
	 */
	protected String localLabel = LOCAL_LABEL_EDEFAULT;

	/**
	 * The default value of the '{@link #getLocalTooltip() <em>Local Tooltip</em>}' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @see #getLocalTooltip()
	 * @generated
	 * @ordered
	 */
	protected static final String LOCAL_TOOLTIP_EDEFAULT = null;

	/**
	 * The cached value of the '{@link #getLocalTooltip() <em>Local Tooltip</em>}' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @see #getLocalTooltip()
	 * @generated
	 * @ordered
	 */
	protected String localTooltip = LOCAL_TOOLTIP_EDEFAULT;

	/**
	 * The default value of the '{@link #getLocalImage() <em>Local Image</em>}' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @see #getLocalImage()
	 * @generated
	 * @ordered
	 */
	protected static final Object LOCAL_IMAGE_EDEFAULT = null;

	/**
	 * The cached value of the '{@link #getLocalImage() <em>Local Image</em>}' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @see #getLocalImage()
	 * @generated
	 * @ordered
	 */
	protected Object localImage = LOCAL_IMAGE_EDEFAULT;

	/**
	 * The default value of the '{@link #getContext() <em>Context</em>}' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->

	 * <!-- end-user-doc -->
	 * @generated
	 */
	public String getLocalLabel() {
		return localLabel;
	}

	/**
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 */
	public void setLocalLabel(String newLocalLabel) {
		String oldLocalLabel = localLabel;
		localLabel = newLocalLabel;
		if (eNotificationRequired())
			eNotify(new ENotificationImpl(this, Notification.SET, BasicPackageImpl.WINDOW__LOCAL_LABEL, oldLocalLabel, localLabel));
	}

	/**
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 */
	public String getLocalTooltip() {
		return localTooltip;
	}

	/**
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 */
	public void setLocalTooltip(String newLocalTooltip) {
		String oldLocalTooltip = localTooltip;
		localTooltip = newLocalTooltip;
		if (eNotificationRequired())
			eNotify(new ENotificationImpl(this, Notification.SET, BasicPackageImpl.WINDOW__LOCAL_TOOLTIP, oldLocalTooltip, localTooltip));
	}

	/**
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 */
	public Object getLocalImage() {
		return localImage;
	}

	/**
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 */
	public void setLocalImage(Object newLocalImage) {
		Object oldLocalImage = localImage;
		localImage = newLocalImage;
		if (eNotificationRequired())
			eNotify(new ENotificationImpl(this, Notification.SET, BasicPackageImpl.WINDOW__LOCAL_IMAGE, oldLocalImage, localImage));
	}

	/**
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 */
	public IEclipseContext getContext() {
		return context;
	}

	/**
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 */
	public String getLocalizedLabel() {
		return LocalizationHelper.getLocalizedLabel(this);		
	}

	/**
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 */
	public String getLocalizedTooltip() {
		return LocalizationHelper.getLocalizedTooltip(this);
	}

	/**
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 */
	@Override

				return getIconURI();
			case BasicPackageImpl.WINDOW__TOOLTIP:
				return getTooltip();
			case BasicPackageImpl.WINDOW__LOCAL_LABEL:
				return getLocalLabel();
			case BasicPackageImpl.WINDOW__LOCAL_TOOLTIP:
				return getLocalTooltip();
			case BasicPackageImpl.WINDOW__LOCAL_IMAGE:
				return getLocalImage();
			case BasicPackageImpl.WINDOW__CONTEXT:
				return getContext();
			case BasicPackageImpl.WINDOW__VARIABLES:

			case BasicPackageImpl.WINDOW__TOOLTIP:
				setTooltip((String)newValue);
				return;
			case BasicPackageImpl.WINDOW__LOCAL_LABEL:
				setLocalLabel((String)newValue);
				return;
			case BasicPackageImpl.WINDOW__LOCAL_TOOLTIP:
				setLocalTooltip((String)newValue);
				return;
			case BasicPackageImpl.WINDOW__LOCAL_IMAGE:
				setLocalImage(newValue);
				return;
			case BasicPackageImpl.WINDOW__CONTEXT:
				setContext((IEclipseContext)newValue);
				return;

			case BasicPackageImpl.WINDOW__TOOLTIP:
				setTooltip(TOOLTIP_EDEFAULT);
				return;
			case BasicPackageImpl.WINDOW__LOCAL_LABEL:
				setLocalLabel(LOCAL_LABEL_EDEFAULT);
				return;
			case BasicPackageImpl.WINDOW__LOCAL_TOOLTIP:
				setLocalTooltip(LOCAL_TOOLTIP_EDEFAULT);
				return;
			case BasicPackageImpl.WINDOW__LOCAL_IMAGE:
				setLocalImage(LOCAL_IMAGE_EDEFAULT);
				return;
			case BasicPackageImpl.WINDOW__CONTEXT:
				setContext(CONTEXT_EDEFAULT);
				return;

				return ICON_URI_EDEFAULT == null ? iconURI != null : !ICON_URI_EDEFAULT.equals(iconURI);
			case BasicPackageImpl.WINDOW__TOOLTIP:
				return TOOLTIP_EDEFAULT == null ? tooltip != null : !TOOLTIP_EDEFAULT.equals(tooltip);
			case BasicPackageImpl.WINDOW__LOCAL_LABEL:
				return LOCAL_LABEL_EDEFAULT == null ? localLabel != null : !LOCAL_LABEL_EDEFAULT.equals(localLabel);
			case BasicPackageImpl.WINDOW__LOCAL_TOOLTIP:
				return LOCAL_TOOLTIP_EDEFAULT == null ? localTooltip != null : !LOCAL_TOOLTIP_EDEFAULT.equals(localTooltip);
			case BasicPackageImpl.WINDOW__LOCAL_IMAGE:
				return LOCAL_IMAGE_EDEFAULT == null ? localImage != null : !LOCAL_IMAGE_EDEFAULT.equals(localImage);
			case BasicPackageImpl.WINDOW__CONTEXT:
				return CONTEXT_EDEFAULT == null ? context != null : !CONTEXT_EDEFAULT.equals(context);
			case BasicPackageImpl.WINDOW__VARIABLES:

				case BasicPackageImpl.WINDOW__LABEL: return UiPackageImpl.UI_LABEL__LABEL;
				case BasicPackageImpl.WINDOW__ICON_URI: return UiPackageImpl.UI_LABEL__ICON_URI;
				case BasicPackageImpl.WINDOW__TOOLTIP: return UiPackageImpl.UI_LABEL__TOOLTIP;
				case BasicPackageImpl.WINDOW__LOCAL_LABEL: return UiPackageImpl.UI_LABEL__LOCAL_LABEL;
				case BasicPackageImpl.WINDOW__LOCAL_TOOLTIP: return UiPackageImpl.UI_LABEL__LOCAL_TOOLTIP;
				case BasicPackageImpl.WINDOW__LOCAL_IMAGE: return UiPackageImpl.UI_LABEL__LOCAL_IMAGE;
				default: return -1;
			}
		}

				case UiPackageImpl.UI_LABEL__LABEL: return BasicPackageImpl.WINDOW__LABEL;
				case UiPackageImpl.UI_LABEL__ICON_URI: return BasicPackageImpl.WINDOW__ICON_URI;
				case UiPackageImpl.UI_LABEL__TOOLTIP: return BasicPackageImpl.WINDOW__TOOLTIP;
				case UiPackageImpl.UI_LABEL__LOCAL_LABEL: return BasicPackageImpl.WINDOW__LOCAL_LABEL;
				case UiPackageImpl.UI_LABEL__LOCAL_TOOLTIP: return BasicPackageImpl.WINDOW__LOCAL_TOOLTIP;
				case UiPackageImpl.UI_LABEL__LOCAL_IMAGE: return BasicPackageImpl.WINDOW__LOCAL_IMAGE;
				default: return -1;
			}
		}

		result.append(iconURI);
		result.append(", tooltip: "); //$NON-NLS-1$
		result.append(tooltip);
		result.append(", localLabel: "); //$NON-NLS-1$
		result.append(localLabel);
		result.append(", localTooltip: "); //$NON-NLS-1$
		result.append(localTooltip);
		result.append(", localImage: "); //$NON-NLS-1$
		result.append(localImage);
		result.append(", context: "); //$NON-NLS-1$
		result.append(context);
		result.append(", variables: "); //$NON-NLS-1$




	public static final int UI_LABEL__TOOLTIP = 2;

	/**
	 * The feature id for the '<em><b>Local Label</b></em>' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 * @ordered
	 */
	public static final int UI_LABEL__LOCAL_LABEL = 3;

	/**
	 * The feature id for the '<em><b>Local Tooltip</b></em>' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 * @ordered
	 */
	public static final int UI_LABEL__LOCAL_TOOLTIP = 4;

	/**
	 * The feature id for the '<em><b>Local Image</b></em>' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 * @ordered
	 */
	public static final int UI_LABEL__LOCAL_IMAGE = 5;

	/**
	 * The number of structural features of the '<em>UI Label</em>' class.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 * @ordered
	 */
	public static final int UI_LABEL_FEATURE_COUNT = 3;

	/**
	 * The meta object id for the '{@link org.eclipse.e4.ui.model.application.ui.impl.ElementContainerImpl <em>Element Container</em>}' class.

	}

	/**
	 * Returns the meta object for the attribute '{@link org.eclipse.e4.ui.model.application.ui.MUILabel#getLocalLabel <em>Local Label</em>}'.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @return the meta object for the attribute '<em>Local Label</em>'.
	 * @see org.eclipse.e4.ui.model.application.ui.MUILabel#getLocalLabel()
	 * @see #getUILabel()
	 * @generated
	 */
	public EAttribute getUILabel_LocalLabel() {
		return (EAttribute)uiLabelEClass.getEStructuralFeatures().get(3);
	}


	/**
	 * Returns the meta object for the attribute '{@link org.eclipse.e4.ui.model.application.ui.MUILabel#getLocalTooltip <em>Local Tooltip</em>}'.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @return the meta object for the attribute '<em>Local Tooltip</em>'.
	 * @see org.eclipse.e4.ui.model.application.ui.MUILabel#getLocalTooltip()
	 * @see #getUILabel()
	 * @generated
	 */
	public EAttribute getUILabel_LocalTooltip() {
		return (EAttribute)uiLabelEClass.getEStructuralFeatures().get(4);
	}


	/**
	 * Returns the meta object for the attribute '{@link org.eclipse.e4.ui.model.application.ui.MUILabel#getLocalImage <em>Local Image</em>}'.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @return the meta object for the attribute '<em>Local Image</em>'.
	 * @see org.eclipse.e4.ui.model.application.ui.MUILabel#getLocalImage()
	 * @see #getUILabel()
	 * @generated
	 */
	public EAttribute getUILabel_LocalImage() {
		return (EAttribute)uiLabelEClass.getEStructuralFeatures().get(5);
	}


	/**
	 * Returns the meta object for class '{@link org.eclipse.e4.ui.model.application.ui.MElementContainer <em>Element Container</em>}'.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->

		createEAttribute(uiLabelEClass, UI_LABEL__LABEL);
		createEAttribute(uiLabelEClass, UI_LABEL__ICON_URI);
		createEAttribute(uiLabelEClass, UI_LABEL__TOOLTIP);
		createEAttribute(uiLabelEClass, UI_LABEL__LOCAL_LABEL);
		createEAttribute(uiLabelEClass, UI_LABEL__LOCAL_TOOLTIP);
		createEAttribute(uiLabelEClass, UI_LABEL__LOCAL_IMAGE);

		elementContainerEClass = createEClass(ELEMENT_CONTAINER);
		createEReference(elementContainerEClass, ELEMENT_CONTAINER__CHILDREN);

		initEAttribute(getUILabel_Label(), ecorePackage.getEString(), "label", null, 0, 1, MUILabel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
		initEAttribute(getUILabel_IconURI(), ecorePackage.getEString(), "iconURI", null, 0, 1, MUILabel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
		initEAttribute(getUILabel_Tooltip(), ecorePackage.getEString(), "tooltip", null, 0, 1, MUILabel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$

		addEOperation(uiLabelEClass, ecorePackage.getEString(), "getLocalizedLabel", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$

		addEOperation(uiLabelEClass, ecorePackage.getEString(), "getLocalizedTooltip", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$

		initEClass(elementContainerEClass, MElementContainer.class, "ElementContainer", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
		g1 = createEGenericType(elementContainerEClass_T);

		public static final EAttribute UI_LABEL__TOOLTIP = eINSTANCE.getUILabel_Tooltip();

		/**
		 * The meta object literal for the '<em><b>Local Label</b></em>' attribute feature.
		 * <!-- begin-user-doc -->
		 * <!-- end-user-doc -->
		 * @generated
		 */
		public static final EAttribute UI_LABEL__LOCAL_LABEL = eINSTANCE.getUILabel_LocalLabel();

		/**
		 * The meta object literal for the '<em><b>Local Tooltip</b></em>' attribute feature.
		 * <!-- begin-user-doc -->
		 * <!-- end-user-doc -->
		 * @generated
		 */
		public static final EAttribute UI_LABEL__LOCAL_TOOLTIP = eINSTANCE.getUILabel_LocalTooltip();

		/**
		 * The meta object literal for the '<em><b>Local Image</b></em>' attribute feature.
		 * <!-- begin-user-doc -->
		 * <!-- end-user-doc -->
		 * @generated
		 */
		public static final EAttribute UI_LABEL__LOCAL_IMAGE = eINSTANCE.getUILabel_LocalImage();

		/**
		 * The meta object literal for the '{@link org.eclipse.e4.ui.model.application.ui.impl.ElementContainerImpl <em>Element Container</em>}' class.
		 * <!-- begin-user-doc -->
		 * <!-- end-user-doc -->




 */
package org.eclipse.e4.ui.model.application.ui.menu.impl;

import org.eclipse.e4.ui.model.LocalizationHelper;
import org.eclipse.e4.ui.model.application.ui.MUILabel;
import org.eclipse.e4.ui.model.application.ui.impl.UIElementImpl;
import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;

 *   <li>{@link org.eclipse.e4.ui.model.application.ui.menu.impl.ItemImpl#getLabel <em>Label</em>}</li>
 *   <li>{@link org.eclipse.e4.ui.model.application.ui.menu.impl.ItemImpl#getIconURI <em>Icon URI</em>}</li>
 *   <li>{@link org.eclipse.e4.ui.model.application.ui.menu.impl.ItemImpl#getTooltip <em>Tooltip</em>}</li>
 *   <li>{@link org.eclipse.e4.ui.model.application.ui.menu.impl.ItemImpl#getLocalLabel <em>Local Label</em>}</li>
 *   <li>{@link org.eclipse.e4.ui.model.application.ui.menu.impl.ItemImpl#getLocalTooltip <em>Local Tooltip</em>}</li>
 *   <li>{@link org.eclipse.e4.ui.model.application.ui.menu.impl.ItemImpl#getLocalImage <em>Local Image</em>}</li>
 *   <li>{@link org.eclipse.e4.ui.model.application.ui.menu.impl.ItemImpl#isEnabled <em>Enabled</em>}</li>
 *   <li>{@link org.eclipse.e4.ui.model.application.ui.menu.impl.ItemImpl#isSelected <em>Selected</em>}</li>
 *   <li>{@link org.eclipse.e4.ui.model.application.ui.menu.impl.ItemImpl#getType <em>Type</em>}</li>

	protected String tooltip = TOOLTIP_EDEFAULT;

	/**
	 * The default value of the '{@link #getLocalLabel() <em>Local Label</em>}' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @see #getLocalLabel()
	 * @generated
	 * @ordered
	 */
	protected static final String LOCAL_LABEL_EDEFAULT = null;

	/**
	 * The cached value of the '{@link #getLocalLabel() <em>Local Label</em>}' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @see #getLocalLabel()
	 * @generated
	 * @ordered
	 */
	protected String localLabel = LOCAL_LABEL_EDEFAULT;

	/**
	 * The default value of the '{@link #getLocalTooltip() <em>Local Tooltip</em>}' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @see #getLocalTooltip()
	 * @generated
	 * @ordered
	 */
	protected static final String LOCAL_TOOLTIP_EDEFAULT = null;

	/**
	 * The cached value of the '{@link #getLocalTooltip() <em>Local Tooltip</em>}' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @see #getLocalTooltip()
	 * @generated
	 * @ordered
	 */
	protected String localTooltip = LOCAL_TOOLTIP_EDEFAULT;

	/**
	 * The default value of the '{@link #getLocalImage() <em>Local Image</em>}' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @see #getLocalImage()
	 * @generated
	 * @ordered
	 */
	protected static final Object LOCAL_IMAGE_EDEFAULT = null;

	/**
	 * The cached value of the '{@link #getLocalImage() <em>Local Image</em>}' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @see #getLocalImage()
	 * @generated
	 * @ordered
	 */
	protected Object localImage = LOCAL_IMAGE_EDEFAULT;

	/**
	 * The default value of the '{@link #isEnabled() <em>Enabled</em>}' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->

	 * <!-- end-user-doc -->
	 * @generated
	 */
	public String getLocalLabel() {
		return localLabel;
	}

	/**
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 */
	public void setLocalLabel(String newLocalLabel) {
		String oldLocalLabel = localLabel;
		localLabel = newLocalLabel;
		if (eNotificationRequired())
			eNotify(new ENotificationImpl(this, Notification.SET, MenuPackageImpl.ITEM__LOCAL_LABEL, oldLocalLabel, localLabel));
	}

	/**
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 */
	public String getLocalTooltip() {
		return localTooltip;
	}

	/**
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 */
	public void setLocalTooltip(String newLocalTooltip) {
		String oldLocalTooltip = localTooltip;
		localTooltip = newLocalTooltip;
		if (eNotificationRequired())
			eNotify(new ENotificationImpl(this, Notification.SET, MenuPackageImpl.ITEM__LOCAL_TOOLTIP, oldLocalTooltip, localTooltip));
	}

	/**
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 */
	public Object getLocalImage() {
		return localImage;
	}

	/**
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 */
	public void setLocalImage(Object newLocalImage) {
		Object oldLocalImage = localImage;
		localImage = newLocalImage;
		if (eNotificationRequired())
			eNotify(new ENotificationImpl(this, Notification.SET, MenuPackageImpl.ITEM__LOCAL_IMAGE, oldLocalImage, localImage));
	}

	/**
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 */
	public boolean isEnabled() {
		return enabled;
	}

	/**
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 */
	public String getLocalizedLabel() {
		return LocalizationHelper.getLocalizedLabel(this);
	}

	/**
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 */
	public String getLocalizedTooltip() {
		return LocalizationHelper.getLocalizedTooltip(this);		
	}

	/**
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 */
	@Override

				return getIconURI();
			case MenuPackageImpl.ITEM__TOOLTIP:
				return getTooltip();
			case MenuPackageImpl.ITEM__LOCAL_LABEL:
				return getLocalLabel();
			case MenuPackageImpl.ITEM__LOCAL_TOOLTIP:
				return getLocalTooltip();
			case MenuPackageImpl.ITEM__LOCAL_IMAGE:
				return getLocalImage();
			case MenuPackageImpl.ITEM__ENABLED:
				return isEnabled();
			case MenuPackageImpl.ITEM__SELECTED:

			case MenuPackageImpl.ITEM__TOOLTIP:
				setTooltip((String)newValue);
				return;
			case MenuPackageImpl.ITEM__LOCAL_LABEL:
				setLocalLabel((String)newValue);
				return;
			case MenuPackageImpl.ITEM__LOCAL_TOOLTIP:
				setLocalTooltip((String)newValue);
				return;
			case MenuPackageImpl.ITEM__LOCAL_IMAGE:
				setLocalImage(newValue);
				return;
			case MenuPackageImpl.ITEM__ENABLED:
				setEnabled((Boolean)newValue);
				return;

			case MenuPackageImpl.ITEM__TOOLTIP:
				setTooltip(TOOLTIP_EDEFAULT);
				return;
			case MenuPackageImpl.ITEM__LOCAL_LABEL:
				setLocalLabel(LOCAL_LABEL_EDEFAULT);
				return;
			case MenuPackageImpl.ITEM__LOCAL_TOOLTIP:
				setLocalTooltip(LOCAL_TOOLTIP_EDEFAULT);
				return;
			case MenuPackageImpl.ITEM__LOCAL_IMAGE:
				setLocalImage(LOCAL_IMAGE_EDEFAULT);
				return;
			case MenuPackageImpl.ITEM__ENABLED:
				setEnabled(ENABLED_EDEFAULT);
				return;

				return ICON_URI_EDEFAULT == null ? iconURI != null : !ICON_URI_EDEFAULT.equals(iconURI);
			case MenuPackageImpl.ITEM__TOOLTIP:
				return TOOLTIP_EDEFAULT == null ? tooltip != null : !TOOLTIP_EDEFAULT.equals(tooltip);
			case MenuPackageImpl.ITEM__LOCAL_LABEL:
				return LOCAL_LABEL_EDEFAULT == null ? localLabel != null : !LOCAL_LABEL_EDEFAULT.equals(localLabel);
			case MenuPackageImpl.ITEM__LOCAL_TOOLTIP:
				return LOCAL_TOOLTIP_EDEFAULT == null ? localTooltip != null : !LOCAL_TOOLTIP_EDEFAULT.equals(localTooltip);
			case MenuPackageImpl.ITEM__LOCAL_IMAGE:
				return LOCAL_IMAGE_EDEFAULT == null ? localImage != null : !LOCAL_IMAGE_EDEFAULT.equals(localImage);
			case MenuPackageImpl.ITEM__ENABLED:
				return enabled != ENABLED_EDEFAULT;
			case MenuPackageImpl.ITEM__SELECTED:

				case MenuPackageImpl.ITEM__LABEL: return UiPackageImpl.UI_LABEL__LABEL;
				case MenuPackageImpl.ITEM__ICON_URI: return UiPackageImpl.UI_LABEL__ICON_URI;
				case MenuPackageImpl.ITEM__TOOLTIP: return UiPackageImpl.UI_LABEL__TOOLTIP;
				case MenuPackageImpl.ITEM__LOCAL_LABEL: return UiPackageImpl.UI_LABEL__LOCAL_LABEL;
				case MenuPackageImpl.ITEM__LOCAL_TOOLTIP: return UiPackageImpl.UI_LABEL__LOCAL_TOOLTIP;
				case MenuPackageImpl.ITEM__LOCAL_IMAGE: return UiPackageImpl.UI_LABEL__LOCAL_IMAGE;
				default: return -1;
			}
		}

				case UiPackageImpl.UI_LABEL__LABEL: return MenuPackageImpl.ITEM__LABEL;
				case UiPackageImpl.UI_LABEL__ICON_URI: return MenuPackageImpl.ITEM__ICON_URI;
				case UiPackageImpl.UI_LABEL__TOOLTIP: return MenuPackageImpl.ITEM__TOOLTIP;
				case UiPackageImpl.UI_LABEL__LOCAL_LABEL: return MenuPackageImpl.ITEM__LOCAL_LABEL;
				case UiPackageImpl.UI_LABEL__LOCAL_TOOLTIP: return MenuPackageImpl.ITEM__LOCAL_TOOLTIP;
				case UiPackageImpl.UI_LABEL__LOCAL_IMAGE: return MenuPackageImpl.ITEM__LOCAL_IMAGE;
				default: return -1;
			}
		}

		result.append(iconURI);
		result.append(", tooltip: "); //$NON-NLS-1$
		result.append(tooltip);
		result.append(", localLabel: "); //$NON-NLS-1$
		result.append(localLabel);
		result.append(", localTooltip: "); //$NON-NLS-1$
		result.append(localTooltip);
		result.append(", localImage: "); //$NON-NLS-1$
		result.append(localImage);
		result.append(", enabled: "); //$NON-NLS-1$
		result.append(enabled);
		result.append(", selected: "); //$NON-NLS-1$




 */
package org.eclipse.e4.ui.model.application.ui.menu.impl;

import org.eclipse.e4.ui.model.LocalizationHelper;
import org.eclipse.e4.ui.model.application.ui.MUILabel;
import org.eclipse.e4.ui.model.application.ui.impl.UIElementImpl;
import org.eclipse.e4.ui.model.application.ui.impl.UiPackageImpl;

 *   <li>{@link org.eclipse.e4.ui.model.application.ui.menu.impl.MenuElementImpl#getLabel <em>Label</em>}</li>
 *   <li>{@link org.eclipse.e4.ui.model.application.ui.menu.impl.MenuElementImpl#getIconURI <em>Icon URI</em>}</li>
 *   <li>{@link org.eclipse.e4.ui.model.application.ui.menu.impl.MenuElementImpl#getTooltip <em>Tooltip</em>}</li>
 *   <li>{@link org.eclipse.e4.ui.model.application.ui.menu.impl.MenuElementImpl#getLocalLabel <em>Local Label</em>}</li>
 *   <li>{@link org.eclipse.e4.ui.model.application.ui.menu.impl.MenuElementImpl#getLocalTooltip <em>Local Tooltip</em>}</li>
 *   <li>{@link org.eclipse.e4.ui.model.application.ui.menu.impl.MenuElementImpl#getLocalImage <em>Local Image</em>}</li>
 *   <li>{@link org.eclipse.e4.ui.model.application.ui.menu.impl.MenuElementImpl#getMnemonics <em>Mnemonics</em>}</li>
 * </ul>
 * </p>

	protected String tooltip = TOOLTIP_EDEFAULT;

	/**
	 * The default value of the '{@link #getLocalLabel() <em>Local Label</em>}' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @see #getLocalLabel()
	 * @generated
	 * @ordered
	 */
	protected static final String LOCAL_LABEL_EDEFAULT = null;

	/**
	 * The cached value of the '{@link #getLocalLabel() <em>Local Label</em>}' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @see #getLocalLabel()
	 * @generated
	 * @ordered
	 */
	protected String localLabel = LOCAL_LABEL_EDEFAULT;

	/**
	 * The default value of the '{@link #getLocalTooltip() <em>Local Tooltip</em>}' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @see #getLocalTooltip()
	 * @generated
	 * @ordered
	 */
	protected static final String LOCAL_TOOLTIP_EDEFAULT = null;

	/**
	 * The cached value of the '{@link #getLocalTooltip() <em>Local Tooltip</em>}' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @see #getLocalTooltip()
	 * @generated
	 * @ordered
	 */
	protected String localTooltip = LOCAL_TOOLTIP_EDEFAULT;

	/**
	 * The default value of the '{@link #getLocalImage() <em>Local Image</em>}' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @see #getLocalImage()
	 * @generated
	 * @ordered
	 */
	protected static final Object LOCAL_IMAGE_EDEFAULT = null;

	/**
	 * The cached value of the '{@link #getLocalImage() <em>Local Image</em>}' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @see #getLocalImage()
	 * @generated
	 * @ordered
	 */
	protected Object localImage = LOCAL_IMAGE_EDEFAULT;

	/**
	 * The default value of the '{@link #getMnemonics() <em>Mnemonics</em>}' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->

	 * <!-- end-user-doc -->
	 * @generated
	 */
	public String getMnemonics() {
		return mnemonics;
	}

	/**
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 */
	public void setLocalLabel(String newLocalLabel) {
		String oldLocalLabel = localLabel;
		localLabel = newLocalLabel;
		if (eNotificationRequired())
			eNotify(new ENotificationImpl(this, Notification.SET, MenuPackageImpl.MENU_ELEMENT__LOCAL_LABEL, oldLocalLabel, localLabel));
	}

	/**
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 */
	public String getLocalTooltip() {
		return localTooltip;
	}

	/**
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 */
	public void setLocalTooltip(String newLocalTooltip) {
		String oldLocalTooltip = localTooltip;
		localTooltip = newLocalTooltip;
		if (eNotificationRequired())
			eNotify(new ENotificationImpl(this, Notification.SET, MenuPackageImpl.MENU_ELEMENT__LOCAL_TOOLTIP, oldLocalTooltip, localTooltip));
	}

	/**
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 */
	public Object getLocalImage() {
		return localImage;
	}

	/**

	 * <!-- end-user-doc -->
	 * @generated
	 */
	public void setMnemonics(String newMnemonics) {
		String oldMnemonics = mnemonics;
		mnemonics = newMnemonics;
		if (eNotificationRequired())
			eNotify(new ENotificationImpl(this, Notification.SET, MenuPackageImpl.MENU_ELEMENT__MNEMONICS, oldMnemonics, mnemonics));
	}

	/**
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 */
	public String getLocalizedLabel() {
		return LocalizationHelper.getLocalizedLabel(this);
	}

	/**
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 */
	public String getLocalizedTooltip() {
		return LocalizationHelper.getLocalizedTooltip(this);
		mnemonics = newMnemonics;
		if (eNotificationRequired())
			eNotify(new ENotificationImpl(this, Notification.SET, MenuPackageImpl.MENU_ELEMENT__MNEMONICS, oldMnemonics, mnemonics));
	}

	/**

				return getIconURI();
			case MenuPackageImpl.MENU_ELEMENT__TOOLTIP:
				return getTooltip();
			case MenuPackageImpl.MENU_ELEMENT__LOCAL_LABEL:
				return getLocalLabel();
			case MenuPackageImpl.MENU_ELEMENT__LOCAL_TOOLTIP:
				return getLocalTooltip();
			case MenuPackageImpl.MENU_ELEMENT__LOCAL_IMAGE:
				return getLocalImage();
			case MenuPackageImpl.MENU_ELEMENT__MNEMONICS:
				return getMnemonics();
		}

			case MenuPackageImpl.MENU_ELEMENT__TOOLTIP:
				setTooltip((String)newValue);
				return;
			case MenuPackageImpl.MENU_ELEMENT__LOCAL_LABEL:
				setLocalLabel((String)newValue);
				return;
			case MenuPackageImpl.MENU_ELEMENT__LOCAL_TOOLTIP:
				setLocalTooltip((String)newValue);
				return;
			case MenuPackageImpl.MENU_ELEMENT__LOCAL_IMAGE:
				setLocalImage(newValue);
				return;
			case MenuPackageImpl.MENU_ELEMENT__MNEMONICS:
				setMnemonics((String)newValue);
				return;

			case MenuPackageImpl.MENU_ELEMENT__TOOLTIP:
				setTooltip(TOOLTIP_EDEFAULT);
				return;
			case MenuPackageImpl.MENU_ELEMENT__LOCAL_LABEL:
				setLocalLabel(LOCAL_LABEL_EDEFAULT);
				return;
			case MenuPackageImpl.MENU_ELEMENT__LOCAL_TOOLTIP:
				setLocalTooltip(LOCAL_TOOLTIP_EDEFAULT);
				return;
			case MenuPackageImpl.MENU_ELEMENT__LOCAL_IMAGE:
				setLocalImage(LOCAL_IMAGE_EDEFAULT);
				return;
			case MenuPackageImpl.MENU_ELEMENT__MNEMONICS:
				setMnemonics(MNEMONICS_EDEFAULT);
				return;

				return ICON_URI_EDEFAULT == null ? iconURI != null : !ICON_URI_EDEFAULT.equals(iconURI);
			case MenuPackageImpl.MENU_ELEMENT__TOOLTIP:
				return TOOLTIP_EDEFAULT == null ? tooltip != null : !TOOLTIP_EDEFAULT.equals(tooltip);
			case MenuPackageImpl.MENU_ELEMENT__LOCAL_LABEL:
				return LOCAL_LABEL_EDEFAULT == null ? localLabel != null : !LOCAL_LABEL_EDEFAULT.equals(localLabel);
			case MenuPackageImpl.MENU_ELEMENT__LOCAL_TOOLTIP:
				return LOCAL_TOOLTIP_EDEFAULT == null ? localTooltip != null : !LOCAL_TOOLTIP_EDEFAULT.equals(localTooltip);
			case MenuPackageImpl.MENU_ELEMENT__LOCAL_IMAGE:
				return LOCAL_IMAGE_EDEFAULT == null ? localImage != null : !LOCAL_IMAGE_EDEFAULT.equals(localImage);
			case MenuPackageImpl.MENU_ELEMENT__MNEMONICS:
				return MNEMONICS_EDEFAULT == null ? mnemonics != null : !MNEMONICS_EDEFAULT.equals(mnemonics);
		}

				case MenuPackageImpl.MENU_ELEMENT__LABEL: return UiPackageImpl.UI_LABEL__LABEL;
				case MenuPackageImpl.MENU_ELEMENT__ICON_URI: return UiPackageImpl.UI_LABEL__ICON_URI;
				case MenuPackageImpl.MENU_ELEMENT__TOOLTIP: return UiPackageImpl.UI_LABEL__TOOLTIP;
				case MenuPackageImpl.MENU_ELEMENT__LOCAL_LABEL: return UiPackageImpl.UI_LABEL__LOCAL_LABEL;
				case MenuPackageImpl.MENU_ELEMENT__LOCAL_TOOLTIP: return UiPackageImpl.UI_LABEL__LOCAL_TOOLTIP;
				case MenuPackageImpl.MENU_ELEMENT__LOCAL_IMAGE: return UiPackageImpl.UI_LABEL__LOCAL_IMAGE;
				default: return -1;
			}
		}

				case UiPackageImpl.UI_LABEL__LABEL: return MenuPackageImpl.MENU_ELEMENT__LABEL;
				case UiPackageImpl.UI_LABEL__ICON_URI: return MenuPackageImpl.MENU_ELEMENT__ICON_URI;
				case UiPackageImpl.UI_LABEL__TOOLTIP: return MenuPackageImpl.MENU_ELEMENT__TOOLTIP;
				case UiPackageImpl.UI_LABEL__LOCAL_LABEL: return MenuPackageImpl.MENU_ELEMENT__LOCAL_LABEL;
				case UiPackageImpl.UI_LABEL__LOCAL_TOOLTIP: return MenuPackageImpl.MENU_ELEMENT__LOCAL_TOOLTIP;
				case UiPackageImpl.UI_LABEL__LOCAL_IMAGE: return MenuPackageImpl.MENU_ELEMENT__LOCAL_IMAGE;
				default: return -1;
			}
		}

		result.append(iconURI);
		result.append(", tooltip: "); //$NON-NLS-1$
		result.append(tooltip);
		result.append(", localLabel: "); //$NON-NLS-1$
		result.append(localLabel);
		result.append(", localTooltip: "); //$NON-NLS-1$
		result.append(localTooltip);
		result.append(", localImage: "); //$NON-NLS-1$
		result.append(localImage);
		result.append(", mnemonics: "); //$NON-NLS-1$
		result.append(mnemonics);
		result.append(')');




	public static final int ITEM__TOOLTIP = UiPackageImpl.UI_ELEMENT_FEATURE_COUNT + 2;

	/**
	 * The feature id for the '<em><b>Local Label</b></em>' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 * @ordered
	 */
	public static final int ITEM__LOCAL_LABEL = UiPackageImpl.UI_ELEMENT_FEATURE_COUNT + 3;

	/**
	 * The feature id for the '<em><b>Local Tooltip</b></em>' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 * @ordered
	 */
	public static final int ITEM__LOCAL_TOOLTIP = UiPackageImpl.UI_ELEMENT_FEATURE_COUNT + 4;

	/**
	 * The feature id for the '<em><b>Local Image</b></em>' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 * @ordered
	 */
	public static final int ITEM__LOCAL_IMAGE = UiPackageImpl.UI_ELEMENT_FEATURE_COUNT + 5;

	/**
	 * The feature id for the '<em><b>Enabled</b></em>' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 * @ordered
	 */
	public static final int ITEM__ENABLED = UiPackageImpl.UI_ELEMENT_FEATURE_COUNT + 3;

	/**
	 * The feature id for the '<em><b>Selected</b></em>' attribute.

	 * @generated
	 * @ordered
	 */
	public static final int ITEM__SELECTED = UiPackageImpl.UI_ELEMENT_FEATURE_COUNT + 4;

	/**
	 * The feature id for the '<em><b>Type</b></em>' attribute.

	 * @generated
	 * @ordered
	 */
	public static final int ITEM__TYPE = UiPackageImpl.UI_ELEMENT_FEATURE_COUNT + 5;

	/**
	 * The number of structural features of the '<em>Item</em>' class.

	 * @generated
	 * @ordered
	 */
	public static final int ITEM_FEATURE_COUNT = UiPackageImpl.UI_ELEMENT_FEATURE_COUNT + 6;

	/**
	 * The meta object id for the '{@link org.eclipse.e4.ui.model.application.ui.menu.impl.HandledItemImpl <em>Handled Item</em>}' class.

	public static final int HANDLED_ITEM__TOOLTIP = ITEM__TOOLTIP;

	/**
	 * The feature id for the '<em><b>Local Label</b></em>' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 * @ordered
	 */
	public static final int HANDLED_ITEM__LOCAL_LABEL = ITEM__LOCAL_LABEL;

	/**
	 * The feature id for the '<em><b>Local Tooltip</b></em>' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 * @ordered
	 */
	public static final int HANDLED_ITEM__LOCAL_TOOLTIP = ITEM__LOCAL_TOOLTIP;

	/**
	 * The feature id for the '<em><b>Local Image</b></em>' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 * @ordered
	 */
	public static final int HANDLED_ITEM__LOCAL_IMAGE = ITEM__LOCAL_IMAGE;

	/**
	 * The feature id for the '<em><b>Enabled</b></em>' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->

	public static final int MENU_ELEMENT__TOOLTIP = UiPackageImpl.UI_ELEMENT_FEATURE_COUNT + 2;

	/**
	 * The feature id for the '<em><b>Local Label</b></em>' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 * @ordered
	 */
	public static final int MENU_ELEMENT__LOCAL_LABEL = UiPackageImpl.UI_ELEMENT_FEATURE_COUNT + 3;

	/**
	 * The feature id for the '<em><b>Local Tooltip</b></em>' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 * @ordered
	 */
	public static final int MENU_ELEMENT__LOCAL_TOOLTIP = UiPackageImpl.UI_ELEMENT_FEATURE_COUNT + 4;

	/**
	 * The feature id for the '<em><b>Local Image</b></em>' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 * @ordered
	 */
	public static final int MENU_ELEMENT__LOCAL_IMAGE = UiPackageImpl.UI_ELEMENT_FEATURE_COUNT + 5;

	/**
	 * The feature id for the '<em><b>Mnemonics</b></em>' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 * @ordered
	 */
	public static final int MENU_ELEMENT__MNEMONICS = UiPackageImpl.UI_ELEMENT_FEATURE_COUNT + 3;

	/**
	 * The number of structural features of the '<em>Element</em>' class.

	 * @generated
	 * @ordered
	 */
	public static final int MENU_ELEMENT_FEATURE_COUNT = UiPackageImpl.UI_ELEMENT_FEATURE_COUNT + 4;

	/**
	 * The meta object id for the '{@link org.eclipse.e4.ui.model.application.ui.menu.impl.MenuItemImpl <em>Item</em>}' class.

	public static final int MENU_ITEM__TOOLTIP = ITEM__TOOLTIP;

	/**
	 * The feature id for the '<em><b>Local Label</b></em>' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 * @ordered
	 */
	public static final int MENU_ITEM__LOCAL_LABEL = ITEM__LOCAL_LABEL;

	/**
	 * The feature id for the '<em><b>Local Tooltip</b></em>' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 * @ordered
	 */
	public static final int MENU_ITEM__LOCAL_TOOLTIP = ITEM__LOCAL_TOOLTIP;

	/**
	 * The feature id for the '<em><b>Local Image</b></em>' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 * @ordered
	 */
	public static final int MENU_ITEM__LOCAL_IMAGE = ITEM__LOCAL_IMAGE;

	/**
	 * The feature id for the '<em><b>Enabled</b></em>' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->

	public static final int MENU_SEPARATOR__TOOLTIP = MENU_ELEMENT__TOOLTIP;

	/**
	 * The feature id for the '<em><b>Local Label</b></em>' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 * @ordered
	 */
	public static final int MENU_SEPARATOR__LOCAL_LABEL = MENU_ELEMENT__LOCAL_LABEL;

	/**
	 * The feature id for the '<em><b>Local Tooltip</b></em>' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 * @ordered
	 */
	public static final int MENU_SEPARATOR__LOCAL_TOOLTIP = MENU_ELEMENT__LOCAL_TOOLTIP;

	/**
	 * The feature id for the '<em><b>Local Image</b></em>' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 * @ordered
	 */
	public static final int MENU_SEPARATOR__LOCAL_IMAGE = MENU_ELEMENT__LOCAL_IMAGE;

	/**
	 * The feature id for the '<em><b>Mnemonics</b></em>' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->

	public static final int MENU__TOOLTIP = MENU_ELEMENT__TOOLTIP;

	/**
	 * The feature id for the '<em><b>Local Label</b></em>' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 * @ordered
	 */
	public static final int MENU__LOCAL_LABEL = MENU_ELEMENT__LOCAL_LABEL;

	/**
	 * The feature id for the '<em><b>Local Tooltip</b></em>' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 * @ordered
	 */
	public static final int MENU__LOCAL_TOOLTIP = MENU_ELEMENT__LOCAL_TOOLTIP;

	/**
	 * The feature id for the '<em><b>Local Image</b></em>' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 * @ordered
	 */
	public static final int MENU__LOCAL_IMAGE = MENU_ELEMENT__LOCAL_IMAGE;

	/**
	 * The feature id for the '<em><b>Mnemonics</b></em>' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->

	public static final int POPUP_MENU__TOOLTIP = MENU__TOOLTIP;

	/**
	 * The feature id for the '<em><b>Local Label</b></em>' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 * @ordered
	 */
	public static final int POPUP_MENU__LOCAL_LABEL = MENU__LOCAL_LABEL;

	/**
	 * The feature id for the '<em><b>Local Tooltip</b></em>' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 * @ordered
	 */
	public static final int POPUP_MENU__LOCAL_TOOLTIP = MENU__LOCAL_TOOLTIP;

	/**
	 * The feature id for the '<em><b>Local Image</b></em>' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 * @ordered
	 */
	public static final int POPUP_MENU__LOCAL_IMAGE = MENU__LOCAL_IMAGE;

	/**
	 * The feature id for the '<em><b>Mnemonics</b></em>' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->

	public static final int DIRECT_MENU_ITEM__TOOLTIP = MENU_ITEM__TOOLTIP;

	/**
	 * The feature id for the '<em><b>Local Label</b></em>' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 * @ordered
	 */
	public static final int DIRECT_MENU_ITEM__LOCAL_LABEL = MENU_ITEM__LOCAL_LABEL;

	/**
	 * The feature id for the '<em><b>Local Tooltip</b></em>' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 * @ordered
	 */
	public static final int DIRECT_MENU_ITEM__LOCAL_TOOLTIP = MENU_ITEM__LOCAL_TOOLTIP;

	/**
	 * The feature id for the '<em><b>Local Image</b></em>' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 * @ordered
	 */
	public static final int DIRECT_MENU_ITEM__LOCAL_IMAGE = MENU_ITEM__LOCAL_IMAGE;

	/**
	 * The feature id for the '<em><b>Enabled</b></em>' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->

	public static final int HANDLED_MENU_ITEM__TOOLTIP = MENU_ITEM__TOOLTIP;

	/**
	 * The feature id for the '<em><b>Local Label</b></em>' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 * @ordered
	 */
	public static final int HANDLED_MENU_ITEM__LOCAL_LABEL = MENU_ITEM__LOCAL_LABEL;

	/**
	 * The feature id for the '<em><b>Local Tooltip</b></em>' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 * @ordered
	 */
	public static final int HANDLED_MENU_ITEM__LOCAL_TOOLTIP = MENU_ITEM__LOCAL_TOOLTIP;

	/**
	 * The feature id for the '<em><b>Local Image</b></em>' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 * @ordered
	 */
	public static final int HANDLED_MENU_ITEM__LOCAL_IMAGE = MENU_ITEM__LOCAL_IMAGE;

	/**
	 * The feature id for the '<em><b>Enabled</b></em>' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->

	public static final int TOOL_ITEM__TOOLTIP = ITEM__TOOLTIP;

	/**
	 * The feature id for the '<em><b>Local Label</b></em>' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 * @ordered
	 */
	public static final int TOOL_ITEM__LOCAL_LABEL = ITEM__LOCAL_LABEL;

	/**
	 * The feature id for the '<em><b>Local Tooltip</b></em>' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 * @ordered
	 */
	public static final int TOOL_ITEM__LOCAL_TOOLTIP = ITEM__LOCAL_TOOLTIP;

	/**
	 * The feature id for the '<em><b>Local Image</b></em>' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 * @ordered
	 */
	public static final int TOOL_ITEM__LOCAL_IMAGE = ITEM__LOCAL_IMAGE;

	/**
	 * The feature id for the '<em><b>Enabled</b></em>' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->

	public static final int HANDLED_TOOL_ITEM__TOOLTIP = TOOL_ITEM__TOOLTIP;

	/**
	 * The feature id for the '<em><b>Local Label</b></em>' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 * @ordered
	 */
	public static final int HANDLED_TOOL_ITEM__LOCAL_LABEL = TOOL_ITEM__LOCAL_LABEL;

	/**
	 * The feature id for the '<em><b>Local Tooltip</b></em>' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 * @ordered
	 */
	public static final int HANDLED_TOOL_ITEM__LOCAL_TOOLTIP = TOOL_ITEM__LOCAL_TOOLTIP;

	/**
	 * The feature id for the '<em><b>Local Image</b></em>' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 * @ordered
	 */
	public static final int HANDLED_TOOL_ITEM__LOCAL_IMAGE = TOOL_ITEM__LOCAL_IMAGE;

	/**
	 * The feature id for the '<em><b>Enabled</b></em>' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->

	public static final int DIRECT_TOOL_ITEM__TOOLTIP = TOOL_ITEM__TOOLTIP;

	/**
	 * The feature id for the '<em><b>Local Label</b></em>' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 * @ordered
	 */
	public static final int DIRECT_TOOL_ITEM__LOCAL_LABEL = TOOL_ITEM__LOCAL_LABEL;

	/**
	 * The feature id for the '<em><b>Local Tooltip</b></em>' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 * @ordered
	 */
	public static final int DIRECT_TOOL_ITEM__LOCAL_TOOLTIP = TOOL_ITEM__LOCAL_TOOLTIP;

	/**
	 * The feature id for the '<em><b>Local Image</b></em>' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 * @ordered
	 */
	public static final int DIRECT_TOOL_ITEM__LOCAL_IMAGE = TOOL_ITEM__LOCAL_IMAGE;

	/**
	 * The feature id for the '<em><b>Enabled</b></em>' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->

	public static final int RENDERED_MENU__TOOLTIP = MENU__TOOLTIP;

	/**
	 * The feature id for the '<em><b>Local Label</b></em>' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 * @ordered
	 */
	public static final int RENDERED_MENU__LOCAL_LABEL = MENU__LOCAL_LABEL;

	/**
	 * The feature id for the '<em><b>Local Tooltip</b></em>' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 * @ordered
	 */
	public static final int RENDERED_MENU__LOCAL_TOOLTIP = MENU__LOCAL_TOOLTIP;

	/**
	 * The feature id for the '<em><b>Local Image</b></em>' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 * @ordered
	 */
	public static final int RENDERED_MENU__LOCAL_IMAGE = MENU__LOCAL_IMAGE;

	/**
	 * The feature id for the '<em><b>Mnemonics</b></em>' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->

	public static final int RENDERED_MENU_ITEM__TOOLTIP = MENU_ITEM__TOOLTIP;

	/**
	 * The feature id for the '<em><b>Local Label</b></em>' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 * @ordered
	 */
	public static final int RENDERED_MENU_ITEM__LOCAL_LABEL = MENU_ITEM__LOCAL_LABEL;

	/**
	 * The feature id for the '<em><b>Local Tooltip</b></em>' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 * @ordered
	 */
	public static final int RENDERED_MENU_ITEM__LOCAL_TOOLTIP = MENU_ITEM__LOCAL_TOOLTIP;

	/**
	 * The feature id for the '<em><b>Local Image</b></em>' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 * @ordered
	 */
	public static final int RENDERED_MENU_ITEM__LOCAL_IMAGE = MENU_ITEM__LOCAL_IMAGE;

	/**
	 * The feature id for the '<em><b>Enabled</b></em>' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->

	public static final int OPAQUE_MENU_ITEM__TOOLTIP = MENU_ITEM__TOOLTIP;

	/**
	 * The feature id for the '<em><b>Local Label</b></em>' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 * @ordered
	 */
	public static final int OPAQUE_MENU_ITEM__LOCAL_LABEL = MENU_ITEM__LOCAL_LABEL;

	/**
	 * The feature id for the '<em><b>Local Tooltip</b></em>' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 * @ordered
	 */
	public static final int OPAQUE_MENU_ITEM__LOCAL_TOOLTIP = MENU_ITEM__LOCAL_TOOLTIP;

	/**
	 * The feature id for the '<em><b>Local Image</b></em>' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 * @ordered
	 */
	public static final int OPAQUE_MENU_ITEM__LOCAL_IMAGE = MENU_ITEM__LOCAL_IMAGE;

	/**
	 * The feature id for the '<em><b>Enabled</b></em>' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->

	public static final int OPAQUE_MENU_SEPARATOR__TOOLTIP = MENU_SEPARATOR__TOOLTIP;

	/**
	 * The feature id for the '<em><b>Local Label</b></em>' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 * @ordered
	 */
	public static final int OPAQUE_MENU_SEPARATOR__LOCAL_LABEL = MENU_SEPARATOR__LOCAL_LABEL;

	/**
	 * The feature id for the '<em><b>Local Tooltip</b></em>' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 * @ordered
	 */
	public static final int OPAQUE_MENU_SEPARATOR__LOCAL_TOOLTIP = MENU_SEPARATOR__LOCAL_TOOLTIP;

	/**
	 * The feature id for the '<em><b>Local Image</b></em>' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 * @ordered
	 */
	public static final int OPAQUE_MENU_SEPARATOR__LOCAL_IMAGE = MENU_SEPARATOR__LOCAL_IMAGE;

	/**
	 * The feature id for the '<em><b>Mnemonics</b></em>' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->

	public static final int OPAQUE_MENU__TOOLTIP = MENU__TOOLTIP;

	/**
	 * The feature id for the '<em><b>Local Label</b></em>' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 * @ordered
	 */
	public static final int OPAQUE_MENU__LOCAL_LABEL = MENU__LOCAL_LABEL;

	/**
	 * The feature id for the '<em><b>Local Tooltip</b></em>' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 * @ordered
	 */
	public static final int OPAQUE_MENU__LOCAL_TOOLTIP = MENU__LOCAL_TOOLTIP;

	/**
	 * The feature id for the '<em><b>Local Image</b></em>' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 * @ordered
	 */
	public static final int OPAQUE_MENU__LOCAL_IMAGE = MENU__LOCAL_IMAGE;

	/**
	 * The feature id for the '<em><b>Mnemonics</b></em>' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->

Lines 1-9 Link Here

(-)src/org/eclipse/e4/ui/model/internal/ModelUtils.java (+35 lines)
		1	/*******************************************************************************
		2	* Copyright (c) 2010, 2011 IBM Corporation and others.
		3	* All rights reserved. This program and the accompanying materials
		4	* are made available under the terms of the Eclipse Public License v1.0
		5	* which accompanies this distribution, and is available at
		6	* http://www.eclipse.org/legal/epl-v10.html
		7	*
		8	* Contributors:
		9	* IBM Corporation - initial API and implementation
		10	*******************************************************************************/
1	package org.eclipse.e4.ui.model.internal;	11	package org.eclipse.e4.ui.model.internal;
2		12
3	import java.util.ArrayList;	13	import java.util.ArrayList;
4	import java.util.Collections;	14	import java.util.Collections;
5	import java.util.List;	15	import java.util.List;
		16	import org.eclipse.e4.core.contexts.IEclipseContext;
6	import org.eclipse.e4.ui.model.application.MApplicationElement;	17	import org.eclipse.e4.ui.model.application.MApplicationElement;
		18	import org.eclipse.e4.ui.model.application.ui.MContext;
		19	import org.eclipse.e4.ui.model.application.ui.MUIElement;
7	import org.eclipse.emf.common.util.EList;	20	import org.eclipse.emf.common.util.EList;
8	import org.eclipse.emf.ecore.EClass;	21	import org.eclipse.emf.ecore.EClass;
9	import org.eclipse.emf.ecore.EClassifier;	22	import org.eclipse.emf.ecore.EClassifier;
Lines 126-129 Link Here
126		139
127	return Collections.emptyList();	140	return Collections.emptyList();
128	}	141	}
		142
		143	public static IEclipseContext getContainingContext(MUIElement element) {
		144	MUIElement curParent = null;
		145	if (element.getCurSharedRef() != null)
		146	curParent = element.getCurSharedRef().getParent();
		147	else
		148	curParent = (MUIElement) ((EObject) element).eContainer();
		149
		150	while (curParent != null) {
		151	if (curParent instanceof MContext) {
		152	return ((MContext) curParent).getContext();
		153	}
		154
		155	if (curParent.getCurSharedRef() != null)
		156	curParent = curParent.getCurSharedRef().getParent();
		157	else
		158	curParent = (MUIElement) ((EObject) curParent).eContainer();
		159	}
		160
		161	return null;
		162	}
		163
129	}	164	}




	int TEST_HARNESS__TOOLTIP = ApplicationPackageImpl.APPLICATION_ELEMENT_FEATURE_COUNT + 27;

	/**
	 * The feature id for the '<em><b>Local Label</b></em>' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 * @ordered
	 */
	int TEST_HARNESS__LOCAL_LABEL = ApplicationPackageImpl.APPLICATION_ELEMENT_FEATURE_COUNT + 28;

	/**
	 * The feature id for the '<em><b>Local Tooltip</b></em>' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 * @ordered
	 */
	int TEST_HARNESS__LOCAL_TOOLTIP = ApplicationPackageImpl.APPLICATION_ELEMENT_FEATURE_COUNT + 29;

	/**
	 * The feature id for the '<em><b>Local Image</b></em>' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 * @ordered
	 */
	int TEST_HARNESS__LOCAL_IMAGE = ApplicationPackageImpl.APPLICATION_ELEMENT_FEATURE_COUNT + 30;

	/**
	 * The feature id for the '<em><b>Dirty</b></em>' attribute. <!--
	 * begin-user-doc --> <!-- end-user-doc -->
	 * 
	 * @generated
	 * @ordered
	 */
	int TEST_HARNESS__DIRTY = ApplicationPackageImpl.APPLICATION_ELEMENT_FEATURE_COUNT + 28;

	/**
	 * The number of structural features of the '<em>Harness</em>' class. <!--

	 * @generated
	 * @ordered
	 */
	int TEST_HARNESS_FEATURE_COUNT = ApplicationPackageImpl.APPLICATION_ELEMENT_FEATURE_COUNT + 29;

	/**
	 * Returns the meta object for class '{@link org.eclipse.e4.ui.tests.model.test.MTestHarness <em>Harness</em>}'.




 *   <li>{@link org.eclipse.e4.ui.tests.model.test.impl.TestHarnessImpl#getLabel <em>Label</em>}</li>
 *   <li>{@link org.eclipse.e4.ui.tests.model.test.impl.TestHarnessImpl#getIconURI <em>Icon URI</em>}</li>
 *   <li>{@link org.eclipse.e4.ui.tests.model.test.impl.TestHarnessImpl#getTooltip <em>Tooltip</em>}</li>
 *   <li>{@link org.eclipse.e4.ui.tests.model.test.impl.TestHarnessImpl#getLocalLabel <em>Local Label</em>}</li>
 *   <li>{@link org.eclipse.e4.ui.tests.model.test.impl.TestHarnessImpl#getLocalTooltip <em>Local Tooltip</em>}</li>
 *   <li>{@link org.eclipse.e4.ui.tests.model.test.impl.TestHarnessImpl#getLocalImage <em>Local Image</em>}</li>
 *   <li>{@link org.eclipse.e4.ui.tests.model.test.impl.TestHarnessImpl#isDirty <em>Dirty</em>}</li>
 * </ul>
 * </p>

	 */
	protected String tooltip = TOOLTIP_EDEFAULT;
	/**
	 * The default value of the '{@link #getLocalLabel() <em>Local Label</em>}' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @see #getLocalLabel()
	 * @generated
	 * @ordered
	 */
	protected static final String LOCAL_LABEL_EDEFAULT = null;
	/**
	 * The cached value of the '{@link #getLocalLabel() <em>Local Label</em>}' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @see #getLocalLabel()
	 * @generated
	 * @ordered
	 */
	protected String localLabel = LOCAL_LABEL_EDEFAULT;
	/**
	 * The default value of the '{@link #getLocalTooltip() <em>Local Tooltip</em>}' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @see #getLocalTooltip()
	 * @generated
	 * @ordered
	 */
	protected static final String LOCAL_TOOLTIP_EDEFAULT = null;
	/**
	 * The cached value of the '{@link #getLocalTooltip() <em>Local Tooltip</em>}' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @see #getLocalTooltip()
	 * @generated
	 * @ordered
	 */
	protected String localTooltip = LOCAL_TOOLTIP_EDEFAULT;
	/**
	 * The default value of the '{@link #getLocalImage() <em>Local Image</em>}' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @see #getLocalImage()
	 * @generated
	 * @ordered
	 */
	protected static final Object LOCAL_IMAGE_EDEFAULT = null;
	/**
	 * The cached value of the '{@link #getLocalImage() <em>Local Image</em>}' attribute.
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @see #getLocalImage()
	 * @generated
	 * @ordered
	 */
	protected Object localImage = LOCAL_IMAGE_EDEFAULT;
	/**
	 * The default value of the '{@link #isDirty() <em>Dirty</em>}' attribute.
	 * <!-- begin-user-doc --> <!-- end-user-doc -->
	 * @see #isDirty()

	}

	/**
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 */
	public String getLocalizedLabel() {
		// TODO: implement this method
		// Ensure that you remove @generated or mark it @generated NOT
		throw new UnsupportedOperationException();
	}

	/**
	 * <!-- begin-user-doc -->
	 * <!-- end-user-doc -->
	 * @generated
	 */
	public String getLocalizedTooltip() {
		// TODO: implement this method
		// Ensure that you remove @generated or mark it @generated NOT
		throw new UnsupportedOperationException();
	}

	/**
	 * <!-- begin-user-doc --> <!-- end-user-doc -->
	 * @generated
	 */

				return getIconURI();
			case MTestPackage.TEST_HARNESS__TOOLTIP:
				return getTooltip();
			case MTestPackage.TEST_HARNESS__LOCAL_LABEL:
				return getLocalLabel();
			case MTestPackage.TEST_HARNESS__LOCAL_TOOLTIP:
				return getLocalTooltip();
			case MTestPackage.TEST_HARNESS__LOCAL_IMAGE:
				return getLocalImage();
			case MTestPackage.TEST_HARNESS__DIRTY:
				return isDirty();
		}

			case MTestPackage.TEST_HARNESS__TOOLTIP:
				setTooltip((String)newValue);
				return;
			case MTestPackage.TEST_HARNESS__LOCAL_LABEL:
				setLocalLabel((String)newValue);
				return;
			case MTestPackage.TEST_HARNESS__LOCAL_TOOLTIP:
				setLocalTooltip((String)newValue);
				return;
			case MTestPackage.TEST_HARNESS__LOCAL_IMAGE:
				setLocalImage(newValue);
				return;
			case MTestPackage.TEST_HARNESS__DIRTY:
				setDirty((Boolean)newValue);
				return;

			case MTestPackage.TEST_HARNESS__TOOLTIP:
				setTooltip(TOOLTIP_EDEFAULT);
				return;
			case MTestPackage.TEST_HARNESS__LOCAL_LABEL:
				setLocalLabel(LOCAL_LABEL_EDEFAULT);
				return;
			case MTestPackage.TEST_HARNESS__LOCAL_TOOLTIP:
				setLocalTooltip(LOCAL_TOOLTIP_EDEFAULT);
				return;
			case MTestPackage.TEST_HARNESS__LOCAL_IMAGE:
				setLocalImage(LOCAL_IMAGE_EDEFAULT);
				return;
			case MTestPackage.TEST_HARNESS__DIRTY:
				setDirty(DIRTY_EDEFAULT);
				return;

				return ICON_URI_EDEFAULT == null ? iconURI != null : !ICON_URI_EDEFAULT.equals(iconURI);
			case MTestPackage.TEST_HARNESS__TOOLTIP:
				return TOOLTIP_EDEFAULT == null ? tooltip != null : !TOOLTIP_EDEFAULT.equals(tooltip);
			case MTestPackage.TEST_HARNESS__LOCAL_LABEL:
				return LOCAL_LABEL_EDEFAULT == null ? localLabel != null : !LOCAL_LABEL_EDEFAULT.equals(localLabel);
			case MTestPackage.TEST_HARNESS__LOCAL_TOOLTIP:
				return LOCAL_TOOLTIP_EDEFAULT == null ? localTooltip != null : !LOCAL_TOOLTIP_EDEFAULT.equals(localTooltip);
			case MTestPackage.TEST_HARNESS__LOCAL_IMAGE:
				return LOCAL_IMAGE_EDEFAULT == null ? localImage != null : !LOCAL_IMAGE_EDEFAULT.equals(localImage);
			case MTestPackage.TEST_HARNESS__DIRTY:
				return dirty != DIRTY_EDEFAULT;
		}

				case MTestPackage.TEST_HARNESS__LABEL: return UiPackageImpl.UI_LABEL__LABEL;
				case MTestPackage.TEST_HARNESS__ICON_URI: return UiPackageImpl.UI_LABEL__ICON_URI;
				case MTestPackage.TEST_HARNESS__TOOLTIP: return UiPackageImpl.UI_LABEL__TOOLTIP;
				case MTestPackage.TEST_HARNESS__LOCAL_LABEL: return UiPackageImpl.UI_LABEL__LOCAL_LABEL;
				case MTestPackage.TEST_HARNESS__LOCAL_TOOLTIP: return UiPackageImpl.UI_LABEL__LOCAL_TOOLTIP;
				case MTestPackage.TEST_HARNESS__LOCAL_IMAGE: return UiPackageImpl.UI_LABEL__LOCAL_IMAGE;
				default: return -1;
			}
		}

				case UiPackageImpl.UI_LABEL__LABEL: return MTestPackage.TEST_HARNESS__LABEL;
				case UiPackageImpl.UI_LABEL__ICON_URI: return MTestPackage.TEST_HARNESS__ICON_URI;
				case UiPackageImpl.UI_LABEL__TOOLTIP: return MTestPackage.TEST_HARNESS__TOOLTIP;
				case UiPackageImpl.UI_LABEL__LOCAL_LABEL: return MTestPackage.TEST_HARNESS__LOCAL_LABEL;
				case UiPackageImpl.UI_LABEL__LOCAL_TOOLTIP: return MTestPackage.TEST_HARNESS__LOCAL_TOOLTIP;
				case UiPackageImpl.UI_LABEL__LOCAL_IMAGE: return MTestPackage.TEST_HARNESS__LOCAL_IMAGE;
				default: return -1;
			}
		}

		result.append(iconURI);
		result.append(", tooltip: ");
		result.append(tooltip);
		result.append(", localLabel: ");
		result.append(localLabel);
		result.append(", localTooltip: ");
		result.append(localTooltip);
		result.append(", localImage: ");
		result.append(localImage);
		result.append(", dirty: ");
		result.append(dirty);
		result.append(')');




import org.eclipse.e4.core.contexts.IEclipseContext;
import org.eclipse.e4.core.di.annotations.Execute;
import org.eclipse.e4.ui.model.application.MApplication;
import org.eclipse.e4.ui.model.application.ui.MContext;
import org.eclipse.e4.ui.model.application.ui.MElementContainer;
import org.eclipse.e4.ui.model.application.ui.MGenericTile;
import org.eclipse.e4.ui.model.application.ui.MUIElement;

import org.eclipse.e4.ui.model.application.ui.basic.MWindowElement;
import org.eclipse.e4.ui.model.application.ui.basic.impl.BasicFactoryImpl;
import org.eclipse.e4.ui.model.application.ui.menu.MToolControl;
import org.eclipse.e4.ui.model.internal.ModelUtils;
import org.eclipse.e4.ui.workbench.IPresentationEngine;
import org.eclipse.e4.ui.workbench.modeling.EModelService;
import org.eclipse.emf.ecore.EObject;

	 * .model .application.MUIElement)
	 */
	public IEclipseContext getContainingContext(MUIElement element) {
		return ModelUtils.getContainingContext(element);
		if (element.getCurSharedRef() != null)
			curParent = element.getCurSharedRef().getParent();
		else
			curParent = (MUIElement) ((EObject) element).eContainer();

		while (curParent != null) {
			if (curParent instanceof MContext) {
				return ((MContext) curParent).getContext();
			}

			if (curParent.getCurSharedRef() != null)
				curParent = curParent.getCurSharedRef().getParent();
			else
				curParent = (MUIElement) ((EObject) curParent).eContainer();
		}

		return null;
	}

	/*




			if (desc != null) {
				psItem.setImage(desc.createImage(false));
				foundImage = true;
				psItem.setToolTipText(persp.getLocalizedLabel());
			}
		}
		if (!foundImage
				|| PrefUtil.getAPIPreferenceStore().getBoolean(
						IWorkbenchPreferenceConstants.SHOW_TEXT_ON_PERSPECTIVE_BAR)) {
			psItem.setText(persp.getLocalizedLabel());
			psItem.setToolTipText(persp.getLocalizedTooltip());
		}

		psItem.setSelection(persp == persp.getParent().getSelectedElement());

					return;
				IWorkbenchPage page = persp.getContext().get(IWorkbenchPage.class);
				String message = NLS.bind(WorkbenchMessages.ResetPerspective_message,
						persp.getLocalizedLabel());
				if (MessageDialog.openConfirm(page.getWorkbenchWindow().getShell(),
						WorkbenchMessages.ResetPerspective_title, message)) {
					page.resetPerspective();

			if (persp != null)
				if (showText) {
					if (persp.getLabel() != null)
						items[i].setText(persp.getLocalizedLabel());
					items[i].setToolTipText(persp.getLocalizedTooltip());
				} else {
					Image image = items[i].getImage();
					if (image != null) {
						items[i].setText("");
						items[i].setToolTipText(persp.getLocalizedLabel());
					}
				}
		}




			String attName = (String) event
					.getProperty(UIEvents.EventTags.ATTNAME);
			if (UIEvents.UILabel.LABEL.equals(attName)) {
				areaItem.setText(areaModel.getLocalizedLabel());
			} else if (UIEvents.UILabel.ICONURI.equals(attName)) {
				areaItem.setImage(getImage(areaModel));
			} else if (UIEvents.UILabel.TOOLTIP.equals(attName)) {
				areaItem.setToolTipText(areaModel.getLocalizedTooltip());
			}
		}
	};


		CTabItem cti = new CTabItem(ctf, SWT.NONE);
		if (areaModel.getLabel() != null)
			cti.setText(areaModel.getLocalizedLabel());
		if (areaModel.getTooltip() != null)
			cti.setToolTipText(areaModel.getLocalizedTooltip());
		if (areaModel.getIconURI() != null)
			cti.setImage(getImage(areaModel));






	private void updateMenuItem() {
		MenuItem item = (MenuItem) widget;
		String text = model.getLocalizedLabel();
		if (text != null) {
			item.setText(text);
		} else {


	private void updateToolItem() {
		ToolItem item = (ToolItem) widget;
		final String text = model.getLocalizedLabel();
		if (text != null) {
			item.setText(text);
		} else {
			item.setText(""); //$NON-NLS-1$
		}
		final String tooltip = model.getLocalizedTooltip();
		item.setToolTipText(tooltip);

		item.setSelection(model.isSelected());





	private void updateMenuItem() {
		MenuItem item = (MenuItem) widget;
		String text = model.getLocalizedLabel();
		ParameterizedCommand parmCmd = model.getWbCommand();
		String keyBindingText = null;
		if (parmCmd != null) {


	private void updateToolItem() {
		ToolItem item = (ToolItem) widget;
		final String text = model.getLocalizedLabel();
		if (text != null) {
			item.setText(text);
		} else {
			item.setText(""); //$NON-NLS-1$
		}
		final String tooltip = model.getLocalizedTooltip();
		item.setToolTipText(tooltip);
		item.setSelection(model.isSelected());
		item.setEnabled(model.isEnabled());

Lines 94-100 Link Here

(-)src/org/eclipse/e4/ui/workbench/renderers/swt/HandledMenuItemRenderer.java (-1 / +1 lines)
94	}	94	}
95		95
96	protected void setItemText(MMenuItem model, MenuItem item) {	96	protected void setItemText(MMenuItem model, MenuItem item) {
97	String text = model.getLabel();	97	String text = model.getLocalizedLabel();
98	if (model instanceof MHandledItem) {	98	if (model instanceof MHandledItem) {
99	MHandledItem handledItem = (MHandledItem) model;	99	MHandledItem handledItem = (MHandledItem) model;
100	IEclipseContext context = getContext(model);	100	IEclipseContext context = getContext(model);




 *******************************************************************************/
package org.eclipse.e4.ui.workbench.renderers.swt;

import org.eclipse.e4.ui.internal.workbench.swt.WorkbenchSWTActivator;

import java.util.HashMap;
import javax.annotation.PostConstruct;
import javax.annotation.PreDestroy;

import org.eclipse.e4.core.contexts.RunAndTrack;
import org.eclipse.e4.core.services.events.IEventBroker;
import org.eclipse.e4.core.services.log.Logger;
import org.eclipse.e4.ui.internal.workbench.swt.WorkbenchSWTActivator;
import org.eclipse.e4.ui.model.application.ui.MCoreExpression;
import org.eclipse.e4.ui.model.application.ui.MElementContainer;
import org.eclipse.e4.ui.model.application.ui.MUIElement;

	}

	protected void setItemText(MMenuItem model, MenuItem item) {
		String text = model.getLocalizedLabel();
		if (text == null) {
			text = ""; //$NON-NLS-1$
		}

Lines 750-756 Link Here

(-)src/org/eclipse/e4/ui/workbench/renderers/swt/MenuManagerRenderer.java (-1 / +1 lines)
750	}	750	}
751		751
752	private String getText(MMenu menuModel) {	752	private String getText(MMenu menuModel) {
753	String text = menuModel.getLabel();	753	String text = menuModel.getLocalizedLabel();
754	if (text == null \|\| text.length() == 0) {	754	if (text == null \|\| text.length() == 0) {
755	return NO_LABEL;	755	return NO_LABEL;
756	}	756	}

Lines 191-197 Link Here

(-)src/org/eclipse/e4/ui/workbench/renderers/swt/MenuRenderer.java (-1 / +1 lines)
191	}	191	}
192		192
193	private void setItemText(MMenu model, MenuItem item) {	193	private void setItemText(MMenu model, MenuItem item) {
194	String text = model.getLabel();	194	String text = model.getLocalizedLabel();
195	if (text == null) {	195	if (text == null) {
196	text = ""; //$NON-NLS-1$	196	text = ""; //$NON-NLS-1$
197	}	197	}

Lines 75-81 Link Here

(-)src/org/eclipse/e4/ui/workbench/renderers/swt/RenderedMenuRenderer.java (-1 / +1 lines)
75	}	75	}
76		76
77	private void setItemText(MMenu model, MenuItem item) {	77	private void setItemText(MMenu model, MenuItem item) {
78	String text = model.getLabel();	78	String text = model.getLocalizedLabel();
79	if (text == null) {	79	if (text == null) {
80	text = ""; //$NON-NLS-1$	80	text = ""; //$NON-NLS-1$
81	}	81	}

Lines 140-146 Link Here

(-)src/org/eclipse/e4/ui/workbench/renderers/swt/SWTPartRenderer.java (-2 / +3 lines)
140	if (logService != null) {	140	if (logService != null) {
141	String msg = "Error disposing widget for : " + element.getClass().getName(); //$NON-NLS-1$	141	String msg = "Error disposing widget for : " + element.getClass().getName(); //$NON-NLS-1$
142	if (element instanceof MUILabel) {	142	if (element instanceof MUILabel) {
143	msg += ' ' + ((MUILabel) element).getLabel();	143	msg += ' ' + ((MUILabel) element)
		144	.getLocalizedLabel();
144	}	145	}
145	logService.error(e, msg);	146	logService.error(e, msg);
146	}	147	}
Lines 159-165 Link Here
159	((Control) widget).getAccessible().addAccessibleListener(	160	((Control) widget).getAccessible().addAccessibleListener(
160	new AccessibleAdapter() {	161	new AccessibleAdapter() {
161	public void getName(AccessibleEvent e) {	162	public void getName(AccessibleEvent e) {
162	e.result = ((MUILabel) me).getLabel();	163	e.result = ((MUILabel) me).getLocalizedLabel();
163	}	164	}
164	});	165	});
165	}	166	}

Lines 325-333 Link Here

(-)src/org/eclipse/e4/ui/workbench/renderers/swt/StackRenderer.java (-2 / +2 lines)
325	cti = new CTabItem(ctf, createFlags, index);	325	cti = new CTabItem(ctf, createFlags, index);
326		326
327	cti.setData(OWNING_ME, element);	327	cti.setData(OWNING_ME, element);
328	cti.setText(getLabel(part, part.getLabel()));	328	cti.setText(getLabel(part, part.getLocalizedLabel()));
329	cti.setImage(getImage(part));	329	cti.setImage(getImage(part));
330	cti.setToolTipText(part.getTooltip());	330	cti.setToolTipText(part.getLocalizedTooltip());
331	if (element.getWidget() != null) {	331	if (element.getWidget() != null) {
332	// The part might have a widget but may not yet have been placed	332	// The part might have a widget but may not yet have been placed
333	// under this stack, check this	333	// under this stack, check this




	}

	private void setItemText(MToolItem model, ToolItem item) {
		String text = model.getLocalizedLabel();
		if (model instanceof MHandledItem) {
			MHandledItem handledItem = (MHandledItem) model;
			IEclipseContext context = getContext(model);

	}

	private String getToolTipText(MItem item) {
		String text = item.getLocalizedTooltip();
		if (item instanceof MHandledItem) {
			MHandledItem handledItem = (MHandledItem) item;
			IEclipseContext context = getContext(item);


		ToolItem newItem = new ToolItem((ToolBar) parent, flags, addIndex);
		if (itemModel.getLabel() != null)
			newItem.setText(itemModel.getLocalizedLabel());

		newItem.setToolTipText(getToolTipText(itemModel));


Lines 376-382 Link Here

(-)src/org/eclipse/e4/ui/workbench/renderers/swt/WBWRenderer.java (-2 / +2 lines)
376	});	376	});
377		377
378	if (wbwModel.getLabel() != null)	378	if (wbwModel.getLabel() != null)
379	wbwShell.setText(wbwModel.getLabel());	379	wbwShell.setText(wbwModel.getLocalizedLabel());
380		380
381	wbwShell.setImage(getImage(wbwModel));	381	wbwShell.setImage(getImage(wbwModel));
382	// TODO: This should be added to the model, see bug 308494	382	// TODO: This should be added to the model, see bug 308494
Lines 608-614 Link Here
608	tableViewer.setLabelProvider(new LabelProvider() {	608	tableViewer.setLabelProvider(new LabelProvider() {
609	@Override	609	@Override
610	public String getText(Object element) {	610	public String getText(Object element) {
611	return ((MPart) element).getLabel();	611	return ((MPart) element).getLocalizedLabel();
612	}	612	}
613	});	613	});
614	tableViewer.setContentProvider(ArrayContentProvider.getInstance());	614	tableViewer.setContentProvider(ArrayContentProvider.getInstance());




 *******************************************************************************/
package org.eclipse.e4.ui.workbench.swt.internal.copy;

import org.eclipse.e4.ui.internal.workbench.swt.WorkbenchSWTActivator;

import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import org.eclipse.e4.core.contexts.IEclipseContext;
import org.eclipse.e4.ui.internal.workbench.swt.WorkbenchSWTActivator;
import org.eclipse.e4.ui.model.LocalizationHelper;
import org.eclipse.e4.ui.model.application.MApplication;
import org.eclipse.e4.ui.model.application.descriptor.basic.MPartDescriptor;
import org.eclipse.jface.dialogs.Dialog;

	 *            the parent <code>Composite</code>.
	 */
	private void createFilteredTreeViewer(Composite parent) {
		PatternFilter filter = new ViewPatternFilter(context);
		int styleBits = SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL | SWT.BORDER;
		filteredTree = new FilteredTree(parent, styleBits, filter, true);
		filteredTree.setBackground(parent.getDisplay().getSystemColor(

	public void selectionChanged(SelectionChangedEvent event) {
		updateSelection(event);
		updateButtons();
		String tooltip = "";
		if (viewDescs.length > 0) {
			tooltip = viewDescs[0].getTooltip();
			tooltip = LocalizationHelper.getLocalized(tooltip, viewDescs[0],
					context);
		}
		boolean hasTooltip = (tooltip == null) ? false : tooltip.length() > 0;
		descriptionHint.setVisible(viewDescs.length == 1 && hasTooltip);
	}

				Object o = selection.getFirstElement();
				if (o instanceof MPartDescriptor) {
					String description = ((MPartDescriptor) o).getTooltip();
					description = LocalizationHelper.getLocalized(description,
							(MPartDescriptor) o, context);
					if (description != null && description.length() == 0)
						description = WorkbenchSWTMessages.ShowView_noDesc;
					popUp(description);





		String str1;
		if (e1 instanceof MPartDescriptor)
			str1 = ((MPartDescriptor) e1).getLocalizedLabel();
		else
			str1 = e1.toString();

		String str2;
		if (e2 instanceof MPartDescriptor)
			str2 = ((MPartDescriptor) e2).getLocalizedLabel();
		else
			str2 = e2.toString();
		if (str1 == null)

Lines 102-109 Link Here

(-)src/org/eclipse/e4/ui/workbench/swt/internal/copy/ViewLabelProvider.java (-3 / +3 lines)
102	} else if (element instanceof String) {	102	} else if (element instanceof String) {
103	Image image = imageMap.get(FOLDER_ICON);	103	Image image = imageMap.get(FOLDER_ICON);
104	if (image == null) {	104	if (image == null) {
105	image = JFaceResources.getImageRegistry().getDescriptor(	105	image = JFaceResources.getImageRegistry()
106	FOLDER_ICON).createImage();	106	.getDescriptor(FOLDER_ICON).createImage();
107	imageMap.put(FOLDER_ICON, image);	107	imageMap.put(FOLDER_ICON, image);
108	}	108	}
109	return image;	109	return image;
Lines 121-127 Link Here
121	if (element instanceof String) {	121	if (element instanceof String) {
122	label = (String) element;	122	label = (String) element;
123	} else if (element instanceof MPartDescriptor) {	123	} else if (element instanceof MPartDescriptor) {
124	label = ((MPartDescriptor) element).getLabel();	124	label = ((MPartDescriptor) element).getLocalizedLabel();
125	}	125	}
126	return label;	126	return label;
127	}	127	}

Lines 10-15 Link Here

(-)src/org/eclipse/e4/ui/workbench/swt/internal/copy/ViewPatternFilter.java (-2 / +8 lines)
10	*******************************************************************************/	10	*******************************************************************************/
11	package org.eclipse.e4.ui.workbench.swt.internal.copy;	11	package org.eclipse.e4.ui.workbench.swt.internal.copy;
12		12
		13	import org.eclipse.e4.core.contexts.IEclipseContext;
		14	import org.eclipse.e4.ui.model.LocalizationHelper;
13	import org.eclipse.e4.ui.model.application.descriptor.basic.MPartDescriptor;	15	import org.eclipse.e4.ui.model.application.descriptor.basic.MPartDescriptor;
14	import org.eclipse.jface.viewers.Viewer;	16	import org.eclipse.jface.viewers.Viewer;
15		17
Lines 18-28 Link Here
18	*/	20	*/
19	public class ViewPatternFilter extends PatternFilter {	21	public class ViewPatternFilter extends PatternFilter {
20		22
		23	private IEclipseContext context;
		24
21	/**	25	/**
22	* Create a new instance of a ViewPatternFilter	26	* Create a new instance of a ViewPatternFilter
23	*/	27	*/
24	public ViewPatternFilter() {	28	public ViewPatternFilter(IEclipseContext context) {
25	super();	29	super();
		30	this.context = context;
26	}	31	}
27		32
28	/*	33	/*
Lines 51-57 Link Here
51	String text = null;	56	String text = null;
52	if (element instanceof MPartDescriptor) {	57	if (element instanceof MPartDescriptor) {
53	MPartDescriptor desc = (MPartDescriptor) element;	58	MPartDescriptor desc = (MPartDescriptor) element;
54	text = desc.getLabel();	59	text = LocalizationHelper.getLocalized(desc.getLabel(), desc,
		60	context);
55	if (wordMatches(text)) {	61	if (wordMatches(text)) {
56	return true;	62	return true;
57	}	63	}




	public String getName() {
		IEditorPart editor = getEditor(false);
		if (input == null) {
			return editor == null ? getModel().getLocalizedLabel() : editor.getEditorInput()
					.getName();
		}
		return editor == null ? input.getName() : editor.getEditorInput().getName();
	}

	public String getTitle() {
		String label = Util.safeString(getModel().getLocalizedLabel());
		if (label.length() == 0) {
			if (input == null) {
				if (descriptor != null) {

Lines 326-332 Link Here

(-)Eclipse UI/org/eclipse/ui/internal/PartSite.java (-1 / +1 lines)
326	* @see org.eclipse.ui.IWorkbenchPartSite#getRegisteredName()	326	* @see org.eclipse.ui.IWorkbenchPartSite#getRegisteredName()
327	*/	327	*/
328	public String getRegisteredName() {	328	public String getRegisteredName() {
329	return element == null ? model.getLabel() : element	329	return element == null ? model.getLocalizedLabel() : element
330	.getAttribute(IWorkbenchRegistryConstants.ATT_NAME);	330	.getAttribute(IWorkbenchRegistryConstants.ATT_NAME);
331	}	331	}
332		332

Lines 12-20 Link Here

(-)Eclipse UI/org/eclipse/ui/internal/WorkbenchPartReference.java (-6 / +5 lines)
12	*******************************************************************************/	12	*******************************************************************************/
13	package org.eclipse.ui.internal;	13	package org.eclipse.ui.internal;
14		14
15	import org.eclipse.e4.ui.workbench.modeling.EPartService;
16	import org.eclipse.e4.ui.workbench.modeling.EPartService.PartState;
17
18	import java.util.HashMap;	15	import java.util.HashMap;
19	import java.util.Iterator;	16	import java.util.Iterator;
20	import java.util.Map;	17	import java.util.Map;
Lines 25-30 Link Here
25	import org.eclipse.e4.core.services.events.IEventBroker;	22	import org.eclipse.e4.core.services.events.IEventBroker;
26	import org.eclipse.e4.ui.model.application.ui.basic.MPart;	23	import org.eclipse.e4.ui.model.application.ui.basic.MPart;
27	import org.eclipse.e4.ui.workbench.UIEvents;	24	import org.eclipse.e4.ui.workbench.UIEvents;
		25	import org.eclipse.e4.ui.workbench.modeling.EPartService;
		26	import org.eclipse.e4.ui.workbench.modeling.EPartService.PartState;
28	import org.eclipse.jface.resource.ImageDescriptor;	27	import org.eclipse.jface.resource.ImageDescriptor;
29	import org.eclipse.jface.resource.JFaceResources;	28	import org.eclipse.jface.resource.JFaceResources;
30	import org.eclipse.jface.util.IPropertyChangeListener;	29	import org.eclipse.jface.util.IPropertyChangeListener;
Lines 357-363 Link Here
357	* @see org.eclipse.ui.IWorkbenchPartReference#getTitle()	356	* @see org.eclipse.ui.IWorkbenchPartReference#getTitle()
358	*/	357	*/
359	public String getTitle() {	358	public String getTitle() {
360	String title = legacyPart == null ? part.getLabel() : legacyPart.getTitle();	359	String title = legacyPart == null ? part.getLocalizedLabel() : legacyPart.getTitle();
361	return Util.safeString(title);	360	return Util.safeString(title);
362	}	361	}
363		362
Lines 367-373 Link Here
367	* @see org.eclipse.ui.IWorkbenchPartReference#getTitleToolTip()	366	* @see org.eclipse.ui.IWorkbenchPartReference#getTitleToolTip()
368	*/	367	*/
369	public String getTitleToolTip() {	368	public String getTitleToolTip() {
370	String toolTip = part.getTooltip();	369	String toolTip = part.getLocalizedTooltip();
371	return Util.safeString(toolTip);	370	return Util.safeString(toolTip);
372	}	371	}
373		372
Lines 637-643 Link Here
637	* @see org.eclipse.ui.IWorkbenchPartReference#getPartName()	636	* @see org.eclipse.ui.IWorkbenchPartReference#getPartName()
638	*/	637	*/
639	public String getPartName() {	638	public String getPartName() {
640	return part.getLabel();	639	return part.getLocalizedLabel();
641	}	640	}
642		641
643	/*	642	/*

Lines 457-463 Link Here

(-)Eclipse UI/org/eclipse/ui/internal/WorkbenchWindow.java (-1 / +1 lines)
457	LabelProvider labelProvider = new LabelProvider() {	457	LabelProvider labelProvider = new LabelProvider() {
458	@Override	458	@Override
459	public String getText(Object element) {	459	public String getText(Object element) {
460	return ((MPart) element).getLabel();	460	return ((MPart) element).getLocalizedLabel();
461	}	461	}
462	};	462	};
463	List<MPart> parts = new ArrayList<MPart>(dirtyParts);	463	List<MPart> parts = new ArrayList<MPart>(dirtyParts);

Lines 105-111 Link Here

(-)Eclipse UI/org/eclipse/ui/internal/e4/compatibility/CompatibilityPart.java (-1 / +1 lines)
105	} catch (Exception e) {	105	} catch (Exception e) {
106	if (logger != null) {	106	if (logger != null) {
107	String msg = "Error setting focus to : " + part.getClass().getName(); //$NON-NLS-1$	107	String msg = "Error setting focus to : " + part.getClass().getName(); //$NON-NLS-1$
108	msg += ' ' + part.getLabel();	108	msg += ' ' + part.getLocalizedLabel();
109	logger.error(e, msg);	109	logger.error(e, msg);
110	}	110	}
111	}	111	}

Lines 13-18 Link Here

(-)Eclipse UI/org/eclipse/ui/internal/quickaccess/ViewElement.java (-1 / +2 lines)
13		13
14	import java.net.MalformedURLException;	14	import java.net.MalformedURLException;
15	import java.net.URL;	15	import java.net.URL;
		16	import org.eclipse.e4.ui.model.LocalizationHelper;
16	import org.eclipse.e4.ui.model.application.descriptor.basic.MPartDescriptor;	17	import org.eclipse.e4.ui.model.application.descriptor.basic.MPartDescriptor;
17	import org.eclipse.e4.ui.model.application.ui.advanced.MPlaceholder;	18	import org.eclipse.e4.ui.model.application.ui.advanced.MPlaceholder;
18	import org.eclipse.e4.ui.model.application.ui.basic.MPart;	19	import org.eclipse.e4.ui.model.application.ui.basic.MPart;
Lines 87-93 Link Here
87		88
88	@Override	89	@Override
89	public String getLabel() {	90	public String getLabel() {
90	return viewDescriptor.getLabel();	91	return LocalizationHelper.getLocalized(viewDescriptor.getLabel(), viewDescriptor, window.getContext());
91	}	92	}
92		93
93	public int hashCode() {	94	public int hashCode() {




 *******************************************************************************/
package org.eclipse.ui.internal.registry;

import org.eclipse.e4.ui.workbench.IResourceUtilities;

import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IConfigurationElement;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
import org.eclipse.e4.ui.model.LocalizationHelper;
import org.eclipse.e4.ui.model.application.MApplication;
import org.eclipse.e4.ui.model.application.descriptor.basic.MPartDescriptor;
import org.eclipse.e4.ui.workbench.IResourceUtilities;
import org.eclipse.e4.ui.workbench.swt.util.ISWTResourceUtilities;
import org.eclipse.emf.common.util.URI;
import org.eclipse.jface.resource.ImageDescriptor;

	 * @see org.eclipse.ui.views.IViewDescriptor#getLabel()
	 */
	public String getLabel() {
		return LocalizationHelper.getLocalized(descriptor.getLabel(), descriptor,
				application.getContext());
	}

	/*

Return to bug 331260

Lines 223-229 Link Here

(-)src/org/eclipse/e4/ui/workbench/renderers/swt/HandledContributionItem.java (-3 / +3 lines)
223		223
224	private void updateMenuItem() {	224	private void updateMenuItem() {
225	MenuItem item = (MenuItem) widget;	225	MenuItem item = (MenuItem) widget;
226	String text = model.getLabel();	226	String text = model.getLocalizedLabel();
227	ParameterizedCommand parmCmd = model.getWbCommand();	227	ParameterizedCommand parmCmd = model.getWbCommand();
228	String keyBindingText = null;	228	String keyBindingText = null;
229	if (parmCmd != null) {	229	if (parmCmd != null) {
Lines 255-267 Link Here
255		255
256	private void updateToolItem() {	256	private void updateToolItem() {
257	ToolItem item = (ToolItem) widget;	257	ToolItem item = (ToolItem) widget;
258	final String text = model.getLabel();	258	final String text = model.getLocalizedLabel();
259	if (text != null) {	259	if (text != null) {
260	item.setText(text);	260	item.setText(text);
261	} else {	261	} else {
262	item.setText(""); //$NON-NLS-1$	262	item.setText(""); //$NON-NLS-1$
263	}	263	}
264	final String tooltip = model.getTooltip();	264	final String tooltip = model.getLocalizedTooltip();
265	item.setToolTipText(tooltip);	265	item.setToolTipText(tooltip);
266	item.setSelection(model.isSelected());	266	item.setSelection(model.isSelected());
267	item.setEnabled(model.isEnabled());	267	item.setEnabled(model.isEnabled());

Lines 171-183 Link Here

(-)Eclipse UI/org/eclipse/ui/internal/EditorReference.java (-2 / +3 lines)
171	public String getName() {	171	public String getName() {
172	IEditorPart editor = getEditor(false);	172	IEditorPart editor = getEditor(false);
173	if (input == null) {	173	if (input == null) {
174	return editor == null ? getModel().getLabel() : editor.getEditorInput().getName();	174	return editor == null ? getModel().getLocalizedLabel() : editor.getEditorInput()
		175	.getName();
175	}	176	}
176	return editor == null ? input.getName() : editor.getEditorInput().getName();	177	return editor == null ? input.getName() : editor.getEditorInput().getName();
177	}	178	}
178		179
179	public String getTitle() {	180	public String getTitle() {
180	String label = Util.safeString(getModel().getLabel());	181	String label = Util.safeString(getModel().getLocalizedLabel());
181	if (label.length() == 0) {	182	if (label.length() == 0) {
182	if (input == null) {	183	if (input == null) {
183	if (descriptor != null) {	184	if (descriptor != null) {

Lines 1-25 Link Here

(-)Application.e4xmi (-9 / +9 lines)
1	<?xml version="1.0" encoding="ASCII"?>	1	<?xml version="1.0" encoding="ASCII"?>
2	<application:Application xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:application="http://www.eclipse.org/ui/2010/UIModel/application" xmlns:basic="http://www.eclipse.org/ui/2010/UIModel/application/ui/basic" xmlns:menu="http://www.eclipse.org/ui/2010/UIModel/application/ui/menu" xsi:schemaLocation="http://www.eclipse.org/ui/2010/UIModel/application/ui/basic http://www.eclipse.org/ui/2010/UIModel/application#//ui/basic http://www.eclipse.org/ui/2010/UIModel/application/ui/menu http://www.eclipse.org/ui/2010/UIModel/application#//ui/menu" xmi:id="_GRxcMXk5Ed-55voCTyIpVQ">	2	<application:Application xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:application="http://www.eclipse.org/ui/2010/UIModel/application" xmlns:basic="http://www.eclipse.org/ui/2010/UIModel/application/ui/basic" xmlns:menu="http://www.eclipse.org/ui/2010/UIModel/application/ui/menu" xsi:schemaLocation="http://www.eclipse.org/ui/2010/UIModel/application/ui/basic http://www.eclipse.org/ui/2010/UIModel/application#//ui/basic http://www.eclipse.org/ui/2010/UIModel/application/ui/menu http://www.eclipse.org/ui/2010/UIModel/application#//ui/menu" xmi:id="_GRxcMXk5Ed-55voCTyIpVQ">
3	<children xsi:type="basic:TrimmedWindow" xmi:id="_SeXUAe8EEd6FC9cDb6iV7g" elementId="_SeXUAe8EEd6FC9cDb6iV7g" label="e4 Contacts Demo" x="20" y="20" width="700" height="480">	3	<children xsi:type="basic:TrimmedWindow" xmi:id="_SeXUAe8EEd6FC9cDb6iV7g" elementId="_SeXUAe8EEd6FC9cDb6iV7g" label="%windowTitle" x="20" y="20" width="700" height="480">
4	<children xsi:type="basic:PartSashContainer" xmi:id="_SeXUCu8EEd6FC9cDb6iV7g" elementId="_SeXUCu8EEd6FC9cDb6iV7g" horizontal="true">	4	<children xsi:type="basic:PartSashContainer" xmi:id="_SeXUCu8EEd6FC9cDb6iV7g" elementId="_SeXUCu8EEd6FC9cDb6iV7g" horizontal="true">
5	<children xsi:type="basic:PartStack" xmi:id="_SeXUC-8EEd6FC9cDb6iV7g" elementId="_SeXUC-8EEd6FC9cDb6iV7g" containerData="30">	5	<children xsi:type="basic:PartStack" xmi:id="_SeXUC-8EEd6FC9cDb6iV7g" elementId="_SeXUC-8EEd6FC9cDb6iV7g" containerData="30">
6	<children xsi:type="basic:Part" xmi:id="_SeXUDO8EEd6FC9cDb6iV7g" elementId="ContactsView" contributionURI="platform:/plugin/org.eclipse.e4.demo.contacts/org.eclipse.e4.demo.contacts.views.ListView" label="Contacts List" iconURI="platform:/plugin/org.eclipse.e4.demo.contacts/icons/silk/folder_user.png" tooltip="List of Contacts"/>	6	<children xsi:type="basic:Part" xmi:id="_SeXUDO8EEd6FC9cDb6iV7g" elementId="ContactsView" contributionURI="platform:/plugin/org.eclipse.e4.demo.contacts/org.eclipse.e4.demo.contacts.views.ListView" label="%contactsList" iconURI="platform:/plugin/org.eclipse.e4.demo.contacts/icons/silk/folder_user.png" tooltip="%contactsTooltip"/>
7	</children>	7	</children>
8	<children xsi:type="basic:PartStack" xmi:id="_SeXUDe8EEd6FC9cDb6iV7g" elementId="org.eclipse.e4.demo.contacts.partstacks.second" containerData="70">	8	<children xsi:type="basic:PartStack" xmi:id="_SeXUDe8EEd6FC9cDb6iV7g" elementId="org.eclipse.e4.demo.contacts.partstacks.second" containerData="70">
9	<children xsi:type="basic:Part" xmi:id="DetailsView" elementId="DetailsView" contributionURI="platform:/plugin/org.eclipse.e4.demo.contacts/org.eclipse.e4.demo.contacts.views.DetailsView" label="Details" iconURI="platform:/plugin/org.eclipse.e4.demo.contacts/icons/silk/report_user.png" tooltip="Contact Details"/>	9	<children xsi:type="basic:Part" xmi:id="DetailsView" elementId="DetailsView" contributionURI="platform:/plugin/org.eclipse.e4.demo.contacts/org.eclipse.e4.demo.contacts.views.DetailsView" label="%partDetails" iconURI="platform:/plugin/org.eclipse.e4.demo.contacts/icons/silk/report_user.png" tooltip="%detailsTooltip"/>
10	</children>	10	</children>
11	</children>	11	</children>
12	<mainMenu xmi:id="menu:org.eclipse.ui.main.menu" elementId="menu:org.eclipse.ui.main.menu">	12	<mainMenu xmi:id="menu:org.eclipse.ui.main.menu" elementId="menu:org.eclipse.ui.main.menu">
13	<children xsi:type="menu:Menu" xmi:id="_SeXUD-8EEd6FC9cDb6iV7g" elementId="_SeXUD-8EEd6FC9cDb6iV7g" label="File">	13	<children xsi:type="menu:Menu" xmi:id="_SeXUD-8EEd6FC9cDb6iV7g" elementId="_SeXUD-8EEd6FC9cDb6iV7g" label="%fileMenu">
14	<children xsi:type="menu:HandledMenuItem" xmi:id="_SeXUEO8EEd6FC9cDb6iV7g" elementId="_SeXUEO8EEd6FC9cDb6iV7g" label="Save" iconURI="platform:/plugin/org.eclipse.e4.demo.contacts/icons/silk/disk.png" command="contacts.save"/>	14	<children xsi:type="menu:HandledMenuItem" xmi:id="_SeXUEO8EEd6FC9cDb6iV7g" elementId="_SeXUEO8EEd6FC9cDb6iV7g" label="%menuLabelSave" iconURI="platform:/plugin/org.eclipse.e4.demo.contacts/icons/silk/disk.png" command="contacts.save"/>
15	<children xsi:type="menu:HandledMenuItem" xmi:id="_SeXUEe8EEd6FC9cDb6iV7g" elementId="_SeXUEe8EEd6FC9cDb6iV7g" label="Delete" iconURI="platform:/plugin/org.eclipse.e4.demo.contacts/icons/silk/user_delete.png" command="contacts.delete"/>	15	<children xsi:type="menu:HandledMenuItem" xmi:id="_SeXUEe8EEd6FC9cDb6iV7g" elementId="_SeXUEe8EEd6FC9cDb6iV7g" label="%menuLabelDelete" iconURI="platform:/plugin/org.eclipse.e4.demo.contacts/icons/silk/user_delete.png" command="contacts.delete"/>
16	<children xsi:type="menu:DirectMenuItem" xmi:id="_SeXUEu8EEd6FC9cDb6iV7g" elementId="_SeXUEu8EEd6FC9cDb6iV7g" label="Direct Exit" contributionURI="platform:/plugin/org.eclipse.e4.demo.contacts/org.eclipse.e4.demo.contacts.handlers.ExitHandler"/>	16	<children xsi:type="menu:DirectMenuItem" xmi:id="_SeXUEu8EEd6FC9cDb6iV7g" elementId="_SeXUEu8EEd6FC9cDb6iV7g" label="%menuLabelDirectExit" contributionURI="platform:/plugin/org.eclipse.e4.demo.contacts/org.eclipse.e4.demo.contacts.handlers.ExitHandler"/>
17	<children xsi:type="menu:HandledMenuItem" xmi:id="_SeXUE-8EEd6FC9cDb6iV7g" elementId="_SeXUE-8EEd6FC9cDb6iV7g" label="Exit" command="contacts.exit"/>	17	<children xsi:type="menu:HandledMenuItem" xmi:id="_SeXUE-8EEd6FC9cDb6iV7g" elementId="_SeXUE-8EEd6FC9cDb6iV7g" label="%menuLabelExit" command="contacts.exit"/>
18	</children>	18	</children>
19	</mainMenu>	19	</mainMenu>
20	<trimBars xmi:id="_SeXUAu8EEd6FC9cDb6iV7g" elementId="_SeXUAu8EEd6FC9cDb6iV7g">	20	<trimBars xmi:id="_SeXUAu8EEd6FC9cDb6iV7g" elementId="_SeXUAu8EEd6FC9cDb6iV7g">
21	<children xsi:type="menu:ToolBar" xmi:id="toolbar:org.eclipse.ui.main.toolbar" elementId="toolbar:org.eclipse.ui.main.toolbar">	21	<children xsi:type="menu:ToolBar" xmi:id="toolbar:org.eclipse.ui.main.toolbar" elementId="toolbar:org.eclipse.ui.main.toolbar">
22	<children xsi:type="menu:DirectToolItem" xmi:id="_SeXUBO8EEd6FC9cDb6iV7g" elementId="_SeXUBO8EEd6FC9cDb6iV7g" label="" iconURI="platform:/plugin/org.eclipse.e4.demo.contacts/icons/silk/disk.png" tooltip="Save" contributionURI="platform:/plugin/org.eclipse.e4.demo.contacts/org.eclipse.e4.demo.contacts.handlers.SaveHandler"/>	22	<children xsi:type="menu:DirectToolItem" xmi:id="_SeXUBO8EEd6FC9cDb6iV7g" elementId="_SeXUBO8EEd6FC9cDb6iV7g" label="" iconURI="platform:/plugin/org.eclipse.e4.demo.contacts/icons/silk/disk.png" tooltip="%toolbarSaveTooltip" contributionURI="platform:/plugin/org.eclipse.e4.demo.contacts/org.eclipse.e4.demo.contacts.handlers.SaveHandler"/>
23	</children>	23	</children>
24	</trimBars>	24	</trimBars>
25	</children>	25	</children>

Lines 24-35 Link Here

(-)META-INF/MANIFEST.MF (-1 / +3 lines)
24	org.eclipse.e4.ui.bindings;bundle-version="0.9.0",	24	org.eclipse.e4.ui.bindings;bundle-version="0.9.0",
25	org.eclipse.e4.ui.css.swt.theme;bundle-version="0.9.0",	25	org.eclipse.e4.ui.css.swt.theme;bundle-version="0.9.0",
26	org.eclipse.e4.ui.css.swt;bundle-version="0.9.1",	26	org.eclipse.e4.ui.css.swt;bundle-version="0.9.1",
27	org.eclipse.e4.ui.di;bundle-version="0.9.0"	27	org.eclipse.e4.ui.di;bundle-version="0.9.0",
		28	org.eclipse.e4.core.services;bundle-version="0.9.1"
28	Bundle-ActivationPolicy: lazy	29	Bundle-ActivationPolicy: lazy
29	Bundle-Vendor: Eclipse.org	30	Bundle-Vendor: Eclipse.org
30	Import-Package: javax.annotation;version="1.0.0",	31	Import-Package: javax.annotation;version="1.0.0",
31	javax.inject;version="1.0.0"	32	javax.inject;version="1.0.0"
32	Bundle-Activator: org.eclipse.e4.demo.contacts.BundleActivatorImpl	33	Bundle-Activator: org.eclipse.e4.demo.contacts.BundleActivatorImpl
33	Export-Package: org.eclipse.e4.demo.contacts.model	34	Export-Package: org.eclipse.e4.demo.contacts.model
		35	Bundle-Localization: plugin
34		36
35		37

Added Link Here

(-)plugin.properties (+21 lines)
1	###############################################################################
2	# Copyright (c) 2011 IBM Corporation and others.
3	# All rights reserved. This program and the accompanying materials
4	# are made available under the terms of the Eclipse Public License v1.0
5	# which accompanies this distribution, and is available at
6	# http://www.eclipse.org/legal/epl-v10.html
7	#
8	# Contributors:
9	# IBM Corporation - initial API and implementation
10	###############################################################################
11	fileMenu = &File
12	partDetails = Details
13	contactsList = Contacts List
14	menuLabelSave = &Save
15	menuLabelDelete = &Delete
16	menuLabelDirectExit = Direct E&xit
17	menuLabelExit = &Exit
18	windowTitle = e4 Contacts Demo
19	contactsTooltip = List of Contacts
20	detailsTooltip = Contact Details
21	toolbarSaveTooltip = Save

Added Link Here

(-)plugin_ru.properties (+22 lines)
1	###############################################################################
2	# Copyright (c) 2011 IBM Corporation and others.
3	# All rights reserved. This program and the accompanying materials
4	# are made available under the terms of the Eclipse Public License v1.0
5	# which accompanies this distribution, and is available at
6	# http://www.eclipse.org/legal/epl-v10.html
7	#
8	# Contributors:
9	# IBM Corporation - initial API and implementation
10	###############################################################################
11	fileMenu = &\u0424\u0430\u0439\u043B
12	partDetails = \u041F\u043E\u0434\u0440\u043E\u0431\u043D\u043E
13	contactsList = \u041A\u043E\u043D\u0442\u0430\u043A\u0442\u044B
14	menuLabelSave = &\u0421\u043E\u0445\u0440\u0430\u043D\u0438\u0442\u044C
15	menuLabelDelete = &\u0423\u0434\u0430\u043B\u0438\u0442\u044C
16	menuLabelDirectExit = &\u0411\u044B\u0441\u0442\u0440\u044B\u0439 \u0432\u044B\u0445\u043E\u0434
17	menuLabelExit = &\u0412\u044B\u0445\u043E\u0434
18	windowTitle = e4 \u0417\u0430\u043F\u0438\u0441\u043D\u0430\u044F \u043A\u043D\u0438\u0436\u043A\u0430
19	contactsTooltip = \u0421\u043F\u0438\u0441\u043E\u043A \u043A\u043E\u043D\u0442\u0430\u043A\u0442\u043E\u0432
20	detailsTooltip = \u041F\u043E\u0434\u0440\u043E\u0431\u043D\u0430\u044F \u0438\u043D\u0444\u043E\u0440\u043C\u0430\u0446\u0438\u044F \u043E \u043A\u043E\u043D\u0442\u0430\u043A\u0442\u0435
21	toolbarSaveTooltip = \u0421\u043E\u0445\u0440\u0430\u043D\u0438\u0442\u044C
22

Added Link Here

(-)src/org/eclipse/e4/demo/contacts/model/internal/BinaryTranslatorProvider.java (+31 lines)
1	/*******************************************************************************
2	* Copyright (c) 2010 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at
6	* http://www.eclipse.org/legal/epl-v10.html
7	*
8	* Contributors:
9	* IBM Corporation - initial API and implementation
10	*******************************************************************************/
11	package org.eclipse.e4.demo.contacts.model.internal;
12
13	import org.eclipse.e4.core.services.translation.TranslationService;
14
15	public class BinaryTranslatorProvider extends TranslationService {
16
17	@Override
18	public String translate(String key, String contributorURI) {
19	if (key == null)
20	return null;
21	char[] charArray = key.toCharArray();
22	StringBuffer tmp = new StringBuffer();
23	tmp.append("0x");
24	for(int i = 0; i < charArray.length; i++) {
25	int value = charArray[i];
26	tmp.append(Integer.toHexString(value));
27	}
28	return tmp.toString();
29	}
30
31	}

Added Link Here

(-)src/org/eclipse/e4/demo/contacts/model/internal/ModelLifeCycleExtension.java (+34 lines)
1	/*******************************************************************************
2	* Copyright (c) 2011 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at
6	* http://www.eclipse.org/legal/epl-v10.html
7	*
8	* Contributors:
9	* IBM Corporation - initial API and implementation
10	*******************************************************************************/
11	package org.eclipse.e4.demo.contacts.model.internal;
12
13	import javax.inject.Inject;
14	import org.eclipse.e4.core.contexts.ContextInjectionFactory;
15	import org.eclipse.e4.core.contexts.IEclipseContext;
16	import org.eclipse.e4.core.services.translation.TranslationService;
17	import org.eclipse.e4.ui.model.application.MApplication;
18	import org.eclipse.e4.ui.workbench.lifecycle.ProcessRemovals;
19
20	public class ModelLifeCycleExtension {
21
22	@Inject
23	public ModelLifeCycleExtension() {
24	// placeholder
25	}
26
27	@ProcessRemovals
28	public void overrideTranslation(MApplication application) {
29	IEclipseContext appContext = application.getContext();
30	BinaryTranslatorProvider translationService = ContextInjectionFactory.make(BinaryTranslatorProvider.class, appContext);
31	appContext.set(TranslationService.class, translationService);
32	}
33
34	}

Lines 152-166 Link Here

(-)model/UIElements.ecore (-6 / +2 lines)
152	eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>	152	eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
153	</eClassifiers>	153	</eClassifiers>
154	<eClassifiers xsi:type="ecore:EClass" name="UILabel" abstract="true" interface="true">	154	<eClassifiers xsi:type="ecore:EClass" name="UILabel" abstract="true" interface="true">
		155	<eOperations name="getLocalizedLabel" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
		156	<eOperations name="getLocalizedTooltip" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
155	<eStructuralFeatures xsi:type="ecore:EAttribute" name="label" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>	157	<eStructuralFeatures xsi:type="ecore:EAttribute" name="label" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
156	<eStructuralFeatures xsi:type="ecore:EAttribute" name="iconURI" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>	158	<eStructuralFeatures xsi:type="ecore:EAttribute" name="iconURI" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
157	<eStructuralFeatures xsi:type="ecore:EAttribute" name="tooltip" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>	159	<eStructuralFeatures xsi:type="ecore:EAttribute" name="tooltip" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
158	<eStructuralFeatures xsi:type="ecore:EAttribute" name="localLabel" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
159	transient="true"/>
160	<eStructuralFeatures xsi:type="ecore:EAttribute" name="localTooltip" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
161	transient="true"/>
162	<eStructuralFeatures xsi:type="ecore:EAttribute" name="localImage" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"
163	transient="true"/>
164	</eClassifiers>	160	</eClassifiers>
165	<eClassifiers xsi:type="ecore:EClass" name="ElementContainer" abstract="true"	161	<eClassifiers xsi:type="ecore:EClass" name="ElementContainer" abstract="true"
166	eSuperTypes="#//ui/UIElement">	162	eSuperTypes="#//ui/UIElement">

Added Link Here

(-)src/org/eclipse/e4/ui/model/LocalizationHelper.java (+94 lines)
1	/*******************************************************************************
2	* Copyright (c) 2011 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at
6	* http://www.eclipse.org/legal/epl-v10.html
7	*
8	* Contributors:
9	* IBM Corporation - initial API and implementation
10	*******************************************************************************/
11	package org.eclipse.e4.ui.model;
12
13	import org.eclipse.e4.core.contexts.IEclipseContext;
14	import org.eclipse.e4.core.services.translation.TranslationService;
15	import org.eclipse.e4.ui.model.application.MApplicationElement;
16	import org.eclipse.e4.ui.model.application.ui.MUIElement;
17	import org.eclipse.e4.ui.model.application.ui.MUILabel;
18	import org.eclipse.e4.ui.model.internal.ModelUtils;
19
20	/**
21	* This class provides set of utility method that can be useful in typical
22	* localization scenarios.
23	*/
24	final public class LocalizationHelper {
25
26	private LocalizationHelper() {
27	// prevents instantiation
28	}
29
30	/**
31	* Returns localized label for the specified element using locale information
32	* from its context.
33	* @param element the element
34	* @return localized element's label, or <code>null</code> if no label can be found
35	*/
36	public static String getLocalizedLabel(MUIElement element) {
37	if (!(element instanceof MUILabel))
38	return null;
39	String key = ((MUILabel)element).getLabel();
40	if (key == null)
41	return null;
42	return getLocalized(key, element);
43	}
44
45	/**
46	* Returns localized tooltip for the specified element using locale information
47	* from its context.
48	* @param element the element
49	* @return localized element's tooltip, or <code>null</code> if no tooltip can be found
50	*/
51	public static String getLocalizedTooltip(MUIElement element) {
52	if (!(element instanceof MUILabel))
53	return null;
54	String key = ((MUILabel)element).getTooltip();
55	if (key == null)
56	return null;
57	return getLocalized(key, element);
58	}
59
60	/**
61	* Returns localized string for the key using locale information specified
62	* in the element's context.
63	* <p>
64	* This method may return <code>null</code> if the context can not be found
65	* for the model element.
66	* </p>
67	* @param key the key
68	* @param element the model element
69	* @return localized key, or <code>null</code> if context information can not
70	* be found for the model element
71	*/
72	public static String getLocalized(String key, MUIElement element) {
73	IEclipseContext context = ModelUtils.getContainingContext(element);
74	if (context == null)
75	return null;
76	return getLocalized(key, element, context);
77	}
78
79	/**
80	* Returns localized string for the key from the application element using translation
81	* service from the context.
82	* @param key the key
83	* @param element the model element
84	* @param context the context
85	* @return localized key
86	*/
87	public static String getLocalized(String key, MApplicationElement element, IEclipseContext context) {
88	TranslationService translation = context.get(TranslationService.class);
89	if (translation == null)
90	return key;
91	return translation.translate(key, element.getContributorURI());
92	}
93
94	}

Lines 138-177 Link Here

(-)src/org/eclipse/e4/ui/model/application/descriptor/basic/impl/BasicPackageImpl.java (-38 / +11 lines)
138	public static final int PART_DESCRIPTOR__TOOLTIP = ApplicationPackageImpl.APPLICATION_ELEMENT_FEATURE_COUNT + 2;	138	public static final int PART_DESCRIPTOR__TOOLTIP = ApplicationPackageImpl.APPLICATION_ELEMENT_FEATURE_COUNT + 2;
139		139
140	/**	140	/**
141	* The feature id for the '<em><b>Local Label</b></em>' attribute.
142	* <!-- begin-user-doc -->
143	* <!-- end-user-doc -->
144	* @generated
145	* @ordered
146	*/
147	public static final int PART_DESCRIPTOR__LOCAL_LABEL = ApplicationPackageImpl.APPLICATION_ELEMENT_FEATURE_COUNT + 3;
148
149	/**
150	* The feature id for the '<em><b>Local Tooltip</b></em>' attribute.
151	* <!-- begin-user-doc -->
152	* <!-- end-user-doc -->
153	* @generated
154	* @ordered
155	*/
156	public static final int PART_DESCRIPTOR__LOCAL_TOOLTIP = ApplicationPackageImpl.APPLICATION_ELEMENT_FEATURE_COUNT + 4;
157
158	/**
159	* The feature id for the '<em><b>Local Image</b></em>' attribute.
160	* <!-- begin-user-doc -->
161	* <!-- end-user-doc -->
162	* @generated
163	* @ordered
164	*/
165	public static final int PART_DESCRIPTOR__LOCAL_IMAGE = ApplicationPackageImpl.APPLICATION_ELEMENT_FEATURE_COUNT + 5;
166
167	/**
168	* The feature id for the '<em><b>Handlers</b></em>' containment reference list.	141	* The feature id for the '<em><b>Handlers</b></em>' containment reference list.
169	* <!-- begin-user-doc -->	142	* <!-- begin-user-doc -->
170	* <!-- end-user-doc -->	143	* <!-- end-user-doc -->
171	* @generated	144	* @generated
172	* @ordered	145	* @ordered
173	*/	146	*/
174	public static final int PART_DESCRIPTOR__HANDLERS = ApplicationPackageImpl.APPLICATION_ELEMENT_FEATURE_COUNT + 6;	147	public static final int PART_DESCRIPTOR__HANDLERS = ApplicationPackageImpl.APPLICATION_ELEMENT_FEATURE_COUNT + 3;
175		148
176	/**	149	/**
177	* The feature id for the '<em><b>Binding Contexts</b></em>' attribute list.	150	* The feature id for the '<em><b>Binding Contexts</b></em>' attribute list.
Lines 180-186 Link Here
180	* @generated	153	* @generated
181	* @ordered	154	* @ordered
182	*/	155	*/
183	public static final int PART_DESCRIPTOR__BINDING_CONTEXTS = ApplicationPackageImpl.APPLICATION_ELEMENT_FEATURE_COUNT + 7;	156	public static final int PART_DESCRIPTOR__BINDING_CONTEXTS = ApplicationPackageImpl.APPLICATION_ELEMENT_FEATURE_COUNT + 4;
184		157
185	/**	158	/**
186	* The feature id for the '<em><b>Allow Multiple</b></em>' attribute.	159	* The feature id for the '<em><b>Allow Multiple</b></em>' attribute.
Lines 189-195 Link Here
189	* @generated	162	* @generated
190	* @ordered	163	* @ordered
191	*/	164	*/
192	public static final int PART_DESCRIPTOR__ALLOW_MULTIPLE = ApplicationPackageImpl.APPLICATION_ELEMENT_FEATURE_COUNT + 8;	165	public static final int PART_DESCRIPTOR__ALLOW_MULTIPLE = ApplicationPackageImpl.APPLICATION_ELEMENT_FEATURE_COUNT + 5;
193		166
194	/**	167	/**
195	* The feature id for the '<em><b>Category</b></em>' attribute.	168	* The feature id for the '<em><b>Category</b></em>' attribute.
Lines 198-204 Link Here
198	* @generated	171	* @generated
199	* @ordered	172	* @ordered
200	*/	173	*/
201	public static final int PART_DESCRIPTOR__CATEGORY = ApplicationPackageImpl.APPLICATION_ELEMENT_FEATURE_COUNT + 9;	174	public static final int PART_DESCRIPTOR__CATEGORY = ApplicationPackageImpl.APPLICATION_ELEMENT_FEATURE_COUNT + 6;
202		175
203	/**	176	/**
204	* The feature id for the '<em><b>Menus</b></em>' containment reference list.	177	* The feature id for the '<em><b>Menus</b></em>' containment reference list.
Lines 207-213 Link Here
207	* @generated	180	* @generated
208	* @ordered	181	* @ordered
209	*/	182	*/
210	public static final int PART_DESCRIPTOR__MENUS = ApplicationPackageImpl.APPLICATION_ELEMENT_FEATURE_COUNT + 10;	183	public static final int PART_DESCRIPTOR__MENUS = ApplicationPackageImpl.APPLICATION_ELEMENT_FEATURE_COUNT + 7;
211		184
212	/**	185	/**
213	* The feature id for the '<em><b>Toolbar</b></em>' containment reference.	186	* The feature id for the '<em><b>Toolbar</b></em>' containment reference.
Lines 216-222 Link Here
216	* @generated	189	* @generated
217	* @ordered	190	* @ordered
218	*/	191	*/
219	public static final int PART_DESCRIPTOR__TOOLBAR = ApplicationPackageImpl.APPLICATION_ELEMENT_FEATURE_COUNT + 11;	192	public static final int PART_DESCRIPTOR__TOOLBAR = ApplicationPackageImpl.APPLICATION_ELEMENT_FEATURE_COUNT + 8;
220		193
221	/**	194	/**
222	* The feature id for the '<em><b>Closeable</b></em>' attribute.	195	* The feature id for the '<em><b>Closeable</b></em>' attribute.
Lines 225-231 Link Here
225	* @generated	198	* @generated
226	* @ordered	199	* @ordered
227	*/	200	*/
228	public static final int PART_DESCRIPTOR__CLOSEABLE = ApplicationPackageImpl.APPLICATION_ELEMENT_FEATURE_COUNT + 12;	201	public static final int PART_DESCRIPTOR__CLOSEABLE = ApplicationPackageImpl.APPLICATION_ELEMENT_FEATURE_COUNT + 9;
229		202
230	/**	203	/**
231	* The feature id for the '<em><b>Dirtyable</b></em>' attribute.	204	* The feature id for the '<em><b>Dirtyable</b></em>' attribute.
Lines 234-240 Link Here
234	* @generated	207	* @generated
235	* @ordered	208	* @ordered
236	*/	209	*/
237	public static final int PART_DESCRIPTOR__DIRTYABLE = ApplicationPackageImpl.APPLICATION_ELEMENT_FEATURE_COUNT + 13;	210	public static final int PART_DESCRIPTOR__DIRTYABLE = ApplicationPackageImpl.APPLICATION_ELEMENT_FEATURE_COUNT + 10;
238		211
239	/**	212	/**
240	* The feature id for the '<em><b>Contribution URI</b></em>' attribute.	213	* The feature id for the '<em><b>Contribution URI</b></em>' attribute.
Lines 243-249 Link Here
243	* @generated	216	* @generated
244	* @ordered	217	* @ordered
245	*/	218	*/
246	public static final int PART_DESCRIPTOR__CONTRIBUTION_URI = ApplicationPackageImpl.APPLICATION_ELEMENT_FEATURE_COUNT + 14;	219	public static final int PART_DESCRIPTOR__CONTRIBUTION_URI = ApplicationPackageImpl.APPLICATION_ELEMENT_FEATURE_COUNT + 11;
247		220
248	/**	221	/**
249	* The feature id for the '<em><b>Description</b></em>' attribute.	222	* The feature id for the '<em><b>Description</b></em>' attribute.
Lines 252-258 Link Here
252	* @generated	225	* @generated
253	* @ordered	226	* @ordered
254	*/	227	*/
255	public static final int PART_DESCRIPTOR__DESCRIPTION = ApplicationPackageImpl.APPLICATION_ELEMENT_FEATURE_COUNT + 15;	228	public static final int PART_DESCRIPTOR__DESCRIPTION = ApplicationPackageImpl.APPLICATION_ELEMENT_FEATURE_COUNT + 12;
256		229
257	/**	230	/**
258	* The number of structural features of the '<em>Part Descriptor</em>' class.	231	* The number of structural features of the '<em>Part Descriptor</em>' class.
Lines 261-267 Link Here
261	* @generated	234	* @generated
262	* @ordered	235	* @ordered
263	*/	236	*/
264	public static final int PART_DESCRIPTOR_FEATURE_COUNT = ApplicationPackageImpl.APPLICATION_ELEMENT_FEATURE_COUNT + 16;	237	public static final int PART_DESCRIPTOR_FEATURE_COUNT = ApplicationPackageImpl.APPLICATION_ELEMENT_FEATURE_COUNT + 13;
265		238
266	/**	239	/**
267	* The meta object id for the '{@link org.eclipse.e4.ui.model.application.descriptor.basic.MPartDescriptorContainer <em>Part Descriptor Container</em>}' class.	240	* The meta object id for the '{@link org.eclipse.e4.ui.model.application.descriptor.basic.MPartDescriptorContainer <em>Part Descriptor Container</em>}' class.

Lines 42-50 Link Here

(-)src/org/eclipse/e4/ui/model/application/descriptor/basic/impl/PartDescriptorImpl.java (-168 / +16 lines)
42	* <li>{@link org.eclipse.e4.ui.model.application.descriptor.basic.impl.PartDescriptorImpl#getLabel <em>Label</em>}</li>	42	* <li>{@link org.eclipse.e4.ui.model.application.descriptor.basic.impl.PartDescriptorImpl#getLabel <em>Label</em>}</li>
43	* <li>{@link org.eclipse.e4.ui.model.application.descriptor.basic.impl.PartDescriptorImpl#getIconURI <em>Icon URI</em>}</li>	43	* <li>{@link org.eclipse.e4.ui.model.application.descriptor.basic.impl.PartDescriptorImpl#getIconURI <em>Icon URI</em>}</li>
44	* <li>{@link org.eclipse.e4.ui.model.application.descriptor.basic.impl.PartDescriptorImpl#getTooltip <em>Tooltip</em>}</li>	44	* <li>{@link org.eclipse.e4.ui.model.application.descriptor.basic.impl.PartDescriptorImpl#getTooltip <em>Tooltip</em>}</li>
45	* <li>{@link org.eclipse.e4.ui.model.application.descriptor.basic.impl.PartDescriptorImpl#getLocalLabel <em>Local Label</em>}</li>
46	* <li>{@link org.eclipse.e4.ui.model.application.descriptor.basic.impl.PartDescriptorImpl#getLocalTooltip <em>Local Tooltip</em>}</li>
47	* <li>{@link org.eclipse.e4.ui.model.application.descriptor.basic.impl.PartDescriptorImpl#getLocalImage <em>Local Image</em>}</li>
48	* <li>{@link org.eclipse.e4.ui.model.application.descriptor.basic.impl.PartDescriptorImpl#getHandlers <em>Handlers</em>}</li>	45	* <li>{@link org.eclipse.e4.ui.model.application.descriptor.basic.impl.PartDescriptorImpl#getHandlers <em>Handlers</em>}</li>
49	* <li>{@link org.eclipse.e4.ui.model.application.descriptor.basic.impl.PartDescriptorImpl#getBindingContexts <em>Binding Contexts</em>}</li>	46	* <li>{@link org.eclipse.e4.ui.model.application.descriptor.basic.impl.PartDescriptorImpl#getBindingContexts <em>Binding Contexts</em>}</li>
50	* <li>{@link org.eclipse.e4.ui.model.application.descriptor.basic.impl.PartDescriptorImpl#isAllowMultiple <em>Allow Multiple</em>}</li>	47	* <li>{@link org.eclipse.e4.ui.model.application.descriptor.basic.impl.PartDescriptorImpl#isAllowMultiple <em>Allow Multiple</em>}</li>
Lines 122-187 Link Here
122	protected String tooltip = TOOLTIP_EDEFAULT;	119	protected String tooltip = TOOLTIP_EDEFAULT;
123		120
124	/**	121	/**
125	* The default value of the '{@link #getLocalLabel() <em>Local Label</em>}' attribute.
126	* <!-- begin-user-doc -->
127	* <!-- end-user-doc -->
128	* @see #getLocalLabel()
129	* @generated
130	* @ordered
131	*/
132	protected static final String LOCAL_LABEL_EDEFAULT = null;
133
134	/**
135	* The cached value of the '{@link #getLocalLabel() <em>Local Label</em>}' attribute.
136	* <!-- begin-user-doc -->
137	* <!-- end-user-doc -->
138	* @see #getLocalLabel()
139	* @generated
140	* @ordered
141	*/
142	protected String localLabel = LOCAL_LABEL_EDEFAULT;
143
144	/**
145	* The default value of the '{@link #getLocalTooltip() <em>Local Tooltip</em>}' attribute.
146	* <!-- begin-user-doc -->
147	* <!-- end-user-doc -->
148	* @see #getLocalTooltip()
149	* @generated
150	* @ordered
151	*/
152	protected static final String LOCAL_TOOLTIP_EDEFAULT = null;
153
154	/**
155	* The cached value of the '{@link #getLocalTooltip() <em>Local Tooltip</em>}' attribute.
156	* <!-- begin-user-doc -->
157	* <!-- end-user-doc -->
158	* @see #getLocalTooltip()
159	* @generated
160	* @ordered
161	*/
162	protected String localTooltip = LOCAL_TOOLTIP_EDEFAULT;
163
164	/**
165	* The default value of the '{@link #getLocalImage() <em>Local Image</em>}' attribute.
166	* <!-- begin-user-doc -->
167	* <!-- end-user-doc -->
168	* @see #getLocalImage()
169	* @generated
170	* @ordered
171	*/
172	protected static final Object LOCAL_IMAGE_EDEFAULT = null;
173
174	/**
175	* The cached value of the '{@link #getLocalImage() <em>Local Image</em>}' attribute.
176	* <!-- begin-user-doc -->
177	* <!-- end-user-doc -->
178	* @see #getLocalImage()
179	* @generated
180	* @ordered
181	*/
182	protected Object localImage = LOCAL_IMAGE_EDEFAULT;
183
184	/**
185	* The cached value of the '{@link #getHandlers() <em>Handlers</em>}' containment reference list.	122	* The cached value of the '{@link #getHandlers() <em>Handlers</em>}' containment reference list.
186	* <!-- begin-user-doc -->	123	* <!-- begin-user-doc -->
187	* <!-- end-user-doc -->	124	* <!-- end-user-doc -->
Lines 428-496 Link Here
428	* <!-- end-user-doc -->	365	* <!-- end-user-doc -->
429	* @generated	366	* @generated
430	*/	367	*/
431	public String getLocalLabel() {
432	return localLabel;
433	}
434
435	/**
436	* <!-- begin-user-doc -->
437	* <!-- end-user-doc -->
438	* @generated
439	*/
440	public void setLocalLabel(String newLocalLabel) {
441	String oldLocalLabel = localLabel;
442	localLabel = newLocalLabel;
443	if (eNotificationRequired())
444	eNotify(new ENotificationImpl(this, Notification.SET, BasicPackageImpl.PART_DESCRIPTOR__LOCAL_LABEL, oldLocalLabel, localLabel));
445	}
446
447	/**
448	* <!-- begin-user-doc -->
449	* <!-- end-user-doc -->
450	* @generated
451	*/
452	public String getLocalTooltip() {
453	return localTooltip;
454	}
455
456	/**
457	* <!-- begin-user-doc -->
458	* <!-- end-user-doc -->
459	* @generated
460	*/
461	public void setLocalTooltip(String newLocalTooltip) {
462	String oldLocalTooltip = localTooltip;
463	localTooltip = newLocalTooltip;
464	if (eNotificationRequired())
465	eNotify(new ENotificationImpl(this, Notification.SET, BasicPackageImpl.PART_DESCRIPTOR__LOCAL_TOOLTIP, oldLocalTooltip, localTooltip));
466	}
467
468	/**
469	* <!-- begin-user-doc -->
470	* <!-- end-user-doc -->
471	* @generated
472	*/
473	public Object getLocalImage() {
474	return localImage;
475	}
476
477	/**
478	* <!-- begin-user-doc -->
479	* <!-- end-user-doc -->
480	* @generated
481	*/
482	public void setLocalImage(Object newLocalImage) {
483	Object oldLocalImage = localImage;
484	localImage = newLocalImage;
485	if (eNotificationRequired())
486	eNotify(new ENotificationImpl(this, Notification.SET, BasicPackageImpl.PART_DESCRIPTOR__LOCAL_IMAGE, oldLocalImage, localImage));
487	}
488
489	/**
490	* <!-- begin-user-doc -->
491	* <!-- end-user-doc -->
492	* @generated
493	*/
494	public List<MHandler> getHandlers() {	368	public List<MHandler> getHandlers() {
495	if (handlers == null) {	369	if (handlers == null) {
496	handlers = new EObjectContainmentEList<MHandler>(MHandler.class, this, BasicPackageImpl.PART_DESCRIPTOR__HANDLERS);	370	handlers = new EObjectContainmentEList<MHandler>(MHandler.class, this, BasicPackageImpl.PART_DESCRIPTOR__HANDLERS);
Lines 694-699 Link Here
694	/**	568	/**
695	* <!-- begin-user-doc -->	569	* <!-- begin-user-doc -->
696	* <!-- end-user-doc -->	570	* <!-- end-user-doc -->
		571	*/
		572	public String getLocalizedLabel() {
		573	throw new UnsupportedOperationException("Please use LocalizationHelper");
		574	}
		575
		576	/**
		577	* <!-- begin-user-doc -->
		578	* <!-- end-user-doc -->
		579	*/
		580	public String getLocalizedTooltip() {
		581	throw new UnsupportedOperationException("Please use LocalizationHelper");
		582	}
		583
		584	/**
		585	* <!-- begin-user-doc -->
		586	* <!-- end-user-doc -->
697	* @generated	587	* @generated
698	*/	588	*/
699	@Override	589	@Override
Lines 723-734 Link Here
723	return getIconURI();	613	return getIconURI();
724	case BasicPackageImpl.PART_DESCRIPTOR__TOOLTIP:	614	case BasicPackageImpl.PART_DESCRIPTOR__TOOLTIP:
725	return getTooltip();	615	return getTooltip();
726	case BasicPackageImpl.PART_DESCRIPTOR__LOCAL_LABEL:
727	return getLocalLabel();
728	case BasicPackageImpl.PART_DESCRIPTOR__LOCAL_TOOLTIP:
729	return getLocalTooltip();
730	case BasicPackageImpl.PART_DESCRIPTOR__LOCAL_IMAGE:
731	return getLocalImage();
732	case BasicPackageImpl.PART_DESCRIPTOR__HANDLERS:	616	case BasicPackageImpl.PART_DESCRIPTOR__HANDLERS:
733	return getHandlers();	617	return getHandlers();
734	case BasicPackageImpl.PART_DESCRIPTOR__BINDING_CONTEXTS:	618	case BasicPackageImpl.PART_DESCRIPTOR__BINDING_CONTEXTS:
Lines 771-785 Link Here
771	case BasicPackageImpl.PART_DESCRIPTOR__TOOLTIP:	655	case BasicPackageImpl.PART_DESCRIPTOR__TOOLTIP:
772	setTooltip((String)newValue);	656	setTooltip((String)newValue);
773	return;	657	return;
774	case BasicPackageImpl.PART_DESCRIPTOR__LOCAL_LABEL:
775	setLocalLabel((String)newValue);
776	return;
777	case BasicPackageImpl.PART_DESCRIPTOR__LOCAL_TOOLTIP:
778	setLocalTooltip((String)newValue);
779	return;
780	case BasicPackageImpl.PART_DESCRIPTOR__LOCAL_IMAGE:
781	setLocalImage(newValue);
782	return;
783	case BasicPackageImpl.PART_DESCRIPTOR__HANDLERS:	658	case BasicPackageImpl.PART_DESCRIPTOR__HANDLERS:
784	getHandlers().clear();	659	getHandlers().clear();
785	getHandlers().addAll((Collection<? extends MHandler>)newValue);	660	getHandlers().addAll((Collection<? extends MHandler>)newValue);
Lines 834-848 Link Here
834	case BasicPackageImpl.PART_DESCRIPTOR__TOOLTIP:	709	case BasicPackageImpl.PART_DESCRIPTOR__TOOLTIP:
835	setTooltip(TOOLTIP_EDEFAULT);	710	setTooltip(TOOLTIP_EDEFAULT);
836	return;	711	return;
837	case BasicPackageImpl.PART_DESCRIPTOR__LOCAL_LABEL:
838	setLocalLabel(LOCAL_LABEL_EDEFAULT);
839	return;
840	case BasicPackageImpl.PART_DESCRIPTOR__LOCAL_TOOLTIP:
841	setLocalTooltip(LOCAL_TOOLTIP_EDEFAULT);
842	return;
843	case BasicPackageImpl.PART_DESCRIPTOR__LOCAL_IMAGE:
844	setLocalImage(LOCAL_IMAGE_EDEFAULT);
845	return;
846	case BasicPackageImpl.PART_DESCRIPTOR__HANDLERS:	712	case BasicPackageImpl.PART_DESCRIPTOR__HANDLERS:
847	getHandlers().clear();	713	getHandlers().clear();
848	return;	714	return;
Lines 891-902 Link Here
891	return ICON_URI_EDEFAULT == null ? iconURI != null : !ICON_URI_EDEFAULT.equals(iconURI);	757	return ICON_URI_EDEFAULT == null ? iconURI != null : !ICON_URI_EDEFAULT.equals(iconURI);
892	case BasicPackageImpl.PART_DESCRIPTOR__TOOLTIP:	758	case BasicPackageImpl.PART_DESCRIPTOR__TOOLTIP:
893	return TOOLTIP_EDEFAULT == null ? tooltip != null : !TOOLTIP_EDEFAULT.equals(tooltip);	759	return TOOLTIP_EDEFAULT == null ? tooltip != null : !TOOLTIP_EDEFAULT.equals(tooltip);
894	case BasicPackageImpl.PART_DESCRIPTOR__LOCAL_LABEL:
895	return LOCAL_LABEL_EDEFAULT == null ? localLabel != null : !LOCAL_LABEL_EDEFAULT.equals(localLabel);
896	case BasicPackageImpl.PART_DESCRIPTOR__LOCAL_TOOLTIP:
897	return LOCAL_TOOLTIP_EDEFAULT == null ? localTooltip != null : !LOCAL_TOOLTIP_EDEFAULT.equals(localTooltip);
898	case BasicPackageImpl.PART_DESCRIPTOR__LOCAL_IMAGE:
899	return LOCAL_IMAGE_EDEFAULT == null ? localImage != null : !LOCAL_IMAGE_EDEFAULT.equals(localImage);
900	case BasicPackageImpl.PART_DESCRIPTOR__HANDLERS:	760	case BasicPackageImpl.PART_DESCRIPTOR__HANDLERS:
901	return handlers != null && !handlers.isEmpty();	761	return handlers != null && !handlers.isEmpty();
902	case BasicPackageImpl.PART_DESCRIPTOR__BINDING_CONTEXTS:	762	case BasicPackageImpl.PART_DESCRIPTOR__BINDING_CONTEXTS:
Lines 933-941 Link Here
933	case BasicPackageImpl.PART_DESCRIPTOR__LABEL: return UiPackageImpl.UI_LABEL__LABEL;	793	case BasicPackageImpl.PART_DESCRIPTOR__LABEL: return UiPackageImpl.UI_LABEL__LABEL;
934	case BasicPackageImpl.PART_DESCRIPTOR__ICON_URI: return UiPackageImpl.UI_LABEL__ICON_URI;	794	case BasicPackageImpl.PART_DESCRIPTOR__ICON_URI: return UiPackageImpl.UI_LABEL__ICON_URI;
935	case BasicPackageImpl.PART_DESCRIPTOR__TOOLTIP: return UiPackageImpl.UI_LABEL__TOOLTIP;	795	case BasicPackageImpl.PART_DESCRIPTOR__TOOLTIP: return UiPackageImpl.UI_LABEL__TOOLTIP;
936	case BasicPackageImpl.PART_DESCRIPTOR__LOCAL_LABEL: return UiPackageImpl.UI_LABEL__LOCAL_LABEL;
937	case BasicPackageImpl.PART_DESCRIPTOR__LOCAL_TOOLTIP: return UiPackageImpl.UI_LABEL__LOCAL_TOOLTIP;
938	case BasicPackageImpl.PART_DESCRIPTOR__LOCAL_IMAGE: return UiPackageImpl.UI_LABEL__LOCAL_IMAGE;
939	default: return -1;	796	default: return -1;
940	}	797	}
941	}	798	}
Lines 966-974 Link Here
966	case UiPackageImpl.UI_LABEL__LABEL: return BasicPackageImpl.PART_DESCRIPTOR__LABEL;	823	case UiPackageImpl.UI_LABEL__LABEL: return BasicPackageImpl.PART_DESCRIPTOR__LABEL;
967	case UiPackageImpl.UI_LABEL__ICON_URI: return BasicPackageImpl.PART_DESCRIPTOR__ICON_URI;	824	case UiPackageImpl.UI_LABEL__ICON_URI: return BasicPackageImpl.PART_DESCRIPTOR__ICON_URI;
968	case UiPackageImpl.UI_LABEL__TOOLTIP: return BasicPackageImpl.PART_DESCRIPTOR__TOOLTIP;	825	case UiPackageImpl.UI_LABEL__TOOLTIP: return BasicPackageImpl.PART_DESCRIPTOR__TOOLTIP;
969	case UiPackageImpl.UI_LABEL__LOCAL_LABEL: return BasicPackageImpl.PART_DESCRIPTOR__LOCAL_LABEL;
970	case UiPackageImpl.UI_LABEL__LOCAL_TOOLTIP: return BasicPackageImpl.PART_DESCRIPTOR__LOCAL_TOOLTIP;
971	case UiPackageImpl.UI_LABEL__LOCAL_IMAGE: return BasicPackageImpl.PART_DESCRIPTOR__LOCAL_IMAGE;
972	default: return -1;	826	default: return -1;
973	}	827	}
974	}	828	}
Lines 1003-1014 Link Here
1003	result.append(iconURI);	857	result.append(iconURI);
1004	result.append(", tooltip: "); //$NON-NLS-1$	858	result.append(", tooltip: "); //$NON-NLS-1$
1005	result.append(tooltip);	859	result.append(tooltip);
1006	result.append(", localLabel: "); //$NON-NLS-1$
1007	result.append(localLabel);
1008	result.append(", localTooltip: "); //$NON-NLS-1$
1009	result.append(localTooltip);
1010	result.append(", localImage: "); //$NON-NLS-1$
1011	result.append(localImage);
1012	result.append(", bindingContexts: "); //$NON-NLS-1$	860	result.append(", bindingContexts: "); //$NON-NLS-1$
1013	result.append(bindingContexts);	861	result.append(bindingContexts);
1014	result.append(", allowMultiple: "); //$NON-NLS-1$	862	result.append(", allowMultiple: "); //$NON-NLS-1$

Lines 393-432 Link Here

(-)src/org/eclipse/e4/ui/model/application/ui/advanced/impl/AdvancedPackageImpl.java (-60 / +6 lines)
393	public static final int PERSPECTIVE__TOOLTIP = UiPackageImpl.ELEMENT_CONTAINER_FEATURE_COUNT + 2;	393	public static final int PERSPECTIVE__TOOLTIP = UiPackageImpl.ELEMENT_CONTAINER_FEATURE_COUNT + 2;
394		394
395	/**	395	/**
396	* The feature id for the '<em><b>Local Label</b></em>' attribute.
397	* <!-- begin-user-doc -->
398	* <!-- end-user-doc -->
399	* @generated
400	* @ordered
401	*/
402	public static final int PERSPECTIVE__LOCAL_LABEL = UiPackageImpl.ELEMENT_CONTAINER_FEATURE_COUNT + 3;
403
404	/**
405	* The feature id for the '<em><b>Local Tooltip</b></em>' attribute.
406	* <!-- begin-user-doc -->
407	* <!-- end-user-doc -->
408	* @generated
409	* @ordered
410	*/
411	public static final int PERSPECTIVE__LOCAL_TOOLTIP = UiPackageImpl.ELEMENT_CONTAINER_FEATURE_COUNT + 4;
412
413	/**
414	* The feature id for the '<em><b>Local Image</b></em>' attribute.
415	* <!-- begin-user-doc -->
416	* <!-- end-user-doc -->
417	* @generated
418	* @ordered
419	*/
420	public static final int PERSPECTIVE__LOCAL_IMAGE = UiPackageImpl.ELEMENT_CONTAINER_FEATURE_COUNT + 5;
421
422	/**
423	* The feature id for the '<em><b>Context</b></em>' attribute.	396	* The feature id for the '<em><b>Context</b></em>' attribute.
424	* <!-- begin-user-doc -->	397	* <!-- begin-user-doc -->
425	* <!-- end-user-doc -->	398	* <!-- end-user-doc -->
426	* @generated	399	* @generated
427	* @ordered	400	* @ordered
428	*/	401	*/
429	public static final int PERSPECTIVE__CONTEXT = UiPackageImpl.ELEMENT_CONTAINER_FEATURE_COUNT + 6;	402	public static final int PERSPECTIVE__CONTEXT = UiPackageImpl.ELEMENT_CONTAINER_FEATURE_COUNT + 3;
430		403
431	/**	404	/**
432	* The feature id for the '<em><b>Variables</b></em>' attribute list.	405	* The feature id for the '<em><b>Variables</b></em>' attribute list.
Lines 435-441 Link Here
435	* @generated	408	* @generated
436	* @ordered	409	* @ordered
437	*/	410	*/
438	public static final int PERSPECTIVE__VARIABLES = UiPackageImpl.ELEMENT_CONTAINER_FEATURE_COUNT + 7;	411	public static final int PERSPECTIVE__VARIABLES = UiPackageImpl.ELEMENT_CONTAINER_FEATURE_COUNT + 4;
439		412
440	/**	413	/**
441	* The feature id for the '<em><b>Properties</b></em>' map.	414	* The feature id for the '<em><b>Properties</b></em>' map.
Lines 444-450 Link Here
444	* @generated	417	* @generated
445	* @ordered	418	* @ordered
446	*/	419	*/
447	public static final int PERSPECTIVE__PROPERTIES = UiPackageImpl.ELEMENT_CONTAINER_FEATURE_COUNT + 8;	420	public static final int PERSPECTIVE__PROPERTIES = UiPackageImpl.ELEMENT_CONTAINER_FEATURE_COUNT + 5;
448		421
449	/**	422	/**
450	* The feature id for the '<em><b>Windows</b></em>' containment reference list.	423	* The feature id for the '<em><b>Windows</b></em>' containment reference list.
Lines 453-459 Link Here
453	* @generated	426	* @generated
454	* @ordered	427	* @ordered
455	*/	428	*/
456	public static final int PERSPECTIVE__WINDOWS = UiPackageImpl.ELEMENT_CONTAINER_FEATURE_COUNT + 9;	429	public static final int PERSPECTIVE__WINDOWS = UiPackageImpl.ELEMENT_CONTAINER_FEATURE_COUNT + 6;
457		430
458	/**	431	/**
459	* The number of structural features of the '<em>Perspective</em>' class.	432	* The number of structural features of the '<em>Perspective</em>' class.
Lines 462-468 Link Here
462	* @generated	435	* @generated
463	* @ordered	436	* @ordered
464	*/	437	*/
465	public static final int PERSPECTIVE_FEATURE_COUNT = UiPackageImpl.ELEMENT_CONTAINER_FEATURE_COUNT + 10;	438	public static final int PERSPECTIVE_FEATURE_COUNT = UiPackageImpl.ELEMENT_CONTAINER_FEATURE_COUNT + 7;
466		439
467	/**	440	/**
468	* The meta object id for the '{@link org.eclipse.e4.ui.model.application.ui.advanced.impl.PerspectiveStackImpl <em>Perspective Stack</em>}' class.	441	* The meta object id for the '{@link org.eclipse.e4.ui.model.application.ui.advanced.impl.PerspectiveStackImpl <em>Perspective Stack</em>}' class.
Lines 800-839 Link Here
800	public static final int AREA__TOOLTIP = BasicPackageImpl.PART_SASH_CONTAINER_FEATURE_COUNT + 2;	773	public static final int AREA__TOOLTIP = BasicPackageImpl.PART_SASH_CONTAINER_FEATURE_COUNT + 2;
801		774
802	/**	775	/**
803	* The feature id for the '<em><b>Local Label</b></em>' attribute.
804	* <!-- begin-user-doc -->
805	* <!-- end-user-doc -->
806	* @generated
807	* @ordered
808	*/
809	public static final int AREA__LOCAL_LABEL = BasicPackageImpl.PART_SASH_CONTAINER_FEATURE_COUNT + 3;
810
811	/**
812	* The feature id for the '<em><b>Local Tooltip</b></em>' attribute.
813	* <!-- begin-user-doc -->
814	* <!-- end-user-doc -->
815	* @generated
816	* @ordered
817	*/
818	public static final int AREA__LOCAL_TOOLTIP = BasicPackageImpl.PART_SASH_CONTAINER_FEATURE_COUNT + 4;
819
820	/**
821	* The feature id for the '<em><b>Local Image</b></em>' attribute.
822	* <!-- begin-user-doc -->
823	* <!-- end-user-doc -->
824	* @generated
825	* @ordered
826	*/
827	public static final int AREA__LOCAL_IMAGE = BasicPackageImpl.PART_SASH_CONTAINER_FEATURE_COUNT + 5;
828
829	/**
830	* The number of structural features of the '<em>Area</em>' class.	776	* The number of structural features of the '<em>Area</em>' class.
831	* <!-- begin-user-doc -->	777	* <!-- begin-user-doc -->
832	* <!-- end-user-doc -->	778	* <!-- end-user-doc -->
833	* @generated	779	* @generated
834	* @ordered	780	* @ordered
835	*/	781	*/
836	public static final int AREA_FEATURE_COUNT = BasicPackageImpl.PART_SASH_CONTAINER_FEATURE_COUNT + 6;	782	public static final int AREA_FEATURE_COUNT = BasicPackageImpl.PART_SASH_CONTAINER_FEATURE_COUNT + 3;
837		783
838	/**	784	/**
839	* <!-- begin-user-doc -->	785	* <!-- begin-user-doc -->

Lines 10-15 Link Here

(-)src/org/eclipse/e4/ui/model/application/ui/advanced/impl/AreaImpl.java (-156 / +5 lines)
10	*/	10	*/
11	package org.eclipse.e4.ui.model.application.ui.advanced.impl;	11	package org.eclipse.e4.ui.model.application.ui.advanced.impl;
12		12
		13	import org.eclipse.e4.ui.model.LocalizationHelper;
13	import org.eclipse.e4.ui.model.application.ui.MUILabel;	14	import org.eclipse.e4.ui.model.application.ui.MUILabel;
14	import org.eclipse.e4.ui.model.application.ui.advanced.MArea;	15	import org.eclipse.e4.ui.model.application.ui.advanced.MArea;
15	import org.eclipse.e4.ui.model.application.ui.basic.impl.PartSashContainerImpl;	16	import org.eclipse.e4.ui.model.application.ui.basic.impl.PartSashContainerImpl;
Lines 28-36 Link Here
28	* <li>{@link org.eclipse.e4.ui.model.application.ui.advanced.impl.AreaImpl#getLabel <em>Label</em>}</li>	29	* <li>{@link org.eclipse.e4.ui.model.application.ui.advanced.impl.AreaImpl#getLabel <em>Label</em>}</li>
29	* <li>{@link org.eclipse.e4.ui.model.application.ui.advanced.impl.AreaImpl#getIconURI <em>Icon URI</em>}</li>	30	* <li>{@link org.eclipse.e4.ui.model.application.ui.advanced.impl.AreaImpl#getIconURI <em>Icon URI</em>}</li>
30	* <li>{@link org.eclipse.e4.ui.model.application.ui.advanced.impl.AreaImpl#getTooltip <em>Tooltip</em>}</li>	31	* <li>{@link org.eclipse.e4.ui.model.application.ui.advanced.impl.AreaImpl#getTooltip <em>Tooltip</em>}</li>
31	* <li>{@link org.eclipse.e4.ui.model.application.ui.advanced.impl.AreaImpl#getLocalLabel <em>Local Label</em>}</li>
32	* <li>{@link org.eclipse.e4.ui.model.application.ui.advanced.impl.AreaImpl#getLocalTooltip <em>Local Tooltip</em>}</li>
33	* <li>{@link org.eclipse.e4.ui.model.application.ui.advanced.impl.AreaImpl#getLocalImage <em>Local Image</em>}</li>
34	* </ul>	32	* </ul>
35	* </p>	33	* </p>
36	*	34	*
Lines 98-163 Link Here
98	protected String tooltip = TOOLTIP_EDEFAULT;	96	protected String tooltip = TOOLTIP_EDEFAULT;
99		97
100	/**	98	/**
101	* The default value of the '{@link #getLocalLabel() <em>Local Label</em>}' attribute.
102	* <!-- begin-user-doc -->
103	* <!-- end-user-doc -->
104	* @see #getLocalLabel()
105	* @generated
106	* @ordered
107	*/
108	protected static final String LOCAL_LABEL_EDEFAULT = null;
109
110	/**
111	* The cached value of the '{@link #getLocalLabel() <em>Local Label</em>}' attribute.
112	* <!-- begin-user-doc -->
113	* <!-- end-user-doc -->
114	* @see #getLocalLabel()
115	* @generated
116	* @ordered
117	*/
118	protected String localLabel = LOCAL_LABEL_EDEFAULT;
119
120	/**
121	* The default value of the '{@link #getLocalTooltip() <em>Local Tooltip</em>}' attribute.
122	* <!-- begin-user-doc -->
123	* <!-- end-user-doc -->
124	* @see #getLocalTooltip()
125	* @generated
126	* @ordered
127	*/
128	protected static final String LOCAL_TOOLTIP_EDEFAULT = null;
129
130	/**
131	* The cached value of the '{@link #getLocalTooltip() <em>Local Tooltip</em>}' attribute.
132	* <!-- begin-user-doc -->
133	* <!-- end-user-doc -->
134	* @see #getLocalTooltip()
135	* @generated
136	* @ordered
137	*/
138	protected String localTooltip = LOCAL_TOOLTIP_EDEFAULT;
139
140	/**
141	* The default value of the '{@link #getLocalImage() <em>Local Image</em>}' attribute.
142	* <!-- begin-user-doc -->
143	* <!-- end-user-doc -->
144	* @see #getLocalImage()
145	* @generated
146	* @ordered
147	*/
148	protected static final Object LOCAL_IMAGE_EDEFAULT = null;
149
150	/**
151	* The cached value of the '{@link #getLocalImage() <em>Local Image</em>}' attribute.
152	* <!-- begin-user-doc -->
153	* <!-- end-user-doc -->
154	* @see #getLocalImage()
155	* @generated
156	* @ordered
157	*/
158	protected Object localImage = LOCAL_IMAGE_EDEFAULT;
159
160	/**
161	* <!-- begin-user-doc -->	99	* <!-- begin-user-doc -->
162	* <!-- end-user-doc -->	100	* <!-- end-user-doc -->
163	* @generated	101	* @generated
Lines 242-305 Link Here
242	/**	180	/**
243	* <!-- begin-user-doc -->	181	* <!-- begin-user-doc -->
244	* <!-- end-user-doc -->	182	* <!-- end-user-doc -->
245	* @generated
246	*/
247	public String getLocalLabel() {
248	return localLabel;
249	}
250
251	/**
252	* <!-- begin-user-doc -->
253	* <!-- end-user-doc -->
254	* @generated
255	*/
256	public void setLocalLabel(String newLocalLabel) {
257	String oldLocalLabel = localLabel;
258	localLabel = newLocalLabel;
259	if (eNotificationRequired())
260	eNotify(new ENotificationImpl(this, Notification.SET, AdvancedPackageImpl.AREA__LOCAL_LABEL, oldLocalLabel, localLabel));
261	}
262
263	/**
264	* <!-- begin-user-doc -->
265	* <!-- end-user-doc -->
266	* @generated
267	*/
268	public String getLocalTooltip() {
269	return localTooltip;
270	}
271
272	/**
273	* <!-- begin-user-doc -->
274	* <!-- end-user-doc -->
275	* @generated
276	*/
277	public void setLocalTooltip(String newLocalTooltip) {
278	String oldLocalTooltip = localTooltip;
279	localTooltip = newLocalTooltip;
280	if (eNotificationRequired())
281	eNotify(new ENotificationImpl(this, Notification.SET, AdvancedPackageImpl.AREA__LOCAL_TOOLTIP, oldLocalTooltip, localTooltip));
282	}
283
284	/**
285	* <!-- begin-user-doc -->
286	* <!-- end-user-doc -->
287	* @generated
288	*/	183	*/
289	public Object getLocalImage() {	184	public String getLocalizedLabel() {
290	return localImage;	185	return LocalizationHelper.getLocalizedLabel(this);
291	}	186	}
292		187
293	/**	188	/**
294	* <!-- begin-user-doc -->	189	* <!-- begin-user-doc -->
295	* <!-- end-user-doc -->	190	* <!-- end-user-doc -->
296	* @generated
297	*/	191	*/
298	public void setLocalImage(Object newLocalImage) {	192	public String getLocalizedTooltip() {
299	Object oldLocalImage = localImage;	193	return LocalizationHelper.getLocalizedTooltip(this);
300	localImage = newLocalImage;
301	if (eNotificationRequired())
302	eNotify(new ENotificationImpl(this, Notification.SET, AdvancedPackageImpl.AREA__LOCAL_IMAGE, oldLocalImage, localImage));
303	}	194	}
304		195
305	/**	196	/**
Lines 316-327 Link Here
316	return getIconURI();	207	return getIconURI();
317	case AdvancedPackageImpl.AREA__TOOLTIP:	208	case AdvancedPackageImpl.AREA__TOOLTIP:
318	return getTooltip();	209	return getTooltip();
319	case AdvancedPackageImpl.AREA__LOCAL_LABEL:
320	return getLocalLabel();
321	case AdvancedPackageImpl.AREA__LOCAL_TOOLTIP:
322	return getLocalTooltip();
323	case AdvancedPackageImpl.AREA__LOCAL_IMAGE:
324	return getLocalImage();
325	}	210	}
326	return super.eGet(featureID, resolve, coreType);	211	return super.eGet(featureID, resolve, coreType);
327	}	212	}
Lines 343-357 Link Here
343	case AdvancedPackageImpl.AREA__TOOLTIP:	228	case AdvancedPackageImpl.AREA__TOOLTIP:
344	setTooltip((String)newValue);	229	setTooltip((String)newValue);
345	return;	230	return;
346	case AdvancedPackageImpl.AREA__LOCAL_LABEL:
347	setLocalLabel((String)newValue);
348	return;
349	case AdvancedPackageImpl.AREA__LOCAL_TOOLTIP:
350	setLocalTooltip((String)newValue);
351	return;
352	case AdvancedPackageImpl.AREA__LOCAL_IMAGE:
353	setLocalImage(newValue);
354	return;
355	}	231	}
356	super.eSet(featureID, newValue);	232	super.eSet(featureID, newValue);
357	}	233	}
Lines 373-387 Link Here
373	case AdvancedPackageImpl.AREA__TOOLTIP:	249	case AdvancedPackageImpl.AREA__TOOLTIP:
374	setTooltip(TOOLTIP_EDEFAULT);	250	setTooltip(TOOLTIP_EDEFAULT);
375	return;	251	return;
376	case AdvancedPackageImpl.AREA__LOCAL_LABEL:
377	setLocalLabel(LOCAL_LABEL_EDEFAULT);
378	return;
379	case AdvancedPackageImpl.AREA__LOCAL_TOOLTIP:
380	setLocalTooltip(LOCAL_TOOLTIP_EDEFAULT);
381	return;
382	case AdvancedPackageImpl.AREA__LOCAL_IMAGE:
383	setLocalImage(LOCAL_IMAGE_EDEFAULT);
384	return;
385	}	252	}
386	super.eUnset(featureID);	253	super.eUnset(featureID);
387	}	254	}
Lines 400-411 Link Here
400	return ICON_URI_EDEFAULT == null ? iconURI != null : !ICON_URI_EDEFAULT.equals(iconURI);	267	return ICON_URI_EDEFAULT == null ? iconURI != null : !ICON_URI_EDEFAULT.equals(iconURI);
401	case AdvancedPackageImpl.AREA__TOOLTIP:	268	case AdvancedPackageImpl.AREA__TOOLTIP:
402	return TOOLTIP_EDEFAULT == null ? tooltip != null : !TOOLTIP_EDEFAULT.equals(tooltip);	269	return TOOLTIP_EDEFAULT == null ? tooltip != null : !TOOLTIP_EDEFAULT.equals(tooltip);
403	case AdvancedPackageImpl.AREA__LOCAL_LABEL:
404	return LOCAL_LABEL_EDEFAULT == null ? localLabel != null : !LOCAL_LABEL_EDEFAULT.equals(localLabel);
405	case AdvancedPackageImpl.AREA__LOCAL_TOOLTIP:
406	return LOCAL_TOOLTIP_EDEFAULT == null ? localTooltip != null : !LOCAL_TOOLTIP_EDEFAULT.equals(localTooltip);
407	case AdvancedPackageImpl.AREA__LOCAL_IMAGE:
408	return LOCAL_IMAGE_EDEFAULT == null ? localImage != null : !LOCAL_IMAGE_EDEFAULT.equals(localImage);
409	}	270	}
410	return super.eIsSet(featureID);	271	return super.eIsSet(featureID);
411	}	272	}
Lines 422-430 Link Here
422	case AdvancedPackageImpl.AREA__LABEL: return UiPackageImpl.UI_LABEL__LABEL;	283	case AdvancedPackageImpl.AREA__LABEL: return UiPackageImpl.UI_LABEL__LABEL;
423	case AdvancedPackageImpl.AREA__ICON_URI: return UiPackageImpl.UI_LABEL__ICON_URI;	284	case AdvancedPackageImpl.AREA__ICON_URI: return UiPackageImpl.UI_LABEL__ICON_URI;
424	case AdvancedPackageImpl.AREA__TOOLTIP: return UiPackageImpl.UI_LABEL__TOOLTIP;	285	case AdvancedPackageImpl.AREA__TOOLTIP: return UiPackageImpl.UI_LABEL__TOOLTIP;
425	case AdvancedPackageImpl.AREA__LOCAL_LABEL: return UiPackageImpl.UI_LABEL__LOCAL_LABEL;
426	case AdvancedPackageImpl.AREA__LOCAL_TOOLTIP: return UiPackageImpl.UI_LABEL__LOCAL_TOOLTIP;
427	case AdvancedPackageImpl.AREA__LOCAL_IMAGE: return UiPackageImpl.UI_LABEL__LOCAL_IMAGE;
428	default: return -1;	286	default: return -1;
429	}	287	}
430	}	288	}
Lines 443-451 Link Here
443	case UiPackageImpl.UI_LABEL__LABEL: return AdvancedPackageImpl.AREA__LABEL;	301	case UiPackageImpl.UI_LABEL__LABEL: return AdvancedPackageImpl.AREA__LABEL;
444	case UiPackageImpl.UI_LABEL__ICON_URI: return AdvancedPackageImpl.AREA__ICON_URI;	302	case UiPackageImpl.UI_LABEL__ICON_URI: return AdvancedPackageImpl.AREA__ICON_URI;
445	case UiPackageImpl.UI_LABEL__TOOLTIP: return AdvancedPackageImpl.AREA__TOOLTIP;	303	case UiPackageImpl.UI_LABEL__TOOLTIP: return AdvancedPackageImpl.AREA__TOOLTIP;
446	case UiPackageImpl.UI_LABEL__LOCAL_LABEL: return AdvancedPackageImpl.AREA__LOCAL_LABEL;
447	case UiPackageImpl.UI_LABEL__LOCAL_TOOLTIP: return AdvancedPackageImpl.AREA__LOCAL_TOOLTIP;
448	case UiPackageImpl.UI_LABEL__LOCAL_IMAGE: return AdvancedPackageImpl.AREA__LOCAL_IMAGE;
449	default: return -1;	304	default: return -1;
450	}	305	}
451	}	306	}
Lines 468-479 Link Here
468	result.append(iconURI);	323	result.append(iconURI);
469	result.append(", tooltip: "); //$NON-NLS-1$	324	result.append(", tooltip: "); //$NON-NLS-1$
470	result.append(tooltip);	325	result.append(tooltip);
471	result.append(", localLabel: "); //$NON-NLS-1$
472	result.append(localLabel);
473	result.append(", localTooltip: "); //$NON-NLS-1$
474	result.append(localTooltip);
475	result.append(", localImage: "); //$NON-NLS-1$
476	result.append(localImage);
477	result.append(')');	326	result.append(')');
478	return result.toString();	327	return result.toString();
479	}	328	}

Lines 392-431 Link Here

(-)src/org/eclipse/e4/ui/model/application/ui/basic/impl/BasicPackageImpl.java (-129 / +21 lines)
392	public static final int PART__TOOLTIP = UiPackageImpl.UI_ELEMENT_FEATURE_COUNT + 8;	392	public static final int PART__TOOLTIP = UiPackageImpl.UI_ELEMENT_FEATURE_COUNT + 8;
393		393
394	/**	394	/**
395	* The feature id for the '<em><b>Local Label</b></em>' attribute.
396	* <!-- begin-user-doc -->
397	* <!-- end-user-doc -->
398	* @generated
399	* @ordered
400	*/
401	public static final int PART__LOCAL_LABEL = UiPackageImpl.UI_ELEMENT_FEATURE_COUNT + 9;
402
403	/**
404	* The feature id for the '<em><b>Local Tooltip</b></em>' attribute.
405	* <!-- begin-user-doc -->
406	* <!-- end-user-doc -->
407	* @generated
408	* @ordered
409	*/
410	public static final int PART__LOCAL_TOOLTIP = UiPackageImpl.UI_ELEMENT_FEATURE_COUNT + 10;
411
412	/**
413	* The feature id for the '<em><b>Local Image</b></em>' attribute.
414	* <!-- begin-user-doc -->
415	* <!-- end-user-doc -->
416	* @generated
417	* @ordered
418	*/
419	public static final int PART__LOCAL_IMAGE = UiPackageImpl.UI_ELEMENT_FEATURE_COUNT + 11;
420
421	/**
422	* The feature id for the '<em><b>Handlers</b></em>' containment reference list.	395	* The feature id for the '<em><b>Handlers</b></em>' containment reference list.
423	* <!-- begin-user-doc -->	396	* <!-- begin-user-doc -->
424	* <!-- end-user-doc -->	397	* <!-- end-user-doc -->
425	* @generated	398	* @generated
426	* @ordered	399	* @ordered
427	*/	400	*/
428	public static final int PART__HANDLERS = UiPackageImpl.UI_ELEMENT_FEATURE_COUNT + 12;	401	public static final int PART__HANDLERS = UiPackageImpl.UI_ELEMENT_FEATURE_COUNT + 9;
429		402
430	/**	403	/**
431	* The feature id for the '<em><b>Dirty</b></em>' attribute.	404	* The feature id for the '<em><b>Dirty</b></em>' attribute.
Lines 434-440 Link Here
434	* @generated	407	* @generated
435	* @ordered	408	* @ordered
436	*/	409	*/
437	public static final int PART__DIRTY = UiPackageImpl.UI_ELEMENT_FEATURE_COUNT + 13;	410	public static final int PART__DIRTY = UiPackageImpl.UI_ELEMENT_FEATURE_COUNT + 10;
438		411
439	/**	412	/**
440	* The feature id for the '<em><b>Binding Contexts</b></em>' attribute list.	413	* The feature id for the '<em><b>Binding Contexts</b></em>' attribute list.
Lines 443-449 Link Here
443	* @generated	416	* @generated
444	* @ordered	417	* @ordered
445	*/	418	*/
446	public static final int PART__BINDING_CONTEXTS = UiPackageImpl.UI_ELEMENT_FEATURE_COUNT + 14;	419	public static final int PART__BINDING_CONTEXTS = UiPackageImpl.UI_ELEMENT_FEATURE_COUNT + 11;
447		420
448	/**	421	/**
449	* The feature id for the '<em><b>Menus</b></em>' containment reference list.	422	* The feature id for the '<em><b>Menus</b></em>' containment reference list.
Lines 452-458 Link Here
452	* @generated	425	* @generated
453	* @ordered	426	* @ordered
454	*/	427	*/
455	public static final int PART__MENUS = UiPackageImpl.UI_ELEMENT_FEATURE_COUNT + 15;	428	public static final int PART__MENUS = UiPackageImpl.UI_ELEMENT_FEATURE_COUNT + 12;
456		429
457	/**	430	/**
458	* The feature id for the '<em><b>Toolbar</b></em>' containment reference.	431	* The feature id for the '<em><b>Toolbar</b></em>' containment reference.
Lines 461-467 Link Here
461	* @generated	434	* @generated
462	* @ordered	435	* @ordered
463	*/	436	*/
464	public static final int PART__TOOLBAR = UiPackageImpl.UI_ELEMENT_FEATURE_COUNT + 16;	437	public static final int PART__TOOLBAR = UiPackageImpl.UI_ELEMENT_FEATURE_COUNT + 13;
465		438
466	/**	439	/**
467	* The feature id for the '<em><b>Closeable</b></em>' attribute.	440	* The feature id for the '<em><b>Closeable</b></em>' attribute.
Lines 470-476 Link Here
470	* @generated	443	* @generated
471	* @ordered	444	* @ordered
472	*/	445	*/
473	public static final int PART__CLOSEABLE = UiPackageImpl.UI_ELEMENT_FEATURE_COUNT + 17;	446	public static final int PART__CLOSEABLE = UiPackageImpl.UI_ELEMENT_FEATURE_COUNT + 14;
474		447
475	/**	448	/**
476	* The feature id for the '<em><b>Description</b></em>' attribute.	449	* The feature id for the '<em><b>Description</b></em>' attribute.
Lines 479-485 Link Here
479	* @generated	452	* @generated
480	* @ordered	453	* @ordered
481	*/	454	*/
482	public static final int PART__DESCRIPTION = UiPackageImpl.UI_ELEMENT_FEATURE_COUNT + 18;	455	public static final int PART__DESCRIPTION = UiPackageImpl.UI_ELEMENT_FEATURE_COUNT + 15;
483		456
484	/**	457	/**
485	* The number of structural features of the '<em>Part</em>' class.	458	* The number of structural features of the '<em>Part</em>' class.
Lines 488-494 Link Here
488	* @generated	461	* @generated
489	* @ordered	462	* @ordered
490	*/	463	*/
491	public static final int PART_FEATURE_COUNT = UiPackageImpl.UI_ELEMENT_FEATURE_COUNT + 19;	464	public static final int PART_FEATURE_COUNT = UiPackageImpl.UI_ELEMENT_FEATURE_COUNT + 16;
492		465
493	/**	466	/**
494	* The feature id for the '<em><b>Element Id</b></em>' attribute.	467	* The feature id for the '<em><b>Element Id</b></em>' attribute.
Lines 689-721 Link Here
689	public static final int INPUT_PART__TOOLTIP = PART__TOOLTIP;	662	public static final int INPUT_PART__TOOLTIP = PART__TOOLTIP;
690		663
691	/**	664	/**
692	* The feature id for the '<em><b>Local Label</b></em>' attribute.
693	* <!-- begin-user-doc -->
694	* <!-- end-user-doc -->
695	* @generated
696	* @ordered
697	*/
698	public static final int INPUT_PART__LOCAL_LABEL = PART__LOCAL_LABEL;
699
700	/**
701	* The feature id for the '<em><b>Local Tooltip</b></em>' attribute.
702	* <!-- begin-user-doc -->
703	* <!-- end-user-doc -->
704	* @generated
705	* @ordered
706	*/
707	public static final int INPUT_PART__LOCAL_TOOLTIP = PART__LOCAL_TOOLTIP;
708
709	/**
710	* The feature id for the '<em><b>Local Image</b></em>' attribute.
711	* <!-- begin-user-doc -->
712	* <!-- end-user-doc -->
713	* @generated
714	* @ordered
715	*/
716	public static final int INPUT_PART__LOCAL_IMAGE = PART__LOCAL_IMAGE;
717
718	/**
719	* The feature id for the '<em><b>Handlers</b></em>' containment reference list.	665	* The feature id for the '<em><b>Handlers</b></em>' containment reference list.
720	* <!-- begin-user-doc -->	666	* <!-- begin-user-doc -->
721	* <!-- end-user-doc -->	667	* <!-- end-user-doc -->
Lines 1256-1295 Link Here
1256	public static final int WINDOW__TOOLTIP = UiPackageImpl.ELEMENT_CONTAINER_FEATURE_COUNT + 2;	1202	public static final int WINDOW__TOOLTIP = UiPackageImpl.ELEMENT_CONTAINER_FEATURE_COUNT + 2;
1257		1203
1258	/**	1204	/**
1259	* The feature id for the '<em><b>Local Label</b></em>' attribute.
1260	* <!-- begin-user-doc -->
1261	* <!-- end-user-doc -->
1262	* @generated
1263	* @ordered
1264	*/
1265	public static final int WINDOW__LOCAL_LABEL = UiPackageImpl.ELEMENT_CONTAINER_FEATURE_COUNT + 3;
1266
1267	/**
1268	* The feature id for the '<em><b>Local Tooltip</b></em>' attribute.
1269	* <!-- begin-user-doc -->
1270	* <!-- end-user-doc -->
1271	* @generated
1272	* @ordered
1273	*/
1274	public static final int WINDOW__LOCAL_TOOLTIP = UiPackageImpl.ELEMENT_CONTAINER_FEATURE_COUNT + 4;
1275
1276	/**
1277	* The feature id for the '<em><b>Local Image</b></em>' attribute.
1278	* <!-- begin-user-doc -->
1279	* <!-- end-user-doc -->
1280	* @generated
1281	* @ordered
1282	*/
1283	public static final int WINDOW__LOCAL_IMAGE = UiPackageImpl.ELEMENT_CONTAINER_FEATURE_COUNT + 5;
1284
1285	/**
1286	* The feature id for the '<em><b>Context</b></em>' attribute.	1205	* The feature id for the '<em><b>Context</b></em>' attribute.
1287	* <!-- begin-user-doc -->	1206	* <!-- begin-user-doc -->
1288	* <!-- end-user-doc -->	1207	* <!-- end-user-doc -->
1289	* @generated	1208	* @generated
1290	* @ordered	1209	* @ordered
1291	*/	1210	*/
1292	public static final int WINDOW__CONTEXT = UiPackageImpl.ELEMENT_CONTAINER_FEATURE_COUNT + 6;	1211	public static final int WINDOW__CONTEXT = UiPackageImpl.ELEMENT_CONTAINER_FEATURE_COUNT + 3;
1293		1212
1294	/**	1213	/**
1295	* The feature id for the '<em><b>Variables</b></em>' attribute list.	1214	* The feature id for the '<em><b>Variables</b></em>' attribute list.
Lines 1298-1304 Link Here
1298	* @generated	1217	* @generated
1299	* @ordered	1218	* @ordered
1300	*/	1219	*/
1301	public static final int WINDOW__VARIABLES = UiPackageImpl.ELEMENT_CONTAINER_FEATURE_COUNT + 7;	1220	public static final int WINDOW__VARIABLES = UiPackageImpl.ELEMENT_CONTAINER_FEATURE_COUNT + 4;
1302		1221
1303	/**	1222	/**
1304	* The feature id for the '<em><b>Properties</b></em>' map.	1223	* The feature id for the '<em><b>Properties</b></em>' map.
Lines 1307-1313 Link Here
1307	* @generated	1226	* @generated
1308	* @ordered	1227	* @ordered
1309	*/	1228	*/
1310	public static final int WINDOW__PROPERTIES = UiPackageImpl.ELEMENT_CONTAINER_FEATURE_COUNT + 8;	1229	public static final int WINDOW__PROPERTIES = UiPackageImpl.ELEMENT_CONTAINER_FEATURE_COUNT + 5;
1311		1230
1312	/**	1231	/**
1313	* The feature id for the '<em><b>Handlers</b></em>' containment reference list.	1232	* The feature id for the '<em><b>Handlers</b></em>' containment reference list.
Lines 1316-1322 Link Here
1316	* @generated	1235	* @generated
1317	* @ordered	1236	* @ordered
1318	*/	1237	*/
1319	public static final int WINDOW__HANDLERS = UiPackageImpl.ELEMENT_CONTAINER_FEATURE_COUNT + 9;	1238	public static final int WINDOW__HANDLERS = UiPackageImpl.ELEMENT_CONTAINER_FEATURE_COUNT + 6;
1320		1239
1321	/**	1240	/**
1322	* The feature id for the '<em><b>Binding Contexts</b></em>' attribute list.	1241	* The feature id for the '<em><b>Binding Contexts</b></em>' attribute list.
Lines 1325-1331 Link Here
1325	* @generated	1244	* @generated
1326	* @ordered	1245	* @ordered
1327	*/	1246	*/
1328	public static final int WINDOW__BINDING_CONTEXTS = UiPackageImpl.ELEMENT_CONTAINER_FEATURE_COUNT + 10;	1247	public static final int WINDOW__BINDING_CONTEXTS = UiPackageImpl.ELEMENT_CONTAINER_FEATURE_COUNT + 7;
1329		1248
1330	/**	1249	/**
1331	* The feature id for the '<em><b>Main Menu</b></em>' containment reference.	1250	* The feature id for the '<em><b>Main Menu</b></em>' containment reference.
Lines 1334-1340 Link Here
1334	* @generated	1253	* @generated
1335	* @ordered	1254	* @ordered
1336	*/	1255	*/
1337	public static final int WINDOW__MAIN_MENU = UiPackageImpl.ELEMENT_CONTAINER_FEATURE_COUNT + 11;	1256	public static final int WINDOW__MAIN_MENU = UiPackageImpl.ELEMENT_CONTAINER_FEATURE_COUNT + 8;
1338		1257
1339	/**	1258	/**
1340	* The feature id for the '<em><b>X</b></em>' attribute.	1259	* The feature id for the '<em><b>X</b></em>' attribute.
Lines 1343-1349 Link Here
1343	* @generated	1262	* @generated
1344	* @ordered	1263	* @ordered
1345	*/	1264	*/
1346	public static final int WINDOW__X = UiPackageImpl.ELEMENT_CONTAINER_FEATURE_COUNT + 12;	1265	public static final int WINDOW__X = UiPackageImpl.ELEMENT_CONTAINER_FEATURE_COUNT + 9;
1347		1266
1348	/**	1267	/**
1349	* The feature id for the '<em><b>Y</b></em>' attribute.	1268	* The feature id for the '<em><b>Y</b></em>' attribute.
Lines 1352-1358 Link Here
1352	* @generated	1271	* @generated
1353	* @ordered	1272	* @ordered
1354	*/	1273	*/
1355	public static final int WINDOW__Y = UiPackageImpl.ELEMENT_CONTAINER_FEATURE_COUNT + 13;	1274	public static final int WINDOW__Y = UiPackageImpl.ELEMENT_CONTAINER_FEATURE_COUNT + 10;
1356		1275
1357	/**	1276	/**
1358	* The feature id for the '<em><b>Width</b></em>' attribute.	1277	* The feature id for the '<em><b>Width</b></em>' attribute.
Lines 1361-1367 Link Here
1361	* @generated	1280	* @generated
1362	* @ordered	1281	* @ordered
1363	*/	1282	*/
1364	public static final int WINDOW__WIDTH = UiPackageImpl.ELEMENT_CONTAINER_FEATURE_COUNT + 14;	1283	public static final int WINDOW__WIDTH = UiPackageImpl.ELEMENT_CONTAINER_FEATURE_COUNT + 11;
1365		1284
1366	/**	1285	/**
1367	* The feature id for the '<em><b>Height</b></em>' attribute.	1286	* The feature id for the '<em><b>Height</b></em>' attribute.
Lines 1370-1376 Link Here
1370	* @generated	1289	* @generated
1371	* @ordered	1290	* @ordered
1372	*/	1291	*/
1373	public static final int WINDOW__HEIGHT = UiPackageImpl.ELEMENT_CONTAINER_FEATURE_COUNT + 15;	1292	public static final int WINDOW__HEIGHT = UiPackageImpl.ELEMENT_CONTAINER_FEATURE_COUNT + 12;
1374		1293
1375	/**	1294	/**
1376	* The feature id for the '<em><b>Windows</b></em>' containment reference list.	1295	* The feature id for the '<em><b>Windows</b></em>' containment reference list.
Lines 1379-1385 Link Here
1379	* @generated	1298	* @generated
1380	* @ordered	1299	* @ordered
1381	*/	1300	*/
1382	public static final int WINDOW__WINDOWS = UiPackageImpl.ELEMENT_CONTAINER_FEATURE_COUNT + 16;	1301	public static final int WINDOW__WINDOWS = UiPackageImpl.ELEMENT_CONTAINER_FEATURE_COUNT + 13;
1383		1302
1384	/**	1303	/**
1385	* The feature id for the '<em><b>Shared Elements</b></em>' containment reference list.	1304	* The feature id for the '<em><b>Shared Elements</b></em>' containment reference list.
Lines 1388-1394 Link Here
1388	* @generated	1307	* @generated
1389	* @ordered	1308	* @ordered
1390	*/	1309	*/
1391	public static final int WINDOW__SHARED_ELEMENTS = UiPackageImpl.ELEMENT_CONTAINER_FEATURE_COUNT + 17;	1310	public static final int WINDOW__SHARED_ELEMENTS = UiPackageImpl.ELEMENT_CONTAINER_FEATURE_COUNT + 14;
1392		1311
1393	/**	1312	/**
1394	* The number of structural features of the '<em>Window</em>' class.	1313	* The number of structural features of the '<em>Window</em>' class.
Lines 1397-1403 Link Here
1397	* @generated	1316	* @generated
1398	* @ordered	1317	* @ordered
1399	*/	1318	*/
1400	public static final int WINDOW_FEATURE_COUNT = UiPackageImpl.ELEMENT_CONTAINER_FEATURE_COUNT + 18;	1319	public static final int WINDOW_FEATURE_COUNT = UiPackageImpl.ELEMENT_CONTAINER_FEATURE_COUNT + 15;
1401		1320
1402	/**	1321	/**
1403	* The feature id for the '<em><b>Element Id</b></em>' attribute.	1322	* The feature id for the '<em><b>Element Id</b></em>' attribute.
Lines 1562-1594 Link Here
1562	public static final int TRIMMED_WINDOW__TOOLTIP = WINDOW__TOOLTIP;	1481	public static final int TRIMMED_WINDOW__TOOLTIP = WINDOW__TOOLTIP;
1563		1482
1564	/**	1483	/**
1565	* The feature id for the '<em><b>Local Label</b></em>' attribute.
1566	* <!-- begin-user-doc -->
1567	* <!-- end-user-doc -->
1568	* @generated
1569	* @ordered
1570	*/
1571	public static final int TRIMMED_WINDOW__LOCAL_LABEL = WINDOW__LOCAL_LABEL;
1572
1573	/**
1574	* The feature id for the '<em><b>Local Tooltip</b></em>' attribute.
1575	* <!-- begin-user-doc -->
1576	* <!-- end-user-doc -->
1577	* @generated
1578	* @ordered
1579	*/
1580	public static final int TRIMMED_WINDOW__LOCAL_TOOLTIP = WINDOW__LOCAL_TOOLTIP;
1581
1582	/**
1583	* The feature id for the '<em><b>Local Image</b></em>' attribute.
1584	* <!-- begin-user-doc -->
1585	* <!-- end-user-doc -->
1586	* @generated
1587	* @ordered
1588	*/
1589	public static final int TRIMMED_WINDOW__LOCAL_IMAGE = WINDOW__LOCAL_IMAGE;
1590
1591	/**
1592	* The feature id for the '<em><b>Context</b></em>' attribute.	1484	* The feature id for the '<em><b>Context</b></em>' attribute.
1593	* <!-- begin-user-doc -->	1485	* <!-- begin-user-doc -->
1594	* <!-- end-user-doc -->	1486	* <!-- end-user-doc -->

Lines 362-401 Link Here

(-)src/org/eclipse/e4/ui/model/application/ui/impl/UiPackageImpl.java (-100 / +5 lines)
362	public static final int UI_LABEL__TOOLTIP = 2;	362	public static final int UI_LABEL__TOOLTIP = 2;
363		363
364	/**	364	/**
365	* The feature id for the '<em><b>Local Label</b></em>' attribute.
366	* <!-- begin-user-doc -->
367	* <!-- end-user-doc -->
368	* @generated
369	* @ordered
370	*/
371	public static final int UI_LABEL__LOCAL_LABEL = 3;
372
373	/**
374	* The feature id for the '<em><b>Local Tooltip</b></em>' attribute.
375	* <!-- begin-user-doc -->
376	* <!-- end-user-doc -->
377	* @generated
378	* @ordered
379	*/
380	public static final int UI_LABEL__LOCAL_TOOLTIP = 4;
381
382	/**
383	* The feature id for the '<em><b>Local Image</b></em>' attribute.
384	* <!-- begin-user-doc -->
385	* <!-- end-user-doc -->
386	* @generated
387	* @ordered
388	*/
389	public static final int UI_LABEL__LOCAL_IMAGE = 5;
390
391	/**
392	* The number of structural features of the '<em>UI Label</em>' class.	365	* The number of structural features of the '<em>UI Label</em>' class.
393	* <!-- begin-user-doc -->	366	* <!-- begin-user-doc -->
394	* <!-- end-user-doc -->	367	* <!-- end-user-doc -->
395	* @generated	368	* @generated
396	* @ordered	369	* @ordered
397	*/	370	*/
398	public static final int UI_LABEL_FEATURE_COUNT = 6;	371	public static final int UI_LABEL_FEATURE_COUNT = 3;
399		372
400	/**	373	/**
401	* The meta object id for the '{@link org.eclipse.e4.ui.model.application.ui.impl.ElementContainerImpl <em>Element Container</em>}' class.	374	* The meta object id for the '{@link org.eclipse.e4.ui.model.application.ui.impl.ElementContainerImpl <em>Element Container</em>}' class.
Lines 1615-1662 Link Here
1615	}	1588	}
1616		1589
1617	/**	1590	/**
1618	* Returns the meta object for the attribute '{@link org.eclipse.e4.ui.model.application.ui.MUILabel#getLocalLabel <em>Local Label</em>}'.
1619	* <!-- begin-user-doc -->
1620	* <!-- end-user-doc -->
1621	* @return the meta object for the attribute '<em>Local Label</em>'.
1622	* @see org.eclipse.e4.ui.model.application.ui.MUILabel#getLocalLabel()
1623	* @see #getUILabel()
1624	* @generated
1625	*/
1626	public EAttribute getUILabel_LocalLabel() {
1627	return (EAttribute)uiLabelEClass.getEStructuralFeatures().get(3);
1628	}
1629
1630
1631	/**
1632	* Returns the meta object for the attribute '{@link org.eclipse.e4.ui.model.application.ui.MUILabel#getLocalTooltip <em>Local Tooltip</em>}'.
1633	* <!-- begin-user-doc -->
1634	* <!-- end-user-doc -->
1635	* @return the meta object for the attribute '<em>Local Tooltip</em>'.
1636	* @see org.eclipse.e4.ui.model.application.ui.MUILabel#getLocalTooltip()
1637	* @see #getUILabel()
1638	* @generated
1639	*/
1640	public EAttribute getUILabel_LocalTooltip() {
1641	return (EAttribute)uiLabelEClass.getEStructuralFeatures().get(4);
1642	}
1643
1644
1645	/**
1646	* Returns the meta object for the attribute '{@link org.eclipse.e4.ui.model.application.ui.MUILabel#getLocalImage <em>Local Image</em>}'.
1647	* <!-- begin-user-doc -->
1648	* <!-- end-user-doc -->
1649	* @return the meta object for the attribute '<em>Local Image</em>'.
1650	* @see org.eclipse.e4.ui.model.application.ui.MUILabel#getLocalImage()
1651	* @see #getUILabel()
1652	* @generated
1653	*/
1654	public EAttribute getUILabel_LocalImage() {
1655	return (EAttribute)uiLabelEClass.getEStructuralFeatures().get(5);
1656	}
1657
1658
1659	/**
1660	* Returns the meta object for class '{@link org.eclipse.e4.ui.model.application.ui.MElementContainer <em>Element Container</em>}'.	1591	* Returns the meta object for class '{@link org.eclipse.e4.ui.model.application.ui.MElementContainer <em>Element Container</em>}'.
1661	* <!-- begin-user-doc -->	1592	* <!-- begin-user-doc -->
1662	* <!-- end-user-doc -->	1593	* <!-- end-user-doc -->
Lines 1879-1887 Link Here
1879	createEAttribute(uiLabelEClass, UI_LABEL__LABEL);	1810	createEAttribute(uiLabelEClass, UI_LABEL__LABEL);
1880	createEAttribute(uiLabelEClass, UI_LABEL__ICON_URI);	1811	createEAttribute(uiLabelEClass, UI_LABEL__ICON_URI);
1881	createEAttribute(uiLabelEClass, UI_LABEL__TOOLTIP);	1812	createEAttribute(uiLabelEClass, UI_LABEL__TOOLTIP);
1882	createEAttribute(uiLabelEClass, UI_LABEL__LOCAL_LABEL);
1883	createEAttribute(uiLabelEClass, UI_LABEL__LOCAL_TOOLTIP);
1884	createEAttribute(uiLabelEClass, UI_LABEL__LOCAL_IMAGE);
1885		1813
1886	elementContainerEClass = createEClass(ELEMENT_CONTAINER);	1814	elementContainerEClass = createEClass(ELEMENT_CONTAINER);
1887	createEReference(elementContainerEClass, ELEMENT_CONTAINER__CHILDREN);	1815	createEReference(elementContainerEClass, ELEMENT_CONTAINER__CHILDREN);
Lines 2004-2012 Link Here
2004	initEAttribute(getUILabel_Label(), ecorePackage.getEString(), "label", null, 0, 1, MUILabel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$	1932	initEAttribute(getUILabel_Label(), ecorePackage.getEString(), "label", null, 0, 1, MUILabel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
2005	initEAttribute(getUILabel_IconURI(), ecorePackage.getEString(), "iconURI", null, 0, 1, MUILabel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$	1933	initEAttribute(getUILabel_IconURI(), ecorePackage.getEString(), "iconURI", null, 0, 1, MUILabel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
2006	initEAttribute(getUILabel_Tooltip(), ecorePackage.getEString(), "tooltip", null, 0, 1, MUILabel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$	1934	initEAttribute(getUILabel_Tooltip(), ecorePackage.getEString(), "tooltip", null, 0, 1, MUILabel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$
2007	initEAttribute(getUILabel_LocalLabel(), ecorePackage.getEString(), "localLabel", null, 0, 1, MUILabel.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$	1935
2008	initEAttribute(getUILabel_LocalTooltip(), ecorePackage.getEString(), "localTooltip", null, 0, 1, MUILabel.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$	1936	addEOperation(uiLabelEClass, ecorePackage.getEString(), "getLocalizedLabel", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$
2009	initEAttribute(getUILabel_LocalImage(), ecorePackage.getEJavaObject(), "localImage", null, 0, 1, MUILabel.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED); //$NON-NLS-1$	1937
		1938	addEOperation(uiLabelEClass, ecorePackage.getEString(), "getLocalizedTooltip", 0, 1, IS_UNIQUE, IS_ORDERED); //$NON-NLS-1$
2010		1939
2011	initEClass(elementContainerEClass, MElementContainer.class, "ElementContainer", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$	1940	initEClass(elementContainerEClass, MElementContainer.class, "ElementContainer", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS); //$NON-NLS-1$
2012	g1 = createEGenericType(elementContainerEClass_T);	1941	g1 = createEGenericType(elementContainerEClass_T);
Lines 2244-2273 Link Here
2244	public static final EAttribute UI_LABEL__TOOLTIP = eINSTANCE.getUILabel_Tooltip();	2173	public static final EAttribute UI_LABEL__TOOLTIP = eINSTANCE.getUILabel_Tooltip();
2245		2174
2246	/**	2175	/**
2247	* The meta object literal for the '<em><b>Local Label</b></em>' attribute feature.
2248	* <!-- begin-user-doc -->
2249	* <!-- end-user-doc -->
2250	* @generated
2251	*/
2252	public static final EAttribute UI_LABEL__LOCAL_LABEL = eINSTANCE.getUILabel_LocalLabel();
2253
2254	/**
2255	* The meta object literal for the '<em><b>Local Tooltip</b></em>' attribute feature.
2256	* <!-- begin-user-doc -->
2257	* <!-- end-user-doc -->
2258	* @generated
2259	*/
2260	public static final EAttribute UI_LABEL__LOCAL_TOOLTIP = eINSTANCE.getUILabel_LocalTooltip();
2261
2262	/**
2263	* The meta object literal for the '<em><b>Local Image</b></em>' attribute feature.
2264	* <!-- begin-user-doc -->
2265	* <!-- end-user-doc -->
2266	* @generated
2267	*/
2268	public static final EAttribute UI_LABEL__LOCAL_IMAGE = eINSTANCE.getUILabel_LocalImage();
2269
2270	/**
2271	* The meta object literal for the '{@link org.eclipse.e4.ui.model.application.ui.impl.ElementContainerImpl <em>Element Container</em>}' class.	2176	* The meta object literal for the '{@link org.eclipse.e4.ui.model.application.ui.impl.ElementContainerImpl <em>Element Container</em>}' class.
2272	* <!-- begin-user-doc -->	2177	* <!-- begin-user-doc -->
2273	* <!-- end-user-doc -->	2178	* <!-- end-user-doc -->

Lines 341-380 Link Here

(-)src/org/eclipse/e4/ui/tests/model/test/MTestPackage.java (-29 / +2 lines)
341	int TEST_HARNESS__TOOLTIP = ApplicationPackageImpl.APPLICATION_ELEMENT_FEATURE_COUNT + 27;	341	int TEST_HARNESS__TOOLTIP = ApplicationPackageImpl.APPLICATION_ELEMENT_FEATURE_COUNT + 27;
342		342
343	/**	343	/**
344	* The feature id for the '<em><b>Local Label</b></em>' attribute.
345	* <!-- begin-user-doc -->
346	* <!-- end-user-doc -->
347	* @generated
348	* @ordered
349	*/
350	int TEST_HARNESS__LOCAL_LABEL = ApplicationPackageImpl.APPLICATION_ELEMENT_FEATURE_COUNT + 28;
351
352	/**
353	* The feature id for the '<em><b>Local Tooltip</b></em>' attribute.
354	* <!-- begin-user-doc -->
355	* <!-- end-user-doc -->
356	* @generated
357	* @ordered
358	*/
359	int TEST_HARNESS__LOCAL_TOOLTIP = ApplicationPackageImpl.APPLICATION_ELEMENT_FEATURE_COUNT + 29;
360
361	/**
362	* The feature id for the '<em><b>Local Image</b></em>' attribute.
363	* <!-- begin-user-doc -->
364	* <!-- end-user-doc -->
365	* @generated
366	* @ordered
367	*/
368	int TEST_HARNESS__LOCAL_IMAGE = ApplicationPackageImpl.APPLICATION_ELEMENT_FEATURE_COUNT + 30;
369
370	/**
371	* The feature id for the '<em><b>Dirty</b></em>' attribute. <!--	344	* The feature id for the '<em><b>Dirty</b></em>' attribute. <!--
372	* begin-user-doc --> <!-- end-user-doc -->	345	* begin-user-doc --> <!-- end-user-doc -->
373	*	346	*
374	* @generated	347	* @generated
375	* @ordered	348	* @ordered
376	*/	349	*/
377	int TEST_HARNESS__DIRTY = ApplicationPackageImpl.APPLICATION_ELEMENT_FEATURE_COUNT + 31;	350	int TEST_HARNESS__DIRTY = ApplicationPackageImpl.APPLICATION_ELEMENT_FEATURE_COUNT + 28;
378		351
379	/**	352	/**
380	* The number of structural features of the '<em>Harness</em>' class. <!--	353	* The number of structural features of the '<em>Harness</em>' class. <!--
Lines 383-389 Link Here
383	* @generated	356	* @generated
384	* @ordered	357	* @ordered
385	*/	358	*/
386	int TEST_HARNESS_FEATURE_COUNT = ApplicationPackageImpl.APPLICATION_ELEMENT_FEATURE_COUNT + 32;	359	int TEST_HARNESS_FEATURE_COUNT = ApplicationPackageImpl.APPLICATION_ELEMENT_FEATURE_COUNT + 29;
387		360
388	/**	361	/**
389	* Returns the meta object for class '{@link org.eclipse.e4.ui.tests.model.test.MTestHarness <em>Harness</em>}'.	362	* Returns the meta object for class '{@link org.eclipse.e4.ui.tests.model.test.MTestHarness <em>Harness</em>}'.

Lines 80-88 Link Here

(-)src/org/eclipse/e4/ui/tests/model/test/impl/TestHarnessImpl.java (-99 / +22 lines)
80	* <li>{@link org.eclipse.e4.ui.tests.model.test.impl.TestHarnessImpl#getLabel <em>Label</em>}</li>	80	* <li>{@link org.eclipse.e4.ui.tests.model.test.impl.TestHarnessImpl#getLabel <em>Label</em>}</li>
81	* <li>{@link org.eclipse.e4.ui.tests.model.test.impl.TestHarnessImpl#getIconURI <em>Icon URI</em>}</li>	81	* <li>{@link org.eclipse.e4.ui.tests.model.test.impl.TestHarnessImpl#getIconURI <em>Icon URI</em>}</li>
82	* <li>{@link org.eclipse.e4.ui.tests.model.test.impl.TestHarnessImpl#getTooltip <em>Tooltip</em>}</li>	82	* <li>{@link org.eclipse.e4.ui.tests.model.test.impl.TestHarnessImpl#getTooltip <em>Tooltip</em>}</li>
83	* <li>{@link org.eclipse.e4.ui.tests.model.test.impl.TestHarnessImpl#getLocalLabel <em>Local Label</em>}</li>
84	* <li>{@link org.eclipse.e4.ui.tests.model.test.impl.TestHarnessImpl#getLocalTooltip <em>Local Tooltip</em>}</li>
85	* <li>{@link org.eclipse.e4.ui.tests.model.test.impl.TestHarnessImpl#getLocalImage <em>Local Image</em>}</li>
86	* <li>{@link org.eclipse.e4.ui.tests.model.test.impl.TestHarnessImpl#isDirty <em>Dirty</em>}</li>	83	* <li>{@link org.eclipse.e4.ui.tests.model.test.impl.TestHarnessImpl#isDirty <em>Dirty</em>}</li>
87	* </ul>	84	* </ul>
88	* </p>	85	* </p>
Lines 464-523 Link Here
464	*/	461	*/
465	protected String tooltip = TOOLTIP_EDEFAULT;	462	protected String tooltip = TOOLTIP_EDEFAULT;
466	/**	463	/**
467	* The default value of the '{@link #getLocalLabel() <em>Local Label</em>}' attribute.
468	* <!-- begin-user-doc -->
469	* <!-- end-user-doc -->
470	* @see #getLocalLabel()
471	* @generated
472	* @ordered
473	*/
474	protected static final String LOCAL_LABEL_EDEFAULT = null;
475	/**
476	* The cached value of the '{@link #getLocalLabel() <em>Local Label</em>}' attribute.
477	* <!-- begin-user-doc -->
478	* <!-- end-user-doc -->
479	* @see #getLocalLabel()
480	* @generated
481	* @ordered
482	*/
483	protected String localLabel = LOCAL_LABEL_EDEFAULT;
484	/**
485	* The default value of the '{@link #getLocalTooltip() <em>Local Tooltip</em>}' attribute.
486	* <!-- begin-user-doc -->
487	* <!-- end-user-doc -->
488	* @see #getLocalTooltip()
489	* @generated
490	* @ordered
491	*/
492	protected static final String LOCAL_TOOLTIP_EDEFAULT = null;
493	/**
494	* The cached value of the '{@link #getLocalTooltip() <em>Local Tooltip</em>}' attribute.
495	* <!-- begin-user-doc -->
496	* <!-- end-user-doc -->
497	* @see #getLocalTooltip()
498	* @generated
499	* @ordered
500	*/
501	protected String localTooltip = LOCAL_TOOLTIP_EDEFAULT;
502	/**
503	* The default value of the '{@link #getLocalImage() <em>Local Image</em>}' attribute.
504	* <!-- begin-user-doc -->
505	* <!-- end-user-doc -->
506	* @see #getLocalImage()
507	* @generated
508	* @ordered
509	*/
510	protected static final Object LOCAL_IMAGE_EDEFAULT = null;
511	/**
512	* The cached value of the '{@link #getLocalImage() <em>Local Image</em>}' attribute.
513	* <!-- begin-user-doc -->
514	* <!-- end-user-doc -->
515	* @see #getLocalImage()
516	* @generated
517	* @ordered
518	*/
519	protected Object localImage = LOCAL_IMAGE_EDEFAULT;
520	/**
521	* The default value of the '{@link #isDirty() <em>Dirty</em>}' attribute.	464	* The default value of the '{@link #isDirty() <em>Dirty</em>}' attribute.
522	* <!-- begin-user-doc --> <!-- end-user-doc -->	465	* <!-- begin-user-doc --> <!-- end-user-doc -->
523	* @see #isDirty()	466	* @see #isDirty()
Lines 1154-1159 Link Here
1154	}	1097	}
1155		1098
1156	/**	1099	/**
		1100	* <!-- begin-user-doc -->
		1101	* <!-- end-user-doc -->
		1102	* @generated
		1103	*/
		1104	public String getLocalizedLabel() {
		1105	// TODO: implement this method
		1106	// Ensure that you remove @generated or mark it @generated NOT
		1107	throw new UnsupportedOperationException();
		1108	}
		1109
		1110	/**
		1111	* <!-- begin-user-doc -->
		1112	* <!-- end-user-doc -->
		1113	* @generated
		1114	*/
		1115	public String getLocalizedTooltip() {
		1116	// TODO: implement this method
		1117	// Ensure that you remove @generated or mark it @generated NOT
		1118	throw new UnsupportedOperationException();
		1119	}
		1120
		1121	/**
1157	* <!-- begin-user-doc --> <!-- end-user-doc -->	1122	* <!-- begin-user-doc --> <!-- end-user-doc -->
1158	* @generated	1123	* @generated
1159	*/	1124	*/
Lines 1278-1289 Link Here
1278	return getIconURI();	1243	return getIconURI();
1279	case MTestPackage.TEST_HARNESS__TOOLTIP:	1244	case MTestPackage.TEST_HARNESS__TOOLTIP:
1280	return getTooltip();	1245	return getTooltip();
1281	case MTestPackage.TEST_HARNESS__LOCAL_LABEL:
1282	return getLocalLabel();
1283	case MTestPackage.TEST_HARNESS__LOCAL_TOOLTIP:
1284	return getLocalTooltip();
1285	case MTestPackage.TEST_HARNESS__LOCAL_IMAGE:
1286	return getLocalImage();
1287	case MTestPackage.TEST_HARNESS__DIRTY:	1246	case MTestPackage.TEST_HARNESS__DIRTY:
1288	return isDirty();	1247	return isDirty();
1289	}	1248	}
Lines 1385-1399 Link Here
1385	case MTestPackage.TEST_HARNESS__TOOLTIP:	1344	case MTestPackage.TEST_HARNESS__TOOLTIP:
1386	setTooltip((String)newValue);	1345	setTooltip((String)newValue);
1387	return;	1346	return;
1388	case MTestPackage.TEST_HARNESS__LOCAL_LABEL:
1389	setLocalLabel((String)newValue);
1390	return;
1391	case MTestPackage.TEST_HARNESS__LOCAL_TOOLTIP:
1392	setLocalTooltip((String)newValue);
1393	return;
1394	case MTestPackage.TEST_HARNESS__LOCAL_IMAGE:
1395	setLocalImage(newValue);
1396	return;
1397	case MTestPackage.TEST_HARNESS__DIRTY:	1347	case MTestPackage.TEST_HARNESS__DIRTY:
1398	setDirty((Boolean)newValue);	1348	setDirty((Boolean)newValue);
1399	return;	1349	return;
Lines 1492-1506 Link Here
1492	case MTestPackage.TEST_HARNESS__TOOLTIP:	1442	case MTestPackage.TEST_HARNESS__TOOLTIP:
1493	setTooltip(TOOLTIP_EDEFAULT);	1443	setTooltip(TOOLTIP_EDEFAULT);
1494	return;	1444	return;
1495	case MTestPackage.TEST_HARNESS__LOCAL_LABEL:
1496	setLocalLabel(LOCAL_LABEL_EDEFAULT);
1497	return;
1498	case MTestPackage.TEST_HARNESS__LOCAL_TOOLTIP:
1499	setLocalTooltip(LOCAL_TOOLTIP_EDEFAULT);
1500	return;
1501	case MTestPackage.TEST_HARNESS__LOCAL_IMAGE:
1502	setLocalImage(LOCAL_IMAGE_EDEFAULT);
1503	return;
1504	case MTestPackage.TEST_HARNESS__DIRTY:	1445	case MTestPackage.TEST_HARNESS__DIRTY:
1505	setDirty(DIRTY_EDEFAULT);	1446	setDirty(DIRTY_EDEFAULT);
1506	return;	1447	return;
Lines 1571-1582 Link Here
1571	return ICON_URI_EDEFAULT == null ? iconURI != null : !ICON_URI_EDEFAULT.equals(iconURI);	1512	return ICON_URI_EDEFAULT == null ? iconURI != null : !ICON_URI_EDEFAULT.equals(iconURI);
1572	case MTestPackage.TEST_HARNESS__TOOLTIP:	1513	case MTestPackage.TEST_HARNESS__TOOLTIP:
1573	return TOOLTIP_EDEFAULT == null ? tooltip != null : !TOOLTIP_EDEFAULT.equals(tooltip);	1514	return TOOLTIP_EDEFAULT == null ? tooltip != null : !TOOLTIP_EDEFAULT.equals(tooltip);
1574	case MTestPackage.TEST_HARNESS__LOCAL_LABEL:
1575	return LOCAL_LABEL_EDEFAULT == null ? localLabel != null : !LOCAL_LABEL_EDEFAULT.equals(localLabel);
1576	case MTestPackage.TEST_HARNESS__LOCAL_TOOLTIP:
1577	return LOCAL_TOOLTIP_EDEFAULT == null ? localTooltip != null : !LOCAL_TOOLTIP_EDEFAULT.equals(localTooltip);
1578	case MTestPackage.TEST_HARNESS__LOCAL_IMAGE:
1579	return LOCAL_IMAGE_EDEFAULT == null ? localImage != null : !LOCAL_IMAGE_EDEFAULT.equals(localImage);
1580	case MTestPackage.TEST_HARNESS__DIRTY:	1515	case MTestPackage.TEST_HARNESS__DIRTY:
1581	return dirty != DIRTY_EDEFAULT;	1516	return dirty != DIRTY_EDEFAULT;
1582	}	1517	}
Lines 1654-1662 Link Here
1654	case MTestPackage.TEST_HARNESS__LABEL: return UiPackageImpl.UI_LABEL__LABEL;	1589	case MTestPackage.TEST_HARNESS__LABEL: return UiPackageImpl.UI_LABEL__LABEL;
1655	case MTestPackage.TEST_HARNESS__ICON_URI: return UiPackageImpl.UI_LABEL__ICON_URI;	1590	case MTestPackage.TEST_HARNESS__ICON_URI: return UiPackageImpl.UI_LABEL__ICON_URI;
1656	case MTestPackage.TEST_HARNESS__TOOLTIP: return UiPackageImpl.UI_LABEL__TOOLTIP;	1591	case MTestPackage.TEST_HARNESS__TOOLTIP: return UiPackageImpl.UI_LABEL__TOOLTIP;
1657	case MTestPackage.TEST_HARNESS__LOCAL_LABEL: return UiPackageImpl.UI_LABEL__LOCAL_LABEL;
1658	case MTestPackage.TEST_HARNESS__LOCAL_TOOLTIP: return UiPackageImpl.UI_LABEL__LOCAL_TOOLTIP;
1659	case MTestPackage.TEST_HARNESS__LOCAL_IMAGE: return UiPackageImpl.UI_LABEL__LOCAL_IMAGE;
1660	default: return -1;	1592	default: return -1;
1661	}	1593	}
1662	}	1594	}
Lines 1740-1748 Link Here
1740	case UiPackageImpl.UI_LABEL__LABEL: return MTestPackage.TEST_HARNESS__LABEL;	1672	case UiPackageImpl.UI_LABEL__LABEL: return MTestPackage.TEST_HARNESS__LABEL;
1741	case UiPackageImpl.UI_LABEL__ICON_URI: return MTestPackage.TEST_HARNESS__ICON_URI;	1673	case UiPackageImpl.UI_LABEL__ICON_URI: return MTestPackage.TEST_HARNESS__ICON_URI;
1742	case UiPackageImpl.UI_LABEL__TOOLTIP: return MTestPackage.TEST_HARNESS__TOOLTIP;	1674	case UiPackageImpl.UI_LABEL__TOOLTIP: return MTestPackage.TEST_HARNESS__TOOLTIP;
1743	case UiPackageImpl.UI_LABEL__LOCAL_LABEL: return MTestPackage.TEST_HARNESS__LOCAL_LABEL;
1744	case UiPackageImpl.UI_LABEL__LOCAL_TOOLTIP: return MTestPackage.TEST_HARNESS__LOCAL_TOOLTIP;
1745	case UiPackageImpl.UI_LABEL__LOCAL_IMAGE: return MTestPackage.TEST_HARNESS__LOCAL_IMAGE;
1746	default: return -1;	1675	default: return -1;
1747	}	1676	}
1748	}	1677	}
Lines 1802-1813 Link Here
1802	result.append(iconURI);	1731	result.append(iconURI);
1803	result.append(", tooltip: ");	1732	result.append(", tooltip: ");
1804	result.append(tooltip);	1733	result.append(tooltip);
1805	result.append(", localLabel: ");
1806	result.append(localLabel);
1807	result.append(", localTooltip: ");
1808	result.append(localTooltip);
1809	result.append(", localImage: ");
1810	result.append(localImage);
1811	result.append(", dirty: ");	1734	result.append(", dirty: ");
1812	result.append(dirty);	1735	result.append(dirty);
1813	result.append(')');	1736	result.append(')');

Lines 18-24 Link Here

(-)src/org/eclipse/e4/ui/internal/workbench/ModelServiceImpl.java (-19 / +2 lines)
18	import org.eclipse.e4.core.contexts.IEclipseContext;	18	import org.eclipse.e4.core.contexts.IEclipseContext;
19	import org.eclipse.e4.core.di.annotations.Execute;	19	import org.eclipse.e4.core.di.annotations.Execute;
20	import org.eclipse.e4.ui.model.application.MApplication;	20	import org.eclipse.e4.ui.model.application.MApplication;
21	import org.eclipse.e4.ui.model.application.ui.MContext;
22	import org.eclipse.e4.ui.model.application.ui.MElementContainer;	21	import org.eclipse.e4.ui.model.application.ui.MElementContainer;
23	import org.eclipse.e4.ui.model.application.ui.MGenericTile;	22	import org.eclipse.e4.ui.model.application.ui.MGenericTile;
24	import org.eclipse.e4.ui.model.application.ui.MUIElement;	23	import org.eclipse.e4.ui.model.application.ui.MUIElement;
Lines 39-44 Link Here
39	import org.eclipse.e4.ui.model.application.ui.basic.MWindowElement;	38	import org.eclipse.e4.ui.model.application.ui.basic.MWindowElement;
40	import org.eclipse.e4.ui.model.application.ui.basic.impl.BasicFactoryImpl;	39	import org.eclipse.e4.ui.model.application.ui.basic.impl.BasicFactoryImpl;
41	import org.eclipse.e4.ui.model.application.ui.menu.MToolControl;	40	import org.eclipse.e4.ui.model.application.ui.menu.MToolControl;
		41	import org.eclipse.e4.ui.model.internal.ModelUtils;
42	import org.eclipse.e4.ui.workbench.IPresentationEngine;	42	import org.eclipse.e4.ui.workbench.IPresentationEngine;
43	import org.eclipse.e4.ui.workbench.modeling.EModelService;	43	import org.eclipse.e4.ui.workbench.modeling.EModelService;
44	import org.eclipse.emf.ecore.EObject;	44	import org.eclipse.emf.ecore.EObject;
Lines 213-236 Link Here
213	* .model .application.MUIElement)	213	* .model .application.MUIElement)
214	*/	214	*/
215	public IEclipseContext getContainingContext(MUIElement element) {	215	public IEclipseContext getContainingContext(MUIElement element) {
216	MUIElement curParent = null;	216	return ModelUtils.getContainingContext(element);
217	if (element.getCurSharedRef() != null)
218	curParent = element.getCurSharedRef().getParent();
219	else
220	curParent = (MUIElement) ((EObject) element).eContainer();
221
222	while (curParent != null) {
223	if (curParent instanceof MContext) {
224	return ((MContext) curParent).getContext();
225	}
226
227	if (curParent.getCurSharedRef() != null)
228	curParent = curParent.getCurSharedRef().getParent();
229	else
230	curParent = (MUIElement) ((EObject) curParent).eContainer();
231	}
232
233	return null;
234	}	217	}
235		218
236	/*	219	/*

Lines 322-335 Link Here

(-)src/org/eclipse/e4/ui/workbench/addons/perspectiveswitcher/PerspectiveSwitcher.java (-7 / +7 lines)
322	if (desc != null) {	322	if (desc != null) {
323	psItem.setImage(desc.createImage(false));	323	psItem.setImage(desc.createImage(false));
324	foundImage = true;	324	foundImage = true;
325	psItem.setToolTipText(persp.getLabel());	325	psItem.setToolTipText(persp.getLocalizedLabel());
326	}	326	}
327	}	327	}
328	if (!foundImage	328	if (!foundImage
329	\|\| PrefUtil.getAPIPreferenceStore().getBoolean(	329	\|\| PrefUtil.getAPIPreferenceStore().getBoolean(
330	IWorkbenchPreferenceConstants.SHOW_TEXT_ON_PERSPECTIVE_BAR)) {	330	IWorkbenchPreferenceConstants.SHOW_TEXT_ON_PERSPECTIVE_BAR)) {
331	psItem.setText(persp.getLabel());	331	psItem.setText(persp.getLocalizedLabel());
332	psItem.setToolTipText(persp.getTooltip());	332	psItem.setToolTipText(persp.getLocalizedTooltip());
333	}	333	}
334		334
335	psItem.setSelection(persp == persp.getParent().getSelectedElement());	335	psItem.setSelection(persp == persp.getParent().getSelectedElement());
Lines 490-496 Link Here
490	return;	490	return;
491	IWorkbenchPage page = persp.getContext().get(IWorkbenchPage.class);	491	IWorkbenchPage page = persp.getContext().get(IWorkbenchPage.class);
492	String message = NLS.bind(WorkbenchMessages.ResetPerspective_message,	492	String message = NLS.bind(WorkbenchMessages.ResetPerspective_message,
493	persp.getLabel());	493	persp.getLocalizedLabel());
494	if (MessageDialog.openConfirm(page.getWorkbenchWindow().getShell(),	494	if (MessageDialog.openConfirm(page.getWorkbenchWindow().getShell(),
495	WorkbenchMessages.ResetPerspective_title, message)) {	495	WorkbenchMessages.ResetPerspective_title, message)) {
496	page.resetPerspective();	496	page.resetPerspective();
Lines 526-538 Link Here
526	if (persp != null)	526	if (persp != null)
527	if (showText) {	527	if (showText) {
528	if (persp.getLabel() != null)	528	if (persp.getLabel() != null)
529	items[i].setText(persp.getLabel());	529	items[i].setText(persp.getLocalizedLabel());
530	items[i].setToolTipText(persp.getTooltip());	530	items[i].setToolTipText(persp.getLocalizedTooltip());
531	} else {	531	} else {
532	Image image = items[i].getImage();	532	Image image = items[i].getImage();
533	if (image != null) {	533	if (image != null) {
534	items[i].setText("");	534	items[i].setText("");
535	items[i].setToolTipText(persp.getLabel());	535	items[i].setToolTipText(persp.getLocalizedLabel());
536	}	536	}
537	}	537	}
538	}	538	}

Lines 55-65 Link Here

(-)src/org/eclipse/e4/ui/workbench/renderers/swt/AreaRenderer.java (-4 / +4 lines)
55	String attName = (String) event	55	String attName = (String) event
56	.getProperty(UIEvents.EventTags.ATTNAME);	56	.getProperty(UIEvents.EventTags.ATTNAME);
57	if (UIEvents.UILabel.LABEL.equals(attName)) {	57	if (UIEvents.UILabel.LABEL.equals(attName)) {
58	areaItem.setText(areaModel.getLabel());	58	areaItem.setText(areaModel.getLocalizedLabel());
59	} else if (UIEvents.UILabel.ICONURI.equals(attName)) {	59	} else if (UIEvents.UILabel.ICONURI.equals(attName)) {
60	areaItem.setImage(getImage(areaModel));	60	areaItem.setImage(getImage(areaModel));
61	} else if (UIEvents.UILabel.TOOLTIP.equals(attName)) {	61	} else if (UIEvents.UILabel.TOOLTIP.equals(attName)) {
62	areaItem.setToolTipText(areaModel.getTooltip());	62	areaItem.setToolTipText(areaModel.getLocalizedTooltip());
63	}	63	}
64	}	64	}
65	};	65	};
Lines 94-102 Link Here
94		94
95	CTabItem cti = new CTabItem(ctf, SWT.NONE);	95	CTabItem cti = new CTabItem(ctf, SWT.NONE);
96	if (areaModel.getLabel() != null)	96	if (areaModel.getLabel() != null)
97	cti.setText(areaModel.getLabel());	97	cti.setText(areaModel.getLocalizedLabel());
98	if (areaModel.getTooltip() != null)	98	if (areaModel.getTooltip() != null)
99	cti.setToolTipText(areaModel.getTooltip());	99	cti.setToolTipText(areaModel.getLocalizedTooltip());
100	if (areaModel.getIconURI() != null)	100	if (areaModel.getIconURI() != null)
101	cti.setImage(getImage(areaModel));	101	cti.setImage(getImage(areaModel));
102		102

Lines 167-173 Link Here

(-)src/org/eclipse/e4/ui/workbench/renderers/swt/ToolItemRenderer.java (-3 / +3 lines)
167	}	167	}
168		168
169	private void setItemText(MToolItem model, ToolItem item) {	169	private void setItemText(MToolItem model, ToolItem item) {
170	String text = model.getLabel();	170	String text = model.getLocalizedLabel();
171	if (model instanceof MHandledItem) {	171	if (model instanceof MHandledItem) {
172	MHandledItem handledItem = (MHandledItem) model;	172	MHandledItem handledItem = (MHandledItem) model;
173	IEclipseContext context = getContext(model);	173	IEclipseContext context = getContext(model);
Lines 192-198 Link Here
192	}	192	}
193		193
194	private String getToolTipText(MItem item) {	194	private String getToolTipText(MItem item) {
195	String text = item.getTooltip();	195	String text = item.getLocalizedTooltip();
196	if (item instanceof MHandledItem) {	196	if (item instanceof MHandledItem) {
197	MHandledItem handledItem = (MHandledItem) item;	197	MHandledItem handledItem = (MHandledItem) item;
198	IEclipseContext context = getContext(item);	198	IEclipseContext context = getContext(item);
Lines 242-248 Link Here
242		242
243	ToolItem newItem = new ToolItem((ToolBar) parent, flags, addIndex);	243	ToolItem newItem = new ToolItem((ToolBar) parent, flags, addIndex);
244	if (itemModel.getLabel() != null)	244	if (itemModel.getLabel() != null)
245	newItem.setText(itemModel.getLabel());	245	newItem.setText(itemModel.getLocalizedLabel());
246		246
247	newItem.setToolTipText(getToolTipText(itemModel));	247	newItem.setToolTipText(getToolTipText(itemModel));
248		248

Lines 44-56 Link Here

(-)src/org/eclipse/e4/ui/workbench/swt/internal/copy/ViewComparator.java (-2 / +2 lines)
44		44
45	String str1;	45	String str1;
46	if (e1 instanceof MPartDescriptor)	46	if (e1 instanceof MPartDescriptor)
47	str1 = ((MPartDescriptor) e1).getLabel();	47	str1 = ((MPartDescriptor) e1).getLocalizedLabel();
48	else	48	else
49	str1 = e1.toString();	49	str1 = e1.toString();
50		50
51	String str2;	51	String str2;
52	if (e2 instanceof MPartDescriptor)	52	if (e2 instanceof MPartDescriptor)
53	str2 = ((MPartDescriptor) e2).getLabel();	53	str2 = ((MPartDescriptor) e2).getLocalizedLabel();
54	else	54	else
55	str2 = e2.toString();	55	str2 = e2.toString();
56	if (str1 == null)	56	if (str1 == null)

Lines 11-24 Link Here

(-)Eclipse UI/org/eclipse/ui/internal/registry/ViewDescriptor.java (-3 / +4 lines)
11	*******************************************************************************/	11	*******************************************************************************/
12	package org.eclipse.ui.internal.registry;	12	package org.eclipse.ui.internal.registry;
13		13
14	import org.eclipse.e4.ui.workbench.IResourceUtilities;
15
16	import org.eclipse.core.runtime.CoreException;	14	import org.eclipse.core.runtime.CoreException;
17	import org.eclipse.core.runtime.IConfigurationElement;	15	import org.eclipse.core.runtime.IConfigurationElement;
18	import org.eclipse.core.runtime.IStatus;	16	import org.eclipse.core.runtime.IStatus;
19	import org.eclipse.core.runtime.Status;	17	import org.eclipse.core.runtime.Status;
		18	import org.eclipse.e4.ui.model.LocalizationHelper;
20	import org.eclipse.e4.ui.model.application.MApplication;	19	import org.eclipse.e4.ui.model.application.MApplication;
21	import org.eclipse.e4.ui.model.application.descriptor.basic.MPartDescriptor;	20	import org.eclipse.e4.ui.model.application.descriptor.basic.MPartDescriptor;
		21	import org.eclipse.e4.ui.workbench.IResourceUtilities;
22	import org.eclipse.e4.ui.workbench.swt.util.ISWTResourceUtilities;	22	import org.eclipse.e4.ui.workbench.swt.util.ISWTResourceUtilities;
23	import org.eclipse.emf.common.util.URI;	23	import org.eclipse.emf.common.util.URI;
24	import org.eclipse.jface.resource.ImageDescriptor;	24	import org.eclipse.jface.resource.ImageDescriptor;
Lines 118-124 Link Here
118	* @see org.eclipse.ui.views.IViewDescriptor#getLabel()	118	* @see org.eclipse.ui.views.IViewDescriptor#getLabel()
119	*/	119	*/
120	public String getLabel() {	120	public String getLabel() {
121	return descriptor.getLabel();	121	return LocalizationHelper.getLocalized(descriptor.getLabel(), descriptor,
		122	application.getContext());
122	}	123	}
123		124
124	/*	125	/*