[Instantobjects-cvscommit] SF.net SVN: instantobjects: [699] branches/Refactor_InstantPersistenceUnit/Source/Core

[<sr...@us...>]

Revision: 699
Author:   srmitch
Date:     2006-08-06 21:06:11 -0700 (Sun, 06 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/instantobjects?rev=699&view=rev

Log Message:
-----------
- Reverted some changes to use of Reintroduce to avoid compiler warnings.
- Reverted some changes to TInstantAttribute.Create to ensure new attribute is initialized.

Modified Paths:
--------------
    branches/Refactor_InstantPersistenceUnit/Source/Core/InstantClasses.pas
    branches/Refactor_InstantPersistenceUnit/Source/Core/InstantMetadata.pas
    branches/Refactor_InstantPersistenceUnit/Source/Core/InstantPersistence.pas
Modified: branches/Refactor_InstantPersistenceUnit/Source/Core/InstantClasses.pas
===================================================================
--- branches/Refactor_InstantPersistenceUnit/Source/Core/InstantClasses.pas	2006-08-06 09:39:33 UTC (rev 698)
+++ branches/Refactor_InstantPersistenceUnit/Source/Core/InstantClasses.pas	2006-08-07 04:06:11 UTC (rev 699)
@@ -400,7 +400,7 @@
     FMetadata: TInstantCollectionItem;
     FOwner: TInstantAbstractObject;
   protected
-    function GetOwner: TInstantAbstractObject;
+    function GetOwner: TInstantAbstractObject; reintroduce; virtual;
     procedure SetOwner(AOwner: TInstantAbstractObject);
     function GetMetadata: TInstantCollectionItem;
     procedure SetMetadata(AMetadata: TInstantCollectionItem);

Modified: branches/Refactor_InstantPersistenceUnit/Source/Core/InstantMetadata.pas
===================================================================
--- branches/Refactor_InstantPersistenceUnit/Source/Core/InstantMetadata.pas	2006-08-06 09:39:33 UTC (rev 698)
+++ branches/Refactor_InstantPersistenceUnit/Source/Core/InstantMetadata.pas	2006-08-07 04:06:11 UTC (rev 699)
@@ -63,6 +63,7 @@
   private
     function GetCollection: TInstantMetadatas;
     procedure SetCollection(Value: TInstantMetadatas);
+      {$IFDEF D6+}reintroduce; {$ENDIF}
   protected
     function InternalEquals(const Other: TInstantMetadata): Boolean; virtual;
   public
@@ -142,7 +143,7 @@
   protected
     function InternalEquals(const Other: TInstantMetadata): Boolean; override;
   public
-    constructor Create(ACollection: TInstantFieldMetadatas);
+    constructor Create(ACollection: TInstantFieldMetadatas); reintroduce;
     procedure Assign(Source: TPersistent); override;
     // Returns True if one of the data types of Other (Other.DataType and
     // Other.AlternateDataTypes) equals one of the data types of Self.
@@ -172,7 +173,7 @@
   protected
     function InternalEquals(const Other: TInstantMetadata): Boolean; override;
   public
-    constructor Create(ACollection: TInstantMetadatas);
+    constructor Create(ACollection: TInstantMetadatas); reintroduce;
     procedure Assign(Source: TPersistent); override;
     property Collection: TInstantIndexMetadatas read GetCollection;
     // Returns True if the field identified by AFieldMetadata is part of this

Modified: branches/Refactor_InstantPersistenceUnit/Source/Core/InstantPersistence.pas
===================================================================
--- branches/Refactor_InstantPersistenceUnit/Source/Core/InstantPersistence.pas	2006-08-06 09:39:33 UTC (rev 698)
+++ branches/Refactor_InstantPersistenceUnit/Source/Core/InstantPersistence.pas	2006-08-07 04:06:11 UTC (rev 699)
@@ -178,7 +178,7 @@
     function GetIsChanged: Boolean; virtual;
     function GetIsDefault: Boolean; virtual;
     function GetIsMandatory: Boolean; virtual;
-    function GetOwner: TInstantObject; virtual;
+    function GetOwner: TInstantObject; reintroduce; virtual;
     procedure Initialize; virtual;
     procedure ReadName(Reader: TInstantReader);
     procedure SetAsBoolean(AValue: Boolean); virtual;
@@ -2270,7 +2270,8 @@
 begin
   Assert((AOwner = nil) or (AOwner is TInstantObject));
   Assert((AMetadata = nil) or (AMetadata is TInstantAttributeMetadata));
-  inherited Create(AOwner, AMetadata);
+  inherited Create(AOwner, nil);
+  SetMetadata(TInstantAttributeMetadata(AMetadata));
 end;
 
 function TInstantAttribute.GetAsBoolean: Boolean;