Revision: 4570
http://skim-app.svn.sourceforge.net/skim-app/?rev=4570&view=rev
Author: hofman
Date: 2008-09-07 10:22:16 +0000 (Sun, 07 Sep 2008)
Log Message:
-----------
Always return shared instances from shared instance class methods.
Modified Paths:
--------------
trunk/SKBookmarkController.m
trunk/SKDownloadController.m
trunk/SKFindController.m
trunk/SKInfoWindowController.m
trunk/SKLineInspector.m
trunk/SKNotesPanelController.m
trunk/SKPDFHoverWindow.m
trunk/SKPreferenceController.m
trunk/SKReleaseNotesController.m
Modified: trunk/SKBookmarkController.m
===================================================================
--- trunk/SKBookmarkController.m 2008-09-06 18:36:52 UTC (rev 4569)
+++ trunk/SKBookmarkController.m 2008-09-07 10:22:16 UTC (rev 4570)
@@ -110,7 +110,9 @@
}
+ (id)allocWithZone:(NSZone *)zone {
- return sharedBookmarkController ?: [super allocWithZone:zone];
+ if (sharedBookmarkController == nil)
+ [super allocWithZone:zone];
+ return sharedBookmarkController;
}
- (id)init {
Modified: trunk/SKDownloadController.m
===================================================================
--- trunk/SKDownloadController.m 2008-09-06 18:36:52 UTC (rev 4569)
+++ trunk/SKDownloadController.m 2008-09-07 10:22:16 UTC (rev 4570)
@@ -69,7 +69,9 @@
static SKDownloadController *sharedDownloadController = nil;
+ (id)sharedDownloadController {
- return sharedDownloadController ?: [[self alloc] init];
+ if (sharedDownloadController == nil)
+ [[self alloc] init];
+ return sharedDownloadController;
}
+ (id)allocWithZone:(NSZone *)zone {
Modified: trunk/SKFindController.m
===================================================================
--- trunk/SKFindController.m 2008-09-06 18:36:52 UTC (rev 4569)
+++ trunk/SKFindController.m 2008-09-07 10:22:16 UTC (rev 4570)
@@ -48,7 +48,9 @@
static SKFindController *sharedFindController = nil;
+ (id)sharedFindController {
- return sharedFindController ?: [[self alloc] init];
+ if (sharedFindController == nil)
+ [[self alloc] init];
+ return sharedFindController;
}
+ (id)allocWithZone:(NSZone *)zone {
Modified: trunk/SKInfoWindowController.m
===================================================================
--- trunk/SKInfoWindowController.m 2008-09-06 18:36:52 UTC (rev 4569)
+++ trunk/SKInfoWindowController.m 2008-09-07 10:22:16 UTC (rev 4570)
@@ -70,7 +70,9 @@
}
+ (id)sharedInstance {
- return sharedInstance ?: [[self alloc] init];
+ if (sharedInstance == nil)
+ [[self alloc] init];
+ return sharedInstance;
}
+ (id)allocWithZone:(NSZone *)zone {
Modified: trunk/SKLineInspector.m
===================================================================
--- trunk/SKLineInspector.m 2008-09-06 18:36:52 UTC (rev 4569)
+++ trunk/SKLineInspector.m 2008-09-07 10:22:16 UTC (rev 4570)
@@ -61,7 +61,9 @@
static SKLineInspector *sharedLineInspector = nil;
+ (id)sharedLineInspector {
- return sharedLineInspector ?: [[self alloc] init];
+ if (sharedLineInspector == nil)
+ [[self alloc] init];
+ return sharedLineInspector;
}
+ (BOOL)sharedLineInspectorExists {
Modified: trunk/SKNotesPanelController.m
===================================================================
--- trunk/SKNotesPanelController.m 2008-09-06 18:36:52 UTC (rev 4569)
+++ trunk/SKNotesPanelController.m 2008-09-07 10:22:16 UTC (rev 4570)
@@ -46,7 +46,9 @@
static SKNotesPanelController *sharedController = nil;
+ (id)sharedController {
- return sharedController ?: [[self alloc] init];
+ if (sharedController == nil)
+ [[self alloc] init];
+ return sharedController;
}
+ (BOOL)sharedControllerExists {
Modified: trunk/SKPDFHoverWindow.m
===================================================================
--- trunk/SKPDFHoverWindow.m 2008-09-06 18:36:52 UTC (rev 4569)
+++ trunk/SKPDFHoverWindow.m 2008-09-07 10:22:16 UTC (rev 4570)
@@ -68,7 +68,9 @@
static SKPDFHoverWindow *sharedHoverWindow = nil;
+ (id)sharedHoverWindow {
- return sharedHoverWindow ?: [[self alloc] init];
+ if (sharedHoverWindow == nil)
+ [[self alloc] init];
+ return sharedHoverWindow;
}
+ (id)allocWithZone:(NSZone *)zone {
Modified: trunk/SKPreferenceController.m
===================================================================
--- trunk/SKPreferenceController.m 2008-09-06 18:36:52 UTC (rev 4569)
+++ trunk/SKPreferenceController.m 2008-09-07 10:22:16 UTC (rev 4570)
@@ -62,7 +62,9 @@
static SKPreferenceController *sharedPrefenceController = nil;
+ (id)sharedPrefenceController {
- return sharedPrefenceController ?: [[self alloc] init];
+ if (sharedPrefenceController == nil)
+ [[self alloc] init];
+ return sharedPrefenceController;
}
+ (id)allocWithZone:(NSZone *)zone {
Modified: trunk/SKReleaseNotesController.m
===================================================================
--- trunk/SKReleaseNotesController.m 2008-09-06 18:36:52 UTC (rev 4569)
+++ trunk/SKReleaseNotesController.m 2008-09-07 10:22:16 UTC (rev 4570)
@@ -44,7 +44,9 @@
static SKReleaseNotesController *sharedReleaseNotesController = nil;
+ (id)sharedReleaseNotesController {
- return sharedReleaseNotesController ?: [[self alloc] init];
+ if (sharedReleaseNotesController == nil)
+ [[self alloc] init];
+ return sharedReleaseNotesController;
}
+ (id)allocWithZone:(NSZone *)zone {
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
