ObjXMPP  Check-in [6b038b0cf6]

Overview
Comment:Don't synthesize the getter when the setter isn't synthesized.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: 6b038b0cf67b638f95a58eb284799469809543304f65a8d64ed7e2b568f0d23e
User & Date: js on 2011-03-27 21:50:14
Other Links: manifest | tags
Context
2011-03-27
23:47
Add XMPPRosterItem class. check-in: c9c5afc2e7 user: js tags: trunk
21:50
Don't synthesize the getter when the setter isn't synthesized. check-in: 6b038b0cf6 user: js tags: trunk
2011-03-24
17:57
Make use of the XMPPStanza convenience functions check-in: 014e7a9d68 user: florob@babelmonkeys.de tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Modified ObjXMPP.xcodeproj/project.pbxproj from [167d820e6b] to [1e7813da0b].

︙︙
374
375
376
377
378
379
380

381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397

398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413

414
415
416
417
418
419
420

				COPY_PHASE_STRIP = NO;
				DYLIB_COMPATIBILITY_VERSION = 0;
				DYLIB_CURRENT_VERSION = 0;
				FRAMEWORK_VERSION = A;
				GCC_DYNAMIC_NO_PIC = NO;
				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
				GCC_PRECOMPILE_PREFIX_HEADER = YES;

				INFOPLIST_FILE = Info.plist;
				PRODUCT_NAME = "$(TARGET_NAME)";
				WRAPPER_EXTENSION = framework;
			};
			name = Debug;
		};
		4BC559BA1337A65500E345C7 /* Release */ = {
			isa = XCBuildConfiguration;
			buildSettings = {
				ALWAYS_SEARCH_USER_PATHS = NO;
				COPY_PHASE_STRIP = YES;
				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
				DYLIB_COMPATIBILITY_VERSION = 0;
				DYLIB_CURRENT_VERSION = 0;
				FRAMEWORK_VERSION = A;
				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
				GCC_PRECOMPILE_PREFIX_HEADER = YES;

				INFOPLIST_FILE = Info.plist;
				PRODUCT_NAME = "$(TARGET_NAME)";
				WRAPPER_EXTENSION = framework;
			};
			name = Release;
		};
/* End XCBuildConfiguration section */

/* Begin XCConfigurationList section */
		4B1295EC1337BD2D00154B25 /* Build configuration list for PBXNativeTarget "ObjXMPPTests" */ = {
			isa = XCConfigurationList;
			buildConfigurations = (
				4B1295EA1337BD2D00154B25 /* Debug */,
				4B1295EB1337BD2D00154B25 /* Release */,
			);
			defaultConfigurationIsVisible = 0;

		};
		4BC5598A1337A65400E345C7 /* Build configuration list for PBXProject "ObjXMPP" */ = {
			isa = XCConfigurationList;
			buildConfigurations = (
				4BC559B61337A65500E345C7 /* Debug */,
				4BC559B71337A65500E345C7 /* Release */,
			);








>

















>
















>








374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423

				COPY_PHASE_STRIP = NO;
				DYLIB_COMPATIBILITY_VERSION = 0;
				DYLIB_CURRENT_VERSION = 0;
				FRAMEWORK_VERSION = A;
				GCC_DYNAMIC_NO_PIC = NO;
				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
				GCC_PRECOMPILE_PREFIX_HEADER = YES;
				GCC_VERSION = 4.2;
				INFOPLIST_FILE = Info.plist;
				PRODUCT_NAME = "$(TARGET_NAME)";
				WRAPPER_EXTENSION = framework;
			};
			name = Debug;
		};
		4BC559BA1337A65500E345C7 /* Release */ = {
			isa = XCBuildConfiguration;
			buildSettings = {
				ALWAYS_SEARCH_USER_PATHS = NO;
				COPY_PHASE_STRIP = YES;
				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
				DYLIB_COMPATIBILITY_VERSION = 0;
				DYLIB_CURRENT_VERSION = 0;
				FRAMEWORK_VERSION = A;
				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
				GCC_PRECOMPILE_PREFIX_HEADER = YES;
				GCC_VERSION = 4.2;
				INFOPLIST_FILE = Info.plist;
				PRODUCT_NAME = "$(TARGET_NAME)";
				WRAPPER_EXTENSION = framework;
			};
			name = Release;
		};
/* End XCBuildConfiguration section */

/* Begin XCConfigurationList section */
		4B1295EC1337BD2D00154B25 /* Build configuration list for PBXNativeTarget "ObjXMPPTests" */ = {
			isa = XCConfigurationList;
			buildConfigurations = (
				4B1295EA1337BD2D00154B25 /* Debug */,
				4B1295EB1337BD2D00154B25 /* Release */,
			);
			defaultConfigurationIsVisible = 0;
			defaultConfigurationName = Release;
		};
		4BC5598A1337A65400E345C7 /* Build configuration list for PBXProject "ObjXMPP" */ = {
			isa = XCConfigurationList;
			buildConfigurations = (
				4BC559B61337A65500E345C7 /* Debug */,
				4BC559B71337A65500E345C7 /* Release */,
			);
︙︙

Modified src/XMPPJID.m from [c01fa5eff3] to [d4cd01dc5d].

︙︙
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40


#include <stringprep.h>

#import "XMPPJID.h"
#import "XMPPExceptions.h"

@implementation XMPPJID
@synthesize node;
@synthesize domain;
@synthesize resource;

+ JID
{
	return [[[self alloc] init] autorelease];
}

+ JIDWithString: (OFString*)str
{








<
<
<
<








23
24
25
26
27
28
29




30
31
32
33
34
35
36


#include <stringprep.h>

#import "XMPPJID.h"
#import "XMPPExceptions.h"

@implementation XMPPJID




+ JID
{
	return [[[self alloc] init] autorelease];
}

+ JIDWithString: (OFString*)str
{
︙︙
107
108
109
110
111
112
113





114
115
116
117
118
119
120

		node = [[OFString alloc] initWithCString: nodepart];
	} @finally {
		free(nodepart);
	}

	[old release];
}






- (void)setDomain: (OFString*)domain_
{
	OFString *old = domain;
	char *srv;
	Stringprep_rc rc;









>
>
>
>
>








103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121

		node = [[OFString alloc] initWithCString: nodepart];
	} @finally {
		free(nodepart);
	}

	[old release];
}

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

