Download
Getting Started
Members
Projects
Community
Marketplace
Events
Planet Eclipse
Newsletter
Videos
Participate
Report a Bug
Forums
Mailing Lists
Wiki
IRC
How to Contribute
Working Groups
Automotive
Internet of Things
LocationTech
Long-Term Support
PolarSys
Science
OpenMDM
More
Community
Marketplace
Events
Planet Eclipse
Newsletter
Videos
Participate
Report a Bug
Forums
Mailing Lists
Wiki
IRC
How to Contribute
Working Groups
Automotive
Internet of Things
LocationTech
Long-Term Support
PolarSys
Science
OpenMDM
Toggle navigation
Bugzilla – Attachment 104870 Details for
Bug 163079
Impossible to identify correct feature for Label Mapping - add type name in displayed list
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
Log In
[x]
|
Terms of Use
|
Copyright Agent
Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read
this important communication.
[patch]
Modified ItemProvider with toggle action
163079.patch (text/plain), 7.85 KB, created by
Artem Tikhomirov
on 2008-06-13 10:55:05 EDT
(
hide
)
Description:
Modified ItemProvider with toggle action
Filename:
MIME Type:
Creator:
Artem Tikhomirov
Created:
2008-06-13 10:55:05 EDT
Size:
7.85 KB
patch
obsolete
>### Eclipse Workspace Patch 1.0 >#P org.eclipse.gmf.map.edit >Index: src/org/eclipse/gmf/mappings/provider/GMFMapEditPlugin.java >=================================================================== >RCS file: /cvsroot/modeling/org.eclipse.gmf/plugins/org.eclipse.gmf.map.edit/src/org/eclipse/gmf/mappings/provider/GMFMapEditPlugin.java,v >retrieving revision 1.9 >diff -u -r1.9 GMFMapEditPlugin.java >--- src/org/eclipse/gmf/mappings/provider/GMFMapEditPlugin.java 11 May 2007 09:41:36 -0000 1.9 >+++ src/org/eclipse/gmf/mappings/provider/GMFMapEditPlugin.java 13 Jun 2008 14:50:15 -0000 >@@ -76,6 +76,16 @@ > return plugin; > } > >+ private boolean myShowQualifiedFeatureLabels = true; >+ >+ public static void toggleQualifiedFeatureLabelPresentation() { >+ INSTANCE.myShowQualifiedFeatureLabels = !INSTANCE.myShowQualifiedFeatureLabels; >+ } >+ >+ public static boolean isQualifiedFeatureLabels() { >+ return INSTANCE.myShowQualifiedFeatureLabels; >+ } >+ > static String getFeatureLabel(EStructuralFeature feature) { > StringBuffer sb = new StringBuffer(); > if (feature.getEContainingClass() != null) { >Index: src/org/eclipse/gmf/mappings/presentation/GMFMapEditor.java >=================================================================== >RCS file: /cvsroot/modeling/org.eclipse.gmf/plugins/org.eclipse.gmf.map.edit/src/org/eclipse/gmf/mappings/presentation/GMFMapEditor.java,v >retrieving revision 1.21 >diff -u -r1.21 GMFMapEditor.java >--- src/org/eclipse/gmf/mappings/presentation/GMFMapEditor.java 5 Jun 2008 14:39:23 -0000 1.21 >+++ src/org/eclipse/gmf/mappings/presentation/GMFMapEditor.java 13 Jun 2008 14:50:15 -0000 >@@ -6,7 +6,6 @@ > */ > package org.eclipse.gmf.mappings.presentation; > >- > import java.io.IOException; > import java.io.InputStream; > import java.util.ArrayList; >@@ -48,7 +47,6 @@ > 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; >@@ -72,6 +70,7 @@ > 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; >@@ -655,7 +654,7 @@ > adapterFactory.addAdapterFactory(new GMFMapItemProviderAdapterFactory()); > adapterFactory.addAdapterFactory(new GMFGraphItemProviderAdapterFactory()); > adapterFactory.addAdapterFactory(new GMFToolItemProviderAdapterFactory()); >- adapterFactory.addAdapterFactory(new EcoreItemProviderAdapterFactory()); >+ adapterFactory.addAdapterFactory(new EcoreItemProviderAdapterFactoryEx()); > adapterFactory.addAdapterFactory(new ReflectiveItemProviderAdapterFactory()); > > // Create the command stack that will notify this editor as commands are executed. >Index: src/org/eclipse/gmf/mappings/presentation/GMFMapActionBarContributor.java >=================================================================== >RCS file: /cvsroot/modeling/org.eclipse.gmf/plugins/org.eclipse.gmf.map.edit/src/org/eclipse/gmf/mappings/presentation/GMFMapActionBarContributor.java,v >retrieving revision 1.6 >diff -u -r1.6 GMFMapActionBarContributor.java >--- src/org/eclipse/gmf/mappings/presentation/GMFMapActionBarContributor.java 3 Apr 2007 16:29:19 -0000 1.6 >+++ src/org/eclipse/gmf/mappings/presentation/GMFMapActionBarContributor.java 13 Jun 2008 14:50:14 -0000 >@@ -108,6 +108,8 @@ > } > }; > >+ protected final ToggleQualifiedLabels toggleLabelsAction = new ToggleQualifiedLabels(); >+ > /** > * This will contain one {@link org.eclipse.emf.edit.ui.action.CreateChildAction} corresponding to each descriptor > * generated for the current selection by the item provider. >@@ -396,7 +398,7 @@ > * This inserts global actions before the "additions-end" separator. > * <!-- begin-user-doc --> > * <!-- end-user-doc --> >- * @generated >+ * @generated NOT > */ > @Override > protected void addGlobalActions(IMenuManager menuManager) { >@@ -407,6 +409,10 @@ > menuManager.insertAfter("ui-actions", refreshViewerAction); > > super.addGlobalActions(menuManager); >+ // handwritten code starts >+ toggleLabelsAction.update(); >+ menuManager.insertBefore("ui-actions", toggleLabelsAction); >+ // handwritten code ends > } > > /** >@@ -420,4 +426,18 @@ > return true; > } > >+ private static class ToggleQualifiedLabels extends Action { >+ public ToggleQualifiedLabels() { >+ super(GMFMapEditPlugin.INSTANCE.getString("_UI_ToggleQualifiedLabels_menu_item"), Action.AS_CHECK_BOX); >+ } >+ @Override >+ public void run() { >+ GMFMapEditPlugin.toggleQualifiedFeatureLabelPresentation(); >+ update(); >+ } >+ >+ void update() { >+ setChecked(GMFMapEditPlugin.isQualifiedFeatureLabels()); >+ } >+ } > } >Index: plugin.properties >=================================================================== >RCS file: /cvsroot/modeling/org.eclipse.gmf/plugins/org.eclipse.gmf.map.edit/plugin.properties,v >retrieving revision 1.43 >diff -u -r1.43 plugin.properties >--- plugin.properties 17 Apr 2008 11:58:45 -0000 1.43 >+++ plugin.properties 13 Jun 2008 14:50:14 -0000 >@@ -20,6 +20,10 @@ > ############################################################# > # Properties in this section ARE REALLY NEED to be translated > ############################################################# >+ >+# next item(s) are manually added >+_UI_ToggleQualifiedLabels_menu_item=Qualified feature names >+# > _UI_CreateChild_text = {0} > _UI_CreateChild_text2 = {1} {0} > _UI_CreateChild_text3 = {1} >Index: src/org/eclipse/gmf/mappings/provider/EcoreItemProviderAdapterFactoryEx.java >=================================================================== >RCS file: src/org/eclipse/gmf/mappings/provider/EcoreItemProviderAdapterFactoryEx.java >diff -N src/org/eclipse/gmf/mappings/provider/EcoreItemProviderAdapterFactoryEx.java >--- /dev/null 1 Jan 1970 00:00:00 -0000 >+++ src/org/eclipse/gmf/mappings/provider/EcoreItemProviderAdapterFactoryEx.java 1 Jan 1970 00:00:00 -0000 >@@ -0,0 +1,45 @@ >+/* >+ * 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) { >+ if (GMFMapEditPlugin.isQualifiedFeatureLabels()) { >+ return GMFMapEditPlugin.getFeatureLabel((EStructuralFeature) obj); >+ } >+ return super.getText(obj); >+ } >+ }; >+ eReferenceItemProvider = new EReferenceItemProvider(this) { >+ @Override >+ public String getText(Object obj) { >+ if (GMFMapEditPlugin.isQualifiedFeatureLabels()) { >+ return GMFMapEditPlugin.getFeatureLabel((EStructuralFeature) obj); >+ } >+ return super.getText(obj); >+ } >+ }; >+ } >+ >+}
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 163079
:
53065
|
104861
| 104870