diff --git a/GSWeb.framework/GSWComponentContent.m b/GSWeb.framework/GSWComponentContent.m
index 653966a..44a64f8 100644
--- a/GSWeb.framework/GSWComponentContent.m
+++ b/GSWeb.framework/GSWComponentContent.m
@@ -1,6 +1,6 @@
/** GSWComponentContent.m - GSWeb: Class GSWComponentContent
- Copyright (C) 1999-2003 Free Software Foundation, Inc.
+ Copyright (C) 1999-2004 Free Software Foundation, Inc.
Written by: Manuel Guesdon
Date: Jan 1999
@@ -50,8 +50,8 @@ RCS_ID("$Id$")
int elementsNb=[(GSWElementIDString*)[aContext elementID]elementsNb];
#endif
LOGObjectFnStart();
- NSDebugMLLog(@"gswdync",@"ET=%@ defName=%@ id=%@",
- [self class],[self definitionName],[aContext elementID]);
+ NSDebugMLLog(@"gswdync",@"ET=%@ declarationName=%@ id=%@",
+ [self class],[self declarationName],[aContext elementID]);
GSWSaveAppendToResponseElementID(aContext);//Debug Only
component=[aContext component];
childTemplate=[component _childTemplate];
@@ -60,8 +60,8 @@ RCS_ID("$Id$")
[childTemplate appendToResponse:response
inContext:aContext];
[aContext _setCurrentComponent:component];
- NSDebugMLLog(@"gswdync",@"END ET=%@ defName=%@ id=%@",
- [self class],[self definitionName],[aContext elementID]);
+ NSDebugMLLog(@"gswdync",@"END ET=%@ declarationName=%@ id=%@",
+ [self class],[self declarationName],[aContext elementID]);
#ifndef NDEBBUG
NSAssert(elementsNb==[(GSWElementIDString*)[aContext elementID]elementsNb],
@"GSWComponentContent appendToResponse: bad elementID");
@@ -82,8 +82,8 @@ RCS_ID("$Id$")
int elementsNb=[(GSWElementIDString*)[aContext elementID]elementsNb];
#endif
LOGObjectFnStart();
- NSDebugMLLog(@"gswdync",@"ET=%@ defName=%@ id=%@",
- [self class],[self definitionName],[aContext elementID]);
+ NSDebugMLLog(@"gswdync",@"ET=%@ declarationName=%@ id=%@",
+ [self class],[self declarationName],[aContext elementID]);
component=[aContext component];
NSDebugMLLog(@"gswdync",@"component=%@",component);
childTemplate=[component _childTemplate];
@@ -99,8 +99,8 @@ RCS_ID("$Id$")
[element class],
element);
[aContext _setCurrentComponent:component];
- NSDebugMLLog(@"gswdync",@"END ET=%@ defName=%@ id=%@",
- [self class],[self definitionName],[aContext elementID]);
+ NSDebugMLLog(@"gswdync",@"END ET=%@ declarationName=%@ id=%@",
+ [self class],[self declarationName],[aContext elementID]);
#ifndef NDEBBUG
NSAssert(elementsNb==[(GSWElementIDString*)[aContext elementID]elementsNb],
@"GSWComponentContent invokeActionForRequest: bad elementID");
@@ -121,8 +121,8 @@ RCS_ID("$Id$")
int elementsNb=[(GSWElementIDString*)[aContext elementID]elementsNb];
#endif
LOGObjectFnStart();
- NSDebugMLLog(@"gswdync",@"ET=%@ defName=%@ id=%@",
- [self class],[self definitionName],[aContext elementID]);
+ NSDebugMLLog(@"gswdync",@"ET=%@ declarationName=%@ id=%@",
+ [self class],[self declarationName],[aContext elementID]);
GSWAssertCorrectElementID(aContext);// Debug Only
component=[aContext component];
childTemplate=[component _childTemplate];
@@ -131,8 +131,8 @@ RCS_ID("$Id$")
[childTemplate takeValuesFromRequest:request
inContext:aContext];
[aContext _setCurrentComponent:component];
- NSDebugMLLog(@"gswdync",@"END ET=%@ defName=%@ id=%@",
- [self class],[self definitionName],[aContext elementID]);
+ NSDebugMLLog(@"gswdync",@"END ET=%@ declarationName=%@ id=%@",
+ [self class],[self declarationName],[aContext elementID]);
#ifndef NDEBBUG
NSAssert(elementsNb==[(GSWElementIDString*)[aContext elementID]elementsNb],
@"GSWComponentContent takeValuesFromRequest: bad elementID");
diff --git a/GSWeb.framework/GSWComponentReference.m b/GSWeb.framework/GSWComponentReference.m
index 313b1f4..ab12970 100644
--- a/GSWeb.framework/GSWComponentReference.m
+++ b/GSWeb.framework/GSWComponentReference.m
@@ -1,6 +1,6 @@
/* GSWComponentReference.m - GSWeb: Class GSWComponentReference
- Copyright (C) 1999-2003 Free Software Foundation, Inc.
+ Copyright (C) 1999-2004 Free Software Foundation, Inc.
Written by: Manuel Guesdon
Date: Jan 1999
@@ -215,8 +215,8 @@ RCS_ID("$Id$")
LOGObjectFnStart();
GSWStartElement(context);
GSWSaveAppendToResponseElementID(context);
- [response appendDebugCommentContentString:[NSString stringWithFormat:@"defName=%@ ID=%@ name=%@",
- [self definitionName],
+ [response appendDebugCommentContentString:[NSString stringWithFormat:@"declarationName=%@ ID=%@ name=%@",
+ [self declarationName],
[context elementID],
_name]];
componentPrev=[context component];
diff --git a/GSWeb.framework/GSWContext.m b/GSWeb.framework/GSWContext.m
index 484904e..87f9955 100644
--- a/GSWeb.framework/GSWContext.m
+++ b/GSWeb.framework/GSWContext.m
@@ -1,6 +1,6 @@
/** GSWContext.m - GSWeb: Class GSWContext
- Copyright (C) 1999-2003 Free Software Foundation, Inc.
+ Copyright (C) 1999-2004 Free Software Foundation, Inc.
Written by: Manuel Guesdon
Date: Jan 1999
@@ -335,12 +335,12 @@ static int dontTraceComponentActionURL=0;
_docStructureElements=[NSMutableSet new];
memset(ptab,'\t',elementIDNb);
ptab[elementIDNb]='\0';
- string=[NSString stringWithFormat:@"%s %@ Element %p Class %@ defName=%@\n",
+ string=[NSString stringWithFormat:@"%s %@ Element %p Class %@ declarationName=%@\n",
ptab,
[self elementID],
element,
[element class],
- [element definitionName]];
+ [element declarationName]];
if (![_docStructureElements containsObject:string])
{
[_docStructure appendString:string];
diff --git a/GSWeb.framework/GSWElement.m b/GSWeb.framework/GSWElement.m
index 8dc7b61..271dcfd 100644
--- a/GSWeb.framework/GSWElement.m
+++ b/GSWeb.framework/GSWElement.m
@@ -1,6 +1,6 @@
/** GSWElement.m - GSWeb: Class GSWElement
- Copyright (C) 1999-2003 Free Software Foundation, Inc.
+ Copyright (C) 1999-2004 Free Software Foundation, Inc.
Written by: Manuel Guesdon
Date: Jan 1999
@@ -176,13 +176,6 @@ BYTE ElementsMap_attributeElement = (BYTE)0x41;
return _declarationName;
};
-//--------------------------------------------------------------------
-//TODO: obsolete: remove it
--(NSString*)definitionName
-{
- return _declarationName;
-};
-
//--------------------------------------------------------------------
-(void)setDeclarationName:(NSString*)declarationName
{
diff --git a/GSWeb.framework/GSWForm.m b/GSWeb.framework/GSWForm.m
index 7563710..cf31ba9 100644
--- a/GSWeb.framework/GSWForm.m
+++ b/GSWeb.framework/GSWForm.m
@@ -262,8 +262,8 @@ RCS_ID("$Id$")
LOGObjectFnStartC("GSWForm");
GSWStartElement(context);
GSWSaveAppendToResponseElementID(context);
- [response appendDebugCommentContentString:[NSString stringWithFormat:@"defName=%@ ID=%@",
- [self definitionName],
+ [response appendDebugCommentContentString:[NSString stringWithFormat:@"declarationName=%@ ID=%@",
+ [self declarationName],
[context elementID]]];
if (!WOStrictFlag)
@@ -322,9 +322,9 @@ RCS_ID("$Id$")
if ([self prefixMatchSenderIDInContext:context]) //Avoid trying to find action if we are not the good component
{
isFormSubmited=[elementID isEqualToString:senderID];
- NSDebugMLLog(@"gswdync",@"ET=%@ defName=%@ \n id=%@ \nsenderId=%@ \nisFormSubmited=%s",
+ NSDebugMLLog(@"gswdync",@"ET=%@ declarationName=%@ \n id=%@ \nsenderId=%@ \nisFormSubmited=%s",
[self class],
- [self definitionName],
+ [self declarationName],
elementID,
senderID,
(isFormSubmited ? "YES" : "NO"));
@@ -337,9 +337,9 @@ RCS_ID("$Id$")
[context _setFormSubmitted:YES];
multipleSubmitValue=[self evaluateCondition:_multipleSubmit
inContext:context];
- NSDebugMLLog(@"gswdync",@"ET=%@ defName=%@ \n id=%@ \nsenderId=%@ \nmultipleSubmit=%s",
+ NSDebugMLLog(@"gswdync",@"ET=%@ declarationName=%@ \n id=%@ \nsenderId=%@ \nmultipleSubmit=%s",
[self class],
- [self definitionName],
+ [self declarationName],
elementID,
senderID,
(multipleSubmitValue ? "YES" : "NO"));
@@ -360,9 +360,9 @@ RCS_ID("$Id$")
if (isFormSubmited)
{
- NSDebugMLLog(@"gswdync",@"ET=%@ defName=%@ \n id=%@ \nsenderId=%@ \nmultipleSubmit=%s \n[context _wasActionInvoked]=%d",
+ NSDebugMLLog(@"gswdync",@"ET=%@ declarationName=%@ \n id=%@ \nsenderId=%@ \nmultipleSubmit=%s \n[context _wasActionInvoked]=%d",
[self class],
- [self definitionName],
+ [self declarationName],
elementID,
senderID,
(multipleSubmitValue ? "YES" : "NO"),
@@ -402,9 +402,9 @@ RCS_ID("$Id$")
if (![context _wasActionInvoked] && [elementID isSearchOverForSenderID:senderID])
{
- LOGError(@"Action not invoked at the end of %@ (def name=%@) (id=%@) senderId=%@",
+ LOGError(@"Action not invoked at the end of %@ (declarationName=%@) (id=%@) senderId=%@",
[self class],
- [self definitionName],
+ [self declarationName],
elementID,
senderID);
};
diff --git a/GSWeb.framework/GSWHyperlink.m b/GSWeb.framework/GSWHyperlink.m
index b8c2e35..6d3ca10 100644
--- a/GSWeb.framework/GSWHyperlink.m
+++ b/GSWeb.framework/GSWHyperlink.m
@@ -1,6 +1,6 @@
/** GSWHyperlink.m - GSWeb: Class GSWHyperlink
- Copyright (C) 1999-2003 Free Software Foundation, Inc.
+ Copyright (C) 1999-2004 Free Software Foundation, Inc.
Written by: Manuel Guesdon
Date: Jan 1999
@@ -796,8 +796,8 @@ RCS_ID("$Id$")
NSDebugMLLog(@"gswdync",@"GSWHTMLURLValuedElement invoke element=%@",element);
NSDebugMLLog(@"gswdync",@"senderID=%@",[context senderID]);
NSDebugMLLog(@"gswdync",@"elementID=%@",[context elementID]);
- NSDebugMLLog(@"gswdync",@"END ET=%@ definition name=%@ id=%@",
- [self class],[self definitionName],[context elementID]);
+ NSDebugMLLog(@"gswdync",@"END ET=%@ declarationName=%@ id=%@",
+ [self class],[self declarationName],[context elementID]);
#ifndef NDEBBUG
NSAssert(elementsNb==[(GSWElementIDString*)[context elementID]elementsNb],@"GSWHyperlink invokeActionForRequest: bad elementID");
#endif
diff --git a/GSWeb.framework/GSWImageButton.m b/GSWeb.framework/GSWImageButton.m
index 438c644..275c721 100644
--- a/GSWeb.framework/GSWImageButton.m
+++ b/GSWeb.framework/GSWImageButton.m
@@ -228,8 +228,8 @@ RCS_ID("$Id$")
[response _appendContentAsciiString:@" type=image"];
name=[self nameInContext:context];
- NSDebugMLLog(@"gswdync",@"definition name=%@ name=%@",
- [self definitionName],name);
+ NSDebugMLLog(@"gswdync",@"declarationName=%@ name=%@",
+ [self declarationName],name);
[response _appendContentAsciiString:@" name=\""];
[response appendContentHTMLAttributeValue:name];
@@ -415,8 +415,8 @@ RCS_ID("$Id$")
senderID=[context senderID];
NSDebugMLog(@"senderID=%@",senderID);
elementID=[context elementID];
- NSDebugMLog(@"definition name=%@ elementID=%@",
- [self definitionName],elementID);
+ NSDebugMLog(@"declarationName=%@ elementID=%@",
+ [self declarationName],elementID);
if ([elementID isEqualToString:senderID])
{
//TODO
diff --git a/GSWeb.framework/GSWSwitchComponent.m b/GSWeb.framework/GSWSwitchComponent.m
index 23e9fb3..63546cf 100644
--- a/GSWeb.framework/GSWSwitchComponent.m
+++ b/GSWeb.framework/GSWSwitchComponent.m
@@ -1,6 +1,6 @@
/** GSWSwitchComponent.m - GSWeb: Class GSWSwitchComponent
- Copyright (C) 1999-2003 Free Software Foundation, Inc.
+ Copyright (C) 1999-2004 Free Software Foundation, Inc.
Written by: Manuel Guesdon
Date: Jan 1999
@@ -49,34 +49,34 @@ RCS_ID("$Id$")
template:nil]))
{
NSMutableDictionary* tmpAssociations=[NSMutableDictionary dictionaryWithDictionary:associations];
- NSDebugMLLog(@"gswdync",@"GSWSwitchComponent %p (defName=%@): tmpAssociations=%@",
- self,[self definitionName],tmpAssociations);
- NSDebugMLLog(@"gswdync",@"GSWSwitchComponent %p (defName=%@): GSWComponentName__Key=%@",
- self,[self definitionName],GSWComponentName__Key[GSWebNamingConv]);
+ NSDebugMLLog(@"gswdync",@"GSWSwitchComponent %p (declarationName=%@): tmpAssociations=%@",
+ self,[self declarationName],tmpAssociations);
+ NSDebugMLLog(@"gswdync",@"GSWSwitchComponent %p (declarationName=%@): GSWComponentName__Key=%@",
+ self,[self declarationName],GSWComponentName__Key[GSWebNamingConv]);
[tmpAssociations removeObjectForKey:GSWComponentName__Key[GSWebNamingConv]];
- NSDebugMLLog(@"gswdync",@"GSWSwitchComponent %p (defName=%@): componentName__Key=%@",
- self,[self definitionName],componentName__Key);
+ NSDebugMLLog(@"gswdync",@"GSWSwitchComponent %p (declarationName=%@): componentName__Key=%@",
+ self,[self declarationName],componentName__Key);
[tmpAssociations removeObjectForKey:componentName__Key];
_componentName = [[associations objectForKey:GSWComponentName__Key[GSWebNamingConv]
withDefaultObject:[_componentName autorelease]] retain];
- NSDebugMLLog(@"gswdync",@"GSWSwitchComponent %p (defName=%@): componentName=%@",
- self,[self definitionName],_componentName);
+ NSDebugMLLog(@"gswdync",@"GSWSwitchComponent %p (declarationName=%@): componentName=%@",
+ self,[self declarationName],_componentName);
if (!_componentName)
{
_componentName = [[associations objectForKey:componentName__Key
withDefaultObject:[_componentName autorelease]] retain];
- NSDebugMLLog(@"gswdync",@"GSWSwitchComponent %p (defName=%@): componentName=%@",
- self,[self definitionName],_componentName);
+ NSDebugMLLog(@"gswdync",@"GSWSwitchComponent %p (declarationName=%@): componentName=%@",
+ self,[self declarationName],_componentName);
}
ASSIGN(_componentAttributes,[NSDictionary dictionaryWithDictionary:tmpAssociations]);
- NSDebugMLLog(@"gswdync",@"GSWSwitchComponent %p (defName=%@): componentAttributes=%@",
- self,[self definitionName],_componentAttributes);
+ NSDebugMLLog(@"gswdync",@"GSWSwitchComponent %p (declarationName=%@): componentAttributes=%@",
+ self,[self declarationName],_componentAttributes);
ASSIGN(_template,templateElement);
- NSDebugMLLog(@"gswdync",@"GSWSwitchComponent %p (defName=%@): template=%@",
- self,[self definitionName],_template);
+ NSDebugMLLog(@"gswdync",@"GSWSwitchComponent %p (declarationName=%@): template=%@",
+ self,[self declarationName],_template);
_componentCache=[NSMutableDictionary new];
};
@@ -193,13 +193,13 @@ if the component has already been created, it get it from the cache; otherwise,
GSWComponent* component=nil;
LOGObjectFnStartC("GSWSwitchComponent");
component=[aContext component];
- NSDebugMLLog(@"gswdync",@"GSWSwitchComponent %p (defName=%@): componentName=%@ parent=%@",
- self,[self definitionName],_componentName,[component parent]);
+ NSDebugMLLog(@"gswdync",@"GSWSwitchComponent %p (declarationName=%@): componentName=%@ parent=%@",
+ self,[self declarationName],_componentName,[component parent]);
if ([aName length]==0)
{
ExceptionRaise(@"GSWSwitchComponent",
- @"ComponentName is null. componentNameKey='%@' definitionName=%@ currentComponentName=%@",
- _componentName,[self definitionName],[component name]);
+ @"ComponentName is null. componentNameKey='%@' declarationName=%@ currentComponentName=%@",
+ _componentName,[self declarationName],[component name]);
}
else
{
@@ -219,8 +219,8 @@ if the component has already been created, it get it from the cache; otherwise,
else
{
ExceptionRaise(@"GSWSwitchComponent",
- @"GSWSwitchComponent %p (defName=%@): Creation failed for element named:%@",
- self,[self definitionName],aName);
+ @"GSWSwitchComponent %p (declarationName=%@): Creation failed for element named:%@",
+ self,[self declarationName],aName);
};
};
};
@@ -236,11 +236,11 @@ if the component has already been created, it get it from the cache; otherwise,
NSString* componentNameValue=nil;
LOGObjectFnStartC("GSWSwitchComponent");
component=[aContext component];
- NSDebugMLLog(@"gswdync",@"GSWSwitchComponent %p (defName=%@): componentName=%@",
- self,[self definitionName],_componentName);
+ NSDebugMLLog(@"gswdync",@"GSWSwitchComponent %p (declarationName=%@): componentName=%@",
+ self,[self declarationName],_componentName);
componentNameValue=[_componentName valueInComponent:component];
- NSDebugMLLog(@"gswdync",@"GSWSwitchComponent %p (defName=%@): componentNameValue=%@",
- self,[self definitionName],componentNameValue);
+ NSDebugMLLog(@"gswdync",@"GSWSwitchComponent %p (declarationName=%@): componentNameValue=%@",
+ self,[self declarationName],componentNameValue);
LOGObjectFnStopC("GSWSwitchComponent");
return componentNameValue;
};