Changeset 284 for trunk/UNation.pas

Timestamp:

Mar 10, 2019, 6:19:51 PM (6 years ago)

Author:

chronos

Message:

• Modified: TNation and TNations classes now uses generic TItem and TItemList classes.
• Added: Translation files for LCL.

File:

• trunk/UNation.pas (modified) (5 diffs)

trunk/UNation.pas

@@ -6 +6 @@
 
 uses
-  Classes, SysUtils, fgl, DOM, UXMLUtils, Graphics;
+  Classes, SysUtils, fgl, DOM, UXMLUtils, Graphics, UItemList;
 
 type
@@ -12 +12 @@
   { TNation }
 
-  TNation = class
-    Id: Integer;
-    Name: string;
+  TNation = class(TItem)
     Color: TColor;
-    procedure Assign(Source: TNation);
-    procedure LoadFromNode(Node: TDOMNode);
-    procedure SaveToNode(Node: TDOMNode);
+    function GetFields: TItemFields; override;
+    procedure GetValue(Index: Integer; out Value); override;
+    procedure SetValue(Index: Integer; var Value); override;
+    procedure Assign(Source: TItem); override;
+    procedure LoadFromNode(Node: TDOMNode); override;
+    procedure SaveToNode(Node: TDOMNode); override;
   end;
 
   { TNations }
 
-  TNations = class(TFPGObjectList<TNation>)
-    NewId: Integer;
-    function FindById(Id: Integer): TNation;
-    function GetNewId: Integer;
-    function AddNew(Name: string): TNation;
+  TNations = class(TItemList)
+    function GetItemClass: TItemClass; override;
     procedure LoadFromNode(Node: TDOMNode);
     procedure SaveToNode(Node: TDOMNode);
     constructor Create(FreeObjects: Boolean = True);
-    procedure Assign(Source: TNations);
   end;
+
+resourcestring
+  SNation = 'Nation';
+
 
 implementation
 
+uses
+  UCommon;
+
 { TNation }
 
-procedure TNation.Assign(Source: TNation);
+function TNation.GetFields: TItemFields;
 begin
-  Id := Source.Id;
-  Name := Source.Name;
-  Color := Source.Color;
+  inherited;
+  Result.AddField('Name');
+  Result.AddField('Color');
+end;
+
+procedure TNation.GetValue(Index: Integer; out Value);
+begin
+  if Index = 0 then string(Value) := Name
+  else if Index = 1 then TColor(Value) := Color
+  else raise Exception.Create('Unsupported value index ' + IntToStr(Index));
+end;
+
+procedure TNation.SetValue(Index: Integer; var Value);
+begin
+  if Index = 0 then Name := string(Value)
+  else if Index = 1 then Color := TColor(Value)
+  else raise Exception.Create('Unsupported value index ' + IntToStr(Index));
+end;
+
+procedure TNation.Assign(Source: TItem);
+begin
+  inherited;
+  Color := TNation(Source).Color;
 end;
 
 procedure TNation.LoadFromNode(Node: TDOMNode);
 begin
-  Id := ReadInteger(Node, 'Id', 0);
-  Name := ReadString(Node, 'Name', '');
+  inherited;
   Color := ReadInteger(Node, 'Color', 0);
 end;
@@ -54 +77 @@
 procedure TNation.SaveToNode(Node: TDOMNode);
 begin
-  WriteInteger(Node, 'Id', Id);
-  WriteString(Node, 'Name', Name);
+  inherited;
   WriteInteger(Node, 'Color', Color);
 end;
@@ -61 +83 @@
 { TNations }
 
-function TNations.FindById(Id: Integer): TNation;
-var
-  I: Integer;
+function TNations.GetItemClass: TItemClass;
 begin
-  I := 0;
-  while (I < Count) and (Items[I].Id <> Id) do Inc(I);
-  if I < Count then Result := Items[I]
-    else Result := nil;
-end;
-
-function TNations.GetNewId: Integer;
-begin
-  Result := NewId;
-  Inc(NewId);
-end;
-
-function TNations.AddNew(Name: string): TNation;
-begin
-  Result := TNation.Create;
-  Result.Name := Name;
-  Result.Id := GetNewId;
-  Add(Result);
+  Result := TNation;
 end;
 
@@ -116 +119 @@
 begin
   inherited;
-  NewId := 1;
-end;
-
-procedure TNations.Assign(Source: TNations);
-var
-  I: Integer;
-begin
-  while Count > Source.Count do Delete(Count - 1);
-  while Count < Source.Count do AddNew('');
-  for I := 0 to Count - 1 do
-    Items[I].Assign(Source.Items[I]);
 end;