instantobjects-cvscommit

[Nando D. <na...@us...>]

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

Modified Files:
	InstantAttributeEditor.pas 
Log Message:
externalstored Part attributes do not map to an intermediate table anymore

Index: InstantAttributeEditor.pas
===================================================================
RCS file: /cvsroot/instantobjects/Source/Design/InstantAttributeEditor.pas,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** InstantAttributeEditor.pas	10 Feb 2005 23:06:31 -0000	1.9
--- InstantAttributeEditor.pas	11 Feb 2005 16:12:16 -0000	1.10
***************
*** 25,30 ****
   *
   * Contributor(s):
!  * Carlo Barazzetta, Adrea Petrelli: porting Kylix
!  * Steven Mitchell: updating for OFExpt in MM7
   *
   * ***** END LICENSE BLOCK ***** *)
--- 25,29 ----
   *
   * Contributor(s):
!  * Carlo Barazzetta, Adrea Petrelli, Nando Dessena, Steven Mitchell
   *
   * ***** END LICENSE BLOCK ***** *)
***************
*** 34,38 ****
  interface
  
! {$IFDEF VER130}{$DEFINE MSWINDOWS}{$ENDIF}
  
  uses
--- 33,37 ----
  interface
  
! {$I ..\Core\InstantDefines.inc}
  
  uses
***************
*** 115,119 ****
      procedure ExternalLinkedNameEditEnter(Sender: TObject);
    private
!     FInMM: boolean;   // True if in ModelMaker, default is False
      FLimited: Boolean;
      FModel: TInstantCodeModel;
--- 114,119 ----
      procedure ExternalLinkedNameEditEnter(Sender: TObject);
    private
!     // True if in ModelMaker, default is False
!     FInMM: Boolean;
      FLimited: Boolean;
      FModel: TInstantCodeModel;
***************
*** 474,478 ****
  
  var
!   HasName, HasClass, HasExternalStoredName, HasExternalLinkedName: Boolean;
    IsComplex, IsContainer, CanBeExternal, IsExternal, IsMaskable, IsString, IsValid: Boolean;
  begin
--- 474,478 ----
  
  var
!   HasName, HasClass, HasExternalLinkedName: Boolean;
    IsComplex, IsContainer, CanBeExternal, IsExternal, IsMaskable, IsString, IsValid: Boolean;
  begin
***************
*** 480,486 ****
    if not CanBeExternal then
      Subject.IsExternal := ceNo;
!   if Subject.IsExternal = ceLinked then
      Subject.ExternalStoredName := '';
!   if Subject.IsExternal = ceStored then
      Subject.ExternalLinkedName := '';
  
--- 480,486 ----
    if not CanBeExternal then
      Subject.IsExternal := ceNo;
!   if (Subject.IsExternal = ceLinked) or (Subject.AttributeType = atPart) then
      Subject.ExternalStoredName := '';
!   if (Subject.IsExternal = ceStored) then
      Subject.ExternalLinkedName := '';
  
***************
*** 490,500 ****
    IsMaskable := Subject.AttributeType in [atString, atMemo, atFloat, atCurrency, atInteger];
    IsContainer := Subject.IsContainer;
-   HasExternalStoredName := ExternalStoredNameEdit.Text <> '';
    HasExternalLinkedName := ExternalLinkedNameEdit.Text <> '';
  
    IsExternal := Subject.IsExternal <> ceNo;
    IsString := Subject.AttributeType in [atString, atMemo];
!   IsValid := HasName and (not IsComplex or HasClass) and
!     (not IsExternal or (HasExternalStoredName or HasExternalLinkedName));
  
    DisableSubControls(DefinitionSheet, Limited);
--- 490,500 ----
    IsMaskable := Subject.AttributeType in [atString, atMemo, atFloat, atCurrency, atInteger];
    IsContainer := Subject.IsContainer;
    HasExternalLinkedName := ExternalLinkedNameEdit.Text <> '';
  
    IsExternal := Subject.IsExternal <> ceNo;
    IsString := Subject.AttributeType in [atString, atMemo];
!   IsValid := HasName and (not IsComplex or HasClass);
!   if IsValid and (Subject.IsExternal = ceLinked) then
!     IsValid := HasExternalLinkedName;
  
    DisableSubControls(DefinitionSheet, Limited);
***************
*** 518,528 ****
      EnableCtrl(IsExternalLabel, CanBeExternal);
    end;
!   EnableCtrl(StorageNameLabel, not IsExternal);
!   EnableCtrl(StorageNameEdit, not IsExternal);
  
    EnableCtrl(ExternalLinkedNameLabel, IsExternal and (Subject.IsExternal = ceLinked));
    EnableCtrl(ExternalLinkedNameEdit, IsExternal and (Subject.IsExternal = ceLinked));
!   EnableCtrl(ExternalStoredNameLabel, IsExternal and (Subject.IsExternal = ceStored));
!   EnableCtrl(ExternalStoredNameEdit, IsExternal and (Subject.IsExternal = ceStored));
  
    EnableCtrl(SizeLabel, IsString);
--- 518,530 ----
      EnableCtrl(IsExternalLabel, CanBeExternal);
    end;
!   EnableCtrl(StorageNameLabel, not IsExternal or (Subject.AttributeType = atPart));
!   EnableCtrl(StorageNameEdit, not IsExternal or (Subject.AttributeType = atPart));
  
    EnableCtrl(ExternalLinkedNameLabel, IsExternal and (Subject.IsExternal = ceLinked));
    EnableCtrl(ExternalLinkedNameEdit, IsExternal and (Subject.IsExternal = ceLinked));
!   EnableCtrl(ExternalStoredNameLabel, IsExternal and (Subject.IsExternal = ceStored)
!     and not (Subject.AttributeType = atPart));
!   EnableCtrl(ExternalStoredNameEdit, IsExternal and (Subject.IsExternal = ceStored)
!     and not (Subject.AttributeType = atPart));
  
    EnableCtrl(SizeLabel, IsString);