Attachment 194167 Details for Bug 343972 – Patch #2

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

[patch] Patch #2

bug343972_patch_2.txt (text/plain), 7.11 KB, created by Greg Amerson

on 2011-04-27 11:06:49 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Greg Amerson

Created: 2011-04-27 11:06:49 EDT

Size: 7.11 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.sapphire.sdk
>Index: sdef/SapphireUiDefEditor.sdef
>===================================================================
>RCS file: /cvsroot/technology/org.eclipse.sapphire/plugins/org.eclipse.sapphire.sdk/sdef/SapphireUiDefEditor.sdef,v
>retrieving revision 1.28
>diff -u -r1.28 SapphireUiDefEditor.sdef
>--- sdef/SapphireUiDefEditor.sdef	27 Apr 2011 05:08:40 -0000	1.28
>+++ sdef/SapphireUiDefEditor.sdef	27 Apr 2011 15:05:25 -0000
>@@ -1012,6 +1012,7 @@
>                     <property-editor>PageName</property-editor>
>                     <property-editor>PageHeaderText</property-editor>
>                     <property-editor>OutlineHeaderText</property-editor>
>+                    <property-editor>Image</property-editor>
>                     <property-editor>InitialSelectionPath</property-editor>
>                 </content>
>             </section>
>#P org.eclipse.sapphire.ui
>Index: src/org/eclipse/sapphire/ui/form/editors/masterdetails/MasterDetailsEditorPage.java
>===================================================================
>RCS file: /cvsroot/technology/org.eclipse.sapphire/plugins/org.eclipse.sapphire.ui/src/org/eclipse/sapphire/ui/form/editors/masterdetails/MasterDetailsEditorPage.java,v
>retrieving revision 1.2
>diff -u -r1.2 MasterDetailsEditorPage.java
>--- src/org/eclipse/sapphire/ui/form/editors/masterdetails/MasterDetailsEditorPage.java	20 Apr 2011 05:40:24 -0000	1.2
>+++ src/org/eclipse/sapphire/ui/form/editors/masterdetails/MasterDetailsEditorPage.java	27 Apr 2011 15:05:26 -0000
>@@ -8,6 +8,7 @@
>  * Contributors:
>  *    Konstantin Komissarchik - initial implementation and ongoing maintenance
>  *    Ling Hao - [bugzilla 329114] rewrite context help binding feature
>+ *    Greg Amerson - [bugzilla 343972] - Add support for setting the masterDetails formPage header image
>  ******************************************************************************/
> 
> package org.eclipse.sapphire.ui.form.editors.masterdetails;
>@@ -57,7 +58,13 @@
> import org.eclipse.jface.viewers.Viewer;
> import org.eclipse.sapphire.modeling.CapitalizationType;
> import org.eclipse.sapphire.modeling.IModelElement;
>+import org.eclipse.sapphire.modeling.ImageData;
> import org.eclipse.sapphire.modeling.ResourceStoreException;
>+import org.eclipse.sapphire.modeling.el.FailSafeFunction;
>+import org.eclipse.sapphire.modeling.el.Function;
>+import org.eclipse.sapphire.modeling.el.FunctionContext;
>+import org.eclipse.sapphire.modeling.el.FunctionResult;
>+import org.eclipse.sapphire.modeling.el.Literal;
> import org.eclipse.sapphire.modeling.util.MutableReference;
> import org.eclipse.sapphire.modeling.xml.RootXmlResource;
> import org.eclipse.sapphire.modeling.xml.XmlResourceStore;
>@@ -82,6 +89,7 @@
> import org.eclipse.sapphire.ui.form.editors.masterdetails.def.IMasterDetailsEditorPageDef;
> import org.eclipse.sapphire.ui.form.editors.masterdetails.state.IMasterDetailsEditorPageState;
> import org.eclipse.sapphire.ui.internal.SapphireUiFrameworkPlugin;
>+import org.eclipse.sapphire.ui.renderers.swt.SwtRendererUtil;
> import org.eclipse.sapphire.ui.swt.renderer.SapphireActionPresentationManager;
> import org.eclipse.sapphire.ui.swt.renderer.SapphireKeyboardActionPresentation;
> import org.eclipse.sapphire.ui.swt.renderer.SapphireMenuActionPresentation;
>@@ -151,6 +159,7 @@
>     private ContentOutline contentOutlinePage;
>     private IPartListener2 partListener;
>     private SapphirePartListener editorPagePartListener;
>+    private final FunctionContext functionContext;
>     
>     public MasterDetailsEditorPage( final SapphireEditor editor,
>                                     final IModelElement rootModelElement,
>@@ -210,6 +219,8 @@
>         outlineHideActionHandler.init( outlineHideAction, null );
>         outlineHideActionHandler.setChecked( isDetailsMaximized() );
>         outlineHideAction.addHandler( outlineHideActionHandler );
>+        
>+        this.functionContext = initFunctionContext();
>     }
> 
>     private static MasterDetailsEditorPagePart createEditorPagePart( final SapphireEditor editor,
>@@ -273,6 +284,15 @@
>             
>             form.setText( this.definition.getPageHeaderText().getLocalizedText( CapitalizationType.TITLE_STYLE, false ) );
>             
>+            final Function imageFunction = FailSafeFunction.create( this.definition.getImage().getContent(), Literal.create( ImageData.class ) );
>+            final FunctionResult imageFunctionResult = imageFunction.evaluate( this.functionContext ); 
>+            final ImageData data = (ImageData) imageFunctionResult.value();
>+            
>+            if (data != null)
>+            {
>+            	form.setImage(SwtRendererUtil.toImageDescriptor(data).createImage());
>+            }
>+            
>             this.mainSection = new RootSection();
>             this.mainSection.createContent( managedForm );
>             
>@@ -810,6 +830,11 @@
>         return filteredTree;
>     }
>     
>+    protected FunctionContext initFunctionContext()
>+    {
>+        return new FunctionContext();
>+    }
>+    
>     private static void updateExpandedState( final MasterDetailsContentOutline contentTree,
>                                              final Tree tree )
>     {
>Index: src/org/eclipse/sapphire/ui/form/editors/masterdetails/def/IMasterDetailsEditorPageDef.java
>===================================================================
>RCS file: /cvsroot/technology/org.eclipse.sapphire/plugins/org.eclipse.sapphire.ui/src/org/eclipse/sapphire/ui/form/editors/masterdetails/def/IMasterDetailsEditorPageDef.java,v
>retrieving revision 1.2
>diff -u -r1.2 IMasterDetailsEditorPageDef.java
>--- src/org/eclipse/sapphire/ui/form/editors/masterdetails/def/IMasterDetailsEditorPageDef.java	22 Apr 2011 22:26:39 -0000	1.2
>+++ src/org/eclipse/sapphire/ui/form/editors/masterdetails/def/IMasterDetailsEditorPageDef.java	27 Apr 2011 15:05:26 -0000
>@@ -8,6 +8,7 @@
>  * Contributors:
>  *    Konstantin Komissarchik - initial implementation and ongoing maintenance
>  *    Ling Hao - [bugzilla 329114] rewrite context help binding feature
>+ *    Greg Amerson - [bugzilla 343972] - Add support for setting the masterDetails formPage header image
>  ******************************************************************************/
> 
> package org.eclipse.sapphire.ui.form.editors.masterdetails.def;
>@@ -20,6 +21,7 @@
> import org.eclipse.sapphire.modeling.annotations.GenerateImpl;
> import org.eclipse.sapphire.modeling.annotations.Label;
> import org.eclipse.sapphire.modeling.annotations.Type;
>+import org.eclipse.sapphire.modeling.el.Function;
> import org.eclipse.sapphire.modeling.localization.Localizable;
> import org.eclipse.sapphire.modeling.xml.annotations.XmlBinding;
> import org.eclipse.sapphire.ui.def.IEditorPageDef;
>@@ -69,4 +71,15 @@
> 
>     IMasterDetailsContentNodeDef getRootNode();
>     
>+    // *** Image ***
>+    
>+    @Type( base = Function.class )
>+    @Label( standard = "image" )
>+    @XmlBinding( path = "image" )
>+    
>+    ValueProperty PROP_IMAGE = new ValueProperty( TYPE, "Image" );
>+    
>+    Value<Function> getImage();
>+    void setImage( String value );
>+    void setImage( Function value );
> }

Actions: View | Diff

Attachments on bug 343972: 194163 | 194167 | 195542