From 343b11db66c30a4219ea0ffbd92b95577a0a7b8a Mon Sep 17 00:00:00 2001
From: inoussa <inoussa@8e941d3f-bd1b-0410-a28a-d453659cc2b4>
Date: Fri, 19 Oct 2007 15:30:20 +0000
Subject: [PATCH] wsdl parser : assume style=document binding if not specified

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@277 8e941d3f-bd1b-0410-a28a-d453659cc2b4
---
 wst/trunk/base_binary_formatter.pas           |   7 +
 wst/trunk/base_json_formatter.pas             | 511 ++++++++++++
 wst/trunk/base_service_intf.pas               |   1 +
 wst/trunk/base_soap_formatter.pas             |  19 +
 wst/trunk/base_xmlrpc_formatter.pas           |   7 +
 .../test_suite/files/no_binding_style.WSDL    |  38 +
 .../files/simpletypeNativeAlias.WSDL          |  21 +
 .../files/simpletypeNativeAlias.xsd           |   9 +
 wst/trunk/tests/test_suite/test_parsers.pas   |  74 ++
 .../tests/test_suite/testformatter_unit.pas   |  52 ++
 wst/trunk/tests/test_suite/wst_test_suite.lpi | 725 +++++++-----------
 wst/trunk/tests/test_suite/wst_test_suite.lpr |   2 +-
 wst/trunk/type_lib_edtr/typ_lib_edtr.lpi      | 553 ++++++-------
 wst/trunk/type_lib_edtr/typ_lib_edtr.lpr      |   2 +-
 .../type_lib_edtr/uwsttypelibraryedit.lfm     |  17 +-
 .../type_lib_edtr/uwsttypelibraryedit.lrs     | 506 ++++++------
 wst/trunk/ws_helper/parserutils.pas           |   4 +-
 wst/trunk/ws_helper/pascal_parser_intf.pas    |  14 +
 wst/trunk/ws_helper/wsdl_parser.pas           |   2 +
 wst/trunk/ws_helper/xsd_generator.pas         |  52 +-
 wst/trunk/ws_helper/xsd_parser.pas            |   5 +-
 21 files changed, 1618 insertions(+), 1003 deletions(-)
 create mode 100644 wst/trunk/base_json_formatter.pas
 create mode 100644 wst/trunk/tests/test_suite/files/no_binding_style.WSDL
 create mode 100644 wst/trunk/tests/test_suite/files/simpletypeNativeAlias.WSDL
 create mode 100644 wst/trunk/tests/test_suite/files/simpletypeNativeAlias.xsd

diff --git a/wst/trunk/base_binary_formatter.pas b/wst/trunk/base_binary_formatter.pas
index 31b600c16..3c49f4ace 100644
--- a/wst/trunk/base_binary_formatter.pas
+++ b/wst/trunk/base_binary_formatter.pas
@@ -300,6 +300,7 @@ type
       const AStyle     : TArrayStyle;
       const AItemName  : string
     ):Integer;
+    function GetScopeItemNames(const AReturnList : TStrings) : Integer;
     procedure EndScopeRead();
     
     procedure BeginHeader();
@@ -1121,6 +1122,12 @@ begin
   Result := StackTop().GetItemCount();
 end;
 
+function TBaseBinaryFormatter.GetScopeItemNames(const AReturnList : TStrings
+  ) : Integer;
+begin
+
+end;
+
 procedure TBaseBinaryFormatter.EndScopeRead();
 begin
   PopStack().Free();
diff --git a/wst/trunk/base_json_formatter.pas b/wst/trunk/base_json_formatter.pas
new file mode 100644
index 000000000..c8ab727ae
--- /dev/null
+++ b/wst/trunk/base_json_formatter.pas
@@ -0,0 +1,511 @@
+{
+    This file is part of the Web Service Toolkit
+    Copyright (c) 2007 by Inoussa OUEDRAOGO
+
+    This file is provide under modified LGPL licence
+    ( the files COPYING.modifiedLGPL and COPYING.LGPL).
+
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+}
+{$INCLUDE wst_global.inc}
+unit base_json_formatter;
+
+interface
+uses
+  Classes, SysUtils, TypInfo, Contnrs,
+  base_service_intf,
+  fpjson;
+
+type
+
+  TJsonInteger = Int64;
+
+  EJsonRpcException = class(EBaseRemoteException)
+  end;
+
+  { TStackItem }
+
+  TStackItem = class
+  private
+    FScopeObject: TJSONData;
+    FScopeType: TScopeType;
+  protected
+    function GetItemsCount() : Integer;virtual;
+  public
+    constructor Create(AScopeObject : TJSONData;AScopeType : TScopeType);
+    function FindNode(var ANodeName : string):TJSONData;virtual;abstract;
+    function CreateStringBuffer(
+      Const AName  : string;
+      const AValue : TJSONStringType
+    ) : TJSONData;virtual;abstract;
+    function CreateIntBuffer(
+      Const AName  : string;
+      const AValue : TJsonInteger
+    ) : TJSONData;virtual;abstract;
+    function CreateFloatBuffer(
+      Const AName  : string;
+      const AValue : TJSONFloat
+    ) : TJSONData;virtual;abstract;
+    function CreateBoolBuffer(
+      Const AName  : string;
+      const AValue : Boolean
+    ) : TJSONData;virtual;abstract;
+    function CreateObjectBuffer(const AName : string) : TJSONObject;virtual;abstract;
+    function CreateArrayBuffer(const AName : string) : TJSONArray;virtual;abstract;
+    property ScopeObject : TJSONData Read FScopeObject;
+    property ScopeType : TScopeType Read FScopeType;
+    property ItemsCount : Integer read GetItemsCount;
+  end;
+  
+  { TObjectStackItem }
+
+  TObjectStackItem = class(TStackItem)
+  protected
+    function GetDataObject() : TJSONObject;{$IFDEF USE_INLINE}inline;{$ENDIF}
+  public
+    constructor Create(AScopeObject : TJSONObject);
+    function FindNode(var ANodeName : string):TJSONData;override;
+    function CreateStringBuffer(
+      const AName  : string;
+      const AValue : TJSONStringType
+    ) : TJSONData;override;
+    function CreateIntBuffer(
+      Const AName  : string;
+      const AValue : TJsonInteger
+    ) : TJSONData;override;
+    function CreateFloatBuffer(
+      Const AName  : string;
+      const AValue : TJSONFloat
+    ) : TJSONData;override;
+    function CreateBoolBuffer(
+      Const AName  : string;
+      const AValue : Boolean
+    ) : TJSONData;override;
+    function CreateObjectBuffer(const AName : string) : TJSONObject;override;
+    function CreateArrayBuffer(const AName : string) : TJSONArray;override;
+  end;
+  
+  { TJsonRpcBaseFormatter }
+
+  TJsonRpcBaseFormatter = class(TSimpleFactoryItem,IFormatterBase)
+  private
+    FSerializationStyle : TSerializationStyle;
+    FStack : TObjectStack;
+  private
+    function GetCurrentScope : String;
+    function HasScope():Boolean;{$IFDEF USE_INLINE}inline;{$ENDIF}
+    procedure CheckScope();{$IFDEF USE_INLINE}inline;{$ENDIF}
+    procedure ClearStack();
+    function StackTop():TStackItem;{$IFDEF USE_INLINE}inline;{$ENDIF}
+    function PopStack():TStackItem;{$IFDEF USE_INLINE}inline;{$ENDIF}
+  protected
+    procedure PutInt64(
+      Const AName     : String;
+      Const ATypeInfo : PTypeInfo;
+      Const AData     : Int64
+    );{$IFDEF USE_INLINE}inline;{$ENDIF}
+  public
+    procedure SetSerializationStyle(const ASerializationStyle : TSerializationStyle);
+    function GetSerializationStyle():TSerializationStyle;
+    procedure Clear();
+
+    procedure BeginObject(
+      Const AName      : string;
+      Const ATypeInfo  : PTypeInfo
+    );
+    procedure BeginArray(
+      const AName         : string;
+      const ATypeInfo     : PTypeInfo;
+      const AItemTypeInfo : PTypeInfo;
+      const ABounds       : Array Of Integer;
+      const AStyle        : TArrayStyle
+    );
+    procedure NilCurrentScope();
+    function IsCurrentScopeNil():Boolean;
+    procedure EndScope();
+    procedure AddScopeAttribute(Const AName,AValue : string);
+    function BeginObjectRead(
+      var   AScopeName : string;
+      const ATypeInfo  : PTypeInfo
+    ) : Integer;
+    function BeginArrayRead(
+      var   AScopeName : string;
+      const ATypeInfo  : PTypeInfo;
+      const AStyle     : TArrayStyle;
+      const AItemName  : string
+    ):Integer;
+    function GetScopeItemNames(const AReturnList : TStrings) : Integer;
+    procedure EndScopeRead();
+    property CurrentScope : String Read GetCurrentScope;
+
+    procedure BeginHeader();
+    procedure EndHeader();
+
+    procedure Put(
+      Const AName     : String;
+      Const ATypeInfo : PTypeInfo;
+      Const AData
+    );
+    procedure PutScopeInnerValue(
+      const ATypeInfo : PTypeInfo;
+      const AData
+    );
+    procedure Get(
+      Const ATypeInfo : PTypeInfo;
+      Var   AName     : String;
+      Var   AData
+    );
+    procedure GetScopeInnerValue(
+      const ATypeInfo : PTypeInfo;
+      var   AData
+    );
+    function ReadBuffer(const AName : string) : string;
+
+    procedure SaveToStream(AStream : TStream);
+    procedure LoadFromStream(AStream : TStream);
+
+    // This procedures will raise exceptions!!!
+    procedure Error(Const AMsg:string);overload;
+    procedure Error(Const AMsg:string; Const AArgs : array of const);overload;
+  public
+    constructor Create();override;
+    destructor Destroy();override;
+  end;
+  
+  
+implementation
+
+{ TJsonRpcBaseFormatter }
+
+function TJsonRpcBaseFormatter.HasScope() : Boolean;
+begin
+  Result := FStack.AtLeast(1);
+end;
+
+procedure TJsonRpcBaseFormatter.CheckScope();
+begin
+  if not HasScope() then
+    Error('There is no scope.');
+end;
+
+procedure TJsonRpcBaseFormatter.ClearStack();
+var
+  i, c : Integer;
+begin
+  c := FStack.Count;
+  for I := 1 to c do
+    FStack.Pop().Free();
+end;
+
+function TJsonRpcBaseFormatter.StackTop() : TStackItem;
+begin
+  CheckScope();
+  Result := FStack.Peek() as TStackItem;
+end;
+
+function TJsonRpcBaseFormatter.PopStack() : TStackItem;
+begin
+  CheckScope();
+  Result := FStack.Pop() as TStackItem;
+end;
+
+procedure TJsonRpcBaseFormatter.PutInt64(
+  const AName : String;
+  const ATypeInfo : PTypeInfo;
+  const AData : Int64
+);
+begin
+  StackTop().CreateIntBuffer(AName,AData);
+end;
+
+procedure TJsonRpcBaseFormatter.SetSerializationStyle(const ASerializationStyle : TSerializationStyle);
+begin
+  FSerializationStyle := ASerializationStyle;
+end;
+
+function TJsonRpcBaseFormatter.GetSerializationStyle() : TSerializationStyle;
+begin
+  Result := FSerializationStyle;
+end;
+
+function TJsonRpcBaseFormatter.GetCurrentScope() : string;
+begin
+  CheckScope();
+  Result := '';
+end;
+
+procedure TJsonRpcBaseFormatter.Clear();
+begin
+  ClearStack();
+end;
+
+procedure TJsonRpcBaseFormatter.BeginObject(
+  const AName : string;
+  const ATypeInfo : PTypeInfo
+);
+var
+  elt : TJSONObject;
+begin
+  if HasScope() then
+    elt := StackTop().CreateObjectBuffer(AName)
+  else
+    elt := TJSONObject.Create();
+  FStack.Push(TObjectStackItem.Create(elt));
+end;
+
+procedure TJsonRpcBaseFormatter.BeginArray(const AName : string;
+  const ATypeInfo : PTypeInfo; const AItemTypeInfo : PTypeInfo;
+  const ABounds : array of Integer; const AStyle : TArrayStyle);
+begin
+
+end;
+
+procedure TJsonRpcBaseFormatter.NilCurrentScope();
+begin
+
+end;
+
+function TJsonRpcBaseFormatter.IsCurrentScopeNil() : Boolean;
+begin
+
+end;
+
+procedure TJsonRpcBaseFormatter.EndScope();
+begin
+
+end;
+
+procedure TJsonRpcBaseFormatter.AddScopeAttribute(const AName, AValue : string);
+begin
+
+end;
+
+function TJsonRpcBaseFormatter.BeginObjectRead(var AScopeName : string;
+  const ATypeInfo : PTypeInfo) : Integer;
+begin
+
+end;
+
+function TJsonRpcBaseFormatter.BeginArrayRead(var AScopeName : string;
+  const ATypeInfo : PTypeInfo; const AStyle : TArrayStyle;
+  const AItemName : string) : Integer;
+begin
+
+end;
+
+function TJsonRpcBaseFormatter.GetScopeItemNames(const AReturnList : TStrings
+  ) : Integer;
+begin
+
+end;
+
+procedure TJsonRpcBaseFormatter.EndScopeRead();
+begin
+
+end;
+
+procedure TJsonRpcBaseFormatter.BeginHeader();
+begin
+
+end;
+
+procedure TJsonRpcBaseFormatter.EndHeader();
+begin
+
+end;
+
+procedure TJsonRpcBaseFormatter.Put(
+  const AName : String;
+  const ATypeInfo : PTypeInfo;
+  const AData
+);
+begin
+
+end;
+
+procedure TJsonRpcBaseFormatter.PutScopeInnerValue(const ATypeInfo : PTypeInfo;
+  const AData);
+begin
+
+end;
+
+procedure TJsonRpcBaseFormatter.Get(const ATypeInfo : PTypeInfo;
+  var AName : String; var AData);
+begin
+
+end;
+
+procedure TJsonRpcBaseFormatter.GetScopeInnerValue(const ATypeInfo : PTypeInfo;
+  var AData);
+begin
+
+end;
+
+function TJsonRpcBaseFormatter.ReadBuffer(const AName : string) : string;
+begin
+
+end;
+
+procedure TJsonRpcBaseFormatter.SaveToStream(AStream : TStream);
+begin
+
+end;
+
+procedure TJsonRpcBaseFormatter.LoadFromStream(AStream : TStream);
+begin
+
+end;
+
+procedure TJsonRpcBaseFormatter.Error(const AMsg : string);
+begin
+  raise EJsonRpcException.Create(AMsg);
+end;
+
+procedure TJsonRpcBaseFormatter.Error(const AMsg : string; const AArgs : array of const);
+begin
+  raise EJsonRpcException.CreateFmt(AMsg,AArgs);
+end;
+
+constructor TJsonRpcBaseFormatter.Create();
+begin
+  inherited Create();
+  FStack := TObjectStack.Create();
+end;
+
+destructor TJsonRpcBaseFormatter.Destroy();
+begin
+  FStack.Free();
+  inherited Destroy();
+end;
+
+{ TStackItem }
+
+function TStackItem.GetItemsCount() : Integer;
+begin
+  Result := FScopeObject.Count;
+end;
+
+constructor TStackItem.Create(AScopeObject : TJSONData; AScopeType : TScopeType);
+begin
+  FScopeObject := AScopeObject;
+  FScopeType := AScopeType;
+end;
+
+{ TObjectStackItem }
+
+function TObjectStackItem.GetDataObject() : TJSONObject;
+begin
+  Result := TJSONObject(ScopeObject);
+end;
+
+constructor TObjectStackItem.Create(AScopeObject : TJSONObject);
+begin
+  inherited Create(AScopeObject,stObject);
+end;
+
+function TObjectStackItem.FindNode(var ANodeName : string) : TJSONData;
+begin
+  Result := GetDataObject().Elements[ANodeName];
+end;
+
+function TObjectStackItem.CreateStringBuffer(
+  const AName  : string;
+  const AValue : TJSONStringType
+) : TJSONData;
+var
+  locObj : TJSONObject;
+  i : PtrInt;
+begin
+  locObj := GetDataObject();
+  Result := locObj.Elements[AName];
+  if ( Result = nil ) then begin
+    i := locObj.Add(AName,AValue);
+    Result := locObj.Items[i];
+  end else begin
+    Result.AsString := AValue;
+  end;
+end;
+
+function TObjectStackItem.CreateIntBuffer(
+  const AName : string;
+  const AValue : TJsonInteger
+) : TJSONData;
+var
+  locObj : TJSONObject;
+  i : PtrInt;
+begin
+  locObj := GetDataObject();
+  Result := locObj.Elements[AName];
+  if ( Result = nil ) then begin
+    i := locObj.Add(AName,AValue);
+    Result := locObj.Items[i];
+  end else begin
+    Result.AsInteger := AValue;
+  end;
+end;
+
+function TObjectStackItem.CreateFloatBuffer(
+  const AName : string;
+  const AValue : TJSONFloat
+) : TJSONData;
+var
+  locObj : TJSONObject;
+  i : PtrInt;
+begin
+  locObj := GetDataObject();
+  Result := locObj.Elements[AName];
+  if ( Result = nil ) then begin
+    i := locObj.Add(AName,AValue);
+    Result := locObj.Items[i];
+  end else begin
+    Result.AsFloat := AValue;
+  end;
+end;
+
+function TObjectStackItem.CreateBoolBuffer(
+  const AName : string;
+  const AValue : Boolean
+) : TJSONData;
+var
+  locObj : TJSONObject;
+  i : PtrInt;
+begin
+  locObj := GetDataObject();
+  Result := locObj.Elements[AName];
+  if ( Result = nil ) then begin
+    i := locObj.Add(AName,AValue);
+    Result := locObj.Items[i];
+  end else begin
+    Result.AsBoolean := AValue;
+  end;
+end;
+
+function TObjectStackItem.CreateObjectBuffer(const AName : string) : TJSONObject;
+var
+  locObj : TJSONObject;
+begin
+  locObj := GetDataObject();
+  Result := locObj.Elements[AName] as TJSONObject;
+  if ( Result = nil ) then begin
+    Result := TJSONObject.Create();
+    locObj.Add(AName,Result);
+  end;
+end;
+
+function TObjectStackItem.CreateArrayBuffer(const AName : string) : TJSONArray;
+var
+  locObj : TJSONObject;
+begin
+  locObj := GetDataObject();
+  Result := locObj.Elements[AName] as TJSONArray;
+  if ( Result = nil ) then begin
+    Result := TJSONArray.Create();
+    locObj.Add(AName,Result);
+  end;
+end;
+
+end.
+
diff --git a/wst/trunk/base_service_intf.pas b/wst/trunk/base_service_intf.pas
index c784a2c8e..925adda69 100644
--- a/wst/trunk/base_service_intf.pas
+++ b/wst/trunk/base_service_intf.pas
@@ -162,6 +162,7 @@ type
       const AStyle     : TArrayStyle;
       const AItemName  : string
     ):Integer;
+    function GetScopeItemNames(const AReturnList : TStrings) : Integer;
     procedure EndScopeRead();
     property CurrentScope : String Read GetCurrentScope;
 
diff --git a/wst/trunk/base_soap_formatter.pas b/wst/trunk/base_soap_formatter.pas
index 403919aba..b6189ac43 100644
--- a/wst/trunk/base_soap_formatter.pas
+++ b/wst/trunk/base_soap_formatter.pas
@@ -314,6 +314,7 @@ type
       const AStyle     : TArrayStyle;
       const AItemName  : string
     ):Integer;
+    function GetScopeItemNames(const AReturnList : TStrings) : Integer;
     procedure EndScopeRead();
 
     procedure BeginHeader();
@@ -494,6 +495,11 @@ begin
   Result := InternalBeginScopeRead(AScopeName,ATypeInfo,stArray,AStyle,AItemName);
 end;
 
+function TSOAPBaseFormatter.GetScopeItemNames(const AReturnList : TStrings) : Integer;
+begin
+
+end;
+
 procedure TSOAPBaseFormatter.EndScopeRead();
 begin
   PopStack().Free();
@@ -1470,6 +1476,9 @@ Var
   dataBuffer : string;
   frmt : string;
   prcsn,i : Integer;
+  {strm : TStringStream;
+  locDoc : TwstXMLDocument;
+  locNode : TDOMNode;}
 begin
   CheckScope();
   Case ATypeInfo^.Kind Of
@@ -1563,6 +1572,16 @@ begin
           dataBuffer[i] := '.';
       end;
   end;
+  (*locDoc := nil;
+  strm := TStringStream.Create(dataBuffer);
+  try
+    ReadXMLFile(locDoc,strm);
+    locNode := locDoc.DocumentElement.CloneNode(True {$IFDEF FPC}, StackTop().ScopeObject.OwnerDocument{$ENDIF});
+    StackTop().ScopeObject.AppendChild(locNode);
+  finally
+    ReleaseDomNode(locDoc);
+    strm.Free();
+  end;*)
   StackTop().ScopeObject.AppendChild(FDoc.CreateTextNode(dataBuffer));
 end;
 
diff --git a/wst/trunk/base_xmlrpc_formatter.pas b/wst/trunk/base_xmlrpc_formatter.pas
index e415b4df7..e9894d016 100644
--- a/wst/trunk/base_xmlrpc_formatter.pas
+++ b/wst/trunk/base_xmlrpc_formatter.pas
@@ -315,6 +315,7 @@ type
       const AStyle     : TArrayStyle;
       const AItemName  : string
     ):Integer;
+    function GetScopeItemNames(const AReturnList : TStrings) : Integer;
     procedure EndScopeRead();
 
     procedure BeginHeader();
@@ -563,6 +564,12 @@ begin
   Result := InternalBeginScopeRead(AScopeName,ATypeInfo,stArray,AStyle,AItemName);
 end;
 
+function TXmlRpcBaseFormatter.GetScopeItemNames(const AReturnList : TStrings
+  ) : Integer;
+begin
+
+end;
+
 procedure TXmlRpcBaseFormatter.EndScopeRead();
 begin
   PopStack().Free();
diff --git a/wst/trunk/tests/test_suite/files/no_binding_style.WSDL b/wst/trunk/tests/test_suite/files/no_binding_style.WSDL
new file mode 100644
index 000000000..509af5f1c
--- /dev/null
+++ b/wst/trunk/tests/test_suite/files/no_binding_style.WSDL
@@ -0,0 +1,38 @@
+<?xml version="1.0"?>
+<definitions name="library1" xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:tns="library1" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" targetNamespace="library1">
+  <types><xsd:schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:tns="library1" targetNamespace="library1"/></types>
+  <message name="sampleMethodA"/>
+  <message name="sampleMethodAResponse"/>
+  <message name="SampleMethodB">
+    <part name="A" type="xsd:string"/>
+    <part name="B" type="xsd:string"/>
+  </message>
+  <message name="SampleMethodBResponse"><part name="result" type="xsd:string"/></message>
+  <portType name="ISampleService">
+    <document><GUID value="{68678930-3C52-40D7-A8F8-24F96560FB3A}"/></document>
+    <operation name="sampleMethodA">
+      <input message="tns:sampleMethodA"/>
+      <output message="tns:sampleMethodAResponse"/>
+    </operation>
+    <operation name="SampleMethodB">
+      <input message="tns:SampleMethodB"/>
+      <output message="tns:SampleMethodBResponse"/>
+    </operation>
+  </portType>
+  <binding name="ISampleServiceBinding" type="tns:ISampleService">
+    <soap:binding transport="http://schemas.xmlsoap.org/soap/http"/>
+    <operation name="sampleMethodA">
+      <soap:operation soapAction=""/>
+      <input><soap:body use="literal" namespace="library1"/></input>
+      <output><soap:body use="literal" namespace="library1"/></output>
+    </operation>
+    <operation name="SampleMethodB">
+      <soap:operation soapAction=""/>
+      <input><soap:body use="literal" namespace="library1"/></input>
+      <output><soap:body use="literal" namespace="library1"/></output>
+    </operation>
+  </binding>
+  <service name="ISampleService">
+    <port name="ISampleServicePort" binding="tns:ISampleServiceBinding"><soap:address location=""/></port>
+  </service>
+</definitions>
diff --git a/wst/trunk/tests/test_suite/files/simpletypeNativeAlias.WSDL b/wst/trunk/tests/test_suite/files/simpletypeNativeAlias.WSDL
new file mode 100644
index 000000000..a9287af74
--- /dev/null
+++ b/wst/trunk/tests/test_suite/files/simpletypeNativeAlias.WSDL
@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+<definitions name="wst_test" 
+   xmlns="http://schemas.xmlsoap.org/wsdl/" 
+   xmlns:tns="library1" 
+   xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
+   xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" 
+   targetNamespace="urn:wst-test">
+
+  <types>
+     <xsd:schema xmlns:n="urn:wst-test" 
+      xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
+      targetNamespace="urn:wst-test">
+      
+        <xsd:element name="AliasString" type="xsd:string"/>
+        <xsd:element name="AliasInt" type="xsd:int"/>
+      
+     </xsd:schema>
+  </types>
+  
+
+</definitions>
diff --git a/wst/trunk/tests/test_suite/files/simpletypeNativeAlias.xsd b/wst/trunk/tests/test_suite/files/simpletypeNativeAlias.xsd
new file mode 100644
index 000000000..029badef7
--- /dev/null
+++ b/wst/trunk/tests/test_suite/files/simpletypeNativeAlias.xsd
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+ <xsd:schema xmlns:n="urn:wst-test" 
+  xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
+  targetNamespace="urn:wst-test">
+  
+  <xsd:element name="AliasString" type="xsd:string"/>
+  <xsd:element name="AliasInt" type="xsd:int"/>
+  
+ </xsd:schema>
diff --git a/wst/trunk/tests/test_suite/test_parsers.pas b/wst/trunk/tests/test_suite/test_parsers.pas
index 933e9ed64..5a1a25004 100644
--- a/wst/trunk/tests/test_suite/test_parsers.pas
+++ b/wst/trunk/tests/test_suite/test_parsers.pas
@@ -32,6 +32,7 @@ type
     function LoadEmptySchema() : TwstPasTreeContainer;virtual;abstract;
     function LoadSimpleType_Enum_Schema() : TwstPasTreeContainer;virtual;abstract;
     function LoadSimpleType_Enum_Embedded_Schema() : TwstPasTreeContainer;virtual;abstract;
