diff --git a/documentation/changelog.md b/documentation/changelog.md index 7369750..47acdb1 100644 --- a/documentation/changelog.md +++ b/documentation/changelog.md @@ -1,3 +1,10 @@ +# **json2puml v2.2.17.113** - 16.06.2024 +## All Editions +### Changed Feature +- Multiline job descriptions are now correctly generated/rendered in the image legend #36 +- Curl mandatory check works now also for cached curl results +- The content of the generated zip file is now based on the outputformat parameters #35 + # **json2puml v2.2.16.112** - 07.06.2024 ## All Editions ### Changed Feature diff --git a/samples/jsonplaceholder/placeholder_parameter_curl.json b/samples/jsonplaceholder/placeholder_parameter_curl.json index 4004eda..7e6d2f6 100644 --- a/samples/jsonplaceholder/placeholder_parameter_curl.json +++ b/samples/jsonplaceholder/placeholder_parameter_curl.json @@ -3,7 +3,7 @@ "detail": null, "group": null, "job": null, - "jobDescription": null, + "jobDescription": "This is a multiline description\nto show that this is also working :-)", "inputListFile": "placeholder_inputlist_curl.json", "inputFiles": [ ], diff --git a/source/json2puml.dproj b/source/json2puml.dproj index c02d491..f209fe1 100644 --- a/source/json2puml.dproj +++ b/source/json2puml.dproj @@ -99,12 +99,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.16.112;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=2.0;CompanyName=SWE Jens Fudickar;LegalCopyright=(c) by Jens Fudickar in 2024 + FileDescription=$(MSBuildProjectName) Command Line;FileVersion=2.2.17.113;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=2.0;CompanyName=SWE Jens Fudickar;LegalCopyright=(c) by Jens Fudickar in 2024 1033 true true (None) - 112 + 113 /parameterfile:samples\acrmcurlparameter.json /debug /wait e:\Delphi\Projects\json2puml\ ..\documentation\icons\json2puml_icon.png @@ -112,18 +112,18 @@ none 2 2 - 16 + 17 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.16.112;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=2.0;CompanyName=SWE Jens Fudickar;LegalCopyright=(c) by Jens Fudickar in 2024 + FileDescription=$(MSBuildProjectName) Command Line;FileVersion=2.2.17.113;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=2.0;CompanyName=SWE Jens Fudickar;LegalCopyright=(c) by Jens Fudickar in 2024 1033 true (None) - 112 + 113 /parameterfile:samples\acrmcurlparameter.json /debug /wait e:\Delphi\Projects\json2puml\ ..\documentation\icons\json2puml_icon.png @@ -131,7 +131,7 @@ none 2 2 - 16 + 17 DEBUG;$(DCC_Define) @@ -151,25 +151,25 @@ true 1033 (Ohne) - 112 + 113 e:\Delphi\Projects\json2puml\ none - FileDescription=$(MSBuildProjectName) Command Line;FileVersion=2.2.16.112;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=2.0;CompanyName=SWE Jens Fudickar;LegalCopyright=(c) by Jens Fudickar in 2024 + FileDescription=$(MSBuildProjectName) Command Line;FileVersion=2.2.17.113;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=2.0;CompanyName=SWE Jens Fudickar;LegalCopyright=(c) by Jens Fudickar in 2024 2 2 - 16 + 17 3 true 1033 (None) - FileDescription=$(MSBuildProjectName) Command Line;FileVersion=2.2.16.112;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=2.0;CompanyName=SWE Jens Fudickar;LegalCopyright=(c) by Jens Fudickar in 2024 - 112 + FileDescription=$(MSBuildProjectName) Command Line;FileVersion=2.2.17.113;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=2.0;CompanyName=SWE Jens Fudickar;LegalCopyright=(c) by Jens Fudickar in 2024 + 113 /parameterfile:docker\json2puml\src\json2puml\sample\tmfparameter.json /debug /wait 2 2 - 16 + 17 false @@ -178,21 +178,21 @@ 0 - FileDescription=$(MSBuildProjectName) Command Line;FileVersion=2.2.16.112;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=2.0;CompanyName=SWE Jens Fudickar;LegalCopyright=(c) by Jens Fudickar in 2024 - 112 + FileDescription=$(MSBuildProjectName) Command Line;FileVersion=2.2.17.113;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=2.0;CompanyName=SWE Jens Fudickar;LegalCopyright=(c) by Jens Fudickar in 2024 + 113 2 2 - 16 + 17 - 112 + 113 e:\Delphi\Projects\json2puml\ 2 true 1033 - FileDescription=$(MSBuildProjectName) Command Line;FileVersion=2.2.16.112;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=2.0;CompanyName=SWE Jens Fudickar;LegalCopyright=(c) by Jens Fudickar in 2024 + FileDescription=$(MSBuildProjectName) Command Line;FileVersion=2.2.17.113;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=2.0;CompanyName=SWE Jens Fudickar;LegalCopyright=(c) by Jens Fudickar in 2024 2 - 16 + 17 diff --git a/source/json2puml.res b/source/json2puml.res index 799e36d..9131d60 100644 Binary files a/source/json2puml.res and b/source/json2puml.res differ diff --git a/source/json2pumlapps.dsk b/source/json2pumlapps.dsk index 224993b..caab316 100644 --- a/source/json2pumlapps.dsk +++ b/source/json2pumlapps.dsk @@ -1,29 +1,205 @@ [Closed Files] -File_0=TSourceModule,'E:\Delphi\Projects\json2puml\source\json2pumlbasedefinition.pas',0,1,762,98,800,0,0,, -File_1=TSourceModule,'E:\Delphi\Projects\json2puml\source\json2pumlloghandler.pas',0,1,409,28,433,0,0,, -File_2=TSourceModule,'E:\Delphi\Projects\json2puml\source\json2pumldefinition.pas',0,1,2052,28,2076,0,0,, -File_3=TSourceModule,'E:\Delphi\Projects\json2puml\source\json2pumltools.pas',0,1,544,26,568,0,0,, -File_4=TSourceModule,'E:\Delphi\Projects\json2puml\source\jsontools.pas',0,1,734,32,743,0,0,, -File_5=TSourceModule,'E:\Delphi\Projects\json2puml\source\json2pumlinputhandler.pas',0,1,1373,23,1405,0,0,, -File_6=TSourceModule,'E:\Delphi\Projects\json2puml\source\json2pumlconst.pas',0,1,116,41,153,0,0,, -File_7=TSourceModule,'E:\Delphi\Projects\json2puml\source\json2pumlform.pas',0,1,1231,76,1261,0,0,,{7 -File_8=TSourceModule,'E:\Delphi\Projects\json2puml\source\json2pumlpuml.pas',0,1,589,92,608,0,0,, -File_9=TSourceModule,'E:\Delphi\Projects\json2puml\source\json2pumlconverterdefinition.pas',0,1,2278,60,2300,0,0,, -File_10=TSourceModule,'E:\Delphi\Projects\json2puml\source\json2pumlframe.pas',0,1,14,113,28,0,0,, -File_11=TSourceModule,'E:\Delphi\Projects\json2puml\unittests\utJson2PumlBasePropertyList.pas',0,1,1,107,24,0,0,, -File_12=TSourceModule,'E:\Delphi\Projects\json2puml\source\json2pumlconverter.pas',0,1,930,43,955,0,0,, -File_13=TSourceModule,'C:\Users\jensf\Documents\Embarcadero\Studio\23.0\CatalogRepository\SynEdit-12\source\SynEditUndo.pas',0,1,312,1,322,0,0,, -File_14=TSourceModule,'c:\program files (x86)\embarcadero\studio\23.0\SOURCE\RTL\SYS\System.pas',0,1,18386,1,18396,0,0,, +File_0=TSourceModule,'c:\program files (x86)\embarcadero\studio\23.0\SOURCE\RTL\SYS\System.SysUtils.pas',0,1,10882,1,10905,0,0,, +File_1=TSourceModule,'E:\Delphi\Projects\json2puml\source\json2pumlbasedefinition.pas',0,1,762,98,800,0,0,, +File_2=TSourceModule,'E:\Delphi\Projects\json2puml\source\json2pumlloghandler.pas',0,1,409,28,433,0,0,, +File_3=TSourceModule,'E:\Delphi\Projects\json2puml\source\json2pumlform.pas',0,1,1231,76,1261,0,0,,{7 +File_4=TSourceModule,'E:\Delphi\Projects\json2puml\source\json2pumlconverterdefinition.pas',0,1,2278,60,2300,0,0,, +File_5=TSourceModule,'E:\Delphi\Projects\json2puml\source\json2pumlframe.pas',0,1,14,113,28,0,0,, +File_6=TSourceModule,'E:\Delphi\Projects\json2puml\unittests\utJson2PumlBasePropertyList.pas',0,1,1,107,24,0,0,, +File_7=TSourceModule,'C:\Users\jensf\Documents\Embarcadero\Studio\23.0\CatalogRepository\SynEdit-12\source\SynEditUndo.pas',0,1,312,1,322,0,0,, +File_8=TSourceModule,'c:\program files (x86)\embarcadero\studio\23.0\SOURCE\RTL\SYS\System.pas',0,1,18386,1,18396,0,0,, [Modules] -Count=0 -EditWindowCount=0 +Module0=E:\Delphi\Projects\json2puml\source\json2pumlpuml.pas +Module1=E:\Delphi\Projects\json2puml\source\jsontools.pas +Module2=E:\Delphi\Projects\json2puml\source\json2pumltools.pas +Module3=E:\Delphi\Projects\json2puml\source\json2pumlconverter.pas +Module4=E:\Delphi\Projects\json2puml\source\json2pumlconst.pas +Module5=E:\Delphi\Projects\json2puml\source\json2pumlservicecontroller.pas +Module6=E:\Delphi\Projects\json2puml\source\json2pumldefinition.pas +Module7=E:\Delphi\Projects\json2puml\source\json2pumlinputhandler.pas +Count=8 +EditWindowCount=1 + +[E:\Delphi\Projects\json2puml\source\json2pumlpuml.pas] +ModuleType=TSourceModule + +[E:\Delphi\Projects\json2puml\source\jsontools.pas] +ModuleType=TSourceModule + +[E:\Delphi\Projects\json2puml\source\json2pumltools.pas] +ModuleType=TSourceModule + +[E:\Delphi\Projects\json2puml\source\json2pumlconverter.pas] +ModuleType=TSourceModule + +[E:\Delphi\Projects\json2puml\source\json2pumlconst.pas] +ModuleType=TSourceModule + +[E:\Delphi\Projects\json2puml\source\json2pumlservicecontroller.pas] +ModuleType=TSourceModule + +[E:\Delphi\Projects\json2puml\source\json2pumldefinition.pas] +ModuleType=TSourceModule + +[E:\Delphi\Projects\json2puml\source\json2pumlinputhandler.pas] +ModuleType=TSourceModule + +[EditWindow0] +ViewCount=8 +CurrentEditView=E:\Delphi\Projects\json2puml\source\json2pumlpuml.pas +View0=0 +View1=1 +View2=2 +View3=3 +View4=4 +View5=5 +View6=6 +View7=7 +PercentageSizes=1 +Create=1 +Visible=1 +Docked=1 +State=0 +Left=0 +Top=0 +Width=9938 +Height=9253 +MaxLeft=-1 +MaxTop=-1 +ClientWidth=9938 +ClientHeight=9253 +DockedToMainForm=1 +BorlandEditorCodeExplorer=BorlandEditorCodeExplorer@EditWindow0 +TopPanelSize=0 +LeftPanelSize=1895 +LeftPanelClients=PropertyInspector,DockSite3 +LeftPanelData=00000800010100000000251000000000000001670700000000000001000000005A0E000009000000446F636B53697465330100000000B31C00001100000050726F7065727479496E73706563746F72FFFFFFFF +RightPanelSize=1996 +RightPanelClients=DockSite2,DockSite4 +RightPanelData=00000800010100000000251000000000000001CC0700000000000001000000004912000009000000446F636B53697465320100000000B31C000009000000446F636B5369746534FFFFFFFF +BottomPanelSize=1542 +BottomPanelClients=MessageView,DockSite1 +BottomPanelData=0000080001020100000009000000446F636B536974653103450000000000000206060000000000000100000000034500000F0000004D65737361676556696577466F726DFFFFFFFF +BottomMiddlePanelSize=0 +BottomMiddlePanelClients=DockSite0,GraphDrawingModel +BottomMiddelPanelData=0000080001020200000009000000446F636B536974653010000000477261706844726177696E67566965779F1D00000000000002F206000000000000FFFFFFFF + +[View0] +CustomEditViewType=TEditView +Module=E:\Delphi\Projects\json2puml\source\jsontools.pas +CursorX=71 +CursorY=766 +TopLine=735 +LeftCol=1 +Elisions= +Bookmarks= +EditViewName=E:\Delphi\Projects\json2puml\source\jsontools.pas + +[View1] +CustomEditViewType=TEditView +Module=E:\Delphi\Projects\json2puml\source\json2pumlpuml.pas +CursorX=33 +CursorY=1887 +TopLine=1881 +LeftCol=1 +Elisions= +Bookmarks= +EditViewName=E:\Delphi\Projects\json2puml\source\json2pumlpuml.pas + +[View2] +CustomEditViewType=TEditView +Module=E:\Delphi\Projects\json2puml\source\json2pumlconverter.pas +CursorX=36 +CursorY=955 +TopLine=930 +LeftCol=1 +Elisions= +Bookmarks= +EditViewName=E:\Delphi\Projects\json2puml\source\json2pumlconverter.pas + +[View3] +CustomEditViewType=TEditView +Module=E:\Delphi\Projects\json2puml\source\json2pumlconst.pas +CursorX=41 +CursorY=187 +TopLine=181 +LeftCol=1 +Elisions= +Bookmarks= +EditViewName=E:\Delphi\Projects\json2puml\source\json2pumlconst.pas + +[View4] +CustomEditViewType=TEditView +Module=E:\Delphi\Projects\json2puml\source\json2pumltools.pas +CursorX=87 +CursorY=1172 +TopLine=1150 +LeftCol=1 +Elisions= +Bookmarks= +EditViewName=E:\Delphi\Projects\json2puml\source\json2pumltools.pas + +[View5] +CustomEditViewType=TEditView +Module=E:\Delphi\Projects\json2puml\source\json2pumldefinition.pas +CursorX=28 +CursorY=1203 +TopLine=1189 +LeftCol=1 +Elisions= +Bookmarks= +EditViewName=E:\Delphi\Projects\json2puml\source\json2pumldefinition.pas + +[View6] +CustomEditViewType=TEditView +Module=E:\Delphi\Projects\json2puml\source\json2pumlservicecontroller.pas +CursorX=122 +CursorY=449 +TopLine=431 +LeftCol=1 +Elisions= +Bookmarks= +EditViewName=E:\Delphi\Projects\json2puml\source\json2pumlservicecontroller.pas + +[View7] +CustomEditViewType=TEditView +Module=E:\Delphi\Projects\json2puml\source\json2pumlinputhandler.pas +CursorX=80 +CursorY=938 +TopLine=915 +LeftCol=1 +Elisions= +Bookmarks= +EditViewName=E:\Delphi\Projects\json2puml\source\json2pumlinputhandler.pas [Watches] Count=0 +[WatchWindow] +WatchColumnWidth=120 +WatchShowColumnHeaders=1 +PercentageSizes=1 +Create=1 +Visible=1 +Docked=1 +State=0 +Left=0 +Top=0 +Width=3824 +Height=1221 +MaxLeft=-1 +MaxTop=-1 +ClientWidth=3824 +ClientHeight=1221 +TBDockHeight=216 +LRDockWidth=13602 +Dockable=1 +StayOnTop=0 + [Breakpoints] -Count=0 +Count=1 +Breakpoint0='E:\Delphi\Projects\json2puml\source\json2pumlconverter.pas',954,'',0,1,'',1,0,0,'',1,'','','',0,'' [EmbarcaderoWin32Debugger_AddressBreakpoints] Count=0 @@ -46,54 +222,58 @@ Count=0 [Main Window] PercentageSizes=1 Create=1 -Visible=0 +Visible=1 Docked=0 -State=0 -Left=914 -Top=1681 -Width=3141 -Height=489 +State=2 +Left=145 +Top=273 +Width=8930 +Height=8520 MaxLeft=-4 MaxTop=-7 -ClientWidth=3078 -ClientHeight=431 -BottomPanelSize=0 +MaxWidth=8930 +MaxHeight=8520 +ClientWidth=10000 +ClientHeight=10057 +BottomPanelSize=8944 +BottomPanelClients=EditWindow0 +BottomPanelData=0000080000000000000000000000000000000000000000000000000100000000000000000C0000004564697457696E646F775F30FFFFFFFF [ProjectManager] PercentageSizes=1 Create=1 -Visible=0 -Docked=0 +Visible=1 +Docked=1 State=0 Left=0 Top=0 -Width=2355 -Height=4375 -MaxLeft=-4 -MaxTop=-7 -ClientWidth=2293 -ClientHeight=4095 -TBDockHeight=4375 -LRDockWidth=2355 +Width=1996 +Height=4382 +MaxLeft=-1 +MaxTop=-1 +ClientWidth=1996 +ClientHeight=4382 +TBDockHeight=5898 +LRDockWidth=2348 Dockable=1 StayOnTop=0 [MessageView] PercentageSizes=1 Create=1 -Visible=0 -Docked=0 +Visible=1 +Docked=1 State=0 Left=0 -Top=0 -Width=1762 -Height=704 -MaxLeft=-4 -MaxTop=-7 -ClientWidth=1699 -ClientHeight=424 -TBDockHeight=704 -LRDockWidth=1762 +Top=28 +Width=9938 +Height=1394 +MaxLeft=-1 +MaxTop=-1 +ClientWidth=9938 +ClientHeight=1394 +TBDockHeight=1394 +LRDockWidth=2770 Dockable=1 StayOnTop=0 @@ -101,158 +281,370 @@ StayOnTop=0 PercentageSizes=1 Create=1 Visible=1 -Docked=0 +Docked=1 State=0 Left=0 Top=0 -Width=1191 -Height=3693 -MaxLeft=-4 -MaxTop=-7 -ClientWidth=1129 -ClientHeight=3412 -TBDockHeight=3693 -LRDockWidth=1191 +Width=1996 +Height=2557 +MaxLeft=-1 +MaxTop=-1 +ClientWidth=1996 +ClientHeight=2557 +TBDockHeight=7155 +LRDockWidth=1996 Dockable=1 StayOnTop=0 [PropertyInspector] PercentageSizes=1 Create=1 -Visible=0 -Docked=0 +Visible=1 +Docked=1 +State=0 +Left=0 +Top=557 +Width=1895 +Height=3599 +MaxLeft=-1 +MaxTop=-1 +ClientWidth=1895 +ClientHeight=3599 +TBDockHeight=7004 +LRDockWidth=1895 +Dockable=1 +StayOnTop=0 +SplitPos=111 + +[frmDesignPreview] +PercentageSizes=1 +Create=1 +Visible=1 +Docked=1 State=0 Left=0 Top=0 -Width=1086 -Height=2672 -MaxLeft=-4 -MaxTop=-7 -ClientWidth=1023 -ClientHeight=2392 -TBDockHeight=2672 -LRDockWidth=1086 +Width=1996 +Height=6803 +MaxLeft=-1 +MaxTop=-1 +ClientWidth=1996 +ClientHeight=6803 +TBDockHeight=5955 +LRDockWidth=2512 Dockable=1 StayOnTop=0 -SplitPos=173 [TemplateView] PercentageSizes=1 Create=1 Visible=0 -Docked=0 +Docked=1 +State=0 +Left=-2296 +Top=370 +Width=273 +Height=359 +MaxLeft=-1 +MaxTop=-1 +ClientWidth=273 +ClientHeight=359 +TBDockHeight=359 +LRDockWidth=273 +Dockable=1 +StayOnTop=0 +Name=120 +Description=334 +filter=1 + +[DebugLogView] +PercentageSizes=1 +Create=1 +Visible=1 +Docked=1 State=0 Left=0 Top=0 -Width=1719 -Height=3089 -MaxLeft=-4 -MaxTop=-7 -ClientWidth=1656 -ClientHeight=2809 -TBDockHeight=3089 -LRDockWidth=1719 +Width=3824 +Height=1221 +MaxLeft=-1 +MaxTop=-1 +ClientWidth=3824 +ClientHeight=1221 +TBDockHeight=409 +LRDockWidth=4949 +Dockable=1 +StayOnTop=0 + +[ThreadStatusWindow] +PercentageSizes=1 +Create=1 +Visible=1 +Docked=1 +State=0 +Left=0 +Top=0 +Width=3824 +Height=1221 +MaxLeft=-1 +MaxTop=-1 +ClientWidth=3824 +ClientHeight=1221 +TBDockHeight=216 +LRDockWidth=7406 +Dockable=1 +StayOnTop=0 +Column0Width=145 +Column1Width=100 +Column2Width=115 +Column3Width=619 + +[LocalVarsWindow] +PercentageSizes=1 +Create=1 +Visible=1 +Docked=1 +State=0 +Left=0 +Top=0 +Width=3824 +Height=1221 +MaxLeft=-1 +MaxTop=-1 +ClientWidth=3824 +ClientHeight=1221 +TBDockHeight=1537 +LRDockWidth=3484 +Dockable=1 +StayOnTop=0 + +[CallStackWindow] +PercentageSizes=1 +Create=1 +Visible=1 +Docked=1 +State=0 +Left=0 +Top=0 +Width=3824 +Height=1221 +MaxLeft=-1 +MaxTop=-1 +ClientWidth=3824 +ClientHeight=1221 +TBDockHeight=2062 +LRDockWidth=3484 Dockable=1 StayOnTop=0 -Name=60 -Description=304 -filter=1 [PatchForm] PercentageSizes=1 Create=1 -Visible=0 -Docked=0 +Visible=1 +Docked=1 State=0 Left=0 Top=0 -Width=2230 -Height=1832 -MaxLeft=-4 -MaxTop=-7 -ClientWidth=2168 -ClientHeight=1552 -TBDockHeight=1832 -LRDockWidth=2230 +Width=2340 +Height=1279 +MaxLeft=-1 +MaxTop=-1 +ClientWidth=2340 +ClientHeight=1279 +TBDockHeight=2500 +LRDockWidth=3398 Dockable=1 StayOnTop=0 [FindReferencsForm] PercentageSizes=1 Create=1 -Visible=0 -Docked=0 +Visible=1 +Docked=1 State=0 Left=0 Top=0 -Width=816 -Height=869 -MaxLeft=-4 -MaxTop=-7 -ClientWidth=754 -ClientHeight=589 -TBDockHeight=869 -LRDockWidth=816 +Width=2340 +Height=1042 +MaxLeft=-1 +MaxTop=-1 +ClientWidth=2340 +ClientHeight=1042 +TBDockHeight=2320 +LRDockWidth=2824 Dockable=1 StayOnTop=0 [RefactoringForm] PercentageSizes=1 Create=1 -Visible=0 -Docked=0 +Visible=1 +Docked=1 State=0 Left=0 Top=0 -Width=816 -Height=869 -MaxLeft=-4 -MaxTop=-7 -ClientWidth=754 -ClientHeight=589 -TBDockHeight=869 -LRDockWidth=816 +Width=2340 +Height=1279 +MaxLeft=-1 +MaxTop=-1 +ClientWidth=2340 +ClientHeight=1279 +TBDockHeight=3211 +LRDockWidth=2824 Dockable=1 StayOnTop=0 +[ToDo List] +PercentageSizes=1 +Create=1 +Visible=1 +Docked=1 +State=0 +Left=0 +Top=0 +Width=2340 +Height=1279 +MaxLeft=-1 +MaxTop=-1 +ClientWidth=2340 +ClientHeight=1279 +TBDockHeight=1157 +LRDockWidth=3676 +Dockable=1 +StayOnTop=0 +Column0Width=314 +Column1Width=30 +Column2Width=150 +Column3Width=172 +Column4Width=129 +SortOrder=4 +ShowHints=1 +ShowChecked=1 + [DataExplorerContainer] PercentageSizes=1 Create=1 +Visible=1 +Docked=1 +State=0 +Left=0 +Top=0 +Width=1996 +Height=6803 +MaxLeft=-1 +MaxTop=-1 +ClientWidth=1996 +ClientHeight=6803 +TBDockHeight=4885 +LRDockWidth=7148 +Dockable=1 +StayOnTop=0 + +[GraphDrawingModel] +PercentageSizes=1 +Create=1 +Visible=0 +Docked=1 +State=0 +Left=501 +Top=1099 +Width=2855 +Height=3211 +MaxLeft=-1 +MaxTop=-1 +ClientWidth=2855 +ClientHeight=3211 +TBDockHeight=3211 +LRDockWidth=2855 +Dockable=1 +StayOnTop=0 + +[ClassBrowserTool] +PercentageSizes=1 +Create=1 Visible=0 Docked=0 State=0 Left=0 Top=0 -Width=2543 -Height=2701 +Width=1895 +Height=3276 MaxLeft=-4 MaxTop=-7 -ClientWidth=2480 -ClientHeight=2421 -TBDockHeight=2701 -LRDockWidth=2543 +ClientWidth=1832 +ClientHeight=2996 +TBDockHeight=3139 +LRDockWidth=1848 +Dockable=1 +StayOnTop=0 + +[BreakpointWindow] +PercentageSizes=1 +Create=1 +Visible=1 +Docked=1 +State=0 +Left=0 +Top=0 +Width=3824 +Height=1221 +MaxLeft=-1 +MaxTop=-1 +ClientWidth=3824 +ClientHeight=1221 +TBDockHeight=1545 +LRDockWidth=8742 Dockable=1 StayOnTop=0 +Column0Width=200 +Column1Width=75 +Column2Width=200 +Column3Width=200 +Column4Width=200 +Column5Width=75 +Column6Width=75 [StructureView] PercentageSizes=1 Create=1 Visible=1 -Docked=0 +Docked=1 State=0 Left=0 Top=0 -Width=758 -Height=2083 -MaxLeft=-4 -MaxTop=-7 -ClientWidth=695 -ClientHeight=1803 -TBDockHeight=2083 -LRDockWidth=758 +Width=1895 +Height=3542 +MaxLeft=-1 +MaxTop=-1 +ClientWidth=1895 +ClientHeight=3542 +TBDockHeight=3678 +LRDockWidth=1895 Dockable=1 StayOnTop=0 +[MMXCodeExplorer] +PercentageSizes=1 +Create=1 +Visible=1 +Docked=1 +State=0 +Left=0 +Top=0 +Width=1996 +Height=6803 +MaxLeft=-1 +MaxTop=-1 +ClientWidth=1996 +ClientHeight=6803 +TBDockHeight=5747 +LRDockWidth=1691 +Dockable=1 +StayOnTop=0 +Layout=0 +Split=141 +ContentsClosed=0 + [fmGrepResults] PercentageSizes=1 Create=1 @@ -266,7 +658,7 @@ Height=2701 MaxLeft=-4 MaxTop=-7 ClientWidth=1547 -ClientHeight=2421 +ClientHeight=2644 TBDockHeight=2701 LRDockWidth=1609 Dockable=1 @@ -278,8 +670,8 @@ Create=1 Visible=0 Docked=0 State=0 -Left=4355 -Top=4073 +Left=0 +Top=0 Width=1289 Height=1846 MaxLeft=-4 @@ -294,7 +686,7 @@ StayOnTop=0 [ParnassusBookmarksForm] PercentageSizes=1 Create=1 -Visible=1 +Visible=0 Docked=0 State=0 Left=0 @@ -310,8 +702,166 @@ LRDockWidth=2227 Dockable=1 StayOnTop=0 +[ModelViewTool] +PercentageSizes=1 +Create=1 +Visible=0 +Docked=1 +State=0 +Left=-2041 +Top=-124 +Width=5301 +Height=4871 +MaxLeft=-1 +MaxTop=-1 +ClientWidth=5301 +ClientHeight=4871 +TBDockHeight=4871 +LRDockWidth=5301 +Dockable=1 +StayOnTop=0 + +[BorlandEditorCodeExplorer@EditWindow0] +PercentageSizes=1 +Create=1 +Visible=0 +Docked=0 +State=0 +Left=0 +Top=0 +Width=1824 +Height=6171 +MaxLeft=-4 +MaxTop=-7 +ClientWidth=1762 +ClientHeight=5891 +TBDockHeight=6171 +LRDockWidth=1824 +Dockable=1 +StayOnTop=0 + [DockHosts] -DockHostCount=0 +DockHostCount=5 + +[DockSite0] +HostDockSite=DockBottomCenterPanel +DockSiteType=1 +PercentageSizes=1 +Create=1 +Visible=0 +Docked=1 +State=0 +Left=8 +Top=8 +Width=2340 +Height=1480 +MaxLeft=-1 +MaxTop=-1 +ClientWidth=2340 +ClientHeight=1480 +TBDockHeight=1480 +LRDockWidth=2340 +Dockable=1 +StayOnTop=0 +TabPosition=1 +ActiveTabID=RefactoringForm +TabDockClients=RefactoringForm,PatchForm,FindReferencsForm,ToDo List + +[DockSite1] +HostDockSite=DockBottomPanel +DockSiteType=1 +PercentageSizes=1 +Create=1 +Visible=0 +Docked=1 +State=0 +Left=1272 +Top=28 +Width=3824 +Height=1422 +MaxLeft=-1 +MaxTop=-1 +ClientWidth=3824 +ClientHeight=1422 +TBDockHeight=1422 +LRDockWidth=3824 +Dockable=1 +StayOnTop=0 +TabPosition=1 +ActiveTabID=DebugLogView +TabDockClients=DebugLogView,BreakpointWindow,ThreadStatusWindow,CallStackWindow,WatchWindow,LocalVarsWindow + +[DockSite2] +HostDockSite=DockRightPanel +DockSiteType=1 +PercentageSizes=1 +Create=1 +Visible=1 +Docked=1 +State=0 +Left=0 +Top=28 +Width=1996 +Height=4583 +MaxLeft=-1 +MaxTop=-1 +ClientWidth=1996 +ClientHeight=4583 +TBDockHeight=7004 +LRDockWidth=1996 +Dockable=1 +StayOnTop=0 +TabPosition=1 +ActiveTabID=ProjectManager +TabDockClients=ProjectManager,MMXCodeExplorer,DataExplorerContainer,frmDesignPreview,ModelViewTool + +[DockSite3] +HostDockSite=DockLeftPanel +DockSiteType=1 +PercentageSizes=1 +Create=1 +Visible=1 +Docked=1 +State=0 +Left=0 +Top=28 +Width=1895 +Height=3542 +MaxLeft=-1 +MaxTop=-1 +ClientWidth=1895 +ClientHeight=3542 +TBDockHeight=7004 +LRDockWidth=1895 +Dockable=1 +StayOnTop=0 +TabPosition=1 +ActiveTabID=StructureView +TabDockClients=StructureView + +[DockSite4] +HostDockSite=DockRightPanel +DockSiteType=1 +PercentageSizes=1 +Create=1 +Visible=1 +Docked=1 +State=0 +Left=0 +Top=702 +Width=1996 +Height=2557 +MaxLeft=-1 +MaxTop=-1 +ClientWidth=1996 +ClientHeight=2557 +TBDockHeight=7004 +LRDockWidth=1996 +Dockable=1 +StayOnTop=0 +TabPosition=1 +ActiveTabID=ToolForm +TabDockClients=ToolForm,TemplateView [ActiveProject] ActiveProject=1 diff --git a/source/json2pumlconst.pas b/source/json2pumlconst.pas index 2b203ce..267d871 100644 --- a/source/json2pumlconst.pas +++ b/source/json2pumlconst.pas @@ -196,7 +196,7 @@ tJson2PumlErrorInformation = record {$ELSE} cCmdLinePrefix = '-'; {$ENDIF} - cCurrentVersion = '2.2.16.112'; + cCurrentVersion = '2.2.17.113'; cApplicationName = 'json2puml'; diff --git a/source/json2pumlservice.dproj b/source/json2pumlservice.dproj index 4ec247b..26ebcaf 100644 --- a/source/json2pumlservice.dproj +++ b/source/json2pumlservice.dproj @@ -104,33 +104,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.16.112;LegalCopyright=(c) by Jens Fudickar in 2024;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=2.0 + CompanyName=SWE Jens Fudickar;FileDescription=$(MSBuildProjectName) Service;FileVersion=2.2.17.113;LegalCopyright=(c) by Jens Fudickar in 2024;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=2.0 1033 true (None) - 112 + 113 ..\documentation\icons\json2puml_icon.png ..\documentation\icons\json2puml_icon.png none 2 2 - 16 + 17 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.16.112;LegalCopyright=(c) by Jens Fudickar in 2024;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=2.0 + CompanyName=SWE Jens Fudickar;FileDescription=$(MSBuildProjectName) Service;FileVersion=2.2.17.113;LegalCopyright=(c) by Jens Fudickar in 2024;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=2.0 1033 true (None) - 112 + 113 ..\documentation\icons\json2puml_icon.png ..\documentation\icons\json2puml_icon.png none 2 2 - 16 + 17 DEBUG;$(DCC_Define) @@ -148,22 +148,22 @@ false true 1033 - FileDescription=$(MSBuildProjectName) Service;FileVersion=2.2.16.112;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=2.0;CompanyName=SWE Jens Fudickar;LegalCopyright=(c) by Jens Fudickar in 2024 - 112 + FileDescription=$(MSBuildProjectName) Service;FileVersion=2.2.17.113;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=2.0;CompanyName=SWE Jens Fudickar;LegalCopyright=(c) by Jens Fudickar in 2024 + 113 none 2 2 - 16 + 17 /debug 3 - 112 - CompanyName=SWE Jens Fudickar;FileDescription=$(MSBuildProjectName) Service;FileVersion=2.2.16.112;LegalCopyright=(c) by Jens Fudickar in 2024;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=2.0 + 113 + CompanyName=SWE Jens Fudickar;FileDescription=$(MSBuildProjectName) Service;FileVersion=2.2.17.113;LegalCopyright=(c) by Jens Fudickar in 2024;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=2.0 2 2 /debug - 16 + 17 3 @@ -173,18 +173,18 @@ 0 - 112 - CompanyName=SWE Jens Fudickar;FileDescription=$(MSBuildProjectName) Service;FileVersion=2.2.16.112;LegalCopyright=(c) by Jens Fudickar in 2024;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=2.0 + 113 + CompanyName=SWE Jens Fudickar;FileDescription=$(MSBuildProjectName) Service;FileVersion=2.2.17.113;LegalCopyright=(c) by Jens Fudickar in 2024;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=2.0 2 2 - 16 + 17 - 112 - CompanyName=SWE Jens Fudickar;FileDescription=$(MSBuildProjectName) Service;FileVersion=2.2.16.112;LegalCopyright=(c) by Jens Fudickar in 2024;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=2.0 + 113 + CompanyName=SWE Jens Fudickar;FileDescription=$(MSBuildProjectName) Service;FileVersion=2.2.17.113;LegalCopyright=(c) by Jens Fudickar in 2024;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=2.0 2 2 - 16 + 17 diff --git a/source/json2pumlservice.res b/source/json2pumlservice.res index 82ae923..d6d43e9 100644 Binary files a/source/json2pumlservice.res and b/source/json2pumlservice.res differ diff --git a/source/json2pumlui.dproj b/source/json2pumlui.dproj index d701cf5..fdc3f07 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.16.112;LegalCopyright=(c) by Jens Fudickar in 2024;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=2.0 + CompanyName=SWE Jens Fudickar;FileDescription=$(MSBuildProjectName) UI;FileVersion=2.2.17.113;LegalCopyright=(c) by Jens Fudickar in 2024;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=2.0 1033 $(BDS)\bin\default_app.manifest - 112 + 113 ..\documentation\icons\json2puml_icon.png ..\documentation\icons\json2puml_icon.png none 2 2 - 16 + 17 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.16.112;LegalCopyright=(c) by Jens Fudickar in 2024;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=2.0 + CompanyName=SWE Jens Fudickar;FileDescription=$(MSBuildProjectName) UI;FileVersion=2.2.17.113;LegalCopyright=(c) by Jens Fudickar in 2024;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=2.0 1033 $(BDS)\bin\default_app.manifest - 112 + 113 ..\documentation\icons\json2puml_icon.png ..\documentation\icons\json2puml_icon.png none 2 2 - 16 + 17 DEBUG;$(DCC_Define) @@ -115,33 +115,33 @@ false - CompanyName=SWE Jens Fudickar;FileDescription=$(MSBuildProjectName) UI;FileVersion=2.2.16.112;LegalCopyright=(c) by Jens Fudickar in 2024;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.17.113;LegalCopyright=(c) by Jens Fudickar in 2024;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=2.0;LastCompiledTime=2022-06-26 23:48:42 PerMonitor true - 112 + 113 1033 ..\documentation\icons\json2puml-icon.png ..\documentation\icons\json2puml-icon.png e:\Delphi\Projects\json2puml\ - /inputfile:e:\Delphi\Projects\json2puml\samples-local\tmf\data\acrm_inputlist_customer_full\102000997754\tmf_629_customer\tmf_629_customer.102000997754.json /leadingobject:product /definitionfile:tmf-definition.json /wait + /parameterfile:e:\Delphi\Projects\json2puml\samples\jsonplaceholder\placeholder_parameter_curl.json /curlparameter:userid=1 2 2 - 16 + 17 3 PerMonitorV2 - 112 + 113 true 1033 /parameterfile:samples\swapi\swapi_parameter_film_characters.json e:\Delphi\Projects\json2puml - CompanyName=SWE Jens Fudickar;FileDescription=$(MSBuildProjectName) UI;FileVersion=2.2.16.112;LegalCopyright=(c) by Jens Fudickar in 2024;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=2.0 + CompanyName=SWE Jens Fudickar;FileDescription=$(MSBuildProjectName) UI;FileVersion=2.2.17.113;LegalCopyright=(c) by Jens Fudickar in 2024;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=2.0 ..\documentation\icons\json2puml_icon.png 2 ..\documentation\icons\json2puml_icon.png 2 - 16 + 17 3 @@ -153,20 +153,20 @@ true PerMonitor - 112 - CompanyName=SWE Jens Fudickar;FileDescription=$(MSBuildProjectName) UI;FileVersion=2.2.16.112;LegalCopyright=(c) by Jens Fudickar in 2024;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=2.0 + 113 + CompanyName=SWE Jens Fudickar;FileDescription=$(MSBuildProjectName) UI;FileVersion=2.2.17.113;LegalCopyright=(c) by Jens Fudickar in 2024;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=2.0 2 2 - 16 + 17 true PerMonitorV2 - 112 - CompanyName=SWE Jens Fudickar;FileDescription=$(MSBuildProjectName) UI;FileVersion=2.2.16.112;LegalCopyright=(c) by Jens Fudickar in 2024;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=2.0 + 113 + CompanyName=SWE Jens Fudickar;FileDescription=$(MSBuildProjectName) UI;FileVersion=2.2.17.113;LegalCopyright=(c) by Jens Fudickar in 2024;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=2.0 2 2 - 16 + 17 diff --git a/source/json2pumlui.res b/source/json2pumlui.res index 311c0c9..4415274 100644 Binary files a/source/json2pumlui.res and b/source/json2pumlui.res differ diff --git a/source/json2pumlwindowsservice.dproj b/source/json2pumlwindowsservice.dproj index 33a5f13..e7285f2 100644 --- a/source/json2pumlwindowsservice.dproj +++ b/source/json2pumlwindowsservice.dproj @@ -85,32 +85,32 @@ Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace) Debug true - FileDescription=$(MSBuildProjectName) Windows Service;FileVersion=2.2.16.112;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=2.0;CompanyName=SWE Jens Fudickar;LegalCopyright=(c) by Jens Fudickar in 2024 + FileDescription=$(MSBuildProjectName) Windows Service;FileVersion=2.2.17.113;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=2.0;CompanyName=SWE Jens Fudickar;LegalCopyright=(c) by Jens Fudickar in 2024 1033 $(BDS)\bin\default_app.manifest - 112 + 113 ..\documentation\icons\json2puml_icon.png ..\documentation\icons\json2puml_icon.png none 2 2 - 16 + 17 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.16.112;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=2.0;CompanyName=SWE Jens Fudickar;LegalCopyright=(c) by Jens Fudickar in 2024 + FileDescription=$(MSBuildProjectName) Windows Service;FileVersion=2.2.17.113;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=2.0;CompanyName=SWE Jens Fudickar;LegalCopyright=(c) by Jens Fudickar in 2024 1033 $(BDS)\bin\default_app.manifest - 112 + 113 ..\documentation\icons\json2puml_icon.png ..\documentation\icons\json2puml_icon.png none 2 2 - 16 + 17 DEBUG;$(DCC_Define) @@ -124,22 +124,22 @@ false true PerMonitorV2 - FileDescription=$(MSBuildProjectName) Windows Service;FileVersion=2.2.16.112;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=2.0;CompanyName=SWE Jens Fudickar;LegalCopyright=(c) by Jens Fudickar in 2024 - 112 + FileDescription=$(MSBuildProjectName) Windows Service;FileVersion=2.2.17.113;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=2.0;CompanyName=SWE Jens Fudickar;LegalCopyright=(c) by Jens Fudickar in 2024 + 113 2 2 - 16 + 17 PerMonitorV2 - 112 - FileDescription=$(MSBuildProjectName) Windows Service;FileVersion=2.2.16.112;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=2.0;CompanyName=SWE Jens Fudickar;LegalCopyright=(c) by Jens Fudickar in 2024 + 113 + FileDescription=$(MSBuildProjectName) Windows Service;FileVersion=2.2.17.113;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=2.0;CompanyName=SWE Jens Fudickar;LegalCopyright=(c) by Jens Fudickar in 2024 2 true 1033 /install 2 - 16 + 17 madExcept;LeakChecking;$(DCC_Define) 3 @@ -152,20 +152,20 @@ true PerMonitorV2 - FileDescription=$(MSBuildProjectName) Windows Service;FileVersion=2.2.16.112;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=2.0;CompanyName=SWE Jens Fudickar;LegalCopyright=(c) by Jens Fudickar in 2024 - 112 + FileDescription=$(MSBuildProjectName) Windows Service;FileVersion=2.2.17.113;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=2.0;CompanyName=SWE Jens Fudickar;LegalCopyright=(c) by Jens Fudickar in 2024 + 113 2 2 - 16 + 17 true PerMonitorV2 - FileDescription=$(MSBuildProjectName) Windows Service;FileVersion=2.2.16.112;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=2.0;CompanyName=SWE Jens Fudickar;LegalCopyright=(c) by Jens Fudickar in 2024 - 112 + FileDescription=$(MSBuildProjectName) Windows Service;FileVersion=2.2.17.113;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=2.0;CompanyName=SWE Jens Fudickar;LegalCopyright=(c) by Jens Fudickar in 2024 + 113 2 2 - 16 + 17 diff --git a/source/json2pumlwindowsservice.res b/source/json2pumlwindowsservice.res index b01e3a3..dae7632 100644 Binary files a/source/json2pumlwindowsservice.res and b/source/json2pumlwindowsservice.res differ