From 5a7d35d2cd6dd3fd0eb442bb2fe0e863b75102ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Thibaudeau?= Date: Mon, 30 Jan 2017 19:04:18 +0100 Subject: [PATCH] Rename variable to avoid name collision MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Ia389bab9dab3da2793fb0f778a343ac3c4979390 Signed-off-by: Stéphane Thibaudeau --- .../genconf/provider/ModelDefinitionItemProvider.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/plugins/org.obeonetwork.m2doc.genconf.edit/src-gen/org/obeonetwork/m2doc/genconf/provider/ModelDefinitionItemProvider.java b/plugins/org.obeonetwork.m2doc.genconf.edit/src-gen/org/obeonetwork/m2doc/genconf/provider/ModelDefinitionItemProvider.java index 2c5c99ef5..531612a37 100644 --- a/plugins/org.obeonetwork.m2doc.genconf.edit/src-gen/org/obeonetwork/m2doc/genconf/provider/ModelDefinitionItemProvider.java +++ b/plugins/org.obeonetwork.m2doc.genconf.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;