+    function LoadSimpleType_AliasToNativeType_Schema() : TwstPasTreeContainer;virtual;abstract;
     
     function LoadComplexType_Class_Schema() : TwstPasTreeContainer;virtual;abstract;
     function LoadComplexType_Class_Embedded_Schema() : TwstPasTreeContainer;virtual;abstract;
@@ -46,6 +47,7 @@ type
 
     procedure SimpleType_Enum();
     procedure SimpleType_Enum_Embedded();
+    procedure SimpleType_AliasToNativeType();
     
     procedure ComplexType_Class();
     procedure ComplexType_Class_Embedded();
@@ -67,6 +69,7 @@ type
     
     function LoadSimpleType_Enum_Schema() : TwstPasTreeContainer;override;
     function LoadSimpleType_Enum_Embedded_Schema() : TwstPasTreeContainer;override;
+    function LoadSimpleType_AliasToNativeType_Schema() : TwstPasTreeContainer;override;
 
     function LoadComplexType_Class_Schema() : TwstPasTreeContainer;override;
     function LoadComplexType_Class_Embedded_Schema() : TwstPasTreeContainer;override;
@@ -88,6 +91,7 @@ type
 
     function LoadSimpleType_Enum_Schema() : TwstPasTreeContainer;override;
     function LoadSimpleType_Enum_Embedded_Schema() : TwstPasTreeContainer;override;
+    function LoadSimpleType_AliasToNativeType_Schema() : TwstPasTreeContainer;override;
 
     function LoadComplexType_Class_Schema() : TwstPasTreeContainer;override;
     function LoadComplexType_Class_Embedded_Schema() : TwstPasTreeContainer;override;
@@ -97,6 +101,8 @@ type
     
     function LoadComplexType_ArraySequence_Schema() : TwstPasTreeContainer;override;
     function LoadComplexType_ArraySequence_Embedded_Schema() : TwstPasTreeContainer;override;
+  published
+    procedure no_binding_style();
   end;
   
 implementation
@@ -127,8 +133,11 @@ const
   x_enumSampleType        = 'EnumSampleType';
     x_enumSampleLIST_COUNT = 7;
     x_enumSampleLIST      : array[0..( x_enumSampleLIST_COUNT - 1 )] of string = ( 'esOne', 'esTwo', 'esThree', 'begin', 'finally', 'True', 'False' );
+  x_simpleTypeAliasString = 'AliasString';
+  x_simpleTypeAliasInt    = 'AliasInt';
   x_simpleType            = 'simpletype';
   x_simpleTypeEmbedded    = 'simpletype_embedded';
+  x_simpletypeNativeAlias = 'simpletypeNativeAlias';
 
   x_targetNamespace       = 'urn:wst-test';
 
@@ -253,6 +262,42 @@ begin
     end;
 end;
 
+procedure TTest_CustomXsdParser.SimpleType_AliasToNativeType();
+var
+  tr : TwstPasTreeContainer;
+  mdl : TPasModule;
+  ls : TList;
+  elt : TPasElement;
+  aliasType : TPasAliasType;
+  i : Integer;
+begin
+  tr := LoadSimpleType_AliasToNativeType_Schema();
+
+  mdl := tr.FindModule(x_targetNamespace);
+  CheckNotNull(mdl);
+  CheckEquals(x_simpletypeNativeAlias,mdl.Name);
+  CheckEquals(x_targetNamespace,tr.GetExternalName(mdl));
+  ls := mdl.InterfaceSection.Declarations;
+  CheckEquals(2,ls.Count);
+  elt := tr.FindElement(x_simpleTypeAliasString);
+    CheckNotNull(elt,x_simpleTypeAliasString);
+    CheckEquals(x_simpleTypeAliasString,elt.Name);
+    CheckEquals(x_simpleTypeAliasString,tr.GetExternalName(elt));
+    CheckIs(elt,TPasAliasType);
+    aliasType := elt as TPasAliasType;
+    CheckNotNull(aliasType.DestType);
+    Check(tr.SameName(aliasType.DestType,'string'));
+
+  elt := tr.FindElement(x_simpleTypeAliasInt);
+    CheckNotNull(elt,x_simpleTypeAliasInt);
+    CheckEquals(x_simpleTypeAliasInt,elt.Name);
+    CheckEquals(x_simpleTypeAliasInt,tr.GetExternalName(elt));
+    CheckIs(elt,TPasAliasType);
+    aliasType := elt as TPasAliasType;
+    CheckNotNull(aliasType.DestType);
+    Check(tr.SameName(aliasType.DestType,'int'));
+end;
+
 type
   TPropertyType = ( ptField, ptAttribute );
 const
@@ -890,6 +935,11 @@ begin
   Result := ParseDoc(x_simpleTypeEmbedded);
 end;
 
+function TTest_XsdParser.LoadSimpleType_AliasToNativeType_Schema() : TwstPasTreeContainer;
+begin
+  Result := ParseDoc(x_simpletypeNativeAlias);
+end;
+
 function TTest_XsdParser.LoadComplexType_Class_Schema(): TwstPasTreeContainer;
 begin
   Result := ParseDoc(x_complexType_class);
@@ -958,6 +1008,11 @@ begin
   Result := ParseDoc(x_simpleTypeEmbedded);
 end;
 
+function TTest_WsdlParser.LoadSimpleType_AliasToNativeType_Schema() : TwstPasTreeContainer;
+begin
+  Result := ParseDoc(x_simpletypeNativeAlias);
+end;
+
 function TTest_WsdlParser.LoadComplexType_Class_Schema(): TwstPasTreeContainer;
 begin
   Result := ParseDoc(x_complexType_class);
@@ -988,6 +1043,25 @@ begin
   Result := ParseDoc(x_complexType_array_sequence_embedded);
 end;
 
+procedure TTest_WsdlParser.no_binding_style();
+var
+  symTable : TwstPasTreeContainer;
+  elt : TPasElement;
+  intf : TPasClassType;
+begin
+  symTable := ParseDoc('no_binding_style');
+  try
+    elt := symTable.FindElement('ISampleService');
+    CheckNotNull(elt);
+    CheckIs(elt,TPasClassType);
+    intf := elt as TPasClassType;
+    Check(intf.ObjKind = okInterface);
+    CheckEquals(2,GetElementCount(intf.Members,TPasProcedure));
+  finally
+    symTable.Free();
+  end;
+end;
+
 initialization
   RegisterTest('XSD parser',TTest_XsdParser.Suite);
   RegisterTest('WSDL parser',TTest_WsdlParser.Suite);
diff --git a/wst/trunk/tests/test_suite/testformatter_unit.pas b/wst/trunk/tests/test_suite/testformatter_unit.pas
index e10ae12a4..1544341ce 100644
--- a/wst/trunk/tests/test_suite/testformatter_unit.pas
+++ b/wst/trunk/tests/test_suite/testformatter_unit.pas
@@ -378,6 +378,8 @@ type
     
     procedure Test_Record_simple();
     procedure Test_Record_nested();
+    
+    procedure test_GetScopeItemNames();
   end;
 
   { TTestBinaryFormatter }
@@ -2708,6 +2710,56 @@ begin
   end;
 end;
 
+procedure TTestFormatter.test_GetScopeItemNames();
+Var
+  f : IFormatterBase;
+  s : TMemoryStream;
+  a, b : TClass_A;
+  x : string;
+  ls : TStringList;
+begin
+  ls := nil;
+  s := Nil;
+  b := nil;
+  a := TClass_A.Create();
+  try
+    a.Val_Bool := False;
+    a.Val_Enum := teThree;
+    a.Val_String := '123';
+    a.Val_32S := 55;
+    b := TClass_A.Create();
+    
+    f := CreateFormatter(TypeInfo(TClass_A));
+
+    f.BeginObject('Root',TypeInfo(TClass_A));
+      f.Put('a',TypeInfo(TClass_A),a);
+      f.Put('b',TypeInfo(TClass_A),b);
+    f.EndScope();
+
+    s := TMemoryStream.Create();
+    f.SaveToStream(s);
+    FreeAndNil(a);
+
+    ls := TStringList.Create();
+    f := CreateFormatter(TypeInfo(TClass_A));
+    s.Position := 0;
+    f.LoadFromStream(s);
+    x := 'Root';
+    f.BeginObjectRead(x,TypeInfo(TClass_A));
+      CheckEquals(0, f.GetScopeItemNames(ls), 'GetScopeItemNames.Count()');
+      Check( ls.IndexOf('Val_Bool') >= 0 );
+      Check( ls.IndexOf('Val_Enum') >= 0 );
+      Check( ls.IndexOf('Val_String') >= 0 );
+      Check( ls.IndexOf('Val_32S') >= 0 );
+    f.EndScopeRead();
+  finally
+    ls.Free();
+    b.Free();;
+    a.Free();
+    s.Free();
+  end;
+end;
+
 
 { TTestBinaryFormatter }
 
diff --git a/wst/trunk/tests/test_suite/wst_test_suite.lpi b/wst/trunk/tests/test_suite/wst_test_suite.lpi
index 510c153f0..f2814f23a 100644
--- a/wst/trunk/tests/test_suite/wst_test_suite.lpi
+++ b/wst/trunk/tests/test_suite/wst_test_suite.lpi
@@ -7,7 +7,7 @@
       <MainUnit Value="0"/>
       <IconPath Value="./"/>
       <TargetFileExt Value=".exe"/>
-      <ActiveEditorIndexAtStart Value="4"/>
+      <ActiveEditorIndexAtStart Value="1"/>
     </General>
     <PublishOptions>
       <Version Value="2"/>
@@ -27,7 +27,7 @@
         <PackageName Value="FPCUnitTestRunner"/>
       </Item1>
     </RequiredPackages>
-    <Units Count="84">
+    <Units Count="72">
       <Unit0>
         <Filename Value="wst_test_suite.lpr"/>
         <IsPartOfProject Value="True"/>
@@ -40,12 +40,12 @@
         <Filename Value="testformatter_unit.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="testformatter_unit"/>
-        <CursorPos X="33" Y="525"/>
-        <TopLine Value="503"/>
+        <CursorPos X="57" Y="195"/>
+        <TopLine Value="181"/>
         <EditorIndex Value="0"/>
         <UsageCount Value="200"/>
         <Bookmarks Count="1">
-          <Item0 X="17" Y="1058" ID="3"/>
+          <Item0 X="17" Y="1060" ID="3"/>
         </Bookmarks>
         <Loaded Value="True"/>
       </Unit1>
@@ -69,29 +69,35 @@
         <Filename Value="..\..\base_binary_formatter.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="base_binary_formatter"/>
-        <CursorPos X="42" Y="219"/>
-        <TopLine Value="211"/>
+        <CursorPos X="3" Y="1358"/>
+        <TopLine Value="1346"/>
+        <EditorIndex Value="14"/>
         <UsageCount Value="200"/>
+        <Loaded Value="True"/>
       </Unit4>
       <Unit5>
         <Filename Value="..\..\base_service_intf.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="base_service_intf"/>
-        <CursorPos X="61" Y="4557"/>
-        <TopLine Value="4538"/>
+        <CursorPos X="3" Y="152"/>
+        <TopLine Value="152"/>
+        <EditorIndex Value="13"/>
         <UsageCount Value="200"/>
         <Bookmarks Count="2">
-          <Item0 X="33" Y="1135" ID="0"/>
-          <Item1 X="5" Y="1189" ID="1"/>
+          <Item0 X="33" Y="1136" ID="0"/>
+          <Item1 X="5" Y="1190" ID="1"/>
         </Bookmarks>
+        <Loaded Value="True"/>
       </Unit5>
       <Unit6>
         <Filename Value="..\..\base_soap_formatter.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="base_soap_formatter"/>
-        <CursorPos X="54" Y="356"/>
-        <TopLine Value="337"/>
+        <CursorPos X="92" Y="1568"/>
+        <TopLine Value="1561"/>
+        <EditorIndex Value="1"/>
         <UsageCount Value="200"/>
+        <Loaded Value="True"/>
       </Unit6>
       <Unit7>
         <Filename Value="..\..\binary_formatter.pas"/>
@@ -161,301 +167,198 @@
         <UnitName Value="metadata_wsdl"/>
         <CursorPos X="40" Y="836"/>
         <TopLine Value="828"/>
+        <EditorIndex Value="3"/>
         <UsageCount Value="206"/>
+        <Loaded Value="True"/>
       </Unit14>
       <Unit15>
         <Filename Value="D:\Lazarus\fpcsrc\fcl\xml\dom.pp"/>
         <UnitName Value="DOM"/>
         <CursorPos X="15" Y="429"/>
         <TopLine Value="413"/>
-        <UsageCount Value="8"/>
+        <UsageCount Value="3"/>
       </Unit15>
       <Unit16>
-        <Filename Value="D:\lazarusClean\fpc\2.0.4\source\rtl\objpas\sysutils\sysutilh.inc"/>
-        <CursorPos X="13" Y="235"/>
-        <TopLine Value="215"/>
-        <UsageCount Value="2"/>
-      </Unit16>
-      <Unit17>
         <Filename Value="..\..\server_service_intf.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="server_service_intf"/>
         <CursorPos X="25" Y="14"/>
         <TopLine Value="97"/>
         <UsageCount Value="203"/>
-      </Unit17>
-      <Unit18>
+      </Unit16>
+      <Unit17>
         <Filename Value="..\..\service_intf.pas"/>
         <UnitName Value="service_intf"/>
-        <CursorPos X="15" Y="22"/>
-        <TopLine Value="10"/>
-        <UsageCount Value="22"/>
-      </Unit18>
-      <Unit19>
-        <Filename Value="D:\lazarusClean\fpc\2.0.4\source\rtl\objpas\classes\classesh.inc"/>
-        <CursorPos X="3" Y="316"/>
-        <TopLine Value="304"/>
-        <UsageCount Value="2"/>
-      </Unit19>
-      <Unit20>
-        <Filename Value="D:\lazarusClean\fpc\2.0.4\source\rtl\objpas\classes\lists.inc"/>
-        <CursorPos X="3" Y="407"/>
-        <TopLine Value="404"/>
-        <UsageCount Value="2"/>
-      </Unit20>
-      <Unit21>
-        <Filename Value="D:\lazarusClean\fpc\2.0.4\source\fcl\inc\contnrs.pp"/>
-        <UnitName Value="contnrs"/>
-        <CursorPos X="3" Y="474"/>
-        <TopLine Value="471"/>
-        <UsageCount Value="2"/>
-      </Unit21>
-      <Unit22>
-        <Filename Value="D:\lazarusClean\fpc\2.0.4\source\rtl\inc\objpash.inc"/>
-        <CursorPos X="27" Y="121"/>
-        <TopLine Value="104"/>
-        <UsageCount Value="2"/>
-      </Unit22>
-      <Unit23>
-        <Filename Value="D:\lazarusClean\fpc\2.0.4\source\rtl\inc\objpas.inc"/>
-        <CursorPos X="9" Y="166"/>
-        <TopLine Value="142"/>
-        <UsageCount Value="2"/>
-      </Unit23>
-      <Unit24>
-        <Filename Value="D:\Lazarus\components\fpcunit\guitestrunner.pas"/>
-        <ComponentName Value="GUITestRunner"/>
-        <HasResources Value="True"/>
-        <UnitName Value="GuiTestRunner"/>
-        <CursorPos X="34" Y="32"/>
-        <TopLine Value="25"/>
-        <UsageCount Value="2"/>
-      </Unit24>
-      <Unit25>
+        <CursorPos X="1" Y="1"/>
+        <TopLine Value="1"/>
+        <UsageCount Value="17"/>
+      </Unit17>
+      <Unit18>
         <Filename Value="..\..\imp_utils.pas"/>
         <UnitName Value="imp_utils"/>
         <CursorPos X="1" Y="105"/>
         <TopLine Value="90"/>
-        <UsageCount Value="14"/>
-      </Unit25>
-      <Unit26>
+        <UsageCount Value="9"/>
+      </Unit18>
+      <Unit19>
         <Filename Value="..\..\..\..\..\lazarusClean\fpc\2.0.4\source\fcl\xml\xmlread.pp"/>
         <UnitName Value="XMLRead"/>
         <CursorPos X="43" Y="13"/>
         <TopLine Value="1"/>
-        <UsageCount Value="8"/>
-      </Unit26>
-      <Unit27>
+        <UsageCount Value="3"/>
+      </Unit19>
+      <Unit20>
         <Filename Value="test_parserdef.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="test_parserdef"/>
         <CursorPos X="93" Y="76"/>
         <TopLine Value="11"/>
         <UsageCount Value="200"/>
+      </Unit20>
+      <Unit21>
+        <Filename Value="..\..\wst.inc"/>
+        <CursorPos X="1" Y="1"/>
+        <TopLine Value="1"/>
+        <UsageCount Value="10"/>
+      </Unit21>
+      <Unit22>
+        <Filename Value="..\test_fpc\interface_problem\interface_problem.pas"/>
+        <UnitName Value="interface_problem"/>
+        <CursorPos X="1" Y="10"/>
+        <TopLine Value="1"/>
+        <UsageCount Value="10"/>
+      </Unit22>
+      <Unit23>
+        <Filename Value="..\..\base_xmlrpc_formatter.pas"/>
+        <IsPartOfProject Value="True"/>
+        <UnitName Value="base_xmlrpc_formatter"/>
+        <CursorPos X="3" Y="1242"/>
+        <TopLine Value="1224"/>
+        <EditorIndex Value="10"/>
+        <UsageCount Value="200"/>
+        <Loaded Value="True"/>
+      </Unit23>
+      <Unit24>
+        <Filename Value="..\..\ws_helper\pscanner.pp"/>
+        <UnitName Value="PScanner"/>
+        <CursorPos X="19" Y="505"/>
+        <TopLine Value="491"/>
+        <UsageCount Value="7"/>
+      </Unit24>
+      <Unit25>
+        <Filename Value="..\..\ws_helper\pascal_parser_intf.pas"/>
+        <UnitName Value="pascal_parser_intf"/>
+        <CursorPos X="3" Y="174"/>
+        <TopLine Value="165"/>
+        <EditorIndex Value="9"/>
+        <UsageCount Value="45"/>
+        <Loaded Value="True"/>
+      </Unit25>
+      <Unit26>
+        <Filename Value="..\..\ws_helper\pastree.pp"/>
+        <UnitName Value="PasTree"/>
+        <CursorPos X="3" Y="75"/>
+        <TopLine Value="68"/>
+        <UsageCount Value="7"/>
+      </Unit26>
+      <Unit27>
+        <Filename Value="..\..\..\..\..\..\lazarus_23_215\fpc\2.1.5\source\packages\fcl-xml\src\dom.pp"/>
+        <UnitName Value="DOM"/>
+        <CursorPos X="38" Y="225"/>
+        <TopLine Value="203"/>
+        <UsageCount Value="6"/>
       </Unit27>
       <Unit28>
-        <Filename Value="..\..\wst.inc"/>
+        <Filename Value="..\..\..\..\..\..\lazarus_23_215XX\fpc\source\packages\fcl-xml\src\dom.pp"/>
+        <UnitName Value="DOM"/>
         <CursorPos X="1" Y="1"/>
         <TopLine Value="1"/>
         <UsageCount Value="5"/>
       </Unit28>
       <Unit29>
-        <Filename Value="..\test_fpc\interface_problem\interface_problem.pas"/>
-        <UnitName Value="interface_problem"/>
-        <CursorPos X="1" Y="10"/>
-        <TopLine Value="1"/>
-        <UsageCount Value="5"/>
-      </Unit29>
-      <Unit30>
-        <Filename Value="..\..\base_xmlrpc_formatter.pas"/>
-        <IsPartOfProject Value="True"/>
-        <UnitName Value="base_xmlrpc_formatter"/>
-        <CursorPos X="70" Y="354"/>
-        <TopLine Value="325"/>
-        <UsageCount Value="200"/>
-      </Unit30>
-      <Unit31>
-        <Filename Value="..\..\ws_helper\pscanner.pp"/>
-        <UnitName Value="PScanner"/>
-        <CursorPos X="19" Y="505"/>
-        <TopLine Value="491"/>
-        <UsageCount Value="12"/>
-      </Unit31>
-      <Unit32>
-        <Filename Value="..\..\ws_helper\pascal_parser_intf.pas"/>
-        <UnitName Value="pascal_parser_intf"/>
-        <CursorPos X="85" Y="149"/>
-        <TopLine Value="53"/>
-        <EditorIndex Value="5"/>
-        <UsageCount Value="50"/>
-        <Loaded Value="True"/>
-      </Unit32>
-      <Unit33>
-        <Filename Value="..\..\ws_helper\pastree.pp"/>
-        <UnitName Value="PasTree"/>
-        <CursorPos X="3" Y="75"/>
-        <TopLine Value="68"/>
-        <UsageCount Value="12"/>
-      </Unit33>
-      <Unit34>
-        <Filename Value="..\..\..\..\..\..\lazarus_23_215\fpc\2.1.5\source\packages\fcl-xml\src\dom.pp"/>
-        <UnitName Value="DOM"/>
-        <CursorPos X="38" Y="225"/>
-        <TopLine Value="203"/>
-        <UsageCount Value="11"/>
-      </Unit34>
-      <Unit35>
-        <Filename Value="..\..\wst_rtti_filter\cursor_intf.pas"/>
-        <UnitName Value="cursor_intf"/>
-        <CursorPos X="3" Y="75"/>
-        <TopLine Value="70"/>
-        <UsageCount Value="3"/>
-      </Unit35>
-      <Unit36>
-        <Filename Value="..\..\wst_rtti_filter\dom_cursors.pas"/>
-        <UnitName Value="dom_cursors"/>
-        <CursorPos X="3" Y="182"/>
-        <TopLine Value="180"/>
-        <UsageCount Value="3"/>
-      </Unit36>
-      <Unit37>
-        <Filename Value="..\..\..\..\..\..\lazarus_23_215\fpc\2.1.5\source\packages\fcl-fpcunit\src\fpcunit.pp"/>
-        <UnitName Value="fpcunit"/>
-        <CursorPos X="1" Y="446"/>
-        <TopLine Value="434"/>
-        <UsageCount Value="1"/>
-      </Unit37>
-      <Unit38>
-        <Filename Value="..\..\semaphore.pas"/>
-        <UnitName Value="semaphore"/>
-        <CursorPos X="3" Y="30"/>
-        <TopLine Value="23"/>
-        <UsageCount Value="2"/>
-      </Unit38>
-      <Unit39>
-        <Filename Value="..\..\..\..\..\..\lazarus_23_215XX\fpc\source\packages\fcl-xml\src\dom.pp"/>
-        <UnitName Value="DOM"/>
-        <CursorPos X="1" Y="1"/>
-        <TopLine Value="1"/>
-        <UsageCount Value="10"/>
-      </Unit39>
-      <Unit40>
-        <Filename Value="..\..\..\..\..\..\lazarus_23_215XX\fpc\source\rtl\win32\system.pp"/>
-        <UnitName Value="System"/>
-        <CursorPos X="22" Y="33"/>
-        <TopLine Value="18"/>
-        <UsageCount Value="1"/>
-      </Unit40>
-      <Unit41>
         <Filename Value="..\..\..\..\..\..\lazarus_23_215XX\fpc\source\packages\fcl-base\src\inc\contnrs.pp"/>
         <UnitName Value="contnrs"/>
-        <CursorPos X="3" Y="114"/>
-        <TopLine Value="101"/>
-        <UsageCount Value="9"/>
-      </Unit41>
-      <Unit42>
+        <CursorPos X="3" Y="1376"/>
+        <TopLine Value="1370"/>
+        <UsageCount Value="6"/>
+      </Unit29>
+      <Unit30>
         <Filename Value="..\..\wst_delphi.inc"/>
         <CursorPos X="1" Y="1"/>
         <TopLine Value="1"/>
-        <UsageCount Value="5"/>
-      </Unit42>
-      <Unit43>
+        <UsageCount Value="10"/>
+      </Unit30>
+      <Unit31>
         <Filename Value="..\..\..\..\..\..\lazarus_23_215XX\fpc\source\rtl\inc\objpash.inc"/>
-        <CursorPos X="26" Y="173"/>
-        <TopLine Value="156"/>
-        <UsageCount Value="5"/>
-      </Unit43>
-      <Unit44>
+        <CursorPos X="8" Y="142"/>
+        <TopLine Value="197"/>
+        <UsageCount Value="6"/>
+      </Unit31>
+      <Unit32>
         <Filename Value="..\..\..\..\..\..\lazarus_23_215XX\fpc\source\rtl\inc\objpas.inc"/>
         <CursorPos X="11" Y="333"/>
         <TopLine Value="375"/>
-        <UsageCount Value="5"/>
-      </Unit44>
-      <Unit45>
+        <UsageCount Value="10"/>
+      </Unit32>
+      <Unit33>
         <Filename Value="..\..\wst_fpc_xml.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="wst_fpc_xml"/>
         <CursorPos X="65" Y="85"/>
         <TopLine Value="56"/>
-        <UsageCount Value="149"/>
-      </Unit45>
-      <Unit46>
+        <UsageCount Value="201"/>
+      </Unit33>
+      <Unit34>
         <Filename Value="..\..\wst_global.inc"/>
         <CursorPos X="3" Y="4"/>
         <TopLine Value="1"/>
-        <UsageCount Value="6"/>
-      </Unit46>
-      <Unit47>
+        <UsageCount Value="1"/>
+      </Unit34>
+      <Unit35>
         <Filename Value="test_utilities.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="test_utilities"/>
         <CursorPos X="40" Y="64"/>
         <TopLine Value="58"/>
-        <EditorIndex Value="1"/>
-        <UsageCount Value="140"/>
+        <EditorIndex Value="15"/>
+        <UsageCount Value="193"/>
         <Loaded Value="True"/>
-      </Unit47>
-      <Unit48>
+      </Unit35>
+      <Unit36>
         <Filename Value="..\..\..\..\..\..\lazarus_23_215XX\fpc\source\packages\fcl-fpcunit\src\fpcunit.pp"/>
         <UnitName Value="fpcunit"/>
         <CursorPos X="66" Y="231"/>
         <TopLine Value="231"/>
-        <UsageCount Value="8"/>
-      </Unit48>
-      <Unit49>
+        <UsageCount Value="3"/>
+      </Unit36>
+      <Unit37>
         <Filename Value="..\..\..\..\..\..\lazarus_23_215XX\fpc\source\packages\fcl-fpcunit\src\testregistry.pp"/>
         <UnitName Value="testregistry"/>
         <CursorPos X="11" Y="32"/>
         <TopLine Value="17"/>
