Menu
▾
▴
[Instantobjects-cvscommit] SF.net SVN: instantobjects: [698] branches/Refactor_InstantPersistenceUnit/Source/Core
|
From: <na...@us...> - 2006-08-06 09:39:53
|
Revision: 698 Author: nandod Date: 2006-08-06 02:39:33 -0700 (Sun, 06 Aug 2006) ViewCVS: http://svn.sourceforge.net/instantobjects?rev=698&view=rev Log Message: ----------- - uses clause of two brokers and a catalog updated. - use of overload and reintroduce reduced. - removed some Code Site logging code left there by mistake. Modified Paths: -------------- branches/Refactor_InstantPersistenceUnit/Source/Brokers/ADO/InstantADO.pas branches/Refactor_InstantPersistenceUnit/Source/Brokers/DBX/InstantDBX.pas branches/Refactor_InstantPersistenceUnit/Source/Catalogs/MSSql/InstantMSSqlCatalog.pas 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/Brokers/ADO/InstantADO.pas =================================================================== --- branches/Refactor_InstantPersistenceUnit/Source/Brokers/ADO/InstantADO.pas 2006-08-06 04:35:11 UTC (rev 697) +++ branches/Refactor_InstantPersistenceUnit/Source/Brokers/ADO/InstantADO.pas 2006-08-06 09:39:33 UTC (rev 698) @@ -40,7 +40,7 @@ uses Classes, Db, ADODB, SysUtils, InstantPersistence, InstantClasses, - InstantCommand; + InstantCommand, InstantBrokers, InstantMetadata, InstantTypes; type TInstantADOProviderType = (ptUnknown, ptMSJet, ptMSSQLServer, ptOracle, ptMySQL, ptIBMDB2); Modified: branches/Refactor_InstantPersistenceUnit/Source/Brokers/DBX/InstantDBX.pas =================================================================== --- branches/Refactor_InstantPersistenceUnit/Source/Brokers/DBX/InstantDBX.pas 2006-08-06 04:35:11 UTC (rev 697) +++ branches/Refactor_InstantPersistenceUnit/Source/Brokers/DBX/InstantDBX.pas 2006-08-06 09:39:33 UTC (rev 698) @@ -45,7 +45,8 @@ {$IFDEF LINUX} QControls, {$ENDIF} - Classes, DB, DBXpress, SqlExpr, InstantPersistence, InstantCommand; + Classes, DB, DBXpress, SqlExpr, InstantPersistence, InstantCommand, + InstantBrokers, InstantMetadata, InstantTypes; type TInstantDBXConnectionDef = class(TInstantConnectionBasedConnectionDef) Modified: branches/Refactor_InstantPersistenceUnit/Source/Catalogs/MSSql/InstantMSSqlCatalog.pas =================================================================== --- branches/Refactor_InstantPersistenceUnit/Source/Catalogs/MSSql/InstantMSSqlCatalog.pas 2006-08-06 04:35:11 UTC (rev 697) +++ branches/Refactor_InstantPersistenceUnit/Source/Catalogs/MSSql/InstantMSSqlCatalog.pas 2006-08-06 09:39:33 UTC (rev 698) @@ -38,7 +38,7 @@ interface uses - InstantPersistence; + InstantPersistence, InstantBrokers, InstantMetadata, InstantTypes; type // A TInstantCatalog that reads catalog information from an MS-SQL server database. Modified: branches/Refactor_InstantPersistenceUnit/Source/Core/InstantClasses.pas =================================================================== --- branches/Refactor_InstantPersistenceUnit/Source/Core/InstantClasses.pas 2006-08-06 04:35:11 UTC (rev 697) +++ branches/Refactor_InstantPersistenceUnit/Source/Core/InstantClasses.pas 2006-08-06 09:39:33 UTC (rev 698) @@ -386,12 +386,11 @@ private FConnector: TComponent; protected - procedure SetConnector(AConnector: TComponent); overload; virtual; + function GetConnector: TComponent; + procedure SetConnector(AConnector: TComponent); public - constructor Create(AConnector: TComponent = nil); virtual; constructor Retrieve(const AObjectId: string; CreateIfMissing: Boolean = False; - Refresh: Boolean = False; AConnector: TComponent = nil); virtual; abstract; - property Connector: TComponent read FConnector; + Refresh: Boolean = False; AConnector: TComponent = nil); virtual; abstract; end; TInstantAbstractAttributeClass = class of TInstantAbstractAttribute; @@ -401,12 +400,13 @@ FMetadata: TInstantCollectionItem; FOwner: TInstantAbstractObject; protected - procedure SetOwner(AOwner: TInstantAbstractObject); overload; virtual; + function GetOwner: TInstantAbstractObject; + procedure SetOwner(AOwner: TInstantAbstractObject); + function GetMetadata: TInstantCollectionItem; + procedure SetMetadata(AMetadata: TInstantCollectionItem); public - constructor Create(AOwner: TInstantAbstractObject; AMetadata: - TInstantCollectionItem); virtual; - property Metadata: TInstantCollectionItem read FMetadata write FMetadata; - property Owner: TInstantAbstractObject read FOwner; + constructor Create(AOwner: TInstantAbstractObject; + AMetadata: TInstantCollectionItem); virtual; end; TInstantStreamFormat = (sfBinary, sfXML); @@ -1919,10 +1919,11 @@ DoConvertProperties(''); end; -constructor TInstantAbstractObject.Create(AConnector: TComponent = nil); +{ TInstantAbstractObject } + +function TInstantAbstractObject.GetConnector: TComponent; begin - inherited Create; - FConnector := AConnector; + Result := FConnector; end; procedure TInstantAbstractObject.SetConnector(AConnector: TComponent); @@ -1930,11 +1931,21 @@ FConnector := AConnector; end; -constructor TInstantAbstractAttribute.Create(AOwner: TInstantAbstractObject; - AMetadata: TInstantCollectionItem); +{ TInstantAbstractAttribute } + +function TInstantAbstractAttribute.GetMetadata: TInstantCollectionItem; begin - inherited Create; - FOwner := AOwner; + Result := FMetadata; +end; + +function TInstantAbstractAttribute.GetOwner: TInstantAbstractObject; +begin + Result := FOwner; +end; + +procedure TInstantAbstractAttribute.SetMetadata( + AMetadata: TInstantCollectionItem); +begin FMetadata := AMetadata; end; @@ -1943,5 +1954,13 @@ FOwner := AOwner; end; +constructor TInstantAbstractAttribute.Create(AOwner: TInstantAbstractObject; + AMetadata: TInstantCollectionItem); +begin + inherited Create; + FOwner := AOwner; + FMetadata := AMetadata; +end; + end. Modified: branches/Refactor_InstantPersistenceUnit/Source/Core/InstantMetadata.pas =================================================================== --- branches/Refactor_InstantPersistenceUnit/Source/Core/InstantMetadata.pas 2006-08-06 04:35:11 UTC (rev 697) +++ branches/Refactor_InstantPersistenceUnit/Source/Core/InstantMetadata.pas 2006-08-06 09:39:33 UTC (rev 698) @@ -40,9 +40,7 @@ interface -uses Classes, Contnrs, Db, InstantClasses, InstantTypes, InstantConsts -, CodeSiteLogging -; +uses Classes, Contnrs, Db, InstantClasses, InstantTypes, InstantConsts; type TInstantAttributeMap = class; @@ -65,7 +63,6 @@ private function GetCollection: TInstantMetadatas; procedure SetCollection(Value: TInstantMetadatas); - {$IFDEF D6+}reintroduce;{$ENDIF} protected function InternalEquals(const Other: TInstantMetadata): Boolean; virtual; public @@ -145,7 +142,7 @@ protected function InternalEquals(const Other: TInstantMetadata): Boolean; override; public - constructor Create(ACollection: TInstantFieldMetadatas); reintroduce; + constructor Create(ACollection: TInstantFieldMetadatas); 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. @@ -175,7 +172,7 @@ protected function InternalEquals(const Other: TInstantMetadata): Boolean; override; public - constructor Create(ACollection: TInstantMetadatas); reintroduce; + constructor Create(ACollection: TInstantMetadatas); procedure Assign(Source: TPersistent); override; property Collection: TInstantIndexMetadatas read GetCollection; // Returns True if the field identified by AFieldMetadata is part of this @@ -1694,13 +1691,10 @@ var AClass: TInstantAbstractAttributeClass; begin - CodeSite.EnterMethod(Self, 'TInstantAttributeMetadata.CreateAttribute'); AClass := AttributeClass; - CodeSite.Send('AClass', AClass.ClassName); if not Assigned(AClass) then raise EInstantError.CreateFmt(SUnsupportedType, [AttributeTypeName]); Result := AClass.Create(TInstantObject(AObject), Self); - CodeSite.ExitMethod(Self, 'TInstantAttributeMetadata.CreateAttribute'); end; function TInstantAttributeMetadata.GetAttributeClass: Modified: branches/Refactor_InstantPersistenceUnit/Source/Core/InstantPersistence.pas =================================================================== --- branches/Refactor_InstantPersistenceUnit/Source/Core/InstantPersistence.pas 2006-08-06 04:35:11 UTC (rev 697) +++ branches/Refactor_InstantPersistenceUnit/Source/Core/InstantPersistence.pas 2006-08-06 09:39:33 UTC (rev 698) @@ -178,7 +178,7 @@ function GetIsChanged: Boolean; virtual; function GetIsDefault: Boolean; virtual; function GetIsMandatory: Boolean; virtual; - function GetOwner: TInstantObject; reintroduce; overload; virtual; + function GetOwner: TInstantObject; virtual; procedure Initialize; virtual; procedure ReadName(Reader: TInstantReader); procedure SetAsBoolean(AValue: Boolean); virtual; @@ -190,12 +190,12 @@ procedure SetAsString(const AValue: string); virtual; procedure SetAsVariant(AValue: Variant); virtual; procedure SetIsChanged(Value: Boolean); - procedure SetOwner(AOwner: TInstantObject); reintroduce; overload; virtual; + procedure SetOwner(AOwner: TInstantObject); virtual; procedure StringValidationError(InvalidChar: Char); procedure WriteName(Writer: TInstantWriter); public constructor Create(AOwner: TInstantAbstractObject = nil; AMetadata: - TInstantCollectionItem = nil); override; + TInstantCollectionItem = nil); override; procedure Changed; procedure CheckHasMetadata; procedure Reset; virtual; @@ -452,7 +452,7 @@ TInstantComplex = class(TInstantAttribute) private - function GetRequiredClass: TInstantAbstractObjectClass; + function GetRequiredClass: TInstantObjectClass; function GetRequiredClassName: string; protected function GetAllowOwned: Boolean; virtual; @@ -464,7 +464,7 @@ property Connector: TInstantConnector read GetConnector; function DetachObject(AObject: TInstantObject): Boolean; virtual; property AllowOwned: Boolean read GetAllowOwned; - property RequiredClass: TInstantAbstractObjectClass read GetRequiredClass; + property RequiredClass: TInstantObjectClass read GetRequiredClass; property RequiredClassName: string read GetRequiredClassName; end; @@ -844,8 +844,7 @@ procedure ReadObject(Reader: TInstantReader); override; procedure RestoreState; virtual; procedure SaveState; virtual; - procedure SetConnector(AConnector: TInstantConnector); reintroduce; overload; - virtual; + procedure SetConnector(AConnector: TInstantConnector); virtual; procedure SetId(const Value: string); virtual; function VerifyOperation(OperationType: TInstantOperationType): TInstantVerificationResult; virtual; procedure WriteObject(Writer: TInstantWriter); override; @@ -856,7 +855,7 @@ public constructor Clone(Source: TInstantObject; AConnector: TInstantConnector = nil); overload; virtual; - constructor Create(AConnector: TComponent = nil); override; + constructor Create(AConnector: TInstantConnector = nil); virtual; constructor Retrieve(const AObjectId: string; CreateIfMissing: Boolean = False; Refresh: Boolean = False; AConnector: TComponent = nil); override; function AddObject(AObject: TInstantObject): Integer; overload; @@ -2267,10 +2266,11 @@ end; constructor TInstantAttribute.Create(AOwner: TInstantAbstractObject = nil; - AMetadata: TInstantCollectionItem = nil); + AMetadata: TInstantCollectionItem = nil); begin - inherited Create(AOwner, nil); - SetMetadata(TInstantAttributeMetadata(AMetadata)); + Assert((AOwner = nil) or (AOwner is TInstantObject)); + Assert((AMetadata = nil) or (AMetadata is TInstantAttributeMetadata)); + inherited Create(AOwner, AMetadata); end; function TInstantAttribute.GetAsBoolean: Boolean; @@ -2364,7 +2364,7 @@ function TInstantAttribute.GetMetadata: TInstantAttributeMetadata; begin - Result := inherited Metadata as TInstantAttributeMetadata; + Result := inherited GetMetadata as TInstantAttributeMetadata; end; function TInstantAttribute.GetName: string; @@ -2377,7 +2377,7 @@ function TInstantAttribute.GetOwner: TInstantObject; begin - Result := inherited Owner as TInstantObject; + Result := inherited GetOwner as TInstantObject; end; function TInstantAttribute.GetValue: Variant; @@ -2452,7 +2452,7 @@ begin if Assigned(Value) and (Value.AttributeType <> AttributeType) then raise EInstantError.CreateFmt(SMetadataMismatch, [ClassName, Name]); - inherited Metadata := Value; + inherited SetMetadata(Value); Initialize; end; @@ -3589,10 +3589,10 @@ InstantCheckConnector(Result); end; -function TInstantComplex.GetRequiredClass: TInstantAbstractObjectClass; +function TInstantComplex.GetRequiredClass: TInstantObjectClass; begin if Assigned(Metadata) then - Result := Metadata.ObjectClass + Result := TInstantObjectClass(Metadata.ObjectClass) else Result := TInstantObject; end; @@ -5571,10 +5571,10 @@ ConvertAttributes; end; -constructor TInstantObject.Create(AConnector: TComponent = nil); +constructor TInstantObject.Create(AConnector: TInstantConnector = nil); begin inherited Create; - InstantCheckConnector(TInstantConnector(AConnector)); + InstantCheckConnector(AConnector); SetConnector(AConnector); Init; DoAfterCreate; @@ -6515,7 +6515,7 @@ begin inherited Create; InstantCheckConnector(TInstantConnector(AConnector)); - SetConnector(AConnector); + SetConnector(TInstantConnector(AConnector)); Instance := ObjectStore.Find(AObjectId); if Assigned(Instance) then begin @@ -6557,7 +6557,7 @@ function TInstantObject.GetConnector: TInstantConnector; begin - Result := inherited Connector as TInstantConnector; + Result := inherited GetConnector as TInstantConnector; end; procedure TInstantObject.SaveState; |
