Attachment #104861 for bug #163079

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




 */
package org.eclipse.gmf.mappings.presentation;


import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;

import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EValidator;
import org.eclipse.emf.ecore.plugin.EcorePlugin;
import org.eclipse.emf.ecore.provider.EcoreItemProviderAdapterFactory;
import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.emf.ecore.resource.ResourceSet;
import org.eclipse.emf.ecore.util.EContentAdapter;

import org.eclipse.emf.edit.ui.util.EditUIUtil;
import org.eclipse.emf.edit.ui.view.ExtendedPropertySheetPage;
import org.eclipse.gmf.gmfgraph.provider.GMFGraphItemProviderAdapterFactory;
import org.eclipse.gmf.mappings.provider.EcoreItemProviderAdapterFactoryEx;
import org.eclipse.gmf.mappings.provider.GMFMapEditPlugin;
import org.eclipse.gmf.mappings.provider.GMFMapItemProviderAdapterFactory;
import org.eclipse.gmf.tooldef.provider.GMFToolItemProviderAdapterFactory;

		adapterFactory.addAdapterFactory(new GMFMapItemProviderAdapterFactory());
		adapterFactory.addAdapterFactory(new GMFGraphItemProviderAdapterFactory());
		adapterFactory.addAdapterFactory(new GMFToolItemProviderAdapterFactory());
		adapterFactory.addAdapterFactory(new EcoreItemProviderAdapterFactoryEx());
		adapterFactory.addAdapterFactory(new ReflectiveItemProviderAdapterFactory());

		// Create the command stack that will notify this editor as commands are executed.




/*
 * Copyright (c) 2008 Borland Software Corporation
 * 
 * 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:
 *    Artem Tikhomirov (Borland) - initial API and implementation
 */
package org.eclipse.gmf.mappings.provider;

import org.eclipse.emf.ecore.EStructuralFeature;
import org.eclipse.emf.ecore.provider.EAttributeItemProvider;
import org.eclipse.emf.ecore.provider.EReferenceItemProvider;
import org.eclipse.emf.ecore.provider.EcoreItemProviderAdapterFactory;

/**
 * @author artem
 */
public class EcoreItemProviderAdapterFactoryEx extends EcoreItemProviderAdapterFactory {
	
	public EcoreItemProviderAdapterFactoryEx() {
		eAttributeItemProvider = new EAttributeItemProvider(this) {
			@Override
			public String getText(Object obj) {
				return GMFMapEditPlugin.getFeatureLabel((EStructuralFeature) obj);
			}
		};
		eReferenceItemProvider = new EReferenceItemProvider(this) {
			@Override
			public String getText(Object obj) {
				return GMFMapEditPlugin.getFeatureLabel((EStructuralFeature) obj);
			}
		};
	}

}

Return to bug 163079

Lines 6-12 Link Here

(-)src/org/eclipse/gmf/mappings/presentation/GMFMapEditor.java (-3 / +2 lines)
6	*/	6	*/
7	package org.eclipse.gmf.mappings.presentation;	7	package org.eclipse.gmf.mappings.presentation;
8		8
9
10	import java.io.IOException;	9	import java.io.IOException;
11	import java.io.InputStream;	10	import java.io.InputStream;
12	import java.util.ArrayList;	11	import java.util.ArrayList;
Lines 48-54 Link Here
48	import org.eclipse.emf.ecore.EObject;	47	import org.eclipse.emf.ecore.EObject;
49	import org.eclipse.emf.ecore.EValidator;	48	import org.eclipse.emf.ecore.EValidator;
50	import org.eclipse.emf.ecore.plugin.EcorePlugin;	49	import org.eclipse.emf.ecore.plugin.EcorePlugin;
51	import org.eclipse.emf.ecore.provider.EcoreItemProviderAdapterFactory;
52	import org.eclipse.emf.ecore.resource.Resource;	50	import org.eclipse.emf.ecore.resource.Resource;
53	import org.eclipse.emf.ecore.resource.ResourceSet;	51	import org.eclipse.emf.ecore.resource.ResourceSet;
54	import org.eclipse.emf.ecore.util.EContentAdapter;	52	import org.eclipse.emf.ecore.util.EContentAdapter;
Lines 72-77 Link Here
72	import org.eclipse.emf.edit.ui.util.EditUIUtil;	70	import org.eclipse.emf.edit.ui.util.EditUIUtil;
73	import org.eclipse.emf.edit.ui.view.ExtendedPropertySheetPage;	71	import org.eclipse.emf.edit.ui.view.ExtendedPropertySheetPage;
74	import org.eclipse.gmf.gmfgraph.provider.GMFGraphItemProviderAdapterFactory;	72	import org.eclipse.gmf.gmfgraph.provider.GMFGraphItemProviderAdapterFactory;
		73	import org.eclipse.gmf.mappings.provider.EcoreItemProviderAdapterFactoryEx;
