diff --git a/SDT/schema4.0/docs/Examples.md b/SDT/schema4.0/docs/Examples.md
index 3cc928002b21b9469754a48a5a3d344408368394..c9687214932bd8a6b9dd21119c32439aac905679 100644
--- a/SDT/schema4.0/docs/Examples.md
+++ b/SDT/schema4.0/docs/Examples.md
@@ -38,7 +38,7 @@ The following code section shows the fully integrated template. The source code
<DataPoint name="status" readable="true" writable="true">
<Doc>This property indicates the ON/OFF status.</Doc>
<DataType>
- <SimpleType type="boolean" />
+ <Simple type="boolean" />
</DataType>
</DataPoint>
</Data>
@@ -81,7 +81,7 @@ Based on the simplified example above, the two appliances will need the [ModuleC
<DataPoint name="operationStatus" writable="true">
<Doc>This property sets/reads the ON/OFF status.</Doc>
<DataType>
- <SimpleType type="boolean"/>
+ <Simple type="boolean"/>
</DataType>
</DataPoint>
</Data>
@@ -97,7 +97,7 @@ Based on the simplified example above, the two appliances will need the [ModuleC
<DataPoint name="measuredCumulativePowerConsumption" writable="false">
<Doc>This indicates cumulative power consumption of the device in increments of 0.001kWh.</Doc>
<DataType>
- <SimpleType type="integer"/>
+ <Simple type="integer"/>
</DataType>
</DataPoint>
</Data>
@@ -108,7 +108,7 @@ Based on the simplified example above, the two appliances will need the [ModuleC
<DataPoint name="installationLocation" writable="true">
<Doc>This property indicates the installation location</Doc>
<DataType>
- <SimpleType type="string"/>
+ <Simple type="string"/>
</DataType>
</DataPoint>
</Data>
@@ -122,7 +122,7 @@ Based on the simplified example above, the two appliances will need the [ModuleC
<DataPoint name="measuredTemperatureValue" readable="true" writable="false">
<Doc>This property indicates the measured temperature value in units of 0.1C.</Doc>
<DataType unitOfMeasure="celsius">
- <SimpleType type="integer" />
+ <Simple type="integer" />
</DataType>
</DataPoint>
</Data>
@@ -145,10 +145,10 @@ At the beginning of the definition some device Properties are defined.
<Properties>
<Property name="Name" value="washing machine">
- <SimpleType type="string" />
+ <Simple type="string" />
</Property>
<Property name="Vendor" value="ACME">
- <SimpleType type="string" />
+ <Simple type="string" />
</Property>
</Properties>
@@ -191,25 +191,25 @@ At the beginning of the definition some device Properties are defined.
<DataPoint name="door_CoverOpen_CloseStatus" readable="true" writable="false">
<Doc>This property indicates whether the door/cover is open or closed.</Doc>
<DataType>
- <SimpleType type="boolean" />
+ <Simple type="boolean" />
</DataType>
</DataPoint>
<DataPoint name="washingMachineSetting" readable="true" writable="true">
<Doc>Washing machine setting</Doc>
<DataType>
- <SimpleType type="string" />
+ <Simple type="string" />
</DataType>
</DataPoint>
<DataPoint name="currentStageOfWashingCycle" readable="true" writable="false">
<Doc>This property indicates the current stage of the washing cycle.</Doc>
<DataType>
- <SimpleType type="string" />
+ <Simple type="string" />
</DataType>
</DataPoint>
<DataPoint name="timeRemainingToCompleteWashingCycle" readable="true" writable="false">
<Doc>This property indicates the time remaining to complete the current washing cycle in the HH:MM:SS format.</Doc>
<DataType>
- <SimpleType type="time" />
+ <Simple type="time" />
</DataType>
</DataPoint>
@@ -221,19 +221,19 @@ At the beginning of the definition some device Properties are defined.
<DataPoint name="onTimerReservationSetting" readable="true" writable="true">
<Doc>Reservation ON/OFF</Doc>
<DataType>
- <SimpleType type="boolean" />
+ <Simple type="boolean" />
</DataType>
</DataPoint>
<DataPoint name="onTimerSetting" readable="true" writable="true">
<Doc>Timer value (HH:MM)</Doc>
<DataType>
- <SimpleType type="time" />
+ <Simple type="time" />
</DataType>
</DataPoint>
<DataPoint name="relativeTimeBasedOnTimerSetting" readable="true" writable="true">
<Doc>Timer value (HH:MM)</Doc>
<DataType>
- <SimpleType type="time" />
+ <Simple type="time" />
</DataType>
</DataPoint>
</Data>
@@ -275,7 +275,7 @@ The following code section shows the fully integrated template.
<DataPoint name="operationStatus" readable="true" writable="true">
<Doc>This property indicates the ON/OFF status.</Doc>
<DataType>
- <SimpleType type="boolean" />
+ <Simple type="boolean" />
</DataType>
</DataPoint>
</Data>
@@ -288,7 +288,7 @@ The following code section shows the fully integrated template.
<DataPoint name="installationLocation" readable="true" writable="true">
<Doc>This property indicates the installation location</Doc>
<DataType>
- <SimpleType type="string" />
+ <Simple type="string" />
</DataType>
</DataPoint>
</Data>
@@ -306,7 +306,7 @@ The following code section shows the fully integrated template.
<DataPoint name="measuredInstantaneousPowerConsumption" readable="true" writable="false">
<Doc>This property indicates the instantaneous power consumption of the device in watts.</Doc>
<DataType unitOfMeasure="watts">
- <SimpleType type="integer" />
+ <Simple type="integer" />
</DataType>
</DataPoint>
</Data>
@@ -317,7 +317,7 @@ The following code section shows the fully integrated template.
<DataPoint name="measuredTemperatureValue" readable="true" writable="false">
<Doc>This property indicates the measured temperature value in units of 0.1C.</Doc>
<DataType unitOfMeasure="celsius">
- <SimpleType type="integer" />
+ <Simple type="integer" />
</DataType>
</DataPoint>
</Data>
@@ -334,10 +334,10 @@ The following code section shows the fully integrated template.
<Properties>
<Property name="Name" value="washing machine">
- <SimpleType type="string" />
+ <Simple type="string" />
</Property>
<Property name="Vendor" value="ACME">
- <SimpleType type="string" />
+ <Simple type="string" />
</Property>
</Properties>
@@ -382,25 +382,25 @@ The following code section shows the fully integrated template.
<DataPoint name="door_CoverOpen_CloseStatus" readable="true" writable="false">
<Doc>This property indicates whether the door/cover is open or closed.</Doc>
<DataType>
- <SimpleType type="boolean" />
+ <Simple type="boolean" />
</DataType>
</DataPoint>
<DataPoint name="washingMachineSetting" readable="true" writable="true">
<Doc>Washing machine setting</Doc>
<DataType>
- <SimpleType type="string" />
+ <Simple type="string" />
</DataType>
</DataPoint>
<DataPoint name="currentStageOfWashingCycle" readable="true" writable="false">
<Doc>This property indicates the current stage of the washing cycle.</Doc>
<DataType>
- <SimpleType type="string" />
+ <Simple type="string" />
</DataType>
</DataPoint>
<DataPoint name="timeRemainingToCompleteWashingCycle" readable="true" writable="false">
<Doc>This property indicates the time remaining to complete the current washing cycle in the HH:MM:SS format.</Doc>
<DataType>
- <SimpleType type="time" />
+ <Simple type="time" />
</DataType>
</DataPoint>
@@ -412,19 +412,19 @@ The following code section shows the fully integrated template.
<DataPoint name="onTimerReservationSetting" readable="true" writable="true">
<Doc>Reservation ON/OFF</Doc>
<DataType>
- <SimpleType type="boolean" />
+ <Simple type="boolean" />
</DataType>
</DataPoint>
<DataPoint name="onTimerSetting" readable="true" writable="true">
<Doc>Timer value (HH:MM)</Doc>
<DataType>
- <SimpleType type="time" />
+ <Simple type="time" />
</DataType>
</DataPoint>
<DataPoint name="relativeTimeBasedOnTimerSetting" readable="true" writable="true">
<Doc>Timer value (HH:MM)</Doc>
<DataType>
- <SimpleType type="time" />
+ <Simple type="time" />
</DataType>
</DataPoint>
</Data>
diff --git a/SDT/schema4.0/docs/SDT_Components.md b/SDT/schema4.0/docs/SDT_Components.md
index ef4adb5c3a6030d9ac165d445bce2ae3ff9432de..d07b21d78ac69ae8fee141ebe3997ad7e8893fc5 100644
--- a/SDT/schema4.0/docs/SDT_Components.md
+++ b/SDT/schema4.0/docs/SDT_Components.md
@@ -17,10 +17,10 @@
1. [DataType](#DataType)
1. [Constraint](#Constraint)
2. [TypeChoice](#TypeChoice)
- 2. [SimpleType](#SimpleType)
- 3. [StructType](#StructType)
- 4. [ArrayType](#ArrayType)
- 5. [EnumType](#EnumType)
+ 2. [Simple](#Simple)
+ 3. [Struct](#Struct)
+ 4. [Array](#Array)
+ 5. [Enum](#Enum)
1. [ExtendExclude](#ExtendExclude)
3. [Extending (Inheriting)](#Extending)
1. [Extend](#Extend)
@@ -194,7 +194,7 @@ string = (* character string excluding the character "/" *) ;
<DataPoint name="attributeName" writable="false">
<Doc>Some documentation for the DataPoint</Doc>
<DataType>
- <SimpleType type="string" />
+ <Simple type="string" />
</DataType
</DataPoint>
</Data>
@@ -237,7 +237,7 @@ The following are two examples for actions implementing a getter and a setter fo
<Arg name="value">
<Doc>The desired value of the associated state.</Doc>
<DataType>
- <SimpleType type="boolean" />
+ <Simple type="boolean" />
</DataType>
</Arg>
</Args>
@@ -295,7 +295,7 @@ Element of [ModuleClass](#ModuleClass).
<Data>
<DataPoint name="state">
<DataType>
- <SimpleType type="boolean" />
+ <Simple type="boolean" />
</DataType>
</DataPoint>
</Data>
@@ -422,13 +422,13 @@ All elements of [DeviceClass](#DeviceClass) can be reused in *ProductClass*, but
<Doc>This is a new product</Doc>
<Properties>
<Property name="name" value="product-abc">
- <SimpleType type="string"></SimpleType>
+ <Simple type="string"></Simple>
</Property>
<Property name="vendor" value="xyz"/>
- <SimpleType type="string"></SimpleType>
+ <Simple type="string"></Simple>
</Property>
<Property name="SerialNumber"/>
- <SimpleType type="string"></SimpleType>
+ <Simple type="string"></Simple>
</Property>
</Properties>
<ModuleClasses>
@@ -467,12 +467,12 @@ Since the *Properties* are highly varied, depending on industry segment, no atte
#### Elements
- **[Doc](#Documentation)** : Documentation for the *Property*. Optional.
-- **DataType** : The data type of the property. This must be a [SimpleType](#SimpleType).
+- **DataType** : The data type of the property. This must be a [Simple](#Simple) type.
#### Example
```xml
<Property name="ManufacturedDate" value="2015.10.30 10:06">
- <SimpleType type="datetime" />
+ <Simple type="datetime" />
</Property>
```
@@ -494,24 +494,24 @@ The various elements of *DataType* are described in the following sections.
<a name="DataType"/></a>
### DataType
-Element of a [Domain](#Domain), [Property](#Property), [Action](#Action), [Arg](#Arg), [DataPoint](#DataPoint), [Event](#Event), [StructType](#StructType), and [ArrayType](#ArrayType).
+Element of a [Domain](#Domain), [Property](#Property), [Action](#Action), [Arg](#Arg), [DataPoint](#DataPoint), [Event](#Event), [Struct](#Struct), and [Array](#Array).
The *DataType* element is a "container" for the various aspects of a type.
#### Attributes
-- **name** : The name of the *DataType*. Optional, with the exception that the name must be set for fields in a [Struct](#Struct) to distinguish individual fields in that structure.
+- **name** : The name of the *DataType*. Optional, with the exception that the name must be set for fields in a [Struct](#Struct) to distinguish individual fields in that structure.
- **unitOfMeasure** : Before considering the type of data in detail, there is the option to label the data with the units of measurement. A "Temperature" measurement is meaningless until the units Kelvin, Celcius, Fahrenheit etc are known. Because of the extreme variety of units, a string field is the default annotation method, although of course a SDO could decide to reference a standardized list of units. Optional.
- **semanticURI** : An attribute that contains a URI to a semantic description of the element. Optional.
#### Elements
- **[Doc](#Documentation)** : Documentation for the *DataType* Element. Optional.
- **TypeChoice** : This element is actual an element from the following list of data types:
- - **[SimpleType](#SimpleType)**
- - **[Struct](#StructType)**
- - **[Array](#ArrayType)**
- - **[EnumType](#EnumType)**
+ - **[Simple](#Simple)**
+ - **[Struct](#Struct)**
+ - **[Array](#Array)**
+ - **[Enum](#Enum)**
- **[Constraint](#Constraint)** : A list of *Constraint* elements. Optional.
---
@@ -544,13 +544,13 @@ The *TypeChoice* construct is required for syntactic reasons in the UML diagram
---
-<a name="SimpleType"/></a>
-### SimpleType
+<a name="Simple"/></a>
+### Simple
Element of [DataType](#DataType).
-The *SimpleType* element is required in order for software to understand the format of the associated data, e.g. are the bytes an integer or real value? The selection choosen by HGI is based on practical experience to include some specific types which are slightly more complex:
+The *Simple* element is required in order for software to understand the format of the associated data, e.g. are the bytes an integer or real value? The selection choosen by HGI is based on practical experience to include some specific types which are slightly more complex:
1. the (technically redundant) options of *date* and *time* - to avoid problems which can arise interpreting a *datetime* value;
2. *url* because it is expected to become extremely common to provide links to other data sources;
@@ -577,19 +577,19 @@ If not stated otherwise datatypes should comply to the equivalent datatypes defi
```xml
<DataPoint name="simpleDataPoint">
<DataType>
- <SimpleType type="string" />
+ <Simple type="string" />
</DataType>
</DataPoint>
```
---
-<a name="StructType"/></a>
-### StructType
+<a name="Struct"/></a>
+### Struct
Element of [DataType](#DataType).
-The *StructType* element can be used to represent an ordered list of diverse DataTypes, which are represented by the *name* attribute of each [DataType](#DataType), and can be used recursively.
+The *Struct* element can be used to represent an ordered list of diverse DataTypes, which are represented by the *name* attribute of each [DataType](#DataType), and can be used recursively.
#### Elements
- **[DataType](#DataType)** : A list of *DataTypes* elements representing the elements of a structure.
@@ -600,10 +600,10 @@ The *StructType* element can be used to represent an ordered list of diverse Dat
<DataType name="structured">
<Struct>
<DataType name="aString">
- <SimpleType type="string" />
+ <Simple type="string" />
</DataType>
<DataType name="anInteger">
- <SimpleType type="integer" />
+ <Simple type="integer" />
</DataType>
</Struct>
</DataType>
@@ -612,13 +612,13 @@ The *StructType* element can be used to represent an ordered list of diverse Dat
---
-<a name="ArrayType"/></a>
-### ArrayType
+<a name="Array"/></a>
+### Array
Element of [DataType](#DataType).
-The *ArrayType* element is provided for defining lists of data; the definition is recursive so that multi-dimensional arrays can be described. Note that a Constraint can be used to provide limits on Array size.
+The *Array* element is provided for defining lists of data; the definition is recursive so that multi-dimensional arrays can be described. Note that a Constraint can be used to provide limits on Array size.
#### Elements
- **[DataType](#DataType)** : A single *DataType* element that specifies the data type for the elements of the array.
@@ -630,7 +630,7 @@ The *ArrayType* element is provided for defining lists of data; the definition i
<DataType name="arrayOfInteger">
<Array>
<DataType>
- <SimpleType type="integer" />
+ <Simple type="integer" />
</DataType>
</Array>
</DataType>
@@ -638,18 +638,18 @@ The *ArrayType* element is provided for defining lists of data; the definition i
```
---
-<a name="EnumType"/></a>
-### EnumType
+<a name="Enum"/></a>
+### Enum
Element of [DataType](#DataType).
-The *EnumType* element is provided for defining an enumeration data type; it defines a (possibly mixed) typed set of [EnumValues](#EnumValue).
+The *Enum* element is provided for defining an enumeration data type; it defines a (possibly mixed) typed set of [EnumValues](#EnumValue).
#### Elements
- **[EnumValue](#EnumValue)** : A list of *EnumValue" element that specifies the data type for the elements of the array.
-<a name="EnumTypeExample"/></a>
+<a name="EnumExample"/></a>
#### Example
```xml
<DataPoint name="enumDataPoint">
@@ -667,23 +667,23 @@ The *EnumType* element is provided for defining an enumeration data type; it def
<a name="EnumValue"/></a>
### EnumValue
-Element of [EnumType](#EnumType).
+Element of [Enum](#Enum).
-The *EnumType* element is provided for defining an enumeration data type; it defines a (possibly mixed) typed set of [EnumValues](#EnumValue).
+The *Enum* element is provided for defining an enumeration data type; it defines a (possibly mixed) typed set of [EnumValues](#EnumValue).
#### Attributes
- **name** : The name that identifies the *EnumValue*. Required.
- **value** : An assigned value for the *EnumValue*. Required.
-- **type** : The *BasicType* of the *EnumValue*. An [EnumType](#EnumType) may have *EnumValues* of mixed type. Optional, the default is *integer*.
+- **type** : The *BasicType* of the *EnumValue*. An [Enum](#Enum) may have *EnumValues* of mixed type. Optional, the default is *integer*.
- **semanticURI** : An attribute that contains a URI to a semantic description of the element. Optional.
#### Elements
- **[Doc](#Documentation)** : Documentation for the *EnumValue* Element. Optional.
#### Example
-See [example in *EnumType*](#EnumTypeExample).
+See [example in *Enum*](#EnumExample).
---
diff --git a/SDT/schema4.0/docs/SDT_JSON.md b/SDT/schema4.0/docs/SDT_JSON.md
index 4a1af69846c0f80f077233e548c2a0baa46a5f15..66f6ac9d970be774b1884963263bedd8490faebc 100644
--- a/SDT/schema4.0/docs/SDT_JSON.md
+++ b/SDT/schema4.0/docs/SDT_JSON.md
@@ -10,9 +10,9 @@
3. [Imports](#imports)
4. [Data Types](#dataTypes)
1. [SimpleType](#SimpleType)
- 2. [ArrayType](#ArrayType)
- 3. [StructType](#StructType)
- 4. [EnumType](#EnumType)
+ 2. [Array](#Array)
+ 3. [Struct](#Struct)
+ 4. [Enum](#Enum)
5. [Extending DataTypes](#extendingDatatypes)
@@ -263,10 +263,10 @@ A simple data type with additional attributes:
}
```
-<a name="ArrayType"/></a>
-### ArrayType
+<a name="Array"/></a>
+### Array
-An [ArrayType](SDT_Components.md#ArrayType) definition is mapped to an *Array* JSON structure. The content of the structure is only one element that defines the type of the array. This could be any [SimpleType](#SimpleType), [ArrayType](#ArrayType), [StructType](#StructType), or [EnumType](#EnumType).
+An [Array](SDT_Components.md#Array) definition is mapped to an *Array* JSON structure. The content of the structure is only one element that defines the type of the array. This could be any [SimpleType](#SimpleType), [Array](#Array), [Struct](#Struct), or [Enum](#Enum).
#### Example
@@ -292,12 +292,12 @@ A simple data type with additional attributes:
}
```
-<a name="StructType"/></a>
-### StructType
+<a name="Struct"/></a>
+### Struct
-A [StructType](SDT_Components.md#StructType) definition is mapped to a *Struct* JSON array. The content of the array are the individual data types for the structure. These could be any [SimpleType](#SimpleType), [ArrayType](#ArrayType), [StructType](#StructType), or [EnumType](#EnumType).
+A [Struct](SDT_Components.md#Struct) definition is mapped to a *Struct* JSON array. The content of the array are the individual data types for the structure. These could be any [SimpleType](#SimpleType), [Array](#Array), [Struct](#Struct), or [Enum](#Enum).
-A *StructType* definition must contain a *name* attribute.
+A *Struct* definition must contain a *name* attribute.
#### Example
@@ -374,12 +374,12 @@ A more complex structured data type (a structure that contains an indentifier va
]
```
-<a name="EnumType"/></a>
-### EnumType
+<a name="Enum"/></a>
+### Enum
-A [EnumType](SDT_Components.md#EnumType) definition is mapped to an *Enum* JSON structure. The content of the structure are the individual enum values of the enum.
+A [Enum](SDT_Components.md#Enum) definition is mapped to an *Enum* JSON structure. The content of the structure are the individual enum values of the enum.
-A *EnumType* definition must contain a *name* attribute.
+A *Enum* definition must contain a *name* attribute.
#### Example
@@ -414,7 +414,7 @@ Extending [DataTypes](SDT_Components.md#DataTypes) are mapped the same way as ex
#### Example
-An [Enum](SDT_Components.md#EnumType) that defines three *EnumValues*. The first definition explicitly specifies the type of the *EnumValue*.
+An [Enum](SDT_Components.md#Enum) that defines three *EnumValues*. The first definition explicitly specifies the type of the *EnumValue*.
**XML**:
diff --git a/SDT/schema4.0/docs/SDT_UML.uxf b/SDT/schema4.0/docs/SDT_UML.uxf
index e4ad21952306f53a6097db4a91faecd0b5171dbd..bf8b10804e5e28901ae4c39dd53721ba7ba1deb1 100644
--- a/SDT/schema4.0/docs/SDT_UML.uxf
+++ b/SDT/schema4.0/docs/SDT_UML.uxf
@@ -6,7 +6,7 @@
<id>UMLNote</id>
<coordinates>
<x>1112</x>
- <y>1440</y>
+ <y>1352</y>
<w>232</w>
<h>208</h>
</coordinates>
@@ -37,7 +37,7 @@ group=1</panel_attributes>
<id>Relation</id>
<coordinates>
<x>1216</x>
- <y>1520</y>
+ <y>1432</y>
<w>88</w>
<h>32</h>
</coordinates>
@@ -52,7 +52,7 @@ group=1</panel_attributes>
<id>Relation</id>
<coordinates>
<x>1216</x>
- <y>1552</y>
+ <y>1464</y>
<w>88</w>
<h>24</h>
</coordinates>
@@ -65,7 +65,7 @@ group=1</panel_attributes>
<id>UMLClass</id>
<coordinates>
<x>1224</x>
- <y>1072</y>
+ <y>984</y>
<w>120</w>
<h>176</h>
</coordinates>
@@ -89,7 +89,7 @@ void</panel_attributes>
<id>Relation</id>
<coordinates>
<x>728</x>
- <y>1136</y>
+ <y>1048</y>
<w>112</w>
<h>64</h>
</coordinates>
@@ -102,7 +102,7 @@ fontsize=12</panel_attributes>
<id>Relation</id>
<coordinates>
<x>728</x>
- <y>1072</y>
+ <y>984</y>
<w>112</w>
<h>64</h>
</coordinates>
@@ -115,7 +115,7 @@ fontsize=12</panel_attributes>
<id>UMLClass</id>
<coordinates>
<x>344</x>
- <y>1072</y>
+ <y>984</y>
<w>152</w>
<h>120</h>
</coordinates>
@@ -135,7 +135,7 @@ fg=blue</panel_attributes>
<id>Relation</id>
<coordinates>
<x>488</x>
- <y>1032</y>
+ <y>944</y>
<w>544</w>
<h>96</h>
</coordinates>
@@ -148,7 +148,7 @@ fontsize=12</panel_attributes>
<id>Relation</id>
<coordinates>
<x>488</x>
- <y>1032</y>
+ <y>944</y>
<w>544</w>
<h>144</h>
</coordinates>
@@ -161,11 +161,11 @@ fontsize=12</panel_attributes>
<id>UMLClass</id>
<coordinates>
<x>824</x>
- <y>1168</y>
+ <y>1080</y>
<w>152</w>
<h>40</h>
</coordinates>
- <panel_attributes>SimpleType
+ <panel_attributes>Simple
--
*@ type : BasicType*
fg=blue</panel_attributes>
@@ -175,7 +175,7 @@ fg=blue</panel_attributes>
<id>Relation</id>
<coordinates>
<x>968</x>
- <y>1192</y>
+ <y>1104</y>
<w>272</w>
<h>32</h>
</coordinates>
@@ -188,7 +188,7 @@ fontsize=12</panel_attributes>
<id>UMLClass</id>
<coordinates>
<x>824</x>
- <y>1264</y>
+ <y>1176</y>
<w>152</w>
<h>88</h>
</coordinates>
@@ -206,7 +206,7 @@ fg=blue</panel_attributes>
<id>Relation</id>
<coordinates>
<x>488</x>
- <y>1152</y>
+ <y>1064</y>
<w>352</w>
<h>144</h>
</coordinates>
@@ -219,7 +219,7 @@ fontsize=12</panel_attributes>
<id>Relation</id>
<coordinates>
<x>968</x>
- <y>1240</y>
+ <y>1152</y>
<w>336</w>
<h>112</h>
</coordinates>
@@ -232,11 +232,11 @@ fontsize=12</panel_attributes>
<id>UMLClass</id>
<coordinates>
<x>824</x>
- <y>1072</y>
+ <y>984</y>
<w>152</w>
<h>40</h>
</coordinates>
- <panel_attributes>StructType
+ <panel_attributes>Struct
--
- DataType : DataType
fg=blue</panel_attributes>
@@ -246,11 +246,11 @@ fg=blue</panel_attributes>
<id>UMLClass</id>
<coordinates>
<x>824</x>
- <y>1120</y>
+ <y>1032</y>
<w>152</w>
<h>40</h>
</coordinates>
- <panel_attributes>ArrayType
+ <panel_attributes>Array
--
- DataType : DataType
fg=blue</panel_attributes>
@@ -260,7 +260,7 @@ fg=blue</panel_attributes>
<id>Relation</id>
<coordinates>
<x>728</x>
- <y>1112</y>
+ <y>1024</y>
<w>112</w>
<h>40</h>
</coordinates>
@@ -274,7 +274,7 @@ fontsize=12
<id>UMLClass</id>
<coordinates>
<x>344</x>
- <y>960</y>
+ <y>872</y>
<w>1000</w>
<h>32</h>
</coordinates>
@@ -289,7 +289,7 @@ lw=0.1</panel_attributes>
<id>UMLClass</id>
<coordinates>
<x>56</x>
- <y>88</y>
+ <y>0</y>
<w>1288</w>
<h>32</h>
</coordinates>
@@ -304,7 +304,7 @@ lw=0.1</panel_attributes>
<id>UMLClass</id>
<coordinates>
<x>624</x>
- <y>192</y>
+ <y>104</y>
<w>192</w>
<h>152</h>
</coordinates>
@@ -328,7 +328,7 @@ fg=blue
<id>UMLClass</id>
<coordinates>
<x>904</x>
- <y>192</y>
+ <y>104</y>
<w>176</w>
<h>104</h>
</coordinates>
@@ -347,7 +347,7 @@ fg=blue</panel_attributes>
<id>UMLClass</id>
<coordinates>
<x>1176</x>
- <y>264</y>
+ <y>176</y>
<w>168</w>
<h>104</h>
</coordinates>
@@ -366,7 +366,7 @@ fg=blue</panel_attributes>
<id>Relation</id>
<coordinates>
<x>1072</x>
- <y>264</y>
+ <y>176</y>
<w>120</w>
<h>32</h>
</coordinates>
@@ -379,7 +379,7 @@ fontsize=12</panel_attributes>
<id>UMLClass</id>
<coordinates>
<x>72</x>
- <y>192</y>
+ <y>104</y>
<w>184</w>
<h>144</h>
</coordinates>
@@ -401,7 +401,7 @@ fg=blue</panel_attributes>
<id>Relation</id>
<coordinates>
<x>504</x>
- <y>192</y>
+ <y>104</y>
<w>136</w>
<h>64</h>
</coordinates>
@@ -414,7 +414,7 @@ fontsize=12</panel_attributes>
<id>UMLClass</id>
<coordinates>
<x>336</x>
- <y>440</y>
+ <y>352</y>
<w>176</w>
<h>128</h>
</coordinates>
@@ -435,7 +435,7 @@ fg=blue</panel_attributes>
<id>Relation</id>
<coordinates>
<x>504</x>
- <y>288</y>
+ <y>200</y>
<w>56</w>
<h>72</h>
</coordinates>
@@ -448,7 +448,7 @@ fontsize=12</panel_attributes>
<id>Relation</id>
<coordinates>
<x>504</x>
- <y>352</y>
+ <y>264</y>
<w>136</w>
<h>144</h>
</coordinates>
@@ -461,7 +461,7 @@ fontsize=12</panel_attributes>
<id>UMLClass</id>
<coordinates>
<x>1176</x>
- <y>488</y>
+ <y>400</y>
<w>168</w>
<h>40</h>
</coordinates>
@@ -474,7 +474,7 @@ fg=blue</panel_attributes>
<id>Relation</id>
<coordinates>
<x>808</x>
- <y>192</y>
+ <y>104</y>
<w>112</w>
<h>56</h>
</coordinates>
@@ -487,7 +487,7 @@ fontsize=12</panel_attributes>
<id>Relation</id>
<coordinates>
<x>1128</x>
- <y>488</y>
+ <y>400</y>
<w>64</w>
<h>32</h>
</coordinates>
@@ -500,7 +500,7 @@ fontsize=12</panel_attributes>
<id>Relation</id>
<coordinates>
<x>808</x>
- <y>240</y>
+ <y>152</y>
<w>112</w>
<h>96</h>
</coordinates>
@@ -513,7 +513,7 @@ fontsize=12</panel_attributes>
<id>UMLClass</id>
<coordinates>
<x>904</x>
- <y>304</y>
+ <y>216</y>
<w>176</w>
<h>144</h>
</coordinates>
@@ -537,7 +537,7 @@ fg=blue
<id>UMLClass</id>
<coordinates>
<x>904</x>
- <y>456</y>
+ <y>368</y>
<w>176</w>
<h>88</h>
</coordinates>
@@ -555,7 +555,7 @@ fg=blue</panel_attributes>
<id>Relation</id>
<coordinates>
<x>808</x>
- <y>320</y>
+ <y>232</y>
<w>112</w>
<h>168</h>
</coordinates>
@@ -568,7 +568,7 @@ fontsize=12</panel_attributes>
<id>Relation</id>
<coordinates>
<x>504</x>
- <y>192</y>
+ <y>104</y>
<w>136</w>
<h>336</h>
</coordinates>
@@ -581,7 +581,7 @@ fontsize=12</panel_attributes>
<id>UMLClass</id>
<coordinates>
<x>336</x>
- <y>328</y>
+ <y>240</y>
<w>176</w>
<h>104</h>
</coordinates>
@@ -600,7 +600,7 @@ fg=blue</panel_attributes>
<id>Relation</id>
<coordinates>
<x>504</x>
- <y>408</y>
+ <y>320</y>
<w>64</w>
<h>64</h>
</coordinates>
@@ -613,7 +613,7 @@ fontsize=12</panel_attributes>
<id>Relation</id>
<coordinates>
<x>504</x>
- <y>192</y>
+ <y>104</y>
<w>136</w>
<h>224</h>
</coordinates>
@@ -625,7 +625,7 @@ fontsize=12</panel_attributes>
<id>Relation</id>
<coordinates>
<x>504</x>
- <y>352</y>
+ <y>264</y>
<w>136</w>
<h>48</h>
</coordinates>
@@ -636,7 +636,7 @@ fontsize=12</panel_attributes>
<id>UMLClass</id>
<coordinates>
<x>624</x>
- <y>352</y>
+ <y>264</y>
<w>192</w>
<h>104</h>
</coordinates>
@@ -647,7 +647,7 @@ fontsize=12</panel_attributes>
/@ value : text/
/@ semanticURI : uri/
/- Doc : Doc/
-- DataType : SimpleType
+- DataType : Simple
fg=blue
transparency=80</panel_attributes>
<additional_attributes/>
@@ -656,7 +656,7 @@ transparency=80</panel_attributes>
<id>Relation</id>
<coordinates>
<x>1072</x>
- <y>192</y>
+ <y>104</y>
<w>56</w>
<h>320</h>
</coordinates>
@@ -669,7 +669,7 @@ fontsize=12</panel_attributes>
<id>Relation</id>
<coordinates>
<x>808</x>
- <y>320</y>
+ <y>232</y>
<w>56</w>
<h>64</h>
</coordinates>
@@ -682,17 +682,17 @@ fontsize=12</panel_attributes>
<id>UMLClass</id>
<coordinates>
<x>584</x>
- <y>1080</y>
+ <y>992</y>
<w>152</w>
<h>88</h>
</coordinates>
<panel_attributes><<enumeration>>
TypeChoice
--
-SimpleType : SimpleType
-Struct : StructType
-Array : ArrayType
-Enum : EnumType
+Simple : Simple
+Struct : Struct
+Array : Array
+Enum : Enum
</panel_attributes>
<additional_attributes/>
@@ -701,7 +701,7 @@ Enum : EnumType
<id>Relation</id>
<coordinates>
<x>488</x>
- <y>1088</y>
+ <y>1000</y>
<w>112</w>
<h>64</h>
</coordinates>
@@ -714,7 +714,7 @@ fontsize=12</panel_attributes>
<id>Relation</id>
<coordinates>
<x>504</x>
- <y>256</y>
+ <y>168</y>
<w>136</w>
<h>120</h>
</coordinates>
@@ -726,7 +726,7 @@ fontsize=12</panel_attributes>
<id>Relation</id>
<coordinates>
<x>248</x>
- <y>160</y>
+ <y>72</y>
<w>392</w>
<h>88</h>
</coordinates>
@@ -738,7 +738,7 @@ fontsize=12</panel_attributes>
<id>Relation</id>
<coordinates>
<x>504</x>
- <y>272</y>
+ <y>184</y>
<w>64</w>
<h>192</h>
</coordinates>
@@ -751,11 +751,11 @@ fontsize=12</panel_attributes>
<id>UMLClass</id>
<coordinates>
<x>824</x>
- <y>1216</y>
+ <y>1128</y>
<w>152</w>
<h>40</h>
</coordinates>
- <panel_attributes>EnumType
+ <panel_attributes>Enum
--
*- EnumValue : EnumValue*
fg=blue</panel_attributes>
@@ -765,7 +765,7 @@ fg=blue</panel_attributes>
<id>Relation</id>
<coordinates>
<x>728</x>
- <y>1144</y>
+ <y>1056</y>
<w>112</w>
<h>104</h>
</coordinates>
@@ -778,7 +778,7 @@ fontsize=12</panel_attributes>
<id>UMLClass</id>
<coordinates>
<x>1024</x>
- <y>1232</y>
+ <y>1144</y>
<w>168</w>
<h>88</h>
</coordinates>
@@ -796,7 +796,7 @@ fg=blue</panel_attributes>
<id>Relation</id>
<coordinates>
<x>968</x>
- <y>1232</y>
+ <y>1144</y>
<w>72</w>
<h>32</h>
</coordinates>
@@ -809,7 +809,7 @@ fontsize=12</panel_attributes>
<id>Relation</id>
<coordinates>
<x>1184</x>
- <y>1240</y>
+ <y>1152</y>
<w>88</w>
<h>64</h>
</coordinates>
@@ -822,7 +822,7 @@ fontsize=12</panel_attributes>
<id>UMLClass</id>
<coordinates>
<x>392</x>
- <y>712</y>
+ <y>624</y>
<w>176</w>
<h>64</h>
</coordinates>
@@ -839,7 +839,7 @@ fg=blue
<id>UMLClass</id>
<coordinates>
<x>888</x>
- <y>712</y>
+ <y>624</y>
<w>192</w>
<h>56</h>
</coordinates>
@@ -854,7 +854,7 @@ fg=blue</panel_attributes>
<id>Relation</id>
<coordinates>
<x>816</x>
- <y>712</y>
+ <y>624</y>
<w>88</w>
<h>56</h>
</coordinates>
@@ -868,7 +868,7 @@ fontsize=12
<id>Relation</id>
<coordinates>
<x>344</x>
- <y>712</y>
+ <y>624</y>
<w>64</w>
<h>32</h>
</coordinates>
@@ -881,7 +881,7 @@ fontsize=12</panel_attributes>
<id>UMLClass</id>
<coordinates>
<x>1168</x>
- <y>712</y>
+ <y>624</y>
<w>176</w>
<h>128</h>
</coordinates>
@@ -902,7 +902,7 @@ subdevice
<id>Relation</id>
<coordinates>
<x>1072</x>
- <y>712</y>
+ <y>624</y>
<w>112</w>
<h>56</h>
</coordinates>
@@ -915,7 +915,7 @@ fontsize=12</panel_attributes>
<id>UMLClass</id>
<coordinates>
<x>888</x>
- <y>776</y>
+ <y>688</y>
<w>192</w>
<h>56</h>
</coordinates>
@@ -930,7 +930,7 @@ fg=blue</panel_attributes>
<id>Relation</id>
<coordinates>
<x>816</x>
- <y>760</y>
+ <y>672</y>
<w>88</w>
<h>48</h>
</coordinates>
@@ -944,7 +944,7 @@ fontsize=12
<id>Relation</id>
<coordinates>
<x>1072</x>
- <y>712</y>
+ <y>624</y>
<w>112</w>
<h>120</h>
</coordinates>
@@ -957,7 +957,7 @@ fontsize=12</panel_attributes>
<id>UMLClass</id>
<coordinates>
<x>648</x>
- <y>712</y>
+ <y>624</y>
<w>176</w>
<h>64</h>
</coordinates>
@@ -975,7 +975,7 @@ Includes : Include
<id>Relation</id>
<coordinates>
<x>560</x>
- <y>720</y>
+ <y>632</y>
<w>104</w>
<h>56</h>
</coordinates>
@@ -989,7 +989,7 @@ fontsize=12
<id>UMLClass</id>
<coordinates>
<x>336</x>
- <y>192</y>
+ <y>104</y>
<w>176</w>
<h>128</h>
</coordinates>
@@ -1011,7 +1011,7 @@ fg=blue</panel_attributes>
<id>Relation</id>
<coordinates>
<x>248</x>
- <y>288</y>
+ <y>200</y>
<w>104</w>
<h>72</h>
</coordinates>
@@ -1024,7 +1024,7 @@ fontsize=12</panel_attributes>
<id>Relation</id>
<coordinates>
<x>248</x>
- <y>192</y>
+ <y>104</y>
<w>104</w>
<h>104</h>
</coordinates>
@@ -1037,7 +1037,7 @@ fontsize=12</panel_attributes>
<id>UMLClass</id>
<coordinates>
<x>344</x>
- <y>624</y>
+ <y>536</y>
<w>1000</w>
<h>32</h>
</coordinates>
@@ -1052,7 +1052,7 @@ lw=0.1</panel_attributes>
<id>Relation</id>
<coordinates>
<x>248</x>
- <y>304</y>
+ <y>216</y>
<w>104</w>
<h>168</h>
</coordinates>
diff --git a/SDT/schema4.0/docs/images/Property.png b/SDT/schema4.0/docs/images/Property.png
index 972617c89d229e5dfa1e489b17174f81c2031984..48c963eb402fe3fcdd691d7dcd7f9348af662260 100644
Binary files a/SDT/schema4.0/docs/images/Property.png and b/SDT/schema4.0/docs/images/Property.png differ
diff --git a/SDT/schema4.0/docs/images/SDT_UML_Basic_Elements.png b/SDT/schema4.0/docs/images/SDT_UML_Basic_Elements.png
index f7a3670421d139b977a8b867f924f4514d04ca07..d16df892a43327b426036cd4013bc4ce8c537f52 100644
Binary files a/SDT/schema4.0/docs/images/SDT_UML_Basic_Elements.png and b/SDT/schema4.0/docs/images/SDT_UML_Basic_Elements.png differ
diff --git a/SDT/schema4.0/docs/images/SDT_simplified.png b/SDT/schema4.0/docs/images/SDT_simplified.png
index 8de39d56f8d1b5a7b426567daf02e69a1b73f728..34cd8beddfdd19ad92520469a31d310d65aa1585 100644
Binary files a/SDT/schema4.0/docs/images/SDT_simplified.png and b/SDT/schema4.0/docs/images/SDT_simplified.png differ
diff --git a/SDT/schema4.0/test/datapoint-test.xml b/SDT/schema4.0/test/datapoint-test.xml
index e7005b011d89f2053d08addf0165270818509de5..bd107b04f21c5414fd7378a5142d51b94e87a9f8 100644
--- a/SDT/schema4.0/test/datapoint-test.xml
+++ b/SDT/schema4.0/test/datapoint-test.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- Test the EnumType -->
+<!-- Test the DataPoint -->
<Domain id="datapoint-test" xmlns="http://www.onem2m.org/xml/sdt/4.0" xmlns:xi="http://www.w3.org/2001/XInclude">
<ModuleClasses>
diff --git a/SDT/schema4.0/test/datatypes-test.xml b/SDT/schema4.0/test/datatypes-test.xml
index 102322080f0ea13d7b54565d70cd2945aee2d0dc..88ce3ab8024bd8d92034904f22196030979275a2 100644
--- a/SDT/schema4.0/test/datatypes-test.xml
+++ b/SDT/schema4.0/test/datatypes-test.xml
@@ -6,7 +6,7 @@
<DataType name="temperatureType" unitOfMeasure="C">
<Simple type="float"/>
</DataType>
- <DataType name="anEnumType">
+ <DataType name="anEnum">
<Enum>
<EnumValue name="red" type="integer" value="1"/>
<EnumValue name="green" value="2"/>
diff --git a/SDT/schema4.0/test/enumtype-test.xml b/SDT/schema4.0/test/enumtype-test.xml
index c4fc806401c7cd46aae68ea92aaa7e7d1be22dbd..c4b121d693c49b129dda0ea0540732dfec74579a 100644
--- a/SDT/schema4.0/test/enumtype-test.xml
+++ b/SDT/schema4.0/test/enumtype-test.xml
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- Test the EnumType -->
+<!-- Test the Enum type -->
-<Domain id="enumtype-test" xmlns="http://www.onem2m.org/xml/sdt/4.0" xmlns:xi="http://www.w3.org/2001/XInclude">
+<Domain id="enum-test" xmlns="http://www.onem2m.org/xml/sdt/4.0" xmlns:xi="http://www.w3.org/2001/XInclude">
<ModuleClasses>
- <ModuleClass name="TestEnumType">
+ <ModuleClass name="TestEnumm">
<Data>
- <DataPoint name="TestEnumTypeDataPoint" writable="true">
+ <DataPoint name="TestEnumDataPoint" writable="true">
<DataType>
<Enum>
<EnumValue name="red" value="1" type="integer" />
diff --git a/SDT/schema4.0/test/semanticURI-test.xml b/SDT/schema4.0/test/semanticURI-test.xml
index e6e6a08220f1858ee95a4414b425276af2739373..38c6a3db35c96640b40fe94941589ee510e80fba 100644
--- a/SDT/schema4.0/test/semanticURI-test.xml
+++ b/SDT/schema4.0/test/semanticURI-test.xml
@@ -6,11 +6,11 @@
<DataType name="temperatureType" unitOfMeasure="C" semanticURI="http://example.com/temperatureType.rdf">
<Simple type="float"/>
</DataType>
- <DataType name="anEnumType" semanticURI="http://example.com/anEnumType.rdf">
+ <DataType name="anEnum" semanticURI="http://example.com/anEnum.rdf">
<Enum>
- <EnumValue name="red" type="integer" value="1" semanticURI="http://example.com/anEnumType-red.rdf"/>
- <EnumValue name="green" value="2" semanticURI="http://example.com/anEnumType-green.rdf"/>
- <EnumValue name="blue" value="3" semanticURI="http://example.com/anEnumType-blue.rdf"/>
+ <EnumValue name="red" type="integer" value="1" semanticURI="http://example.com/anEnum-red.rdf"/>
+ <EnumValue name="green" value="2" semanticURI="http://example.com/anEnum-green.rdf"/>
+ <EnumValue name="blue" value="3" semanticURI="http://example.com/anEnum-blue.rdf"/>
</Enum>
</DataType>
</DataTypes>