Attachment #193953 for bug #342777

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




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;

            
            for( ISapphireActionImage image : def.getImages() )
            {
                final Function imageFunction = FailSafeFunction.create( image.getImage().getContent(), Literal.create( ImageData.class ) );
                final FunctionResult imageFunctionResult = imageFunction.evaluate( this.functionContext ); 
                ImageData data = (ImageData) imageFunctionResult.value();
                
                if( data != null )
                {
                	final ImageDescriptor img = ImageDescriptor.createFromImageData(new org.eclipse.swt.graphics.ImageData(data.contents()));
                    if (img != null)
                    {
                    	this.images.add( img );	
                    }                	
                }
                
                imageFunctionResult.dispose();

Return to bug 342777

Lines 16-21 Link Here

(-)src/org/eclipse/sapphire/ui/SapphireActionSystemPart.java (-4 / +9 lines)
16	import java.util.concurrent.CopyOnWriteArrayList;	16	import java.util.concurrent.CopyOnWriteArrayList;
17		17
18	import org.eclipse.jface.resource.ImageDescriptor;	18	import org.eclipse.jface.resource.ImageDescriptor;
		19	import org.eclipse.sapphire.modeling.ImageData;
19	import org.eclipse.sapphire.modeling.el.FailSafeFunction;	20	import org.eclipse.sapphire.modeling.el.FailSafeFunction;
20	import org.eclipse.sapphire.modeling.el.Function;	21	import org.eclipse.sapphire.modeling.el.Function;
21	import org.eclipse.sapphire.modeling.el.FunctionContext;	22	import org.eclipse.sapphire.modeling.el.FunctionContext;
Lines 80-92 Link Here
80		81
81	for( ISapphireActionImage image : def.getImages() )	82	for( ISapphireActionImage image : def.getImages() )
82	{	83	{
83	final Function imageFunction = FailSafeFunction.create( image.getImage().getContent(), Literal.create( ImageDescriptor.class ) );	84	final Function imageFunction = FailSafeFunction.create( image.getImage().getContent(), Literal.create( ImageData.class ) );
84	final FunctionResult imageFunctionResult = imageFunction.evaluate( this.functionContext );	85	final FunctionResult imageFunctionResult = imageFunction.evaluate( this.functionContext );
85	final ImageDescriptor img = (ImageDescriptor) imageFunctionResult.value();	86	ImageData data = (ImageData) imageFunctionResult.value();
86		87
87	if( img != null )	88	if( data != null )
88	{	89	{
89	this.images.add( img );	90	final ImageDescriptor img = ImageDescriptor.createFromImageData(new org.eclipse.swt.graphics.ImageData(data.contents()));
		91	if (img != null)
		92	{
		93	this.images.add( img );
		94	}
90	}	95	}
91		96
92	imageFunctionResult.dispose();	97	imageFunctionResult.dispose();