Attachment #183403 for bug #330482

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




import org.eclipse.sapphire.modeling.xml.annotations.XmlListBinding;
import org.eclipse.sapphire.modeling.xml.annotations.XmlRootBinding;
import org.eclipse.sapphire.ui.def.internal.SapphireUiDefMethods;
import org.eclipse.sapphire.ui.diagram.def.IDiagramPageDef;

/**
 * @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>

    
    ModelElementList<IEditorPageDef> getEditorPageDefs();
    
    // *** DiagramPageDefs ***
    
    @Type( base = IDiagramPageDef.class )
    @XmlListBinding( mappings = @XmlListBinding.Mapping( element = "diagram-page", type = IDiagramPageDef.class ) )
    
    ListProperty PROP_DIAGRAM_PAGE_DEFS = new ListProperty( TYPE, "DiagramPageDefs" );
    
    ModelElementList<IDiagramPageDef> getDiagramPageDefs();
    
    // *** DialogDefs ***
    
    @Type( base = ISapphireDialogDef.class )

Added Link Here

(-)src/org/eclipse/sapphire/ui/diagram/def/ConnectionEndpointType.java (+10 lines)
1	package org.eclipse.sapphire.ui.diagram.def;
2
3
4	public enum ConnectionEndpointType
5	{
6	NONE,
7	ARROW,
8	CIRCLE,
9	ELLIPSE;
10	}




package org.eclipse.sapphire.ui.diagram.def;

import org.eclipse.sapphire.modeling.ElementProperty;
import org.eclipse.sapphire.modeling.ModelElementHandle;
import org.eclipse.sapphire.modeling.ModelElementType;
import org.eclipse.sapphire.modeling.Value;
import org.eclipse.sapphire.modeling.ValueProperty;
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.xml.annotations.XmlBinding;
import org.eclipse.sapphire.ui.def.ILabelDef;
import org.eclipse.sapphire.ui.def.ISapphirePartDef;

@GenerateImpl

public interface IDiagramConnectionDef 
	
	extends ISapphirePartDef 
	
{
	ModelElementType TYPE = new ModelElementType( IDiagramConnectionDef.class );
	
    // *** Id ***
    
    @Label( standard = "ID" )
    @XmlBinding( path = "id" )
    
    ValueProperty PROP_ID = new ValueProperty( TYPE, "Id" );
    
    Value<String> getId();
    void setId( String id );
    
    // *** Property ***
    
    @Label( standard = "property" )
    @XmlBinding( path = "property" )
    
    ValueProperty PROP_PROPERTY = new ValueProperty( TYPE, "Property" );
    
    Value<String> getProperty();
    void setProperty( String property );
        
    // *** Label ***
    
    @Type( base = ILabelDef.class )
    @Label( standard = "label" )
    @XmlBinding( path = "label" )
    
    ElementProperty PROP_LABEL = new ElementProperty( TYPE, "Label" );
    
    ModelElementHandle<ILabelDef> getLabel();
    
    // *** Endpoint1 ***
    
    @Type( base = IDiagramConnectionEndpointDef.class )
    @XmlBinding( path = "endpoint1" )

    ElementProperty PROP_ENDPOINT_1 = new ElementProperty( TYPE, "Endpoint1" );
    
    ModelElementHandle<IDiagramConnectionEndpointDef> getEndpoint1();

    // *** Endpoint2 ***
    
    @Type( base = IDiagramConnectionEndpointDef.class )
    @XmlBinding( path = "endpoint2" )

    ElementProperty PROP_ENDPOINT_2 = new ElementProperty( TYPE, "Endpoint2" );
    
    ModelElementHandle<IDiagramConnectionEndpointDef> getEndpoint2();
    
}




package org.eclipse.sapphire.ui.diagram.def;

import org.eclipse.sapphire.modeling.ModelElementType;
import org.eclipse.sapphire.modeling.Value;
import org.eclipse.sapphire.modeling.ValueProperty;
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.xml.annotations.XmlBinding;
import org.eclipse.sapphire.ui.def.ISapphirePartDef;

@GenerateImpl

public interface IDiagramConnectionEndpointDef 

	extends ISapphirePartDef 
	
{
	ModelElementType TYPE = new ModelElementType( IDiagramConnectionEndpointDef.class );
	
    // *** Property ***
    
    @Label( standard = "property" )
    @XmlBinding( path = "property" )
    
    ValueProperty PROP_PROPERTY = new ValueProperty( TYPE, "Property" );
    
    Value<String> getProperty();
    void setProperty( String property );
    
	// *** Type ***
	
	@Type( base = ConnectionEndpointType.class )
	@XmlBinding( path = "connectionDecoratorType" )
	
	ValueProperty PROP_TYPE = new ValueProperty( TYPE, "Type" );
	
	Value<ConnectionEndpointType> getType();
	void setType( String value );
	void setType( ConnectionEndpointType value );
    
	
}




package org.eclipse.sapphire.ui.diagram.def;

import org.eclipse.sapphire.modeling.ElementProperty;
import org.eclipse.sapphire.modeling.ModelElementHandle;
import org.eclipse.sapphire.modeling.ModelElementType;
import org.eclipse.sapphire.modeling.Value;
import org.eclipse.sapphire.modeling.ValueProperty;
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.xml.annotations.XmlBinding;
import org.eclipse.sapphire.ui.def.ILabelDef;
import org.eclipse.sapphire.ui.def.ISapphirePartDef;

@GenerateImpl

public interface IDiagramNodeDef 

	extends ISapphirePartDef
	
{
	ModelElementType TYPE = new ModelElementType( IDiagramNodeDef.class );
	
    // *** Id ***
    
    @Label( standard = "ID" )
    @XmlBinding( path = "id" )
    
    ValueProperty PROP_ID = new ValueProperty( TYPE, "Id" );
    
    Value<String> getId();
    void setId( String id );
    
    // *** ToolPaletteLabel ***
    
    @Label( standard = "tool palette label" )
    @XmlBinding( path = "toolPaletteLabel" )
    
    ValueProperty PROP_TOOL_PALETTE_LABEL = new ValueProperty( TYPE, "ToolPaletteLabel" );
    
    Value<String> getToolPaletteLabel();
    void setToolPaletteLabel( String paletteLabel );
    
    // *** ToolPaletteDesc ***
    
    @Label( standard = "tool palette description" )
    @XmlBinding( path = "toolPaletteDesc" )
    
    ValueProperty PROP_TOOL_PALETTE_DESC = new ValueProperty( TYPE, "ToolPaletteDesc" );
    
    Value<String> getToolPaletteDesc();
    void setToolPaletteDesc( String paletteDesc );

    // *** Property ***
    
    @Label( standard = "property" )
    @XmlBinding( path = "property" )
    
    ValueProperty PROP_PROPERTY = new ValueProperty( TYPE, "Property" );
    
    Value<String> getProperty();
    void setProperty( String property );
        
    // *** Label ***
    
    @Type( base = ILabelDef.class )
    @Label( standard = "label" )
    @XmlBinding( path = "label" )
    
    ElementProperty PROP_LABEL = new ElementProperty( TYPE, "Label" );
    
    ModelElementHandle<ILabelDef> getLabel();
    
	
}




package org.eclipse.sapphire.ui.diagram.def;

import org.eclipse.sapphire.modeling.ListProperty;
import org.eclipse.sapphire.modeling.ModelElementList;
import org.eclipse.sapphire.modeling.ModelElementType;
import org.eclipse.sapphire.modeling.Value;
import org.eclipse.sapphire.modeling.ValueProperty;
import org.eclipse.sapphire.modeling.annotations.DefaultValue;
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.xml.annotations.XmlBinding;
import org.eclipse.sapphire.modeling.xml.annotations.XmlListBinding;
import org.eclipse.sapphire.ui.def.ISapphirePartDef;

@GenerateImpl

public interface IDiagramPageDef 
	
	extends ISapphirePartDef
	
{
	ModelElementType TYPE = new ModelElementType( IDiagramPageDef.class);
	
    // *** Id ***
    
    @Label( standard = "ID" )
    @XmlBinding( path = "id" )
    
    ValueProperty PROP_ID = new ValueProperty( TYPE, "Id" );
    
    Value<String> getId();
    void setId( String id );
    
    // *** PageName ***
    
    @Label( standard = "page name" )
    @DefaultValue( text = "Diagram" )
    @XmlBinding( path = "page-name" )
    
    ValueProperty PROP_PAGE_NAME = new ValueProperty( TYPE, "PageName" );
    
    Value<String> getPageName();
    void setPageName( String pageName );
    
    // *** PageHeaderText ***
    
    @Label( standard = "page header text" )
    @DefaultValue( text = "Diagram View" )
    @XmlBinding( path = "page-header-text" )
    
    ValueProperty PROP_PAGE_HEADER_TEXT = new ValueProperty( TYPE, "PageHeaderText" );
    
    Value<String> getPageHeaderText();
    void setPageHeaderText( String pageHeaderText );
	
	// *** DiagramNodeDefs ***
    
    @Type( base = IDiagramNodeDef.class )
    @XmlListBinding( mappings = @XmlListBinding.Mapping( element = "node", type = IDiagramNodeDef.class ) )
                             
    ListProperty PROP_DIAGRAM_NODE_DEFS = new ListProperty( TYPE, "DiagramNodeDefs" );
    
    ModelElementList<IDiagramNodeDef> getDiagramNodeDefs();
    
	// *** DiagramConnectionDefs ***
    
    @Type( base = IDiagramConnectionDef.class )
    @XmlListBinding( mappings = @XmlListBinding.Mapping( element = "connection", type = IDiagramConnectionDef.class ) )
                             
    ListProperty PROP_DIAGRAM_CONNECTION_DEFS = new ListProperty( TYPE, "DiagramConnectionDefs" );
    
    ModelElementList<IDiagramConnectionDef> getDiagramConnectionDefs();
	
}

Return to bug 330482

Lines 26-31 Link Here

(-)src/org/eclipse/sapphire/ui/def/ISapphireUiDef.java (+10 lines)
26	import org.eclipse.sapphire.modeling.xml.annotations.XmlListBinding;	26	import org.eclipse.sapphire.modeling.xml.annotations.XmlListBinding;
27	import org.eclipse.sapphire.modeling.xml.annotations.XmlRootBinding;	27	import org.eclipse.sapphire.modeling.xml.annotations.XmlRootBinding;
28	import org.eclipse.sapphire.ui.def.internal.SapphireUiDefMethods;	28	import org.eclipse.sapphire.ui.def.internal.SapphireUiDefMethods;
		29	import org.eclipse.sapphire.ui.diagram.def.IDiagramPageDef;
29		30
30	/**	31	/**
31	* @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>	32	* @author <a href="mailto:konstantin.komissarchik@oracle.com">Konstantin Komissarchik</a>
Lines 129-134 Link Here
129		130
130	ModelElementList<IEditorPageDef> getEditorPageDefs();	131	ModelElementList<IEditorPageDef> getEditorPageDefs();
131		132
		133	// * DiagramPageDefs *
		134
		135	@Type( base = IDiagramPageDef.class )
		136	@XmlListBinding( mappings = @XmlListBinding.Mapping( element = "diagram-page", type = IDiagramPageDef.class ) )
		137
		138	ListProperty PROP_DIAGRAM_PAGE_DEFS = new ListProperty( TYPE, "DiagramPageDefs" );
		139
		140	ModelElementList<IDiagramPageDef> getDiagramPageDefs();
		141
132	// * DialogDefs *	142	// * DialogDefs *
133		143
134	@Type( base = ISapphireDialogDef.class )	144	@Type( base = ISapphireDialogDef.class )

Added Link Here

(-)src/org/eclipse/sapphire/ui/diagram/def/IDiagramConnectionDef.java (+72 lines)
1	package org.eclipse.sapphire.ui.diagram.def;
2
3	import org.eclipse.sapphire.modeling.ElementProperty;
4	import org.eclipse.sapphire.modeling.ModelElementHandle;
5	import org.eclipse.sapphire.modeling.ModelElementType;
6	import org.eclipse.sapphire.modeling.Value;
7	import org.eclipse.sapphire.modeling.ValueProperty;
8	import org.eclipse.sapphire.modeling.annotations.GenerateImpl;
9	import org.eclipse.sapphire.modeling.annotations.Label;
10	import org.eclipse.sapphire.modeling.annotations.Type;
11	import org.eclipse.sapphire.modeling.xml.annotations.XmlBinding;
12	import org.eclipse.sapphire.ui.def.ILabelDef;
13	import org.eclipse.sapphire.ui.def.ISapphirePartDef;
14
15	@GenerateImpl
16
17	public interface IDiagramConnectionDef
18
19	extends ISapphirePartDef
20
21	{
22	ModelElementType TYPE = new ModelElementType( IDiagramConnectionDef.class );
23
24	// * Id *
25
26	@Label( standard = "ID" )
27	@XmlBinding( path = "id" )
28
29	ValueProperty PROP_ID = new ValueProperty( TYPE, "Id" );
30
31	Value<String> getId();
32	void setId( String id );
33
34	// * Property *
35
36	@Label( standard = "property" )
37	@XmlBinding( path = "property" )
38
39	ValueProperty PROP_PROPERTY = new ValueProperty( TYPE, "Property" );
40
41	Value<String> getProperty();
42	void setProperty( String property );
43
44	// * Label *
45
46	@Type( base = ILabelDef.class )
47	@Label( standard = "label" )
48	@XmlBinding( path = "label" )
49
50	ElementProperty PROP_LABEL = new ElementProperty( TYPE, "Label" );
51
52	ModelElementHandle<ILabelDef> getLabel();
53
54	// * Endpoint1 *
55
56	@Type( base = IDiagramConnectionEndpointDef.class )
57	@XmlBinding( path = "endpoint1" )
58
59	ElementProperty PROP_ENDPOINT_1 = new ElementProperty( TYPE, "Endpoint1" );
60
61	ModelElementHandle<IDiagramConnectionEndpointDef> getEndpoint1();
62
63	// * Endpoint2 *
64
65	@Type( base = IDiagramConnectionEndpointDef.class )
66	@XmlBinding( path = "endpoint2" )
67
68	ElementProperty PROP_ENDPOINT_2 = new ElementProperty( TYPE, "Endpoint2" );
69
70	ModelElementHandle<IDiagramConnectionEndpointDef> getEndpoint2();
71
72	}

Added Link Here

(-)src/org/eclipse/sapphire/ui/diagram/def/IDiagramNodeDef.java (+75 lines)
1	package org.eclipse.sapphire.ui.diagram.def;
2
3	import org.eclipse.sapphire.modeling.ElementProperty;
4	import org.eclipse.sapphire.modeling.ModelElementHandle;
5	import org.eclipse.sapphire.modeling.ModelElementType;
6	import org.eclipse.sapphire.modeling.Value;
7	import org.eclipse.sapphire.modeling.ValueProperty;
8	import org.eclipse.sapphire.modeling.annotations.GenerateImpl;
9	import org.eclipse.sapphire.modeling.annotations.Label;
10	import org.eclipse.sapphire.modeling.annotations.Type;
11	import org.eclipse.sapphire.modeling.xml.annotations.XmlBinding;
12	import org.eclipse.sapphire.ui.def.ILabelDef;
13	import org.eclipse.sapphire.ui.def.ISapphirePartDef;
14
15	@GenerateImpl
16
17	public interface IDiagramNodeDef
18
19	extends ISapphirePartDef
20
21	{
22	ModelElementType TYPE = new ModelElementType( IDiagramNodeDef.class );
23
24	// * Id *
25
26	@Label( standard = "ID" )
27	@XmlBinding( path = "id" )
28
29	ValueProperty PROP_ID = new ValueProperty( TYPE, "Id" );
30
31	Value<String> getId();
32	void setId( String id );
33
34	// * ToolPaletteLabel *
35
36	@Label( standard = "tool palette label" )
37	@XmlBinding( path = "toolPaletteLabel" )
38
39	ValueProperty PROP_TOOL_PALETTE_LABEL = new ValueProperty( TYPE, "ToolPaletteLabel" );
40
41	Value<String> getToolPaletteLabel();
42	void setToolPaletteLabel( String paletteLabel );
43
44	// * ToolPaletteDesc *
45
46	@Label( standard = "tool palette description" )
47	@XmlBinding( path = "toolPaletteDesc" )
48
49	ValueProperty PROP_TOOL_PALETTE_DESC = new ValueProperty( TYPE, "ToolPaletteDesc" );
50
51	Value<String> getToolPaletteDesc();
52	void setToolPaletteDesc( String paletteDesc );
53
54	// * Property *
55
56	@Label( standard = "property" )
57	@XmlBinding( path = "property" )
58
59	ValueProperty PROP_PROPERTY = new ValueProperty( TYPE, "Property" );
60
61	Value<String> getProperty();
62	void setProperty( String property );
63
64	// * Label *
65
66	@Type( base = ILabelDef.class )
67	@Label( standard = "label" )
68	@XmlBinding( path = "label" )
69
70	ElementProperty PROP_LABEL = new ElementProperty( TYPE, "Label" );
71
72	ModelElementHandle<ILabelDef> getLabel();
73
74
75	}

Added Link Here

(-)src/org/eclipse/sapphire/ui/diagram/def/IDiagramPageDef.java (+75 lines)
1	package org.eclipse.sapphire.ui.diagram.def;
2
3	import org.eclipse.sapphire.modeling.ListProperty;
4	import org.eclipse.sapphire.modeling.ModelElementList;
5	import org.eclipse.sapphire.modeling.ModelElementType;
6	import org.eclipse.sapphire.modeling.Value;
7	import org.eclipse.sapphire.modeling.ValueProperty;
8	import org.eclipse.sapphire.modeling.annotations.DefaultValue;
9	import org.eclipse.sapphire.modeling.annotations.GenerateImpl;
10	import org.eclipse.sapphire.modeling.annotations.Label;
11	import org.eclipse.sapphire.modeling.annotations.Type;
12	import org.eclipse.sapphire.modeling.xml.annotations.XmlBinding;
13	import org.eclipse.sapphire.modeling.xml.annotations.XmlListBinding;
14	import org.eclipse.sapphire.ui.def.ISapphirePartDef;
15
16	@GenerateImpl
17
18	public interface IDiagramPageDef
19
20	extends ISapphirePartDef
21
22	{
23	ModelElementType TYPE = new ModelElementType( IDiagramPageDef.class);
24
25	// * Id *
26
27	@Label( standard = "ID" )
28	@XmlBinding( path = "id" )
29
30	ValueProperty PROP_ID = new ValueProperty( TYPE, "Id" );
31
32	Value<String> getId();
33	void setId( String id );
34
35	// * PageName *
36
37	@Label( standard = "page name" )
38	@DefaultValue( text = "Diagram" )
39	@XmlBinding( path = "page-name" )
40
41	ValueProperty PROP_PAGE_NAME = new ValueProperty( TYPE, "PageName" );
42
43	Value<String> getPageName();
44	void setPageName( String pageName );
45
46	// * PageHeaderText *
47
48	@Label( standard = "page header text" )
49	@DefaultValue( text = "Diagram View" )
50	@XmlBinding( path = "page-header-text" )
51
52	ValueProperty PROP_PAGE_HEADER_TEXT = new ValueProperty( TYPE, "PageHeaderText" );
53
54	Value<String> getPageHeaderText();
55	void setPageHeaderText( String pageHeaderText );
56
57	// * DiagramNodeDefs *
58
59	@Type( base = IDiagramNodeDef.class )
60	@XmlListBinding( mappings = @XmlListBinding.Mapping( element = "node", type = IDiagramNodeDef.class ) )
61
62	ListProperty PROP_DIAGRAM_NODE_DEFS = new ListProperty( TYPE, "DiagramNodeDefs" );
63
64	ModelElementList<IDiagramNodeDef> getDiagramNodeDefs();
65
66	// * DiagramConnectionDefs *
67
68	@Type( base = IDiagramConnectionDef.class )
69	@XmlListBinding( mappings = @XmlListBinding.Mapping( element = "connection", type = IDiagramConnectionDef.class ) )
70
71	ListProperty PROP_DIAGRAM_CONNECTION_DEFS = new ListProperty( TYPE, "DiagramConnectionDefs" );
72
73	ModelElementList<IDiagramConnectionDef> getDiagramConnectionDefs();
74
75	}