Merge branch 'Feature/uGitHUB' into Development

JensBorrisholt · Aug 2, 2020 · 1bbd436 · 1bbd436
2 parents a0f9ad6 + 8f1dfcd
commit 1bbd436
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 11 deletions.
diff --git a/Demo Generator/Pkg.Json.DemoGenerator.pas b/Demo Generator/Pkg.Json.DemoGenerator.pas
@@ -27,9 +27,10 @@   TDemoGenerator = class
     procedure UpdateDemoProject;
     procedure ModifyDemoHelper;
     procedure SetRootDirectory(const Value: string);
+    procedure SetDestinationDirectory(const Value: string);
   published
     property RootDirectory: string read FRootDirectory write SetRootDirectory;
-    property DestinationDirectory : string read FDestinationDirectory;
+    property DestinationDirectory: string read FDestinationDirectory write SetDestinationDirectory;
     property DestinationFrameWork: TDestinationFrameWork read FTDestinationFrameWork write FTDestinationFrameWork;
     property DestinationClassName: string read FDestinationClassName write FDestinationClassName;
     property DestinationUnitName: string read FDestinationUnitName write FDestinationUnitName;
@@ -86,7 +87,9 @@ procedure TDemoGenerator.Execute;
 
   FJsonMapper.DestinationClassName := FDestinationClassName;
   FJsonMapper.DestinationUnitName := FDestinationUnitName;
-  FDestinationDirectory := FRootDirectory + FJsonMapper.DestinationClassName + TPath.DirectorySeparatorChar;
+
+  if FDestinationDirectory = '' then
+    FDestinationDirectory := FRootDirectory + FJsonMapper.DestinationClassName + TPath.DirectorySeparatorChar;
   TDirectory.CreateDirectory(FDestinationDirectory);
 
   if FFileName = '' then
@@ -184,6 +187,12 @@ procedure TDemoGenerator.ModifyDemoHelper;
   SaveText;
 end;
 
+procedure TDemoGenerator.SetDestinationDirectory(const Value: string);
+begin
+  FDestinationDirectory := IncludeTrailingPathDelimiter(Value);
+  FRootDirectory := FDestinationDirectory;
+end;
+
 procedure TDemoGenerator.SetRootDirectory(const Value: string);
 begin
   FRootDirectory := IncludeTrailingPathDelimiter(Value);

diff --git a/Generator GUI/uMainForm.pas b/Generator GUI/uMainForm.pas
@@ -226,15 +226,13 @@ procedure TMainForm.ActDemoExecute(Sender: TObject);
   if not SelectDirectory('Select a directory', Destination, Destination) then
     exit;
 
-  FJsonMapper.DestinationClassName := Edit1.Text;
-  FJsonMapper.DestinationUnitName := Edit2.Text;
-  FJsonMapper.Parse(Memo1.Lines.Text);
-
   with TDemoGenerator.Create do
     try
       DestinationClassName := Edit1.Text;
       DestinationUnitName := Edit2.Text;
       DestinationDirectory := Destination;
+      DestinationFrameWork := TDestinationFrameWork.dfBoth;
+      Json := Memo1.Text;
       Execute;
     finally
       free;

diff --git a/Lib/Pkg.Json.JSONName.pas b/Lib/Pkg.Json.JSONName.pas
@@ -100,7 +100,7 @@ constructor TJSONName.Create(aItemName: string);
 
 function TJSONName.NameAttribute: string;
 begin
-  exit('[JSONName(' + AnsiQuotedStr(FJsonName, #39) + ')]');
+  exit('JSONName(' + AnsiQuotedStr(FJsonName, #39) + ')');
 end;
 
 procedure TJSONName.SetName(const Value: string);

diff --git a/Lib/Pkg.Json.StubField.pas b/Lib/Pkg.Json.StubField.pas
@@ -175,7 +175,7 @@ function TStubClass.GetImplementationPart: string;
       Lines.AddFormat('  %s.Free;', [StubField.FieldName]);
 
     for StubField in FArrayItems do
-      Lines.AddFormat('  %s.Free;', [StubField.FieldName]);
+      Lines.AddFormat('  Get%s.Free;', [StubField.PropertyName]);
 
     Lines.Add('  inherited;');
     Lines.Add('end;');
@@ -248,16 +248,15 @@     Lines.Add(Name + ' = class' + IfThen(BaseClass = '', '', '(' + BaseClass + '
       if StubField.IsObjectArrayField then
       begin
         StubArrayField := StubField as TStubArrayField;
-        Lines.Add('  ' + StubField.NameAttribute);
-        Lines.Add('  [JSONMarshalled(False)]');
+        Lines.AddFormat('  [%s, JSONMarshalled(False)]', [StubField.NameAttribute]);
         Lines.AddFormat('  %sArray: TArray<%s>;', [StubField.FieldName, StubField.TypeAsString]);
         Lines.Add('  [GenericListReflect]');
         Lines.AddFormat('  %s: TObjectList<%s>;', [StubField.FieldName, StubArrayField.TypeAsString]);
       end
       else
       begin
         if StubField.NeedsAttribute then
-          Lines.Add('  ' + StubField.NameAttribute);
+          Lines.AddFormat('  [%s]', [StubField.NameAttribute]);
 
         Lines.AddFormat('  %s: %s;', [StubField.FieldName, StubField.TypeAsString]);
       end;

diff --git a/Unit Test/JsonToDelphiClassTests.dproj b/Unit Test/JsonToDelphiClassTests.dproj
@@ -778,6 +778,7 @@
                 <SourceProjectName>C:\Users\Jens Borrisholt\Documents\GitHUB\Delphi-JsonToDelphiClass\Generator GUI\JsonToDelphiClass.dproj</SourceProjectName>
                 <TestProjectName/>
             </UnitTesting>
+            <ModelSupport>False</ModelSupport>
         </BorlandProject>
         <ProjectFileVersion>12</ProjectFileVersion>
     </ProjectExtensions>