- (void)setDomain: (OFString*)domain_
{
	OFString *old = domain;
	char *srv;
	Stringprep_rc rc;
︙︙
129
130
131
132
133
134
135





136
137
138
139
140
141
142

		domain = [[OFString alloc] initWithCString: srv];
	} @finally {
		free(srv);
	}

	[old release];
}






- (void)setResource: (OFString*)resource_
{
	OFString *old = resource;
	char *res;
	Stringprep_rc rc;









>
>
>
>
>








130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148

		domain = [[OFString alloc] initWithCString: srv];
	} @finally {
		free(srv);
	}

	[old release];
}

- (OFString*)domain
{
	return [[node copy] autorelease];
}

- (void)setResource: (OFString*)resource_
{
	OFString *old = resource;
	char *res;
	Stringprep_rc rc;
︙︙
158
159
160
161
162
163
164





165
166
167
168
169
170
171

		resource = [[OFString alloc] initWithCString: res];
	} @finally {
		free(res);
	}

	[old release];
}






- (OFString*)bareJID
{
	if (node != nil)
		return [OFString stringWithFormat: @"%@@%@", node, domain];
	else
		return [OFString stringWithFormat: @"%@", domain];








>
>
>
>
>








164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182

		resource = [[OFString alloc] initWithCString: res];
	} @finally {
		free(res);
	}

	[old release];
}

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

- (OFString*)bareJID
{
	if (node != nil)
		return [OFString stringWithFormat: @"%@@%@", node, domain];
	else
		return [OFString stringWithFormat: @"%@", domain];
︙︙

Modified src/XMPPStanza.m from [1ae4e0c618] to [a16d9343e0].

︙︙
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39

 * POSSIBILITY OF SUCH DAMAGE.
 */

#import "XMPPStanza.h"
#import "XMPPJID.h"

@implementation XMPPStanza
@synthesize from;
@synthesize to;
@synthesize type;
@synthesize ID;

+ stanzaWithName: (OFString*)name
{
	return [[[self alloc] initWithName: name] autorelease];
}

+ stanzaWithName: (OFString*)name
	    type: (OFString*)type_








<
<
<
<
<








21
22
23
24
25
26
27





28
29
30
31
32
33
34

 * POSSIBILITY OF SUCH DAMAGE.
 */

#import "XMPPStanza.h"
#import "XMPPJID.h"

@implementation XMPPStanza





+ stanzaWithName: (OFString*)name
{
	return [[[self alloc] initWithName: name] autorelease];
}

+ stanzaWithName: (OFString*)name
	    type: (OFString*)type_
︙︙
162
163
164
165
166
167
168





169
170
171
172
173
174
175
176
177
178
179
180
181





182
183
184
185
186
187
188
189
190
191
192
193
194





195
196
197
198
199
200
201
202
203
204
205
206
207





208


	[self removeAttributeForName: @"from"];

	if (from_ != nil)
		[self addAttributeWithName: @"from"
			       stringValue: from_.fullJID];
}






- (void)setTo: (XMPPJID*)to_
{
	XMPPJID *old = to;
	to = [to_ copy];
	[old release];

	[self removeAttributeForName: @"to"];

	if (to_ != nil)
		[self addAttributeWithName: @"to"
			       stringValue: to_.fullJID];
}






- (void)setType: (OFString*)type_
{
	OFString *old = type;
	type = [type_ copy];
	[old release];

	[self removeAttributeForName: @"type"];

	if (type_ != nil)
		[self addAttributeWithName: @"type"
			       stringValue: type];
}






- (void)setID: (OFString*)ID_
{
	OFString* old = ID;
	ID = [ID_ copy];
	[old release];

	[self removeAttributeForName: @"id"];

	if (ID_ != nil)
		[self addAttributeWithName: @"id"
			       stringValue: ID];
}





@end








>
>
>
>
>













>
>
>
>
>













>
>
>
>
>













>
>
>
>
>


157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223


	[self removeAttributeForName: @"from"];

	if (from_ != nil)
		[self addAttributeWithName: @"from"
			       stringValue: from_.fullJID];
}

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

- (void)setTo: (XMPPJID*)to_
{
	XMPPJID *old = to;
	to = [to_ copy];
	[old release];

	[self removeAttributeForName: @"to"];

	if (to_ != nil)
		[self addAttributeWithName: @"to"
			       stringValue: to_.fullJID];
}

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

- (void)setType: (OFString*)type_
{
	OFString *old = type;
	type = [type_ copy];
	[old release];

	[self removeAttributeForName: @"type"];

	if (type_ != nil)
		[self addAttributeWithName: @"type"
			       stringValue: type];
}

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

- (void)setID: (OFString*)ID_
{
	OFString* old = ID;
	ID = [ID_ copy];
	[old release];

	[self removeAttributeForName: @"id"];

	if (ID_ != nil)
		[self addAttributeWithName: @"id"
			       stringValue: ID];
}

- (OFString*)ID
{
	return [[ID copy] autorelease];
}
@end