2002-05-16 Manuel Guesdon <mguesdon@orange-concept.com>

* GSWeb.framework/GSWTextField.m:
		o added warning in _isFormattedValueInComponent:equalToFormattedValue:
		o added warning in takeValuesFromRequest:inContext:
	* GSWeb.framework/GSWPopUpButton.m
		o added ElementID debugging methods
		o added DocStructure debugging features
	* GSWeb.framework/GSWSwitchComponent.m
		o added ElementID debugging methods
		o added DocStructure debugging features
	* GSWeb.framework/GSWRepetition.m
		o added ElementID debugging methods
		o added DocStructure debugging features
		o param names changes to conform to coding standards
	* GSWeb.framework/GSWComponentContent.m
		o added ElementID debugging methods
		o added DocStructure debugging features
	* GSWeb.framework/GSWComponentReference.m:
		o added ElementID debugging methods
		o added DocStructure debugging features
		o ivar names changes to conform to coding standards
		o logs
	* GSWeb.framework/GSWElement.m:
		o added ElementID debugging methods
		o added DocStructure debugging features
		o logs
	* GSWeb.framework/GSWElement.h
		o added ElementID debugging
	* GSWeb.framework/GSWForm.m:
		o added ElementID debugging
		o added DocStructure debugging features
		o logs
	* GSWeb.framework/GSWHTMLDynamicElement.m:
		o ivar names changes to conform to coding standards
		o added ElementID debugging
		o added DocStructure debugging features
	* GSWeb.framework/GSWConditional.m:
		o added ElementID debugging
		o added DocStructure debugging features
		o ivar names changes to conform to coding standards
	* GSWeb.framework/GSWConditional.h.
		o ivar names changes to conform to coding standards
	* GSWeb.framework/GSWRepetition.h.
		o param names changes to conform to coding standards
	* GSWeb.framework/GSWReset.m:
		o ivar names changes to conform to coding standards
		o added ElementID debugging
		o added DocStructure debugging features
	* GSWeb.framework/GSWReset.h.
		o ivar names changes to conform to coding standards
	* GSWeb.framework/GSWResponse.h/.m:
		o added DocStructure debugging features
	* GSWeb.framework/GSWContext.h/.m:
		o added DocStructure debugging features
	* GSWeb.framework/GSWSession.m:
		o added DocStructure debugging features
	* GSWeb.framework/GSWTemplateParserXML.m
		o logs
	* GSWeb.framework/GSWTemplateParser.m
		o logs
	* GSWeb.framework/GSWDisplayGroup.m:
		o corrected insertion bugs
		o added -insertAfterLastObject
		o added -selectFirst
	* GSWeb.framework/GSWDisplayGroup.h:
		o added -insertAfterLastObject
		o added -selectFirst
	* GSWeb.framework/GSWHTMLStaticElement.m
		o added ElementID debugging
		o added DocStructure debugging features
	* GSWeb.framework/GSWCheckBox.m
		o added ElementID debugging
		o added DocStructure debugging features
	* GSWeb.framework/GSWComponent.m
		o added ElementID debugging
		o added DocStructure debugging features
	* GSWeb.framework/GSWHTMLStaticGroup.m
		o added ElementID debugging
		o added DocStructure debugging features
	* GSWeb.framework/GSWTextField.m
		o added ElementID debugging
		o added DocStructure debugging features
	* GSWeb.framework/GSWString.m
		o added ElementID debugging
		o added DocStructure debugging features
	* GSWeb.framework/GSWSubmitButton.m
		o added ElementID debugging
		o added DocStructure debugging features
	* GSWeb.framework/GSWURLValuedElementData.m/.h:
		o added ElementID debugging
		o added DocStructure debugging features
		o ivar names changes to conform to coding standards
	* GSWeb.framework/GSWRadioButton.m
		o added ElementID debugging
		o added DocStructure debugging features
	* GSWeb.framework/GSWInput.m
		o added ElementID debugging
		o added DocStructure debugging features
		o logs
	* GSWeb.framework/GSWHyperlink.m
		o added ElementID debugging
		o added DocStructure debugging features
	* GSWeb.framework/GSWFileUpload.m
		o added ElementID debugging
		o added DocStructure debugging features


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gsweb/trunk@13661 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
mguesdon 2002-05-16 18:01:40 +00:00
parent fd60ac7071
commit c576f5a730
45 changed files with 1807 additions and 1282 deletions

