Attachment 183403 Details for Bug 330482 – diagram def files incorporating kosta's comments

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

[patch] diagram def files incorporating kosta's comments

patch_diagram_def4.txt (text/plain), 12.27 KB, created by Shenxue Zhou

on 2010-11-18 12:11:48 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Shenxue Zhou

Created: 2010-11-18 12:11:48 EST

Size: 12.27 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.sapphire.ui
>Index: src/org/eclipse/sapphire/ui/def/ISapphireUiDef.java
>===================================================================
>RCS file: /cvsroot/technology/org.eclipse.sapphire/plugins/org.eclipse.sapphire.ui/src/org/eclipse/sapphire/ui/def/ISapphireUiDef.java,v
>retrieving revision 1.2
>diff -u -r1.2 ISapphireUiDef.java
>--- src/org/eclipse/sapphire/ui/def/ISapphireUiDef.java	16 Nov 2010 04:26:02 -0000	1.2
>+++ src/org/eclipse/sapphire/ui/def/ISapphireUiDef.java	18 Nov 2010 17:10:09 -0000
>@@ -26,6 +26,7 @@
> 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>
>@@ -129,6 +130,15 @@
>     
>     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 )
>Index: src/org/eclipse/sapphire/ui/diagram/def/ConnectionEndpointType.java
>===================================================================
>RCS file: src/org/eclipse/sapphire/ui/diagram/def/ConnectionEndpointType.java
>diff -N src/org/eclipse/sapphire/ui/diagram/def/ConnectionEndpointType.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/sapphire/ui/diagram/def/ConnectionEndpointType.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,10 @@
>+package org.eclipse.sapphire.ui.diagram.def;
>+
>+
>+public enum ConnectionEndpointType 
>+{
>+	NONE,
>+	ARROW,
>+	CIRCLE,
>+	ELLIPSE;
>+}
>Index: src/org/eclipse/sapphire/ui/diagram/def/IDiagramConnectionDef.java
>===================================================================
>RCS file: src/org/eclipse/sapphire/ui/diagram/def/IDiagramConnectionDef.java
>diff -N src/org/eclipse/sapphire/ui/diagram/def/IDiagramConnectionDef.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/sapphire/ui/diagram/def/IDiagramConnectionDef.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,72 @@
>+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();
>+    
>+}
>Index: src/org/eclipse/sapphire/ui/diagram/def/IDiagramConnectionEndpointDef.java
>===================================================================
>RCS file: src/org/eclipse/sapphire/ui/diagram/def/IDiagramConnectionEndpointDef.java
>diff -N src/org/eclipse/sapphire/ui/diagram/def/IDiagramConnectionEndpointDef.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/sapphire/ui/diagram/def/IDiagramConnectionEndpointDef.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,43 @@
>+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 );
>+    
>+	
>+}
>Index: src/org/eclipse/sapphire/ui/diagram/def/IDiagramNodeDef.java
>===================================================================
>RCS file: src/org/eclipse/sapphire/ui/diagram/def/IDiagramNodeDef.java
>diff -N src/org/eclipse/sapphire/ui/diagram/def/IDiagramNodeDef.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/sapphire/ui/diagram/def/IDiagramNodeDef.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,75 @@
>+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();
>+    
>+	
>+}
>Index: src/org/eclipse/sapphire/ui/diagram/def/IDiagramPageDef.java
>===================================================================
>RCS file: src/org/eclipse/sapphire/ui/diagram/def/IDiagramPageDef.java
>diff -N src/org/eclipse/sapphire/ui/diagram/def/IDiagramPageDef.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/sapphire/ui/diagram/def/IDiagramPageDef.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,75 @@
>+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();
>+	
>+}

Actions: View | Diff

Attachments on bug 330482: 183320 | 183327 | 183361 | 183403 | 184197 | 184669 | 185156 | 185573 | 185574 | 185576 | 185679 | 186532 | 186776 | 186777