75	import org.eclipse.gmf.mappings.provider.GMFMapEditPlugin;	74	import org.eclipse.gmf.mappings.provider.GMFMapEditPlugin;
76	import org.eclipse.gmf.mappings.provider.GMFMapItemProviderAdapterFactory;	75	import org.eclipse.gmf.mappings.provider.GMFMapItemProviderAdapterFactory;
77	import org.eclipse.gmf.tooldef.provider.GMFToolItemProviderAdapterFactory;	76	import org.eclipse.gmf.tooldef.provider.GMFToolItemProviderAdapterFactory;
Lines 655-661 Link Here
655	adapterFactory.addAdapterFactory(new GMFMapItemProviderAdapterFactory());	654	adapterFactory.addAdapterFactory(new GMFMapItemProviderAdapterFactory());
656	adapterFactory.addAdapterFactory(new GMFGraphItemProviderAdapterFactory());	655	adapterFactory.addAdapterFactory(new GMFGraphItemProviderAdapterFactory());
657	adapterFactory.addAdapterFactory(new GMFToolItemProviderAdapterFactory());	656	adapterFactory.addAdapterFactory(new GMFToolItemProviderAdapterFactory());
658	adapterFactory.addAdapterFactory(new EcoreItemProviderAdapterFactory());	657	adapterFactory.addAdapterFactory(new EcoreItemProviderAdapterFactoryEx());
659	adapterFactory.addAdapterFactory(new ReflectiveItemProviderAdapterFactory());	658	adapterFactory.addAdapterFactory(new ReflectiveItemProviderAdapterFactory());
660		659
661	// Create the command stack that will notify this editor as commands are executed.	660	// Create the command stack that will notify this editor as commands are executed.

Added Link Here

(-)src/org/eclipse/gmf/mappings/provider/EcoreItemProviderAdapterFactoryEx.java (+39 lines)
1	/*
2	* Copyright (c) 2008 Borland Software Corporation
3	*
4	* All rights reserved. This program and the accompanying materials
5	* are made available under the terms of the Eclipse Public License v1.0
6	* which accompanies this distribution, and is available at
7	* http://www.eclipse.org/legal/epl-v10.html
8	*
9	* Contributors:
10	* Artem Tikhomirov (Borland) - initial API and implementation
11	*/
12	package org.eclipse.gmf.mappings.provider;
13
14	import org.eclipse.emf.ecore.EStructuralFeature;
15	import org.eclipse.emf.ecore.provider.EAttributeItemProvider;
16	import org.eclipse.emf.ecore.provider.EReferenceItemProvider;
17	import org.eclipse.emf.ecore.provider.EcoreItemProviderAdapterFactory;
18
19	/**
20	* @author artem
21	*/
22	public class EcoreItemProviderAdapterFactoryEx extends EcoreItemProviderAdapterFactory {
23
24	public EcoreItemProviderAdapterFactoryEx() {
25	eAttributeItemProvider = new EAttributeItemProvider(this) {
26	@Override
27	public String getText(Object obj) {
28	return GMFMapEditPlugin.getFeatureLabel((EStructuralFeature) obj);
29	}
30	};
31	eReferenceItemProvider = new EReferenceItemProvider(this) {
32	@Override
33	public String getText(Object obj) {
34	return GMFMapEditPlugin.getFeatureLabel((EStructuralFeature) obj);
35	}
36	};
37	}
38
39	}