+2005-05-03 Helge Hess <helge.hess@opengroupware.org>
+
+ * WOXMLMapDecoder.m: fixed a gcc 4.0 warnings, changed for the new
+ DOM implementation naming (v4.5.8)
+
2004-08-40 Helge Hess <helge.hess@opengroupware.org>
* added hack to install the project in FHS locations - the library,
-# $Id$
+# Version file
-SUBMINOR_VERSION:=7
+SUBMINOR_VERSION:=8
@implementation WOXMLMapDecoder
-- (id)initWithModel:(id)_model {
- self->model = RETAIN(_model);
+- (id)initWithModel:(WOXMLMappingModel *)_model {
+ self->model = [_model retain];
return self;
}
- (void)dealloc {
- RELEASE(self->model);
+ [self->model release];
[super dealloc];
}
+/* operations */
+
- (WOXMLMappingEntity *)defaultEntity {
return nil;
}
- (id)decodeRootObjectFromString:(NSString *)_str {
id doc;
- doc = [DOMDocument documentFromString:_str];
+ doc = [NGDOMDocument documentFromString:_str];
return [self _processDOMDocument:doc];
}
- (id)decodeRootObjectFromData:(NSData *)_data {
id doc;
- doc = [DOMDocument documentFromData:_data];
+ doc = [NGDOMDocument documentFromData:_data];
return [self _processDOMDocument:doc];
}
+2005-05-03 Helge Hess <helge.hess@opengroupware.org>
+
+ * XmlExt.subproj/DOMNode+EOQualifier.m: reworked for new DOM
+ (v4.5.159)
+
2005-04-24 Helge Hess <helge.hess@opengroupware.org>
* fixed gcc 4.0 warnings (v4.5.158)
@class NSArray;
@class EOQualifier;
-@interface DOMNode(EOQualifier)
+@interface NGDOMNode(EOQualifier)
- (NSArray *)childrenMatchingQualifier:(EOQualifier *)_qualifier;
- (NSArray *)descendantsMatchingQualifier:(EOQualifier *)_qualifier;
NGCharBuffer8 str = NULL;
str = NGMalloc(sizeof(NGCharBuffer8Struct));
str = NGCharBuffer8_init(str, strlen(_cstr) + 2);
- strcpy(str->buffer, _cstr);
+ strcpy((char *)str->buffer, _cstr);
return str;
}
len = strlen(_cstr);
NGCharBuffer8_checkCapacity(_str, len);
- strcat(_str->buffer, _cstr);
+ strcat((char *)_str->buffer, _cstr);
_str->length += len;
}
_str->buffer[0] = '\0';
}
-static inline NSString *NGCharBuffer8_makeStringAndDealloc(NGCharBuffer8 _str) {
- if (_str == NULL) {
+static inline NSString *NGCharBuffer8_makeStringAndDealloc(NGCharBuffer8 _str){
+ NSString *str;
+
+ if (_str == NULL)
return nil;
- }
- else {
- NSString *str = [NSString stringWithCString:_str->buffer length:_str->length];
- NSCAssert3(strlen(_str->buffer) == _str->length,
- @"length of cstring(%s) and the buffer do not match (%i vs %i)",
- _str->buffer, strlen(_str->buffer), _str->length);
+ str = [NSString stringWithCString:(char *)_str->buffer length:_str->length];
+ NSCAssert3(strlen((char *)_str->buffer) == _str->length,
+ @"length of cstring(%s) and the buffer do not match (%i vs %i)",
+ _str->buffer, strlen((char *)_str->buffer), _str->length);
- NGCharBuffer8_dealloc(_str); _str = NULL;
- return str;
- }
+ NGCharBuffer8_dealloc(_str); _str = NULL;
+ return str;
}
static inline void NGCharBuffer8_stripTrailingSpaces(NGCharBuffer8 _str) {
# version
-SUBMINOR_VERSION:=158
+SUBMINOR_VERSION:=159
# v4.3.115 requires libFoundation v1.0.59
# v4.2.72 requires libEOControl v4.2.39
id children;
unsigned count;
- if (![(DOMNode *)self hasChildNodes])
+ if (![(id<DOMNode>)self hasChildNodes])
return nil;
- if ((children = [(DOMNode *)self childNodes]) == nil)
+ if ((children = [(id<DOMNode>)self childNodes]) == nil)
return nil;
if ((count = [children count]) == 0) {
[_array addObject:self];
}
- if (![(DOMNode *)self hasChildNodes])
+ if (![(id<DOMNode>)self hasChildNodes])
return;
- children = [(DOMNode *)self childNodes];
+ children = [(id<DOMNode>)self childNodes];
for (i = 0, count = [children count]; i < count; i++) {
[[children objectAtIndex:i]
_addDOMDescendantsMatchingQualifier:_qualifier
@end /* NSObject(DOMNodeEOQualifier) */
-@implementation DOMNode(EOQualifier)
+@implementation NGDOMNode(EOQualifier)
- (NSArray *)childrenMatchingQualifier:(EOQualifier *)_qualifier {
return [self _domChildrenMatchingQualifier:_qualifier];
includeSelf:NO];
}
-@end /* DOMNode(EOQualifier) */
+@end /* NGDOMNode(EOQualifier) */
+2005-05-03 Helge Hess <helge.hess@opengroupware.org>
+
+ * renamed most implementations from DOMxx to NGDOMxx to avoid linking
+ issues with Tiger WebKit (still incomplete). Note that protocols are
+ still the same, so 'real' DOM apps will continue to work ;-)
+ (v4.5.15)
+
2005-04-23 Helge Hess <helge.hess@opengroupware.org>
* fixed loads of @protocol related gcc 4.0 warnings (v4.5.14)
documentElement | getDocumentElement()
*/
-@implementation DOMImplementation(JSSupport)
+@implementation NGDOMImplementation(JSSupport)
- (id)_jsfunc_createDocument:(NSArray *)_args {
NSString *nsuri = nil, *qname = nil, *doctype = nil;
return [self createDocumentType:qname publicId:pubId systemId:sysId];
}
-@end /* DOMImplementation(JSSupport) */
+@end /* NGDOMImplementation(JSSupport) */
-@implementation DOMDocument(JSSupport)
+@implementation NGDOMDocument(JSSupport)
- (id)_jsprop_doctype {
return [self doctype];
return [self createEntityReference:[[_args objectAtIndex:0] stringValue]];
}
-@end /* DOMDocument(JSSupport) */
+@end /* NGDOMDocument(JSSupport) */
-@implementation DOMNode(JSSupport)
+@implementation NGDOMNode(JSSupport)
- (NSString *)_jsprop_nodeName {
return [self nodeName];
// #warning some JS DOMNode API missing
-@end /* DOMNode(JSSupport) */
+@end /* NGDOMNode(JSSupport) */
-@implementation DOMCharacterData(JSSupport)
+@implementation NGDOMCharacterData(JSSupport)
- (void)_jsprop_data:(NSString *)_data {
_data = [_data stringValue];
return self;
}
-@end /* DOMCharacterData(JSSupport) */
+@end /* NGDOMCharacterData(JSSupport) */
-@implementation DOMAttribute(JSSupport)
+@implementation NGDOMAttribute(JSSupport)
- (NSString *)_jsprop_name {
return [self name];
return [self ownerElement];
}
-@end /* DOMAttribute(JSSupport) */
+@end /* NGDOMAttribute(JSSupport) */
-@implementation DOMElement(JSSupport)
+@implementation NGDOMElement(JSSupport)
- (NSString *)_jsprop_tagName {
return [self tagName];
namespaceURI:[[_args objectAtIndex:0] stringValue]];
}
-@end /* DOMElement(JSSupport) */
+@end /* NGDOMElement(JSSupport) */
-@implementation DOMDocumentType(JSSupport)
+@implementation NGDOMDocumentType(JSSupport)
- (NSString *)_jsprop_name {
return [self name];
return [self internalSubset];
}
-@end /* DOMDocumentType(JSSupport) */
+@end /* NGDOMDocumentType(JSSupport) */
-@implementation DOMProcessingInstruction(JSSupport)
+@implementation NGDOMProcessingInstruction(JSSupport)
- (NSString *)_jsprop_target {
return [self target];
return [self data];
}
-@end /* DOMProcessingInstruction(JSSupport) */
+@end /* NGDOMProcessingInstruction(JSSupport) */
parentNode, nextSibling, previousSibling always return nil !!!
*/
-@interface DOMAttribute : DOMNodeWithChildren < DOMAttr >
+@interface NGDOMAttribute : NGDOMNodeWithChildren < DOMAttr >
{
id element;
NSString *name;
@end
-@interface DOMAttribute(PrivateCtors)
+@interface NGDOMAttribute(PrivateCtors)
/* use DOMDocument for constructing DOMAttributes ! */
- (id)initWithName:(NSString *)_name;
@end
-@interface DOMAttribute(ObjCValues)
+@interface NGDOMAttribute(ObjCValues)
- (NSString *)stringValue;
- (int)intValue;
#include "DOMDocument.h"
#include "common.h"
-@implementation DOMAttribute
+@implementation NGDOMAttribute
- (id)initWithName:(NSString *)_name namespaceURI:(NSString *)_uri {
if ((self = [super init])) {
[self stringValue]];
}
-@end /* DOMAttribute */
-
-@implementation DOMAttribute(ObjCValues)
+/* ObjCValues */
- (NSString *)stringValue {
return [self value];
return [[self stringValue] doubleValue];
}
-@end /* DOMAttribute(Values) */
-
-@implementation DOMAttribute(QPValues)
+/* QPValues */
- (NSException *)setQueryPathValue:(id)_value {
[self setValue:[_value stringValue]];
return [self value];
}
-@end /* DOMAttribute(QPValues) */
+@end /* NGDOMAttribute */
#include <DOM/DOMText.h>
-@interface DOMCDATASection : DOMText < DOMCDATASection >
+@interface NGDOMCDATASection : NGDOMText < DOMCDATASection >
{
}
@end
-@interface DOMCDATASection(PrivateCtors)
+@interface NGDOMCDATASection(PrivateCtors)
/* use DOMDocument for constructing DOMCDATASection's ! */
@end
#include "DOMCDATASection.h"
-@implementation DOMCDATASection
+@implementation NGDOMCDATASection
/* node */
return nil;
}
-@end /* DOMCDATASection */
+@end /* NGDOMCDATASection */
@class NSString;
-@interface DOMCharacterData : DOMNode < DOMCharacterData >
+@interface NGDOMCharacterData : NGDOMNode < DOMCharacterData >
{
id parent;
NSString *data;
#include "DOMCharacterData.h"
#include "common.h"
-@implementation DOMCharacterData
+@implementation NGDOMCharacterData
- (id)initWithString:(NSString *)_s {
if ((self = [super init])) {
return self->parent;
}
-@end /* DOMCharacterData */
-
-@implementation DOMCharacterData(QPValues)
+/* QPValues */
- (NSException *)setQueryPathValue:(id)_value {
[self setData:[_value stringValue]];
return [self data];
}
-@end /* DOMCharacterData(QPValues) */
+@end /* NGDOMCharacterData(QPValues) */
@class NSString;
-@interface DOMComment : DOMCharacterData < DOMComment >
+@interface NGDOMComment : NGDOMCharacterData < DOMComment >
{
}
#include "DOMComment.h"
-@implementation DOMComment
+@implementation NGDOMComment
/* node */
return nil;
}
-@end /* DOMComment */
+@end /* NGDOMComment */
#include <DOM/DOMTreeWalker.h>
-@implementation DOMDocument(DocumentTraversal)
+@implementation NGDOMDocument(DocumentTraversal)
- (Class)domTreeWalkerClass {
return NSClassFromString(@"DOMTreeWalker");
return [walker autorelease];
}
-@end /* DOMDocument(DocumentTraversal) */
+@end /* NGDOMDocument(DocumentTraversal) */
#include <DOM/DOMNode.h>
@class NSString, NSArray;
-@class DOMImplementation;
+@class NGDOMImplementation;
-@interface DOMDocument : DOMNodeWithChildren < DOMDocument >
+@interface NGDOMDocument : NGDOMNodeWithChildren < DOMDocument >
{
NSString *qname;
NSString *uri;
id doctype;
- DOMImplementation *dom;
+ NGDOMImplementation *dom;
NSArray *errors;
NSArray *warnings;
@end
-@interface DOMDocument(DocumentTraversal)
+@interface NGDOMDocument(DocumentTraversal)
- (id)createNodeIterator:(id)_node
whatToShow:(unsigned long)_whatToShow
@end
-@interface DOMDocument(PrivateCtors)
+@interface NGDOMDocument(PrivateCtors)
/* use DOMImplementation for constructing DOMDocument ! */
- (id)initWithName:(NSString *)_qname
namespaceURI:(NSString *)_uri
documentType:(id)_doctype
- dom:(DOMImplementation *)_dom;
+ dom:(NGDOMImplementation *)_dom;
@end
//#define PROF_DEALLOC 1
-@implementation DOMDocument
+@implementation NGDOMDocument
+ (id)documentFromData:(NSData *)_data {
id builder;
- (id)initWithName:(NSString *)_qname
namespaceURI:(NSString *)_uri
documentType:(id)_doctype
- dom:(DOMImplementation *)_dom
+ dom:(NGDOMImplementation *)_dom
{
self->dom = [_dom retain];
self->qname = [_qname copy];
- (id<NSObject,DOMDocumentType>)doctype {
return self->doctype;
}
-- (DOMImplementation *)implementation {
+- (NGDOMImplementation *)implementation {
return self->dom;
}
}
- (id<NSObject,DOMNodeList>)getElementsByTagName:(NSString *)_tagName {
/* introduced in DOM2, should return a *live* list ! */
- NSMutableArray *array;
- DOMNodePreorderWalker *walker;
+ NSMutableArray *array;
+ NGDOMNodePreorderWalker *walker;
SEL sel;
id ctx;
if (_tagName == nil)
return nil;
- array = [NSMutableArray array];
+ array = [NSMutableArray arrayWithCapacity:4];
if ([_tagName isEqualToString:@"*"]) {
_tagName = nil;
sel = @selector(_walk_getElementsByTagName:);
}
- walker = [[DOMNodePreorderWalker alloc]
- initWithTarget:self
- selector:sel
- context:ctx];
+ walker = [[NGDOMNodePreorderWalker alloc]
+ initWithTarget:self selector:sel context:ctx];
[walker walkNode:self];
return [elem autorelease];
}
-@end /* DOMDocument */
-
-@implementation DOMDocument(QPValues)
+/* QPValues */
- (NSException *)setQueryPathValue:(id)_value {
return [NSException exceptionWithName:@"QueryPathEvalException"
return [self documentElement];
}
-@end /* DOMDocument(QPValues) */
+@end /* NGDOMDocument */
#include <DOM/DOMNode.h>
@class NSString;
-@class DOMImplementation;
+@class NGDOMImplementation;
-@interface DOMDocumentFragment : DOMNodeWithChildren < DOMDocumentFragment >
+@interface NGDOMDocumentFragment : NGDOMNodeWithChildren < DOMDocumentFragment >
{
}
@end
-@interface DOMDocumentFragment(PrivateCtors)
+@interface NGDOMDocumentFragment(PrivateCtors)
/* use DOMImplementation for constructing DOMDocumentFragment's ! */
- (id)initWithName:(NSString *)_name
publicId:(NSString *)_p systemId:(NSString *)_s
- dom:(DOMImplementation *)_dom;
+ dom:(NGDOMImplementation *)_dom;
@end
#include <DOM/DOMNode.h>
-@interface DOMDocumentType : DOMNode
+@interface NGDOMDocumentType : NGDOMNode
{
id parent;
}
@end
-@interface DOMDocumentType(PrivateCtors)
+@interface NGDOMDocumentType(PrivateCtors)
/* use DOMDocument for constructing DOMDocumentType's ! */
- (id)initWithName:(NSString *)_name
#include "DOMDocumentType.h"
#include "common.h"
-@implementation DOMDocumentType
+@implementation NGDOMDocumentType
- (id)initWithName:(NSString *)_name
publicId:(NSString *)_pubId
return self->parent;
}
-@end /* DOMDocumentType */
+@end /* NGDOMDocumentType */
@class NSString, NSMutableDictionary, NSMutableArray;
-@interface DOMElement : DOMNodeWithChildren < DOMElement >
+@interface NGDOMElement : NGDOMNodeWithChildren < DOMElement >
{
id parent;
NSString *tagName;
@end
-@interface DOMElement(PrivateCtors)
+@interface NGDOMElement(PrivateCtors)
/* use DOMDocument for constructing DOMElements ! */
- (id)initWithTagName:(NSString *)_tagName;
@interface _DOMElementAttrNamedNodeMap : NSObject < DOMNamedNodeMap >
{
- DOMElement *element; /* non-retained */
+ NGDOMElement *element; /* non-retained */
}
- (id)initWithElement:(id)_element;
@end /* _DOMElementAttrNamedNodeMap */
-@interface DOMElement(Privates)
+@interface NGDOMElement(Privates)
- (unsigned)_numberOfAttributes;
- (id)_attributeNodeAtIndex:(unsigned)_idx;
- (id)attributeNode:(NSString *)_localName;
static NSNull *null = nil;
-@implementation DOMElement
+@implementation NGDOMElement
- (id)initWithTagName:(NSString *)_tagName namespaceURI:(NSString *)_uri {
if (null == nil)
}
- (id<NSObject,DOMNodeList>)getElementsByTagName:(NSString *)_tagName {
/* introduced in DOM2, should return a *live* list ! */
- NSMutableArray *array;
- DOMNodePreorderWalker *walker;
+ NGDOMNodePreorderWalker *walker;
+ NSMutableArray *array;
SEL sel;
id ctx;
if (_tagName == nil)
return nil;
- array = [NSMutableArray array];
+ array = [NSMutableArray arrayWithCapacity:4];
if ([_tagName isEqualToString:@"*"]) {
_tagName = nil;
sel = @selector(_walk_getElementsByTagName:);
}
- walker = [[DOMNodePreorderWalker alloc]
- initWithTarget:self
- selector:sel
- context:ctx];
+ walker = [[NGDOMNodePreorderWalker alloc]
+ initWithTarget:self selector:sel context:ctx];
[walker walkNode:self];
[self hasChildNodes] ? [[self childNodes] length] : 0];
}
-@end /* DOMElement */
-
-@implementation DOMElement(QPValues)
+/* QPValues */
- (NSException *)setQueryPathValue:(id)_value {
return [NSException exceptionWithName:@"QueryPathEvalException"
return [self childNodes];
}
-@end /* DOMElement(QPValues) */
+@end /* NGDOMElement */
@implementation _DOMElementAttrNamedNodeMap
@class NSString;
-@interface DOMEntity : DOMNodeWithChildren
+@interface NGDOMEntity : NGDOMNodeWithChildren
{
}
@end
-@interface DOMEntity(PrivateCtors)
+@interface NGDOMEntity(PrivateCtors)
/* use DOMDocument for constructing DOMEntity's ! */
@end
#include "DOMEntity.h"
#include "common.h"
-@implementation DOMEntity
+@implementation NGDOMEntity
/* attributes */
return nil;
}
-@end /* DOMEntity */
+@end /* NGDOMEntity */
@class NSString;
-@interface DOMEntityReference : DOMNodeWithChildren
+@interface NGDOMEntityReference : NGDOMNodeWithChildren
{
id parent;
NSString *name;
@end
-@interface DOMEntityReference(PrivateCtors)
+@interface NGDOMEntityReference(PrivateCtors)
/* use DOMDocument for constructing DOMEntityReference's ! */
- (id)initWithName:(NSString *)_name;
#include "DOMEntityReference.h"
#include "common.h"
-@implementation DOMEntityReference
+@implementation NGDOMEntityReference
- (id)initWithName:(NSString *)_name {
self->name = [_name copy];
return self->parent;
}
-@end /* DOMEntityReference */
+@end /* NGDOMEntityReference */
@class NSString;
-@interface DOMImplementation : NSObject
+@interface NGDOMImplementation : NSObject
{
Class elementClass;
Class textNodeClass;
@end
-@interface DOMImplementation(PrivateClassRegistry)
+@interface NGDOMImplementation(PrivateClassRegistry)
- (Class)domElementClass;
- (Class)domElementNSClass;
- (Class)domDocumentFragmentClass;
#include "DOMDocumentFragment.h"
#include "common.h"
-@implementation DOMImplementation
+@implementation NGDOMImplementation
- (id)init {
- self->elementClass = NSClassFromString(@"DOMElement");
- self->textNodeClass = NSClassFromString(@"DOMText");
- self->attrClass = NSClassFromString(@"DOMAttribute");
+ self->elementClass = NSClassFromString(@"NGDOMElement");
+ self->textNodeClass = NSClassFromString(@"NGDOMText");
+ self->attrClass = NSClassFromString(@"NGDOMAttribute");
return self;
}
- (Class)domDocumentClass {
- return [DOMDocument class];
+ return [NGDOMDocument class];
}
- (Class)domDocumentTypeClass {
- return NSClassFromString(@"DOMDocumentType");
+ return NSClassFromString(@"NGDOMDocumentType");
}
- (Class)domElementClass {
return self->elementClass;
}
- (Class)domDocumentFragmentClass {
- return NSClassFromString(@"DOMDocumentFragment");
+ return NSClassFromString(@"NGDOMDocumentFragment");
}
- (Class)domTextNodeClass {
return self->textNodeClass;
}
- (Class)domCommentClass {
- return NSClassFromString(@"DOMComment");
+ return NSClassFromString(@"NGDOMComment");
}
- (Class)domCDATAClass {
- return NSClassFromString(@"DOMCDATA");
+ return NSClassFromString(@"NGDOMCDATA");
}
- (Class)domProcessingInstructionClass {
- return NSClassFromString(@"DOMProcessingInstruction");
+ return NSClassFromString(@"NGDOMProcessingInstruction");
}
- (Class)domAttributeClass {
return self->attrClass;
return self->attrClass;
}
- (Class)domEntityReferenceClass {
- return NSClassFromString(@"DOMEntityReference");
+ return NSClassFromString(@"NGDOMEntityReference");
}
- (id)createDocumentWithName:(NSString *)_qname
{
id doc;
- doc = [[[self domDocumentClass]
- alloc]
- initWithName:_qname
- namespaceURI:_uri
- documentType:_doctype
- dom:self];
+ doc = [[[self domDocumentClass] alloc]
+ initWithName:_qname namespaceURI:_uri documentType:_doctype
+ dom:self];
return [doc autorelease];
}
{
id doc;
- doc = [[[self domDocumentTypeClass]
- alloc]
- initWithName:_qname
- publicId:_pubId
- systemId:_sysId
- dom:self];
+ doc = [[[self domDocumentTypeClass] alloc]
+ initWithName:_qname publicId:_pubId systemId:_sysId dom:self];
return [doc autorelease];
}
-@end /* DOMImplementation */
+@end /* NGDOMImplementation */
- (NSEnumerator *)domParentNodeEnumerator;
-@end /* DOMNode(Enum) */
+@end /* NSObject(DOMNodeEnum) */
-@interface DOMNode(Enum)
+@interface NGDOMNode(Enum)
- (NSEnumerator *)parentNodeEnumerator;
-@end /* DOMNode(Enum) */
+@end /* NGDOMNode(Enum) */
#endif /* __DOM_DOMNodeEnum_H__ */
- (NSEnumerator *)domParentNodeEnumerator {
return [_DOMNodeParentNodeEnumerator enumeratorWithDOMNode:
- [(DOMNode *)self parentNode]];
+ [(NGDOMNode *)self parentNode]];
}
-@end /* DOMNode(Enum) */
+@end /* NSObject(DOMNodeEnum) */
-@implementation DOMNode(Enum)
+@implementation NGDOMNode(Enum)
- (NSEnumerator *)parentNodeEnumerator {
return [self domParentNodeEnumerator];
}
-@end /* DOMNode(Enum) */
+@end /* NGDOMNode(Enum) */
@implementation _DOMNodeParentNodeEnumerator
#include "DOMDocument.h"
#include "common.h"
-@implementation DOMNode(QPEval)
+@implementation NGDOMNode(QPEval)
- (id)queryPathRootObjectInContext:(id)_ctx {
return [self ownerDocument];
}
-@end /* DOMNode(QPEval) */
+@end /* NGDOMNode(QPEval) */
-@implementation DOMDocument(QPEval)
+@implementation NGDOMDocument(QPEval)
- (id)queryPathRootObjectInContext:(id)_ctx {
return self;
}
-@end /* DOMNode(QPEval) */
+@end /* NGDOMNode(QPEval) */
@class NSString, NSArray;
-@interface DOMNode(QueryPath)
+@interface NGDOMNode(QueryPath)
/* Evaluate a stack of path specifiers. */
- (id)lookupPathComponents:(NSArray *)_path;
#include "DOMQueryPathExpression.h"
#include "common.h"
-@implementation DOMNode(QueryPath)
+@implementation NGDOMNode(QueryPath)
- (id)lookupPathComponents:(NSArray *)_path {
DOMQueryPathExpression *expr;
#include <DOM/DOMProtocols.h>
@class NSMutableArray, NSData;
-@class DOMDocument;
+@class NGDOMDocument;
-@interface DOMNode : NSObject < DOMNode >
+@interface NGDOMNode : NSObject < DOMNode >
{
}
@end
-@interface DOMNode(Additions)
+@interface NGDOMNode(Additions)
- (NSString *)nodeTypeString;
- (NSString *)xmlStringValue;
@end
-@interface DOMNodeWithChildren : DOMNode
+@interface NGDOMNodeWithChildren : NGDOMNode
{
@private
NSMutableArray *childNodes;
case DOM_CDATA_SECTION_NODE:
case DOM_COMMENT_NODE:
case DOM_TEXT_NODE:
- return [(DOMCharacterData *)_node data];
+ return [(id<DOMCharacterData>)_node data];
case DOM_DOCUMENT_NODE:
case DOM_DOCUMENT_FRAGMENT_NODE:
return nil;
case DOM_PROCESSING_INSTRUCTION_NODE:
- return [(DOMProcessingInstruction *)_node data];
+ return [(id<DOMProcessingInstruction>)_node data];
case DOM_DOCUMENT_TYPE_NODE:
case DOM_ENTITY_NODE:
}
}
-@implementation DOMNode
+@implementation NGDOMNode
- (void)_domNodeRegisterParentNode:(id)_parent {
}
}
- (id<NSObject,DOMNode>)previousSibling {
- DOMNode *parent;
+ NGDOMNode *parent;
- if ((parent = (DOMNode *)[self parentNode]) == nil) return nil;
+ if ((parent = (NGDOMNode *)[self parentNode]) == nil) return nil;
if (parent == nil) return nil;
if (![parent respondsToSelector:@selector(_domNodeBeforeNode:)]) return nil;
return [parent _domNodeBeforeNode:self];
}
- (id<NSObject,DOMNode>)nextSibling {
- DOMNode *parent;
+ NGDOMNode *parent;
- if ((parent = (DOMNode *)[self parentNode]) == nil) return nil;
+ if ((parent = (NGDOMNode *)[self parentNode]) == nil) return nil;
if (parent == nil) return nil;
if (![parent respondsToSelector:@selector(_domNodeBeforeNode:)]) return nil;
return [parent _domNodeAfterNode:self];
[self hasChildNodes] ? [[self childNodes] length] : 0];
}
-@end /* DOMNode */
+@end /* NGDOMNode */
#include "DOMXMLOutputter.h"
#include "DOMCharacterData.h"
-@implementation DOMNode(Additions)
+@implementation NGDOMNode(Additions)
- (NSString *)nodeTypeString {
switch ([self nodeType]) {
case DOM_TEXT_NODE:
case DOM_COMMENT_NODE:
case DOM_CDATA_SECTION_NODE:
- [s appendString:[(DOMCharacterData *)self data]];
+ [s appendString:[(id<DOMCharacterData>)self data]];
break;
default:
return [[s copy] autorelease];
}
-@end /* DOMNode(Additions) */
+@end /* NGDOMNode(Additions) */
@implementation NSArray(DOMNodeList)
#define DOM_SHOW_DOCUMENT_FRAGMENT 0x00000400
#define DOM_SHOW_NOTATION 0x00000800
-@interface DOMNodeFilter : NSObject
+@interface NGDOMNodeFilter : NSObject
- (DOMNodeFilterType)acceptNode:(id)_node;
#include "DOMNodeFilter.h"
-@implementation DOMNodeFilter
+@implementation NGDOMNodeFilter
- (DOMNodeFilterType)acceptNode:(id)_node {
return DOM_FILTER_ACCEPT;
}
-@end /* DOMNodeFilter */
+@end /* NGDOMNodeFilter */
#import <Foundation/NSObject.h>
-@interface DOMNodeIterator : NSObject
+@interface NGDOMNodeIterator : NSObject
{
id root;
unsigned long whatToShow;
#include <DOM/DOMNode.h>
#include "common.h"
-@implementation DOMNodeIterator
+@implementation NGDOMNodeIterator
- (id)initWithRootNode:(id)_rootNode
whatToShow:(unsigned long)_whatToShow
- (void)detach {
}
-@end /* DOMNodeIterator */
+@end /* NGDOMNodeIterator */
#import <Foundation/NSObject.h>
-@interface DOMNodeWalker : NSObject
+@interface NGDOMNodeWalker : NSObject
{
id target;
SEL selector;
@end
-@interface DOMNodePreorderWalker : DOMNodeWalker
+@interface NGDOMNodePreorderWalker : NGDOMNodeWalker
@end
-@interface DOMNodePostorderWalker : DOMNodeWalker
+@interface NGDOMNodePostorderWalker : NGDOMNodeWalker
@end
#endif /* __DOMNodeWalker_H__ */
#include "DOMNode.h"
#include "common.h"
-@interface DOMNodeWalker(Privates)
+@interface NGDOMNodeWalker(Privates)
- (void)_processCurrentNode;
@end
-@implementation DOMNodeWalker
+@implementation NGDOMNodeWalker
- (id)initWithTarget:(id)_target selector:(SEL)_selector context:(id)_ctx {
self->target = [_target retain];
self->isStopped = YES;
}
-@end /* DOMNodeWalker */
+@end /* NGDOMNodeWalker */
-@implementation DOMNodePreorderWalker
+@implementation NGDOMNodePreorderWalker
- (void)_beforeChildren {
[self _processCurrentNode];
- (void)_afterChildren {
}
-@end /* DOMNodePreorderWalker */
+@end /* NGDOMNodePreorderWalker */
-@implementation DOMNodePostorderWalker
+@implementation NGDOMNodePostorderWalker
- (void)_beforeChildren {
}
[self _processCurrentNode];
}
-@end /* DOMNodePreorderWalker */
+@end /* NGDOMNodePreorderWalker */
#include <DOM/DOMNode.h>
#include "common.h"
-@implementation DOMNodeWithChildren
+@implementation NGDOMNodeWithChildren
- (void)dealloc {
[self->childNodes makeObjectsPerformSelector:
return [self->childNodes objectAtIndex:(idx + 1)];
}
-@end /* DOMNodeWithChildren */
+@end /* NGDOMNodeWithChildren */
#include <DOM/DOMNode.h>
-@interface DOMNotation : DOMNode
+@interface NGDOMNotation : NGDOMNode
{
}
@end
-@interface DOMNotation(PrivateCtors)
+@interface NGDOMNotation(PrivateCtors)
/* use DOMDocument for constructing DOMNotation's ! */
@end
#include "DOMNotation.h"
-@implementation DOMNotation
+@implementation NGDOMNotation
- (DOMNodeType)nodeType {
return DOM_NOTATION_NODE;
return nil;
}
-@end /* DOMNotation */
+@end /* NGDOMNotation */
#import <Foundation/NSObject.h>
-@interface DOMPYXOutputter : NSObject
+@interface NGDOMPYXOutputter : NSObject
{
}
#include "DOMElement.h"
#include "common.h"
-@interface DOMPYXOutputter(Privates)
+@interface NGDOMPYXOutputter(Privates)
- (void)outputNode:(id)_node to:(id)_target;
- (void)outputNodeList:(id)_nodeList to:(id)_target;
@end
-@implementation DOMPYXOutputter
+@implementation NGDOMPYXOutputter
- (void)write:(NSString *)s to:(id)_target {
printf("%s", [s cString]);
@class NSString;
-@interface DOMProcessingInstruction : DOMNode
+@interface NGDOMProcessingInstruction : NGDOMNode
{
id parent;
NSString *target;
@end
-@interface DOMProcessingInstruction(PrivateCtors)
+@interface NGDOMProcessingInstruction(PrivateCtors)
/* use DOMDocument for constructing DOMProcessingInstructions ! */
- (id)initWithTarget:(NSString *)_target data:(NSString *)_data;
#include "DOMProcessingInstruction.h"
#include "common.h"
-@implementation DOMProcessingInstruction
+@implementation NGDOMProcessingInstruction
- (id)initWithTarget:(NSString *)_target data:(NSString *)_data {
if ((self = [super init])) {
[self target], [self data]];
}
-@end /* DOMProcessingInstruction */
+@end /* NGDOMProcessingInstruction */
@protocol DOMEntityReference < DOMNode >
@end
-@class DOMImplementation;
+@class NGDOMImplementation;
@protocol DOMDocument < DOMNode >
- (id<NSObject,DOMDocumentType>)doctype;
-- (DOMImplementation *)implementation;
+- (NGDOMImplementation *)implementation;
- (id<NSObject,DOMElement>)documentElement;
- (id<NSObject,DOMNodeList>)getElementsByTagName:(NSString *)_tagName;
switch ([_domNode nodeType]) {
case DOM_DOCUMENT_NODE:
case DOM_DOCUMENT_FRAGMENT_NODE:
- root = [(DOMDocument *)_domNode documentElement];
+ root = [(id<DOMDocument>)_domNode documentElement];
if (root == nil) {
NSLog(@"WARNING(%s): document node %@ has no root element !",
__PRETTY_FUNCTION__, _domNode);
break;
case DOM_ATTRIBUTE_NODE:
- root = [(DOMAttribute *)_domNode ownerElement];
+ root = [(id<DOMAttr>)_domNode ownerElement];
if (root == nil) {
NSLog(@"WARNING(%s): attribute node %@ has no owner element !",
__PRETTY_FUNCTION__, _domNode);
static id idom = nil;
if (idom == nil)
- idom = [[DOMImplementation alloc] init];
+ idom = [[NGDOMImplementation alloc] init];
return [self initWithDOMImplementation:idom];
}
not seen in that view.
*/
-@interface DOMText : DOMCharacterData < DOMText >
+@interface NGDOMText : NGDOMCharacterData < DOMText >
{
}
- (id)doesNotRecognizeSelector:(SEL)_sel;
@end
-@implementation DOMText
+@implementation NGDOMText
/* node */
return nil;
}
-@end /* DOMText */
+@end /* NGDOMText */
@class NSArray;
-@interface DOMTreeWalker : NSObject
+@interface NGDOMTreeWalker : NSObject
{
id root;
unsigned long whatToShow;
@end
-@interface DOMTreeWalker(PrivateCtors)
+@interface NGDOMTreeWalker(PrivateCtors)
/* use DOMDocument(DocumentTraversal) for constructing DOMTreeWalker's ! */
- (id)initWithRootNode:(id)_rootNode
#include <DOM/DOMNode.h>
#include "common.h"
-@implementation DOMTreeWalker
+@implementation NGDOMTreeWalker
- (id)initWithRootNode:(id)_rootNode
whatToShow:(unsigned long)_whatToShow
return nil;
}
-@end /* DOMTreeWalker */
+@end /* NGDOMTreeWalker */
# version file
-SUBMINOR_VERSION:=14
+SUBMINOR_VERSION:=15
+2005-05-03 Helge Hess <helge.hess@opengroupware.org>
+
+ * fixed gcc 4.0 warnings, changed for new DOM implemention names
+
2004-08-31 Helge Hess <helge.hess@skyrix.com>
* fixed linking for FHS configurations
if ([path hasPrefix:@"-"]) {
if ([path isEqualToString:@"-pyx"]) {
- out = [[[DOMPYXOutputter alloc] init] autorelease];
+ out = [[[NGDOMPYXOutputter alloc] init] autorelease];
}
else if ([path isEqualToString:@"-xml"]) {
out = [[[DOMXMLOutputter alloc] init] autorelease];
if ([path hasPrefix:@"-"]) {
if ([path isEqualToString:@"-pyx"]) {
- out = [[[DOMPYXOutputter alloc] init] autorelease];
+ out = [[[NGDOMPYXOutputter alloc] init] autorelease];
}
else if ([path isEqualToString:@"-xml"]) {
out = [[[DOMXMLOutputter alloc] init] autorelease];
projects / sope / commitdiff