[Instantobjects-cvscommit] SF.net SVN: instantobjects: [694] branches/2.0/Source/Core/InstantPersistence.pas

[<jcm...@us...>]

Revision: 694
Author:   jcmoraisjr
Date:     2006-08-01 16:13:37 -0700 (Tue, 01 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/instantobjects?rev=694&view=rev

Log Message:
-----------
- Fixed bug [1531266] Connector.GenerateId doesn't receive Object;
- Removed default parameter value from GenerateId method.

Modified Paths:
--------------
    branches/2.0/Source/Core/InstantPersistence.pas
Modified: branches/2.0/Source/Core/InstantPersistence.pas
===================================================================
--- branches/2.0/Source/Core/InstantPersistence.pas	2006-08-01 23:06:12 UTC (rev 693)
+++ branches/2.0/Source/Core/InstantPersistence.pas	2006-08-01 23:13:37 UTC (rev 694)
@@ -1488,7 +1488,7 @@
     function InternalCreateQuery: TInstantQuery; virtual;
     function InternalCreateScheme(Model: TInstantModel): TInstantScheme; virtual; abstract;
     procedure InternalDisconnect; virtual; abstract;
-    function InternalGenerateId(const AObject: TInstantObject = nil): string; virtual;
+    function InternalGenerateId(const AObject: TInstantObject): string; virtual;
     procedure InternalRollbackTransaction; virtual;
     procedure InternalStartTransaction; virtual;
     function RemoveTransactedObject(AObject: TInstantObject): Integer;
@@ -1508,7 +1508,7 @@
     function CreateQuery: TInstantQuery;
     procedure Disconnect;
     function EnsureObjectStore(AClass: TInstantObjectClass): TInstantObjectStore;
-    function GenerateId(const AObject: TInstantObject = nil): string;
+    function GenerateId(const AObject: TInstantObject): string;
     class procedure RegisterClass;
     procedure RegisterClient(Client: TObject);
     procedure RollbackTransaction;
@@ -8428,7 +8428,7 @@
   if IsAbandoned then
     Result := InstantGenerateId
   else
-    Result := Connector.GenerateId;
+    Result := Connector.GenerateId(Self);
 end;
 
 function TInstantObject.GetCaption: string;
@@ -9282,7 +9282,7 @@
   end;
 end;
 
-function TInstantConnector.GenerateId(const AObject: TInstantObject = nil): string;
+function TInstantConnector.GenerateId(const AObject: TInstantObject): string;
 begin
   Result := InternalGenerateId(AObject);
 end;
@@ -9423,7 +9423,7 @@
   Result := Broker.CreateQuery;
 end;
 
-function TInstantConnector.InternalGenerateId(const AObject: TInstantObject = nil): string;
+function TInstantConnector.InternalGenerateId(const AObject: TInstantObject): string;
 begin
   if Assigned(FOnGenerateId) then
   begin