ObjFW  Check-in [bb63873748]

Overview
Comment:Move -[setStringValue:] to OFXMLNode
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: bb638737489323b6444bb9da993326fd01f3312a83509f1e3ef2e83b7b64abc1
User & Date: js on 2014-05-04 23:57:28
Other Links: manifest | tags
Context
2014-05-05
00:14
Always build tests check-in: 974b1b203f user: js tags: trunk
2014-05-04
23:57
Move -[setStringValue:] to OFXMLNode check-in: bb63873748 user: js tags: trunk
2014-05-03
22:38
lookup-asm-ppc-*.S: Use positive rotations check-in: 6776b7bd3c user: js tags: trunk
Changes

Modified src/OFXMLAttribute.h from [730ca5265c] to [5b16d4ff08].

32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
32
33
34
35
36
37
38

39
40
41
42
43
44
45







-







#ifdef OF_HAVE_PROPERTIES
@property (readonly, copy) OFString *name;
# ifdef __cplusplus
@property (readonly, copy, getter=namespace) OFString *namespace_;
# else
@property (readonly, copy) OFString *namespace;
# endif
@property (readonly, copy) OFString *stringValue;
#endif

/*!
 * @brief Creates a new XML attribute.
 *
 * @param name The name of the attribute
 * @param stringValue The string value of the attribute

Modified src/OFXMLAttribute.m from [de4a0a8f01] to [15d4c89e57].

113
114
115
116
117
118
119





120



121
122
123
124
125
126
127
113
114
115
116
117
118
119
120
121
122
123
124

125
126
127
128
129
130
131
132
133
134







+
+
+
+
+
-
+
+
+







- (OFString*)namespace
{
	OF_GETTER(_namespace, true)
}

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

- (void)setStringValue: (OFString*)stringValue
{
	OF_GETTER(_stringValue, true)
	OFString *old = _stringValue;
	_stringValue = [stringValue copy];
	[old release];
}

- (bool)isEqual: (id)object
{
	OFXMLAttribute *attribute;

	if (![object isKindOfClass: [OFXMLAttribute class]])

Modified src/OFXMLCDATA.m from [2795d1dea5] to [9d629883bd].

90
91
92
93
94
95
96







97
98
99
100
101
102
103
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110







+
+
+
+
+
+
+







	return [_CDATA hash];
}

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

- (void)setStringValue: (OFString*)stringValue
{
	OFString *old = _CDATA;
	_CDATA = [stringValue copy];
	[old release];
}

- (OFString*)XMLString
{
	/* FIXME: What to do about ]]>? */
	return [OFString stringWithFormat: @"<![CDATA[%@]]>", _CDATA];
}

Modified src/OFXMLCharacters.m from [6bff098399] to [a711001bc8].

90
91
92
93
94
95
96







97
98
99
100
101
102
103
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110







+
+
+
+
+
+
+







	return [_characters hash];
}

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

- (void)setStringValue: (OFString*)stringValue
{
	OFString *old = _characters;
	_characters = [stringValue copy];
	[old release];
}

- (OFString*)XMLString
{
	return [_characters stringByXMLEscaping];
}

- (OFString*)XMLStringWithIndentation: (unsigned int)indentation

Modified src/OFXMLElement.h from [750e4163a0] to [eefae05a4d].

241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
241
242
243
244
245
246
247








248
249
250
251
252
253
254







-
-
-
-
-
-
-
-







/*!
 * @brief Returns an array of OFXMLNodes with all children of the element.
 *
 * @return An array of OFXMLNodes with all children of the element
 */
- (OFArray*)children;

/*!
 * @brief Removes all children and sets the string value to the specified
 *	  string.
 *
 * @param stringValue The new string value for the element
 */
- (void)setStringValue: (OFString*)stringValue;

/*!
 * @brief Adds the specified attribute.
 *
 * If an attribute with the same name and namespace already exists, it is not
 * added.
 *
 * @param attribute The attribute to add

Modified src/OFXMLNode.h from [40bf5e90f9] to [e5dd70c54e].

26
27
28
29
30
31
32










33
34
35
36
37
38
39
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49







+
+
+
+
+
+
+
+
+
+







/*!
 * @brief Returns the contents of the receiver as a string value.
 *
 * @return A string with the string value
 */
- (OFString*)stringValue;

/*!
 * @brief Sets the string value of the receiver to the specified string.
 *
 * For an @ref OFXMLElement, it removes all children and creates a single child
 * with the specified string value.
 *
 * @param stringValue The new string value for the node
 */
- (void)setStringValue: (OFString*)stringValue;

/*!
 * @brief Returns the contents of the receiver as a decimal value.
 *
 * @return An integer with the decimal value
 */
- (intmax_t)decimalValue;

Modified src/OFXMLNode.m from [c48b471d7e] to [b9283daef7].

25
26
27
28
29
30
31





32
33
34
35
36
37
38
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43







+
+
+
+
+







- initWithSerialization: (OFXMLElement*)element
{
	OF_INVALID_INIT_METHOD
}

- (OFString*)stringValue
{
	OF_UNRECOGNIZED_SELECTOR
}

- (void)setStringValue: (OFString*)stringValue
{
	OF_UNRECOGNIZED_SELECTOR
}

- (intmax_t)decimalValue
{
	return [[self stringValue] decimalValue];
}