# **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
jfudickar · Feb 7, 2024 · db2b295 · db2b295
1 parent c044e2b
commit db2b295
Show file tree

Hide file tree

Showing 16 changed files with 174 additions and 147 deletions.
diff --git 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
@@ -81,39 +81,39 @@
         <DCC_UsePackage>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)</DCC_UsePackage>
         <DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace)</DCC_Namespace>
         <BT_BuildType>Debug</BT_BuildType>
-        <VerInfo_Keys>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</VerInfo_Keys>
+        <VerInfo_Keys>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</VerInfo_Keys>
         <VerInfo_Locale>1033</VerInfo_Locale>
         <DCC_ConsoleTarget>true</DCC_ConsoleTarget>
         <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
         <Manifest_File>(None)</Manifest_File>
-        <VerInfo_Build>108</VerInfo_Build>
+        <VerInfo_Build>109</VerInfo_Build>
         <Debugger_RunParams> /parameterfile:samples\acrmcurlparameter.json /debug /wait</Debugger_RunParams>
         <Debugger_CWD>e:\Delphi\Projects\json2puml\</Debugger_CWD>
         <UWP_DelphiLogo44>..\documentation\icons\json2puml_icon.png</UWP_DelphiLogo44>
         <UWP_DelphiLogo150>..\documentation\icons\json2puml_icon.png</UWP_DelphiLogo150>
         <AppDPIAwarenessMode>none</AppDPIAwarenessMode>
         <VerInfo_MajorVer>2</VerInfo_MajorVer>
         <VerInfo_MinorVer>2</VerInfo_MinorVer>
-        <VerInfo_Release>12</VerInfo_Release>
+        <VerInfo_Release>13</VerInfo_Release>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Base_Win64)'!=''">
         <DCC_UsePackage>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)</DCC_UsePackage>
         <DCC_ConsoleTarget>true</DCC_ConsoleTarget>
         <DCC_Namespace>Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;$(DCC_Namespace)</DCC_Namespace>
         <BT_BuildType>Debug</BT_BuildType>
-        <VerInfo_Keys>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</VerInfo_Keys>
+        <VerInfo_Keys>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</VerInfo_Keys>
         <VerInfo_Locale>1033</VerInfo_Locale>
         <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
         <Manifest_File>(None)</Manifest_File>
-        <VerInfo_Build>108</VerInfo_Build>
+        <VerInfo_Build>109</VerInfo_Build>
         <Debugger_RunParams> /parameterfile:samples\acrmcurlparameter.json /debug /wait</Debugger_RunParams>
         <Debugger_CWD>e:\Delphi\Projects\json2puml\</Debugger_CWD>
         <UWP_DelphiLogo44>..\documentation\icons\json2puml_icon.png</UWP_DelphiLogo44>
         <UWP_DelphiLogo150>..\documentation\icons\json2puml_icon.png</UWP_DelphiLogo150>
         <AppDPIAwarenessMode>none</AppDPIAwarenessMode>
         <VerInfo_MajorVer>2</VerInfo_MajorVer>
         <VerInfo_MinorVer>2</VerInfo_MinorVer>
-        <VerInfo_Release>12</VerInfo_Release>
+        <VerInfo_Release>13</VerInfo_Release>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Cfg_1)'!=''">
         <DCC_Define>DEBUG;$(DCC_Define)</DCC_Define>
@@ -133,25 +133,25 @@
         <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
         <VerInfo_Locale>1033</VerInfo_Locale>
         <Manifest_File>(Ohne)</Manifest_File>
-        <VerInfo_Build>108</VerInfo_Build>
+        <VerInfo_Build>109</VerInfo_Build>
         <Debugger_CWD>e:\Delphi\Projects\json2puml\</Debugger_CWD>
         <AppDPIAwarenessMode>none</AppDPIAwarenessMode>
-        <VerInfo_Keys>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</VerInfo_Keys>
+        <VerInfo_Keys>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</VerInfo_Keys>
         <VerInfo_MajorVer>2</VerInfo_MajorVer>
         <VerInfo_MinorVer>2</VerInfo_MinorVer>
-        <VerInfo_Release>12</VerInfo_Release>
+        <VerInfo_Release>13</VerInfo_Release>
         <DCC_MapFile>3</DCC_MapFile>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Cfg_1_Win64)'!=''">
         <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
         <VerInfo_Locale>1033</VerInfo_Locale>
         <Manifest_File>(None)</Manifest_File>
-        <VerInfo_Keys>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</VerInfo_Keys>
-        <VerInfo_Build>108</VerInfo_Build>
+        <VerInfo_Keys>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</VerInfo_Keys>
+        <VerInfo_Build>109</VerInfo_Build>
         <Debugger_RunParams> /parameterfile:docker\json2puml\src\json2puml\sample\tmfparameter.json /debug /wait</Debugger_RunParams>
         <VerInfo_MajorVer>2</VerInfo_MajorVer>
         <VerInfo_MinorVer>2</VerInfo_MinorVer>
-        <VerInfo_Release>12</VerInfo_Release>
+        <VerInfo_Release>13</VerInfo_Release>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Cfg_2)'!=''">
         <DCC_LocalDebugSymbols>false</DCC_LocalDebugSymbols>
@@ -160,21 +160,21 @@
         <DCC_DebugInformation>0</DCC_DebugInformation>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Cfg_2_Win32)'!=''">
-        <VerInfo_Keys>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</VerInfo_Keys>
-        <VerInfo_Build>108</VerInfo_Build>
+        <VerInfo_Keys>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</VerInfo_Keys>
+        <VerInfo_Build>109</VerInfo_Build>
         <VerInfo_MajorVer>2</VerInfo_MajorVer>
         <VerInfo_MinorVer>2</VerInfo_MinorVer>
-        <VerInfo_Release>12</VerInfo_Release>
+        <VerInfo_Release>13</VerInfo_Release>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Cfg_2_Win64)'!=''">
-        <VerInfo_Build>108</VerInfo_Build>
+        <VerInfo_Build>109</VerInfo_Build>
         <Debugger_CWD>e:\Delphi\Projects\json2puml\</Debugger_CWD>
         <VerInfo_MajorVer>2</VerInfo_MajorVer>
         <VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
         <VerInfo_Locale>1033</VerInfo_Locale>
-        <VerInfo_Keys>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</VerInfo_Keys>
+        <VerInfo_Keys>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</VerInfo_Keys>
         <VerInfo_MinorVer>2</VerInfo_MinorVer>
-        <VerInfo_Release>12</VerInfo_Release>
+        <VerInfo_Release>13</VerInfo_Release>
     </PropertyGroup>
     <ItemGroup>
         <DelphiCompile Include="$(MainSource)">

diff --git a/source/json2puml.res b/source/json2puml.res
diff --git 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
@@ -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