Attachment 167480 Details for Bug 312025 – patch V2

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] patch V2

312025_V2.txt (text/plain), 2.28 KB, created by Bozier jerome

on 2010-05-07 10:32:27 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Bozier jerome

Created: 2010-05-07 10:32:27 EDT

Size: 2.28 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.tptp.platform.common.ui
>Index: src-common-internal/org/eclipse/hyades/ui/internal/extension/AssociationDescriptor.java
>===================================================================
>RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.common.ui/src-common-internal/org/eclipse/hyades/ui/internal/extension/AssociationDescriptor.java,v
>retrieving revision 1.3
>diff -u -r1.3 AssociationDescriptor.java
>--- src-common-internal/org/eclipse/hyades/ui/internal/extension/AssociationDescriptor.java	24 Jan 2008 02:29:08 -0000	1.3
>+++ src-common-internal/org/eclipse/hyades/ui/internal/extension/AssociationDescriptor.java	7 May 2010 14:30:40 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2005, 2008 IBM Corporation and others.
>+ * Copyright (c) 2005, 2010 IBM Corporation 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
>@@ -32,7 +32,9 @@
>  * interface.
>  * 
>  * @author marcelop
>+ * @author Jerome Bozier
>  * @since 0.0.1
>+ * @version May 7, 2010
>  */
> public class AssociationDescriptor 
> implements IAssociationDescriptor, Serializable
>@@ -56,6 +58,7 @@
> 	protected boolean isPluginDefault = false;
> 
> 	protected IConfigurationElement configurationElement;
>+	private Object currentInstance = null;
> 	
> 	/**
> 	 * Constructor for AssociationDescriptor
>@@ -209,13 +212,15 @@
> 	 */
> 	public Class getImplementationClass()
> 	{
>+		currentInstance = null;
> 		if((extensionClass == null) && (configurationElement != null))
> 		{
> 			if(getValue(configurationElement, "class") != null)
> 			{
> 				try
> 				{
>-					extensionClass = configurationElement.createExecutableExtension("class").getClass();
>+					currentInstance = configurationElement.createExecutableExtension("class");
>+					extensionClass = currentInstance.getClass();
> 				}
> 				catch (Exception e)
> 				{
>@@ -233,6 +238,9 @@
> 	public Object createImplementationClassInstance()
> 	{
> 		Class cls = getImplementationClass();
>+		if (currentInstance != null) {
>+			return currentInstance;
>+		}
> 		if(cls != null)
> 		{
> 			try

Actions: View | Diff

Attachments on bug 312025: 167461 | 167480