Changeset 285 for trunk/UNation.pas

Timestamp:

Mar 10, 2019, 11:57:03 PM (6 years ago)

Author:

chronos

Message:

• Modified: More work on item class with defined form fields.

File:

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

trunk/UNation.pas

@@ -6 +6 @@
 
 uses
-  Classes, SysUtils, fgl, DOM, UXMLUtils, Graphics, UItemList;
+  Classes, SysUtils, DOM, UXMLUtils, Graphics, UItemList;
 
 type
@@ -17 +17 @@
     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;
+    class function GetClassSysName: string; override;
   end;
 
@@ -25 +23 @@
 
   TNations = class(TItemList)
-    function GetItemClass: TItemClass; override;
-    procedure LoadFromNode(Node: TDOMNode);
-    procedure SaveToNode(Node: TDOMNode);
-    constructor Create(FreeObjects: Boolean = True);
+    class function GetItemClass: TItemClass; override;
   end;
 
@@ -44 +39 @@
 function TNation.GetFields: TItemFields;
 begin
-  inherited;
-  Result.AddField('Name');
-  Result.AddField('Color');
+  Result := inherited;
+  Result.AddField(2, 'Color', 'Color', dtColor);
 end;
 
 procedure TNation.GetValue(Index: Integer; out Value);
 begin
-  if Index = 0 then string(Value) := Name
-  else if Index = 1 then TColor(Value) := Color
+  if Index = 1 then string(Value) := Name
+  else if Index = 2 then TColor(Value) := Color
   else raise Exception.Create('Unsupported value index ' + IntToStr(Index));
 end;
@@ -58 +52 @@
 procedure TNation.SetValue(Index: Integer; var Value);
 begin
-  if Index = 0 then Name := string(Value)
-  else if Index = 1 then Color := TColor(Value)
+  if Index = 1 then Name := string(Value)
+  else if Index = 2 then Color := TColor(Value)
   else raise Exception.Create('Unsupported value index ' + IntToStr(Index));
 end;
 
-procedure TNation.Assign(Source: TItem);
+class function TNation.GetClassSysName: string;
 begin
-  inherited;
-  Color := TNation(Source).Color;
-end;
-
-procedure TNation.LoadFromNode(Node: TDOMNode);
-begin
-  inherited;
-  Color := ReadInteger(Node, 'Color', 0);
-end;
-
-procedure TNation.SaveToNode(Node: TDOMNode);
-begin
-  inherited;
-  WriteInteger(Node, 'Color', Color);
+  Result := 'Nation';
 end;
 
 { TNations }
 
-function TNations.GetItemClass: TItemClass;
+class function TNations.GetItemClass: TItemClass;
 begin
   Result := TNation;
 end;
 
-procedure TNations.LoadFromNode(Node: TDOMNode);
-var
-  Node2: TDOMNode;
-  NewItem: TNation;
-begin
-  Count := 0;
-  Node2 := Node.FirstChild;
-  while Assigned(Node2) and (Node2.NodeName = 'Nation') do begin
-    NewItem := TNation.Create;
-    NewItem.LoadFromNode(Node2);
-    Add(NewItem);
-    Node2 := Node2.NextSibling;
-  end;
-end;
-
-procedure TNations.SaveToNode(Node: TDOMNode);
-var
-  I: Integer;
-  NewNode2: TDOMNode;
-begin
-  for I := 0 to Count - 1 do
-  with Items[I] do begin
-    NewNode2 := Node.OwnerDocument.CreateElement('Nation');
-    Node.AppendChild(NewNode2);
-    SaveToNode(NewNode2);
-  end;
-end;
-
-constructor TNations.Create(FreeObjects: Boolean);
-begin
-  inherited;
-end;
-
 end.