Rename variable to avoid name collision

Change-Id: Ia389bab9dab3da2793fb0f778a343ac3c4979390 Signed-off-by: Stéphane Thibaudeau <[email protected]>
ObeoNetwork · Jan 30, 2017 · 5a7d35d · 5a7d35d
1 parent dd765d1
commit 5a7d35d
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/...conf.edit/src-gen/org/obeonetwork/m2doc/genconf/provider/ModelDefinitionItemProvider.java b/...conf.edit/src-gen/org/obeonetwork/m2doc/genconf/provider/ModelDefinitionItemProvider.java
@@ -176,7 +176,7 @@ private String getLabelForExternalEObject(EObject eObject) {
         return "";
     }
 
-    private ComposedAdapterFactory adapterFactory = null;
+    private ComposedAdapterFactory delegatedAdapterFactory = null;
     /**
      * Return a label provider for the specified EObject
      * Try to return an existing one and create a new AdapterFactory if needed
@@ -192,11 +192,11 @@ private IItemLabelProvider getItemLabelProvider(EObject eObject) {
 		}
 
     	// No adapter found we have no choice but creating our own AdapterFactory
-    	if (adapterFactory == null) {
-    		adapterFactory = new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE);
+    	if (delegatedAdapterFactory == null) {
+    		delegatedAdapterFactory = new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE);
     	}
-    	if (adapterFactory != null) {
-    		return (IItemLabelProvider) adapterFactory.adapt(eObject, IItemLabelProvider.class);
+    	if (delegatedAdapterFactory != null) {
+    		return (IItemLabelProvider) delegatedAdapterFactory.adapt(eObject, IItemLabelProvider.class);
     	}
 
     	return null;