From: Robert M. <mar...@us...> - 2004-07-21 06:02:53
|
Update of /cvsroot/jvcl/dev/JVCL3/run In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22546/JVCL3/run Modified Files: JvgWinMask.pas JvgWizardHeader.pas JvgXMLSerializer.pas Log Message: move .inc entries down Index: JvgXMLSerializer.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvgXMLSerializer.pas,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** JvgXMLSerializer.pas 5 Jul 2004 07:08:19 -0000 1.18 --- JvgXMLSerializer.pas 21 Jul 2004 06:02:44 -0000 1.19 *************** *** 22,85 **** located at http://jvcl.sourceforge.net ! Known Issues: ! -----------------------------------------------------------------------------} ! // $Id$ ! ! {$I jvcl.inc} ! ! unit JvgXMLSerializer; ! ! // Êîìïîíåíò êîíâåðòèðóåò êîìïîíåíò â XML è îáðàòíî â ñîîòâåòñòâèè ! // ñ published-èíòåðôåéñîì êëàññà êîìïîíåíòà. ! // ! // XML ôîðìèðóåòñÿ â âèäå ïàð òåãîâ ñ âëîæåííûìè â íèõ çíà÷åíèÿìè. ! // Àòðèáóòû ó òåãîâ îòñóòñòâóþò. ! // ! // Òåã âåðõíåãî óðîâíÿ ñîîòâåòñòâóåò êëàññó îáúåêòà. ! // Âëîæåííûå òåãè ñîîòâåòñòâóþò èìåíàì ñâîéñòâ. ! // Äëÿ ýëåìåíòîâ êîëëåêöèé êîíòåéíåðíûé òåã ñîîòâåòñòâóåò èìåíè êëàññà. ! // ! // Âëîæåííîñòü òåãîâ íå îãðàíè÷åíà è ïîëíîñòüþ ïîâòîðÿåò ! // published èíòåðôåéñ êëàññà çàäàííîãî îáúåêòà. ! // ! // Ïîääåðæèâàþòñÿ öåëûå òèïû, òèïû ñ ïëàâàþùåé òî÷êîé, ïåðå÷èñëåíèÿ, ! // íàáîðû, ñòðîêè, ñèìâîëû. âàðèàíòíûå òèïû, ! // êëàññîâûå òèïû, ñòîêîâûå ñïèñêè è êîëëåêöèè. ! // ! // Èíòåðôåéñ: ! // procedure Serialize(Component: TObject; Stream: TStream); ! // - Ñåðèàëèçàöèÿ îáúåêòà â XML ! // procedure DeSerialize(Component: TObject; Stream: TStream); ! // - Çàãðóçêà XML â îáúåêò ! // ! // property GenerateFormattedXML - ñîçäàâàòü ôîðìàòèðîâàííûé XML êîä ! // property ExcludeEmptyValues - ïðîïóñêàòü ïóñòûå çíà÷åíèÿ ñâîéñòâ ! // property ExcludeDefaultValues - ïðîïóñêàòü çíà÷åíèÿ ïî óìîë÷àíèþ ! // property StrongConformity - íåîáõîäèìî íàëè÷èå â XML ñîîòâ. òåãîâ äëÿ âñåõ êëàññîâûõ òèïîâ ! // property IgnoreUnknownTags - èãíîðèðîâàòü íåèçâåñòíûå òåãè ïðè çàãðóçêå ! // property OnGetXMLHeader - ïîçâîëÿåò óêàçàòü ñâîé XML çàãîëîâîê ! // ! // WrapCollections - îáîðà÷èâàòü êîëëåêöèè â îòäåëüíûå òåãè ! // Îãðàíè÷åíèÿ: ! //  â êàæäîì îáúåêòå äîïóñòèìî èñïîëüçîâàòü òîëüêî îäíó êîëëåêöèþ êàæäîãî òèïà. ! // Íàñëåäíèêè êëàññà TStrings íå ìîãóò èìåòü published ñâîéñòâ. ! // ! // Ïðîöåäóðíûå òèïû íå îáðàáàòûâàþòñÿ. ! // ! // Äëÿ ãåíåðàöèè DTD ó îáúåêòà âñå ñâîéñòâà êëàññîâûõ òèïîâ, îäíîèìåííûå ñî ! // ñâîéñòâàìè àãðåãèðîâàííûõ îáúåêòîâ, äîëæíû áûòü îäíîãî êëàññà. ! // ! // Ïðåäóñëîâèÿ: ! // Îáúåêò äëÿ (äå)ñåðèàëèçàöèè äîëæåí áûòü ñîçäàí äî âûçîâà ïðîöåäóðû. ! // ! // Ïðè StrongConformity == True íåîáõîäèìî ïðèñóòñòâèå â çàãðóæàåìîì XML òåãîâ ! // äëÿ âñåõ êëàññîâûõ òèïîâ. Ïðèñóòñòâèå îñòàëüíûõ òåãîâ íå ïðîâåðÿåòñÿ. ! // ! // Äîïîëíèòåëüíî: ! // Ïðè çàãðóçêå èç XML ñîäåðæèìîå êîëëåêöèé â îáúåêòå íå î÷èùàåòñÿ, ! // ÷òî ïîçâîëÿåò äîçàãðóæàòü äàííûå èç ìíîæåñòâà èñòî÷íèêîâ â îäèí îáúåêò. ! ! { Translation : ! The component converts given component to XML and back according to published interface of its class. --- 22,26 ---- located at http://jvcl.sourceforge.net ! Description: The component converts given component to XML and back according to published interface of its class. *************** *** 129,133 **** When loading TCollection from XML, it is not voided (?) so you can load TCollection as a merge of different XML sources. ! } interface --- 70,81 ---- When loading TCollection from XML, it is not voided (?) so you can load TCollection as a merge of different XML sources. ! ! Known Issues: ! -----------------------------------------------------------------------------} ! // $Id$ ! ! unit JvgXMLSerializer; ! ! {$I jvcl.inc} interface *************** *** 135,139 **** uses Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms, ! Dialogs, ComCtrls, JvComponent, TypInfo; type --- 83,88 ---- uses Windows, Messages, SysUtils, Classes, Graphics, Controls, Forms, ! Dialogs, ComCtrls, TypInfo, ! JvComponent; type *************** *** 141,155 **** TBeforeParsingEvent = procedure(Sender: TObject; Buffer: PChar) of object; ! EJvgXMLSerializerException = class(Exception) ! end; ! ! XMLSerializerException = class(Exception) ! end; ! EJvgXMLOpenTagNotFoundException = class(XMLSerializerException) ! end; ! EJvgXMLCloseTagNotFoundException = class(XMLSerializerException) ! end; ! EJvgXMLUncknownPropertyException = class(XMLSerializerException) ! end; TJvgXMLSerializerException = class of XMLSerializerException; --- 90,98 ---- TBeforeParsingEvent = procedure(Sender: TObject; Buffer: PChar) of object; ! EJvgXMLSerializerException = class(Exception); ! XMLSerializerException = class(Exception); ! EJvgXMLOpenTagNotFoundException = class(XMLSerializerException); ! EJvgXMLCloseTagNotFoundException = class(XMLSerializerException); ! EJvgXMLUncknownPropertyException = class(XMLSerializerException); TJvgXMLSerializerException = class of XMLSerializerException; *************** *** 162,166 **** TokenPtr {, MaxTokenPtr}: PChar; OutStream: TStream; - FOnGetXMLHeader: TOnGetXMLHeader; FGenerateFormattedXML: Boolean; --- 105,108 ---- *************** *** 175,179 **** procedure WriteOutStream(const Value: string); - { Private declarations } protected procedure SerializeInternal(Component: TObject; Level: integer = 1); --- 117,120 ---- *************** *** 199,222 **** procedure GenerateDTD(Component: TObject; Stream: TStream); published ! property GenerateFormattedXML: Boolean ! read FGenerateFormattedXML write FGenerateFormattedXML default True; ! property ExcludeEmptyValues: Boolean ! read FExcludeEmptyValues write FExcludeEmptyValues; ! property ExcludeDefaultValues: Boolean ! read FExcludeDefaultValues write FExcludeDefaultValues; ! property ReplaceReservedSymbols: Boolean ! read FReplaceReservedSymbols write FReplaceReservedSymbols; ! property StrongConformity: Boolean ! read FStrongConformity write FStrongConformity default True; ! property IgnoreUnknownTags: Boolean ! read FIgnoreUnknownTags write FIgnoreUnknownTags; ! ! property WrapCollections: Boolean ! read FWrapCollections write FWrapCollections default True; ! ! property OnGetXMLHeader: TOnGetXMLHeader ! read FOnGetXMLHeader write FOnGetXMLHeader; ! property BeforeParsing: TBeforeParsingEvent ! read FBeforeParsing write FBeforeParsing; end; --- 140,152 ---- procedure GenerateDTD(Component: TObject; Stream: TStream); published ! property GenerateFormattedXML: Boolean read FGenerateFormattedXML write FGenerateFormattedXML default True; ! property ExcludeEmptyValues: Boolean read FExcludeEmptyValues write FExcludeEmptyValues; ! property ExcludeDefaultValues: Boolean read FExcludeDefaultValues write FExcludeDefaultValues; ! property ReplaceReservedSymbols: Boolean read FReplaceReservedSymbols write FReplaceReservedSymbols; ! property StrongConformity: Boolean read FStrongConformity write FStrongConformity default True; ! property IgnoreUnknownTags: Boolean read FIgnoreUnknownTags write FIgnoreUnknownTags; ! property WrapCollections: Boolean read FWrapCollections write FWrapCollections default True; ! property OnGetXMLHeader: TOnGetXMLHeader read FOnGetXMLHeader write FOnGetXMLHeader; ! property BeforeParsing: TBeforeParsingEvent read FBeforeParsing write FBeforeParsing; end; *************** *** 246,250 **** RsCloseXMLTagNotFound = 'Close tag not found: </%s>'; RsUnknownProperty = 'Unknown property: %s'; ! {$ENDIF USEJVCL} constructor TJvgXMLSerializer.Create(AOwner: TComponent); --- 176,180 ---- RsCloseXMLTagNotFound = 'Close tag not found: </%s>'; RsUnknownProperty = 'Unknown property: %s'; ! {$ENDIF !USEJVCL} constructor TJvgXMLSerializer.Create(AOwner: TComponent); Index: JvgWinMask.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvgWinMask.pas,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** JvgWinMask.pas 13 Jun 2004 05:58:50 -0000 1.12 --- JvgWinMask.pas 21 Jul 2004 06:02:44 -0000 1.13 *************** *** 25,32 **** // $Id$ - {$I jvcl.inc} - unit JvgWinMask; interface --- 25,32 ---- // $Id$ unit JvgWinMask; + {$I jvcl.inc} + interface Index: JvgWizardHeader.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvgWizardHeader.pas,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** JvgWizardHeader.pas 1 Jul 2004 07:27:24 -0000 1.13 --- JvgWizardHeader.pas 21 Jul 2004 06:02:44 -0000 1.14 *************** *** 25,32 **** // $Id$ - {$I jvcl.inc} - unit JvgWizardHeader; interface --- 25,32 ---- // $Id$ unit JvgWizardHeader; + {$I jvcl.inc} + interface |