gnustep/libs-gsweb
0
0
Fork 0
mirror of https://github.com/gnustep/libs-gsweb.git synced 2025-06-01 09:31:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

* GSWeb.framework/GSWElement.h/.m:

Browse source 
o renamed definitionName to declarationName


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gsweb/trunk@18902 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
mguesdon 2004-03-25 08:33:43 +00:00
parent 1664296447
commit e8ae4eaa6b
2 changed files with 29 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

8
GSWeb.framework/GSWElement.h
View file

@ -1,6 +1,6 @@
/** GSWElement.h - <title>GSWeb: Class GSWElement</title> /** GSWElement.h - <title>GSWeb: Class GSWElement</title>
Copyright (C) 1999-2002 Free Software Foundation, Inc. Copyright (C) 1999-2004 Free Software Foundation, Inc.
Written by: Manuel Guesdon <mguesdon@orange-concept.com> Written by: Manuel Guesdon <mguesdon@orange-concept.com>
Date: Jan 1999 Date: Jan 1999
@ -43,7 +43,7 @@ extern BYTE ElementsMap_attributeElement;
#ifndef NDEBBUG #ifndef NDEBBUG
{ {
NSString* _appendToResponseElementID; NSString* _appendToResponseElementID;
NSString* _definitionName; // Name of element in def file (.gswd) - Mainly for debugging purpose NSString* _declarationName; // Name of element in def file (.gswd) - Mainly for debugging purpose
}; };
#endif #endif
@ -65,8 +65,8 @@ extern BYTE ElementsMap_attributeElement;
stopFlag:(BOOL)stop; stopFlag:(BOOL)stop;
#endif #endif
-(NSString*)definitionName; -(NSString*)declarationName;
-(void)setDefinitionName:(NSString*)definitionName; -(void)setDeclarationName:(NSString*)declarationName;
@end @end
#ifdef NDEBBUG #ifdef NDEBBUG

43
GSWeb.framework/GSWElement.m
View file

@ -52,9 +52,9 @@ BYTE ElementsMap_attributeElement = (BYTE)0x41;
elementID=[context elementID]; elementID=[context elementID];
/* if ([elementID length]==0) /* if ([elementID length]==0)
elementID=@"MARKER";*/ elementID=@"MARKER";*/
NSDebugMLLog(@"GSWElement",@"self=%p definitionName=%@ elementID=%@ %p",self,[self definitionName],elementID,elementID); NSDebugMLLog(@"GSWElement",@"self=%p declarationName=%@ elementID=%@ %p",self,[self declarationName],elementID,elementID);
ASSIGNCOPY(_appendToResponseElementID,elementID); ASSIGNCOPY(_appendToResponseElementID,elementID);
NSDebugMLLog(@"GSWElement",@"self=%p definitionName=%@ _appendToResponseElementID=%@ %p",self,[self definitionName],_appendToResponseElementID,_appendToResponseElementID); NSDebugMLLog(@"GSWElement",@"self=%p declarationName=%@ _appendToResponseElementID=%@ %p",self,[self declarationName],_appendToResponseElementID,_appendToResponseElementID);
GSWAssertIsElementID(context); GSWAssertIsElementID(context);
LOGObjectFnStopC("GSWElement"); LOGObjectFnStopC("GSWElement");
}; };
@ -87,10 +87,10 @@ BYTE ElementsMap_attributeElement = (BYTE)0x41;
}; };
if (!OK && ![context isInLoop]) if (!OK && ![context isInLoop])
{ {
NSString* msg=[NSString stringWithFormat:@"In Object %p Class %@ definitionName=%@ (file %s line %d), id '%@' (%p) in %@ is not the same than in appendToResponse '%@' (%p)", NSString* msg=[NSString stringWithFormat:@"In Object %p Class %@ declarationName=%@ (file %s line %d), id '%@' (%p) in %@ is not the same than in appendToResponse '%@' (%p)",
self, self,
[self class], [self class],
[self definitionName], [self declarationName],
file, file,
line, line,
[context elementID], [context elementID],
@ -112,17 +112,17 @@ BYTE ElementsMap_attributeElement = (BYTE)0x41;
line:(int)line line:(int)line
{ {
LOGObjectFnStartC("GSWElement"); LOGObjectFnStartC("GSWElement");
/* NSDebugMLLog(@"GSWElement",@"self=%p definitionName=%@ _appendToResponseElementID=%@ %p / [context elementID]=%@", /* NSDebugMLLog(@"GSWElement",@"self=%p declarationName=%@ _appendToResponseElementID=%@ %p / [context elementID]=%@",
self, self,
[self definitionName], [self declarationName],
_appendToResponseElementID,_appendToResponseElementID,[context elementID]); _appendToResponseElementID,_appendToResponseElementID,[context elementID]);
*/ */
if (_appendToResponseElementID && [_appendToResponseElementID length]==0 && [[context elementID] length]>0) if (_appendToResponseElementID && [_appendToResponseElementID length]==0 && [[context elementID] length]>0)
{ {
NSString* msg=[NSString stringWithFormat:@"In Object %p Class %@ definitionName=%@ (file %s line %d), in %@ _appendToResponseElementID '%@' (%p) is not set", NSString* msg=[NSString stringWithFormat:@"In Object %p Class %@ declarationName=%@ (file %s line %d), in %@ _appendToResponseElementID '%@' (%p) is not set",
self, self,
[self class], [self class],
[self definitionName], [self declarationName],
file, file,
line, line,
NSStringFromSelector(method), NSStringFromSelector(method),
@ -149,7 +149,7 @@ BYTE ElementsMap_attributeElement = (BYTE)0x41;
(start ? "START" : (stop ? "STOP" : "")), (start ? "START" : (stop ? "STOP" : "")),
self, self,
[self class], [self class],
[self definitionName], [self declarationName],
[context elementID], [context elementID],
_appendToResponseElementID, _appendToResponseElementID,
(senderID ? "senderID:" : ""), (senderID ? "senderID:" : ""),
@ -164,26 +164,33 @@ BYTE ElementsMap_attributeElement = (BYTE)0x41;
GSWLogAssertGood(self); GSWLogAssertGood(self);
GSWLogC("Dealloc GSWElement"); GSWLogC("Dealloc GSWElement");
GSWLogC("Dealloc GSWElement: name"); GSWLogC("Dealloc GSWElement: name");
DESTROY(_definitionName); DESTROY(_declarationName);
GSWLogC("Dealloc GSWElement Super"); GSWLogC("Dealloc GSWElement Super");
[super dealloc]; [super dealloc];
GSWLogC("End Dealloc GSWElement"); GSWLogC("End Dealloc GSWElement");
} }
//-------------------------------------------------------------------- //--------------------------------------------------------------------
-(NSString*)definitionName -(NSString*)declarationName
{ {
return _definitionName; return _declarationName;
}; };
//-------------------------------------------------------------------- //--------------------------------------------------------------------
-(void)setDefinitionName:(NSString*)definitionName //TODO: obsolete: remove it
-(NSString*)definitionName
{ {
NSDebugMLLog(@"gswdync",@"setDefinitionName1 in %p: %p %@", return _declarationName;
self,definitionName,definitionName); };
ASSIGN(_definitionName,definitionName);
NSDebugMLLog(@"gswdync",@"setDefinitionName2 in %p: %p %@", //--------------------------------------------------------------------
self,_definitionName,_definitionName); -(void)setDeclarationName:(NSString*)declarationName
{
NSDebugMLLog(@"gswdync",@"setDeclarationName1 in %p: %p %@",
self,declarationName,declarationName);
ASSIGN(_declarationName,declarationName);
NSDebugMLLog(@"gswdync",@"setDeclarationName2 in %p: %p %@",
self,_declarationName,_declarationName);
}; };
@end @end