[JEDI.NET-commits] main/run Jedi.System.pas,1.6,1.7

[Marcel B. <jed...@us...>]

Update of /cvsroot/jedidotnet/main/run
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2823/main/run

Modified Files:
	Jedi.System.pas 
Log Message:
* AttributeUtils.IndexOf searching for a Attribute type, only accepts the same type, not inherited instances.
* AttributeUtils.CombineAttributes always searches for the attribute type of the attribute in the second list.

Index: Jedi.System.pas
===================================================================
RCS file: /cvsroot/jedidotnet/main/run/Jedi.System.pas,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Jedi.System.pas	24 Nov 2004 13:48:27 -0000	1.6
--- Jedi.System.pas	24 Nov 2004 15:18:28 -0000	1.7
***************
*** 86,99 ****
    else
      attrType := attr.GetType;
!   Result := attrList.Count - 1;
    endLoop := False;
!   while (Result >= 0) and not endLoop do
    begin
!     endLoop := attrType.IsInstanceOfType(attrList[Result]);
      if endLoop and not &Object.ReferenceEquals(attr, attrType) then
        endLoop := attr.Equals(attrList[Result]);
      if not endLoop then
!       Dec(Result);
    end;
  end;
  
--- 86,101 ----
    else
      attrType := attr.GetType;
!   Result := 0;
    endLoop := False;
!   while (Result < attrList.Count) and not endLoop do
    begin
!     endLoop := attrType = attrList[Result].GetType;
      if endLoop and not &Object.ReferenceEquals(attr, attrType) then
        endLoop := attr.Equals(attrList[Result]);
      if not endLoop then
!       Inc(Result);
    end;
+   if Result >= attrList.Count then
+     Result := -1;
  end;
  
***************
*** 123,127 ****
    for index := 0 to attributes2.Count - 1 do
    begin
!     attrIndex := IndexOf(Result, attributes2[index]);
      if attrIndex > -1 then
      begin
--- 125,129 ----
    for index := 0 to attributes2.Count - 1 do
    begin
!     attrIndex := IndexOf(Result, attributes2[index].GetType);
      if attrIndex > -1 then
      begin