Attachment 193954 Details for Bug 342777 – Fix for regression in SapphireActionSystemPart

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

[patch] Fix for regression in SapphireActionSystemPart

SapphireActionSystemPart.java_patch.txt (text/plain), 2.23 KB, created by Greg Amerson

on 2011-04-23 07:55:26 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Greg Amerson

Created: 2011-04-23 07:55:26 EDT

Size: 2.23 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.sapphire.ui
>Index: src/org/eclipse/sapphire/ui/SapphireActionSystemPart.java
>===================================================================
>RCS file: /cvsroot/technology/org.eclipse.sapphire/plugins/org.eclipse.sapphire.ui/src/org/eclipse/sapphire/ui/SapphireActionSystemPart.java,v
>retrieving revision 1.5
>diff -u -r1.5 SapphireActionSystemPart.java
>--- src/org/eclipse/sapphire/ui/SapphireActionSystemPart.java	20 Apr 2011 05:40:24 -0000	1.5
>+++ src/org/eclipse/sapphire/ui/SapphireActionSystemPart.java	23 Apr 2011 11:48:40 -0000
>@@ -16,6 +16,7 @@
> import java.util.concurrent.CopyOnWriteArrayList;
> 
> import org.eclipse.jface.resource.ImageDescriptor;
>+import org.eclipse.sapphire.modeling.ImageData;
> import org.eclipse.sapphire.modeling.el.FailSafeFunction;
> import org.eclipse.sapphire.modeling.el.Function;
> import org.eclipse.sapphire.modeling.el.FunctionContext;
>@@ -80,13 +81,19 @@
>             
>             for( ISapphireActionImage image : def.getImages() )
>             {
>-                final Function imageFunction = FailSafeFunction.create( image.getImage().getContent(), Literal.create( ImageDescriptor.class ) );
>+                final Function imageFunction = FailSafeFunction.create( image.getImage().getContent(), Literal.create( ImageData.class ) );
>                 final FunctionResult imageFunctionResult = imageFunction.evaluate( this.functionContext ); 
>-                final ImageDescriptor img = (ImageDescriptor) imageFunctionResult.value();
>+                final ImageData data = (ImageData) imageFunctionResult.value();
>                 
>-                if( img != null )
>+                if( data != null )
>                 {
>-                    this.images.add( img );
>+                	final org.eclipse.swt.graphics.ImageData swtdata = new org.eclipse.swt.graphics.ImageData( data.contents() );
>+                   final ImageDescriptor img = ImageDescriptor.createFromImageData( swtdata );
>+                    
>+                   if ( img != null )
>+                    {
>+                    	this.images.add( img );	
>+                    }                	
>                 }
>                 
>                 imageFunctionResult.dispose();

Flags:

konstantin: iplog+

Actions: View | Diff

Attachments on bug 342777: 193953 | 193954