Read XML with name space activated, add upper cased file filters

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@2577 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
inoussa
2012-10-22 13:55:14 +00:00
parent 82a48915cf
commit 4a587712a7
3 changed files with 624 additions and 626 deletions

View File

@@ -1,22 +1,22 @@
object fWstTypeLibraryEdit: TfWstTypeLibraryEdit object fWstTypeLibraryEdit: TfWstTypeLibraryEdit
Left = 141 Left = 141
Height = 644 Height = 644
Top = 194 Top = 163
Width = 833 Width = 833
AllowDropFiles = True AllowDropFiles = True
Caption = '[Web Services Toolkit ] Type Library Editor' Caption = '[Web Services Toolkit ] Type Library Editor'
ClientHeight = 624 ClientHeight = 619
ClientWidth = 833 ClientWidth = 833
Menu = MainMenu1 Menu = MainMenu1
OnClose = FormClose OnClose = FormClose
OnDropFiles = FormDropFiles OnDropFiles = FormDropFiles
OnShow = FormShow OnShow = FormShow
Position = poDesktopCenter Position = poDesktopCenter
LCLVersion = '0.9.31' LCLVersion = '1.0.1.4'
object SB: TStatusBar object SB: TStatusBar
Left = 0 Left = 0
Height = 23 Height = 21
Top = 601 Top = 598
Width = 833 Width = 833
Panels = < Panels = <
item item
@@ -29,20 +29,19 @@ object fWstTypeLibraryEdit: TfWstTypeLibraryEdit
end end
object Panel1: TPanel object Panel1: TPanel
Left = 0 Left = 0
Height = 601 Height = 598
Top = 0 Top = 0
Width = 314 Width = 314
Align = alLeft Align = alLeft
ClientHeight = 601 ClientHeight = 598
ClientWidth = 314 ClientWidth = 314
TabOrder = 0 TabOrder = 0
object trvSchema: TTreeView object trvSchema: TTreeView
Left = 1 Left = 1
Height = 599 Height = 596
Top = 1 Top = 1
Width = 312 Width = 312
Align = alClient Align = alClient
DefaultItemHeight = 16
PopupMenu = PopupMenu1 PopupMenu = PopupMenu1
ReadOnly = True ReadOnly = True
TabOrder = 0 TabOrder = 0
@@ -52,16 +51,16 @@ object fWstTypeLibraryEdit: TfWstTypeLibraryEdit
end end
object Panel2: TPanel object Panel2: TPanel
Left = 322 Left = 322
Height = 601 Height = 598
Top = 0 Top = 0
Width = 511 Width = 511
Align = alClient Align = alClient
ClientHeight = 601 ClientHeight = 598
ClientWidth = 511 ClientWidth = 511
TabOrder = 1 TabOrder = 1
object PC: TPageControl object PC: TPageControl
Left = 1 Left = 1
Height = 463 Height = 460
Top = 1 Top = 1
Width = 509 Width = 509
ActivePage = tsInterface ActivePage = tsInterface
@@ -70,13 +69,13 @@ object fWstTypeLibraryEdit: TfWstTypeLibraryEdit
TabOrder = 0 TabOrder = 0
object tsInterface: TTabSheet object tsInterface: TTabSheet
Caption = '&Interface' Caption = '&Interface'
ClientHeight = 437 ClientHeight = 425
ClientWidth = 501 ClientWidth = 503
inline srcInterface: TSynEdit inline srcInterface: TSynEdit
Left = 0 Left = 0
Height = 437 Height = 425
Top = 0 Top = 0
Width = 501 Width = 503
Align = alClient Align = alClient
Font.Color = clBlack Font.Color = clBlack
Font.Height = -13 Font.Height = -13
@@ -594,8 +593,8 @@ object fWstTypeLibraryEdit: TfWstTypeLibraryEdit
end end
object tsWSDL: TTabSheet object tsWSDL: TTabSheet
Caption = '&WSDL' Caption = '&WSDL'
ClientHeight = 437 ClientHeight = 425
ClientWidth = 501 ClientWidth = 503
inline srcWSDL: TSynEdit inline srcWSDL: TSynEdit
Left = 0 Left = 0
Height = 437 Height = 437
@@ -1119,8 +1118,8 @@ object fWstTypeLibraryEdit: TfWstTypeLibraryEdit
end end
object tsProxy: TTabSheet object tsProxy: TTabSheet
Caption = '&Proxy' Caption = '&Proxy'
ClientHeight = 437 ClientHeight = 425
ClientWidth = 501 ClientWidth = 503
inline srcProxy: TSynEdit inline srcProxy: TSynEdit
Left = 0 Left = 0
Height = 437 Height = 437
@@ -1644,8 +1643,8 @@ object fWstTypeLibraryEdit: TfWstTypeLibraryEdit
end end
object tsImp: TTabSheet object tsImp: TTabSheet
Caption = 'Im&plementation Skeleton' Caption = 'Im&plementation Skeleton'
ClientHeight = 437 ClientHeight = 425
ClientWidth = 501 ClientWidth = 503
inline srcImp: TSynEdit inline srcImp: TSynEdit
Left = 0 Left = 0
Height = 437 Height = 437
@@ -2169,8 +2168,8 @@ object fWstTypeLibraryEdit: TfWstTypeLibraryEdit
end end
object tsBinder: TTabSheet object tsBinder: TTabSheet
Caption = '&Binder' Caption = '&Binder'
ClientHeight = 437 ClientHeight = 425
ClientWidth = 501 ClientWidth = 503
inline srcBinder: TSynEdit inline srcBinder: TSynEdit
Left = 0 Left = 0
Height = 437 Height = 437
@@ -2694,8 +2693,8 @@ object fWstTypeLibraryEdit: TfWstTypeLibraryEdit
end end
object tsLog: TTabSheet object tsLog: TTabSheet
Caption = '&Log' Caption = '&Log'
ClientHeight = 437 ClientHeight = 425
ClientWidth = 501 ClientWidth = 503
object mmoLog: TMemo object mmoLog: TMemo
Left = 0 Left = 0
Height = 437 Height = 437
@@ -2713,7 +2712,7 @@ object fWstTypeLibraryEdit: TfWstTypeLibraryEdit
object PCInfos: TPageControl object PCInfos: TPageControl
Left = 1 Left = 1
Height = 128 Height = 128
Top = 472 Top = 469
Width = 509 Width = 509
ActivePage = tsDocumentation ActivePage = tsDocumentation
Align = alBottom Align = alBottom
@@ -2721,13 +2720,13 @@ object fWstTypeLibraryEdit: TfWstTypeLibraryEdit
TabOrder = 1 TabOrder = 1
object tsDocumentation: TTabSheet object tsDocumentation: TTabSheet
Caption = 'Documentation' Caption = 'Documentation'
ClientHeight = 102 ClientHeight = 93
ClientWidth = 501 ClientWidth = 503
object edtDocumentation: TMemo object edtDocumentation: TMemo
Left = 0 Left = 0
Height = 102 Height = 93
Top = 0 Top = 0
Width = 501 Width = 503
Align = alClient Align = alClient
Color = clSilver Color = clSilver
ReadOnly = True ReadOnly = True
@@ -2738,8 +2737,8 @@ object fWstTypeLibraryEdit: TfWstTypeLibraryEdit
end end
object tsXSD: TTabSheet object tsXSD: TTabSheet
Caption = 'XML Schema Definition ( XSD )' Caption = 'XML Schema Definition ( XSD )'
ClientHeight = 102 ClientHeight = 93
ClientWidth = 501 ClientWidth = 503
inline edtXSD: TSynEdit inline edtXSD: TSynEdit
Left = 0 Left = 0
Height = 102 Height = 102
@@ -3262,8 +3261,8 @@ object fWstTypeLibraryEdit: TfWstTypeLibraryEdit
end end
object tsDependencies: TTabSheet object tsDependencies: TTabSheet
Caption = 'Used by' Caption = 'Used by'
ClientHeight = 102 ClientHeight = 93
ClientWidth = 501 ClientWidth = 503
object tvDependency: TTreeView object tvDependency: TTreeView
Left = 0 Left = 0
Height = 102 Height = 102
@@ -3283,7 +3282,7 @@ object fWstTypeLibraryEdit: TfWstTypeLibraryEdit
Cursor = crVSplit Cursor = crVSplit
Left = 1 Left = 1
Height = 8 Height = 8
Top = 464 Top = 461
Width = 509 Width = 509
Align = alBottom Align = alBottom
Color = clBlack Color = clBlack
@@ -3293,7 +3292,7 @@ object fWstTypeLibraryEdit: TfWstTypeLibraryEdit
end end
object Splitter1: TSplitter object Splitter1: TSplitter
Left = 314 Left = 314
Height = 601 Height = 598
Top = 0 Top = 0
Width = 8 Width = 8
Color = clBlack Color = clBlack
@@ -3524,8 +3523,7 @@ object fWstTypeLibraryEdit: TfWstTypeLibraryEdit
end end
end end
object OD: TOpenDialog object OD: TOpenDialog
Filter = 'WDSL files(*.WSDL)|*.wsdl|Pascal file (*.pas)|*.pas|XSD files ( *.xsd )|*.xsd' Filter = 'wsdl files(*.wsdl)|*.wsdl|Pascal file (*.pas)|*.pas|XSD files ( *.xsd )|*.xsd|WDSL files(*.WSDL)|*.WSDL'
FilterIndex = 0
InitialDir = '.\' InitialDir = '.\'
Options = [ofPathMustExist, ofFileMustExist, ofEnableSizing, ofViewDetail] Options = [ofPathMustExist, ofFileMustExist, ofEnableSizing, ofViewDetail]
left = 409 left = 409
@@ -3557,7 +3555,7 @@ object fWstTypeLibraryEdit: TfWstTypeLibraryEdit
end end
object SD: TSaveDialog object SD: TSaveDialog
DefaultExt = '.WSDL' DefaultExt = '.WSDL'
Filter = 'WDSL files (*.wsdl)|*.wsdl|XSD files ( *.xsd )|*.xsd' Filter = 'wsdl files (*.wsdl)|*.wsdl|XSD files ( *.xsd )|*.xsd|WDSL files (*.WDSL)|*.WDSL'
FilterIndex = 0 FilterIndex = 0
Options = [ofPathMustExist, ofEnableSizing, ofViewDetail] Options = [ofPathMustExist, ofEnableSizing, ofViewDetail]
left = 498 left = 498

