pascal/lazarus-ccr
1
0
Fork 0
Code Issues Releases Activity

Import Wizard : XML opening should use name spaces

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@3014 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
inoussa
2014-05-07 12:55:34 +00:00
parent 9a1296eeb0
commit 9f07522d7c
3 changed files with 39 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
wst/trunk/ide/lazarus/wstimportdlg.lfm
View File

@ -8,7 +8,7 @@ object formImport: TformImport
Caption = 'WSDL Importer'
ClientHeight = 553
ClientWidth = 526
LCLVersion = '0.9.27'
LCLVersion = '1.2.2.0'
object Panel2: TPanel
Left = 0
Height = 505
@ -29,23 +29,23 @@ object formImport: TformImport
TabOrder = 0
object Label1: TLabel
Left = 9
Height = 14
Height = 13
Top = 4
Width = 186
Width = 185
Caption = 'Web Services Description File ( WSDL )'
ParentColor = False
end
object Label2: TLabel
Left = 9
Height = 14
Height = 13
Top = 69
Width = 81
Width = 80
Caption = 'Output directory'
ParentColor = False
end
object edtInputFile: TEdit
Left = 9
Height = 23
Height = 21
Top = 31
Width = 380
Anchors = [akTop, akLeft, akRight]
@ -63,7 +63,7 @@ object formImport: TformImport
end
object edtOutputDir: TEdit
Left = 9
Height = 23
Height = 21
Top = 88
Width = 380
Anchors = [akTop, akLeft, akRight]
@ -83,7 +83,7 @@ object formImport: TformImport
Left = 9
Height = 17
Top = 128
Width = 181
Width = 183
Caption = 'Add the generated files to project'
TabOrder = 4
end
@ -123,7 +123,7 @@ object formImport: TformImport
Left = 9
Height = 17
Top = 8
Width = 80
Width = 82
Caption = 'Interface file'
Checked = True
OnClick = edtOptionIntfClick
@ -134,7 +134,7 @@ object formImport: TformImport
Left = 9
Height = 17
Top = 56
Width = 63
Width = 65
Caption = 'Proxy file'
Checked = True
State = cbChecked
@ -144,7 +144,7 @@ object formImport: TformImport
Left = 294
Height = 17
Top = 8
Width = 103
Width = 105
Caption = 'Service Binder file'
TabOrder = 3
end
@ -152,7 +152,7 @@ object formImport: TformImport
Left = 294
Height = 17
Top = 56
Width = 153
Width = 155
Caption = 'Implementation Skeleton file'
TabOrder = 4
end
@ -160,7 +160,7 @@ object formImport: TformImport
Left = 30
Height = 17
Top = 32
Width = 88
Width = 90
Caption = 'Parse all types'
OnClick = edtOptionIntfALLClick
TabOrder = 1
@ -169,7 +169,7 @@ object formImport: TformImport
Left = 9
Height = 17
Top = 90
Width = 290
Width = 292
Anchors = [akLeft, akBottom]
Caption = 'Generate easy access interface for wrapped parameters'
TabOrder = 5
@ -178,7 +178,7 @@ object formImport: TformImport
Left = 9
Height = 17
Top = 121
Width = 202
Width = 204
Anchors = [akLeft, akBottom]
Caption = 'Generate documentation as comments'
TabOrder = 6
@ -187,7 +187,7 @@ object formImport: TformImport
Left = 294
Height = 17
Top = 121
Width = 188
Width = 190
Caption = 'Generate object array as Collection'
TabOrder = 7
end

30
wst/trunk/ide/lazarus/wstimportdlg.lrs
View File

