instantobjects-cvscommit

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

Update of /cvsroot/instantobjects/Source/ObjectFoundry
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24498

Modified Files:
	OFExpert.pas 
Log Message:
Updates to EditAttribute method to support changes to 
Attribute Editor.

Index: OFExpert.pas
===================================================================
RCS file: /cvsroot/instantobjects/Source/ObjectFoundry/OFExpert.pas,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** OFExpert.pas	17 Nov 2004 20:59:50 -0000	1.2
--- OFExpert.pas	24 Feb 2005 00:27:21 -0000	1.3
***************
*** 11,16 ****
      FOptions: TOFOptions;
      procedure AttributeEditorLoadClasses(Sender: TObject; Items: TStrings);
!     procedure AttributeEditorLoadClassAttrs(Sender: TObject;
!       const ClassName: String; Items: TStrings);
      function GetOptions: TOFOptions;
      function IsInstantObjectClass(AClass: IMMClassBase): Boolean;
--- 11,16 ----
      FOptions: TOFOptions;
      procedure AttributeEditorLoadClasses(Sender: TObject; Items: TStrings);
!     //procedure AttributeEditorLoadClassAttrs(Sender: TObject;
!     //  const ClassName: String; Items: TStrings);
      function GetOptions: TOFOptions;
      function IsInstantObjectClass(AClass: IMMClassBase): Boolean;
***************
*** 57,61 ****
    Contnrs, Windows, OFClasses, OFUtils, OFCritic, InstantAttributeEditor,
    InstantPersistence, InstantCode, Forms, Controls, Menus, MMEngineDefs,
!   OFClassRegWizard;
  
  const
--- 57,61 ----
    Contnrs, Windows, OFClasses, OFUtils, OFCritic, InstantAttributeEditor,
    InstantPersistence, InstantCode, Forms, Controls, Menus, MMEngineDefs,
!   OFClassRegWizard, InstantDesignUtils;
  
  const
***************
*** 71,75 ****
  end;
  
! procedure TObjectFoundryExpert.AttributeEditorLoadClassAttrs(
    Sender: TObject; const ClassName: String; Items: TStrings);
  var
--- 71,75 ----
  end;
  
! (*procedure TObjectFoundryExpert.AttributeEditorLoadClassAttrs(
    Sender: TObject; const ClassName: String; Items: TStrings);
  var
***************
*** 99,103 ****
      end;
    end;    { if }
! end;
  
  procedure TObjectFoundryExpert.AttributeEditorLoadClasses(Sender: TObject;
--- 99,103 ----
      end;
    end;    { if }
! end; *)
  
  procedure TObjectFoundryExpert.AttributeEditorLoadClasses(Sender: TObject;
***************
*** 127,140 ****
  var
    Attribute: TMMCodeAttribute;
  begin
    if Assigned(P) and P.Valid then
    begin
      Attribute := TMMCodeAttribute.Create(P);
      try
        with TInstantAttributeEditorForm.Create(nil) do
        try
!         InMM := True;         // SRM - 14 Oct 2004
          OnLoadClasses := AttributeEditorLoadClasses;
-         OnLoadClassAttributes := AttributeEditorLoadClassAttrs; // SRM - 01 Oct 2004
          Subject := Attribute;
          Result := ShowModal = mrOK;
--- 127,153 ----
  var
    Attribute: TMMCodeAttribute;
+   lClass: IMMClassifier;
+ 
+   function GetBaseClassStorageName: String;
+   begin
+     Assert(Assigned(lClass), 'lClass is not assigned!');
+     if lClass.TaggedValues[IOClassStorageName] <> '' then
+       Result := lClass.TaggedValues[IOClassStorageName]
+     else
+       Result := lClass.Name;
+ 
+     Result := Remove_T_FromClassName(Result);
+   end;
+ 
  begin
    if Assigned(P) and P.Valid then
    begin
+     lClass := P.ClassBase;
      Attribute := TMMCodeAttribute.Create(P);
      try
        with TInstantAttributeEditorForm.Create(nil) do
        try
!         BaseClassStorageName := GetBaseClassStorageName;
          OnLoadClasses := AttributeEditorLoadClasses;
          Subject := Attribute;
          Result := ShowModal = mrOK;