-        <UsageCount Value="10"/>
-      </Unit49>
-      <Unit50>
-        <Filename Value="..\..\..\..\..\..\lazarus_23_215XX\fpc\source\packages\fcl-fpcunit\src\testdecorator.pp"/>
-        <UnitName Value="testdecorator"/>
-        <CursorPos X="3" Y="30"/>
-        <TopLine Value="1"/>
-        <UsageCount Value="2"/>
-      </Unit50>
-      <Unit51>
+        <UsageCount Value="5"/>
+      </Unit37>
+      <Unit38>
         <Filename Value="..\..\..\..\..\..\lazarus_23_215XX\fpc\source\packages\fcl-fpcunit\src\DUnitCompatibleInterface.inc"/>
         <CursorPos X="21" Y="9"/>
         <TopLine Value="1"/>
-        <UsageCount Value="7"/>
-      </Unit51>
-      <Unit52>
+        <UsageCount Value="2"/>
+      </Unit38>
+      <Unit39>
         <Filename Value="..\..\..\..\..\..\lazarus_23_215XX\fpc\source\rtl\objpas\typinfo.pp"/>
         <UnitName Value="typinfo"/>
         <CursorPos X="53" Y="41"/>
         <TopLine Value="37"/>
-        <UsageCount Value="5"/>
-      </Unit52>
-      <Unit53>
-        <Filename Value="..\..\..\..\..\..\lazarus_23_215XX\fpc\source\rtl\objpas\sysutils\sysstrh.inc"/>
-        <CursorPos X="89" Y="122"/>
-        <TopLine Value="106"/>
-        <UsageCount Value="4"/>
-      </Unit53>
-      <Unit54>
-        <Filename Value="..\..\..\..\..\..\lazarus_23_215XX\fpc\source\rtl\objpas\sysutils\sysinth.inc"/>
-        <CursorPos X="24" Y="63"/>
-        <TopLine Value="46"/>
-        <UsageCount Value="4"/>
-      </Unit54>
-      <Unit55>
+        <UsageCount Value="10"/>
+      </Unit39>
+      <Unit40>
         <Filename Value="..\..\ws_helper\wsdl2pas_imp.pas"/>
         <UnitName Value="wsdl2pas_imp"/>
         <CursorPos X="1" Y="1"/>
         <TopLine Value="31"/>
-        <UsageCount Value="5"/>
-      </Unit55>
-      <Unit56>
-        <Filename Value="..\..\..\..\..\..\lazarus2204\fpc\2.0.4\source\fcl\xml\dom.pp"/>
-        <UnitName Value="DOM"/>
-        <CursorPos X="3" Y="196"/>
-        <TopLine Value="191"/>
-        <UsageCount Value="3"/>
-      </Unit56>
-      <Unit57>
+        <UsageCount Value="10"/>
+      </Unit40>
+      <Unit41>
         <Filename Value="..\..\type_lib_edtr\umoduleedit.pas"/>
         <ComponentName Value="fModuleEdit"/>
         <HasResources Value="True"/>
@@ -463,9 +366,9 @@
         <UnitName Value="umoduleedit"/>
         <CursorPos X="47" Y="21"/>
         <TopLine Value="18"/>
-        <UsageCount Value="5"/>
-      </Unit57>
-      <Unit58>
+        <UsageCount Value="10"/>
+      </Unit41>
+      <Unit42>
         <Filename Value="..\..\type_lib_edtr\ubindingedit.pas"/>
         <ComponentName Value="fBindingEdit"/>
         <HasResources Value="True"/>
@@ -473,9 +376,9 @@
         <UnitName Value="ubindingedit"/>
         <CursorPos X="41" Y="21"/>
         <TopLine Value="18"/>
-        <UsageCount Value="5"/>
-      </Unit58>
-      <Unit59>
+        <UsageCount Value="10"/>
+      </Unit42>
+      <Unit43>
         <Filename Value="..\..\type_lib_edtr\ufarrayedit.pas"/>
         <ComponentName Value="fArrayEdit"/>
         <HasResources Value="True"/>
@@ -483,9 +386,9 @@
         <UnitName Value="ufarrayedit"/>
         <CursorPos X="41" Y="9"/>
         <TopLine Value="5"/>
-        <UsageCount Value="5"/>
-      </Unit59>
-      <Unit60>
+        <UsageCount Value="10"/>
+      </Unit43>
+      <Unit44>
         <Filename Value="..\..\type_lib_edtr\uftypealiasedit.pas"/>
         <ComponentName Value="fTypeAliasEdit"/>
         <HasResources Value="True"/>
@@ -493,9 +396,9 @@
         <UnitName Value="uftypealiasedit"/>
         <CursorPos X="22" Y="9"/>
         <TopLine Value="7"/>
-        <UsageCount Value="5"/>
-      </Unit60>
-      <Unit61>
+        <UsageCount Value="10"/>
+      </Unit44>
+      <Unit45>
         <Filename Value="..\..\type_lib_edtr\ufrmsaveoption.pas"/>
         <ComponentName Value="frmSaveOptions"/>
         <HasResources Value="True"/>
@@ -503,300 +406,218 @@
         <UnitName Value="ufrmsaveoption"/>
         <CursorPos X="22" Y="9"/>
         <TopLine Value="6"/>
-        <UsageCount Value="5"/>
-      </Unit61>
-      <Unit62>
-        <Filename Value="..\..\..\..\..\..\lazarus_23_215XX\fpc\source\rtl\objpas\sysutils\sysutilh.inc"/>
-        <CursorPos X="4" Y="64"/>
-        <TopLine Value="64"/>
-        <UsageCount Value="3"/>
-      </Unit62>
-      <Unit63>
+        <UsageCount Value="10"/>
+      </Unit45>
+      <Unit46>
         <Filename Value="..\..\server_service_xmlrpc.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="server_service_xmlrpc"/>
         <CursorPos X="38" Y="33"/>
         <TopLine Value="27"/>
-        <UsageCount Value="94"/>
-      </Unit63>
-      <Unit64>
+        <UsageCount Value="147"/>
+      </Unit46>
+      <Unit47>
         <Filename Value="..\..\..\..\..\..\lazarus_23_215XX\fpc\source\packages\fcl-xml\src\xmlread.pp"/>
         <UnitName Value="XMLRead"/>
-        <CursorPos X="6" Y="37"/>
-        <TopLine Value="31"/>
-        <UsageCount Value="5"/>
-      </Unit64>
-      <Unit65>
+        <CursorPos X="3" Y="1205"/>
+        <TopLine Value="1203"/>
+        <UsageCount Value="8"/>
+      </Unit47>
+      <Unit48>
         <Filename Value="..\..\xmlrpc_formatter.pas"/>
         <UnitName Value="xmlrpc_formatter"/>
         <CursorPos X="1" Y="169"/>
         <TopLine Value="154"/>
-        <UsageCount Value="9"/>
-      </Unit65>
-      <Unit66>
+        <UsageCount Value="4"/>
+      </Unit48>
+      <Unit49>
         <Filename Value="..\..\record_rtti.pas"/>
         <UnitName Value="record_rtti"/>
         <CursorPos X="37" Y="276"/>
         <TopLine Value="265"/>
-        <UsageCount Value="13"/>
-      </Unit66>
-      <Unit67>
+        <UsageCount Value="8"/>
+      </Unit49>
+      <Unit50>
         <Filename Value="..\..\wst_rtl_imp.inc"/>
         <CursorPos X="1" Y="1"/>
         <TopLine Value="1"/>
-        <UsageCount Value="5"/>
-      </Unit67>
-      <Unit68>
+        <UsageCount Value="10"/>
+      </Unit50>
+      <Unit51>
         <Filename Value="test_parsers.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="test_parsers"/>
-        <CursorPos X="17" Y="621"/>
-        <TopLine Value="608"/>
-        <EditorIndex Value="2"/>
-        <UsageCount Value="72"/>
+        <CursorPos X="50" Y="24"/>
+        <TopLine Value="1"/>
+        <EditorIndex Value="4"/>
+        <UsageCount Value="125"/>
         <Loaded Value="True"/>
-      </Unit68>
-      <Unit69>
+      </Unit51>
+      <Unit52>
         <Filename Value="..\..\ws_helper\xsd_parser.pas"/>
         <UnitName Value="xsd_parser"/>
-        <CursorPos X="3" Y="65"/>
-        <TopLine Value="88"/>
-        <EditorIndex Value="8"/>
-        <UsageCount Value="34"/>
+        <CursorPos X="17" Y="190"/>
+        <TopLine Value="188"/>
+        <EditorIndex Value="6"/>
+        <UsageCount Value="29"/>
         <Loaded Value="True"/>
-      </Unit69>
-      <Unit70>
+      </Unit52>
+      <Unit53>
         <Filename Value="..\..\ws_helper\parserutils.pas"/>
         <UnitName Value="parserutils"/>
-        <CursorPos X="41" Y="29"/>
-        <TopLine Value="70"/>
-        <EditorIndex Value="6"/>
-        <UsageCount Value="26"/>
+        <CursorPos X="98" Y="94"/>
+        <TopLine Value="71"/>
+        <EditorIndex Value="8"/>
+        <UsageCount Value="21"/>
         <Loaded Value="True"/>
-      </Unit70>
-      <Unit71>
+      </Unit53>
+      <Unit54>
         <Filename Value="..\..\..\..\..\..\lazarus_23_2.2.1\fpc\2.2.1\source\packages\fcl-fpcunit\src\testregistry.pp"/>
         <UnitName Value="testregistry"/>
         <CursorPos X="1" Y="1"/>
         <TopLine Value="18"/>
-        <UsageCount Value="7"/>
-      </Unit71>
-      <Unit72>
+        <UsageCount Value="2"/>
+      </Unit54>
+      <Unit55>
         <Filename Value="..\..\..\..\..\..\lazarus_23_2.2.1\fpc\2.2.1\source\packages\fcl-fpcunit\src\DUnitCompatibleInterface.inc"/>
         <CursorPos X="3" Y="120"/>
         <TopLine Value="115"/>
-        <UsageCount Value="6"/>
-      </Unit72>
-      <Unit73>
+        <UsageCount Value="1"/>
+      </Unit55>
+      <Unit56>
         <Filename Value="..\..\..\..\..\..\lazarus_23_2.2.1\fpc\2.2.1\source\packages\fcl-fpcunit\src\fpcunit.pp"/>
         <UnitName Value="fpcunit"/>
         <CursorPos X="60" Y="449"/>
         <TopLine Value="424"/>
-        <UsageCount Value="9"/>
-      </Unit73>
-      <Unit74>
+        <UsageCount Value="4"/>
+      </Unit56>
+      <Unit57>
         <Filename Value="..\..\ws_helper\logger_intf.pas"/>
         <UnitName Value="logger_intf"/>
         <CursorPos X="85" Y="50"/>
         <TopLine Value="35"/>
-        <UsageCount Value="6"/>
-      </Unit74>
-      <Unit75>
+        <UsageCount Value="1"/>
+      </Unit57>
+      <Unit58>
         <Filename Value="..\..\ws_helper\ws_parser_imp.pas"/>
         <UnitName Value="ws_parser_imp"/>
-        <CursorPos X="61" Y="122"/>
-        <TopLine Value="94"/>
-        <EditorIndex Value="10"/>
-        <UsageCount Value="33"/>
+        <CursorPos X="14" Y="91"/>
+        <TopLine Value="77"/>
+        <EditorIndex Value="7"/>
+        <UsageCount Value="28"/>
         <Loaded Value="True"/>
-      </Unit75>
-      <Unit76>
+      </Unit58>
+      <Unit59>
         <Filename Value="..\..\..\..\..\..\lazarus_23_2.2.1\fpc\2.2.1\source\rtl\inc\objpash.inc"/>
         <CursorPos X="21" Y="151"/>
         <TopLine Value="129"/>
-        <UsageCount Value="9"/>
-      </Unit76>
-      <Unit77>
+        <UsageCount Value="4"/>
+      </Unit59>
+      <Unit60>
         <Filename Value="..\..\ws_helper\wsdl_generator.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="wsdl_generator"/>
         <CursorPos X="27" Y="146"/>
         <TopLine Value="124"/>
-        <EditorIndex Value="3"/>
-        <UsageCount Value="52"/>
-        <Loaded Value="True"/>
-      </Unit77>
-      <Unit78>
+        <UsageCount Value="105"/>
+      </Unit60>
+      <Unit61>
         <Filename Value="..\..\..\..\..\..\lazarus_23_2.2.1\fpc\2.2.1\source\packages\fcl-xml\src\xmlread.pp"/>
         <UnitName Value="XMLRead"/>
         <CursorPos X="1" Y="1975"/>
         <TopLine Value="1963"/>
-        <UsageCount Value="8"/>
-      </Unit78>
-      <Unit79>
+        <UsageCount Value="3"/>
+      </Unit61>
+      <Unit62>
         <Filename Value="..\..\..\..\..\..\lazarus_23_2.2.1\fpc\2.2.1\source\rtl\inc\objpas.inc"/>
         <CursorPos X="11" Y="222"/>
         <TopLine Value="219"/>
-        <UsageCount Value="9"/>
-      </Unit79>
-      <Unit80>
+        <UsageCount Value="4"/>
+      </Unit62>
+      <Unit63>
         <Filename Value="..\..\..\..\..\..\lazarus_23_2.2.1\fpc\2.2.1\source\packages\fcl-base\src\inc\contnrs.pp"/>
         <UnitName Value="contnrs"/>
         <CursorPos X="3" Y="701"/>
         <TopLine Value="698"/>
-        <UsageCount Value="9"/>
-      </Unit80>
-      <Unit81>
+        <UsageCount Value="4"/>
+      </Unit63>
+      <Unit64>
         <Filename Value="..\..\ws_helper\xsd_generator.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="xsd_generator"/>
         <CursorPos X="3" Y="81"/>
-        <TopLine Value="77"/>
-        <EditorIndex Value="4"/>
-        <UsageCount Value="35"/>
+        <TopLine Value="261"/>
+        <EditorIndex Value="2"/>
+        <UsageCount Value="88"/>
         <Loaded Value="True"/>
-      </Unit81>
-      <Unit82>
+      </Unit64>
+      <Unit65>
         <Filename Value="..\..\ws_helper\xsd_consts.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="xsd_consts"/>
         <CursorPos X="8" Y="78"/>
         <TopLine Value="51"/>
-        <EditorIndex Value="7"/>
-        <UsageCount Value="34"/>
-        <Loaded Value="True"/>
-      </Unit82>
-      <Unit83>
+        <UsageCount Value="87"/>
+      </Unit65>
+      <Unit66>
         <Filename Value="..\..\ws_helper\wsdl_parser.pas"/>
+        <IsPartOfProject Value="True"/>
         <UnitName Value="wsdl_parser"/>
-        <CursorPos X="67" Y="101"/>
-        <TopLine Value="90"/>
-        <EditorIndex Value="9"/>
-        <UsageCount Value="17"/>
+        <CursorPos X="28" Y="845"/>
+        <TopLine Value="835"/>
+        <EditorIndex Value="5"/>
+        <UsageCount Value="20"/>
         <Loaded Value="True"/>
-      </Unit83>
+      </Unit66>
+      <Unit67>
+        <Filename Value="..\..\base_json_formatter.pas"/>
+        <IsPartOfProject Value="True"/>
+        <UnitName Value="base_json_formatter"/>
+        <CursorPos X="58" Y="112"/>
+        <TopLine Value="99"/>
+        <EditorIndex Value="11"/>
+        <UsageCount Value="73"/>
+        <Loaded Value="True"/>
+      </Unit67>
+      <Unit68>
+        <Filename Value="..\..\fcl-json\src\fpjson.pp"/>
+        <UnitName Value="fpjson"/>
+        <CursorPos X="3" Y="265"/>
+        <TopLine Value="296"/>
+        <EditorIndex Value="12"/>
+        <UsageCount Value="37"/>
+        <Loaded Value="True"/>
+      </Unit68>
+      <Unit69>
+        <Filename Value="..\..\wst_types.pas"/>
+        <UnitName Value="wst_types"/>
+        <CursorPos X="1" Y="1"/>
+        <TopLine Value="13"/>
+        <UsageCount Value="6"/>
+      </Unit69>
+      <Unit70>
+        <Filename Value="..\..\..\..\..\..\lazarus_23_215XX\fpc\source\rtl\inc\systemh.inc"/>
+        <CursorPos X="3" Y="389"/>
+        <TopLine Value="375"/>
+        <UsageCount Value="6"/>
+      </Unit70>
+      <Unit71>
+        <Filename Value="..\..\..\..\..\..\lazarus_23_215XX\fpc\source\packages\fcl-xml\src\xmlwrite.pp"/>
+        <UnitName Value="XMLWrite"/>
+        <CursorPos X="9" Y="609"/>
+        <TopLine Value="586"/>
+        <UsageCount Value="16"/>
+      </Unit71>
     </Units>
-    <JumpHistory Count="30" HistoryIndex="29">
+    <JumpHistory Count="2" HistoryIndex="1">
       <Position1>
-        <Filename Value="..\..\ws_helper\xsd_generator.pas"/>
-        <Caret Line="697" Column="22" TopLine="680"/>
+        <Filename Value="..\..\base_soap_formatter.pas"/>
+        <Caret Line="1481" Column="23" TopLine="1470"/>
       </Position1>
       <Position2>
-        <Filename Value="..\..\ws_helper\xsd_generator.pas"/>
-        <Caret Line="277" Column="28" TopLine="253"/>
+        <Filename Value="..\..\base_soap_formatter.pas"/>
+        <Caret Line="127" Column="61" TopLine="115"/>
       </Position2>
-      <Position3>
-        <Filename Value="..\..\ws_helper\xsd_generator.pas"/>
-        <Caret Line="732" Column="1" TopLine="714"/>
-      </Position3>
-      <Position4>
-        <Filename Value="..\..\ws_helper\xsd_generator.pas"/>
-        <Caret Line="64" Column="77" TopLine="43"/>
-      </Position4>
-      <Position5>
-        <Filename Value="..\..\ws_helper\xsd_generator.pas"/>
-        <Caret Line="726" Column="1" TopLine="705"/>
-      </Position5>
-      <Position6>
-        <Filename Value="..\..\ws_helper\xsd_generator.pas"/>
-        <Caret Line="77" Column="3" TopLine="75"/>
-      </Position6>
-      <Position7>
-        <Filename Value="..\..\ws_helper\xsd_generator.pas"/>
-        <Caret Line="769" Column="5" TopLine="739"/>
-      </Position7>
-      <Position8>
-        <Filename Value="..\..\ws_helper\xsd_generator.pas"/>
-        <Caret Line="72" Column="19" TopLine="57"/>
-      </Position8>
-      <Position9>
-        <Filename Value="..\..\ws_helper\xsd_generator.pas"/>
-        <Caret Line="802" Column="5" TopLine="771"/>
-      </Position9>
-      <Position10>
-        <Filename Value="..\..\ws_helper\xsd_generator.pas"/>
-        <Caret Line="806" Column="5" TopLine="792"/>
-      </Position10>
-      <Position11>
-        <Filename Value="..\..\ws_helper\xsd_generator.pas"/>
-        <Caret Line="87" Column="13" TopLine="73"/>
-      </Position11>
-      <Position12>
-        <Filename Value="..\..\ws_helper\xsd_generator.pas"/>
-        <Caret Line="760" Column="32" TopLine="741"/>
-      </Position12>
-      <Position13>
-        <Filename Value="..\..\ws_helper\xsd_generator.pas"/>
-        <Caret Line="777" Column="9" TopLine="763"/>
-      </Position13>
-      <Position14>
-        <Filename Value="..\..\ws_helper\xsd_generator.pas"/>
-        <Caret Line="795" Column="5" TopLine="782"/>
-      </Position14>
-      <Position15>
-        <Filename Value="..\..\ws_helper\xsd_generator.pas"/>
-        <Caret Line="798" Column="73" TopLine="785"/>
-      </Position15>
-      <Position16>
-        <Filename Value="..\..\ws_helper\xsd_generator.pas"/>
-        <Caret Line="805" Column="49" TopLine="791"/>
-      </Position16>
-      <Position17>
-        <Filename Value="..\..\ws_helper\xsd_generator.pas"/>
-        <Caret Line="71" Column="17" TopLine="52"/>
-      </Position17>
-      <Position18>
-        <Filename Value="..\..\ws_helper\xsd_generator.pas"/>
-        <Caret Line="804" Column="3" TopLine="798"/>
-      </Position18>
-      <Position19>
-        <Filename Value="..\..\ws_helper\xsd_generator.pas"/>
-        <Caret Line="73" Column="1" TopLine="53"/>
-      </Position19>
-      <Position20>
-        <Filename Value="..\..\ws_helper\xsd_generator.pas"/>
-        <Caret Line="779" Column="1" TopLine="767"/>
-      </Position20>
-      <Position21>
-        <Filename Value="..\..\ws_helper\xsd_generator.pas"/>
-        <Caret Line="86" Column="23" TopLine="73"/>
-      </Position21>
-      <Position22>
-        <Filename Value="..\..\ws_helper\xsd_generator.pas"/>
-        <Caret Line="799" Column="37" TopLine="787"/>
-      </Position22>
-      <Position23>
-        <Filename Value="..\..\ws_helper\xsd_generator.pas"/>
-        <Caret Line="757" Column="24" TopLine="744"/>
-      </Position23>
-      <Position24>
-        <Filename Value="..\..\ws_helper\xsd_generator.pas"/>
-        <Caret Line="799" Column="1" TopLine="787"/>
-      </Position24>
-      <Position25>
-        <Filename Value="..\..\ws_helper\xsd_generator.pas"/>
-        <Caret Line="801" Column="95" TopLine="788"/>
-      </Position25>
-      <Position26>
-        <Filename Value="..\..\ws_helper\xsd_generator.pas"/>
-        <Caret Line="798" Column="34" TopLine="773"/>
-      </Position26>
-      <Position27>
-        <Filename Value="..\..\ws_helper\wsdl_generator.pas"/>
-        <Caret Line="598" Column="49" TopLine="587"/>
-      </Position27>
-      <Position28>
-        <Filename Value="..\..\ws_helper\xsd_generator.pas"/>
-        <Caret Line="794" Column="20" TopLine="768"/>
-      </Position28>
-      <Position29>
-        <Filename Value="..\..\ws_helper\xsd_generator.pas"/>
-        <Caret Line="797" Column="32" TopLine="780"/>
-      </Position29>
-      <Position30>
-        <Filename Value="..\..\ws_helper\xsd_generator.pas"/>
-        <Caret Line="787" Column="16" TopLine="786"/>
-      </Position30>
     </JumpHistory>
   </ProjectOptions>
   <CompilerOptions>
@@ -807,7 +628,7 @@
     </Target>
     <SearchPaths>
       <IncludeFiles Value="..\..\"/>
-      <OtherUnitFiles Value="..\..\;..\..\ws_helper\;..\..\wst_rtti_filter\"/>
+      <OtherUnitFiles Value="..\..\;..\..\ws_helper\;..\..\wst_rtti_filter\;..\..\fcl-json\src\"/>
       <UnitOutputDirectory Value="obj"/>
     </SearchPaths>
     <Parsing>
diff --git a/wst/trunk/tests/test_suite/wst_test_suite.lpr b/wst/trunk/tests/test_suite/wst_test_suite.lpr
index 474fc6da5..0c62ad0d7 100644
--- a/wst/trunk/tests/test_suite/wst_test_suite.lpr
+++ b/wst/trunk/tests/test_suite/wst_test_suite.lpr
@@ -17,7 +17,7 @@ uses
   metadata_generator, parserdefs, server_service_intf, metadata_wsdl,
   test_parserdef, base_xmlrpc_formatter, wst_fpc_xml, test_utilities,
   server_service_xmlrpc, test_parsers, wsdl_generator, xsd_generator, 
-xsd_consts;
+xsd_consts, base_json_formatter, wsdl_parser;
 
 Const
   ShortOpts = 'alh';
diff --git a/wst/trunk/type_lib_edtr/typ_lib_edtr.lpi b/wst/trunk/type_lib_edtr/typ_lib_edtr.lpi
index a0ed71bdd..3bc440c9d 100644
--- a/wst/trunk/type_lib_edtr/typ_lib_edtr.lpi
+++ b/wst/trunk/type_lib_edtr/typ_lib_edtr.lpi
@@ -7,7 +7,7 @@
       <MainUnit Value="0"/>
       <IconPath Value="./"/>
       <TargetFileExt Value=".exe"/>
-      <ActiveEditorIndexAtStart Value="0"/>
+      <ActiveEditorIndexAtStart Value="13"/>
     </General>
     <VersionInfo>
       <ProjectVersion Value=""/>
@@ -32,13 +32,13 @@
         <PackageName Value="LCL"/>
       </Item2>
     </RequiredPackages>
-    <Units Count="93">
+    <Units Count="94">
       <Unit0>
         <Filename Value="typ_lib_edtr.lpr"/>
         <IsPartOfProject Value="True"/>
-        <CursorPos X="60" Y="13"/>
+        <CursorPos X="1" Y="21"/>
         <TopLine Value="1"/>
-        <EditorIndex Value="8"/>
+        <EditorIndex Value="13"/>
         <UsageCount Value="200"/>
         <Loaded Value="True"/>
       </Unit0>
@@ -49,8 +49,8 @@
         <IsPartOfProject Value="True"/>
         <ResourceFilename Value="uwsttypelibraryedit.lrs"/>
         <UnitName Value="uwsttypelibraryedit"/>
-        <CursorPos X="1" Y="385"/>
-        <TopLine Value="369"/>
+        <CursorPos X="27" Y="171"/>
+        <TopLine Value="152"/>
         <EditorIndex Value="0"/>
         <UsageCount Value="200"/>
         <Loaded Value="True"/>
@@ -60,14 +60,14 @@
         <UnitName Value="parserdefs"/>
         <CursorPos X="1" Y="35"/>
         <TopLine Value="22"/>
-        <UsageCount Value="38"/>
+        <UsageCount Value="36"/>
       </Unit2>
       <Unit3>
         <Filename Value="..\ws_helper\wsdl2pas_imp.pas"/>
         <UnitName Value="wsdl2pas_imp"/>
         <CursorPos X="61" Y="1902"/>
         <TopLine Value="1879"/>
-        <UsageCount Value="100"/>
+        <UsageCount Value="98"/>
         <Bookmarks Count="1">
           <Item0 X="65" Y="790" ID="2"/>
         </Bookmarks>
@@ -77,7 +77,7 @@
         <UnitName Value="wsdl_generator"/>
         <CursorPos X="19" Y="5"/>
         <TopLine Value="1"/>