@ -1,29 +1,29 @@
{ Ceci est un fichier ressource g�n�r� automatiquement par Lazarus }
{ This is an automatically generated lazarus resource file }
LazarusResources.Add('TformImport','FORMDATA',[
'TPF0'#11'TformImport'#10'formImport'#4'Left'#3'>'#2#6'Height'#3')'#2#3'Top'#3
+#133#0#5'Width'#3#14#2#13'ActiveControl'#7#7'Button1'#11'BorderStyle'#7#13'b'
+'sSizeToolWin'#7'Caption'#6#13'WSDL Importer'#12'ClientHeight'#3')'#2#11'Cli'
+'entWidth'#3#14#2#10'LCLVersion'#6#6'0.9.27'#0#6'TPanel'#6'Panel2'#4'Left'#2
+'entWidth'#3#14#2#10'LCLVersion'#6#7'1.2.2.0'#0#6'TPanel'#6'Panel2'#4'Left'#2
+#0#6'Height'#3#249#1#3'Top'#2#0#5'Width'#3#14#2#5'Align'#7#8'alClient'#12'Cl'
+'ientHeight'#3#249#1#11'ClientWidth'#3#14#2#8'TabOrder'#2#1#0#9'TGroupBox'#9
+'GroupBox1'#4'Left'#2#8#6'Height'#3#168#0#3'Top'#2#8#5'Width'#3#250#1#7'Anch'
+'ors'#11#5'akTop'#6'akLeft'#7'akRight'#0#12'ClientHeight'#3#150#0#11'ClientW'
+'idth'#3#246#1#8'TabOrder'#2#0#0#6'TLabel'#6'Label1'#4'Left'#2#9#6'Height'#2
+#14#3'Top'#2#4#5'Width'#3#186#0#7'Caption'#6'&Web Services Description File '
+#13#3'Top'#2#4#5'Width'#3#185#0#7'Caption'#6'&Web Services Description File '
+'( WSDL )'#11'ParentColor'#8#0#0#6'TLabel'#6'Label2'#4'Left'#2#9#6'Height'#2
+#14#3'Top'#2'E'#5'Width'#2'Q'#7'Caption'#6#16'Output directory'#11'ParentCol'
+'or'#8#0#0#5'TEdit'#12'edtInputFile'#4'Left'#2#9#6'Height'#2#23#3'Top'#2#31#5
+#13#3'Top'#2'E'#5'Width'#2'P'#7'Caption'#6#16'Output directory'#11'ParentCol'
+'or'#8#0#0#5'TEdit'#12'edtInputFile'#4'Left'#2#9#6'Height'#2#21#3'Top'#2#31#5
+'Width'#3'|'#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akRight'#0#8'TabOrder'#2#0
+#0#0#7'TButton'#7'Button2'#4'Left'#3#151#1#6'Height'#2#25#3'Top'#2#31#5'Widt'
+'h'#2'('#6'Action'#7#11'actOpenFile'#7'Anchors'#11#5'akTop'#7'akRight'#0#25
+'BorderSpacing.InnerBorder'#2#4#8'TabOrder'#2#1#0#0#5'TEdit'#12'edtOutputDir'
+#4'Left'#2#9#6'Height'#2#23#3'Top'#2'X'#5'Width'#3'|'#1#7'Anchors'#11#5'akTo'
+#4'Left'#2#9#6'Height'#2#21#3'Top'#2'X'#5'Width'#3'|'#1#7'Anchors'#11#5'akTo'
+'p'#6'akLeft'#7'akRight'#0#8'TabOrder'#2#2#0#0#7'TButton'#7'Button3'#4'Left'
+#3#151#1#6'Height'#2#25#3'Top'#2'X'#5'Width'#2'('#6'Action'#7#10'actOpenDir'
+#7'Anchors'#11#5'akTop'#7'akRight'#0#25'BorderSpacing.InnerBorder'#2#4#8'Tab'
+'Order'#2#3#0#0#9'TCheckBox'#15'edtAddToProject'#4'Left'#2#9#6'Height'#2#17#3
+'Top'#3#128#0#5'Width'#3#181#0#7'Caption'#6'"Add the generated files to proj'
+'Top'#3#128#0#5'Width'#3#183#0#7'Caption'#6'"Add the generated files to proj'
+'ect'#8'TabOrder'#2#4#0#0#0#9'TGroupBox'#9'GroupBox2'#4'Left'#2#8#6'Height'#3
+#129#0#3'Top'#3'p'#1#5'Width'#3#250#1#7'Anchors'#11#5'akTop'#6'akLeft'#7'akR'
+'ight'#8'akBottom'#0#7'Caption'#6#12' Messages '#12'ClientHeight'#2'o'#11
@ -33,24 +33,24 @@ LazarusResources.Add('TformImport','FORMDATA',[
+'Left'#2#8#6'Height'#3#168#0#3'Top'#3#184#0#5'Width'#3#250#1#7'Anchors'#11#5
+'akTop'#6'akLeft'#7'akRight'#0#7'Caption'#6#11' Options '#12'ClientHeight'
+#3#150#0#11'ClientWidth'#3#246#1#8'TabOrder'#2#1#0#9'TCheckBox'#13'edtOption'
+'Intf'#4'Left'#2#9#6'Height'#2#17#3'Top'#2#8#5'Width'#2'P'#7'Caption'#6#14'I'
+'Intf'#4'Left'#2#9#6'Height'#2#17#3'Top'#2#8#5'Width'#2'R'#7'Caption'#6#14'I'
+'nterface file'#7'Checked'#9#7'OnClick'#7#18'edtOptionIntfClick'#5'State'#7#9
+'cbChecked'#8'TabOrder'#2#0#0#0#9'TCheckBox'#14'edtOptionProxy'#4'Left'#2#9#6
+'Height'#2#17#3'Top'#2'8'#5'Width'#2'?'#7'Caption'#6#10'Proxy file'#7'Checke'
+'Height'#2#17#3'Top'#2'8'#5'Width'#2'A'#7'Caption'#6#10'Proxy file'#7'Checke'
+'d'#9#5'State'#7#9'cbChecked'#8'TabOrder'#2#2#0#0#9'TCheckBox'#15'edtOptionB'
+'inder'#4'Left'#3'&'#1#6'Height'#2#17#3'Top'#2#8#5'Width'#2'g'#7'Caption'#6
+'inder'#4'Left'#3'&'#1#6'Height'#2#17#3'Top'#2#8#5'Width'#2'i'#7'Caption'#6
+#19'Service Binder file'#8'TabOrder'#2#3#0#0#9'TCheckBox'#12'edtOptionImp'#4
+'Left'#3'&'#1#6'Height'#2#17#3'Top'#2'8'#5'Width'#3#153#0#7'Caption'#6#28'Im'
+'Left'#3'&'#1#6'Height'#2#17#3'Top'#2'8'#5'Width'#3#155#0#7'Caption'#6#28'Im'
+'plementation Skeleton file'#8'TabOrder'#2#4#0#0#9'TCheckBox'#16'edtOptionIn'
+'tfALL'#4'Left'#2#30#6'Height'#2#17#3'Top'#2' '#5'Width'#2'X'#7'Caption'#6#15
+'tfALL'#4'Left'#2#30#6'Height'#2#17#3'Top'#2' '#5'Width'#2'Z'#7'Caption'#6#15
+'Parse all types'#7'OnClick'#7#21'edtOptionIntfALLClick'#8'TabOrder'#2#1#0#0
+#9'TCheckBox'#22'edtOptionWrappedParams'#4'Left'#2#9#6'Height'#2#17#3'Top'#2
+'Z'#5'Width'#3'"'#1#7'Anchors'#11#6'akLeft'#8'akBottom'#0#7'Caption'#6'5Gene'
+'Z'#5'Width'#3'$'#1#7'Anchors'#11#6'akLeft'#8'akBottom'#0#7'Caption'#6'5Gene'
+'rate easy access interface for wrapped parameters'#8'TabOrder'#2#5#0#0#9'TC'
+'heckBox'#16'edtDocAsComments'#4'Left'#2#9#6'Height'#2#17#3'Top'#2'y'#5'Widt'
+'h'#3#202#0#7'Anchors'#11#6'akLeft'#8'akBottom'#0#7'Caption'#6'"Generate doc'
+'h'#3#204#0#7'Anchors'#11#6'akLeft'#8'akBottom'#0#7'Caption'#6'"Generate doc'
+'umentation as comments'#8'TabOrder'#2#6#0#0#9'TCheckBox'#16'edtGenCollectio'
+'n'#4'Left'#3'&'#1#6'Height'#2#17#3'Top'#2'y'#5'Width'#3#188#0#7'Caption'#6
+'n'#4'Left'#3'&'#1#6'Height'#2#17#3'Top'#2'y'#5'Width'#3#190#0#7'Caption'#6
+'#Generate object array as Collection'#8'TabOrder'#2#7#0#0#0#0#6'TPanel'#6'P'
+'anel1'#4'Left'#2#0#6'Height'#2'0'#3'Top'#3#249#1#5'Width'#3#14#2#5'Align'#7
+#8'alBottom'#12'ClientHeight'#2'0'#11'ClientWidth'#3#14#2#8'TabOrder'#2#0#0#7

13
wst/trunk/ide/lazarus/wstimportdlg.pas
View File

@ -69,9 +69,9 @@ var
formImport: TformImport;
implementation
uses DOM, XMLRead, pastree, pascal_parser_intf, wsdl_parser, source_utils,
uses DOM, XMLRead, wst_fpc_xml, pastree, pascal_parser_intf, wsdl_parser, source_utils,
generator, metadata_generator, binary_streamer, wst_resources_utils
{$IFDEF WST_IDE},LazIDEIntf{$ENDIF};
{$IFDEF WST_IDE},LazIDEIntf{$ENDIF},locators,xsd_parser;
type
TSourceType = xgoInterface .. xgoBinder;
@ -85,6 +85,7 @@ var
locDoc : TXMLDocument;
prsr : IParser;
symName : string;
prsrCtx : IParserContext;
begin
Result := nil;
if FileExists(AFileName) then begin
@ -92,11 +93,13 @@ begin
if ( symName[Length(symName)] = '.' ) then begin
Delete(symName,Length(symName),1);
end;
ReadXMLFile(locDoc,AFileName);
locDoc := ReadXMLFile(AFileName);
try
Result := TwstPasTreeContainer.Create();
try
prsr := TWsdlParser.Create(locDoc,Result,ANotifier);
prsrCtx := prsr as IParserContext;
prsrCtx.SetDocumentLocator(TFileDocumentLocator.Create(ExtractFilePath(ExpandFileName(AFileName))));
prsr.Execute(pmAllTypes,symName);
except
FreeAndNil(Result);
@ -299,7 +302,7 @@ begin
);
ShowStatusMessage(mtInfo,'');
{$IFDEF WST_IDE}
openFlags := [];
{openFlags := [ofRevert];
if edtAddToProject.Checked then begin
Include(openFlags,ofAddToProject);
end;
@ -313,7 +316,7 @@ begin
trueOpenFlags := trueOpenFlags - [ofAddToProject];
end;
LazarusIDE.DoOpenEditorFile(destPath + srcItm.GetFileName(),-1,trueOpenFlags);
end;
end;}
{$ENDIF}
finally
srcMgnr := nil;