[JEDI.NET-commits] main/run Jedi.System.pas,1.2,1.3

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

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

Modified Files:
	Jedi.System.pas 
Log Message:
* Reduced the use of AttributeArray to only function result types
* Added comment why the private constructor and the {$HINT OFF} directive.

Index: Jedi.System.pas
===================================================================
RCS file: /cvsroot/jedidotnet/main/run/Jedi.System.pas,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Jedi.System.pas	24 Jun 2004 20:06:33 -0000	1.2
--- Jedi.System.pas	4 Aug 2004 08:28:18 -0000	1.3
***************
*** 40,43 ****
--- 40,45 ----
    AttributeUtils = class (System.Object)
    strict private
+     { Avoids a hint about private symbol declared but not used. We need to declare it to prevent the compiler from
+       automatically generating a public constructor (due to a .NET rule) }
      {$HINTS OFF}
      constructor Create;
***************
*** 48,53 ****
        operation: AttributeCombineOperation): ArrayList; overload; static;
    public
!     class function CombineAttributes(attributes1, attributes2: AttributeArray): AttributeArray; overload; static;
!     class function CombineAttributes(attributes1, attributes2: AttributeArray;
        operation: AttributeCombineOperation): AttributeArray; overload; static;
      class function CombineAttributes(attributes1, attributes2: AttributeCollection): AttributeCollection;
--- 50,55 ----
        operation: AttributeCombineOperation): ArrayList; overload; static;
    public
!     class function CombineAttributes(attributes1, attributes2: array of Attribute): AttributeArray; overload; static;
!     class function CombineAttributes(attributes1, attributes2: array of Attribute;
        operation: AttributeCombineOperation): AttributeArray; overload; static;
      class function CombineAttributes(attributes1, attributes2: AttributeCollection): AttributeCollection;
***************
*** 55,65 ****
      class function CombineAttributes(attributes1, attributes2: AttributeCollection;
        operation: AttributeCombineOperation): AttributeCollection; overload; static;
!     class function CombineAttributes(attributes1: AttributeArray;
        attributes2: AttributeCollection): AttributeArray; overload; static;
!     class function CombineAttributes(attributes1: AttributeArray; attributes2: AttributeCollection;
        operation: AttributeCombineOperation): AttributeArray; overload; static;
      class function CombineAttributes(attributes1: AttributeCollection; attributes2:
!       AttributeArray): AttributeCollection; overload; static;
!     class function CombineAttributes(attributes1: AttributeCollection; attributes2: AttributeArray;
        operation: AttributeCombineOperation): AttributeCollection; overload; static;
    end;
--- 57,67 ----
      class function CombineAttributes(attributes1, attributes2: AttributeCollection;
        operation: AttributeCombineOperation): AttributeCollection; overload; static;
!     class function CombineAttributes(attributes1: array of Attribute;
        attributes2: AttributeCollection): AttributeArray; overload; static;
!     class function CombineAttributes(attributes1: array of Attribute; attributes2: AttributeCollection;
        operation: AttributeCombineOperation): AttributeArray; overload; static;
      class function CombineAttributes(attributes1: AttributeCollection; attributes2:
!       array of Attribute): AttributeCollection; overload; static;
!     class function CombineAttributes(attributes1: AttributeCollection; attributes2: array of Attribute;
        operation: AttributeCombineOperation): AttributeCollection; overload; static;
    end;
***************
*** 113,122 ****
  end;
  
! class function AttributeUtils.CombineAttributes(attributes1, attributes2: AttributeArray): AttributeArray;
  begin
    Result := CombineAttributes(attributes1, attributes2, AttributeCombineOperation.AddAndReplace);
  end;
  
! class function AttributeUtils.CombineAttributes(attributes1, attributes2: AttributeArray;
    operation: AttributeCombineOperation): AttributeArray;
  begin
--- 115,124 ----
  end;
  
! class function AttributeUtils.CombineAttributes(attributes1, attributes2: array of Attribute): AttributeArray;
  begin
    Result := CombineAttributes(attributes1, attributes2, AttributeCombineOperation.AddAndReplace);
  end;
  
! class function AttributeUtils.CombineAttributes(attributes1, attributes2: array of Attribute;
    operation: AttributeCombineOperation): AttributeArray;
  begin
***************
*** 137,141 ****
  end;
  
! class function AttributeUtils.CombineAttributes(attributes1: AttributeArray;
    attributes2: AttributeCollection): AttributeArray;
  begin
--- 139,143 ----
  end;
  
! class function AttributeUtils.CombineAttributes(attributes1: array of Attribute;
    attributes2: AttributeCollection): AttributeArray;
  begin
***************
*** 143,147 ****
  end;
  
! class function AttributeUtils.CombineAttributes(attributes1: AttributeArray; attributes2: AttributeCollection;
    operation: AttributeCombineOperation): AttributeArray;
  begin
--- 145,149 ----
  end;
  
! class function AttributeUtils.CombineAttributes(attributes1: array of Attribute; attributes2: AttributeCollection;
    operation: AttributeCombineOperation): AttributeArray;
  begin
***************
*** 151,155 ****
  
  class function AttributeUtils.CombineAttributes(attributes1: AttributeCollection;
!   attributes2: AttributeArray): AttributeCollection;
  begin
    Result := CombineAttributes(attributes1, attributes2, AttributeCombineOperation.AddAndReplace);
--- 153,157 ----
  
  class function AttributeUtils.CombineAttributes(attributes1: AttributeCollection;
!   attributes2: array of Attribute): AttributeCollection;
  begin
    Result := CombineAttributes(attributes1, attributes2, AttributeCombineOperation.AddAndReplace);
***************
*** 157,161 ****
  
  class function AttributeUtils.CombineAttributes(attributes1: AttributeCollection;
!   attributes2: AttributeArray; operation: AttributeCombineOperation): AttributeCollection;
  begin
    Result := AttributeCollection.Create(AttributeArray(CombineAttributes(ArrayList.Create(attributes1),
--- 159,163 ----
  
  class function AttributeUtils.CombineAttributes(attributes1: AttributeCollection;
!   attributes2: array of Attribute; operation: AttributeCombineOperation): AttributeCollection;
  begin
    Result := AttributeCollection.Create(AttributeArray(CombineAttributes(ArrayList.Create(attributes1),