Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2015-02-23 06:09:34 +0000
committerEike Stepper2015-02-23 07:30:59 +0000
commit061576bcf891c0d48e1c624118b0d7584f4ff59a (patch)
tree3fee9bd68e7b77562abddcfd1746e66cd7489bcb /plugins/org.eclipse.emf.cdo.ui
parent9c12b9143fadefb1fe0543d6615a55a5807c0c1a (diff)
downloadcdo-061576bcf891c0d48e1c624118b0d7584f4ff59a.tar.gz
cdo-061576bcf891c0d48e1c624118b0d7584f4ff59a.tar.xz
cdo-061576bcf891c0d48e1c624118b0d7584f4ff59a.zip
[458349] Consolidate UI
Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=458349
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.ui')
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/CDOPropertyAdapterFactory.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/CDOPropertyAdapterFactory.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/CDOPropertyAdapterFactory.java
index a6f2b92535..9d95a040df 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/CDOPropertyAdapterFactory.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/internal/ui/CDOPropertyAdapterFactory.java
@@ -81,13 +81,13 @@ public class CDOPropertyAdapterFactory extends AbstractPropertyAdapterFactory
{
EObject eObject = (EObject)object;
- final Map<String, Object> propertyValues = new HashMap<String, Object>();
+ final Map<String, Object> emfProperties = new HashMap<String, Object>();
DefaultPropertySource<EObject> result = new DefaultPropertySource<EObject>(eObject, ObjectProperties.INSTANCE)
{
@Override
public Object getPropertyValue(Object id)
{
- Object value = propertyValues.get(id);
+ Object value = emfProperties.get(id);
if (value != null)
{
return value;
@@ -128,7 +128,7 @@ public class CDOPropertyAdapterFactory extends AbstractPropertyAdapterFactory
PropertyDescriptor descriptor = result.addDescriptor(category, id, displayName, description);
Object value = propertyDescriptor.getPropertyValue(eObject);
- propertyValues.put(id, value);
+ emfProperties.put(id, value);
final String text = labelProvider.getText(value);
descriptor.setLabelProvider(new LabelProvider()

Back to the top