File diff suppressed because it is too large Load Diff

View File

@@ -217,7 +217,7 @@ var
implementation implementation
uses uses
view_helper, DOM, XMLRead, XMLWrite, //HeapTrc, view_helper, DOM, wst_fpc_xml, XMLWrite, //HeapTrc,
xsd_parser, wsdl_parser, source_utils, command_line_parser, generator, metadata_generator, xsd_parser, wsdl_parser, source_utils, command_line_parser, generator, metadata_generator,
binary_streamer, wst_resources_utils, xsd_generator, wsdl_generator, binary_streamer, wst_resources_utils, xsd_generator, wsdl_generator,
uabout, edit_helper, udm, ufrmsaveoption, pparser, SynEditTypes uabout, edit_helper, udm, ufrmsaveoption, pparser, SynEditTypes
@@ -309,7 +309,7 @@ begin
Delete(symName,Length(symName),1); Delete(symName,Length(symName),1);
end; end;
prsr := nil; prsr := nil;
ReadXMLFile(locDoc,AContent); locDoc := ReadXMLFile(AContent);
try try
Result := TwstPasTreeContainer.Create(); Result := TwstPasTreeContainer.Create();
try try
@@ -367,7 +367,7 @@ begin
Delete(symName,Length(symName),1); Delete(symName,Length(symName),1);
end; end;
prsr := nil; prsr := nil;
ReadXMLFile(locDoc,AContent); locDoc := ReadXMLFile(AContent);
try try
Result := TwstPasTreeContainer.Create(); Result := TwstPasTreeContainer.Create();
try try