-        <UsageCount Value="200"/>
+        <UsageCount Value="198"/>
       </Unit4>
       <Unit5>
         <Filename Value="uabout.pas"/>
@@ -105,9 +105,9 @@
         <Filename Value="view_helper.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="view_helper"/>
-        <CursorPos X="1" Y="667"/>
+        <CursorPos X="6" Y="669"/>
         <TopLine Value="652"/>
-        <EditorIndex Value="3"/>
+        <EditorIndex Value="7"/>
         <UsageCount Value="200"/>
         <Loaded Value="True"/>
       </Unit7>
@@ -117,7 +117,7 @@
         <UnitName Value="source_utils"/>
         <CursorPos X="1" Y="153"/>
         <TopLine Value="138"/>
-        <EditorIndex Value="13"/>
+        <EditorIndex Value="18"/>
         <UsageCount Value="200"/>
         <Loaded Value="True"/>
       </Unit8>
@@ -127,7 +127,7 @@
         <UnitName Value="edit_helper"/>
         <CursorPos X="11" Y="717"/>
         <TopLine Value="712"/>
-        <EditorIndex Value="5"/>
+        <EditorIndex Value="10"/>
         <UsageCount Value="200"/>
         <Loaded Value="True"/>
       </Unit9>
@@ -140,7 +140,7 @@
         <UnitName Value="ufclassedit"/>
         <CursorPos X="1" Y="118"/>
         <TopLine Value="131"/>
-        <EditorIndex Value="9"/>
+        <EditorIndex Value="14"/>
         <UsageCount Value="200"/>
         <Loaded Value="True"/>
       </Unit10>
@@ -152,7 +152,7 @@
         <UnitName Value="ufpropedit"/>
         <CursorPos X="58" Y="147"/>
         <TopLine Value="129"/>
-        <EditorIndex Value="11"/>
+        <EditorIndex Value="16"/>
         <UsageCount Value="200"/>
         <Loaded Value="True"/>
       </Unit11>
@@ -161,14 +161,14 @@
         <UnitName Value="ComCtrls"/>
         <CursorPos X="15" Y="1781"/>
         <TopLine Value="1768"/>
-        <UsageCount Value="7"/>
+        <UsageCount Value="5"/>
       </Unit12>
       <Unit13>
         <Filename Value="..\ws_helper\parserutils.pas"/>
         <UnitName Value="parserutils"/>
-        <CursorPos X="49" Y="27"/>
-        <TopLine Value="18"/>
-        <EditorIndex Value="6"/>
+        <CursorPos X="1" Y="142"/>
+        <TopLine Value="128"/>
+        <EditorIndex Value="11"/>
         <UsageCount Value="101"/>
         <Loaded Value="True"/>
       </Unit13>
@@ -176,76 +176,76 @@
         <Filename Value="..\..\..\..\lazarus23_213\fpc\2.1.3\source\rtl\i386\i386.inc"/>
         <CursorPos X="2" Y="1284"/>
         <TopLine Value="1263"/>
-        <UsageCount Value="4"/>
+        <UsageCount Value="2"/>
       </Unit14>
       <Unit15>
         <Filename Value="..\..\..\..\lazarus23_213\fpc\2.1.3\source\rtl\inc\except.inc"/>
         <CursorPos X="1" Y="223"/>
         <TopLine Value="209"/>
-        <UsageCount Value="4"/>
+        <UsageCount Value="2"/>
       </Unit15>
       <Unit16>
         <Filename Value="..\..\..\..\lazarus23_213\fpc\2.1.3\source\rtl\inc\objpas.inc"/>
         <CursorPos X="1" Y="152"/>
         <TopLine Value="138"/>
-        <UsageCount Value="6"/>
+        <UsageCount Value="4"/>
       </Unit16>
       <Unit17>
         <Filename Value="ufclassedit.lrs"/>
         <CursorPos X="39" Y="2"/>
         <TopLine Value="1"/>
-        <UsageCount Value="7"/>
+        <UsageCount Value="5"/>
       </Unit17>
       <Unit18>
         <Filename Value="..\..\..\..\lazarus23_213\fpc\2.1.3\source\rtl\inc\wstrings.inc"/>
         <CursorPos X="1" Y="317"/>
         <TopLine Value="303"/>
-        <UsageCount Value="7"/>
+        <UsageCount Value="5"/>
       </Unit18>
       <Unit19>
         <Filename Value="..\..\..\..\lazarus23_213\fpc\2.1.3\source\packages\fcl-xml\src\dom.pp"/>
         <UnitName Value="DOM"/>
         <CursorPos X="3" Y="2064"/>
         <TopLine Value="2041"/>
-        <UsageCount Value="7"/>
+        <UsageCount Value="5"/>
       </Unit19>
       <Unit20>
         <Filename Value="..\..\..\..\lazarus23_213\lcl\stdctrls.pp"/>
         <UnitName Value="StdCtrls"/>
         <CursorPos X="24" Y="362"/>
         <TopLine Value="348"/>
-        <UsageCount Value="6"/>
+        <UsageCount Value="4"/>
       </Unit20>
       <Unit21>
         <Filename Value="..\..\..\..\lazarus23_213\fpc\2.1.3\source\rtl\objpas\classes\classesh.inc"/>
         <CursorPos X="12" Y="64"/>
         <TopLine Value="49"/>
-        <UsageCount Value="6"/>
+        <UsageCount Value="4"/>
       </Unit21>
       <Unit22>
         <Filename Value="..\..\..\..\lazarus23_213\fpc\2.1.3\source\rtl\objpas\classes\stringl.inc"/>
         <CursorPos X="15" Y="1071"/>
         <TopLine Value="1056"/>
-        <UsageCount Value="6"/>
+        <UsageCount Value="4"/>
       </Unit22>
       <Unit23>
         <Filename Value="..\..\..\..\lazarus23_213\fpc\2.1.3\source\rtl\objpas\types.pp"/>
         <UnitName Value="types"/>
         <CursorPos X="6" Y="15"/>
         <TopLine Value="1"/>
-        <UsageCount Value="6"/>
+        <UsageCount Value="4"/>
       </Unit23>
       <Unit24>
         <Filename Value="..\..\..\..\lazarus23_213\fpc\2.1.3\source\rtl\objpas\sysutils\sysstrh.inc"/>
         <CursorPos X="10" Y="104"/>
         <TopLine Value="90"/>
-        <UsageCount Value="6"/>
+        <UsageCount Value="4"/>
       </Unit24>
       <Unit25>
         <Filename Value="..\..\..\..\lazarus23_213\fpc\2.1.3\source\rtl\objpas\sysutils\sysstr.inc"/>
         <CursorPos X="1" Y="689"/>
         <TopLine Value="686"/>
-        <UsageCount Value="6"/>
+        <UsageCount Value="4"/>
       </Unit25>
       <Unit26>
         <Filename Value="uinterfaceedit.pas"/>
@@ -261,7 +261,7 @@
         <Filename Value="uinterfaceedit.lfm"/>
         <CursorPos X="1" Y="1"/>
         <TopLine Value="1"/>
-        <UsageCount Value="6"/>
+        <UsageCount Value="4"/>
         <SyntaxHighlighter Value="LFM"/>
       </Unit27>
       <Unit28>
@@ -275,162 +275,154 @@
         <UsageCount Value="203"/>
       </Unit28>
       <Unit29>
-        <Filename Value="..\..\..\..\lazarus23_213\lcl\include\treeview.inc"/>
-        <CursorPos X="25" Y="68"/>
-        <TopLine Value="61"/>
-        <UsageCount Value="1"/>
-      </Unit29>
-      <Unit30>
         <Filename Value="..\ws_helper\pascal_parser_intf.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="pascal_parser_intf"/>
-        <CursorPos X="12" Y="176"/>
-        <TopLine Value="137"/>
-        <EditorIndex Value="14"/>
-        <UsageCount Value="195"/>
+        <CursorPos X="1" Y="778"/>
+        <TopLine Value="764"/>
+        <EditorIndex Value="19"/>
+        <UsageCount Value="221"/>
         <Loaded Value="True"/>
-      </Unit30>
-      <Unit31>
+      </Unit29>
+      <Unit30>
         <Filename Value="..\ws_helper\pparser.pp"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="PParser"/>
         <CursorPos X="18" Y="1148"/>
         <TopLine Value="1126"/>
-        <UsageCount Value="195"/>
-      </Unit31>
-      <Unit32>
+        <UsageCount Value="221"/>
+      </Unit30>
+      <Unit31>
         <Filename Value="..\ws_helper\logger_intf.pas"/>
         <UnitName Value="logger_intf"/>
         <CursorPos X="2" Y="12"/>
         <TopLine Value="37"/>
-        <UsageCount Value="32"/>
-      </Unit32>
-      <Unit33>
+        <UsageCount Value="30"/>
+      </Unit31>
+      <Unit32>
         <Filename Value="..\ws_helper\pastree.pp"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="PasTree"/>
         <CursorPos X="24" Y="296"/>
         <TopLine Value="274"/>
-        <UsageCount Value="195"/>
-      </Unit33>
-      <Unit34>
+        <UsageCount Value="221"/>
+      </Unit32>
+      <Unit33>
         <Filename Value="..\..\..\..\lazarus_23_215\lcl\include\treeview.inc"/>
         <CursorPos X="35" Y="71"/>
         <TopLine Value="58"/>
-        <UsageCount Value="10"/>
-      </Unit34>
-      <Unit35>
-        <Filename Value="..\..\..\..\lazarus23_213\lcl\include\customcheckbox.inc"/>
-        <CursorPos X="1" Y="120"/>
-        <TopLine Value="108"/>
-        <UsageCount Value="1"/>
-      </Unit35>
-      <Unit36>
+        <UsageCount Value="8"/>
+      </Unit33>
+      <Unit34>
         <Filename Value="umain.lrs"/>
         <CursorPos X="1" Y="1"/>
         <TopLine Value="1"/>
-        <UsageCount Value="3"/>
-      </Unit36>
-      <Unit37>
+        <UsageCount Value="1"/>
+      </Unit34>
+      <Unit35>
         <Filename Value="..\wst_rtti_filter\rtti_filters.pas"/>
         <UnitName Value="rtti_filters"/>
-        <CursorPos X="1" Y="236"/>
-        <TopLine Value="219"/>
-        <UsageCount Value="22"/>
-      </Unit37>
-      <Unit38>
+        <CursorPos X="1" Y="579"/>
+        <TopLine Value="565"/>
+        <EditorIndex Value="5"/>
+        <UsageCount Value="34"/>
+        <Loaded Value="True"/>
+      </Unit35>
+      <Unit36>
         <Filename Value="..\ws_helper\generator.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="generator"/>
         <CursorPos X="1" Y="2514"/>
         <TopLine Value="2475"/>
-        <EditorIndex Value="7"/>
-        <UsageCount Value="112"/>
+        <EditorIndex Value="12"/>
+        <UsageCount Value="138"/>
         <Bookmarks Count="1">
           <Item0 X="36" Y="2046" ID="1"/>
         </Bookmarks>
         <Loaded Value="True"/>
-      </Unit38>
-      <Unit39>
+      </Unit36>
+      <Unit37>
         <Filename Value="..\wst_rtti_filter\dom_cursors.pas"/>
         <UnitName Value="dom_cursors"/>
-        <CursorPos X="1" Y="239"/>
-        <TopLine Value="222"/>
-        <UsageCount Value="19"/>
-      </Unit39>
-      <Unit40>
+        <CursorPos X="1" Y="273"/>
+        <TopLine Value="259"/>
+        <EditorIndex Value="4"/>
+        <UsageCount Value="31"/>
+        <Loaded Value="True"/>
+      </Unit37>
+      <Unit38>
         <Filename Value="..\ws_helper\command_line_parser.pas"/>
         <UnitName Value="command_line_parser"/>
         <CursorPos X="20" Y="31"/>
         <TopLine Value="17"/>
-        <UsageCount Value="17"/>
-      </Unit40>
-      <Unit41>
+        <UsageCount Value="15"/>
+      </Unit38>
+      <Unit39>
         <Filename Value="..\..\..\..\..\lazarus_23_215\lcl\forms.pp"/>
         <UnitName Value="Forms"/>
         <CursorPos X="44" Y="10"/>
         <TopLine Value="1"/>
-        <UsageCount Value="3"/>
-      </Unit41>
-      <Unit42>
+        <UsageCount Value="1"/>
+      </Unit39>
+      <Unit40>
         <Filename Value="..\ws_helper\pscanner.pp"/>
         <UnitName Value="PScanner"/>
         <CursorPos X="1" Y="1"/>
         <TopLine Value="322"/>
-        <UsageCount Value="6"/>
-      </Unit42>
-      <Unit43>
+        <UsageCount Value="4"/>
+      </Unit40>
+      <Unit41>
         <Filename Value="..\ws_helper\metadata_generator.pas"/>
         <UnitName Value="metadata_generator"/>
         <CursorPos X="11" Y="20"/>
         <TopLine Value="14"/>
-        <UsageCount Value="3"/>
-      </Unit43>
-      <Unit44>
+        <UsageCount Value="1"/>
+      </Unit41>
+      <Unit42>
         <Filename Value="..\ide\lazarus\wst_register.pas"/>
         <UnitName Value="wst_register"/>
         <CursorPos X="42" Y="6"/>
         <TopLine Value="1"/>
-        <UsageCount Value="7"/>
-      </Unit44>
-      <Unit45>
+        <UsageCount Value="5"/>
+      </Unit42>
+      <Unit43>
         <Filename Value="..\..\..\..\..\lazarus_23_215\ideintf\menuintf.pas"/>
         <UnitName Value="MenuIntf"/>
         <CursorPos X="53" Y="417"/>
         <TopLine Value="409"/>
-        <UsageCount Value="4"/>
-      </Unit45>
-      <Unit46>
+        <UsageCount Value="2"/>
+      </Unit43>
+      <Unit44>
         <Filename Value="..\ide\lazarus\wstimportdlg.pas"/>
         <ComponentName Value="formImport"/>
         <HasResources Value="True"/>
         <UnitName Value="wstimportdlg"/>
         <CursorPos X="29" Y="60"/>
         <TopLine Value="154"/>
-        <UsageCount Value="7"/>
-      </Unit46>
-      <Unit47>
+        <UsageCount Value="5"/>
+      </Unit44>
+      <Unit45>
         <Filename Value="..\..\..\..\..\lazarus_23_215\ideintf\lazideintf.pas"/>
         <UnitName Value="LazIDEIntf"/>
         <CursorPos X="33" Y="174"/>
         <TopLine Value="162"/>
-        <UsageCount Value="3"/>
-      </Unit47>
-      <Unit48>
+        <UsageCount Value="1"/>
+      </Unit45>
+      <Unit46>
         <Filename Value="..\..\..\..\..\lazarus_23_215\ideintf\projectintf.pas"/>
         <UnitName Value="ProjectIntf"/>
         <CursorPos X="3" Y="284"/>
         <TopLine Value="262"/>
-        <UsageCount Value="3"/>
-      </Unit48>
-      <Unit49>
+        <UsageCount Value="1"/>
+      </Unit46>
+      <Unit47>
         <Filename Value="..\..\..\..\..\lazarus_23_215\ideintf\idecommands.pas"/>
         <UnitName Value="IDECommands"/>
         <CursorPos X="47" Y="291"/>
         <TopLine Value="279"/>
-        <UsageCount Value="3"/>
-      </Unit49>
-      <Unit50>
+        <UsageCount Value="1"/>
+      </Unit47>
+      <Unit48>
         <Filename Value="uprocedit.pas"/>
         <ComponentName Value="fProcEdit"/>
         <IsPartOfProject Value="True"/>
@@ -438,33 +430,33 @@
         <UnitName Value="uprocedit"/>
         <CursorPos X="2" Y="12"/>
         <TopLine Value="1"/>
-        <UsageCount Value="151"/>
-      </Unit50>
-      <Unit51>
+        <UsageCount Value="177"/>
+      </Unit48>
+      <Unit49>
         <Filename Value="..\..\..\..\..\lazarus_23_215XX\lcl\comctrls.pp"/>
         <UnitName Value="ComCtrls"/>
-        <CursorPos X="4" Y="1660"/>
-        <TopLine Value="1660"/>
-        <UsageCount Value="3"/>
-      </Unit51>
-      <Unit52>
+        <CursorPos X="3" Y="2218"/>
+        <TopLine Value="2218"/>
+        <UsageCount Value="8"/>
+      </Unit49>
+      <Unit50>
         <Filename Value="common_gui_utils.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="common_gui_utils"/>
         <CursorPos X="1" Y="1"/>
         <TopLine Value="1"/>
-        <EditorIndex Value="10"/>
-        <UsageCount Value="149"/>
+        <EditorIndex Value="15"/>
+        <UsageCount Value="175"/>
         <Loaded Value="True"/>
-      </Unit52>
-      <Unit53>
+      </Unit50>
+      <Unit51>
         <Filename Value="..\..\..\..\..\DOCUME~1\ADMINI~1\LOCALS~1\Temp\DestBug.pas"/>
         <UnitName Value="DestBug"/>
         <CursorPos X="1" Y="1"/>
         <TopLine Value="1"/>
-        <UsageCount Value="3"/>
-      </Unit53>
-      <Unit54>
+        <UsageCount Value="1"/>
+      </Unit51>
+      <Unit52>
         <Filename Value="uargedit.pas"/>
         <ComponentName Value="fArgEdit"/>
         <IsPartOfProject Value="True"/>
@@ -472,23 +464,23 @@
         <UnitName Value="uargedit"/>
         <CursorPos X="2" Y="12"/>
         <TopLine Value="1"/>
-        <UsageCount Value="142"/>
-      </Unit54>
-      <Unit55>
+        <UsageCount Value="168"/>
+      </Unit52>
+      <Unit53>
         <Filename Value="..\..\..\..\..\lazarus_23_215XX\lcl\interfaces\win32\win32wscontrols.pp"/>
         <UnitName Value="Win32WSControls"/>
         <CursorPos X="1" Y="226"/>
         <TopLine Value="212"/>
-        <UsageCount Value="4"/>
-      </Unit55>
-      <Unit56>
+        <UsageCount Value="2"/>
+      </Unit53>
+      <Unit54>
         <Filename Value="umain.lfm"/>
         <CursorPos X="19" Y="1822"/>
         <TopLine Value="1858"/>
-        <UsageCount Value="4"/>
+        <UsageCount Value="2"/>
         <SyntaxHighlighter Value="LFM"/>
-      </Unit56>
-      <Unit57>
+      </Unit54>
+      <Unit55>
         <Filename Value="umoduleedit.pas"/>
         <ComponentName Value="fModuleEdit"/>
         <IsPartOfProject Value="True"/>
@@ -496,16 +488,16 @@
         <UnitName Value="umoduleedit"/>
         <CursorPos X="2" Y="12"/>
         <TopLine Value="1"/>
-        <UsageCount Value="134"/>
-      </Unit57>
-      <Unit58>
+        <UsageCount Value="160"/>
+      </Unit55>
+      <Unit56>
         <Filename Value="..\..\..\..\..\lazarus_23_215XX\lcl\stdctrls.pp"/>
         <UnitName Value="StdCtrls"/>
         <CursorPos X="3" Y="1020"/>
         <TopLine Value="1006"/>
-        <UsageCount Value="4"/>
-      </Unit58>
-      <Unit59>
+        <UsageCount Value="2"/>
+      </Unit56>
+      <Unit57>
         <Filename Value="ubindingedit.pas"/>
         <ComponentName Value="fBindingEdit"/>
         <IsPartOfProject Value="True"/>
@@ -513,40 +505,40 @@
         <UnitName Value="ubindingedit"/>
         <CursorPos X="2" Y="12"/>
         <TopLine Value="1"/>
-        <UsageCount Value="124"/>
-      </Unit59>
-      <Unit60>
+        <UsageCount Value="150"/>
+      </Unit57>
+      <Unit58>
         <Filename Value="..\..\..\..\..\lazarus_23_215XX\fpc\source\rtl\inc\objpash.inc"/>
         <CursorPos X="26" Y="158"/>
         <TopLine Value="135"/>
-        <UsageCount Value="5"/>
-      </Unit60>
-      <Unit61>
+        <UsageCount Value="3"/>
+      </Unit58>
+      <Unit59>
         <Filename Value="..\..\..\..\..\lazarus_23_215XX\fpc\source\rtl\inc\objpas.inc"/>
         <CursorPos X="11" Y="550"/>
         <TopLine Value="645"/>
-        <UsageCount Value="5"/>
-      </Unit61>
-      <Unit62>
+        <UsageCount Value="3"/>
+      </Unit59>
+      <Unit60>
         <Filename Value="..\..\..\..\..\lazarus_23_215XX\fpc\source\rtl\objpas\classes\classesh.inc"/>
         <CursorPos X="15" Y="257"/>
         <TopLine Value="233"/>
-        <UsageCount Value="10"/>
-      </Unit62>
-      <Unit63>
+        <UsageCount Value="8"/>
+      </Unit60>
+      <Unit61>
         <Filename Value="..\..\..\..\..\lazarus_23_215XX\fpc\source\rtl\objpas\classes\lists.inc"/>
         <CursorPos X="3" Y="537"/>
         <TopLine Value="535"/>
-        <UsageCount Value="10"/>
-      </Unit63>
-      <Unit64>
+        <UsageCount Value="8"/>
+      </Unit61>
+      <Unit62>
         <Filename Value="..\..\..\..\..\lazarus_23_215XX\fpc\source\packages\fcl-base\src\inc\contnrs.pp"/>
         <UnitName Value="contnrs"/>
         <CursorPos X="15" Y="167"/>
         <TopLine Value="145"/>
-        <UsageCount Value="10"/>
-      </Unit64>
-      <Unit65>
+        <UsageCount Value="8"/>
+      </Unit62>
+      <Unit63>
         <Filename Value="ufrmsaveoption.pas"/>
         <ComponentName Value="frmSaveOptions"/>
         <IsPartOfProject Value="True"/>
@@ -554,42 +546,44 @@
         <UnitName Value="ufrmsaveoption"/>
         <CursorPos X="42" Y="64"/>
         <TopLine Value="42"/>
-        <UsageCount Value="120"/>
-      </Unit65>
-      <Unit66>
+        <UsageCount Value="146"/>
+      </Unit63>
+      <Unit64>
         <Filename Value="..\..\..\..\..\lazarus_23_215XX\lcl\dialogs.pp"/>
         <UnitName Value="Dialogs"/>
         <CursorPos X="3" Y="44"/>
         <TopLine Value="27"/>
-        <UsageCount Value="5"/>
-      </Unit66>
-      <Unit67>
+        <UsageCount Value="3"/>
+      </Unit64>
+      <Unit65>
         <Filename Value="..\..\..\..\..\lazarus_23_215XX\fpc\source\packages\fcl-xml\src\dom.pp"/>
         <UnitName Value="DOM"/>
         <CursorPos X="3" Y="1459"/>
         <TopLine Value="1455"/>
-        <UsageCount Value="5"/>
-      </Unit67>
-      <Unit68>
+        <UsageCount Value="3"/>
+      </Unit65>
+      <Unit66>
         <Filename Value="..\wst_rtti_filter\cursor_intf.pas"/>
         <UnitName Value="cursor_intf"/>
-        <CursorPos X="2" Y="90"/>
-        <TopLine Value="71"/>
-        <UsageCount Value="22"/>
-      </Unit68>
-      <Unit69>
+        <CursorPos X="1" Y="107"/>
+        <TopLine Value="93"/>
+        <EditorIndex Value="3"/>
+        <UsageCount Value="34"/>
+        <Loaded Value="True"/>
+      </Unit66>
+      <Unit67>
         <Filename Value="..\..\..\..\..\lazarus_23_215XX\lcl\include\control.inc"/>
         <CursorPos X="1" Y="2403"/>
         <TopLine Value="2390"/>
-        <UsageCount Value="5"/>
-      </Unit69>
-      <Unit70>
+        <UsageCount Value="3"/>
+      </Unit67>
+      <Unit68>
         <Filename Value="..\..\..\..\..\lazarus_23_215XX\lcl\include\customform.inc"/>
         <CursorPos X="1" Y="1417"/>
         <TopLine Value="1398"/>
-        <UsageCount Value="5"/>
-      </Unit70>
-      <Unit71>
+        <UsageCount Value="3"/>
+      </Unit68>
+      <Unit69>
         <Filename Value="ufarrayedit.pas"/>
         <ComponentName Value="fArrayEdit"/>
         <IsPartOfProject Value="True"/>
@@ -597,9 +591,9 @@
         <UnitName Value="ufarrayedit"/>
         <CursorPos X="67" Y="117"/>
         <TopLine Value="95"/>
-        <UsageCount Value="104"/>
-      </Unit71>
-      <Unit72>
+        <UsageCount Value="130"/>
+      </Unit69>
+      <Unit70>
         <Filename Value="uftypealiasedit.pas"/>
         <ComponentName Value="fTypeAliasEdit"/>
         <IsPartOfProject Value="True"/>
@@ -607,72 +601,72 @@
         <UnitName Value="uftypealiasedit"/>
         <CursorPos X="21" Y="1"/>
         <TopLine Value="1"/>
-        <UsageCount Value="95"/>
-      </Unit72>
-      <Unit73>
+        <UsageCount Value="121"/>
+      </Unit70>
+      <Unit71>
         <Filename Value="..\..\..\..\..\Documents and Settings\Administrateur\Bureau\ACER\n\AWSECommerceService.pas"/>
         <UnitName Value="AWSECommerceService"/>
         <CursorPos X="1" Y="1"/>
         <TopLine Value="1"/>
-        <UsageCount Value="17"/>
-      </Unit73>
-      <Unit74>
+        <UsageCount Value="15"/>
+      </Unit71>
+      <Unit72>
         <Filename Value="..\..\..\..\..\Documents and Settings\Administrateur\Bureau\ACER\n\AWSECommerceService_proxy.pas"/>
         <UnitName Value="AWSECommerceService_proxy"/>
         <CursorPos X="1" Y="1"/>
         <TopLine Value="1"/>
-        <UsageCount Value="17"/>
-      </Unit74>
-      <Unit75>
+        <UsageCount Value="15"/>
+      </Unit72>
+      <Unit73>
         <Filename Value="..\..\..\..\..\lazarus_23_215XX\fpc\source\rtl\objpas\typinfo.pp"/>
         <UnitName Value="typinfo"/>
         <CursorPos X="1" Y="1"/>
         <TopLine Value="22"/>
