410346: Sudden performance degradation e.g. of the Outline View update.

https://bugs.eclipse.org/bugs/show_bug.cgi?id=410346

Fix proliferation of item-provider adapters on model elements due to CompositeAdapterFactories being repeatedly created but never disposed.

4 files changed, 66 insertions, 37 deletions

diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/query/ImageQuery.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/query/ImageQuery.java
index 232c67c5999..5c9a88c06d8 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/query/ImageQuery.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/query/ImageQuery.java
@@ -1,5 +1,5 @@
 /**

- *  Copyright (c) 2011, 2012 Mia-Software.

+ *  Copyright (c) 2011, 2014 Mia-Software, CEA, and others.

  *

  *  All rights reserved. This program and the accompanying materials

  *  are made available under the terms of the Eclipse Public License v1.0

@@ -11,6 +11,7 @@
  *      Gregoire Dupe (Mia-Software) - Bug 369987 - [Restructuring][Table] Switch to the new customization and facet framework

  *      Nicolas Bros (Mia-Software) - Bug 379683 - customizable Tree content provider

  *      Gregoire Dupe (Mia-Software) - Bug 424122 - [Table] Images, fonts and colors are not shared between the instances of table

+ *      Christian W. Damus (CEA) - bug 410346

  */

 package org.eclipse.papyrus.emf.facet.custom.ui.internal.query;

 

@@ -19,10 +20,8 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EReference;

 import org.eclipse.emf.ecore.ETypedElement;

 import org.eclipse.emf.edit.provider.ComposedAdapterFactory;

-import org.eclipse.emf.edit.provider.ComposedImage;

 import org.eclipse.emf.edit.provider.IItemLabelProvider;

 import org.eclipse.emf.edit.ui.provider.ExtendedImageRegistry;

-import org.eclipse.papyrus.emf.facet.custom.ui.internal.Activator;

 import org.eclipse.papyrus.emf.facet.custom.ui.internal.ImageProvider;

 import org.eclipse.papyrus.emf.facet.custom.ui.internal.custompt.ImageWrapper;

 import org.eclipse.papyrus.emf.facet.efacet.core.IFacetManager;

@@ -31,9 +30,6 @@ import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.FacetAttribu
 import org.eclipse.papyrus.emf.facet.efacet.metamodel.v0_2_0.efacet.FacetReference;

 import org.eclipse.papyrus.emf.facet.query.java.core.IJavaQuery2;

 import org.eclipse.papyrus.emf.facet.query.java.core.IParameterValueList2;

-import org.eclipse.papyrus.emf.facet.util.swt.imageprovider.IImageProvider;

-import org.eclipse.papyrus.emf.facet.util.swt.imageprovider.IImageProviderFactory;

-import org.eclipse.jface.resource.ImageDescriptor;

 import org.eclipse.papyrus.emf.facet.custom.metamodel.custompt.IImage;

 import org.eclipse.swt.graphics.Image;

 

