ObjFW  Diff

Differences From Artifact [37f60bba81]:

To Artifact [37eac853b7]:

  • File src/exceptions/OFUnboundNamespaceException.m — part of check-in [3d16a30f41] at 2013-06-22 12:12:36 on branch trunk — Rework exceptions.

    This mostly removes the argument for the class in which the exception
    occurred. As backtraces were recently added for all platforms, the
    passed class does not give any extra information on where the exception
    occurred anymore.

    This also removes a few other arguments which were not too helpful. In
    the past, the idea was to pass as many arguments as possible so that it
    is easier to find the origin of the exception. However, as backtraces
    are a much better way to find the origin, those are not useful anymore
    and just make the exception more cumbersome to use. The rule is now to
    only pass arguments that might help in recovering from the exception or
    provide information that is otherwise not easily accessible. (user: js, size: 1690) [annotate] [blame] [check-ins using]


21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
#import "OFUnboundNamespaceException.h"
#import "OFString.h"
#import "OFXMLElement.h"

#import "common.h"

@implementation OFUnboundNamespaceException
+ (instancetype)exceptionWithClass: (Class)class
			 namespace: (OFString*)namespace
			   element: (OFXMLElement*)element
{
	return [[[self alloc] initWithClass: class
				  namespace: namespace
				    element: element] autorelease];
}

- initWithClass: (Class)class
{
	@try {
		[self doesNotRecognizeSelector: _cmd];
	} @catch (id e) {
		[self release];
		@throw e;
	}

	abort();
}

- initWithClass: (Class)class
      namespace: (OFString*)namespace
	element: (OFXMLElement*)element
{
	self = [super initWithClass: class];

	@try {
		_namespace = [namespace copy];
		_element = [element retain];
	} @catch (id e) {
		[self release];
		@throw e;







|
<
|

|
<
|


|











<
|
|

|







21
22
23
24
25
26
27
28

29
30
31

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

47
48
49
50
51
52
53
54
55
56
57
#import "OFUnboundNamespaceException.h"
#import "OFString.h"
#import "OFXMLElement.h"

#import "common.h"

@implementation OFUnboundNamespaceException
+ (instancetype)exceptionWithNamespace: (OFString*)namespace

			       element: (OFXMLElement*)element
{
	return [[[self alloc] initWithNamespace: namespace

					element: element] autorelease];
}

- init
{
	@try {
		[self doesNotRecognizeSelector: _cmd];
	} @catch (id e) {
		[self release];
		@throw e;
	}

	abort();
}


- initWithNamespace: (OFString*)namespace
	    element: (OFXMLElement*)element
{
	self = [super init];

	@try {
		_namespace = [namespace copy];
		_element = [element retain];
	} @catch (id e) {
		[self release];
		@throw e;
70
71
72
73
74
75
76
77

78
79
80
81
82
83
84
85
86
87
88
89

	[super dealloc];
}

- (OFString*)description
{
	return [OFString stringWithFormat:
	    @"The namespace %@ is not bound in class %@", _namespace, _inClass];

}

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

- (OFXMLElement*)element
{
	OF_GETTER(_element, false)
}
@end







|
>












67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87

	[super dealloc];
}

- (OFString*)description
{
	return [OFString stringWithFormat:
	    @"The namespace %@ is not bound in an element of type %@!",
	    _namespace, [_element class]];
}

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

- (OFXMLElement*)element
{
	OF_GETTER(_element, false)
}
@end