From 2c018868d283d53e869a2ed30f5dcc03846a06fa Mon Sep 17 00:00:00 2001 From: paul Date: Wed, 24 Dec 2008 05:37:30 +0000 Subject: [PATCH] jcf: reduce amount of hints git-svn-id: trunk@17917 - --- .../jcf2/Process/Transform/SortUses.pas | 4 +- components/jcf2/Settings/JCFSetBase.pas | 18 +- .../Settings/Streams/RegistrySettings.pas | 10 ++ .../jcf2/Settings/Streams/SettingsStream.pas | 156 ++++-------------- 4 files changed, 46 insertions(+), 142 deletions(-) diff --git a/components/jcf2/Process/Transform/SortUses.pas b/components/jcf2/Process/Transform/SortUses.pas index 8ae0df8187..04f9d5cb55 100644 --- a/components/jcf2/Process/Transform/SortUses.pas +++ b/components/jcf2/Process/Transform/SortUses.pas @@ -213,8 +213,8 @@ var function IsBreakToken(const pcToken: TSourceToken): Boolean; begin - Result := (lcToken.TokenType in leBreakTokens) or - ((lcToken.TokenType = ttComment) and (lcToken.CommentStyle = eCompilerDirective)); + Result := (pcToken.TokenType in leBreakTokens) or + ((pcToken.TokenType = ttComment) and (pcToken.CommentStyle = eCompilerDirective)); end; var diff --git a/components/jcf2/Settings/JCFSetBase.pas b/components/jcf2/Settings/JCFSetBase.pas index d8ce97f3b3..ca73f83597 100644 --- a/components/jcf2/Settings/JCFSetBase.pas +++ b/components/jcf2/Settings/JCFSetBase.pas @@ -48,8 +48,8 @@ type procedure SetSection(const ps: string); public - procedure WriteToStream(const pcStream: TSettingsOutput); virtual; - procedure ReadFromStream(const pcStream: TSettingsInput); virtual; + procedure WriteToStream(const pcStream: TSettingsOutput); virtual; abstract; + procedure ReadFromStream(const pcStream: TSettingsInput); virtual; abstract; property Section: string Read fsSection; end; @@ -61,18 +61,4 @@ begin fsSection := ps; end; -procedure TSetBase.WriteToStream(const pcStream: TSettingsOutput); -begin - // do nothing - here for override - Assert(False, 'Class ' + ClassName + ' must override TSetBase.WriteToStream'); -end; - -procedure TSetBase.ReadFromStream(const pcStream: TSettingsInput); -begin - // do nothing - here for override - Assert(False, 'Class ' + ClassName + ' must override TSetBase.ReadFromStream'); -end; - - - end. diff --git a/components/jcf2/Settings/Streams/RegistrySettings.pas b/components/jcf2/Settings/Streams/RegistrySettings.pas index 1d7dfe3139..d9fccd485c 100644 --- a/components/jcf2/Settings/Streams/RegistrySettings.pas +++ b/components/jcf2/Settings/Streams/RegistrySettings.pas @@ -64,6 +64,8 @@ type procedure Write(const psTagName: string; const pcValue: TStrings); override; end; + { TSettingsInputRegistry } + TSettingsInputRegistry = class(TSettingsInput) private fReg: TRegIniFile; @@ -83,6 +85,7 @@ type function Read(const psTag: string): string; override; function Read(const psTag, psDefault: string): string; override; function Read(const psTag: string; const piDefault: integer): integer; override; + function Read(const psTag: string; const pfDefault: double): double; override; function Read(const psTag: string; const pbDefault: boolean): boolean; override; function Read(const psTag: string; const pcStrings: TStrings): boolean; override; end; @@ -242,6 +245,13 @@ begin Result := fReg.ReadInteger(fsSection, psTag, piDefault) end; +function TSettingsInputRegistry.Read(const psTag: string; + const pfDefault: double): double; +begin + Assert(fReg <> nil); + Result := Str2Float(fReg.ReadString(fsSection, psTag, Float2Str(pfDefault))); +end; + function TSettingsInputRegistry.Read(const psTag: string; const pbDefault: boolean): boolean; begin diff --git a/components/jcf2/Settings/Streams/SettingsStream.pas b/components/jcf2/Settings/Streams/SettingsStream.pas index c2c53fdf11..e612490cc6 100644 --- a/components/jcf2/Settings/Streams/SettingsStream.pas +++ b/components/jcf2/Settings/Streams/SettingsStream.pas @@ -45,16 +45,16 @@ type TSettingsOutput = class(TObject) private public - procedure WriteXMLHeader; virtual; + procedure WriteXMLHeader; virtual; abstract; - procedure OpenSection(const psName: string); virtual; - procedure CloseSection(const psName: string); virtual; + procedure OpenSection(const psName: string); virtual; abstract; + procedure CloseSection(const psName: string); virtual; abstract; - procedure Write(const psTagName, psValue: string); overload; virtual; - procedure Write(const psTagName: string; const piValue: integer); overload; virtual; - procedure Write(const psTagName: string; const pbValue: boolean); overload; virtual; - procedure Write(const psTagName: string; const pdValue: double); overload; virtual; - procedure Write(const psTagName: string; const pcValue: TStrings); overload; virtual; + procedure Write(const psTagName, psValue: string); overload; virtual; abstract; + procedure Write(const psTagName: string; const piValue: integer); overload; virtual; abstract; + procedure Write(const psTagName: string; const pbValue: boolean); overload; virtual; abstract; + procedure Write(const psTagName: string; const pdValue: double); overload; virtual; abstract; + procedure Write(const psTagName: string; const pcValue: TStrings); overload; virtual; abstract; end; @@ -89,20 +89,16 @@ type { settings reading interface } TSettingsInput = class(TObject) public - function ExtractSection(const psSection: string): TSettingsInput; virtual; + function ExtractSection(const psSection: string): TSettingsInput; virtual; abstract; - function HasTag(const psTag: string): boolean; virtual; + function HasTag(const psTag: string): boolean; virtual; abstract; - function Read(const psTag: string): string; overload; virtual; - function Read(const psTag, psDefault: string): string; overload; virtual; - function Read(const psTag: string; const piDefault: integer): integer; - overload; virtual; - function Read(const psTag: string; const pfDefault: double): double; - overload; virtual; - function Read(const psTag: string; const pbDefault: boolean): boolean; - overload; virtual; - function Read(const psTag: string; const pcStrings: TStrings): boolean; - overload; virtual; + function Read(const psTag: string): string; overload; virtual; abstract; + function Read(const psTag, psDefault: string): string; overload; virtual; abstract; + function Read(const psTag: string; const piDefault: integer): integer; overload; virtual; abstract; + function Read(const psTag: string; const pfDefault: double): double; overload; virtual; abstract; + function Read(const psTag: string; const pbDefault: boolean): boolean; overload; virtual; abstract; + function Read(const psTag: string; const pcStrings: TStrings): boolean; overload; virtual; abstract; end; @@ -138,14 +134,19 @@ type { dummy impl that always returns the default } + + { TSettingsInputDummy } + TSettingsInputDummy = class(TSettingsInput) private public function ExtractSection(const psSection: string): TSettingsInput; override; function HasTag(const psTag: string): boolean; override; + function Read(const psTag: string): string; override; function Read(const psTag, psDefault: string): string; override; function Read(const psTag: string; const piDefault: integer): integer; override; + function Read(const psTag: string; const pfDefault: double): double; override; function Read(const psTag: string; const pbDefault: boolean): boolean; override; function Read(const psTag: string; const pcStrings: TStrings): boolean; override; end; @@ -161,52 +162,6 @@ uses const XML_HEADER = '' + NativeLineBreak; -procedure TSettingsOutput.WriteXMLHeader; -begin - Assert(False, 'TSettingsOutput.WriteXMLHeader must be overridden in class ' + ClassName); -end; - - -procedure TSettingsOutput.OpenSection(const psName: string); -begin - Assert(False, 'TSettingsOutput.OpenSection must be overridden in class ' + ClassName); -end; - -procedure TSettingsOutput.CloseSection(const psName: string); -begin - Assert(False, 'TSettingsOutput.CloseSection must be overridden in class ' + ClassName); -end; - -procedure TSettingsOutput.Write(const psTagName, psValue: string); -begin - Assert(False, 'TSettingsOutput.Write (string) must be overridden in class ' + - ClassName); -end; - -procedure TSettingsOutput.Write(const psTagName: string; const piValue: integer); -begin - Assert(False, 'TSettingsOutput.Write (int) must be overridden in class ' + ClassName); -end; - -procedure TSettingsOutput.Write(const psTagName: string; const pbValue: boolean); -begin - Assert(False, 'TSettingsOutput.Write (boolean) must be overridden in class ' + - ClassName); -end; - -procedure TSettingsOutput.Write(const psTagName: string; const pdValue: double); -begin - Assert(False, 'TSettingsOutput.Write (double) must be overridden in class ' + - ClassName); -end; - -procedure TSettingsOutput.Write(const psTagName: string; const pcValue: TStrings); -begin - Assert(False, 'TSettingsOutput.Write (TStrings) must be overridden in class ' + - ClassName); -end; - -{--------------------} constructor TSettingsStreamOutput.Create(const psFileName: string); begin inherited Create(); @@ -297,64 +252,6 @@ begin Write(psTagName, pcValue.CommaText); end; -{----------------------------------------------------------------------------- - SettingsInput} - -function TSettingsInput.ExtractSection(const psSection: string): TSettingsInput; -begin - Assert(False, 'TSettingsInput.ExtractSection must be overridden in class ' + - ClassName); - Result := nil; -end; - -function TSettingsInput.HasTag(const psTag: string): boolean; -begin - Assert(False, 'TSettingsInput.HasTag must be overridden in class ' + ClassName); - Result := False; -end; - -function TSettingsInput.Read(const psTag: string): string; -begin - Assert(False, 'TSettingsInput.GetValue(string) must be overridden in class ' + - ClassName); - Result := ''; -end; - -function TSettingsInput.Read(const psTag, psDefault: string): string; -begin - Assert(False, 'TSettingsInput.GetValue(string) must be overridden in class ' + - ClassName); - Result := ''; -end; - -function TSettingsInput.Read(const psTag: string; const piDefault: integer): integer; -begin - Assert(False, 'TSettingsInput.GetValue(integer) must be overridden in class ' + - ClassName); - Result := 0; -end; - -function TSettingsInput.Read(const psTag: string; const pfDefault: double): double; -begin - Assert(False, 'TSettingsInput.GetValue(double) must be overridden in class ' + - ClassName); - Result := 0.0; -end; - -function TSettingsInput.Read(const psTag: string; const pbDefault: boolean): boolean; -begin - Assert(False, 'TSettingsInput.GetValue(boolean) must be overridden in class ' + - ClassName); - Result := False; -end; - -function TSettingsInput.Read(const psTag: string; const pcStrings: TStrings): boolean; -begin - Assert(False, 'TSettingsInput.GetValue(TStrings) must be overridden in class ' + - ClassName); - Result := False; -end; - {----------------------------------------------------------------------------- SettingsInputString } @@ -539,6 +436,12 @@ begin Result := piDefault; end; +function TSettingsInputDummy.Read(const psTag: string; + const pfDefault: double): double; +begin + Result := pfDefault; +end; + function TSettingsInputDummy.Read(const psTag, psDefault: string): string; begin Result := psDefault; @@ -554,6 +457,11 @@ begin Result := True; end; +function TSettingsInputDummy.Read(const psTag: string): string; +begin + Result := ''; +end; + function TSettingsInputDummy.Read(const psTag: string; const pbDefault: boolean): boolean; begin