mirror of
https://github.com/gnustep/libs-base.git
synced 2025-05-11 16:50:42 +00:00
fix whitespace/indentatrion issues
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@37647 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald
parent
28cac03e05
commit
5a5946dfce
2 changed files with 108 additions and 98 deletions
|
|
@ -44,11 +44,11 @@ extern "C" {
|
|||
|
||||
enum
|
||||
{
|
||||
NSUserNotificationActivationTypeNone = 0,
|
||||
NSUserNotificationActivationTypeContentsClicked = 1,
|
||||
NSUserNotificationActivationTypeActionButtonClicked = 2
|
||||
NSUserNotificationActivationTypeNone = 0,
|
||||
NSUserNotificationActivationTypeContentsClicked = 1,
|
||||
NSUserNotificationActivationTypeActionButtonClicked = 2
|
||||
#if OS_API_VERSION(MAC_OS_X_VERSION_10_9,GS_API_LATEST)
|
||||
,NSUserNotificationActivationTypeReplied = 3
|
||||
,NSUserNotificationActivationTypeReplied = 3
|
||||
#endif
|
||||
};
|
||||
typedef NSInteger NSUserNotificationActivationType;
|
||||
|
|
@ -57,8 +57,8 @@ typedef NSInteger NSUserNotificationActivationType;
|
|||
@interface NSUserNotification : NSObject <NSCopying>
|
||||
{
|
||||
#if GS_EXPOSE(NSUserNotification)
|
||||
@public
|
||||
id _uniqueId;
|
||||
@public
|
||||
id _uniqueId;
|
||||
#endif
|
||||
}
|
||||
|
||||
|
|
@ -96,8 +96,8 @@ GS_EXPORT NSString * const NSUserNotificationDefaultSoundName;
|
|||
@interface NSUserNotificationCenter : NSObject
|
||||
{
|
||||
#if GS_EXPOSE(NSUserNotificationCenter)
|
||||
NSMutableArray *_scheduledNotifications;
|
||||
NSMutableArray *_deliveredNotifications;
|
||||
NSMutableArray *_scheduledNotifications;
|
||||
NSMutableArray *_deliveredNotifications;
|
||||
#endif
|
||||
}
|
||||
|
||||
|
|
@ -126,9 +126,12 @@ GS_EXPORT NSString * const NSUserNotificationDefaultSoundName;
|
|||
@interface NSObject (NSUserNotificationCenterDelegateMethods)
|
||||
#endif
|
||||
|
||||
- (void) userNotificationCenter: (NSUserNotificationCenter *)center didDeliverNotification: (NSUserNotification *)notification;
|
||||
- (void) userNotificationCenter: (NSUserNotificationCenter *)center didActivateNotification: (NSUserNotification *)notification;
|
||||
- (BOOL) userNotificationCenter: (NSUserNotificationCenter *)center shouldPresentNotification: (NSUserNotification *)notification;
|
||||
- (void) userNotificationCenter: (NSUserNotificationCenter *)center
|
||||
didDeliverNotification: (NSUserNotification *)notification;
|
||||
- (void) userNotificationCenter: (NSUserNotificationCenter *)center
|
||||
didActivateNotification: (NSUserNotification *)notification;
|
||||
- (BOOL) userNotificationCenter: (NSUserNotificationCenter *)center
|
||||
shouldPresentNotification: (NSUserNotification *)notification;
|
||||
|
||||
@end
|
||||
|
||||
|
|
|
|||
|
|
@ -46,33 +46,32 @@
|
|||
|
||||
- (id) init
|
||||
{
|
||||
self = [super init];
|
||||
if (self)
|
||||
{
|
||||
self.hasActionButton = YES;
|
||||
}
|
||||
return self;
|
||||
if (nil != (self = [super init]))
|
||||
{
|
||||
self.hasActionButton = YES;
|
||||
}
|
||||
return self;
|
||||
}
|
||||
|
||||
- (void) dealloc
|
||||
{
|
||||
RELEASE(_uniqueId);
|
||||
[super dealloc];
|
||||
RELEASE(_uniqueId);
|
||||
[super dealloc];
|
||||
}
|
||||
|
||||
- (id) copyWithZone: (NSZone *)zone
|
||||
{
|
||||
return NSCopyObject(self, 0, zone);
|
||||
return NSCopyObject(self, 0, zone);
|
||||
}
|
||||
|
||||
- (NSString *)description
|
||||
{
|
||||
return [NSString stringWithFormat:@"<%s:%p> { title: \"%@\" "
|
||||
"informativeText: \"%@\" "
|
||||
"actionButtonTitle: \"%@\" }",
|
||||
object_getClassName(self), self,
|
||||
self.title, self.informativeText,
|
||||
self.actionButtonTitle];
|
||||
return [NSString stringWithFormat:@"<%s:%p> { title: \"%@\" "
|
||||
"informativeText: \"%@\" "
|
||||
"actionButtonTitle: \"%@\" }",
|
||||
object_getClassName(self), self,
|
||||
self.title, self.informativeText,
|
||||
self.actionButtonTitle];
|
||||
}
|
||||
|
||||
@end
|
||||
|
|
@ -93,106 +92,110 @@ static NSUserNotificationCenter *defaultUserNotificationCenter = nil;
|
|||
|
||||
+ (Class) defaultUserNotificationCenterClass
|
||||
{
|
||||
NSBundle *bundle = [NSBundle bundleForClass: [self class]];
|
||||
NSString *bundlePath = [bundle pathForResource: @"NSUserNotification"
|
||||
ofType: @"bundle"
|
||||
inDirectory: nil];
|
||||
if (bundlePath)
|
||||
{
|
||||
bundle = [NSBundle bundleWithPath: bundlePath];
|
||||
if (bundle)
|
||||
return [bundle principalClass];
|
||||
}
|
||||
return self;
|
||||
NSBundle *bundle = [NSBundle bundleForClass: [self class]];
|
||||
NSString *bundlePath = [bundle pathForResource: @"NSUserNotification"
|
||||
ofType: @"bundle"
|
||||
inDirectory: nil];
|
||||
if (bundlePath)
|
||||
{
|
||||
bundle = [NSBundle bundleWithPath: bundlePath];
|
||||
if (bundle)
|
||||
{
|
||||
return [bundle principalClass];
|
||||
}
|
||||
}
|
||||
return self;
|
||||
}
|
||||
|
||||
+ (void) atExit
|
||||
{
|
||||
DESTROY(defaultUserNotificationCenter);
|
||||
DESTROY(defaultUserNotificationCenter);
|
||||
}
|
||||
|
||||
+ (void) initialize
|
||||
{
|
||||
if ([NSUserNotificationCenter class] == self)
|
||||
if ([NSUserNotificationCenter class] == self)
|
||||
{
|
||||
Class uncClass = [self defaultUserNotificationCenterClass];
|
||||
defaultUserNotificationCenter = [[uncClass alloc] init];
|
||||
[self registerAtExit];
|
||||
Class uncClass = [self defaultUserNotificationCenterClass];
|
||||
defaultUserNotificationCenter = [[uncClass alloc] init];
|
||||
[self registerAtExit];
|
||||
}
|
||||
}
|
||||
|
||||
+ (void) setDefaultUserNotificationCenter: (NSUserNotificationCenter *)unc
|
||||
{
|
||||
ASSIGN(defaultUserNotificationCenter, unc);
|
||||
ASSIGN(defaultUserNotificationCenter, unc);
|
||||
}
|
||||
|
||||
+ (NSUserNotificationCenter *) defaultUserNotificationCenter
|
||||
{
|
||||
return defaultUserNotificationCenter;
|
||||
return defaultUserNotificationCenter;
|
||||
}
|
||||
|
||||
|
||||
- (id) init
|
||||
{
|
||||
self = [super init];
|
||||
if (self)
|
||||
{
|
||||
_scheduledNotifications = [[NSMutableArray alloc] init];
|
||||
_deliveredNotifications = [[NSMutableArray alloc] init];
|
||||
}
|
||||
return self;
|
||||
if (nil != (self = self = [super init]))
|
||||
{
|
||||
_scheduledNotifications = [[NSMutableArray alloc] init];
|
||||
_deliveredNotifications = [[NSMutableArray alloc] init];
|
||||
}
|
||||
return self;
|
||||
}
|
||||
|
||||
- (void) dealloc
|
||||
{
|
||||
[NSObject cancelPreviousPerformRequestsWithTarget: self];
|
||||
RELEASE(_scheduledNotifications);
|
||||
[self removeAllDeliveredNotifications];
|
||||
RELEASE(_deliveredNotifications);
|
||||
[super dealloc];
|
||||
[NSObject cancelPreviousPerformRequestsWithTarget: self];
|
||||
RELEASE(_scheduledNotifications);
|
||||
[self removeAllDeliveredNotifications];
|
||||
RELEASE(_deliveredNotifications);
|
||||
[super dealloc];
|
||||
}
|
||||
|
||||
- (void) scheduleNotification: (NSUserNotification *)un
|
||||
{
|
||||
if (!un.deliveryDate)
|
||||
{
|
||||
[self deliverNotification: un];
|
||||
return;
|
||||
}
|
||||
[_scheduledNotifications addObject: un];
|
||||
NSTimeInterval delay = [un.deliveryDate timeIntervalSinceNow];
|
||||
[self performSelector: @selector(deliverNotification:)
|
||||
withObject: un
|
||||
afterDelay: delay];
|
||||
if (!un.deliveryDate)
|
||||
{
|
||||
[self deliverNotification: un];
|
||||
return;
|
||||
}
|
||||
[_scheduledNotifications addObject: un];
|
||||
NSTimeInterval delay = [un.deliveryDate timeIntervalSinceNow];
|
||||
[self performSelector: @selector(deliverNotification:)
|
||||
withObject: un
|
||||
afterDelay: delay];
|
||||
}
|
||||
|
||||
- (void) removeScheduledNotification: (NSUserNotification *)un
|
||||
{
|
||||
[NSObject cancelPreviousPerformRequestsWithTarget: self
|
||||
selector: @selector(deliverNotification:)
|
||||
object: un];
|
||||
[_scheduledNotifications removeObject: un];
|
||||
[NSObject cancelPreviousPerformRequestsWithTarget: self
|
||||
selector: @selector(deliverNotification:)
|
||||
object: un];
|
||||
[_scheduledNotifications removeObject: un];
|
||||
}
|
||||
|
||||
- (void) _deliverNotification: (NSUserNotification *)un
|
||||
{
|
||||
NSLog(@"%s -- needs implementation", __PRETTY_FUNCTION__);
|
||||
NSLog(@"%s -- needs implementation", __PRETTY_FUNCTION__);
|
||||
}
|
||||
|
||||
- (void) deliverNotification: (NSUserNotification *)un
|
||||
{
|
||||
[self removeScheduledNotification: un];
|
||||
[self _deliverNotification: un];
|
||||
[self removeScheduledNotification: un];
|
||||
[self _deliverNotification: un];
|
||||
|
||||
NSDate *actualDeliveryDate = un.deliveryDate;
|
||||
if (!actualDeliveryDate)
|
||||
actualDeliveryDate = [NSDate date];
|
||||
un.actualDeliveryDate = actualDeliveryDate;
|
||||
[_deliveredNotifications addObject: un];
|
||||
un.presented = YES;
|
||||
NSDate *actualDeliveryDate = un.deliveryDate;
|
||||
if (!actualDeliveryDate)
|
||||
actualDeliveryDate = [NSDate date];
|
||||
un.actualDeliveryDate = actualDeliveryDate;
|
||||
[_deliveredNotifications addObject: un];
|
||||
un.presented = YES;
|
||||
|
||||
if (self.delegate && [self.delegate respondsToSelector: @selector(userNotificationCenter:didDeliverNotification:)])
|
||||
[self.delegate userNotificationCenter: self didDeliverNotification: un];
|
||||
if (self.delegate && [self.delegate respondsToSelector:
|
||||
@selector(userNotificationCenter:didDeliverNotification:)])
|
||||
{
|
||||
[self.delegate userNotificationCenter: self didDeliverNotification: un];
|
||||
}
|
||||
}
|
||||
|
||||
- (void) _removeDeliveredNotification: (NSUserNotification *)un
|
||||
|
|
@ -201,31 +204,35 @@ static NSUserNotificationCenter *defaultUserNotificationCenter = nil;
|
|||
|
||||
- (void) removeDeliveredNotification: (NSUserNotification *)un
|
||||
{
|
||||
[self _removeDeliveredNotification: un];
|
||||
[_deliveredNotifications removeObject: un];
|
||||
[self _removeDeliveredNotification: un];
|
||||
[_deliveredNotifications removeObject: un];
|
||||
}
|
||||
|
||||
- (void) removeAllDeliveredNotifications
|
||||
{
|
||||
NSUInteger i, count = [_deliveredNotifications count];
|
||||
for (i = 0; i < count; i++)
|
||||
{
|
||||
NSUserNotification *un = [_deliveredNotifications objectAtIndex: i];
|
||||
[self _removeDeliveredNotification:un];
|
||||
}
|
||||
[_deliveredNotifications removeAllObjects];
|
||||
NSUInteger i, count = [_deliveredNotifications count];
|
||||
|
||||
for (i = 0; i < count; i++)
|
||||
{
|
||||
NSUserNotification *un = [_deliveredNotifications objectAtIndex: i];
|
||||
[self _removeDeliveredNotification:un];
|
||||
}
|
||||
[_deliveredNotifications removeAllObjects];
|
||||
}
|
||||
|
||||
- (NSUserNotification *) deliveredNotificationWithUniqueId: (id)uniqueId
|
||||
{
|
||||
NSUInteger i, count = [_deliveredNotifications count];
|
||||
for (i = 0; i < count; i++)
|
||||
{
|
||||
NSUserNotification *un = [_deliveredNotifications objectAtIndex: i];
|
||||
if ([un->_uniqueId isEqual: uniqueId])
|
||||
return un;
|
||||
}
|
||||
return nil;
|
||||
NSUInteger i, count = [_deliveredNotifications count];
|
||||
|
||||
for (i = 0; i < count; i++)
|
||||
{
|
||||
NSUserNotification *un = [_deliveredNotifications objectAtIndex: i];
|
||||
if ([un->_uniqueId isEqual: uniqueId])
|
||||
{
|
||||
return un;
|
||||
}
|
||||
}
|
||||
return nil;
|
||||
}
|
||||
|
||||
@end
|
||||
|
|
|
|||
Loading…
Reference in a new issue