-        <UsageCount Value="7"/>
-      </Unit75>
-      <Unit76>
+        <UsageCount Value="5"/>
+      </Unit73>
+      <Unit74>
         <Filename Value="..\..\..\..\..\lazarus_23_215XX\fpc\source\rtl\objpas\sysutils\sysstrh.inc"/>
         <CursorPos X="10" Y="84"/>
         <TopLine Value="57"/>
-        <UsageCount Value="7"/>
-      </Unit76>
-      <Unit77>
+        <UsageCount Value="5"/>
+      </Unit74>
+      <Unit75>
         <Filename Value="..\..\..\..\..\lazarus_23_215XX\fpc\source\rtl\objpas\sysutils\sysansih.inc"/>
         <CursorPos X="10" Y="24"/>
         <TopLine Value="1"/>
-        <UsageCount Value="7"/>
-      </Unit77>
-      <Unit78>
+        <UsageCount Value="5"/>
+      </Unit75>
+      <Unit76>
         <Filename Value="..\..\..\..\..\lazarus_23_215XX\fpc\source\rtl\objpas\sysutils\sysansi.inc"/>
         <CursorPos X="13" Y="51"/>
         <TopLine Value="42"/>
-        <UsageCount Value="7"/>
-      </Unit78>
-      <Unit79>
+        <UsageCount Value="5"/>
+      </Unit76>
+      <Unit77>
         <Filename Value="..\..\..\..\..\lazarus_23_215XX\fpc\source\rtl\inc\systemh.inc"/>
         <CursorPos X="11" Y="577"/>
         <TopLine Value="562"/>
-        <UsageCount Value="7"/>
-      </Unit79>
-      <Unit80>
+        <UsageCount Value="5"/>
+      </Unit77>
+      <Unit78>
         <Filename Value="..\..\..\..\..\lazarus_23_215XX\fpc\source\rtl\inc\astrings.inc"/>
         <CursorPos X="3" Y="747"/>
         <TopLine Value="742"/>
-        <UsageCount Value="7"/>
-      </Unit80>
-      <Unit81>
+        <UsageCount Value="5"/>
+      </Unit78>
+      <Unit79>
         <Filename Value="..\..\..\..\..\lazarus_23_215XX\fpc\source\rtl\objpas\classes\streams.inc"/>
         <CursorPos X="7" Y="124"/>
         <TopLine Value="117"/>
-        <UsageCount Value="8"/>
-      </Unit81>
-      <Unit82>
+        <UsageCount Value="6"/>
+      </Unit79>
+      <Unit80>
         <Filename Value="..\wst_global.inc"/>
         <CursorPos X="1" Y="1"/>
         <TopLine Value="1"/>
-        <UsageCount Value="10"/>
-      </Unit82>
-      <Unit83>
+        <UsageCount Value="8"/>
+      </Unit80>
+      <Unit81>
         <Filename Value="ufrecordedit.pas"/>
         <ComponentName Value="fRecordEdit"/>
         <IsPartOfProject Value="True"/>
@@ -680,89 +674,106 @@
         <UnitName Value="ufrecordedit"/>
         <CursorPos X="35" Y="99"/>
         <TopLine Value="78"/>
-        <EditorIndex Value="12"/>
-        <UsageCount Value="61"/>
+        <EditorIndex Value="17"/>
+        <UsageCount Value="87"/>
         <Loaded Value="True"/>
-      </Unit83>
-      <Unit84>
+      </Unit81>
+      <Unit82>
         <Filename Value="..\ws_helper\wsdl_generator.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="wsdl_generator"/>
-        <CursorPos X="45" Y="21"/>
+        <CursorPos X="35" Y="21"/>
         <TopLine Value="1"/>
-        <EditorIndex Value="4"/>
-        <UsageCount Value="32"/>
+        <EditorIndex Value="8"/>
+        <UsageCount Value="58"/>
+        <Loaded Value="True"/>
+      </Unit82>
+      <Unit83>
+        <Filename Value="..\ws_helper\wsdl_parser.pas"/>
+        <UnitName Value="wsdl_parser"/>
+        <CursorPos X="1" Y="712"/>
+        <TopLine Value="698"/>
+        <EditorIndex Value="1"/>
+        <UsageCount Value="24"/>
+        <Loaded Value="True"/>
+      </Unit83>
+      <Unit84>
+        <Filename Value="..\ws_helper\xsd_parser.pas"/>
+        <IsPartOfProject Value="True"/>
+        <UnitName Value="xsd_parser"/>
+        <CursorPos X="1" Y="331"/>
+        <TopLine Value="317"/>
+        <EditorIndex Value="2"/>
+        <UsageCount Value="45"/>
         <Loaded Value="True"/>
       </Unit84>
       <Unit85>
-        <Filename Value="..\ws_helper\wsdl_parser.pas"/>
-        <UnitName Value="wsdl_parser"/>
-        <CursorPos X="38" Y="1136"/>
-        <TopLine Value="1113"/>
-        <EditorIndex Value="1"/>
-        <UsageCount Value="12"/>
-        <Loaded Value="True"/>
-      </Unit85>
-      <Unit86>
-        <Filename Value="..\ws_helper\xsd_parser.pas"/>
-        <UnitName Value="xsd_parser"/>
-        <CursorPos X="15" Y="93"/>
-        <TopLine Value="78"/>
-        <EditorIndex Value="2"/>
-        <UsageCount Value="12"/>
-        <Loaded Value="True"/>
-      </Unit86>
-      <Unit87>
         <Filename Value="..\..\..\..\..\lazarus_23_2.2.1\fpc\2.2.1\source\rtl\inc\objpas.inc"/>
         <CursorPos X="1" Y="58"/>
         <TopLine Value="43"/>
-        <UsageCount Value="10"/>
-      </Unit87>
-      <Unit88>
+        <UsageCount Value="8"/>
+      </Unit85>
+      <Unit86>
         <Filename Value="..\..\..\..\..\lazarus_23_2.2.1\fpc\2.2.1\source\rtl\inc\except.inc"/>
         <CursorPos X="1" Y="95"/>
         <TopLine Value="80"/>
-        <UsageCount Value="10"/>
-      </Unit88>
-      <Unit89>
+        <UsageCount Value="8"/>
+      </Unit86>
+      <Unit87>
         <Filename Value="..\..\..\..\..\lazarus_23_2.2.1\fpc\2.2.1\source\rtl\i386\setjump.inc"/>
         <CursorPos X="1" Y="36"/>
         <TopLine Value="21"/>
-        <UsageCount Value="10"/>
-      </Unit89>
-      <Unit90>
+        <UsageCount Value="8"/>
+      </Unit87>
+      <Unit88>
         <Filename Value="..\..\..\..\..\lazarus_23_2.2.1\fpc\2.2.1\source\rtl\i386\i386.inc"/>
         <CursorPos X="1" Y="1250"/>
         <TopLine Value="1235"/>
-        <UsageCount Value="10"/>
-      </Unit90>
-      <Unit91>
+        <UsageCount Value="8"/>
+      </Unit88>
+      <Unit89>
         <Filename Value="..\..\..\..\..\lazarus_23_2.2.1\fpc\2.2.1\source\rtl\win32\classes.pp"/>
         <UnitName Value="Classes"/>
         <CursorPos X="1" Y="50"/>
         <TopLine Value="21"/>
-        <UsageCount Value="10"/>
-      </Unit91>
-      <Unit92>
+        <UsageCount Value="8"/>
+      </Unit89>
+      <Unit90>
         <Filename Value="..\..\..\..\..\lazarus_23_2.2.1\fpc\2.2.1\source\rtl\objpas\classes\intf.inc"/>
         <CursorPos X="1" Y="35"/>
         <TopLine Value="194"/>
-        <UsageCount Value="10"/>
+        <UsageCount Value="8"/>
+      </Unit90>
+      <Unit91>
+        <Filename Value="..\ws_helper\ws_parser_imp.pas"/>
+        <UnitName Value="ws_parser_imp"/>
+        <CursorPos X="1" Y="1274"/>
+        <TopLine Value="1260"/>
+        <EditorIndex Value="6"/>
+        <UsageCount Value="22"/>
+        <Loaded Value="True"/>
+      </Unit91>
+      <Unit92>
+        <Filename Value="..\..\..\..\..\lazarus_23_215XX\lcl\include\containedaction.inc"/>
+        <CursorPos X="1" Y="110"/>
+        <TopLine Value="96"/>
+        <UsageCount Value="8"/>
       </Unit92>
+      <Unit93>
+        <Filename Value="..\ws_helper\xsd_generator.pas"/>
+        <UnitName Value="xsd_generator"/>
+        <CursorPos X="1" Y="514"/>
+        <TopLine Value="500"/>
+        <EditorIndex Value="9"/>
+        <UsageCount Value="22"/>
+        <Loaded Value="True"/>
+      </Unit93>
     </Units>
-    <JumpHistory Count="3" HistoryIndex="2">
+    <JumpHistory Count="1" HistoryIndex="0">
       <Position1>
-        <Filename Value="uwsttypelibraryedit.pas"/>
-        <Caret Line="170" Column="45" TopLine="151"/>
+        <Filename Value="typ_lib_edtr.lpr"/>
+        <Caret Line="21" Column="1" TopLine="1"/>
       </Position1>
-      <Position2>
-        <Filename Value="uwsttypelibraryedit.pas"/>
-        <Caret Line="378" Column="17" TopLine="364"/>
-      </Position2>
-      <Position3>
-        <Filename Value="uwsttypelibraryedit.pas"/>
-        <Caret Line="172" Column="59" TopLine="151"/>
-      </Position3>
     </JumpHistory>
   </ProjectOptions>
   <CompilerOptions>
@@ -787,7 +798,7 @@
     </CodeGeneration>
     <Linking>
       <Debugging>
-        <UseLineInfoUnit Value="False"/>
+        <GenerateDebugInfo Value="True"/>
         <StripSymbols Value="True"/>
       </Debugging>
       <LinkSmart Value="True"/>
@@ -802,6 +813,16 @@
     </Other>
   </CompilerOptions>
   <Debugging>
+    <BreakPoints Count="2">
+      <Item1>
+        <Source Value="..\ws_helper\wsdl_parser.pas"/>
+        <Line Value="1045"/>
+      </Item1>
+      <Item2>
+        <Source Value="..\ws_helper\wsdl_parser.pas"/>
+        <Line Value="1042"/>
+      </Item2>
+    </BreakPoints>
     <Exceptions Count="2">
       <Item1>
         <Name Value="ECodetoolError"/>
diff --git a/wst/trunk/type_lib_edtr/typ_lib_edtr.lpr b/wst/trunk/type_lib_edtr/typ_lib_edtr.lpr
index 17be7f5f2..3695c65d6 100644
--- a/wst/trunk/type_lib_edtr/typ_lib_edtr.lpr
+++ b/wst/trunk/type_lib_edtr/typ_lib_edtr.lpr
@@ -12,7 +12,7 @@ uses
   edit_helper, ufclassedit, ufpropedit, uinterfaceedit, udm,
   pascal_parser_intf, PasTree, PParser, uprocedit, common_gui_utils, uargedit,
   umoduleedit, ubindingedit, ufrmsaveoption, ufarrayedit, generator,
-  uftypealiasedit, ufrecordedit, wsdl_generator;
+  uftypealiasedit, ufrecordedit, wsdl_generator, xsd_parser;
 
 begin
   Application.Initialize;
diff --git a/wst/trunk/type_lib_edtr/uwsttypelibraryedit.lfm b/wst/trunk/type_lib_edtr/uwsttypelibraryedit.lfm
index 0dde68c23..226dc1518 100644
--- a/wst/trunk/type_lib_edtr/uwsttypelibraryedit.lfm
+++ b/wst/trunk/type_lib_edtr/uwsttypelibraryedit.lfm
@@ -78,11 +78,9 @@ object fWstTypeLibraryEdit: TfWstTypeLibraryEdit
           PopupMenu = PopupMenu2
           TabOrder = 0
           BookMarkOptions.Xoffset = 81
-          BookMarkOptions.OnChange = nil
           Gutter.DigitCount = 5
           Gutter.ShowLineNumbers = True
           Gutter.ShowCodeFolding = True
-          Gutter.OnChange = nil
           Gutter.CodeFoldingWidth = 14
           Highlighter = SynPasSyn1
           Keystrokes = <          
@@ -407,7 +405,6 @@ object fWstTypeLibraryEdit: TfWstTypeLibraryEdit
               ShortCut = 24642
             end>
           ReadOnly = True
-          SelectedColor.OnChange = nil
         end
       end
       object tsWSDL: TTabSheet
@@ -427,9 +424,7 @@ object fWstTypeLibraryEdit: TfWstTypeLibraryEdit
           PopupMenu = PopupMenu2
           TabOrder = 0
           BookMarkOptions.Xoffset = 54
-          BookMarkOptions.OnChange = nil
           Gutter.ShowLineNumbers = True
-          Gutter.OnChange = nil
           Gutter.CodeFoldingWidth = 14
           Highlighter = SynXMLSyn1
           Keystrokes = <          
@@ -754,7 +749,6 @@ object fWstTypeLibraryEdit: TfWstTypeLibraryEdit
               ShortCut = 24642
             end>
           ReadOnly = True
-          SelectedColor.OnChange = nil
         end
       end
       object tsProxy: TTabSheet
@@ -774,9 +768,11 @@ object fWstTypeLibraryEdit: TfWstTypeLibraryEdit
           PopupMenu = PopupMenu2
           TabOrder = 0
           BookMarkOptions.Xoffset = 81
+          BookMarkOptions.OnChange = nil
           Gutter.DigitCount = 5
           Gutter.ShowLineNumbers = True
           Gutter.ShowCodeFolding = True
+          Gutter.OnChange = nil
           Gutter.CodeFoldingWidth = 14
           Highlighter = SynPasSyn1
           Keystrokes = <          
@@ -1101,6 +1097,7 @@ object fWstTypeLibraryEdit: TfWstTypeLibraryEdit
               ShortCut = 24642
             end>
           ReadOnly = True
+          SelectedColor.OnChange = nil
         end
       end
       object tsImp: TTabSheet
@@ -1120,9 +1117,11 @@ object fWstTypeLibraryEdit: TfWstTypeLibraryEdit
           PopupMenu = PopupMenu2
           TabOrder = 0
           BookMarkOptions.Xoffset = 81
+          BookMarkOptions.OnChange = nil
           Gutter.DigitCount = 5
           Gutter.ShowLineNumbers = True
           Gutter.ShowCodeFolding = True
+          Gutter.OnChange = nil
           Gutter.CodeFoldingWidth = 14
           Highlighter = SynPasSyn1
           Keystrokes = <          
@@ -1447,6 +1446,7 @@ object fWstTypeLibraryEdit: TfWstTypeLibraryEdit
               ShortCut = 24642
             end>
           ReadOnly = True
+          SelectedColor.OnChange = nil
         end
       end
       object tsBinder: TTabSheet
@@ -1466,10 +1466,12 @@ object fWstTypeLibraryEdit: TfWstTypeLibraryEdit
           PopupMenu = PopupMenu2
           TabOrder = 0
           BookMarkOptions.Xoffset = 81
+          BookMarkOptions.OnChange = nil
           Gutter.AutoSize = True
           Gutter.DigitCount = 5
           Gutter.ShowLineNumbers = True
           Gutter.ShowCodeFolding = True
+          Gutter.OnChange = nil
           Gutter.CodeFoldingWidth = 14
           Highlighter = SynPasSyn1
           Keystrokes = <          
@@ -1794,6 +1796,7 @@ object fWstTypeLibraryEdit: TfWstTypeLibraryEdit
               ShortCut = 24642
             end>
           ReadOnly = True
+          SelectedColor.OnChange = nil
         end
       end
       object tsLog: TTabSheet
@@ -1926,6 +1929,7 @@ object fWstTypeLibraryEdit: TfWstTypeLibraryEdit
       Caption = 'Open File'
       DisableIfNoHandler = True
       OnExecute = actOpenFileExecute
+      ShortCut = 16463
     end
     object actExit: TAction
       Caption = 'Exit'
@@ -1994,6 +1998,7 @@ object fWstTypeLibraryEdit: TfWstTypeLibraryEdit
       Caption = 'Save'
       DisableIfNoHandler = True
       OnExecute = actSaveExecute
+      ShortCut = 16467
     end
     object actDelete: TAction
       Caption = 'Delete'