@@ -61,21 +57,25 @@ public class ImageQuery implements IJavaQuery2<EObject, IImage> {
 		IImage result = null;

 		final ComposedAdapterFactory adapterFactory = new ComposedAdapterFactory(

 				ComposedAdapterFactory.Descriptor.Registry.INSTANCE);

-		final IItemLabelProvider itemLabelProvider = (IItemLabelProvider) adapterFactory

-				.adapt(source, IItemLabelProvider.class);

-		if (itemLabelProvider != null) {

-			Object imageObject = itemLabelProvider.getImage(source);

-			Image image = ExtendedImageRegistry.getInstance().getImage(imageObject);

-			result = new ImageWrapper(image);

-////			final ImageDescriptor imgDescriptor = ExtendedImageRegistry

-////					.getInstance().getImageDescriptor(source);

-//			final IImageProvider imgProvider = IImageProviderFactory.DEFAULT

-//					.createIImageProvider(Activator.getDefault());

-//			if (imgDescriptor != null) {

-//				final Image image = imgProvider.getImage(imgDescriptor);

-//				result = new ImageWrapper(image);

-//			}

+		

+		try {

+			final IItemLabelProvider itemLabelProvider = (IItemLabelProvider)adapterFactory.adapt(source, IItemLabelProvider.class);

+			if(itemLabelProvider != null) {

+				Object imageObject = itemLabelProvider.getImage(source);

+				Image image = ExtendedImageRegistry.getInstance().getImage(imageObject);

+				result = new ImageWrapper(image);

+////			final ImageDescriptor imgDescriptor = ExtendedImageRegistry.getInstance().getImageDescriptor(source);

+//				final IImageProvider imgProvider = IImageProviderFactory.DEFAULT.createIImageProvider(Activator.getDefault());

+//				if(imgDescriptor != null) {

+//					final Image image = imgProvider.getImage(imgDescriptor);

+//					result = new ImageWrapper(image);

+//				}

+			}

+		} finally {

+			// Dispose the adapter factory because it added an adapter that would leak, as it will never be reused

+			adapterFactory.dispose();

 		}

+		

 		return result;

 	}

 

diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/query/LabelQuery.java b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/query/LabelQuery.java
index 0d0d0130c20..8e5e5b7d05a 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/query/LabelQuery.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.custom.ui/src/org/eclipse/papyrus/emf/facet/custom/ui/internal/query/LabelQuery.java
@@ -1,5 +1,5 @@
 /**

- *  Copyright (c) 2011 Mia-Software.

+ *  Copyright (c) 2011, 2014 Mia-Software, CEA, and others.

  *

  *  All rights reserved. This program and the accompanying materials

  *  are made available under the terms of the Eclipse Public License v1.0

@@ -12,6 +12,7 @@
  *      Gregoire Dupe (Mia-Software) - Bug 373078 - API Cleaning

  *      Gregoire Dupe (Mia-Software) - Bug 375087 - [Table] ITableWidget.addColumn(List<ETypedElement>, List<FacetSet>)

  *      Nicolas Bros (Mia-Software) - Bug 379683 - customizable Tree content provider

+ *      Christian W. Damus (CEA) - bug 410346

  */

 package org.eclipse.papyrus.emf.facet.custom.ui.internal.query;

 

@@ -47,16 +48,21 @@ public class LabelQuery implements IJavaQuery2<EObject, String> {
 		if (sfParam == null) {

 			final ComposedAdapterFactory adapterFactory = new ComposedAdapterFactory(

 					ComposedAdapterFactory.Descriptor.Registry.INSTANCE);

-			final IItemLabelProvider itemLabelProvider = (IItemLabelProvider) adapterFactory

-					.adapt(source, IItemLabelProvider.class);

-			// We don't want to use a ReflectiveItemProvider because it provides

-			// a string prefixed with the eObject's meta-class name.

-			if (itemLabelProvider instanceof ReflectiveItemProvider) {

-				result = LabelQuery.getDefaultName(source);

-			} else if (itemLabelProvider == null) {

-				result = ModelUtils.getDefaultName(source);

-			} else {

-				result = itemLabelProvider.getText(source);

+			

+			try {

+				final IItemLabelProvider itemLabelProvider = (IItemLabelProvider)adapterFactory.adapt(source, IItemLabelProvider.class);

+				// We don't want to use a ReflectiveItemProvider because it provides

+				// a string prefixed with the eObject's meta-class name.

+				if(itemLabelProvider instanceof ReflectiveItemProvider) {

+					result = LabelQuery.getDefaultName(source);

+				} else if(itemLabelProvider == null) {

+					result = ModelUtils.getDefaultName(source);

+				} else {

+					result = itemLabelProvider.getText(source);

+				}

+			} finally {

+				// Dispose the adapter factory because it added an adapter that would leak, as nobody else will ever use it

+				adapterFactory.dispose();

 			}

 		} else {

 			try {

diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.core/src/org/eclipse/papyrus/emf/facet/util/emf/core/ModelUtils.java b/plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.core/src/org/eclipse/papyrus/emf/facet/util/emf/core/ModelUtils.java
index 51087d4e391..023da74e765 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.core/src/org/eclipse/papyrus/emf/facet/util/emf/core/ModelUtils.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.util.emf.core/src/org/eclipse/papyrus/emf/facet/util/emf/core/ModelUtils.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2009, 2010, 2012 Mia-Software.

+ * Copyright (c) 2009, 2014 Mia-Software, CEA, and others.

  * 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

@@ -12,6 +12,8 @@
  *      Gregoire Dupe (Mia-Software) - Bug 371367 - Hierarchical FacetSets

  *      Gregoire Dupe (Mia-Software) - Bug 369987 - [Restructuring][Table] Switch to the new customization and facet framework

  *      Gregoire Dupe (Mia-Software) - Bug 387470 - [EFacet][Custom] Editors

+ *      Christian W. Damus (CEA) - bug 410346

+ *      

  *******************************************************************************/

 package org.eclipse.papyrus.emf.facet.util.emf.core;

 

@@ -162,11 +164,18 @@ public final class ModelUtils {
 	 */

 	//Copied from org.eclipse.papyrus.emf.facet.infra.common.core.internal.utils.ModelUtils.getName(EObject)

 	public static String getName(final EObject eObject) {

-		IItemLabelProvider itemLabelProvider = (IItemLabelProvider) new ComposedAdapterFactory(

-				ComposedAdapterFactory.Descriptor.Registry.INSTANCE).adapt(eObject, IItemLabelProvider.class);

-		if (itemLabelProvider != null) {

-			return itemLabelProvider.getText(eObject);

+		ComposedAdapterFactory adapterFactory = new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE);

+

+		try {

+			IItemLabelProvider itemLabelProvider = (IItemLabelProvider)adapterFactory.adapt(eObject, IItemLabelProvider.class);

+			if(itemLabelProvider != null) {

+				return itemLabelProvider.getText(eObject);

+			}

+		} finally {

+			// Dispose the adapter factory because it added an adapter that would leak, as it will never be reused

+			adapterFactory.dispose();

 		}

+

 		return ModelUtils.getDefaultName(eObject);

 	}

 

diff --git a/plugins/facet/org.eclipse.papyrus.emf.facet.widgets/src/org/eclipse/papyrus/emf/facet/widgets/internal/CustomizableLabelProvider.java b/plugins/facet/org.eclipse.papyrus.emf.facet.widgets/src/org/eclipse/papyrus/emf/facet/widgets/internal/CustomizableLabelProvider.java
index 77b942396af..edd2ff8f2cf 100644
--- a/plugins/facet/org.eclipse.papyrus.emf.facet.widgets/src/org/eclipse/papyrus/emf/facet/widgets/internal/CustomizableLabelProvider.java
+++ b/plugins/facet/org.eclipse.papyrus.emf.facet.widgets/src/org/eclipse/papyrus/emf/facet/widgets/internal/CustomizableLabelProvider.java
@@ -1,5 +1,5 @@
 /*******************************************************************************

- * Copyright (c) 2010 Mia-Software.

+ * Copyright (c) 2010, 2014 Mia-Software, CEA, and others.

  * 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

@@ -9,6 +9,8 @@
  *    Nicolas Bros (Mia-Software) - initial API and implementation

  *    Nicolas Bros (Mia-Software) - Bug 339653 - org.eclipse.papyrus.emf.facet.widgets API Cleaning

  *    Gregoire Dupe (Mia-Software) - Bug 369987 - [Restructuring][Table] Switch to the new customization and facet framework

+ *    Christian W. Damus (CEA) - bug 410346

+ *  

  *******************************************************************************/

 

 package org.eclipse.papyrus.emf.facet.widgets.internal;

@@ -49,6 +51,18 @@ public class CustomizableLabelProvider extends LabelProvider {
 	}

 

 	@Override

+	public void dispose() {

+		try {

+			// Because we created this adapter factory, ourselves, we must dispose it, as it may have created

+			// adapters that are redundant with other adapters still attached to the model and nobody else will

+			// be using our adapters (they are only recognized by the factory that created them)

+			adapterFactoryWithRegistry.dispose();

+		} finally {

+			super.dispose();

+		}

+	}

+	

+	@Override

 	public String getText(final Object element) {

 		if (element instanceof EReference) {

 			EReference eReference = (EReference) element;