ObjFW  Diff

Differences From Artifact [daf8eb8593]:

To Artifact [37fee43ed7]:


47
48
49
50
51
52
53
54
55


56
57
58

59
60
61
62
63
64
65
47
48
49
50
51
52
53


54
55
56
57

58
59
60
61
62
63
64
65







-
-
+
+


-
+







- (instancetype)initWithSerialization: (OFXMLElement *)element
{
	self = [super of_init];

	@try {
		void *pool = objc_autoreleasePoolPush();

		if (![[element name] isEqual: [self className]] ||
		    ![[element namespace] isEqual: OF_SERIALIZATION_NS])
		if (![element.name isEqual: self.className] ||
		    ![element.namespace isEqual: OF_SERIALIZATION_NS])
			@throw [OFInvalidArgumentException exception];

		_CDATA = [[element stringValue] copy];
		_CDATA = [element.stringValue copy];

		objc_autoreleasePoolPop(pool);
	} @catch (id e) {
		[self release];
		@throw e;
	}

86
87
88
89
90
91
92
93

94
95
96
97
98
99
100
86
87
88
89
90
91
92

93
94
95
96
97
98
99
100







-
+







	CDATA = object;

	return ([CDATA->_CDATA isEqual: _CDATA]);
}

- (uint32_t)hash
{
	return [_CDATA hash];
	return _CDATA.hash;
}

- (OFString *)stringValue
{
	return [[_CDATA copy] autorelease];
}

116
117
118
119
120
121
122
123

124
125
126
127
128
129

130
131
132
133
134

135
136
137
138
139
140

141
142
143
144
145
146
116
117
118
119
120
121
122

123
124
125
126
127
128

129
130
131
132
133

134
135
136
137
138
139

140
141
142
143
144
145
146







-
+





-
+




-
+





-
+






	[ret retain];
	objc_autoreleasePoolPop(pool);
	return [ret autorelease];
}

- (OFString *)XMLStringWithIndentation: (unsigned int)indentation
{
	return [self XMLString];
	return self.XMLString;
}

- (OFString *)XMLStringWithIndentation: (unsigned int)indentation
				level: (unsigned int)level
{
	return [self XMLString];
	return self.XMLString;
}

- (OFString *)description
{
	return [self XMLString];
	return self.XMLString;
}

- (OFXMLElement *)XMLElementBySerializing
{
	OFXMLElement *element =
	    [OFXMLElement elementWithName: [self className]
	    [OFXMLElement elementWithName: self.className
				namespace: OF_SERIALIZATION_NS];
	[element addChild: self];

	return element;
}
@end