[JEDI.NET-commits] main/run Jedi.Collections.InlineEditable.pas,1.1,1.2 Jedi.System.Attributes.pas,1
Status: Pre-Alpha
Brought to you by:
jedi_mbe
From: Marcel B. <jed...@us...> - 2005-01-22 15:05:13
|
Update of /cvsroot/jedidotnet/main/run In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13324/main/run Modified Files: Jedi.Collections.InlineEditable.pas Jedi.System.Attributes.pas Log Message: Added SourceInfo attribute Index: Jedi.System.Attributes.pas =================================================================== RCS file: /cvsroot/jedidotnet/main/run/Jedi.System.Attributes.pas,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Jedi.System.Attributes.pas 5 Dec 2004 13:19:48 -0000 1.1 --- Jedi.System.Attributes.pas 22 Jan 2005 15:05:05 -0000 1.2 *************** *** 29,49 **** uses System.Collections, ! System.ComponentModel; {$ENDREGION} ! {$REGION 'Attributes'} type AttributeArray = array of Attribute; AttributeCombineOperation = (Add, Replace, Delete, AddAndReplace); type AttributeUtils = class (System.Object) strict protected - constructor Create; class function CombineAttributes(attributes1, attributes2: ArrayList; operation: AttributeCombineOperation): ArrayList; overload; static; - class function IndexOf(attrList: ArrayList; attr: System.Object): Integer; static; - class function ToArrayList(attrs: array of Attribute): ArrayList; overload; static; - class function ToArrayList(attrs: AttributeCollection): ArrayList; overload; static; public class function CombineAttributes(attributes1, attributes2: array of Attribute): AttributeArray; overload; static; --- 29,55 ---- uses System.Collections, ! System.ComponentModel, ! Jedi.System.SourceVersioning; {$ENDREGION} ! {$REGION 'Helper types (Delphi only)'} type AttributeArray = array of Attribute; + {$ENDREGION} + + {$REGION 'Enumerations'} + type + [JediSourceInfo('$Header$')] AttributeCombineOperation = (Add, Replace, Delete, AddAndReplace); + {$ENDREGION} + {$REGION 'Attribute list/collection handling'} type + [JediSourceInfo('$Header$')] AttributeUtils = class (System.Object) + {$REGION 'Combining attribute lists'} strict protected class function CombineAttributes(attributes1, attributes2: ArrayList; operation: AttributeCombineOperation): ArrayList; overload; static; public class function CombineAttributes(attributes1, attributes2: array of Attribute): AttributeArray; overload; static; *************** *** 62,69 **** --- 68,89 ---- class function CombineAttributes(attributes1: AttributeCollection; attributes2: array of Attribute; operation: AttributeCombineOperation): AttributeCollection; overload; static; + {$ENDREGION} + {$REGION 'Constructor'} + strict protected + constructor Create; + {$ENDREGION} + {$REGION 'Internal helper methods'} + strict protected + class function IndexOf(attrList: ArrayList; attr: System.Object): Integer; static; + class function ToArrayList(attrs: array of Attribute): ArrayList; overload; static; + class function ToArrayList(attrs: AttributeCollection): ArrayList; overload; static; + {$ENDREGION} + {$REGION 'Retrieval of an attribute'} + public class function GetAttribute(attributes: array of Attribute; attr: Attribute): Attribute; overload; static; class function GetAttribute(attributes: array of Attribute; attrType: System.Type): Attribute; overload; static; class function GetAttribute(attributes: AttributeCollection; attr: Attribute): Attribute; overload; static; class function GetAttribute(attributes: AttributeCollection; attrType: System.Type): Attribute; overload; static; + {$ENDREGION} end; {$ENDREGION} Index: Jedi.Collections.InlineEditable.pas =================================================================== RCS file: /cvsroot/jedidotnet/main/run/Jedi.Collections.InlineEditable.pas,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Jedi.Collections.InlineEditable.pas 5 Dec 2004 13:19:48 -0000 1.1 --- Jedi.Collections.InlineEditable.pas 22 Jan 2005 15:05:05 -0000 1.2 *************** *** 29,32 **** --- 29,33 ---- uses Jedi.System.Attributes, + Jedi.System.SourceVersioning, System.Collections, System.Collections.Specialized, *************** *** 39,42 **** --- 40,44 ---- {$REGION 'Inline collection editing'} type + [JediSourceInfo('$Header$')] InlineCollectionUtils = class (System.Object) strict private *************** *** 65,68 **** --- 67,71 ---- end; + [JediSourceInfo('$Header$')] IInlineCollection = interface { add an item to the collection. This method is used by the 'new item' semi property when a new value should be *************** *** 82,85 **** --- 85,89 ---- end; + [JediSourceInfo('$Header$')] InlineCollectionConverter = class (System.ComponentModel.CollectionConverter) { when converting to a string uses IInlineCollection.GetCollectionValue. } *************** *** 94,97 **** --- 98,102 ---- end; + [JediSourceInfo('$Header$')] InlineCollectionEditor = class (UITypeEditor) function GetEditStyle(context: ITypeDescriptorContext): UITypeEditorEditStyle; override; *************** *** 104,107 **** --- 109,113 ---- type [TypeConverter(TypeOf(InlineCollectionConverter)), Editor(TypeOf(InlineCollectionEditor), TypeOf(UITypeEditor))] + [JediSourceInfo('$Header$')] InlineCollectionBase = class abstract (CollectionBase, IInlineCollection) strict private *************** *** 128,131 **** --- 134,138 ---- type [TypeConverter(TypeOf(InlineCollectionConverter)), Editor(TypeOf(InlineCollectionEditor), TypeOf(UITypeEditor))] + [JediSourceInfo('$Header$')] InlineDictionaryBase = class abstract (DictionaryBase, IInlineCollection) {$REGION 'IInlineCollection methods'} |