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

WstImportDlg: fix opening generated files in editor (Thanks Juha Maninnen)

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@3181 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
inoussa
2014-06-16 19:08:10 +00:00
parent f1b0922aa1
commit 58be34c928
1 changed files with 15 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6,7 +6,7 @@ interface
uses
Classes, SysUtils, LResources, Forms, Controls, Graphics, Dialogs, StdCtrls,
ExtCtrls, Buttons, ActnList, logger_intf;
ExtCtrls, Buttons, ActnList, logger_intf {$IFDEF WST_IDE}, LCLVersion {$ENDIF};
type
@@ -73,7 +73,7 @@ implementation
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},locators,xsd_parser;
{$IFDEF WST_IDE},LazIDEIntf, ProjectIntf {$ENDIF},locators,xsd_parser;
type
TSourceType = xgoInterface .. xgoBinder;
@@ -280,14 +280,13 @@ var
tree : TwstPasTreeContainer;
oldCursor : TCursor;
srcMgnr : ISourceManager;
i : Integer;
genOptions : TGenOptions;
fileSet : TSourceTypes;
destPath : string;
{$IFDEF WST_IDE}
j, c : Integer;
i, j, c : Integer;
srcItm : ISourceStream;
trueOpenFlags, openFlags : TOpenFlags;
destPath : string;
{$ENDIF}
begin
oldCursor := Screen.Cursor;
@@ -297,28 +296,25 @@ begin
try
genOptions := GetOptions();
fileSet := genOptions - [xgoWrappedParameter,xgoDocAsComments];
srcMgnr := GenerateSource(
tree,fileSet,otFileSystem,IncludeTrailingPathDelimiter(edtOutputDir.Text),
@ShowStatusMessage,
genOptions
);
destPath := IncludeTrailingPathDelimiter(edtOutputDir.Text);
srcMgnr := GenerateSource(tree, fileSet, otFileSystem, destPath,
@ShowStatusMessage, genOptions);
ShowStatusMessage(mtInfo,'');
{$IFDEF WST_IDE}
{openFlags := [ofRevert];
{$IF lcl_fullversion >= 1030000}
openFlags := [ofRevert];
if edtAddToProject.Checked then begin
Include(openFlags,ofAddToProject);
Include(openFlags, ofAddToProject);
end;
destPath := IncludeTrailingPathDelimiter(edtOutputDir.Text);
c := srcMgnr.GetCount();
for i := 0 to Pred(c) do begin
srcItm := srcMgnr.GetItem(i);
trueOpenFlags := openFlags;
for j := 0 to Pred(LazarusIDE.ActiveProject.FileCount) do begin
if AnsiSameText(srcItm.GetFileName(),ExtractFileName(LazarusIDE.ActiveProject.Files[j].Filename)) then
trueOpenFlags := trueOpenFlags - [ofAddToProject];
end;
LazarusIDE.DoOpenEditorFile(destPath + srcItm.GetFileName(),-1,trueOpenFlags);
end;}
if Assigned( LazarusIDE.ActiveProject.FindFile(srcItm.GetFileName(), [pfsfOnlyProjectFiles]) ) then
Exclude(trueOpenFlags, ofAddToProject);
LazarusIDE.DoOpenEditorFile(destPath + srcItm.GetFileName(), -1, -1, trueOpenFlags);
end;
{$ENDIF}
{$ENDIF}
finally
srcMgnr := nil;