Overview
Comment: | Add +[OFXMLElement elementWithElement:]. |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA3-256: |
34788afdca4b307ac460a825f6e335a0 |
User & Date: | js on 2011-04-25 22:48:07 |
Other Links: | manifest | tags |
Context
2011-04-25
| ||
22:50 |
Don't fall back to ISO-8859-1 in +[OFString stringWithContentsOfURL:]. This way, we can be sure to never have garbage. check-in: c74d7dec0e user: js tags: trunk | |
22:48 | Add +[OFXMLElement elementWithElement:]. check-in: 34788afdca user: js tags: trunk | |
22:46 | Cache the class for exeptions in -[OFXMLElement initWithXMLString:]. check-in: 2e95ed7d11 user: js tags: trunk | |
Changes
Modified src/OFXMLElement.h from [6e4cad8b3b] to [ccc3d2d9aa].
︙ | ︙ | |||
32 33 34 35 36 37 38 | OFString *ns; OFString *defaultNamespace; OFMutableArray *attributes; OFMutableDictionary *namespaces; OFMutableArray *children; OFString *characters; OFString *CDATA; | | | 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 | OFString *ns; OFString *defaultNamespace; OFMutableArray *attributes; OFMutableDictionary *namespaces; OFMutableArray *children; OFString *characters; OFString *CDATA; OFString *comment; } #ifdef OF_HAVE_PROPERTIES @property (readonly, copy) OFString *name; @property (readonly, copy, getter=namespace) OFString *ns; @property (copy) OFString *defaultNamespace; @property (readonly, copy) OFArray *attributes; |
︙ | ︙ | |||
103 104 105 106 107 108 109 110 111 112 113 114 115 116 | * Creates a new element, only consisting of the specified comment. * * \param comment The comment the element represents * \return A new autoreleased OFXMLElement consisting of the specified comment */ + elementWithComment: (OFString*)comment; /** * Parses the string and returns an OFXMLElement for it. * * \param string The string to parse * \return A new autoreleased OFXMLElement with the contents of the string */ + elementWithXMLString: (OFString*)string; | > > > > > > > | 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 | * Creates a new element, only consisting of the specified comment. * * \param comment The comment the element represents * \return A new autoreleased OFXMLElement consisting of the specified comment */ + elementWithComment: (OFString*)comment; /** * \param element An OFXMLElement to initialize the OFXMLElement with * \return A new autoreleased OFXMLElement with the contents of the specified * element */ + elementWithElement: (OFXMLElement*)element; /** * Parses the string and returns an OFXMLElement for it. * * \param string The string to parse * \return A new autoreleased OFXMLElement with the contents of the string */ + elementWithXMLString: (OFString*)string; |
︙ | ︙ | |||
185 186 187 188 189 190 191 192 193 194 195 196 197 198 | * specified comment. * * \param comment The comment the element represents * \return An initialized OFXMLElement consisting of the specified comment */ - initWithComment: (OFString*)comment; /** * Parses the string and initializes an already allocated OFXMLElement with it. * * \param string The string to parse * \return An initialized OFXMLElement with the contents of the string */ - initWithXMLString: (OFString*)string; | > > > > > > > > > > | 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 | * specified comment. * * \param comment The comment the element represents * \return An initialized OFXMLElement consisting of the specified comment */ - initWithComment: (OFString*)comment; /** * Initializes an already allocated OFXMLElement with the specified * OFXMLElement. * * \param element An OFXMLElement to initialize the OFXMLElement with * \return A new autoreleased OFXMLElement with the contents of the specified * element */ - initWithElement: (OFXMLElement*)element; /** * Parses the string and initializes an already allocated OFXMLElement with it. * * \param string The string to parse * \return An initialized OFXMLElement with the contents of the string */ - initWithXMLString: (OFString*)string; |
︙ | ︙ |
Modified src/OFXMLElement.m from [f692e4e696] to [f7cabbca27].
︙ | ︙ | |||
94 95 96 97 98 99 100 101 102 103 104 105 106 107 | return [[[self alloc] initWithCDATA: CDATA] autorelease]; } + elementWithComment: (OFString*)comment { return [[[self alloc] initWithComment: comment] autorelease]; } + elementWithXMLString: (OFString*)string { return [[[self alloc] initWithXMLString: string] autorelease]; } - init | > > > > > | 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 | return [[[self alloc] initWithCDATA: CDATA] autorelease]; } + elementWithComment: (OFString*)comment { return [[[self alloc] initWithComment: comment] autorelease]; } + elementWithElement: (OFXMLElement*)element { return [[[self alloc] initWithElement: element] autorelease]; } + elementWithXMLString: (OFString*)string { return [[[self alloc] initWithXMLString: string] autorelease]; } - init |
︙ | ︙ | |||
200 201 202 203 204 205 206 207 208 209 210 211 212 213 | @try { comment = [comment_ copy]; } @catch (id e) { [self release]; @throw e; } return self; } - initWithXMLString: (OFString*)string { OFAutoreleasePool *pool; | > > > > > > > > > > > > > > > > > > > > > > | 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 | @try { comment = [comment_ copy]; } @catch (id e) { [self release]; @throw e; } return self; } - initWithElement: (OFXMLElement*)element { self = [super init]; @try { name = [element->name copy]; ns = [element->ns copy]; defaultNamespace = [element->defaultNamespace copy]; attributes = [element->attributes mutableCopy]; namespaces = [element->namespaces mutableCopy]; children = [element->children mutableCopy]; characters = [element->characters copy]; CDATA = [element->CDATA copy]; comment = [element->comment copy]; } @catch (id e) { [self release]; @throw e; } return self; } - initWithXMLString: (OFString*)string { OFAutoreleasePool *pool; |
︙ | ︙ |