From db2b2950bbff9fe22c2b4e5cdabe756cb4ba1fb8 Mon Sep 17 00:00:00 2001 From: Jens Fudickar Date: Wed, 7 Feb 2024 21:35:28 +0100 Subject: [PATCH] # **json2puml v2.2.13.109** - 07.02.2024 ## All Editions ### New Feature - When a curl command fails but a response has been saved the content of the file is logged as "debug". To see this the debug parameter must be defined ## UI Editions ### Changed Feature - The button "Reload and convert files" is working agian (#22) - The execute menu has been restablished - Restructured the show menu - changing the "debug" flag in the ui now has an influence on the generated log outputs --- documentation/changelog.md | 14 +++++ source/json2puml.dproj | 36 ++++++------ source/json2puml.res | Bin 16376 -> 16376 bytes source/json2pumlconst.pas | 2 +- source/json2pumlform.dfm | 84 +++++++++++++-------------- source/json2pumlform.pas | 18 ++++-- source/json2pumlservice.dproj | 36 ++++++------ source/json2pumlservice.res | Bin 16412 -> 16412 bytes source/json2pumltools.pas | 9 +-- source/json2pumlui.dproj | 38 ++++++------ source/json2pumlui.res | Bin 18204 -> 18204 bytes source/json2pumlvcltools.pas | 12 +++- source/json2pumlwindowsservice.dproj | 36 ++++++------ source/json2pumlwindowsservice.res | Bin 18300 -> 18300 bytes unittests/json2pumlunittestsui.dproj | 36 ++++++------ unittests/json2pumlunittestsui.res | Bin 154872 -> 154872 bytes 16 files changed, 174 insertions(+), 147 deletions(-) diff --git a/documentation/changelog.md b/documentation/changelog.md index 58fd7bf..cde0592 100644 --- a/documentation/changelog.md +++ b/documentation/changelog.md @@ -1,3 +1,17 @@ +# **json2puml v2.2.13.109** - 07.02.2024 +## All Editions +### New Feature +- When a curl command fails but a response has been saved the content of the file is logged as "debug". + To see this the debug parameter must be defined + +## UI Editions +### Changed Feature +- The button "Reload and convert files" is working agian (#22) +- The execute menu has been restablished +- Restructured the show menu +- changing the "debug" flag in the ui now has an influence on the generated log outputs + + # **json2puml v2.2.12.108** - 23.01.2024 ## All Editions ### New Feature diff --git a/source/json2puml.dproj b/source/json2puml.dproj index bbf2042..ae04983 100644 --- a/source/json2puml.dproj +++ b/source/json2puml.dproj @@ -81,12 +81,12 @@ DBXSqliteDriver;IndyIPCommon;RESTComponents;bindcompdbx;DBXInterBaseDriver;vcl;IndyIPServer;vclactnband;vclFireDAC;IndySystem;bindcompvclsmp;tethering;svnui;bindcompvclwinx;dsnapcon;FireDACADSDriver;FireDACMSAccDriver;fmxFireDAC;vclimg;madBasic_;Jcl;FireDAC;vcltouch;vcldb;bindcompfmx;svn;FireDACSqliteDriver;FireDACPgDriver;inetdb;soaprtl;DbxCommonDriver;fmx;FireDACIBDriver;fmxdae;xmlrtl;soapmidas;vcledge;fmxobj;vclwinx;rtl;DbxClientDriver;CustomIPTransport;vcldsnap;dbexpress;IndyCore;vclx;bindcomp;appanalytics;dsnap;FireDACCommon;IndyIPClient;bindcompvcl;RESTBackendComponents;VCLRESTComponents;soapserver;dbxcds;VclSmp;adortl;JclDeveloperTools;JclVcl;vclie;bindengine;DBXMySQLDriver;CloudService;dsnapxml;FireDACMySQLDriver;dbrtl;IndyProtocols;inetdbxpress;FireDACCommonODBC;FireDACCommonDriver;JclContainers;inet;fmxase;$(DCC_UsePackage) Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace) Debug - FileDescription=$(MSBuildProjectName) Command Line;FileVersion=2.2.12.108;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=2.0;CompanyName=SWE Jens Fudickar;LegalCopyright=(c) by Jens Fudickar in 2023 + FileDescription=$(MSBuildProjectName) Command Line;FileVersion=2.2.13.109;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=2.0;CompanyName=SWE Jens Fudickar;LegalCopyright=(c) by Jens Fudickar in 2023 1033 true true (None) - 108 + 109 /parameterfile:samples\acrmcurlparameter.json /debug /wait e:\Delphi\Projects\json2puml\ ..\documentation\icons\json2puml_icon.png @@ -94,18 +94,18 @@ none 2 2 - 12 + 13 DBXSqliteDriver;IndyIPCommon;RESTComponents;bindcompdbx;DBXInterBaseDriver;vcl;IndyIPServer;vclactnband;vclFireDAC;IndySystem;bindcompvclsmp;tethering;bindcompvclwinx;dsnapcon;FireDACADSDriver;FireDACMSAccDriver;fmxFireDAC;vclimg;FireDAC;vcltouch;vcldb;bindcompfmx;FireDACSqliteDriver;FireDACPgDriver;inetdb;soaprtl;DbxCommonDriver;fmx;FireDACIBDriver;fmxdae;xmlrtl;soapmidas;vcledge;fmxobj;vclwinx;rtl;DbxClientDriver;CustomIPTransport;vcldsnap;dbexpress;IndyCore;vclx;bindcomp;appanalytics;dsnap;FireDACCommon;IndyIPClient;bindcompvcl;RESTBackendComponents;VCLRESTComponents;soapserver;dbxcds;VclSmp;adortl;vclie;bindengine;DBXMySQLDriver;CloudService;dsnapxml;FireDACMySQLDriver;dbrtl;IndyProtocols;inetdbxpress;FireDACCommonODBC;FireDACCommonDriver;inet;fmxase;$(DCC_UsePackage) true Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;$(DCC_Namespace) Debug - FileDescription=$(MSBuildProjectName) Command Line;FileVersion=2.2.12.108;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=2.0;CompanyName=SWE Jens Fudickar;LegalCopyright=(c) by Jens Fudickar in 2023 + FileDescription=$(MSBuildProjectName) Command Line;FileVersion=2.2.13.109;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=2.0;CompanyName=SWE Jens Fudickar;LegalCopyright=(c) by Jens Fudickar in 2023 1033 true (None) - 108 + 109 /parameterfile:samples\acrmcurlparameter.json /debug /wait e:\Delphi\Projects\json2puml\ ..\documentation\icons\json2puml_icon.png @@ -113,7 +113,7 @@ none 2 2 - 12 + 13 DEBUG;$(DCC_Define) @@ -133,25 +133,25 @@ true 1033 (Ohne) - 108 + 109 e:\Delphi\Projects\json2puml\ none - FileDescription=$(MSBuildProjectName) Command Line;FileVersion=2.2.12.108;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=2.0;CompanyName=SWE Jens Fudickar;LegalCopyright=(c) by Jens Fudickar in 2023 + FileDescription=$(MSBuildProjectName) Command Line;FileVersion=2.2.13.109;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=2.0;CompanyName=SWE Jens Fudickar;LegalCopyright=(c) by Jens Fudickar in 2023 2 2 - 12 + 13 3 true 1033 (None) - FileDescription=$(MSBuildProjectName) Command Line;FileVersion=2.2.12.108;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=2.0;CompanyName=SWE Jens Fudickar;LegalCopyright=(c) by Jens Fudickar in 2023 - 108 + FileDescription=$(MSBuildProjectName) Command Line;FileVersion=2.2.13.109;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=2.0;CompanyName=SWE Jens Fudickar;LegalCopyright=(c) by Jens Fudickar in 2023 + 109 /parameterfile:docker\json2puml\src\json2puml\sample\tmfparameter.json /debug /wait 2 2 - 12 + 13 false @@ -160,21 +160,21 @@ 0 - FileDescription=$(MSBuildProjectName) Command Line;FileVersion=2.2.12.108;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=2.0;CompanyName=SWE Jens Fudickar;LegalCopyright=(c) by Jens Fudickar in 2023 - 108 + FileDescription=$(MSBuildProjectName) Command Line;FileVersion=2.2.13.109;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=2.0;CompanyName=SWE Jens Fudickar;LegalCopyright=(c) by Jens Fudickar in 2023 + 109 2 2 - 12 + 13 - 108 + 109 e:\Delphi\Projects\json2puml\ 2 true 1033 - FileDescription=$(MSBuildProjectName) Command Line;FileVersion=2.2.12.108;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=2.0;CompanyName=SWE Jens Fudickar;LegalCopyright=(c) by Jens Fudickar in 2023 + FileDescription=$(MSBuildProjectName) Command Line;FileVersion=2.2.13.109;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=2.0;CompanyName=SWE Jens Fudickar;LegalCopyright=(c) by Jens Fudickar in 2023 2 - 12 + 13 diff --git a/source/json2puml.res b/source/json2puml.res index a14d890dd7013af024940af82cc9ca66987cf927..afe70a448755d66b1ae62d28d2cf4d99caa1408d 100644 GIT binary patch delta 28 kcmexS|D%3F33Dz3@5J)QoW=}#42BE_43?Xd8K>F-0HH<+NdN!< delta 28 kcmexS|D%3F33Cnu&&2Y_oJI_K42BE_3>KS{8K>F-0HF#AMF0Q* diff --git a/source/json2pumlconst.pas b/source/json2pumlconst.pas index 6b45869..6e63f17 100644 --- a/source/json2pumlconst.pas +++ b/source/json2pumlconst.pas @@ -193,7 +193,7 @@ tJson2PumlErrorInformation = record {$ELSE} cCmdLinePrefix = '-'; {$ENDIF} - cCurrentVersion = '2.2.12.108'; + cCurrentVersion = '2.2.13.109'; cApplicationName = 'json2puml'; diff --git a/source/json2pumlform.dfm b/source/json2pumlform.dfm index 41a8778..4d5f546 100644 --- a/source/json2pumlform.dfm +++ b/source/json2pumlform.dfm @@ -118,7 +118,7 @@ object json2pumlMainForm: Tjson2pumlMainForm Top = 73 Width = 1357 Height = 808 - ActivePage = LogTabSheet + ActivePage = OutputTabsheet Align = alClient TabOrder = 3 object LogTabSheet: TTabSheet @@ -696,9 +696,8 @@ object json2pumlMainForm: Tjson2pumlMainForm Top = 319 Width = 161 Height = 25 - Action = ReloadAndConvertAction + Action = GenerateServiceListResultsAction Anchors = [akTop, akRight] - Caption = 'Generate Servicelist Results' Default = True TabOrder = 4 end @@ -961,8 +960,7 @@ object json2pumlMainForm: Tjson2pumlMainForm end object ShowCurlParameterAction: TAction Category = 'Show' - Caption = 'Show Curl Authentication File' - ShortCut = 16498 + Caption = 'Show &Curl Parameter File' OnExecute = ShowCurlParameterActionExecute end object LoadFileAction: TAction @@ -1010,8 +1008,7 @@ object json2pumlMainForm: Tjson2pumlMainForm end object ShowExecuteAction: TAction Category = 'Show' - Caption = 'Show Execute' - ShortCut = 16502 + Caption = 'Show &Execute' OnExecute = ShowExecuteActionExecute end object ConvertCurrentFileAction: TAction @@ -1022,38 +1019,32 @@ object json2pumlMainForm: Tjson2pumlMainForm end object ShowInputListAction: TAction Category = 'Show' - Caption = 'Show Input List' - ShortCut = 16496 + Caption = 'Show &Input List' OnExecute = ShowInputListActionExecute end object ShowDefinitionFileAction: TAction Category = 'Show' - Caption = 'Show Definition File' - ShortCut = 16499 + Caption = 'Show &Definition File' OnExecute = ShowDefinitionFileActionExecute end object ShowOutputFilesAction: TAction Category = 'Show' - Caption = 'Show Output Files' - ShortCut = 16503 + Caption = 'Show &Result Files' OnExecute = ShowOutputFilesActionExecute end object ShowOptionFileAction: TAction Category = 'Show' - Caption = 'Show Option File' - ShortCut = 16500 + Caption = 'Show O&ption File' OnExecute = ShowOptionFileActionExecute end object ShowCurlAuthenticationAction: TAction Category = 'Show' - Caption = 'Show Curl Authentication File' - ShortCut = 16497 + Caption = 'Show Curl &Authentication File' OnExecute = ShowCurlAuthenticationActionExecute end object ShowParameterFileAction: TAction Category = 'Show' - Caption = 'Show Parameter File' - ShortCut = 16501 + Caption = 'Show P&arameter File' OnExecute = ShowParameterFileActionExecute end object SaveFileAction: TAction @@ -1077,7 +1068,7 @@ object json2pumlMainForm: Tjson2pumlMainForm end object ShowGlobalConfigFile: TAction Category = 'Show' - Caption = 'Show Global Configuration File' + Caption = 'Show &Global Configuration File' end object OpenCurrentJSONAction: TAction Category = 'Output Files' @@ -1091,6 +1082,11 @@ object json2pumlMainForm: Tjson2pumlMainForm OnExecute = OpenConfigurationFileExternalExecute OnUpdate = SaveFileActionUpdate end + object GenerateServiceListResultsAction: TAction + Category = 'Execute' + Caption = 'Generate ServiceList Results' + OnExecute = GenerateServiceListResultsActionExecute + end end object ImageList1: TImageList Left = 640 @@ -1787,47 +1783,30 @@ object json2pumlMainForm: Tjson2pumlMainForm Items = < item Action = ShowExecuteAction - Caption = 'S&how Execute' - ShortCut = 16502 end item Action = ShowOutputFilesAction - Caption = 'Show O&utput Files' - ShortCut = 16503 end item - Action = ShowCurlParameterAction - Caption = '&Show Curl Authentication File' - ShortCut = 16498 + Action = ShowDefinitionFileAction end item - Action = ShowInputListAction - Caption = 'Sh&ow Input List' - ShortCut = 16496 + Action = ShowParameterFileAction end item - Action = ShowDefinitionFileAction - Caption = 'Sho&w Definition File' - ShortCut = 16499 + Action = ShowInputListAction end item - Action = ShowOptionFileAction - Caption = 'Show O&ption File' - ShortCut = 16500 + Action = ShowCurlAuthenticationAction end item - Action = ShowCurlAuthenticationAction - Caption = 'Show &Curl Authentication File' - ShortCut = 16497 + Action = ShowCurlParameterAction end item - Action = ShowParameterFileAction - Caption = 'Show P&arameter File' - ShortCut = 16501 + Action = ShowOptionFileAction end item Action = ShowGlobalConfigFile - Caption = 'Show &Global Configuration File' end> Caption = '&Show' end @@ -1915,6 +1894,25 @@ object json2pumlMainForm: Tjson2pumlMainForm ShortCut = 120 end> Caption = 'Ou&tput Files' + end + item + Items = < + item + Action = ConvertAllOpenFilesAction + Caption = '&Convert all open files' + ImageIndex = 15 + ShortCut = 116 + end + item + Action = ReloadAndConvertAction + Caption = '&Reload and convert files' + ShortCut = 16466 + end + item + Action = GenerateServiceListResultsAction + Caption = '&Generate ServiceList Results' + end> + Caption = 'E&xecute' end> ActionBar = ActionMainMenuBar end diff --git a/source/json2pumlform.pas b/source/json2pumlform.pas index 7f7253e..ffcffdb 100644 --- a/source/json2pumlform.pas +++ b/source/json2pumlform.pas @@ -212,6 +212,7 @@ Tjson2pumlMainForm = class(TForm) Label28: TLabel; DBEdit1: TDBEdit; Button2: TButton; + GenerateServiceListResultsAction: TAction; procedure CommandLineEditPanelResize (Sender: TObject); procedure ConvertAllOpenFilesActionExecute (Sender: TObject); procedure ConvertCurrentFileActionExecute (Sender: TObject); @@ -220,6 +221,7 @@ Tjson2pumlMainForm = class(TForm) procedure FormClose (Sender: TObject; var Action: TCloseAction); procedure FormCloseQuery (Sender: TObject; var CanClose: Boolean); procedure FormShow (Sender: TObject); + procedure GenerateServiceListResultsActionExecute(Sender: TObject); procedure InitialTimerTimer (Sender: TObject); procedure LoadFileActionExecute (Sender: TObject); procedure OpenConfigurationFileExternalExecute (Sender: TObject); @@ -349,7 +351,8 @@ implementation constructor Tjson2pumlMainForm.Create (AOwner: TComponent); begin inherited Create (AOwner); - + FLogStringListProvider := TLogStringListProvider.Create; + Logger.Providers.add (LogStringListProvider); end; destructor Tjson2pumlMainForm.Destroy; @@ -358,7 +361,6 @@ destructor Tjson2pumlMainForm.Destroy; begin if Logger.Providers.IndexOf (LogStringListProvider) >= 0 then Logger.Providers.delete (Logger.Providers.IndexOf(LogStringListProvider)); - // FLogStringListProvider.Free; end; FInputHandler.Free; GlobalLogStringListProvider.LogList := nil; @@ -798,6 +800,7 @@ procedure Tjson2pumlMainForm.FormToCommandline; InputHandler.CmdLineParameter.TitleFilter := titlefilterEdit.Text; InputHandler.CmdLineParameter.GenerateOutputDefinition := generateoutputdefinitionCheckBox.Checked; InputHandler.CmdLineParameter.Debug := debugCheckBox.Checked; + GlobalCommandLineParameter.Debug := debugCheckBox.Checked; // Doing it twice to support also the log initialisation FillParameterList (InputHandler.CmdLineParameter.CurlParameter, CurlParameterDataSet); FillParameterList (InputHandler.CmdLineParameter.CurlAuthenticationParameter, CurlAuthenticationParameterDataset); end; @@ -877,6 +880,7 @@ function Tjson2pumlMainForm.GetCurrentPage: tJson2PumlPage; procedure Tjson2pumlMainForm.HandleInputParameter; begin FormToCommandline; + InitFormDefaultLogger; LogLines.Clear; if InputHandler.CmdLineParameter.Failed then begin @@ -892,12 +896,9 @@ procedure Tjson2pumlMainForm.InitFormDefaultLogger; begin InitDefaultLogger (GlobalConfigurationDefinition.LogFileOutputPath, jatUI, false, not FindCmdLineSwitch(cNoLogFiles, True)); - FLogStringListProvider := TLogStringListProvider.Create; - Logger.Providers.add (LogStringListProvider); LogStringListProvider.ShowTimeStamp := True; LogStringListProvider.ShowEventTypes := True; LogStringListProvider.LogList := LogLines; - LogStringListProvider.LogLevel := LOG_DEBUG; SetLogProviderDefaults (LogStringListProvider, jatUI); LogStringListProvider.Enabled := True; end; @@ -1011,7 +1012,7 @@ procedure Tjson2pumlMainForm.OpenCurrentJSONFile; procedure Tjson2pumlMainForm.ReloadAndConvertActionExecute (Sender: TObject); begin - GenerateServiceListResults; + HandleInputParameter; end; procedure Tjson2pumlMainForm.ReloadFileActionExecute (Sender: TObject); @@ -1236,6 +1237,11 @@ procedure Tjson2pumlMainForm.FillCurlFileListDataset (ConverterInputList: tJson2 end; end; +procedure Tjson2pumlMainForm.GenerateServiceListResultsActionExecute(Sender: TObject); +begin + GenerateServiceListResults; +end; + procedure Tjson2pumlMainForm.HandleNotifyChange (Sender: TObject; ChangeType: tJson2PumlNotifyChangeType; ProgressValue, ProgressMaxValue: Integer; ProgressInfo: string = ''); begin diff --git a/source/json2pumlservice.dproj b/source/json2pumlservice.dproj index f4bef82..f9340c2 100644 --- a/source/json2pumlservice.dproj +++ b/source/json2pumlservice.dproj @@ -86,33 +86,33 @@ DBXSqliteDriver;dxPSPrVwRibbonRS25;dxRibbonCustomizationFormRS25;vclactnband;dxChartControlRS25;vclFireDAC;cxExportRS25;dxHttpIndyRequestRS25;tethering;dxPScxCommonRS25;cxGridEMFRS25;FireDACADSDriver;cxPivotGridOLAPRS25;JvPluginSystem;cxSchedulerGridRS25;vcltouch;JvBands;vcldb;Intraweb;svn;JvJans;dxGaugeControlRS25;cxLibraryRS25;BaseOracleObjects25;dxFlowChartAdvancedCustomizeFormRS25;odacfmx250;vclx;dxSpreadSheetConditionalFormattingDialogsRS25;dxTileControlRS25;dxMapControlRS25;dxPDFViewerRS25;dxDockingRS25;VCLRESTComponents;dxPSLnksRS25;dxWizardControlRS25;dxRichEditControlRS25;IcsFmxD102Run;vclie;bindengine;dxFireDACServerModeRS25;JvHMI;FireDACMySQLDriver;dxPSdxPDFViewerLnkRS25;bindcompdbx;dxPSdxLCLnkRS25;IndyIPServer;dxGanttControlRS25;dac250;IndySystem;dsnapcon;dxPSRichEditControlLnkRS25;FireDACMSAccDriver;fmxFireDAC;vclimg;Jcl;dxdbtrRS25;dxPScxTLLnkRS25;dxSpreadSheetRS25;dxPScxSchedulerLnkRS25;FMXTee;cxGridRS25;dxSpreadSheetCoreConditionalFormattingDialogsRS25;DbxCommonDriver;dxorgcRS25;JvManagedThreads;dxCloudServiceLibraryRS25;xmlrtl;JvTimeFramework;fmxobj;dxPScxGridLnkRS25;rtl;DbxClientDriver;dacvcl250;dxPSCoreRS25;CodeSiteExpressPkg;dxmdsRS25;JvSystem;JvStdCtrls;appanalytics;IndyIPClient;bindcompvcl;dxADOEMFRS25;TeeUI;JvDocking;JvPascalInterpreter;VclSmp;JclVcl;cxVerticalGridRS25;dxtrmdRS25;JvControls;JvPrintPreview;dxADOServerModeRS25;dxCoreRS25;cxSchedulerTreeBrowserRS25;oraprov250;DBXInterBaseDriver;dxRichEditControlCoreRS25;dxPSTeeChartRS25;JvGlobus;svnui;JvMM;dxPSdxFCLnkRS25;dxRichEditCoreRS25;SyntEditDB25;bindcompfmx;JvNet;inetdb;JvAppFrm;FmxTeeUI;fmx;fmxdae;dxPScxPivotGridLnkRS25;dxBarDBNavRS25;dxTabbedMDIRS25;JvWizards;dbexpress;IndyCore;dxFlowChartRS25;dxRichEditDocumentModelRS25;JvPageComps;dsnap;dxBarRS25;dxPSDBTeeChartRS25;IcsVclD102Run;dxdborRS25;dxPScxExtCommonRS25;cxPivotGridRS25;JclDeveloperTools;dxSpreadSheetReportDesignerRS25;dxNavBarRS25;dxPSdxSpreadSheetLnkRS25;cxSchedulerRibbonStyleEventEditorRS25;JvCmp;DBXMySQLDriver;FireDACCommonODBC;cxTreeListRS25;IndyIPCommon;JvCustom;vcl;dxPScxVGridLnkRS25;JvXPCtrls;dxBarExtItemsRS25;dxComnRS25;dxPSdxDBTVLnkRS25;madExcept_;madBasic_;TeeDB;dxSpreadSheetCoreRS25;dxServerModeRS25;JvCore;dxPScxPCProdRS25;dxFlowChartLayoutsRS25;JvCrypt;FireDACPgDriver;dxEMFRS25;JvDlgs;JvRuntimeDesign;Tee;dxPsPrVwAdvRS25;vclwinx;madDisAsm_;cxTreeListdxBarPopupMenuRS25;CustomIPTransport;vcldsnap;cxSchedulerWebServiceStorageRS25;dxPSdxOCLnkRS25;bindcomp;SyntEdit25;cxPivotGridChartRS25;cxSchedulerRS25;dxBarExtDBItemsRS25;dxOrgChartAdvancedCustomizeFormRS25;SynEdit_R;dxDBXServerModeRS25;dxFireDACEMFRS25;dxGDIPlusRS25;dxPSdxGaugeControlLnkRS25;dmvcframeworkRT;dbxcds;adortl;dmvcframeworkDT;odac250;dacfmx250;dxPSdxDBOCLnkRS25;dxRibbonRS25;dsnapxml;dxSpellCheckerRS25;dbrtl;inetdbxpress;IndyProtocols;dxFlowChartDesignerRS25;IcsCommonD102Run;JclContainers;odacvcl250;dxPSdxMapControlLnkRS25;fmxase;$(DCC_UsePackage) Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace) Debug - CompanyName=SWE Jens Fudickar;FileDescription=$(MSBuildProjectName) Service;FileVersion=2.2.11.107;LegalCopyright=(c) by Jens Fudickar in 2023;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=2.0 + CompanyName=SWE Jens Fudickar;FileDescription=$(MSBuildProjectName) Service;FileVersion=2.2.13.109;LegalCopyright=(c) by Jens Fudickar in 2023;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=2.0 1033 true (None) - 107 + 109 ..\documentation\icons\json2puml_icon.png ..\documentation\icons\json2puml_icon.png none 2 2 - 11 + 13 DBXSqliteDriver;dxPSPrVwRibbonRS25;dxRibbonCustomizationFormRS25;vclactnband;dxChartControlRS25;vclFireDAC;cxExportRS25;dxHttpIndyRequestRS25;tethering;dxPScxCommonRS25;cxGridEMFRS25;FireDACADSDriver;cxPivotGridOLAPRS25;cxSchedulerGridRS25;vcltouch;vcldb;Intraweb;dxGaugeControlRS25;cxLibraryRS25;dxFlowChartAdvancedCustomizeFormRS25;vclx;dxSpreadSheetConditionalFormattingDialogsRS25;dxTileControlRS25;dxMapControlRS25;dxPDFViewerRS25;dxDockingRS25;VCLRESTComponents;dxPSLnksRS25;dxWizardControlRS25;dxRichEditControlRS25;IcsFmxD102Run;vclie;bindengine;dxFireDACServerModeRS25;FireDACMySQLDriver;dxPSdxPDFViewerLnkRS25;bindcompdbx;dxPSdxLCLnkRS25;IndyIPServer;dxGanttControlRS25;IndySystem;dsnapcon;dxPSRichEditControlLnkRS25;FireDACMSAccDriver;fmxFireDAC;vclimg;dxdbtrRS25;dxPScxTLLnkRS25;dxSpreadSheetRS25;dxPScxSchedulerLnkRS25;FMXTee;cxGridRS25;dxSpreadSheetCoreConditionalFormattingDialogsRS25;DbxCommonDriver;dxorgcRS25;dxCloudServiceLibraryRS25;xmlrtl;fmxobj;dxPScxGridLnkRS25;rtl;DbxClientDriver;dxPSCoreRS25;dxmdsRS25;appanalytics;IndyIPClient;bindcompvcl;dxADOEMFRS25;TeeUI;VclSmp;cxVerticalGridRS25;dxtrmdRS25;dxADOServerModeRS25;dxCoreRS25;cxSchedulerTreeBrowserRS25;DBXInterBaseDriver;dxRichEditControlCoreRS25;dxPSTeeChartRS25;dxPSdxFCLnkRS25;dxRichEditCoreRS25;bindcompfmx;inetdb;FmxTeeUI;fmx;fmxdae;dxPScxPivotGridLnkRS25;dxBarDBNavRS25;dxTabbedMDIRS25;dbexpress;IndyCore;dxFlowChartRS25;dxRichEditDocumentModelRS25;dsnap;dxBarRS25;dxPSDBTeeChartRS25;IcsVclD102Run;dxdborRS25;dxPScxExtCommonRS25;cxPivotGridRS25;dxSpreadSheetReportDesignerRS25;dxNavBarRS25;dxPSdxSpreadSheetLnkRS25;cxSchedulerRibbonStyleEventEditorRS25;DBXMySQLDriver;FireDACCommonODBC;cxTreeListRS25;IndyIPCommon;vcl;dxPScxVGridLnkRS25;dxBarExtItemsRS25;dxComnRS25;dxPSdxDBTVLnkRS25;TeeDB;dxSpreadSheetCoreRS25;dxServerModeRS25;dxPScxPCProdRS25;dxFlowChartLayoutsRS25;FireDACPgDriver;dxEMFRS25;Tee;dxPsPrVwAdvRS25;vclwinx;cxTreeListdxBarPopupMenuRS25;CustomIPTransport;vcldsnap;cxSchedulerWebServiceStorageRS25;dxPSdxOCLnkRS25;bindcomp;cxPivotGridChartRS25;cxSchedulerRS25;dxBarExtDBItemsRS25;dxOrgChartAdvancedCustomizeFormRS25;SynEdit_R;dxDBXServerModeRS25;dxFireDACEMFRS25;dxGDIPlusRS25;dxPSdxGaugeControlLnkRS25;dbxcds;adortl;dxPSdxDBOCLnkRS25;dxRibbonRS25;dsnapxml;dxSpellCheckerRS25;dbrtl;inetdbxpress;IndyProtocols;dxFlowChartDesignerRS25;IcsCommonD102Run;dxPSdxMapControlLnkRS25;fmxase;$(DCC_UsePackage) Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;$(DCC_Namespace) Debug - CompanyName=SWE Jens Fudickar;FileDescription=$(MSBuildProjectName) Service;FileVersion=2.2.11.107;LegalCopyright=(c) by Jens Fudickar in 2023;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=2.0 + CompanyName=SWE Jens Fudickar;FileDescription=$(MSBuildProjectName) Service;FileVersion=2.2.13.109;LegalCopyright=(c) by Jens Fudickar in 2023;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=2.0 1033 true (None) - 107 + 109 ..\documentation\icons\json2puml_icon.png ..\documentation\icons\json2puml_icon.png none 2 2 - 11 + 13 DEBUG;$(DCC_Define) @@ -130,23 +130,23 @@ false true 1033 - FileDescription=$(MSBuildProjectName) Service;FileVersion=2.2.11.107;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=2.0;CompanyName=SWE Jens Fudickar;LegalCopyright=(c) by Jens Fudickar in 2023 - 107 + FileDescription=$(MSBuildProjectName) Service;FileVersion=2.2.13.109;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=2.0;CompanyName=SWE Jens Fudickar;LegalCopyright=(c) by Jens Fudickar in 2023 + 109 none 2 2 - 11 + 13 /debug 3 madExcept;LeakChecking;$(DCC_Define) - 107 - CompanyName=SWE Jens Fudickar;FileDescription=$(MSBuildProjectName) Service;FileVersion=2.2.11.107;LegalCopyright=(c) by Jens Fudickar in 2023;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=2.0 + 109 + CompanyName=SWE Jens Fudickar;FileDescription=$(MSBuildProjectName) Service;FileVersion=2.2.13.109;LegalCopyright=(c) by Jens Fudickar in 2023;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=2.0 2 2 /debug - 11 + 13 3 @@ -156,18 +156,18 @@ 0 - 107 - CompanyName=SWE Jens Fudickar;FileDescription=$(MSBuildProjectName) Service;FileVersion=2.2.11.107;LegalCopyright=(c) by Jens Fudickar in 2023;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=2.0 + 109 + CompanyName=SWE Jens Fudickar;FileDescription=$(MSBuildProjectName) Service;FileVersion=2.2.13.109;LegalCopyright=(c) by Jens Fudickar in 2023;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=2.0 2 2 - 11 + 13 - 107 - CompanyName=SWE Jens Fudickar;FileDescription=$(MSBuildProjectName) Service;FileVersion=2.2.11.107;LegalCopyright=(c) by Jens Fudickar in 2023;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=2.0 + 109 + CompanyName=SWE Jens Fudickar;FileDescription=$(MSBuildProjectName) Service;FileVersion=2.2.13.109;LegalCopyright=(c) by Jens Fudickar in 2023;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=2.0 2 2 - 11 + 13 diff --git a/source/json2pumlservice.res b/source/json2pumlservice.res index 28fe01a5c2584a405dab759398f3dc4b8382d2ec..de0f9ef9b88eac299f93b8eaa6c7e2b2966fcaff 100644 GIT binary patch delta 31 mcmbQ!z&NLYaY6}mE(7nza&1OVV+K72Lk0r|%gw793+(`oR0tvf delta 31 mcmbQ!z&NLYaY6}mHUsy@a&1OVLk2wtLk0r|^UbRn3+(`n*a#W` diff --git a/source/json2pumltools.pas b/source/json2pumltools.pas index 2d415b8..c94eb36 100644 --- a/source/json2pumltools.pas +++ b/source/json2pumltools.pas @@ -1285,6 +1285,7 @@ class function TCurlUtils.Execute (const iBaseUrl: string; const iUrlParts, iOpt vErrorMessage: string; vCommandOutPut, vCommandErrors: TStringList; vOutputFile: TStringList; + s : String; begin @@ -1360,10 +1361,10 @@ class function TCurlUtils.Execute (const iBaseUrl: string; const iUrlParts, iOpt vOutputFile := TStringList.Create; try vOutputFile.LoadFromFile (iOutputFile); - // if vOutputFile.Count > 0 then - // GlobalLoghandler.Debug ('curl result output (%s)', [iOutputFile]); - // for s in vOutputFile do - // GlobalLoghandler.Debug (s); + if vOutputFile.Count > 0 then + GlobalLoghandler.Debug ('curl result output (%s)', [iOutputFile]); + for s in vOutputFile do + GlobalLoghandler.Debug (s); finally vOutputFile.Free; end; diff --git a/source/json2pumlui.dproj b/source/json2pumlui.dproj index 75d25a9..f61f889 100644 --- a/source/json2pumlui.dproj +++ b/source/json2pumlui.dproj @@ -78,32 +78,32 @@ Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace) Debug true - CompanyName=SWE Jens Fudickar;FileDescription=$(MSBuildProjectName) UI;FileVersion=2.2.12.108;LegalCopyright=(c) by Jens Fudickar in 2023;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=2.0 + CompanyName=SWE Jens Fudickar;FileDescription=$(MSBuildProjectName) UI;FileVersion=2.2.13.109;LegalCopyright=(c) by Jens Fudickar in 2023;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=2.0 1033 $(BDS)\bin\default_app.manifest - 108 + 109 ..\documentation\icons\json2puml_icon.png ..\documentation\icons\json2puml_icon.png none 2 2 - 12 + 13 DBXSqliteDriver;dxPSPrVwRibbonRS25;dxRibbonCustomizationFormRS25;vclactnband;dxChartControlRS25;vclFireDAC;cxExportRS25;dxHttpIndyRequestRS25;tethering;dxPScxCommonRS25;cxGridEMFRS25;FireDACADSDriver;cxPivotGridOLAPRS25;cxSchedulerGridRS25;vcltouch;vcldb;Intraweb;dxGaugeControlRS25;cxLibraryRS25;vclib;dxFlowChartAdvancedCustomizeFormRS25;vclx;dxSpreadSheetConditionalFormattingDialogsRS25;dxTileControlRS25;dxMapControlRS25;dxPDFViewerRS25;dxDockingRS25;VCLRESTComponents;dxPSLnksRS25;dxWizardControlRS25;dxRichEditControlRS25;vclie;bindengine;dxFireDACServerModeRS25;FireDACMySQLDriver;dxPSdxPDFViewerLnkRS25;bindcompdbx;dxPSdxLCLnkRS25;IndyIPServer;dxGanttControlRS25;IndySystem;dsnapcon;dxPSRichEditControlLnkRS25;FireDACMSAccDriver;fmxFireDAC;vclimg;dxdbtrRS25;dxPScxTLLnkRS25;dxSpreadSheetRS25;dxPScxSchedulerLnkRS25;FMXTee;cxGridRS25;dxSpreadSheetCoreConditionalFormattingDialogsRS25;DbxCommonDriver;dxorgcRS25;dxCloudServiceLibraryRS25;xmlrtl;fmxobj;dxPScxGridLnkRS25;rtl;DbxClientDriver;dxPSCoreRS25;dxmdsRS25;appanalytics;IndyIPClient;bindcompvcl;dxADOEMFRS25;TeeUI;VclSmp;cxVerticalGridRS25;dxtrmdRS25;dxADOServerModeRS25;dxCoreRS25;cxSchedulerTreeBrowserRS25;DBXInterBaseDriver;dxRichEditControlCoreRS25;dxPSTeeChartRS25;dxPSdxFCLnkRS25;dxRichEditCoreRS25;cxPageControldxBarPopupMenuRS25;bindcompfmx;inetdb;FmxTeeUI;fmx;fmxdae;dxPScxPivotGridLnkRS25;dxBarDBNavRS25;dxTabbedMDIRS25;dbexpress;IndyCore;dxFlowChartRS25;dxRichEditDocumentModelRS25;dsnap;dxBarRS25;dxPSDBTeeChartRS25;dxdborRS25;dxPScxExtCommonRS25;cxPivotGridRS25;dxSpreadSheetReportDesignerRS25;dxNavBarRS25;dxPSdxSpreadSheetLnkRS25;cxSchedulerRibbonStyleEventEditorRS25;DBXMySQLDriver;FireDACCommonODBC;cxTreeListRS25;IndyIPCommon;vcl;dxPScxVGridLnkRS25;dxBarExtItemsRS25;dxComnRS25;dxPSdxDBTVLnkRS25;TeeDB;dxSpreadSheetCoreRS25;dxServerModeRS25;dxPScxPCProdRS25;dxFlowChartLayoutsRS25;FireDACPgDriver;ibmonitor;dxEMFRS25;ibxpress;Tee;ibxbindings;dxPsPrVwAdvRS25;vclwinx;cxTreeListdxBarPopupMenuRS25;CustomIPTransport;vcldsnap;cxSchedulerWebServiceStorageRS25;dxPSdxOCLnkRS25;bindcomp;cxPivotGridChartRS25;cxSchedulerRS25;dxBarExtDBItemsRS25;dxOrgChartAdvancedCustomizeFormRS25;dxDBXServerModeRS25;dxFireDACEMFRS25;dxGDIPlusRS25;dxPSdxGaugeControlLnkRS25;dbxcds;adortl;dxPSdxDBOCLnkRS25;dxRibbonRS25;dsnapxml;dxSpellCheckerRS25;dbrtl;inetdbxpress;IndyProtocols;dxFlowChartDesignerRS25;dxPSdxMapControlLnkRS25;fmxase;$(DCC_UsePackage) Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;$(DCC_Namespace) Debug true - CompanyName=SWE Jens Fudickar;FileDescription=$(MSBuildProjectName) UI;FileVersion=2.2.12.108;LegalCopyright=(c) by Jens Fudickar in 2023;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=2.0 + CompanyName=SWE Jens Fudickar;FileDescription=$(MSBuildProjectName) UI;FileVersion=2.2.13.109;LegalCopyright=(c) by Jens Fudickar in 2023;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=2.0 1033 $(BDS)\bin\default_app.manifest - 108 + 109 ..\documentation\icons\json2puml_icon.png ..\documentation\icons\json2puml_icon.png none 2 2 - 12 + 13 DEBUG;$(DCC_Define) @@ -115,10 +115,10 @@ false - CompanyName=SWE Jens Fudickar;FileDescription=$(MSBuildProjectName) UI;FileVersion=2.2.12.108;LegalCopyright=(c) by Jens Fudickar in 2023;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=2.0;LastCompiledTime=2022-06-26 23:48:42 + CompanyName=SWE Jens Fudickar;FileDescription=$(MSBuildProjectName) UI;FileVersion=2.2.13.109;LegalCopyright=(c) by Jens Fudickar in 2023;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=2.0;LastCompiledTime=2022-06-26 23:48:42 PerMonitor true - 108 + 109 1033 ..\documentation\icons\json2puml-icon.png ..\documentation\icons\json2puml-icon.png @@ -126,21 +126,21 @@ /inputfile:"samples-local\tmf\data\bill_gh\bill_gh.json" /leadingobject:product /definitionfile:"samples\tmf\tmf_definition.json" /option:full 2 2 - 12 + 13 PerMonitorV2 - 108 + 109 true 1033 - /parameterfile:samples\swapi\swapi_parameter_film_characters.json /debug + /parameterfile:samples\swapi\swapi_parameter_film_characters.json e:\Delphi\Projects\json2puml - CompanyName=SWE Jens Fudickar;FileDescription=$(MSBuildProjectName) UI;FileVersion=2.2.12.108;LegalCopyright=(c) by Jens Fudickar in 2023;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=2.0 + CompanyName=SWE Jens Fudickar;FileDescription=$(MSBuildProjectName) UI;FileVersion=2.2.13.109;LegalCopyright=(c) by Jens Fudickar in 2023;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=2.0 ..\documentation\icons\json2puml_icon.png 2 ..\documentation\icons\json2puml_icon.png 2 - 12 + 13 3 @@ -152,20 +152,20 @@ true PerMonitor - 108 - CompanyName=SWE Jens Fudickar;FileDescription=$(MSBuildProjectName) UI;FileVersion=2.2.12.108;LegalCopyright=(c) by Jens Fudickar in 2023;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=2.0 + 109 + CompanyName=SWE Jens Fudickar;FileDescription=$(MSBuildProjectName) UI;FileVersion=2.2.13.109;LegalCopyright=(c) by Jens Fudickar in 2023;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=2.0 2 2 - 12 + 13 true PerMonitorV2 - 108 - CompanyName=SWE Jens Fudickar;FileDescription=$(MSBuildProjectName) UI;FileVersion=2.2.12.108;LegalCopyright=(c) by Jens Fudickar in 2023;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=2.0 + 109 + CompanyName=SWE Jens Fudickar;FileDescription=$(MSBuildProjectName) UI;FileVersion=2.2.13.109;LegalCopyright=(c) by Jens Fudickar in 2023;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=2.0 2 2 - 12 + 13 diff --git a/source/json2pumlui.res b/source/json2pumlui.res index 1334c42320e345b703c9448bbf1536004d525038..0b5eca91e4d43727a2ff59768ec1d708ab3dbad7 100644 GIT binary patch delta 31 mcmbQ!$2g~taY6}mE(7nza&bmZV+K72Lk0r|%gxgnTU`N<{RlAt delta 31 mcmbQ!$2g~taY6}m4g=4|a&bmZBL+PNLk0r|i_Oy+TU`NWinapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace) Debug true - FileDescription=$(MSBuildProjectName) Windows Service;FileVersion=2.2.12.108;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=2.0;CompanyName=SWE Jens Fudickar;LegalCopyright=(c) by Jens Fudickar in 2023 + FileDescription=$(MSBuildProjectName) Windows Service;FileVersion=2.2.13.109;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=2.0;CompanyName=SWE Jens Fudickar;LegalCopyright=(c) by Jens Fudickar in 2023 1033 $(BDS)\bin\default_app.manifest - 108 + 109 ..\documentation\icons\json2puml_icon.png ..\documentation\icons\json2puml_icon.png none 2 2 - 12 + 13 DBXSqliteDriver;DBXDb2Driver;vclactnband;vclFireDAC;tethering;FireDACADSDriver;cxLibraryRS27;dxRibbonCustomizationFormRS27;FireDACMSSQLDriver;vcltouch;vcldb;dxPScxExtCommonRS27;cxTreeListRS27;dxPScxSchedulerLnkRS27;dxRichEditDocumentModelRS27;dxPsPrVwAdvRS27;FireDACDBXDriver;vclx;dxPSdxFCLnkRS27;dxSpellCheckerRS27;dxPDFViewerRS27;RESTBackendComponents;VCLRESTComponents;dxWizardControlRS27;cxSchedulerTreeBrowserRS27;vclie;bindengine;CloudService;dxBarExtDBItemsRS27;FireDACMySQLDriver;SVGIconPackage;cxExportRS27;DataSnapClient;cxSchedulerWebServiceStorageRS27;bindcompdbx;IndyIPServer;DBXSybaseASEDriver;dxPScxPCProdRS27;IndySystem;dxHttpIndyRequestRS27;bindcompvclwinx;dxFlowChartRS27;dsnapcon;FireDACMSAccDriver;fmxFireDAC;FireDACInfxDriver;vclimg;dxmdsRS27;dxPSPrVwRibbonRS27;dxCoreRS27;emshosting;DBXOdbcDriver;FireDACTDataDriver;FMXTee;cxSchedulerRibbonStyleEventEditorRS27;soaprtl;DbxCommonDriver;dxRichEditCoreRS27;dxCloudServiceLibraryRS27;xmlrtl;soapmidas;DataSnapNativeClient;fmxobj;rtl;emsserverresource;DbxClientDriver;dxdborRS27;DBXSybaseASADriver;dxdbtrRS27;dxPSDBTeeChartRS27;appanalytics;dxSpreadSheetCoreRS27;dxRichEditControlCoreRS27;dxGDIPlusRS27;IndyIPClient;dxFireDACServerModeRS27;dxFlowChartAdvancedCustomizeFormRS27;bindcompvcl;dxServerModeRS27;TeeUI;dxPSLnksRS27;dxorgcRS27;VclSmp;dxDBXServerModeRS27;FireDACODBCDriver;DataSnapIndy10ServerTransport;cxGridRS27;DataSnapProviderClient;FireDACMongoDBDriver;dxFireDACEMFRS27;dxtrmdRS27;dxSpreadSheetCoreConditionalFormattingDialogsRS27;RESTComponents;DataSnapServerMidas;DBXInterBaseDriver;dxSpreadSheetConditionalFormattingDialogsRS27;dxGaugeControlRS27;dxSpreadSheetReportDesignerRS27;dxSpreadSheetRS27;bindcompvclsmp;emsclientfiredac;DataSnapFireDAC;dxPSRichEditControlLnkRS27;cxPivotGridOLAPRS27;dxBarDBNavRS27;DBXMSSQLDriver;cxPivotGridRS27;dxADOServerModeRS27;DatasnapConnectorsFreePascal;bindcompfmx;DBXOracleDriver;inetdb;dxFlowChartDesignerRS27;FmxTeeUI;emsedge;fmx;FireDACIBDriver;fmxdae;vcledge;dbexpress;IndyCore;dxRibbonRS27;dxOrgChartAdvancedCustomizeFormRS27;dsnap;emsclient;DataSnapCommon;SVGIconImageListFMX;FireDACCommon;dxTileControlRS27;dxBarExtItemsRS27;DataSnapConnectors;cxSchedulerRS27;cxGridEMFRS27;soapserver;dxRichEditControlRS27;dxPScxTLLnkRS27;FireDACOracleDriver;DBXMySQLDriver;dxFlowChartLayoutsRS27;dxPSCoreRS27;dxADOEMFRS27;DBXFirebirdDriver;FireDACCommonODBC;FireDACCommonDriver;dxPScxPivotGridLnkRS27;inet;cxPivotGridChartRS27;IndyIPCommon;dxPSdxOCLnkRS27;vcl;FireDACDb2Driver;dxPSdxDBOCLnkRS27;dxMapControlRS27;dxComnRS27;dxPSdxGaugeControlLnkRS27;dxEMFRS27;TeeDB;FireDAC;cxTreeListdxBarPopupMenuRS27;dxPScxVGridLnkRS27;dxPSdxPDFViewerLnkRS27;dxPSdxSpreadSheetLnkRS27;FireDACSqliteDriver;FireDACPgDriver;FireDACASADriver;dxTabbedMDIRS27;dxGanttControlRS27;Tee;DataSnapServer;vclwinx;FireDACDSDriver;dxPScxCommonRS27;CustomIPTransport;vcldsnap;dxPSTeeChartRS27;dxPScxGridLnkRS27;bindcomp;DBXInformixDriver;cxSchedulerGridRS27;cxVerticalGridRS27;dxDockingRS27;dxNavBarRS27;SVGIconImageList;dbxcds;adortl;dsnapxml;dbrtl;IndyProtocols;inetdbxpress;dxBarRS27;dxChartControlRS27;dxPSdxLCLnkRS27;dxPSdxMapControlLnkRS27;dxPSdxDBTVLnkRS27;fmxase;$(DCC_UsePackage) Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;$(DCC_Namespace) Debug true - FileDescription=$(MSBuildProjectName) Windows Service;FileVersion=2.2.12.108;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=2.0;CompanyName=SWE Jens Fudickar;LegalCopyright=(c) by Jens Fudickar in 2023 + FileDescription=$(MSBuildProjectName) Windows Service;FileVersion=2.2.13.109;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=2.0;CompanyName=SWE Jens Fudickar;LegalCopyright=(c) by Jens Fudickar in 2023 1033 $(BDS)\bin\default_app.manifest - 108 + 109 ..\documentation\icons\json2puml_icon.png ..\documentation\icons\json2puml_icon.png none 2 2 - 12 + 13 DEBUG;$(DCC_Define) @@ -124,22 +124,22 @@ false true PerMonitorV2 - FileDescription=$(MSBuildProjectName) Windows Service;FileVersion=2.2.12.108;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=2.0;CompanyName=SWE Jens Fudickar;LegalCopyright=(c) by Jens Fudickar in 2023 - 108 + FileDescription=$(MSBuildProjectName) Windows Service;FileVersion=2.2.13.109;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=2.0;CompanyName=SWE Jens Fudickar;LegalCopyright=(c) by Jens Fudickar in 2023 + 109 2 2 - 12 + 13 PerMonitorV2 - 108 - FileDescription=$(MSBuildProjectName) Windows Service;FileVersion=2.2.12.108;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=2.0;CompanyName=SWE Jens Fudickar;LegalCopyright=(c) by Jens Fudickar in 2023 + 109 + FileDescription=$(MSBuildProjectName) Windows Service;FileVersion=2.2.13.109;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=2.0;CompanyName=SWE Jens Fudickar;LegalCopyright=(c) by Jens Fudickar in 2023 2 true 1033 /install 2 - 12 + 13 madExcept;LeakChecking;$(DCC_Define) @@ -151,20 +151,20 @@ true PerMonitorV2 - FileDescription=$(MSBuildProjectName) Windows Service;FileVersion=2.2.12.108;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=2.0;CompanyName=SWE Jens Fudickar;LegalCopyright=(c) by Jens Fudickar in 2023 - 108 + FileDescription=$(MSBuildProjectName) Windows Service;FileVersion=2.2.13.109;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=2.0;CompanyName=SWE Jens Fudickar;LegalCopyright=(c) by Jens Fudickar in 2023 + 109 2 2 - 12 + 13 true PerMonitorV2 - FileDescription=$(MSBuildProjectName) Windows Service;FileVersion=2.2.12.108;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=2.0;CompanyName=SWE Jens Fudickar;LegalCopyright=(c) by Jens Fudickar in 2023 - 108 + FileDescription=$(MSBuildProjectName) Windows Service;FileVersion=2.2.13.109;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=2.0;CompanyName=SWE Jens Fudickar;LegalCopyright=(c) by Jens Fudickar in 2023 + 109 2 2 - 12 + 13 diff --git a/source/json2pumlwindowsservice.res b/source/json2pumlwindowsservice.res index 8ba2cda90fd5c566fec2aec74a650870ea454dd7..d1b62e65f3ec625d83bdb4a8ce3f972a5d491ff3 100644 GIT binary patch delta 31 mcmey<$M~m@aY6}mE(7nza%M(OV+K72Lk0r|%gxPWinapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace) Debug true - FileDescription=$(MSBuildProjectName);FileVersion=2.2.12.108;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0 + FileDescription=$(MSBuildProjectName);FileVersion=2.2.13.109;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0 1033 $(BDS)\bin\default_app.manifest 2 2 - 12 - 108 + 13 + 109 vclwinx;DataSnapServer;fmx;vclie;DbxCommonDriver;bindengine;IndyIPCommon;VCLRESTComponents;DBXMSSQLDriver;FireDACCommonODBC;emsclient;appanalytics;IndyProtocols;vclx;dbxcds;vcledge;FmxTeeUI;DBXFirebirdDriver;FireDACSqliteDriver;DbxClientDriver;soapmidas;TeeUI;dbexpress;inet;vcltouch;FireDACDBXDriver;fmxdae;CustomIPTransport;FireDACMSSQLDriver;IndySystem;vclFireDAC;FireDACCommon;DataSnapServerMidas;FireDACODBCDriver;emsserverresource;bindcompdbx;rtl;FireDACMySQLDriver;DBXSqliteDriver;DBXSybaseASEDriver;vclimg;DataSnapFireDAC;inetdbxpress;FireDAC;xmlrtl;dsnap;FireDACDb2Driver;DBXOracleDriver;DBXInformixDriver;fmxobj;bindcompvclsmp;DataSnapNativeClient;DatasnapConnectorsFreePascal;emshosting;FireDACCommonDriver;IndyIPClient;bindcompvclwinx;emsedge;bindcompfmx;inetdb;FireDACASADriver;Tee;vclactnband;fmxFireDAC;FireDACInfxDriver;DBXMySQLDriver;VclSmp;DataSnapCommon;fmxase;DBXOdbcDriver;dbrtl;FireDACOracleDriver;TeeDB;FireDACMSAccDriver;DataSnapIndy10ServerTransport;DataSnapConnectors;vcldsnap;DBXInterBaseDriver;FireDACMongoDBDriver;FireDACTDataDriver;Skia.Package.VCL;vcldb;SynEditDR;bindcomp;IndyCore;RESTBackendComponents;FireDACADSDriver;RESTComponents;IndyIPServer;vcl;dsnapxml;adortl;dsnapcon;DataSnapClient;DataSnapProviderClient;DBXDb2Driver;emsclientfiredac;FireDACPgDriver;FireDACDSDriver;tethering;bindcompvcl;CloudService;DBXSybaseASADriver;FMXTee;soaprtl;soapserver;FireDACIBDriver;$(DCC_UsePackage) Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;$(DCC_Namespace) Debug true - FileDescription=$(MSBuildProjectName);FileVersion=2.2.12.108;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0 + FileDescription=$(MSBuildProjectName);FileVersion=2.2.13.109;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0 1033 $(BDS)\bin\default_app.manifest 2 2 - 12 - 108 + 13 + 109 DEBUG;$(DCC_Define) @@ -117,17 +117,17 @@ 1033 2 2 - 12 - FileDescription=$(MSBuildProjectName);FileVersion=2.2.12.108;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0 - 108 + 13 + FileDescription=$(MSBuildProjectName);FileVersion=2.2.13.109;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0 + 109 PerMonitorV2 2 2 - 12 - FileDescription=$(MSBuildProjectName);FileVersion=2.2.12.108;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0 - 108 + 13 + FileDescription=$(MSBuildProjectName);FileVersion=2.2.13.109;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0 + 109 false @@ -139,17 +139,17 @@ PerMonitorV2 2 2 - 12 - FileDescription=$(MSBuildProjectName);FileVersion=2.2.12.108;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0 - 108 + 13 + FileDescription=$(MSBuildProjectName);FileVersion=2.2.13.109;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0 + 109 PerMonitorV2 2 2 - 12 - FileDescription=$(MSBuildProjectName);FileVersion=2.2.12.108;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0 - 108 + 13 + FileDescription=$(MSBuildProjectName);FileVersion=2.2.13.109;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0 + 109 diff --git a/unittests/json2pumlunittestsui.res b/unittests/json2pumlunittestsui.res index 08199f07299b0d698f0e5c07cb8d7cd0e152521a..8f4a056104380ef75b9630d5f6960bbe40b2c271 100644 GIT binary patch delta 38 ucmeydlk>+;&Iu*VxeUA$%kOg84Umj?+dvA delta 38 ucmeydlk>+;&Iu*VISf1#%kOg84UmjlMA%~