View file

@ -1,11 +1,18 @@
/* GSWComponentReference.m - GSWeb: Class GSWComponentReference
Copyright (C) 1999 Free Software Foundation, Inc.
/* GSWComponentReference.m - <title>GSWeb: Class GSWComponentReference</title>
Copyright (C) 1999-2002 Free Software Foundation, Inc.
Written by: Manuel Guesdon <mguesdon@sbuilders.com>
Written by: Manuel Guesdon <mguesdon@orange-concept.com>
Date: Jan 1999
This file is part of the GNUstep Web Library.
$Revision$
$Date$
<abstract></abstract>
This file is part of the GNUstep Web Library.
<license>
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
License as published by the Free Software Foundation; either
@ -19,7 +26,8 @@
You should have received a copy of the GNU Library General Public
License along with this library; if not, write to the Free
Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
</license>
**/
static char rcsId[] = "$Id$";
@ -29,28 +37,28 @@ static char rcsId[] = "$Id$";
@implementation GSWComponentReference
//--------------------------------------------------------------------
-(id)initWithName:(NSString*)name_
associations:(NSDictionary*)associations_
-(id)initWithName:(NSString*)aName
associations:(NSDictionary*)associations
{
LOGObjectFnStart();
//OK
NSDebugMLLog(@"gswdync",@"name:%@",name);
NSDebugMLLog(@"gswdync",@"associations_:%@",associations_);
if ((self==[super initWithName:name_
associations:associations_
NSDebugMLLog(@"gswdync",@"aName:%@",aName);
NSDebugMLLog(@"gswdync",@"associations:%@",associations);
if ((self==[super initWithName:aName
associations:associations
template:nil]))
{
ASSIGN(name,name_);
if (associations_ && [associations_ count])
ASSIGN(_name,aName);
if (associations && [associations count])
{
NSMutableArray* tmpArray=[NSMutableArray array];
int i=0;
ASSIGN(associationsKeys,[associations_ allKeys]);
for(i=0;i<[associationsKeys count];i++)
ASSIGN(_associationsKeys,[associations allKeys]);
for(i=0;i<[_associationsKeys count];i++)
{
[tmpArray addObject:[associations_ objectForKey:[associationsKeys objectAtIndex:i]]];
[tmpArray addObject:[associations objectForKey:[_associationsKeys objectAtIndex:i]]];
};
ASSIGN(associations,[NSArray arrayWithArray:tmpArray]);
ASSIGN(_associations,[NSArray arrayWithArray:tmpArray]);
};
};
LOGObjectFnStop();
@ -58,19 +66,19 @@ static char rcsId[] = "$Id$";
};
//--------------------------------------------------------------------
-(id)initWithName:(NSString*)name_
associations:(NSDictionary*)associations_
template:(GSWElement*)_template
-(id)initWithName:(NSString*)aName
associations:(NSDictionary*)associations
template:(GSWElement*)template
{
LOGObjectFnStart();
NSDebugMLLog(@"gswdync",@"name:%@",name);
NSDebugMLLog(@"gswdync",@"associations_:%@",associations_);
NSDebugMLLog(@"gswdync",@"_template:%@",_template);
if ((self==[self initWithName:name_
associations:associations_]))
{
ASSIGN(contentElement,_template);
};
NSDebugMLLog(@"gswdync",@"aName:%@",aName);
NSDebugMLLog(@"gswdync",@"associations:%@",associations);
NSDebugMLLog(@"gswdync",@"template:%@",template);
if ((self==[self initWithName:aName
associations:associations]))
{
ASSIGN(_contentElement,template);
};
LOGObjectFnStop();
return self;
};
@ -80,13 +88,13 @@ static char rcsId[] = "$Id$";
{
GSWLogC("Dealloc GSWComponentReference");
GSWLogC("Destroy name");
DESTROY(name);
DESTROY(_name);
GSWLogC("Destroy associationsKeys");
DESTROY(associationsKeys);
DESTROY(_associationsKeys);
GSWLogC("Destroy associations");
DESTROY(associations);
DESTROY(_associations);
GSWLogC("Destroy contentElement");
DESTROY(contentElement);
DESTROY(_contentElement);
GSWLogC("Dealloc GSWComponentReference Super");
[super dealloc];
GSWLogC("End Dealloc GSWComponentReference");
@ -96,91 +104,93 @@ static char rcsId[] = "$Id$";
-(NSString*)description
{
return [NSString stringWithFormat:@"<%@ %p name:%@ associationsKeys:%@ associations:%@ contentElement:%@>",
[self class],
(void*)self,
name,
associationsKeys,
associations,
contentElement];
[self class],
(void*)self,
_name,
_associationsKeys,
_associations,
_contentElement];
};
@end
//====================================================================
@implementation GSWComponentReference (GSWComponentReferenceA)
-(void)popRefComponentInContext:(GSWContext*)_context
-(void)popRefComponentInContext:(GSWContext*)context
{
//OK
GSWComponent* _subComponent=nil;
GSWComponent* _component=nil;
GSWComponent* subComponent=nil;
GSWComponent* component=nil;
LOGObjectFnStart();
_subComponent=[_context component];
_component=[_subComponent parent];
[_subComponent synchronizeComponentToParent];
[_context _setCurrentComponent:_component];
subComponent=[context component];
component=[subComponent parent];
[subComponent synchronizeComponentToParent];
[context _setCurrentComponent:component];
LOGObjectFnStop();
};
//--------------------------------------------------------------------
-(void)pushRefComponentInContext:(GSWContext*)_context
-(void)pushRefComponentInContext:(GSWContext*)context
{
//OK
GSWComponent* _subComponent=nil;
GSWComponentDefinition* _subComponentDefinition=nil;
GSWComponent* _component=nil;
NSString* _elementID=nil;
GSWComponent* subComponent=nil;
GSWComponentDefinition* subComponentDefinition=nil;
GSWComponent* component=nil;
NSString* elementID=nil;
LOGObjectFnStart();
_component=[_context component];
_elementID=[_context elementID];
NSDebugMLLog(@"gswdync",@"_elementID:%@",_elementID);
_subComponent=[_component subComponentForElementID:_elementID];
NSDebugMLLog(@"gswdync",@"_subComponent:%@",_subComponent);
if (!_subComponent)
{
NSArray* _languages=[_context languages];
NSDebugMLLog(@"gswdync",@"name:%@",name);
NSDebugMLLog(@"gswdync",@"pushRefComponentInContext comporef=%p parent=%p",
(void*)self,
(void*)_component);
_subComponentDefinition=[GSWApp componentDefinitionWithName:name
languages:_languages];
NSDebugMLLog(@"gswdync",@"_subComponentDefinition=%@",_subComponentDefinition);
if (_subComponentDefinition)
{
_subComponent=[_subComponentDefinition componentInstanceInContext:_context];
NSDebugMLLog(@"gswdync",@"_subComponent:%@",_subComponent);
if (_subComponent)
{
NSDebugMLLog(@"gswdync",@"SETPARENT comporef=%p parent=%p component=%p",
(void*)self,
(void*)_component,
(void*)_subComponent);
[_subComponent setParent:_component
associationsKeys:associationsKeys
associations:associations
template:contentElement];
}
else
{
ExceptionRaise(@"GSWComponentReference: subcomponent instance creation failed in '@'",name);
};
}
else
{
ExceptionRaise(@"GSWComponentReference: can't find subcomponent definition in '@'",name);
};
if (_subComponent)
{
[_component setSubComponent:_subComponent
forElementID:_elementID];
[_subComponent awakeInContext:_context];
};
};
if (_subComponent)
{
[_subComponent synchronizeParentToComponent];
};
[_context _setCurrentComponent:_subComponent];
component=[context component];
elementID=[context elementID];
NSDebugMLLog(@"gswdync",@"_elementID:%@",elementID);
subComponent=[component subComponentForElementID:elementID];
NSDebugMLLog(@"gswdync",@"subComponent:%@",subComponent);
if (!subComponent)
{
NSArray* languages=[context languages];
NSDebugMLLog(@"gswdync",@"name:%@",_name);
NSDebugMLLog(@"gswdync",@"pushRefComponentInContext comporef=%p parent=%p",
(void*)self,
(void*)component);
subComponentDefinition=[GSWApp componentDefinitionWithName:_name
languages:languages];
NSDebugMLLog(@"gswdync",@"subComponentDefinition=%@",subComponentDefinition);
if (subComponentDefinition)
{
subComponent=[subComponentDefinition componentInstanceInContext:context];
NSDebugMLLog(@"gswdync",@"subComponent:%@",subComponent);
if (subComponent)
{
NSDebugMLLog(@"gswdync",@"SETPARENT comporef=%p parent=%p component=%p",
(void*)self,
(void*)component,
(void*)subComponent);
[subComponent setParent:component
associationsKeys:_associationsKeys
associations:_associations
template:_contentElement];
}
else
{
ExceptionRaise(@"GSWComponentReference: subcomponent instance creation failed in '@'",
_name);
};
}
else
{
ExceptionRaise(@"GSWComponentReference: can't find subcomponent definition in '@'",
_name);
};
if (subComponent)
{
[component setSubComponent:subComponent
forElementID:elementID];
[subComponent awakeInContext:context];
};
};
if (subComponent)
{
[subComponent synchronizeParentToComponent];
};
[context _setCurrentComponent:subComponent];
LOGObjectFnStop();
};
@ -191,99 +201,105 @@ static char rcsId[] = "$Id$";
@implementation GSWComponentReference (GSWRequestHandling)
//--------------------------------------------------------------------
-(void)appendToResponse:(GSWResponse*)response_
inContext:(GSWContext*)context_
-(void)appendToResponse:(GSWResponse*)response
inContext:(GSWContext*)context
{
//OK
GSWComponent* _component=nil;
GSWComponent* _componentPrev=nil;
GSWComponent* component=nil;
GSWComponent* componentPrev=nil;
#ifndef NDEBBUG
int elementsNb=[(GSWElementIDString*)[context_ elementID]elementsNb];
int elementsNb=[(GSWElementIDString*)[context elementID]elementsNb];
#endif
LOGObjectFnStart();
NSDebugMLLog(@"gswdync",@"ET=%@ id=%@",[self class],[context_ elementID]);
GSWSaveAppendToResponseElementID(context_);//Debug Only
_componentPrev=[context_ component];
[self pushRefComponentInContext:context_];
if ([context_ component])
{
_component=[context_ component];
[_component appendToResponse:response_
inContext:context_];
[self popRefComponentInContext:context_];
}
GSWStartElement(context);
GSWSaveAppendToResponseElementID(context);
[response appendDebugCommentContentString:[NSString stringWithFormat:@"defName=%@ ID=%@",
[self definitionName],
[context elementID]]];
componentPrev=[context component];
[self pushRefComponentInContext:context];
if ([context component])
{
component=[context component];
[component appendToResponse:response
inContext:context];
[self popRefComponentInContext:context];
}
else
[context_ _setCurrentComponent:_componentPrev];
NSDebugMLLog(@"gswdync",@"END ET=%@ id=%@",[self class],[context_ elementID]);
[context _setCurrentComponent:componentPrev];
GSWStopElement(context);
#ifndef NDEBBUG
NSAssert(elementsNb==[(GSWElementIDString*)[context_ elementID]elementsNb],
@"GSWComponentReference appendToResponse: bad elementID");
NSAssert(elementsNb==[(GSWElementIDString*)[context elementID]elementsNb],
@"GSWComponentReference appendToResponse: bad elementID");
#endif
LOGObjectFnStop();
};
//--------------------------------------------------------------------
-(GSWElement*)invokeActionForRequest:(GSWRequest*)request_
inContext:(GSWContext*)context_
-(GSWElement*)invokeActionForRequest:(GSWRequest*)request
inContext:(GSWContext*)context
{
GSWElement* _element=nil;
GSWComponent* _component=nil;
GSWComponent* _componentPrev=nil;
GSWElement* element=nil;
GSWComponent* component=nil;
GSWComponent* componentPrev=nil;
#ifndef NDEBBUG
int elementsNb=[(GSWElementIDString*)[context_ elementID]elementsNb];
int elementsNb=[(GSWElementIDString*)[context elementID]elementsNb];
#endif
LOGObjectFnStart();
NSDebugMLLog(@"gswdync",@"ET=%@ id=%@ senderId=%@",[self class],[context_ elementID],[context_ senderID]);
_componentPrev=[context_ component];
GSWAssertCorrectElementID(context_);// Debug Only
[self pushRefComponentInContext:context_];
if ([context_ component])
{
if ([self prefixMatchSenderIDInContext:context_]) //Avoid trying to find action if we are not the good component
{
_component=[context_ component];
_element=[_component invokeActionForRequest:request_
inContext:context_];
};
[self popRefComponentInContext:context_];
}
GSWStartElement(context);
GSWAssertCorrectElementID(context);
NSDebugMLLog(@"gswdync",@"senderId=%@",[context senderID]);
componentPrev=[context component];
[self pushRefComponentInContext:context];
if ([context component])
{
if ([self prefixMatchSenderIDInContext:context]) //Avoid trying to find action if we are not the good component
{
component=[context component];
element=[component invokeActionForRequest:request
inContext:context];
};
[self popRefComponentInContext:context];
}
else
[context_ _setCurrentComponent:_componentPrev];
NSDebugMLLog(@"gswdync",@"END ET=%@ id=%@",[self class],[context_ elementID]);
[context _setCurrentComponent:componentPrev];
GSWStopElement(context);
#ifndef NDEBBUG
NSAssert(elementsNb==[(GSWElementIDString*)[context_ elementID]elementsNb],@"GSWComponentReference invokeActionForRequest: bad elementID");
NSAssert(elementsNb==[(GSWElementIDString*)[context elementID]elementsNb],
@"GSWComponentReference invokeActionForRequest: bad elementID");
#endif
LOGObjectFnStop();
return _element;
return element;
};
//--------------------------------------------------------------------
-(void)takeValuesFromRequest:(GSWRequest*)request_
inContext:(GSWContext*)context_
-(void)takeValuesFromRequest:(GSWRequest*)request
inContext:(GSWContext*)context
{
//OK
GSWComponent* _component=nil;
GSWComponent* _componentPrev=nil;
GSWComponent* component=nil;
GSWComponent* componentPrev=nil;
#ifndef NDEBBUG
int elementsNb=[(GSWElementIDString*)[context_ elementID]elementsNb];
int elementsNb=[(GSWElementIDString*)[context elementID]elementsNb];
#endif
LOGObjectFnStart();
NSDebugMLLog(@"gswdync",@"ET=%@ id=%@",[self class],[context_ elementID]);
GSWAssertCorrectElementID(context_);// Debug Only
_componentPrev=[context_ component];
[self pushRefComponentInContext:context_];
if ([context_ component])
{
_component=[context_ component];
[_component takeValuesFromRequest:request_
inContext:context_];
[self popRefComponentInContext:context_];
}
GSWStartElement(context);
GSWAssertCorrectElementID(context);
componentPrev=[context component];
[self pushRefComponentInContext:context];
if ([context component])
{
component=[context component];
[component takeValuesFromRequest:request
inContext:context];
[self popRefComponentInContext:context];
}
else
[context_ _setCurrentComponent:_componentPrev];
NSDebugMLLog(@"gswdync",@"END ET=%@ id=%@",[self class],[context_ elementID]);
[context _setCurrentComponent:componentPrev];
GSWStopElement(context);
#ifndef NDEBBUG
NSAssert(elementsNb==[(GSWElementIDString*)[context_ elementID]elementsNb],@"GSWComponentReference takeValuesFromRequest: bad elementID");
NSAssert(elementsNb==[(GSWElementIDString*)[context elementID]elementsNb],
@"GSWComponentReference takeValuesFromRequest: bad elementID");
#endif
LOGObjectFnStop();
};