diff --git a/wst/trunk/type_lib_edtr/uwsttypelibraryedit.lrs b/wst/trunk/type_lib_edtr/uwsttypelibraryedit.lrs
index ec4054c52..43fb1e426 100644
--- a/wst/trunk/type_lib_edtr/uwsttypelibraryedit.lrs
+++ b/wst/trunk/type_lib_edtr/uwsttypelibraryedit.lrs
@@ -22,63 +22,61 @@ LazarusResources.Add('TfWstTypeLibraryEdit','FORMDATA',[
   +'='#2#5'Width'#3#245#1#5'Align'#7#8'alClient'#12'Font.CharSet'#7#12'ANSI_CHA'
   +'RSET'#10'Font.Color'#7#7'clBlack'#11'Font.Height'#2#236#9'Font.Name'#6#7'Co'
   +'urier'#10'Font.Pitch'#7#7'fpFixed'#11'ParentColor'#8#9'PopupMenu'#7#10'Popu'
-  +'pMenu2'#8'TabOrder'#2#0#23'BookMarkOptions.Xoffset'#2'Q'#24'BookMarkOptions'
-  +'.OnChange'#13#17'Gutter.DigitCount'#2#5#22'Gutter.ShowLineNumbers'#9#22'Gut'
-  +'ter.ShowCodeFolding'#9#15'Gutter.OnChange'#13#23'Gutter.CodeFoldingWidth'#2
-  +#14#11'Highlighter'#7#10'SynPasSyn1'#10'Keystrokes'#14#1#7'Command'#2#3#8'Sh'
-  +'ortCut'#2'&'#0#1#7'Command'#2'g'#8'ShortCut'#3'& '#0#1#7'Command'#3#211#0#8
-  +'ShortCut'#3'&@'#0#1#7'Command'#2#4#8'ShortCut'#2'('#0#1#7'Command'#2'h'#8'S'
-  +'hortCut'#3'( '#0#1#7'Command'#3#212#0#8'ShortCut'#3'(@'#0#1#7'Command'#2#1#8
-  +'ShortCut'#2'%'#0#1#7'Command'#2'e'#8'ShortCut'#3'% '#0#1#7'Command'#2#5#8'S'
-  +'hortCut'#3'%@'#0#1#7'Command'#2'i'#8'ShortCut'#3'%`'#0#1#7'Command'#2#2#8'S'
-  +'hortCut'#2''''#0#1#7'Command'#2'f'#8'ShortCut'#3''' '#0#1#7'Command'#2#6#8
-  +'ShortCut'#3'''@'#0#1#7'Command'#2'j'#8'ShortCut'#3'''`'#0#1#7'Command'#2#10
-  +#8'ShortCut'#2'"'#0#1#7'Command'#2'n'#8'ShortCut'#3'" '#0#1#7'Command'#2#14#8
-  +'ShortCut'#3'"@'#0#1#7'Command'#2'r'#8'ShortCut'#3'"`'#0#1#7'Command'#2#9#8
-  +'ShortCut'#2'!'#0#1#7'Command'#2'm'#8'ShortCut'#3'! '#0#1#7'Command'#2#13#8
-  +'ShortCut'#3'!@'#0#1#7'Command'#2'q'#8'ShortCut'#3'!`'#0#1#7'Command'#2#7#8
-  +'ShortCut'#2'$'#0#1#7'Command'#2'k'#8'ShortCut'#3'$ '#0#1#7'Command'#2#15#8
-  +'ShortCut'#3'$@'#0#1#7'Command'#2's'#8'ShortCut'#3'$`'#0#1#7'Command'#2#8#8
-  +'ShortCut'#2'#'#0#1#7'Command'#2'l'#8'ShortCut'#3'# '#0#1#7'Command'#2#16#8
-  +'ShortCut'#3'#@'#0#1#7'Command'#2't'#8'ShortCut'#3'#`'#0#1#7'Command'#3#223#0
-  +#8'ShortCut'#2'-'#0#1#7'Command'#3#201#0#8'ShortCut'#3'-@'#0#1#7'Command'#3
-  +'\'#2#8'ShortCut'#3'- '#0#1#7'Command'#3#246#1#8'ShortCut'#2'.'#0#1#7'Comman'
-  +'d'#3'['#2#8'ShortCut'#3'. '#0#1#7'Command'#3#245#1#8'ShortCut'#2#8#0#1#7'Co'
-  +'mmand'#3#245#1#8'ShortCut'#3#8' '#0#1#7'Command'#3#248#1#8'ShortCut'#3#8'@'
-  +#0#1#7'Command'#3'Y'#2#8'ShortCut'#4#8#128#0#0#0#1#7'Command'#3'Z'#2#8'Short'
-  +'Cut'#4#8#160#0#0#0#1#7'Command'#3#253#1#8'ShortCut'#2#13#0#1#7'Command'#3
-  +#199#0#8'ShortCut'#3'A@'#0#1#7'Command'#3#201#0#8'ShortCut'#3'C@'#0#1#7'Comm'
-  +'and'#3'b'#2#8'ShortCut'#3'I`'#0#1#7'Command'#3#253#1#8'ShortCut'#3'M@'#0#1#7
-  +'Command'#3#254#1#8'ShortCut'#3'N@'#0#1#7'Command'#3#247#1#8'ShortCut'#3'T@'
-  +#0#1#7'Command'#3'c'#2#8'ShortCut'#3'U`'#0#1#7'Command'#3'\'#2#8'ShortCut'#3
-  +'V@'#0#1#7'Command'#3'['#2#8'ShortCut'#3'X@'#0#1#7'Command'#3#251#1#8'ShortC'
-  +'ut'#3'Y@'#0#1#7'Command'#3#250#1#8'ShortCut'#3'Y`'#0#1#7'Command'#3'Y'#2#8
-  +'ShortCut'#3'Z@'#0#1#7'Command'#3'Z'#2#8'ShortCut'#3'Z`'#0#1#7'Command'#3'-'
-  +#1#8'ShortCut'#3'0@'#0#1#7'Command'#3'.'#1#8'ShortCut'#3'1@'#0#1#7'Command'#3
-  +'/'#1#8'ShortCut'#3'2@'#0#1#7'Command'#3'0'#1#8'ShortCut'#3'3@'#0#1#7'Comman'
-  +'d'#3'1'#1#8'ShortCut'#3'4@'#0#1#7'Command'#3'2'#1#8'ShortCut'#3'5@'#0#1#7'C'
-  +'ommand'#3'3'#1#8'ShortCut'#3'6@'#0#1#7'Command'#3'4'#1#8'ShortCut'#3'7@'#0#1
-  +#7'Command'#3'5'#1#8'ShortCut'#3'8@'#0#1#7'Command'#3'6'#1#8'ShortCut'#3'9@'
-  +#0#1#7'Command'#3'_'#1#8'ShortCut'#3'0`'#0#1#7'Command'#3'`'#1#8'ShortCut'#3
-  +'1`'#0#1#7'Command'#3'a'#1#8'ShortCut'#3'2`'#0#1#7'Command'#3'b'#1#8'ShortCu'
-  +'t'#3'3`'#0#1#7'Command'#3'c'#1#8'ShortCut'#3'4`'#0#1#7'Command'#3'd'#1#8'Sh'
-  +'ortCut'#3'5`'#0#1#7'Command'#3'e'#1#8'ShortCut'#3'6`'#0#1#7'Command'#3'f'#1
-  +#8'ShortCut'#3'7`'#0#1#7'Command'#3'g'#1#8'ShortCut'#3'8`'#0#1#7'Command'#3
-  +'h'#1#8'ShortCut'#3'9`'#0#1#7'Command'#3#231#0#8'ShortCut'#3'N`'#0#1#7'Comma'
-  ,'nd'#3#232#0#8'ShortCut'#3'C`'#0#1#7'Command'#3#233#0#8'ShortCut'#3'L`'#0#1#7
-  +'Command'#3'd'#2#8'ShortCut'#2#9#0#1#7'Command'#3'e'#2#8'ShortCut'#3#9' '#0#1
-  +#7'Command'#3#250#0#8'ShortCut'#3'B`'#0#0#8'ReadOnly'#9#22'SelectedColor.OnC'
-  +'hange'#13#0#0#0#9'TTabSheet'#6'tsWSDL'#7'Caption'#6#5'&WSDL'#12'ClientHeigh'
-  +'t'#3'='#2#11'ClientWidth'#3#245#1#0#8'TSynEdit'#7'srcWSDL'#6'Height'#3'='#2
-  +#5'Width'#3#245#1#5'Align'#7#8'alClient'#12'Font.CharSet'#7#12'ANSI_CHARSET'
-  +#10'Font.Color'#7#7'clBlack'#11'Font.Height'#2#233#9'Font.Name'#6#7'Courier'
-  +#10'Font.Pitch'#7#7'fpFixed'#11'ParentColor'#8#9'PopupMenu'#7#10'PopupMenu2'
-  +#8'TabOrder'#2#0#23'BookMarkOptions.Xoffset'#2'6'#24'BookMarkOptions.OnChang'
-  +'e'#13#22'Gutter.ShowLineNumbers'#9#15'Gutter.OnChange'#13#23'Gutter.CodeFol'
-  +'dingWidth'#2#14#11'Highlighter'#7#10'SynXMLSyn1'#10'Keystrokes'#14#1#7'Comm'
-  +'and'#2#3#8'ShortCut'#2'&'#0#1#7'Command'#2'g'#8'ShortCut'#3'& '#0#1#7'Comma'
-  +'nd'#3#211#0#8'ShortCut'#3'&@'#0#1#7'Command'#2#4#8'ShortCut'#2'('#0#1#7'Com'
-  +'mand'#2'h'#8'ShortCut'#3'( '#0#1#7'Command'#3#212#0#8'ShortCut'#3'(@'#0#1#7
+  +'pMenu2'#8'TabOrder'#2#0#23'BookMarkOptions.Xoffset'#2'Q'#17'Gutter.DigitCou'
+  +'nt'#2#5#22'Gutter.ShowLineNumbers'#9#22'Gutter.ShowCodeFolding'#9#23'Gutter'
+  +'.CodeFoldingWidth'#2#14#11'Highlighter'#7#10'SynPasSyn1'#10'Keystrokes'#14#1
+  +#7'Command'#2#3#8'ShortCut'#2'&'#0#1#7'Command'#2'g'#8'ShortCut'#3'& '#0#1#7
+  +'Command'#3#211#0#8'ShortCut'#3'&@'#0#1#7'Command'#2#4#8'ShortCut'#2'('#0#1#7
+  +'Command'#2'h'#8'ShortCut'#3'( '#0#1#7'Command'#3#212#0#8'ShortCut'#3'(@'#0#1
+  +#7'Command'#2#1#8'ShortCut'#2'%'#0#1#7'Command'#2'e'#8'ShortCut'#3'% '#0#1#7
+  +'Command'#2#5#8'ShortCut'#3'%@'#0#1#7'Command'#2'i'#8'ShortCut'#3'%`'#0#1#7
+  +'Command'#2#2#8'ShortCut'#2''''#0#1#7'Command'#2'f'#8'ShortCut'#3''' '#0#1#7
+  +'Command'#2#6#8'ShortCut'#3'''@'#0#1#7'Command'#2'j'#8'ShortCut'#3'''`'#0#1#7
+  +'Command'#2#10#8'ShortCut'#2'"'#0#1#7'Command'#2'n'#8'ShortCut'#3'" '#0#1#7
+  +'Command'#2#14#8'ShortCut'#3'"@'#0#1#7'Command'#2'r'#8'ShortCut'#3'"`'#0#1#7
+  +'Command'#2#9#8'ShortCut'#2'!'#0#1#7'Command'#2'm'#8'ShortCut'#3'! '#0#1#7'C'
+  +'ommand'#2#13#8'ShortCut'#3'!@'#0#1#7'Command'#2'q'#8'ShortCut'#3'!`'#0#1#7
+  +'Command'#2#7#8'ShortCut'#2'$'#0#1#7'Command'#2'k'#8'ShortCut'#3'$ '#0#1#7'C'
+  +'ommand'#2#15#8'ShortCut'#3'$@'#0#1#7'Command'#2's'#8'ShortCut'#3'$`'#0#1#7
+  +'Command'#2#8#8'ShortCut'#2'#'#0#1#7'Command'#2'l'#8'ShortCut'#3'# '#0#1#7'C'
+  +'ommand'#2#16#8'ShortCut'#3'#@'#0#1#7'Command'#2't'#8'ShortCut'#3'#`'#0#1#7
+  +'Command'#3#223#0#8'ShortCut'#2'-'#0#1#7'Command'#3#201#0#8'ShortCut'#3'-@'#0
+  +#1#7'Command'#3'\'#2#8'ShortCut'#3'- '#0#1#7'Command'#3#246#1#8'ShortCut'#2
+  +'.'#0#1#7'Command'#3'['#2#8'ShortCut'#3'. '#0#1#7'Command'#3#245#1#8'ShortCu'
+  +'t'#2#8#0#1#7'Command'#3#245#1#8'ShortCut'#3#8' '#0#1#7'Command'#3#248#1#8'S'
+  +'hortCut'#3#8'@'#0#1#7'Command'#3'Y'#2#8'ShortCut'#4#8#128#0#0#0#1#7'Command'
+  +#3'Z'#2#8'ShortCut'#4#8#160#0#0#0#1#7'Command'#3#253#1#8'ShortCut'#2#13#0#1#7
+  +'Command'#3#199#0#8'ShortCut'#3'A@'#0#1#7'Command'#3#201#0#8'ShortCut'#3'C@'
+  +#0#1#7'Command'#3'b'#2#8'ShortCut'#3'I`'#0#1#7'Command'#3#253#1#8'ShortCut'#3
+  +'M@'#0#1#7'Command'#3#254#1#8'ShortCut'#3'N@'#0#1#7'Command'#3#247#1#8'Short'
+  +'Cut'#3'T@'#0#1#7'Command'#3'c'#2#8'ShortCut'#3'U`'#0#1#7'Command'#3'\'#2#8
+  +'ShortCut'#3'V@'#0#1#7'Command'#3'['#2#8'ShortCut'#3'X@'#0#1#7'Command'#3#251
+  +#1#8'ShortCut'#3'Y@'#0#1#7'Command'#3#250#1#8'ShortCut'#3'Y`'#0#1#7'Command'
+  +#3'Y'#2#8'ShortCut'#3'Z@'#0#1#7'Command'#3'Z'#2#8'ShortCut'#3'Z`'#0#1#7'Comm'
+  +'and'#3'-'#1#8'ShortCut'#3'0@'#0#1#7'Command'#3'.'#1#8'ShortCut'#3'1@'#0#1#7
+  +'Command'#3'/'#1#8'ShortCut'#3'2@'#0#1#7'Command'#3'0'#1#8'ShortCut'#3'3@'#0
+  +#1#7'Command'#3'1'#1#8'ShortCut'#3'4@'#0#1#7'Command'#3'2'#1#8'ShortCut'#3'5'
+  +'@'#0#1#7'Command'#3'3'#1#8'ShortCut'#3'6@'#0#1#7'Command'#3'4'#1#8'ShortCut'
+  +#3'7@'#0#1#7'Command'#3'5'#1#8'ShortCut'#3'8@'#0#1#7'Command'#3'6'#1#8'Short'
+  +'Cut'#3'9@'#0#1#7'Command'#3'_'#1#8'ShortCut'#3'0`'#0#1#7'Command'#3'`'#1#8
+  +'ShortCut'#3'1`'#0#1#7'Command'#3'a'#1#8'ShortCut'#3'2`'#0#1#7'Command'#3'b'
+  +#1#8'ShortCut'#3'3`'#0#1#7'Command'#3'c'#1#8'ShortCut'#3'4`'#0#1#7'Command'#3
+  +'d'#1#8'ShortCut'#3'5`'#0#1#7'Command'#3'e'#1#8'ShortCut'#3'6`'#0#1#7'Comman'
+  +'d'#3'f'#1#8'ShortCut'#3'7`'#0#1#7'Command'#3'g'#1#8'ShortCut'#3'8`'#0#1#7'C'
+  +'ommand'#3'h'#1#8'ShortCut'#3'9`'#0#1#7'Command'#3#231#0#8'ShortCut'#3'N`'#0
+  +#1#7'Command'#3#232#0#8'ShortCut'#3'C`'#0#1#7'Command'#3#233#0#8'ShortCut'#3
+  ,'L`'#0#1#7'Command'#3'd'#2#8'ShortCut'#2#9#0#1#7'Command'#3'e'#2#8'ShortCut'
+  +#3#9' '#0#1#7'Command'#3#250#0#8'ShortCut'#3'B`'#0#0#8'ReadOnly'#9#0#0#0#9'T'
+  +'TabSheet'#6'tsWSDL'#7'Caption'#6#5'&WSDL'#12'ClientHeight'#3'='#2#11'Client'
+  +'Width'#3#245#1#0#8'TSynEdit'#7'srcWSDL'#6'Height'#3'='#2#5'Width'#3#245#1#5
+  +'Align'#7#8'alClient'#12'Font.CharSet'#7#12'ANSI_CHARSET'#10'Font.Color'#7#7
+  +'clBlack'#11'Font.Height'#2#233#9'Font.Name'#6#7'Courier'#10'Font.Pitch'#7#7
+  +'fpFixed'#11'ParentColor'#8#9'PopupMenu'#7#10'PopupMenu2'#8'TabOrder'#2#0#23
+  +'BookMarkOptions.Xoffset'#2'6'#22'Gutter.ShowLineNumbers'#9#23'Gutter.CodeFo'
+  +'ldingWidth'#2#14#11'Highlighter'#7#10'SynXMLSyn1'#10'Keystrokes'#14#1#7'Com'
+  +'mand'#2#3#8'ShortCut'#2'&'#0#1#7'Command'#2'g'#8'ShortCut'#3'& '#0#1#7'Comm'
+  +'and'#3#211#0#8'ShortCut'#3'&@'#0#1#7'Command'#2#4#8'ShortCut'#2'('#0#1#7'Co'
+  +'mmand'#2'h'#8'ShortCut'#3'( '#0#1#7'Command'#3#212#0#8'ShortCut'#3'(@'#0#1#7
   +'Command'#2#1#8'ShortCut'#2'%'#0#1#7'Command'#2'e'#8'ShortCut'#3'% '#0#1#7'C'
   +'ommand'#2#5#8'ShortCut'#3'%@'#0#1#7'Command'#2'i'#8'ShortCut'#3'%`'#0#1#7'C'
   +'ommand'#2#2#8'ShortCut'#2''''#0#1#7'Command'#2'f'#8'ShortCut'#3''' '#0#1#7
@@ -117,23 +115,126 @@ LazarusResources.Add('TfWstTypeLibraryEdit','FORMDATA',[
   +'ommand'#3'h'#1#8'ShortCut'#3'9`'#0#1#7'Command'#3#231#0#8'ShortCut'#3'N`'#0
   +#1#7'Command'#3#232#0#8'ShortCut'#3'C`'#0#1#7'Command'#3#233#0#8'ShortCut'#3
   +'L`'#0#1#7'Command'#3'd'#2#8'ShortCut'#2#9#0#1#7'Command'#3'e'#2#8'ShortCut'
-  +#3#9' '#0#1#7'Command'#3#250#0#8'ShortCut'#3'B`'#0#0#8'ReadOnly'#9#22'Select'
-  +'edColor.OnChange'#13#0#0#0#9'TTabSheet'#7'tsProxy'#7'Caption'#6#6'&Proxy'#12
-  +'ClientHeight'#3'='#2#11'ClientWidth'#3#245#1#0#8'TSynEdit'#8'srcProxy'#6'He'
-  +'ight'#3'='#2#5'Width'#3#245#1#5'Align'#7#8'alClient'#12'Font.CharSet'#7#12
-  +'ANSI_CHARSET'#10'Font.Color'#7#7'clBlack'#11'Font.Height'#2#236#9'Font.Name'
-  +#6#7'Courier'#10'Font.Pitch'#7#7'fpFixed'#11'ParentColor'#8#9'PopupMenu'#7#10
-  +'PopupMenu2'#8'TabOrder'#2#0#23'BookMarkOptions.Xoffset'#2'Q'#17'Gutter.Digi'
-  +'tCount'#2#5#22'Gutter.ShowLineNumbers'#9#22'Gutter.ShowCodeFolding'#9#23'Gu'
-  +'tter.CodeFoldingWidth'#2#14#11'Highlighter'#7#10'SynPasSyn1'#10'Keystrokes'
-  +#14#1#7'Command'#2#3#8'ShortCut'#2'&'#0#1#7'Command'#2'g'#8'ShortCut'#3'& '#0
-  +#1#7'Command'#3#211#0#8'ShortCut'#3'&@'#0#1#7'Command'#2#4#8'ShortCut'#2'('#0
-  +#1#7'Command'#2'h'#8'ShortCut'#3'( '#0#1#7'Command'#3#212#0#8'ShortCut'#3'(@'
-  ,#0#1#7'Command'#2#1#8'ShortCut'#2'%'#0#1#7'Command'#2'e'#8'ShortCut'#3'% '#0
-  +#1#7'Command'#2#5#8'ShortCut'#3'%@'#0#1#7'Command'#2'i'#8'ShortCut'#3'%`'#0#1
-  +#7'Command'#2#2#8'ShortCut'#2''''#0#1#7'Command'#2'f'#8'ShortCut'#3''' '#0#1
-  +#7'Command'#2#6#8'ShortCut'#3'''@'#0#1#7'Command'#2'j'#8'ShortCut'#3'''`'#0#1
-  +#7'Command'#2#10#8'ShortCut'#2'"'#0#1#7'Command'#2'n'#8'ShortCut'#3'" '#0#1#7
+  +#3#9' '#0#1#7'Command'#3#250#0#8'ShortCut'#3'B`'#0#0#8'ReadOnly'#9#0#0#0#9'T'
+  +'TabSheet'#7'tsProxy'#7'Caption'#6#6'&Proxy'#12'ClientHeight'#3'='#2#11'Clie'
+  +'ntWidth'#3#245#1#0#8'TSynEdit'#8'srcProxy'#6'Height'#3'='#2#5'Width'#3#245#1
+  +#5'Align'#7#8'alClient'#12'Font.CharSet'#7#12'ANSI_CHARSET'#10'Font.Color'#7
+  +#7'clBlack'#11'Font.Height'#2#236#9'Font.Name'#6#7'Courier'#10'Font.Pitch'#7
+  +#7'fpFixed'#11'ParentColor'#8#9'PopupMenu'#7#10'PopupMenu2'#8'TabOrder'#2#0
+  +#23'BookMarkOptions.Xoffset'#2'Q'#24'BookMarkOptions.OnChange'#13#17'Gutter.'
+  +'DigitCount'#2#5#22'Gutter.ShowLineNumbers'#9#22'Gutter.ShowCodeFolding'#9#15
+  +'Gutter.OnChange'#13#23'Gutter.CodeFoldingWidth'#2#14#11'Highlighter'#7#10'S'
+  +'ynPasSyn1'#10'Keystrokes'#14#1#7'Command'#2#3#8'ShortCut'#2'&'#0#1#7'Comman'
+  +'d'#2'g'#8'ShortCut'#3'& '#0#1#7'Command'#3#211#0#8'ShortCut'#3'&@'#0#1#7'Co'
+  +'mmand'#2#4#8'ShortCut'#2'('#0#1#7'Command'#2'h'#8'ShortCut'#3'( '#0#1#7'Com'
+  +'mand'#3#212#0#8'ShortCut'#3'(@'#0#1#7'Command'#2#1#8'ShortCut'#2'%'#0#1#7'C'
+  +'ommand'#2'e'#8'ShortCut'#3'% '#0#1#7'Command'#2#5#8'ShortCut'#3'%@'#0#1#7'C'
+  ,'ommand'#2'i'#8'ShortCut'#3'%`'#0#1#7'Command'#2#2#8'ShortCut'#2''''#0#1#7'C'
+  +'ommand'#2'f'#8'ShortCut'#3''' '#0#1#7'Command'#2#6#8'ShortCut'#3'''@'#0#1#7
+  +'Command'#2'j'#8'ShortCut'#3'''`'#0#1#7'Command'#2#10#8'ShortCut'#2'"'#0#1#7
+  +'Command'#2'n'#8'ShortCut'#3'" '#0#1#7'Command'#2#14#8'ShortCut'#3'"@'#0#1#7
+  +'Command'#2'r'#8'ShortCut'#3'"`'#0#1#7'Command'#2#9#8'ShortCut'#2'!'#0#1#7'C'
+  +'ommand'#2'm'#8'ShortCut'#3'! '#0#1#7'Command'#2#13#8'ShortCut'#3'!@'#0#1#7
+  +'Command'#2'q'#8'ShortCut'#3'!`'#0#1#7'Command'#2#7#8'ShortCut'#2'$'#0#1#7'C'
+  +'ommand'#2'k'#8'ShortCut'#3'$ '#0#1#7'Command'#2#15#8'ShortCut'#3'$@'#0#1#7
+  +'Command'#2's'#8'ShortCut'#3'$`'#0#1#7'Command'#2#8#8'ShortCut'#2'#'#0#1#7'C'
+  +'ommand'#2'l'#8'ShortCut'#3'# '#0#1#7'Command'#2#16#8'ShortCut'#3'#@'#0#1#7
+  +'Command'#2't'#8'ShortCut'#3'#`'#0#1#7'Command'#3#223#0#8'ShortCut'#2'-'#0#1
+  +#7'Command'#3#201#0#8'ShortCut'#3'-@'#0#1#7'Command'#3'\'#2#8'ShortCut'#3'- '
+  +#0#1#7'Command'#3#246#1#8'ShortCut'#2'.'#0#1#7'Command'#3'['#2#8'ShortCut'#3
+  +'. '#0#1#7'Command'#3#245#1#8'ShortCut'#2#8#0#1#7'Command'#3#245#1#8'ShortCu'
+  +'t'#3#8' '#0#1#7'Command'#3#248#1#8'ShortCut'#3#8'@'#0#1#7'Command'#3'Y'#2#8
+  +'ShortCut'#4#8#128#0#0#0#1#7'Command'#3'Z'#2#8'ShortCut'#4#8#160#0#0#0#1#7'C'
+  +'ommand'#3#253#1#8'ShortCut'#2#13#0#1#7'Command'#3#199#0#8'ShortCut'#3'A@'#0
+  +#1#7'Command'#3#201#0#8'ShortCut'#3'C@'#0#1#7'Command'#3'b'#2#8'ShortCut'#3
+  +'I`'#0#1#7'Command'#3#253#1#8'ShortCut'#3'M@'#0#1#7'Command'#3#254#1#8'Short'
+  +'Cut'#3'N@'#0#1#7'Command'#3#247#1#8'ShortCut'#3'T@'#0#1#7'Command'#3'c'#2#8
+  +'ShortCut'#3'U`'#0#1#7'Command'#3'\'#2#8'ShortCut'#3'V@'#0#1#7'Command'#3'['
+  +#2#8'ShortCut'#3'X@'#0#1#7'Command'#3#251#1#8'ShortCut'#3'Y@'#0#1#7'Command'
+  +#3#250#1#8'ShortCut'#3'Y`'#0#1#7'Command'#3'Y'#2#8'ShortCut'#3'Z@'#0#1#7'Com'
+  +'mand'#3'Z'#2#8'ShortCut'#3'Z`'#0#1#7'Command'#3'-'#1#8'ShortCut'#3'0@'#0#1#7
+  +'Command'#3'.'#1#8'ShortCut'#3'1@'#0#1#7'Command'#3'/'#1#8'ShortCut'#3'2@'#0
+  +#1#7'Command'#3'0'#1#8'ShortCut'#3'3@'#0#1#7'Command'#3'1'#1#8'ShortCut'#3'4'
+  +'@'#0#1#7'Command'#3'2'#1#8'ShortCut'#3'5@'#0#1#7'Command'#3'3'#1#8'ShortCut'
+  +#3'6@'#0#1#7'Command'#3'4'#1#8'ShortCut'#3'7@'#0#1#7'Command'#3'5'#1#8'Short'
+  +'Cut'#3'8@'#0#1#7'Command'#3'6'#1#8'ShortCut'#3'9@'#0#1#7'Command'#3'_'#1#8
+  +'ShortCut'#3'0`'#0#1#7'Command'#3'`'#1#8'ShortCut'#3'1`'#0#1#7'Command'#3'a'
+  +#1#8'ShortCut'#3'2`'#0#1#7'Command'#3'b'#1#8'ShortCut'#3'3`'#0#1#7'Command'#3
+  +'c'#1#8'ShortCut'#3'4`'#0#1#7'Command'#3'd'#1#8'ShortCut'#3'5`'#0#1#7'Comman'
+  +'d'#3'e'#1#8'ShortCut'#3'6`'#0#1#7'Command'#3'f'#1#8'ShortCut'#3'7`'#0#1#7'C'
+  +'ommand'#3'g'#1#8'ShortCut'#3'8`'#0#1#7'Command'#3'h'#1#8'ShortCut'#3'9`'#0#1
+  +#7'Command'#3#231#0#8'ShortCut'#3'N`'#0#1#7'Command'#3#232#0#8'ShortCut'#3'C'
+  +'`'#0#1#7'Command'#3#233#0#8'ShortCut'#3'L`'#0#1#7'Command'#3'd'#2#8'ShortCu'
+  +'t'#2#9#0#1#7'Command'#3'e'#2#8'ShortCut'#3#9' '#0#1#7'Command'#3#250#0#8'Sh'
+  +'ortCut'#3'B`'#0#0#8'ReadOnly'#9#22'SelectedColor.OnChange'#13#0#0#0#9'TTabS'
+  +'heet'#5'tsImp'#7'Caption'#6#24'Im&plementation Skeleton'#12'ClientHeight'#3
+  +'='#2#11'ClientWidth'#3#245#1#0#8'TSynEdit'#6'srcImp'#6'Height'#3'='#2#5'Wid'
+  +'th'#3#245#1#5'Align'#7#8'alClient'#12'Font.CharSet'#7#12'ANSI_CHARSET'#10'F'
+  +'ont.Color'#7#7'clBlack'#11'Font.Height'#2#236#9'Font.Name'#6#7'Courier'#10
+  +'Font.Pitch'#7#7'fpFixed'#11'ParentColor'#8#9'PopupMenu'#7#10'PopupMenu2'#8
+  +'TabOrder'#2#0#23'BookMarkOptions.Xoffset'#2'Q'#24'BookMarkOptions.OnChange'
+  +#13#17'Gutter.DigitCount'#2#5#22'Gutter.ShowLineNumbers'#9#22'Gutter.ShowCod'
+  +'eFolding'#9#15'Gutter.OnChange'#13#23'Gutter.CodeFoldingWidth'#2#14#11'High'
+  +'lighter'#7#10'SynPasSyn1'#10'Keystrokes'#14#1#7'Command'#2#3#8'ShortCut'#2
+  +'&'#0#1#7'Command'#2'g'#8'ShortCut'#3'& '#0#1#7'Command'#3#211#0#8'ShortCut'
+  +#3'&@'#0#1#7'Command'#2#4#8'ShortCut'#2'('#0#1#7'Command'#2'h'#8'ShortCut'#3
+  +'( '#0#1#7'Command'#3#212#0#8'ShortCut'#3'(@'#0#1#7'Command'#2#1#8'ShortCut'
+  +#2'%'#0#1#7'Command'#2'e'#8'ShortCut'#3'% '#0#1#7'Command'#2#5#8'ShortCut'#3
+  +'%@'#0#1#7'Command'#2'i'#8'ShortCut'#3'%`'#0#1#7'Command'#2#2#8'ShortCut'#2
+  +''''#0#1#7'Command'#2'f'#8'ShortCut'#3''' '#0#1#7'Command'#2#6#8'ShortCut'#3
+  +'''@'#0#1#7'Command'#2'j'#8'ShortCut'#3'''`'#0#1#7'Command'#2#10#8'ShortCut'
+  +#2'"'#0#1#7'Command'#2'n'#8'ShortCut'#3'" '#0#1#7'Command'#2#14#8'ShortCut'#3
+  +'"@'#0#1#7'Command'#2'r'#8'ShortCut'#3'"`'#0#1#7'Command'#2#9#8'ShortCut'#2
+  +'!'#0#1#7'Command'#2'm'#8'ShortCut'#3'! '#0#1#7'Command'#2#13#8'ShortCut'#3
+  +'!@'#0#1#7'Command'#2'q'#8'ShortCut'#3'!`'#0#1#7'Command'#2#7#8'ShortCut'#2
+  +'$'#0#1#7'Command'#2'k'#8'ShortCut'#3'$ '#0#1#7'Command'#2#15#8'ShortCut'#3
+  +'$@'#0#1#7'Command'#2's'#8'ShortCut'#3'$`'#0#1#7'Command'#2#8#8'ShortCut'#2
+  +'#'#0#1#7'Command'#2'l'#8'ShortCut'#3'# '#0#1#7'Command'#2#16#8'ShortCut'#3
+  +'#@'#0#1#7'Command'#2't'#8'ShortCut'#3'#`'#0#1#7'Command'#3#223#0#8'ShortCut'
+  +#2'-'#0#1#7'Command'#3#201#0#8'ShortCut'#3'-@'#0#1#7'Command'#3'\'#2#8'Short'
+  +'Cut'#3'- '#0#1#7'Command'#3#246#1#8'ShortCut'#2'.'#0#1#7'Command'#3'['#2#8
+  ,'ShortCut'#3'. '#0#1#7'Command'#3#245#1#8'ShortCut'#2#8#0#1#7'Command'#3#245
+  +#1#8'ShortCut'#3#8' '#0#1#7'Command'#3#248#1#8'ShortCut'#3#8'@'#0#1#7'Comman'
+  +'d'#3'Y'#2#8'ShortCut'#4#8#128#0#0#0#1#7'Command'#3'Z'#2#8'ShortCut'#4#8#160
+  +#0#0#0#1#7'Command'#3#253#1#8'ShortCut'#2#13#0#1#7'Command'#3#199#0#8'ShortC'
+  +'ut'#3'A@'#0#1#7'Command'#3#201#0#8'ShortCut'#3'C@'#0#1#7'Command'#3'b'#2#8
+  +'ShortCut'#3'I`'#0#1#7'Command'#3#253#1#8'ShortCut'#3'M@'#0#1#7'Command'#3
+  +#254#1#8'ShortCut'#3'N@'#0#1#7'Command'#3#247#1#8'ShortCut'#3'T@'#0#1#7'Comm'
+  +'and'#3'c'#2#8'ShortCut'#3'U`'#0#1#7'Command'#3'\'#2#8'ShortCut'#3'V@'#0#1#7
+  +'Command'#3'['#2#8'ShortCut'#3'X@'#0#1#7'Command'#3#251#1#8'ShortCut'#3'Y@'#0
+  +#1#7'Command'#3#250#1#8'ShortCut'#3'Y`'#0#1#7'Command'#3'Y'#2#8'ShortCut'#3
+  +'Z@'#0#1#7'Command'#3'Z'#2#8'ShortCut'#3'Z`'#0#1#7'Command'#3'-'#1#8'ShortCu'
+  +'t'#3'0@'#0#1#7'Command'#3'.'#1#8'ShortCut'#3'1@'#0#1#7'Command'#3'/'#1#8'Sh'
+  +'ortCut'#3'2@'#0#1#7'Command'#3'0'#1#8'ShortCut'#3'3@'#0#1#7'Command'#3'1'#1
+  +#8'ShortCut'#3'4@'#0#1#7'Command'#3'2'#1#8'ShortCut'#3'5@'#0#1#7'Command'#3
+  +'3'#1#8'ShortCut'#3'6@'#0#1#7'Command'#3'4'#1#8'ShortCut'#3'7@'#0#1#7'Comman'
+  +'d'#3'5'#1#8'ShortCut'#3'8@'#0#1#7'Command'#3'6'#1#8'ShortCut'#3'9@'#0#1#7'C'
+  +'ommand'#3'_'#1#8'ShortCut'#3'0`'#0#1#7'Command'#3'`'#1#8'ShortCut'#3'1`'#0#1
+  +#7'Command'#3'a'#1#8'ShortCut'#3'2`'#0#1#7'Command'#3'b'#1#8'ShortCut'#3'3`'
+  +#0#1#7'Command'#3'c'#1#8'ShortCut'#3'4`'#0#1#7'Command'#3'd'#1#8'ShortCut'#3
+  +'5`'#0#1#7'Command'#3'e'#1#8'ShortCut'#3'6`'#0#1#7'Command'#3'f'#1#8'ShortCu'
+  +'t'#3'7`'#0#1#7'Command'#3'g'#1#8'ShortCut'#3'8`'#0#1#7'Command'#3'h'#1#8'Sh'
+  +'ortCut'#3'9`'#0#1#7'Command'#3#231#0#8'ShortCut'#3'N`'#0#1#7'Command'#3#232
+  +#0#8'ShortCut'#3'C`'#0#1#7'Command'#3#233#0#8'ShortCut'#3'L`'#0#1#7'Command'
+  +#3'd'#2#8'ShortCut'#2#9#0#1#7'Command'#3'e'#2#8'ShortCut'#3#9' '#0#1#7'Comma'
+  +'nd'#3#250#0#8'ShortCut'#3'B`'#0#0#8'ReadOnly'#9#22'SelectedColor.OnChange'
+  +#13#0#0#0#9'TTabSheet'#8'tsBinder'#7'Caption'#6#7'&Binder'#12'ClientHeight'#3
+  +'='#2#11'ClientWidth'#3#245#1#0#8'TSynEdit'#9'srcBinder'#6'Height'#3'='#2#5
+  +'Width'#3#245#1#5'Align'#7#8'alClient'#12'Font.CharSet'#7#12'ANSI_CHARSET'#10
+  +'Font.Color'#7#7'clBlack'#11'Font.Height'#2#236#9'Font.Name'#6#7'Courier'#10
+  +'Font.Pitch'#7#7'fpFixed'#11'ParentColor'#8#9'PopupMenu'#7#10'PopupMenu2'#8
+  +'TabOrder'#2#0#23'BookMarkOptions.Xoffset'#2'Q'#24'BookMarkOptions.OnChange'
+  +#13#15'Gutter.AutoSize'#9#17'Gutter.DigitCount'#2#5#22'Gutter.ShowLineNumber'
+  +'s'#9#22'Gutter.ShowCodeFolding'#9#15'Gutter.OnChange'#13#23'Gutter.CodeFold'
+  +'ingWidth'#2#14#11'Highlighter'#7#10'SynPasSyn1'#10'Keystrokes'#14#1#7'Comma'
+  +'nd'#2#3#8'ShortCut'#2'&'#0#1#7'Command'#2'g'#8'ShortCut'#3'& '#0#1#7'Comman'
+  +'d'#3#211#0#8'ShortCut'#3'&@'#0#1#7'Command'#2#4#8'ShortCut'#2'('#0#1#7'Comm'
+  +'and'#2'h'#8'ShortCut'#3'( '#0#1#7'Command'#3#212#0#8'ShortCut'#3'(@'#0#1#7
+  +'Command'#2#1#8'ShortCut'#2'%'#0#1#7'Command'#2'e'#8'ShortCut'#3'% '#0#1#7'C'
+  +'ommand'#2#5#8'ShortCut'#3'%@'#0#1#7'Command'#2'i'#8'ShortCut'#3'%`'#0#1#7'C'
+  +'ommand'#2#2#8'ShortCut'#2''''#0#1#7'Command'#2'f'#8'ShortCut'#3''' '#0#1#7
+  +'Command'#2#6#8'ShortCut'#3'''@'#0#1#7'Command'#2'j'#8'ShortCut'#3'''`'#0#1#7
+  +'Command'#2#10#8'ShortCut'#2'"'#0#1#7'Command'#2'n'#8'ShortCut'#3'" '#0#1#7
   +'Command'#2#14#8'ShortCut'#3'"@'#0#1#7'Command'#2'r'#8'ShortCut'#3'"`'#0#1#7
   +'Command'#2#9#8'ShortCut'#2'!'#0#1#7'Command'#2'm'#8'ShortCut'#3'! '#0#1#7'C'
   +'ommand'#2#13#8'ShortCut'#3'!@'#0#1#7'Command'#2'q'#8'ShortCut'#3'!`'#0#1#7
@@ -156,7 +257,7 @@ LazarusResources.Add('TfWstTypeLibraryEdit','FORMDATA',[
   +#3'Y'#2#8'ShortCut'#3'Z@'#0#1#7'Command'#3'Z'#2#8'ShortCut'#3'Z`'#0#1#7'Comm'
   +'and'#3'-'#1#8'ShortCut'#3'0@'#0#1#7'Command'#3'.'#1#8'ShortCut'#3'1@'#0#1#7
   +'Command'#3'/'#1#8'ShortCut'#3'2@'#0#1#7'Command'#3'0'#1#8'ShortCut'#3'3@'#0
-  +#1#7'Command'#3'1'#1#8'ShortCut'#3'4@'#0#1#7'Command'#3'2'#1#8'ShortCut'#3'5'
+  ,#1#7'Command'#3'1'#1#8'ShortCut'#3'4@'#0#1#7'Command'#3'2'#1#8'ShortCut'#3'5'
   +'@'#0#1#7'Command'#3'3'#1#8'ShortCut'#3'6@'#0#1#7'Command'#3'4'#1#8'ShortCut'
   +#3'7@'#0#1#7'Command'#3'5'#1#8'ShortCut'#3'8@'#0#1#7'Command'#3'6'#1#8'Short'
   +'Cut'#3'9@'#0#1#7'Command'#3'_'#1#8'ShortCut'#3'0`'#0#1#7'Command'#3'`'#1#8
@@ -167,183 +268,84 @@ LazarusResources.Add('TfWstTypeLibraryEdit','FORMDATA',[
   +'ommand'#3'h'#1#8'ShortCut'#3'9`'#0#1#7'Command'#3#231#0#8'ShortCut'#3'N`'#0
   +#1#7'Command'#3#232#0#8'ShortCut'#3'C`'#0#1#7'Command'#3#233#0#8'ShortCut'#3
   +'L`'#0#1#7'Command'#3'd'#2#8'ShortCut'#2#9#0#1#7'Command'#3'e'#2#8'ShortCut'
-  +#3#9' '#0#1#7'Command'#3#250#0#8'ShortCut'#3'B`'#0#0#8'ReadOnly'#9#0#0#0#9'T'
-  +'TabSheet'#5'tsImp'#7'Caption'#6#24'Im&plementation Skeleton'#12'ClientHeigh'
-  +'t'#3'='#2#11'ClientWidth'#3#245#1#0#8'TSynEdit'#6'srcImp'#6'Height'#3'='#2#5
-  +'Width'#3#245#1#5'Align'#7#8'alClient'#12'Font.CharSet'#7#12'ANSI_CHARSET'#10
-  +'Font.Color'#7#7'clBlack'#11'Font.Height'#2#236#9'Font.Name'#6#7'Courier'#10
-  +'Font.Pitch'#7#7'fpFixed'#11'ParentColor'#8#9'PopupMenu'#7#10'PopupMenu2'#8
-  +'TabOrder'#2#0#23'BookMarkOptions.Xoffset'#2'Q'#17'Gutter.DigitCount'#2#5#22
-  +'Gutter.ShowLineNumbers'#9#22'Gutter.ShowCodeFolding'#9#23'Gutter.CodeFoldin'
-  +'gWidth'#2#14#11'Highlighter'#7#10'SynPasSyn1'#10'Keystrokes'#14#1#7'Command'
-  +#2#3#8'ShortCut'#2'&'#0#1#7'Command'#2'g'#8'ShortCut'#3'& '#0#1#7'Command'#3
-  +#211#0#8'ShortCut'#3'&@'#0#1#7'Command'#2#4#8'ShortCut'#2'('#0#1#7'Command'#2
-  +'h'#8'ShortCut'#3'( '#0#1#7'Command'#3#212#0#8'ShortCut'#3'(@'#0#1#7'Command'
-  +#2#1#8'ShortCut'#2'%'#0#1#7'Command'#2'e'#8'ShortCut'#3'% '#0#1#7'Command'#2
-  +#5#8'ShortCut'#3'%@'#0#1#7'Command'#2'i'#8'ShortCut'#3'%`'#0#1#7'Command'#2#2
-  +#8'ShortCut'#2''''#0#1#7'Command'#2'f'#8'ShortCut'#3''' '#0#1#7'Command'#2#6
-  +#8'ShortCut'#3'''@'#0#1#7'Command'#2'j'#8'ShortCut'#3'''`'#0#1#7'Command'#2
-  +#10#8'ShortCut'#2'"'#0#1#7'Command'#2'n'#8'ShortCut'#3'" '#0#1#7'Command'#2
-  +#14#8'ShortCut'#3'"@'#0#1#7'Command'#2'r'#8'ShortCut'#3'"`'#0#1#7'Command'#2
-  +#9#8'ShortCut'#2'!'#0#1#7'Command'#2'm'#8'ShortCut'#3'! '#0#1#7'Command'#2#13
-  +#8'ShortCut'#3'!@'#0#1#7'Command'#2'q'#8'ShortCut'#3'!`'#0#1#7'Command'#2#7#8
-  +'ShortCut'#2'$'#0#1#7'Command'#2'k'#8'ShortCut'#3'$ '#0#1#7'Command'#2#15#8
-  +'ShortCut'#3'$@'#0#1#7'Command'#2's'#8'ShortCut'#3'$`'#0#1#7'Command'#2#8#8
-  +'ShortCut'#2'#'#0#1#7'Command'#2'l'#8'ShortCut'#3'# '#0#1#7'Command'#2#16#8
-  +'ShortCut'#3'#@'#0#1#7'Command'#2't'#8'ShortCut'#3'#`'#0#1#7'Command'#3#223#0
-  +#8'ShortCut'#2'-'#0#1#7'Command'#3#201#0#8'ShortCut'#3'-@'#0#1#7'Command'#3
-  +'\'#2#8'ShortCut'#3'- '#0#1#7'Command'#3#246#1#8'ShortCut'#2'.'#0#1#7'Comman'
-  ,'d'#3'['#2#8'ShortCut'#3'. '#0#1#7'Command'#3#245#1#8'ShortCut'#2#8#0#1#7'Co'
-  +'mmand'#3#245#1#8'ShortCut'#3#8' '#0#1#7'Command'#3#248#1#8'ShortCut'#3#8'@'
-  +#0#1#7'Command'#3'Y'#2#8'ShortCut'#4#8#128#0#0#0#1#7'Command'#3'Z'#2#8'Short'
-  +'Cut'#4#8#160#0#0#0#1#7'Command'#3#253#1#8'ShortCut'#2#13#0#1#7'Command'#3
-  +#199#0#8'ShortCut'#3'A@'#0#1#7'Command'#3#201#0#8'ShortCut'#3'C@'#0#1#7'Comm'
-  +'and'#3'b'#2#8'ShortCut'#3'I`'#0#1#7'Command'#3#253#1#8'ShortCut'#3'M@'#0#1#7
-  +'Command'#3#254#1#8'ShortCut'#3'N@'#0#1#7'Command'#3#247#1#8'ShortCut'#3'T@'
-  +#0#1#7'Command'#3'c'#2#8'ShortCut'#3'U`'#0#1#7'Command'#3'\'#2#8'ShortCut'#3
-  +'V@'#0#1#7'Command'#3'['#2#8'ShortCut'#3'X@'#0#1#7'Command'#3#251#1#8'ShortC'
-  +'ut'#3'Y@'#0#1#7'Command'#3#250#1#8'ShortCut'#3'Y`'#0#1#7'Command'#3'Y'#2#8
-  +'ShortCut'#3'Z@'#0#1#7'Command'#3'Z'#2#8'ShortCut'#3'Z`'#0#1#7'Command'#3'-'
-  +#1#8'ShortCut'#3'0@'#0#1#7'Command'#3'.'#1#8'ShortCut'#3'1@'#0#1#7'Command'#3
-  +'/'#1#8'ShortCut'#3'2@'#0#1#7'Command'#3'0'#1#8'ShortCut'#3'3@'#0#1#7'Comman'
-  +'d'#3'1'#1#8'ShortCut'#3'4@'#0#1#7'Command'#3'2'#1#8'ShortCut'#3'5@'#0#1#7'C'
-  +'ommand'#3'3'#1#8'ShortCut'#3'6@'#0#1#7'Command'#3'4'#1#8'ShortCut'#3'7@'#0#1
-  +#7'Command'#3'5'#1#8'ShortCut'#3'8@'#0#1#7'Command'#3'6'#1#8'ShortCut'#3'9@'
-  +#0#1#7'Command'#3'_'#1#8'ShortCut'#3'0`'#0#1#7'Command'#3'`'#1#8'ShortCut'#3
-  +'1`'#0#1#7'Command'#3'a'#1#8'ShortCut'#3'2`'#0#1#7'Command'#3'b'#1#8'ShortCu'
-  +'t'#3'3`'#0#1#7'Command'#3'c'#1#8'ShortCut'#3'4`'#0#1#7'Command'#3'd'#1#8'Sh'
-  +'ortCut'#3'5`'#0#1#7'Command'#3'e'#1#8'ShortCut'#3'6`'#0#1#7'Command'#3'f'#1
-  +#8'ShortCut'#3'7`'#0#1#7'Command'#3'g'#1#8'ShortCut'#3'8`'#0#1#7'Command'#3
-  +'h'#1#8'ShortCut'#3'9`'#0#1#7'Command'#3#231#0#8'ShortCut'#3'N`'#0#1#7'Comma'
-  +'nd'#3#232#0#8'ShortCut'#3'C`'#0#1#7'Command'#3#233#0#8'ShortCut'#3'L`'#0#1#7
-  +'Command'#3'd'#2#8'ShortCut'#2#9#0#1#7'Command'#3'e'#2#8'ShortCut'#3#9' '#0#1
-  +#7'Command'#3#250#0#8'ShortCut'#3'B`'#0#0#8'ReadOnly'#9#0#0#0#9'TTabSheet'#8
-  +'tsBinder'#7'Caption'#6#7'&Binder'#12'ClientHeight'#3'='#2#11'ClientWidth'#3
-  +#245#1#0#8'TSynEdit'#9'srcBinder'#6'Height'#3'='#2#5'Width'#3#245#1#5'Align'
-  +#7#8'alClient'#12'Font.CharSet'#7#12'ANSI_CHARSET'#10'Font.Color'#7#7'clBlac'
-  +'k'#11'Font.Height'#2#236#9'Font.Name'#6#7'Courier'#10'Font.Pitch'#7#7'fpFix'
-  +'ed'#11'ParentColor'#8#9'PopupMenu'#7#10'PopupMenu2'#8'TabOrder'#2#0#23'Book'
-  +'MarkOptions.Xoffset'#2'Q'#15'Gutter.AutoSize'#9#17'Gutter.DigitCount'#2#5#22
-  +'Gutter.ShowLineNumbers'#9#22'Gutter.ShowCodeFolding'#9#23'Gutter.CodeFoldin'
-  +'gWidth'#2#14#11'Highlighter'#7#10'SynPasSyn1'#10'Keystrokes'#14#1#7'Command'
-  +#2#3#8'ShortCut'#2'&'#0#1#7'Command'#2'g'#8'ShortCut'#3'& '#0#1#7'Command'#3
-  +#211#0#8'ShortCut'#3'&@'#0#1#7'Command'#2#4#8'ShortCut'#2'('#0#1#7'Command'#2
-  +'h'#8'ShortCut'#3'( '#0#1#7'Command'#3#212#0#8'ShortCut'#3'(@'#0#1#7'Command'
-  +#2#1#8'ShortCut'#2'%'#0#1#7'Command'#2'e'#8'ShortCut'#3'% '#0#1#7'Command'#2
-  +#5#8'ShortCut'#3'%@'#0#1#7'Command'#2'i'#8'ShortCut'#3'%`'#0#1#7'Command'#2#2
-  +#8'ShortCut'#2''''#0#1#7'Command'#2'f'#8'ShortCut'#3''' '#0#1#7'Command'#2#6
-  +#8'ShortCut'#3'''@'#0#1#7'Command'#2'j'#8'ShortCut'#3'''`'#0#1#7'Command'#2
-  +#10#8'ShortCut'#2'"'#0#1#7'Command'#2'n'#8'ShortCut'#3'" '#0#1#7'Command'#2
-  +#14#8'ShortCut'#3'"@'#0#1#7'Command'#2'r'#8'ShortCut'#3'"`'#0#1#7'Command'#2
-  +#9#8'ShortCut'#2'!'#0#1#7'Command'#2'm'#8'ShortCut'#3'! '#0#1#7'Command'#2#13
-  +#8'ShortCut'#3'!@'#0#1#7'Command'#2'q'#8'ShortCut'#3'!`'#0#1#7'Command'#2#7#8
-  +'ShortCut'#2'$'#0#1#7'Command'#2'k'#8'ShortCut'#3'$ '#0#1#7'Command'#2#15#8
-  +'ShortCut'#3'$@'#0#1#7'Command'#2's'#8'ShortCut'#3'$`'#0#1#7'Command'#2#8#8
-  +'ShortCut'#2'#'#0#1#7'Command'#2'l'#8'ShortCut'#3'# '#0#1#7'Command'#2#16#8
-  +'ShortCut'#3'#@'#0#1#7'Command'#2't'#8'ShortCut'#3'#`'#0#1#7'Command'#3#223#0
-  +#8'ShortCut'#2'-'#0#1#7'Command'#3#201#0#8'ShortCut'#3'-@'#0#1#7'Command'#3
-  +'\'#2#8'ShortCut'#3'- '#0#1#7'Command'#3#246#1#8'ShortCut'#2'.'#0#1#7'Comman'
-  +'d'#3'['#2#8'ShortCut'#3'. '#0#1#7'Command'#3#245#1#8'ShortCut'#2#8#0#1#7'Co'
-  +'mmand'#3#245#1#8'ShortCut'#3#8' '#0#1#7'Command'#3#248#1#8'ShortCut'#3#8'@'
-  +#0#1#7'Command'#3'Y'#2#8'ShortCut'#4#8#128#0#0#0#1#7'Command'#3'Z'#2#8'Short'
-  +'Cut'#4#8#160#0#0#0#1#7'Command'#3#253#1#8'ShortCut'#2#13#0#1#7'Command'#3
-  +#199#0#8'ShortCut'#3'A@'#0#1#7'Command'#3#201#0#8'ShortCut'#3'C@'#0#1#7'Comm'
-  +'and'#3'b'#2#8'ShortCut'#3'I`'#0#1#7'Command'#3#253#1#8'ShortCut'#3'M@'#0#1#7
-  +'Command'#3#254#1#8'ShortCut'#3'N@'#0#1#7'Command'#3#247#1#8'ShortCut'#3'T@'
-  +#0#1#7'Command'#3'c'#2#8'ShortCut'#3'U`'#0#1#7'Command'#3'\'#2#8'ShortCut'#3
-  +'V@'#0#1#7'Command'#3'['#2#8'ShortCut'#3'X@'#0#1#7'Command'#3#251#1#8'ShortC'
-  +'ut'#3'Y@'#0#1#7'Command'#3#250#1#8'ShortCut'#3'Y`'#0#1#7'Command'#3'Y'#2#8
-  +'ShortCut'#3'Z@'#0#1#7'Command'#3'Z'#2#8'ShortCut'#3'Z`'#0#1#7'Command'#3'-'
-  +#1#8'ShortCut'#3'0@'#0#1#7'Command'#3'.'#1#8'ShortCut'#3'1@'#0#1#7'Command'#3
-  +'/'#1#8'ShortCut'#3'2@'#0#1#7'Command'#3'0'#1#8'ShortCut'#3'3@'#0#1#7'Comman'
-  +'d'#3'1'#1#8'ShortCut'#3'4@'#0#1#7'Command'#3'2'#1#8'ShortCut'#3'5@'#0#1#7'C'
-  ,'ommand'#3'3'#1#8'ShortCut'#3'6@'#0#1#7'Command'#3'4'#1#8'ShortCut'#3'7@'#0#1
-  +#7'Command'#3'5'#1#8'ShortCut'#3'8@'#0#1#7'Command'#3'6'#1#8'ShortCut'#3'9@'
-  +#0#1#7'Command'#3'_'#1#8'ShortCut'#3'0`'#0#1#7'Command'#3'`'#1#8'ShortCut'#3
-  +'1`'#0#1#7'Command'#3'a'#1#8'ShortCut'#3'2`'#0#1#7'Command'#3'b'#1#8'ShortCu'
-  +'t'#3'3`'#0#1#7'Command'#3'c'#1#8'ShortCut'#3'4`'#0#1#7'Command'#3'd'#1#8'Sh'
-  +'ortCut'#3'5`'#0#1#7'Command'#3'e'#1#8'ShortCut'#3'6`'#0#1#7'Command'#3'f'#1
-  +#8'ShortCut'#3'7`'#0#1#7'Command'#3'g'#1#8'ShortCut'#3'8`'#0#1#7'Command'#3
-  +'h'#1#8'ShortCut'#3'9`'#0#1#7'Command'#3#231#0#8'ShortCut'#3'N`'#0#1#7'Comma'
-  +'nd'#3#232#0#8'ShortCut'#3'C`'#0#1#7'Command'#3#233#0#8'ShortCut'#3'L`'#0#1#7
-  +'Command'#3'd'#2#8'ShortCut'#2#9#0#1#7'Command'#3'e'#2#8'ShortCut'#3#9' '#0#1
-  +#7'Command'#3#250#0#8'ShortCut'#3'B`'#0#0#8'ReadOnly'#9#0#0#0#9'TTabSheet'#5
-  +'tsLog'#7'Caption'#6#4'&Log'#12'ClientHeight'#3'='#2#11'ClientWidth'#3#245#1
-  +#0#5'TMemo'#6'mmoLog'#6'Height'#3'='#2#5'Width'#3#245#1#5'Align'#7#8'alClien'
-  +'t'#13'Lines.Strings'#1#6#0#0#10'ScrollBars'#7#6'ssBoth'#8'TabOrder'#2#0#0#0
-  +#0#0#0#9'TSplitter'#9'Splitter1'#4'Left'#3':'#1#6'Height'#3'Y'#2#5'Width'#2#8
-  +#5'Color'#7#7'clBlack'#11'ParentColor'#8#0#0#9'TMainMenu'#9'MainMenu1'#4'lef'
-  +'t'#3'`'#1#3'top'#2'p'#0#9'TMenuItem'#9'MenuItem1'#7'Caption'#6#6'&Files'#0#9
-  +'TMenuItem'#10'MenuItem16'#6'Action'#7#10'actNewFile'#7'OnClick'#7#17'actNew'
-  +'FileExecute'#0#0#9'TMenuItem'#9'MenuItem2'#7'Caption'#6#1'-'#0#0#9'TMenuIte'
-  +'m'#9'MenuItem5'#6'Action'#7#11'actOpenFile'#7'OnClick'#7#18'actOpenFileExec'
-  +'ute'#0#0#9'TMenuItem'#9'MenuItem3'#6'Action'#7#9'actExport'#7'OnClick'#7#16
-  +'actExportExecute'#0#0#9'TMenuItem'#9'MenuItem7'#6'Action'#7#7'actSave'#7'On'
-  +'Click'#7#14'actSaveExecute'#0#0#9'TMenuItem'#10'MenuItem32'#6'Action'#7#9'a'
-  +'ctSaveAs'#7'OnClick'#7#16'actSaveAsExecute'#0#0#9'TMenuItem'#10'MenuItem17'
-  +#7'Caption'#6#1'-'#0#0#9'TMenuItem'#9'MenuItem4'#6'Action'#7#7'actExit'#7'On'
-  +'Click'#7#14'actExitExecute'#0#0#0#9'TMenuItem'#10'MenuItem14'#7'Caption'#6#5
-  +'&View'#0#9'TMenuItem'#10'MenuItem15'#6'Action'#7#14'actRefreshView'#7'OnCli'
-  +'ck'#7#21'actRefreshViewExecute'#0#0#9'TMenuItem'#10'MenuItem29'#7'Caption'#6
-  +#1'-'#0#0#9'TMenuItem'#10'MenuItem30'#6'Action'#7#13'actFullExpand'#7'OnClic'
-  +'k'#7#20'actFullExpandExecute'#0#0#9'TMenuItem'#10'MenuItem31'#6'Action'#7#15
-  +'actFullCollapse'#7'OnClick'#7#22'actFullCollapseExecute'#0#0#0#9'TMenuItem'
-  +#10'MenuItem10'#7'Caption'#6#8'&Edition'#0#9'TMenuItem'#10'MenuItem11'#6'Act'
-  +'ion'#7#13'actEnumCreate'#7'OnClick'#7#20'actEnumCreateExecute'#0#0#9'TMenuI'
-  +'tem'#10'MenuItem23'#6'Action'#7#17'actCompoundCreate'#7'OnClick'#7#24'actCo'
-  +'mpoundCreateExecute'#0#0#9'TMenuItem'#10'MenuItem48'#6'Action'#7#15'actReco'
-  +'rdCreate'#7'OnClick'#7#22'actRecordCreateExecute'#0#0#9'TMenuItem'#10'MenuI'
-  +'tem25'#6'Action'#7#13'actIntfCreate'#7'OnClick'#7#20'actIntfCreateExecute'#0
-  +#0#9'TMenuItem'#10'MenuItem35'#6'Action'#7#14'actArrayCreate'#7'OnClick'#7#21
-  +'actArrayCreateExecute'#0#0#9'TMenuItem'#10'MenuItem36'#6'Action'#7#18'actTy'
-  +'peALiasCreate'#7'OnClick'#7#25'actTypeALiasCreateExecute'#0#0#9'TMenuItem'
-  +#10'MenuItem12'#7'Caption'#6#1'-'#0#0#9'TMenuItem'#10'MenuItem13'#6'Action'#7
-  +#15'actUpdateObject'#7'Caption'#6#13'Update Object'#7'OnClick'#7#22'actUpdat'
-  +'eObjectExecute'#0#0#9'TMenuItem'#10'MenuItem34'#6'Action'#7#9'actDelete'#7
-  +'OnClick'#7#16'actDeleteExecute'#0#0#0#9'TMenuItem'#9'MenuItem6'#6'Action'#7
-  +#8'actAbout'#7'Caption'#6#6'&About'#7'OnClick'#7#15'actAboutExecute'#0#0#0#11
-  +'TActionList'#2'AL'#4'left'#3'X'#1#3'top'#2'8'#0#7'TAction'#11'actOpenFile'#7
-  +'Caption'#6#9'Open File'#18'DisableIfNoHandler'#9#9'OnExecute'#7#18'actOpenF'
-  +'ileExecute'#0#0#7'TAction'#7'actExit'#7'Caption'#6#4'Exit'#18'DisableIfNoHa'
-  +'ndler'#9#9'OnExecute'#7#14'actExitExecute'#0#0#7'TAction'#9'actExport'#7'Ca'
-  +'ption'#6#24'Save generated files ...'#18'DisableIfNoHandler'#9#9'OnExecute'
-  +#7#16'actExportExecute'#8'OnUpdate'#7#15'actExportUpdate'#0#0#7'TAction'#8'a'
-  +'ctAbout'#7'Caption'#6#5'About'#18'DisableIfNoHandler'#9#9'OnExecute'#7#15'a'
-  +'ctAboutExecute'#0#0#7'TAction'#9'actSaveAs'#7'Caption'#6#11'Save As ...'#18
-  +'DisableIfNoHandler'#9#9'OnExecute'#7#16'actSaveAsExecute'#8'OnUpdate'#7#15
-  +'actExportUpdate'#0#0#7'TAction'#13'actEnumCreate'#7'Caption'#6#18'Create En'
-  +'umeration'#18'DisableIfNoHandler'#9#9'OnExecute'#7#20'actEnumCreateExecute'
-  +#0#0#7'TAction'#15'actUpdateObject'#7'Caption'#6#6'Update'#18'DisableIfNoHan'
-  +'dler'#9#9'OnExecute'#7#22'actUpdateObjectExecute'#8'OnUpdate'#7#21'actUpdat'
-  +'eObjectUpdate'#0#0#7'TAction'#14'actRefreshView'#7'Caption'#6#14'&Refresh V'
-  +'iews'#18'DisableIfNoHandler'#9#9'OnExecute'#7#21'actRefreshViewExecute'#0#0
-  +#7'TAction'#10'actNewFile'#7'Caption'#6#8'New File'#18'DisableIfNoHandler'#9
-  +#9'OnExecute'#7#17'actNewFileExecute'#0#0#7'TAction'#17'actCompoundCreate'#7
-  +'Caption'#6#17'Create Class Type'#18'DisableIfNoHandler'#9#9'OnExecute'#7#24
-  +'actCompoundCreateExecute'#0#0#7'TAction'#13'actIntfCreate'#7'Caption'#6#16
-  ,'Create Interface'#18'DisableIfNoHandler'#9#9'OnExecute'#7#20'actIntfCreateE'
-  +'xecute'#0#0#7'TAction'#13'actFullExpand'#7'Caption'#6#11'Full expand'#18'Di'
-  +'sableIfNoHandler'#9#9'OnExecute'#7#20'actFullExpandExecute'#0#0#7'TAction'
-  +#15'actFullCollapse'#7'Caption'#6#13'Full Collapse'#18'DisableIfNoHandler'#9
-  +#9'OnExecute'#7#22'actFullCollapseExecute'#0#0#7'TAction'#7'actSave'#7'Capti'
-  +'on'#6#4'Save'#18'DisableIfNoHandler'#9#9'OnExecute'#7#14'actSaveExecute'#0#0
-  +#7'TAction'#9'actDelete'#7'Caption'#6#6'Delete'#18'DisableIfNoHandler'#9#9'O'
-  +'nExecute'#7#16'actDeleteExecute'#8'OnUpdate'#7#21'actUpdateObjectUpdate'#0#0
-  +#7'TAction'#14'actArrayCreate'#7'Caption'#6#12'Create Array'#18'DisableIfNoH'
-  +'andler'#9#9'OnExecute'#7#21'actArrayCreateExecute'#0#0#7'TAction'#18'actTyp'
-  +'eALiasCreate'#7'Caption'#6#17'Create Type ALias'#18'DisableIfNoHandler'#9#9
-  +'OnExecute'#7#25'actTypeALiasCreateExecute'#0#0#7'TAction'#15'actRecordCreat'
-  +'e'#7'Caption'#6#13'Create Record'#18'DisableIfNoHandler'#9#9'OnExecute'#7#22
-  +'actRecordCreateExecute'#0#0#0#11'TOpenDialog'#2'OD'#5'Title'#6#26'Ouvrir un'
-  +' fichier existant'#6'Filter'#6'3WDSL files(*.WSDL)|*.WSDL|Pascal file (*.pa'
-  +'s)|*.pas'#11'FilterIndex'#2#0#10'InitialDir'#6#2'.\'#7'Options'#11#15'ofPat'
-  +'hMustExist'#15'ofFileMustExist'#14'ofEnableSizing'#12'ofViewDetail'#0#4'lef'
-  +'t'#3#153#1#3'top'#2'X'#0#0#10'TSynPasSyn'#10'SynPasSyn1'#7'Enabled'#8#23'Co'
-  +'mmentAttri.Foreground'#7#6'clBlue'#18'CommentAttri.Style'#11#6'fsBold'#0#22
-  +'StringAttri.Foreground'#7#8'clMaroon'#17'SymbolAttri.Style'#11#6'fsBold'#0
-  +#25'DirectiveAttri.Foreground'#7#7'clGreen'#20'DirectiveAttri.Style'#11#6'fs'
-  +'Bold'#0#14'NestedComments'#9#4'left'#3#183#1#3'top'#2'h'#0#0#11'TSaveDialog'
-  +#2'SD'#5'Title'#6#27'Enregistrer le fichier sous'#10'DefaultExt'#6#5'.WSDL'#6
+  +#3#9' '#0#1#7'Command'#3#250#0#8'ShortCut'#3'B`'#0#0#8'ReadOnly'#9#22'Select'
+  +'edColor.OnChange'#13#0#0#0#9'TTabSheet'#5'tsLog'#7'Caption'#6#4'&Log'#12'Cl'
+  +'ientHeight'#3'='#2#11'ClientWidth'#3#245#1#0#5'TMemo'#6'mmoLog'#6'Height'#3
+  +'='#2#5'Width'#3#245#1#5'Align'#7#8'alClient'#13'Lines.Strings'#1#6#0#0#10'S'
+  +'crollBars'#7#6'ssBoth'#8'TabOrder'#2#0#0#0#0#0#0#9'TSplitter'#9'Splitter1'#4
+  +'Left'#3':'#1#6'Height'#3'Y'#2#5'Width'#2#8#5'Color'#7#7'clBlack'#11'ParentC'
+  +'olor'#8#0#0#9'TMainMenu'#9'MainMenu1'#4'left'#3'`'#1#3'top'#2'p'#0#9'TMenuI'
+  +'tem'#9'MenuItem1'#7'Caption'#6#6'&Files'#0#9'TMenuItem'#10'MenuItem16'#6'Ac'
+  +'tion'#7#10'actNewFile'#7'OnClick'#7#17'actNewFileExecute'#0#0#9'TMenuItem'#9
+  +'MenuItem2'#7'Caption'#6#1'-'#0#0#9'TMenuItem'#9'MenuItem5'#6'Action'#7#11'a'
+  +'ctOpenFile'#7'OnClick'#7#18'actOpenFileExecute'#0#0#9'TMenuItem'#9'MenuItem'
+  +'3'#6'Action'#7#9'actExport'#7'OnClick'#7#16'actExportExecute'#0#0#9'TMenuIt'
+  +'em'#9'MenuItem7'#6'Action'#7#7'actSave'#7'OnClick'#7#14'actSaveExecute'#0#0
+  +#9'TMenuItem'#10'MenuItem32'#6'Action'#7#9'actSaveAs'#7'OnClick'#7#16'actSav'
+  +'eAsExecute'#0#0#9'TMenuItem'#10'MenuItem17'#7'Caption'#6#1'-'#0#0#9'TMenuIt'
+  +'em'#9'MenuItem4'#6'Action'#7#7'actExit'#7'OnClick'#7#14'actExitExecute'#0#0
+  +#0#9'TMenuItem'#10'MenuItem14'#7'Caption'#6#5'&View'#0#9'TMenuItem'#10'MenuI'
+  +'tem15'#6'Action'#7#14'actRefreshView'#7'OnClick'#7#21'actRefreshViewExecute'
+  +#0#0#9'TMenuItem'#10'MenuItem29'#7'Caption'#6#1'-'#0#0#9'TMenuItem'#10'MenuI'
+  +'tem30'#6'Action'#7#13'actFullExpand'#7'OnClick'#7#20'actFullExpandExecute'#0
+  +#0#9'TMenuItem'#10'MenuItem31'#6'Action'#7#15'actFullCollapse'#7'OnClick'#7
+  +#22'actFullCollapseExecute'#0#0#0#9'TMenuItem'#10'MenuItem10'#7'Caption'#6#8
+  +'&Edition'#0#9'TMenuItem'#10'MenuItem11'#6'Action'#7#13'actEnumCreate'#7'OnC'
+  +'lick'#7#20'actEnumCreateExecute'#0#0#9'TMenuItem'#10'MenuItem23'#6'Action'#7
+  +#17'actCompoundCreate'#7'OnClick'#7#24'actCompoundCreateExecute'#0#0#9'TMenu'
+  +'Item'#10'MenuItem48'#6'Action'#7#15'actRecordCreate'#7'OnClick'#7#22'actRec'
+  +'ordCreateExecute'#0#0#9'TMenuItem'#10'MenuItem25'#6'Action'#7#13'actIntfCre'
+  +'ate'#7'OnClick'#7#20'actIntfCreateExecute'#0#0#9'TMenuItem'#10'MenuItem35'#6
+  +'Action'#7#14'actArrayCreate'#7'OnClick'#7#21'actArrayCreateExecute'#0#0#9'T'
+  +'MenuItem'#10'MenuItem36'#6'Action'#7#18'actTypeALiasCreate'#7'OnClick'#7#25
+  +'actTypeALiasCreateExecute'#0#0#9'TMenuItem'#10'MenuItem12'#7'Caption'#6#1'-'
+  +#0#0#9'TMenuItem'#10'MenuItem13'#6'Action'#7#15'actUpdateObject'#7'Caption'#6
+  +#13'Update Object'#7'OnClick'#7#22'actUpdateObjectExecute'#0#0#9'TMenuItem'
+  +#10'MenuItem34'#6'Action'#7#9'actDelete'#7'OnClick'#7#16'actDeleteExecute'#0
+  +#0#0#9'TMenuItem'#9'MenuItem6'#6'Action'#7#8'actAbout'#7'Caption'#6#6'&About'
+  +#7'OnClick'#7#15'actAboutExecute'#0#0#0#11'TActionList'#2'AL'#4'left'#3'X'#1
+  +#3'top'#2'8'#0#7'TAction'#11'actOpenFile'#7'Caption'#6#9'Open File'#18'Disab'
+  +'leIfNoHandler'#9#9'OnExecute'#7#18'actOpenFileExecute'#8'ShortCut'#3'O@'#0#0
+  +#7'TAction'#7'actExit'#7'Caption'#6#4'Exit'#18'DisableIfNoHandler'#9#9'OnExe'
+  +'cute'#7#14'actExitExecute'#0#0#7'TAction'#9'actExport'#7'Caption'#6#24'Save'
+  +' generated files ...'#18'DisableIfNoHandler'#9#9'OnExecute'#7#16'actExportE'
+  +'xecute'#8'OnUpdate'#7#15'actExportUpdate'#0#0#7'TAction'#8'actAbout'#7'Capt'
+  +'ion'#6#5'About'#18'DisableIfNoHandler'#9#9'OnExecute'#7#15'actAboutExecute'
+  +#0#0#7'TAction'#9'actSaveAs'#7'Caption'#6#11'Save As ...'#18'DisableIfNoHand'
+  +'ler'#9#9'OnExecute'#7#16'actSaveAsExecute'#8'OnUpdate'#7#15'actExportUpdate'
+  +#0#0#7'TAction'#13'actEnumCreate'#7'Caption'#6#18'Create Enumeration'#18'Dis'
+  +'ableIfNoHandler'#9#9'OnExecute'#7#20'actEnumCreateExecute'#0#0#7'TAction'#15
+  +'actUpdateObject'#7'Caption'#6#6'Update'#18'DisableIfNoHandler'#9#9'OnExecut'
+  +'e'#7#22'actUpdateObjectExecute'#8'OnUpdate'#7#21'actUpdateObjectUpdate'#0#0
+  +#7'TAction'#14'actRefreshView'#7'Caption'#6#14'&Refresh Views'#18'DisableIfN'
+  +'oHandler'#9#9'OnExecute'#7#21'actRefreshViewExecute'#0#0#7'TAction'#10'actN'
+  +'ewFile'#7'Caption'#6#8'New File'#18'DisableIfNoHandler'#9#9'OnExecute'#7#17
+  +'actNewFileExecute'#0#0#7'TAction'#17'actCompoundCreate'#7'Caption'#6#17'Cre'
+  ,'ate Class Type'#18'DisableIfNoHandler'#9#9'OnExecute'#7#24'actCompoundCreat'
+  +'eExecute'#0#0#7'TAction'#13'actIntfCreate'#7'Caption'#6#16'Create Interface'
+  +#18'DisableIfNoHandler'#9#9'OnExecute'#7#20'actIntfCreateExecute'#0#0#7'TAct'
+  +'ion'#13'actFullExpand'#7'Caption'#6#11'Full expand'#18'DisableIfNoHandler'#9
+  +#9'OnExecute'#7#20'actFullExpandExecute'#0#0#7'TAction'#15'actFullCollapse'#7
+  +'Caption'#6#13'Full Collapse'#18'DisableIfNoHandler'#9#9'OnExecute'#7#22'act'
+  +'FullCollapseExecute'#0#0#7'TAction'#7'actSave'#7'Caption'#6#4'Save'#18'Disa'
+  +'bleIfNoHandler'#9#9'OnExecute'#7#14'actSaveExecute'#8'ShortCut'#3'S@'#0#0#7
+  +'TAction'#9'actDelete'#7'Caption'#6#6'Delete'#18'DisableIfNoHandler'#9#9'OnE'
+  +'xecute'#7#16'actDeleteExecute'#8'OnUpdate'#7#21'actUpdateObjectUpdate'#0#0#7
+  +'TAction'#14'actArrayCreate'#7'Caption'#6#12'Create Array'#18'DisableIfNoHan'
+  +'dler'#9#9'OnExecute'#7#21'actArrayCreateExecute'#0#0#7'TAction'#18'actTypeA'
+  +'LiasCreate'#7'Caption'#6#17'Create Type ALias'#18'DisableIfNoHandler'#9#9'O'
+  +'nExecute'#7#25'actTypeALiasCreateExecute'#0#0#7'TAction'#15'actRecordCreate'
+  +#7'Caption'#6#13'Create Record'#18'DisableIfNoHandler'#9#9'OnExecute'#7#22'a'
+  +'ctRecordCreateExecute'#0#0#0#11'TOpenDialog'#2'OD'#5'Title'#6#26'Ouvrir un '
+  +'fichier existant'#6'Filter'#6'3WDSL files(*.WSDL)|*.WSDL|Pascal file (*.pas'
+  +')|*.pas'#11'FilterIndex'#2#0#10'InitialDir'#6#2'.\'#7'Options'#11#15'ofPath'
+  +'MustExist'#15'ofFileMustExist'#14'ofEnableSizing'#12'ofViewDetail'#0#4'left'
+  +#3#153#1#3'top'#2'X'#0#0#10'TSynPasSyn'#10'SynPasSyn1'#7'Enabled'#8#23'Comme'
+  +'ntAttri.Foreground'#7#6'clBlue'#18'CommentAttri.Style'#11#6'fsBold'#0#22'St'
+  +'ringAttri.Foreground'#7#8'clMaroon'#17'SymbolAttri.Style'#11#6'fsBold'#0#25
+  +'DirectiveAttri.Foreground'#7#7'clGreen'#20'DirectiveAttri.Style'#11#6'fsBol'
+  +'d'#0#14'NestedComments'#9#4'left'#3#183#1#3'top'#2'h'#0#0#11'TSaveDialog'#2
+  +'SD'#5'Title'#6#27'Enregistrer le fichier sous'#10'DefaultExt'#6#5'.WSDL'#6
   +'Filter'#6#25'WDSL files(*.WSDL)|*.WSDL'#11'FilterIndex'#2#0#7'Options'#11#15
   +'ofPathMustExist'#14'ofEnableSizing'#12'ofViewDetail'#0#4'left'#3#242#1#3'to'
   +'p'#3#176#0#0#0#10'TPopupMenu'#10'PopupMenu1'#4'left'#3#152#0#3'top'#3#152#0
diff --git a/wst/trunk/ws_helper/parserutils.pas b/wst/trunk/ws_helper/parserutils.pas
index 69d78e019..4f9f1a6c9 100644
--- a/wst/trunk/ws_helper/parserutils.pas
+++ b/wst/trunk/ws_helper/parserutils.pas
@@ -76,7 +76,7 @@ const
 implementation
 uses StrUtils, rtti_filters;
 
-const LANGAGE_TOKEN : array[0..107] of string = (
+const LANGAGE_TOKEN : array[0..108] of string = (
   'ABSTRACT', 'AND', 'ARRAY', 'AS', 'ASM',
   'BEGIN', 'BOOLEAN', 'BYTE',
   'CASE', 'CDECL', 'CHAR', 'CLASS', 'COMP', 'CONST', 'CONSTRUCTOR', 'CONTAINS', 'CURRENCY',
@@ -91,7 +91,7 @@ const LANGAGE_TOKEN : array[0..107] of string = (
   'OBJECT', 'OF', 'OLEVARIANT', 'OR', 'OUT', 'OVERLOAD', 'OVERRIDE',
   'PACKAGE', 'PACKED', 'PASCAL', 'PCHAR', 'PRIVATE', 'PROCEDURE', 'PROGRAM', 'PUBLISHED',
   'RAISE', 'READ', 'REAL', 'RECORD', 'REGISTER', 'REINTRODUCE', 'REPEAT', 'REQUIRES', 'RESULT',
-  'SAFECALL', 'SET', 'SHL', 'SHORTINT', 'SHR', 'SINGLE', 'SMALLINT', 'STDCALL', 'STORED',
+  'SAFECALL', 'SET', 'SHL', 'SHORTINT', 'SHR', 'SINGLE', 'SMALLINT', 'STDCALL', 'STORED', 'STRING',
   'THEN', 'TO', 'TRY', 'TYPE', 'UNIT', 'UNTIL', 'USES',
   'VAR', 'VARARGS', 'VARIANT', 'VIRTUAL', 'WHILE', 'WIDECHAR', 'WITH', 'WORD', 'WRITE', 'XOR'
 );
diff --git a/wst/trunk/ws_helper/pascal_parser_intf.pas b/wst/trunk/ws_helper/pascal_parser_intf.pas
index 20877cebc..d92f660ff 100644
--- a/wst/trunk/ws_helper/pascal_parser_intf.pas
+++ b/wst/trunk/ws_helper/pascal_parser_intf.pas
@@ -132,6 +132,7 @@ type
     procedure RegisterExternalAlias(AObject : TPasElement; const AExternalName : String);
     function SameName(AObject : TPasElement; const AName : string) : Boolean;
     function GetExternalName(AObject : TPasElement) : string;
+    function GetNameSpace(AType : TPasType) : string ;
     function IsAttributeProperty(AObject : TPasVariable) : Boolean;
     procedure SetPropertyAsAttribute(AObject : TPasVariable; const AValue : Boolean);
 
@@ -320,6 +321,7 @@ begin
 
     AddAlias('token','string',Result);
     AddAlias('anyURI','string',Result);
+    AddAlias('ID','string',Result);
     AddAlias('float','Single',Result);
     AddAlias('nonNegativeInteger','LongWord',Result);
     AddAlias('positiveInteger','nonNegativeInteger',Result);
@@ -802,6 +804,18 @@ begin
   end;
 end;
 
+function TwstPasTreeContainer.GetNameSpace(AType: TPasType): string;
+begin
+  if Assigned(AType) and
+     Assigned(AType.Parent{Section}) and
+     Assigned(AType.Parent.Parent{Module})
+  then begin
+    Result := GetExternalName(AType.Parent.Parent);
+  end else begin
+    Result := '';
+  end;
+end;
+
 { TwstBinding }
 
 constructor TwstBinding.Create(
diff --git a/wst/trunk/ws_helper/wsdl_parser.pas b/wst/trunk/ws_helper/wsdl_parser.pas
index 2b9beba27..94a5db3ae 100644
--- a/wst/trunk/ws_helper/wsdl_parser.pas
+++ b/wst/trunk/ws_helper/wsdl_parser.pas
@@ -846,6 +846,8 @@ begin
         if Assigned(typeNode) then begin
           ExtractSoapBindingStyle(bindingNode,locWStrBuffer);
           locSoapBindingStyle := locWStrBuffer;
+          if IsStrEmpty(locSoapBindingStyle) then
+            locSoapBindingStyle := s_document;
           intfDef := ParsePortType(typeNode,bindingNode,locSoapBindingStyle);
           bdng := SymbolTable.AddBinding(bindingName,intfDef);
           bdng.Address := ExtractAddress();
diff --git a/wst/trunk/ws_helper/xsd_generator.pas b/wst/trunk/ws_helper/xsd_generator.pas
index 759ae2a0f..61b1bca89 100644
--- a/wst/trunk/ws_helper/xsd_generator.pas
+++ b/wst/trunk/ws_helper/xsd_generator.pas
@@ -279,7 +279,7 @@ begin
     c := Pred(ANode.Attributes.Length);
     if ( AStartIndex >= 0 ) then
       i := AStartIndex;
-    for i := 0 to c do begin
+    for i := AStartIndex to c do begin
       if AnsiSameText(AAttValue,ANode.Attributes.Item[i].NodeValue) and
          ( b or ( Pos(AStartingWith,ANode.Attributes.Item[i].NodeName) = 1 ))
       then begin
@@ -530,25 +530,28 @@ begin
          trueParent.InheritsFrom(TPasNativeSimpleType)
       then begin
         typeCategory := tcSimpleContent;
-        derivationNode := CreateElement(Format('%s:%s',[s_xs_short,s_extension]),cplxNode,ADocument);
-        s := Trim(GetNameSpaceShortName(GetTypeNameSpace(AContainer,trueParent),ADocument));
-        if ( Length(s) > 0 ) then begin
-          s := s + ':';
-        end;
-        s := s + AContainer.GetExternalName(trueParent);
-        derivationNode.SetAttribute(s_base,s);
-        hasSequence := False;
       end;
+      derivationNode := CreateElement(Format('%s:%s',[s_xs_short,s_extension]),cplxNode,ADocument);
+      s := Trim(GetNameSpaceShortName(GetTypeNameSpace(AContainer,trueParent),ADocument));
+      if ( Length(s) > 0 ) then begin
+        s := s + ':';
+      end;
+      s := s + AContainer.GetExternalName(trueParent);
+      derivationNode.SetAttribute(s_base,s);
+      hasSequence := False;
     end;
-    for i := 0 to Pred(typItm.Members.Count) do begin
-      if TPasElement(typItm.Members[i]).InheritsFrom(TPasProperty) then begin
-        p := TPasProperty(typItm.Members[i]);
-        if not AContainer.IsAttributeProperty(p) then begin
-          if ( typeCategory = tcSimpleContent ) then begin
-            raise EXsdGeneratorException.CreateFmt('Invalid type definition, a simple type cannot have "not attribute" properties : "%s"',[AContainer.GetExternalName(ASymbol)]);
+    if ( typItm.Members.Count > 0 ) then begin
+      hasSequence := False;
+      for i := 0 to Pred(typItm.Members.Count) do begin
+        if TPasElement(typItm.Members[i]).InheritsFrom(TPasProperty) then begin
+          p := TPasProperty(typItm.Members[i]);
+          if not AContainer.IsAttributeProperty(p) then begin
+            if ( typeCategory = tcSimpleContent ) then begin
+              raise EXsdGeneratorException.CreateFmt('Invalid type definition, a simple type cannot have "not attribute" properties : "%s"',[AContainer.GetExternalName(ASymbol)]);
+            end;
+            hasSequence := True;
           end;
         end;
-        hasSequence := True;
       end;
     end;
     if hasSequence then begin
@@ -581,7 +584,11 @@ begin
             propTypItm := p.VarType;
             if Assigned(propTypItm) then begin
               prop_ns_shortName := GetNameSpaceShortName(GetTypeNameSpace(AContainer,propTypItm),ADocument);
-              propNode.SetAttribute(s_type,Format('%s:%s',[prop_ns_shortName,AContainer.GetExternalName(propTypItm)]));
+              if GetUltimeType(propTypItm).InheritsFrom(TPasArrayType) then
+                s := AContainer.GetExternalName(TPasArrayType(GetUltimeType(propTypItm)).ElType)
+              else
+                s := AContainer.GetExternalName(propTypItm);
+              propNode.SetAttribute(s_type,Format('%s:%s',[prop_ns_shortName,s]));
               if AContainer.IsAttributeProperty(p) then begin
                 if AnsiSameText('Has',Copy(p.StoredAccessorName,1,3)) then
                   propNode.SetAttribute(s_use,'optional')
@@ -589,10 +596,13 @@ begin
                   propNode.SetAttribute(s_use,'required');
               end else begin
                 if AnsiSameText('Has',Copy(p.StoredAccessorName,1,3)) then
-                  propNode.SetAttribute(s_minOccurs,'0')
-                else
-                  propNode.SetAttribute(s_minOccurs,'1');
-                propNode.SetAttribute(s_maxOccurs,'1');
+                  propNode.SetAttribute(s_minOccurs,'0');
+                {else
+                  propNode.SetAttribute(s_minOccurs,'1');}
+                if GetUltimeType(propTypItm).InheritsFrom(TPasArrayType) then
+                  propNode.SetAttribute(s_maxOccurs,s_unbounded)
+                {else
+                  propNode.SetAttribute(s_maxOccurs,'1');}
               end;
             end;
           end;
diff --git a/wst/trunk/ws_helper/xsd_parser.pas b/wst/trunk/ws_helper/xsd_parser.pas
index 6956a5a34..31f475d36 100644
--- a/wst/trunk/ws_helper/xsd_parser.pas
+++ b/wst/trunk/ws_helper/xsd_parser.pas
@@ -188,6 +188,8 @@ end;
 function TCustomXsdSchemaParser.FindElement(const AName: String): TPasElement;
 begin
   Result := SymbolTable.FindElementInModule(AName,FModule);
+  if ( Result = nil ) then
+    Result := SymbolTable.FindElement(AName);
 end;
 
 function TCustomXsdSchemaParser.FindNamedNode(
@@ -484,8 +486,7 @@ end;
 
 procedure TCustomXsdSchemaParser.ParseTypes();
 var
-  nd : TDOMNodeRttiExposer;
-  schmCrsr, crsSchemaChild, typTmpCrs : IObjectCursor;
+  crsSchemaChild, typTmpCrs : IObjectCursor;
   typFilterStr : string;
   typNode : TDOMNode;
 begin