Attachment 45256 Details for Bug 133941 – better getPropertySourceProvider()

[patch] better getPropertySourceProvider()

patch.txt (text/plain), 2.21 KB, created by John Gilbert

on 2006-06-24 20:43:06 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: John Gilbert

Created: 2006-06-24 20:43:06 EDT

Size: 2.21 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.ui.views
>Index: src/org/eclipse/ui/views/properties/PropertySheetEntry.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.ui.views/src/org/eclipse/ui/views/properties/PropertySheetEntry.java,v
>retrieving revision 1.24
>diff -u -r1.24 PropertySheetEntry.java
>--- src/org/eclipse/ui/views/properties/PropertySheetEntry.java	8 May 2006 20:53:18 -0000	1.24
>+++ src/org/eclipse/ui/views/properties/PropertySheetEntry.java	25 Jun 2006 00:44:55 -0000
>@@ -245,7 +245,8 @@
> 			PropertySheetEntry entry = createChildEntry();
> 			entry.setDescriptor(d);
> 			entry.setParent(this);
>-			entry.setPropertySourceProvider(propertySourceProvider);
>+			entry
>+					.setPropertySourceProvider(getPropertySourceProvider(values[0]));
> 			entry.refreshValues();
> 			newEntries[i] = entry;
> 		}
>@@ -460,11 +461,7 @@
> 			return (IPropertySource) sources.get(object);
> 
> 		IPropertySource result = null;
>-		IPropertySourceProvider provider = propertySourceProvider;
>-
>-		if (provider == null && object != null)
>-			provider = (IPropertySourceProvider) Platform.getAdapterManager()
>-					.getAdapter(object, IPropertySourceProvider.class);
>+		IPropertySourceProvider provider = getPropertySourceProvider(object);
> 
> 		if (provider != null) {
> 			result = provider.getPropertySource(object);
>@@ -569,7 +566,8 @@
> 				entry = createChildEntry();
> 				entry.setDescriptor(d);
> 				entry.setParent(this);
>-				entry.setPropertySourceProvider(propertySourceProvider);
>+				entry
>+						.setPropertySourceProvider(getPropertySourceProvider(values[0]));
> 				entriesChanged = true;
> 			}
> 			entry.refreshValues();
>@@ -710,6 +708,19 @@
> 	}
> 
> 	/**
>+	 * @param object
>+	 * @return
>+	 */
>+	public IPropertySourceProvider getPropertySourceProvider(Object object) {
>+		if (propertySourceProvider == null && object != null) {
>+			return (IPropertySourceProvider) Platform.getAdapterManager()
>+					.getAdapter(object, IPropertySourceProvider.class);
>+		} else {
>+			return propertySourceProvider;
>+		}
>+	}
>+
>+	/**
> 	 * Set the value for this entry.
> 	 * <p>
> 	 * We set the given value as the value for all our value objects. We then

Actions: View | Diff

Attachments on bug 133941: 37252 | 37327 | 45255 | 45256 | 51551