From ae8da86aaa9569e653f575706c02694d54f9a836 Mon Sep 17 00:00:00 2001 From: mguesdon Date: Tue, 6 Apr 2004 11:16:34 +0000 Subject: [PATCH] o replaced -definitionName call by -declarationName o replaced -setDefinitionName -setDeclarationName git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gsweb/trunk@19048 72102866-910b-0410-8b05-ffd578937521 --- GSWeb.framework/GSWConditional.m | 22 +++++++++++----------- GSWeb.framework/GSWRepetition.m | 10 +++++----- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/GSWeb.framework/GSWConditional.m b/GSWeb.framework/GSWConditional.m index d5a9e7c..fcab7f1 100644 --- a/GSWeb.framework/GSWConditional.m +++ b/GSWeb.framework/GSWConditional.m @@ -1,6 +1,6 @@ /** GSWConditional.m - GSWeb: Class GSWConditional - Copyright (C) 1999-2003 Free Software Foundation, Inc. + Copyright (C) 1999-2004 Free Software Foundation, Inc. Written by: Manuel Guesdon Date: Jan 1999 @@ -130,11 +130,11 @@ Bindings } //-------------------------------------------------------------------- --(void)setDefinitionName:(NSString*)definitionName +-(void)setDeclarationName:(NSString*)declarationName { - [super setDefinitionName:definitionName]; - if (definitionName && _childrenGroup) - [_childrenGroup setDefinitionName:[NSString stringWithFormat:@"%@-StaticGroup",definitionName]]; + [super setDeclarationName:declarationName]; + if (declarationName && _childrenGroup) + [_childrenGroup setDeclarationName:[NSString stringWithFormat:@"%@-StaticGroup",declarationName]]; }; //-------------------------------------------------------------------- @@ -180,8 +180,8 @@ Bindings NSDebugMLLog(@"gswdync",@"elementID=%@",[aContext elementID]); if (negate) doIt=!doIt; - NSDebugMLLog(@"gswdync",@"defname=%@ condition=%@ negate=%@ evaluatedCondition=%s evaluatedNegate=%s doIt=%s", - [self definitionName], + NSDebugMLLog(@"gswdync",@"declarationName=%@ condition=%@ negate=%@ evaluatedCondition=%s evaluatedNegate=%s doIt=%s", + [self declarationName], _condition, _negate, (condition ? "YES" : "NO"), @@ -233,8 +233,8 @@ Bindings doIt=condition; if (negate) doIt=!doIt; - NSDebugMLLog(@"gswdync",@"defname=%@ condition=%@ negate=%@ evaluatedCondition=%s evaluatedNegate=%s doIt=%s", - [self definitionName], + NSDebugMLLog(@"gswdync",@"declarationName=%@ condition=%@ negate=%@ evaluatedCondition=%s evaluatedNegate=%s doIt=%s", + [self declarationName], _condition, _negate, (condition ? "YES" : "NO"), @@ -294,8 +294,8 @@ Bindings doIt=condition; if (negate) doIt=!doIt; - NSDebugMLLog(@"gswdync",@"defname=%@ condition=%@ negate=%@ evaluatedCondition=%s evaluatedNegate=%s doIt=%s", - [self definitionName], + NSDebugMLLog(@"gswdync",@"declarationName=%@ condition=%@ negate=%@ evaluatedCondition=%s evaluatedNegate=%s doIt=%s", + [self declarationName], _condition, _negate, (condition ? "YES" : "NO"), diff --git a/GSWeb.framework/GSWRepetition.m b/GSWeb.framework/GSWRepetition.m index f86afdc..6b7df8b 100644 --- a/GSWeb.framework/GSWRepetition.m +++ b/GSWeb.framework/GSWRepetition.m @@ -1,6 +1,6 @@ /** GSWRepetition.m - GSWeb: Class GSWRepetition - Copyright (C) 1999-2003 Free Software Foundation, Inc. + Copyright (C) 1999-2004 Free Software Foundation, Inc. Written by: Manuel Guesdon Date: Jan 1999 @@ -121,11 +121,11 @@ RCS_ID("$Id$") } //-------------------------------------------------------------------- --(void)setDefinitionName:(NSString*)definitionName +-(void)setDeclarationName:(NSString*)declarationName { - [super setDefinitionName:definitionName]; - if (definitionName && _childrenGroup) - [_childrenGroup setDefinitionName:[NSString stringWithFormat:@"%@-StaticGroup",definitionName]]; + [super setDeclarationName:declarationName]; + if (declarationName && _childrenGroup) + [_childrenGroup setDeclarationName:[NSString stringWithFormat:@"%@-StaticGroup",declarationName]]; }; //--------------------------------------------------------------------