• R/O
  • HTTP
  • SSH
  • HTTPS

Commit

Frequently used words (click to add to your profile)

javac++androidlinuxc#windowsobjective-ccocoa誰得qtpythonphprubygameguibathyscaphec計画中(planning stage)翻訳omegatframeworktwitterdomtestvb.netdirectxゲームエンジンbtronarduinopreviewer

「プロジェクト終了」 BathyScapheのプレビューアプラグインを複数使用出来るようにするプラグイン


Commit MetaInfo

Revision8b2b8fe4176d1b4d9ee2e99bcb2371ec1f134389 (tree)
Time2010-09-12 12:38:58
Authormasakih <masakih@user...>
Commitermasakih

Log Message

[Mod] シングルトンの実装を変更。

git-svn-id: svn+ssh://macmini/usr/local/svnrepos/PreviewerSelector/PreviewerSelector@26 42e33f61-e417-4bac-a148-64f5df846d20

Change Summary

Incremental Difference

--- a/PSPreference.h
+++ b/PSPreference.h
@@ -10,7 +10,7 @@
1010 NSMutableArray *plugInList;
1111 }
1212
13-+ (id)sharedInstance;
13++ (id)sharedPreference;
1414 - (void)setPlugInList:(id)list;
1515
1616 - (IBAction)togglePreferencePanel: (id) sender;
--- a/PSPreference.m
+++ b/PSPreference.m
@@ -15,36 +15,42 @@ static NSString *const PSPRowIndexType = @"PSPRowIndexType";
1515
1616 static PSPreference *sSharedInstance = nil;
1717
18-+ (id)sharedInstance
18++ (PSPreference*)sharedPreference
1919 {
20- if(!sSharedInstance) {
21- sSharedInstance = [[self alloc] privateInit];
20+ if (sSharedInstance == nil) {
21+ sSharedInstance = [[super allocWithZone:NULL] initWithWindowNibName:@"Preference"];
2222 }
23-
2423 return sSharedInstance;
2524 }
2625
27-- (id)privateInit
26++ (id)allocWithZone:(NSZone *)zone
27+{
28+ return [[self sharedPreference] retain];
29+}
30+
31+- (id)copyWithZone:(NSZone *)zone
2832 {
29- self = [super initWithWindowNibName:@"Preference"];
30- if(self) {
31- //
32- }
33-
3433 return self;
3534 }
36-- (id)init
35+
36+- (id)retain
3737 {
38- self = [super init];
39- [self release];
40-
41- return [[self class] sharedInstance];
38+ return self;
4239 }
43-- (void)dealloc
40+
41+- (NSUInteger)retainCount
4442 {
45- [plugInList release];
46-
47- [super dealloc];
43+ return NSUIntegerMax; //denotes an object that cannot be released
44+}
45+
46+- (void)release
47+{
48+ //do nothing
49+}
50+
51+- (id)autorelease
52+{
53+ return self;
4854 }
4955 - (void)awakeFromNib
5056 {
--- a/PreviewerSelector.m
+++ b/PreviewerSelector.m
@@ -156,25 +156,17 @@ final:
156156 psSwapMethod();
157157 }
158158
159-+ (id)sharedInstance
159++ (PreviewerSelector *)sharedInstance
160160 {
161- @synchronized(self) {
162- if (sSharedInstance == nil) {
163- [[self alloc] init]; // ここでは代入していない
164- }
165- }
166- return sSharedInstance;
161+ if (sSharedInstance == nil) {
162+ sSharedInstance = [[super allocWithZone:NULL] init];
163+ }
164+ return sSharedInstance;
167165 }
168166
169167 + (id)allocWithZone:(NSZone *)zone
170168 {
171- @synchronized(self) {
172- if (sSharedInstance == nil) {
173- sSharedInstance = [super allocWithZone:zone];
174- return sSharedInstance; // 最初の割り当てで代入し、返す
175- }
176- }
177- return sSharedInstance;
169+ return [[self sharedInstance] retain];
178170 }
179171
180172 - (id)copyWithZone:(NSZone *)zone
@@ -189,12 +181,12 @@ final:
189181
190182 - (NSUInteger)retainCount
191183 {
192- return UINT_MAX; // 解放できないオブジェクトであることを示す
184+ return NSUIntegerMax; //denotes an object that cannot be released
193185 }
194186
195187 - (void)release
196188 {
197- // 何もしない
189+ //do nothing
198190 }
199191
200192 - (id)autorelease
@@ -429,7 +421,7 @@ final:
429421 }
430422 - (void)openPSPreference:(id)sender
431423 {
432- PSPreference *pref = [PSPreference sharedInstance];
424+ PSPreference *pref = [PSPreference sharedPreference];
433425 [pref setPlugInList:[self loadedPlugInsInfo]];
434426 [pref showWindow:self];
435427 }
@@ -548,7 +540,7 @@ final:
548540
549541 - (IBAction) togglePreviewPanel : (id) sender
550542 {
551- PSPreference *pref = [PSPreference sharedInstance];
543+ PSPreference *pref = [PSPreference sharedPreference];
552544 [pref setPlugInList:[self loadedPlugInsInfo]];
553545 [pref togglePreferencePanel:self];
554546 }
--- a/PreviewerSelector.xcodeproj/masaki.mode1v3
+++ b/PreviewerSelector.xcodeproj/masaki.mode1v3
@@ -360,9 +360,8 @@
360360 <key>PBXSmartGroupTreeModuleOutlineStateSelectionKey</key>
361361 <array>
362362 <array>
363- <integer>21</integer>
364- <integer>19</integer>
365- <integer>14</integer>
363+ <integer>10</integer>
364+ <integer>1</integer>
366365 <integer>0</integer>
367366 </array>
368367 </array>
@@ -406,7 +405,7 @@
406405 <key>PBXProjectModuleGUID</key>
407406 <string>1CE0B20306471E060097A5F4</string>
408407 <key>PBXProjectModuleLabel</key>
409- <string>Localizable.strings</string>
408+ <string>NSKeyedArchiver.h</string>
410409 <key>PBXSplitModuleInNavigatorKey</key>
411410 <dict>
412411 <key>Split0</key>
@@ -414,36 +413,37 @@
414413 <key>PBXProjectModuleGUID</key>
415414 <string>1CE0B20406471E060097A5F4</string>
416415 <key>PBXProjectModuleLabel</key>
417- <string>Localizable.strings</string>
416+ <string>NSKeyedArchiver.h</string>
418417 <key>_historyCapacity</key>
419418 <integer>0</integer>
420419 <key>bookmark</key>
421- <string>F423362C12334BB7005BA1B8</string>
420+ <string>F458F2C9123C617900A546E4</string>
422421 <key>history</key>
423422 <array>
424423 <string>F4C981E00F46C583005499D7</string>
425424 <string>F4C6F3B00F470B4F0078E711</string>
426- <string>F432B5AC0F4854EC00E28D22</string>
427425 <string>F450329E0F66AB5A00B0B042</string>
428426 <string>F4D2550111C79FF800232358</string>
429427 <string>F4D2553411C7A46800232358</string>
430428 <string>F4D2553611C7A46800232358</string>
431429 <string>F4D2560A11C7AA2C00232358</string>
432430 <string>F4D2560C11C7AA2C00232358</string>
433- <string>F4D2565B11C7B1ED00232358</string>
434431 <string>F4D2566611C7B31D00232358</string>
435432 <string>F46DB903121C1E8F006F8C6D</string>
436433 <string>F46DB90A121D6294006F8C6D</string>
437434 <string>F46DB90C121D6294006F8C6D</string>
438435 <string>F46DB90D121D6294006F8C6D</string>
439- <string>F46DB90E121D6294006F8C6D</string>
440436 <string>F468C2A6121D7D08009EFA3E</string>
441437 <string>F423361A12334362005BA1B8</string>
442438 <string>F423362812334BB7005BA1B8</string>
443439 <string>F423362912334BB7005BA1B8</string>
444- <string>F423362A12334BB7005BA1B8</string>
445- <string>F423362B12334BB7005BA1B8</string>
446- <string>F450329C0F66AB5A00B0B042</string>
440+ <string>F49061F5123A7C0800458627</string>
441+ <string>F49061F6123A7C0800458627</string>
442+ <string>F4906224123A7E4D00458627</string>
443+ <string>F4906225123A7E4D00458627</string>
444+ <string>F4906226123A7E4D00458627</string>
445+ <string>F458F2A9123C5B9800A546E4</string>
446+ <string>F458F2AA123C5B9800A546E4</string>
447447 </array>
448448 </dict>
449449 <key>SplitCount</key>
@@ -455,14 +455,14 @@
455455 <key>GeometryConfiguration</key>
456456 <dict>
457457 <key>Frame</key>
458- <string>{{0, 0}, {918, 555}}</string>
458+ <string>{{0, 0}, {918, 679}}</string>
459459 <key>RubberWindowFrame</key>
460460 <string>192 145 1126 725 0 0 1440 878 </string>
461461 </dict>
462462 <key>Module</key>
463463 <string>PBXNavigatorGroup</string>
464464 <key>Proportion</key>
465- <string>555pt</string>
465+ <string>679pt</string>
466466 </dict>
467467 <dict>
468468 <key>ContentConfiguration</key>
@@ -475,14 +475,14 @@
475475 <key>GeometryConfiguration</key>
476476 <dict>
477477 <key>Frame</key>
478- <string>{{0, 560}, {918, 124}}</string>
478+ <string>{{0, 684}, {918, 0}}</string>
479479 <key>RubberWindowFrame</key>
480480 <string>192 145 1126 725 0 0 1440 878 </string>
481481 </dict>
482482 <key>Module</key>
483483 <string>XCDetailModule</string>
484484 <key>Proportion</key>
485- <string>124pt</string>
485+ <string>0pt</string>
486486 </dict>
487487 </array>
488488 <key>Proportion</key>
@@ -501,9 +501,9 @@
501501 </array>
502502 <key>TableOfContents</key>
503503 <array>
504- <string>F423361D12334362005BA1B8</string>
504+ <string>F458F28D123C58A600A546E4</string>
505505 <string>1CE0B1FE06471DED0097A5F4</string>
506- <string>F423361E12334362005BA1B8</string>
506+ <string>F458F28E123C58A600A546E4</string>
507507 <string>1CE0B20306471E060097A5F4</string>
508508 <string>1CE0B20506471E060097A5F4</string>
509509 </array>
@@ -622,7 +622,7 @@
622622 <key>StatusbarIsVisible</key>
623623 <true/>
624624 <key>TimeStamp</key>
625- <real>305351607.15960902</real>
625+ <real>305947001.78109002</real>
626626 <key>ToolbarDisplayMode</key>
627627 <integer>2</integer>
628628 <key>ToolbarIsVisible</key>
@@ -637,11 +637,15 @@
637637 <integer>5</integer>
638638 <key>WindowOrderList</key>
639639 <array>
640- <string>F423362012334362005BA1B8</string>
641- <string>F423362112334362005BA1B8</string>
642- <string>1CD10A99069EF8BA00B06720</string>
640+ <string>F458F2CA123C617900A546E4</string>
641+ <string>1C530D57069F1CE1000CFCEE</string>
642+ <string>1C0AD2AF069F1E9B00FABCE6</string>
643+ <string>F458F291123C58A600A546E4</string>
644+ <string>F458F292123C58A600A546E4</string>
643645 <string>F4F4DDE80F67D5AD00C75461</string>
644646 <string>/Users/masaki/Projects/PreviewerSelector/PreviewerSelector.xcodeproj</string>
647+ <string>F458F2A4123C5B5E00A546E4</string>
648+ <string>1CD10A99069EF8BA00B06720</string>
645649 <string>1C78EAAD065D492600B07095</string>
646650 </array>
647651 <key>WindowString</key>
@@ -722,7 +726,7 @@
722726 <key>TableOfContents</key>
723727 <array>
724728 <string>F4F4DDE80F67D5AD00C75461</string>
725- <string>F423360E12334308005BA1B8</string>
729+ <string>F458F284123C58A300A546E4</string>
726730 <string>1CD0528F0623707200166675</string>
727731 <string>XCMainBuildResultsModuleGUID</string>
728732 </array>
@@ -842,13 +846,13 @@
842846 <key>TableOfContents</key>
843847 <array>
844848 <string>1CD10A99069EF8BA00B06720</string>
845- <string>F423361312334360005BA1B8</string>
849+ <string>F458F285123C58A300A546E4</string>
846850 <string>1C162984064C10D400B95A72</string>
847- <string>F423361412334360005BA1B8</string>
848- <string>F423361512334360005BA1B8</string>
849- <string>F423361612334360005BA1B8</string>
850- <string>F423361712334360005BA1B8</string>
851- <string>F423361812334360005BA1B8</string>
851+ <string>F458F286123C58A300A546E4</string>
852+ <string>F458F287123C58A300A546E4</string>
853+ <string>F458F288123C58A300A546E4</string>
854+ <string>F458F289123C58A300A546E4</string>
855+ <string>F458F28A123C58A300A546E4</string>
852856 </array>
853857 <key>ToolbarConfiguration</key>
854858 <string>xcode.toolbar.config.debugV3</string>
@@ -857,7 +861,7 @@
857861 <key>WindowToolGUID</key>
858862 <string>1CD10A99069EF8BA00B06720</string>
859863 <key>WindowToolIsVisible</key>
860- <false/>
864+ <true/>
861865 </dict>
862866 <dict>
863867 <key>FirstTimeWindowDisplayed</key>
@@ -938,8 +942,8 @@
938942 <key>TableOfContents</key>
939943 <array>
940944 <string>1C530D57069F1CE1000CFCEE</string>
941- <string>F4D2554211C7A4A100232358</string>
942- <string>F4D2554311C7A4A100232358</string>
945+ <string>F458F2A2123C5B5E00A546E4</string>
946+ <string>F458F2A3123C5B5E00A546E4</string>
943947 <string>1CDD528C0622207200134675</string>
944948 <string>1CD0528E0623707200166675</string>
945949 </array>
@@ -1006,7 +1010,7 @@
10061010 <key>TableOfContents</key>
10071011 <array>
10081012 <string>1C78EAAD065D492600B07095</string>
1009- <string>F423361912334360005BA1B8</string>
1013+ <string>F458F28F123C58A600A546E4</string>
10101014 <string>1C78EAAC065D492600B07095</string>
10111015 </array>
10121016 <key>ToolbarConfiguration</key>
@@ -1147,7 +1151,7 @@
11471151 <key>TableOfContents</key>
11481152 <array>
11491153 <string>F4C6F3920F47034D0078E711</string>
1150- <string>F4D2569A11C7B7E200232358</string>
1154+ <string>F49061ED12390A1D00458627</string>
11511155 <string>1C78EAB2065D492600B07095</string>
11521156 <string>1CD052920623707200166675</string>
11531157 </array>
@@ -1226,7 +1230,7 @@
12261230 <real>168</real>
12271231 </array>
12281232 <key>RubberWindowFrame</key>
1229- <string>343 309 744 409 0 0 1280 832 </string>
1233+ <string>445 341 744 409 0 0 1440 878 </string>
12301234 </dict>
12311235 <key>Module</key>
12321236 <string>PBXSmartGroupTreeModule</string>
@@ -1248,7 +1252,7 @@
12481252 <key>Frame</key>
12491253 <string>{{190, 0}, {554, 368}}</string>
12501254 <key>RubberWindowFrame</key>
1251- <string>343 309 744 409 0 0 1280 832 </string>
1255+ <string>445 341 744 409 0 0 1440 878 </string>
12521256 </dict>
12531257 <key>Module</key>
12541258 <string>XCDetailModule</string>
@@ -1275,19 +1279,19 @@
12751279 <true/>
12761280 <key>TableOfContents</key>
12771281 <array>
1278- <string>F4C9817B0F469A44005499D7</string>
1279- <string>F4C9817C0F469A44005499D7</string>
1282+ <string>F458F2A4123C5B5E00A546E4</string>
1283+ <string>F458F2A5123C5B5E00A546E4</string>
12801284 <string>1CE0B1FE06471DED0097A5F4</string>
12811285 <string>1CA1AED706398EBD00589147</string>
12821286 </array>
12831287 <key>ToolbarConfiguration</key>
12841288 <string>xcode.toolbar.config.breakpointsV3</string>
12851289 <key>WindowString</key>
1286- <string>343 309 744 409 0 0 1280 832 </string>
1290+ <string>445 341 744 409 0 0 1440 878 </string>
12871291 <key>WindowToolGUID</key>
1288- <string>F4C9817B0F469A44005499D7</string>
1292+ <string>F458F2A4123C5B5E00A546E4</string>
12891293 <key>WindowToolIsVisible</key>
1290- <false/>
1294+ <true/>
12911295 </dict>
12921296 <dict>
12931297 <key>FirstTimeWindowDisplayed</key>
@@ -1436,7 +1440,7 @@
14361440 <real>22</real>
14371441 </array>
14381442 <key>RubberWindowFrame</key>
1439- <string>34 381 630 352 0 0 1280 832 </string>
1443+ <string>42 416 630 352 0 0 1440 878 </string>
14401444 </dict>
14411445 <key>Module</key>
14421446 <string>PBXClassBrowserModule</string>
@@ -1459,13 +1463,13 @@
14591463 <key>TableOfContents</key>
14601464 <array>
14611465 <string>1C0AD2AF069F1E9B00FABCE6</string>
1462- <string>F450326B0F669F7300B0B042</string>
1466+ <string>F458F29E123C5AC300A546E4</string>
14631467 <string>1CA6456E063B45B4001379D8</string>
14641468 </array>
14651469 <key>ToolbarConfiguration</key>
14661470 <string>xcode.toolbar.config.classbrowser</string>
14671471 <key>WindowString</key>
1468- <string>34 381 630 352 0 0 1280 832 </string>
1472+ <string>42 416 630 352 0 0 1440 878 </string>
14691473 <key>WindowToolGUID</key>
14701474 <string>1C0AD2AF069F1E9B00FABCE6</string>
14711475 <key>WindowToolIsVisible</key>
--- a/PreviewerSelector.xcodeproj/masaki.pbxuser
+++ b/PreviewerSelector.xcodeproj/masaki.pbxuser
@@ -8,10 +8,11 @@
88 8D5B49AC048680CD000E48DA /* PreviewerSelector */,
99 );
1010 breakpoints = (
11- F468C2A4121D7D01009EFA3E /* PreviewerSelector.m:301 */,
12- F468C2CC121D7D87009EFA3E /* PreviewerSelector.m:224 */,
13- F423360912334249005BA1B8 /* PreviewerSelector.m:278 */,
14- F423360F1233432B005BA1B8 /* PreviewerSelector.m:342 */,
11+ F468C2A4121D7D01009EFA3E /* PreviewerSelector.m:293 */,
12+ F468C2CC121D7D87009EFA3E /* PreviewerSelector.m:216 */,
13+ F423360912334249005BA1B8 /* PreviewerSelector.m:270 */,
14+ F423360F1233432B005BA1B8 /* PreviewerSelector.m:334 */,
15+ F458F295123C58E100A546E4 /* PreviewerSelector.m:488 */,
1516 );
1617 codeSenseManager = F4F15C460A0CEC2300C7526C /* Code sense */;
1718 executables = (
@@ -112,25 +113,37 @@
112113 PBXFileDataSource_Target_ColumnID,
113114 );
114115 };
115- PBXPerProjectTemplateStateSaveDate = 305727863;
116- PBXWorkspaceStateSaveDate = 305727863;
116+ PBXPerProjectTemplateStateSaveDate = 305944466;
117+ PBXWorkspaceStateSaveDate = 305944466;
117118 };
118119 perUserProjectItems = {
119120 F423361A12334362005BA1B8 = F423361A12334362005BA1B8 /* PlistBookmark */;
120121 F423362812334BB7005BA1B8 = F423362812334BB7005BA1B8 /* PBXTextBookmark */;
121122 F423362912334BB7005BA1B8 = F423362912334BB7005BA1B8 /* PBXTextBookmark */;
122- F423362A12334BB7005BA1B8 = F423362A12334BB7005BA1B8 /* PBXTextBookmark */;
123- F423362B12334BB7005BA1B8 = F423362B12334BB7005BA1B8 /* PBXTextBookmark */;
124- F423362C12334BB7005BA1B8 = F423362C12334BB7005BA1B8 /* PBXTextBookmark */;
125- F432B5AC0F4854EC00E28D22 = F432B5AC0F4854EC00E28D22 /* PBXTextBookmark */;
126- F450329C0F66AB5A00B0B042 = F450329C0F66AB5A00B0B042 /* PBXTextBookmark */;
127123 F450329E0F66AB5A00B0B042 = F450329E0F66AB5A00B0B042 /* PlistBookmark */;
124+ F458F28B123C58A600A546E4 /* PBXTextBookmark */ = F458F28B123C58A600A546E4 /* PBXTextBookmark */;
125+ F458F28C123C58A600A546E4 /* PBXTextBookmark */ = F458F28C123C58A600A546E4 /* PBXTextBookmark */;
126+ F458F299123C58EA00A546E4 /* PBXTextBookmark */ = F458F299123C58EA00A546E4 /* PBXTextBookmark */;
127+ F458F29A123C58EA00A546E4 /* PBXTextBookmark */ = F458F29A123C58EA00A546E4 /* PBXTextBookmark */;
128+ F458F2A9123C5B9800A546E4 /* PBXTextBookmark */ = F458F2A9123C5B9800A546E4 /* PBXTextBookmark */;
129+ F458F2AA123C5B9800A546E4 /* PBXTextBookmark */ = F458F2AA123C5B9800A546E4 /* PBXTextBookmark */;
130+ F458F2AC123C5B9800A546E4 /* PBXTextBookmark */ = F458F2AC123C5B9800A546E4 /* PBXTextBookmark */;
131+ F458F2B8123C5C6300A546E4 /* PBXTextBookmark */ = F458F2B8123C5C6300A546E4 /* PBXTextBookmark */;
132+ F458F2C1123C603600A546E4 /* PBXTextBookmark */ = F458F2C1123C603600A546E4 /* PBXTextBookmark */;
133+ F458F2C9123C617900A546E4 /* PBXTextBookmark */ = F458F2C9123C617900A546E4 /* PBXTextBookmark */;
128134 F468C2A6121D7D08009EFA3E = F468C2A6121D7D08009EFA3E /* PBXTextBookmark */;
129135 F46DB903121C1E8F006F8C6D = F46DB903121C1E8F006F8C6D /* PBXTextBookmark */;
130136 F46DB90A121D6294006F8C6D = F46DB90A121D6294006F8C6D /* PBXTextBookmark */;
131137 F46DB90C121D6294006F8C6D = F46DB90C121D6294006F8C6D /* PBXTextBookmark */;
132138 F46DB90D121D6294006F8C6D = F46DB90D121D6294006F8C6D /* PBXTextBookmark */;
133- F46DB90E121D6294006F8C6D = F46DB90E121D6294006F8C6D /* PBXTextBookmark */;
139+ F49061F5123A7C0800458627 = F49061F5123A7C0800458627 /* PBXTextBookmark */;
140+ F49061F6123A7C0800458627 = F49061F6123A7C0800458627 /* PBXTextBookmark */;
141+ F4906222123A7E4D00458627 = F4906222123A7E4D00458627 /* PBXTextBookmark */;
142+ F4906224123A7E4D00458627 = F4906224123A7E4D00458627 /* PBXTextBookmark */;
143+ F4906225123A7E4D00458627 = F4906225123A7E4D00458627 /* PBXTextBookmark */;
144+ F4906226123A7E4D00458627 = F4906226123A7E4D00458627 /* PBXTextBookmark */;
145+ F4906227123A7E4D00458627 = F4906227123A7E4D00458627 /* PBXTextBookmark */;
146+ F4906229123B9BFC00458627 = F4906229123B9BFC00458627 /* PBXTextBookmark */;
134147 F4C6F3B00F470B4F0078E711 = F4C6F3B00F470B4F0078E711 /* PlistBookmark */;
135148 F4C981E00F46C583005499D7 = F4C981E00F46C583005499D7 /* PBXTextBookmark */;
136149 F4D2550111C79FF800232358 = F4D2550111C79FF800232358 /* PBXTextBookmark */;
@@ -138,7 +151,6 @@
138151 F4D2553611C7A46800232358 = F4D2553611C7A46800232358 /* PBXTextBookmark */;
139152 F4D2560A11C7AA2C00232358 = F4D2560A11C7AA2C00232358 /* PBXTextBookmark */;
140153 F4D2560C11C7AA2C00232358 = F4D2560C11C7AA2C00232358 /* PBXTextBookmark */;
141- F4D2565B11C7B1ED00232358 = F4D2565B11C7B1ED00232358 /* PBXTextBookmark */;
142154 F4D2566611C7B31D00232358 = F4D2566611C7B31D00232358 /* PBXTextBookmark */;
143155 };
144156 sourceControlManager = F4F15C450A0CEC2300C7526C /* Source Control */;
@@ -162,7 +174,7 @@
162174 8D5B49AC048680CD000E48DA /* PreviewerSelector */ = {
163175 activeExec = 0;
164176 };
165- F423360912334249005BA1B8 /* PreviewerSelector.m:278 */ = {
177+ F423360912334249005BA1B8 /* PreviewerSelector.m:270 */ = {
166178 isa = PBXFileBreakpoint;
167179 actions = (
168180 );
@@ -174,13 +186,13 @@
174186 functionName = "-loadDefaultPreviewer";
175187 hitCount = 0;
176188 ignoreCount = 0;
177- lineNumber = 278;
189+ lineNumber = 270;
178190 location = ImagePreviewer;
179- modificationTime = 305349472.928263;
191+ modificationTime = 305947000.454138;
180192 originalNumberOfMultipleMatches = 1;
181- state = 1;
193+ state = 2;
182194 };
183- F423360F1233432B005BA1B8 /* PreviewerSelector.m:342 */ = {
195+ F423360F1233432B005BA1B8 /* PreviewerSelector.m:334 */ = {
184196 isa = PBXFileBreakpoint;
185197 actions = (
186198 );
@@ -192,11 +204,11 @@
192204 functionName = "-restorePlugInsInfo";
193205 hitCount = 0;
194206 ignoreCount = 0;
195- lineNumber = 342;
207+ lineNumber = 334;
196208 location = ImagePreviewer;
197- modificationTime = 305349472.928317;
209+ modificationTime = 305947000.454912;
198210 originalNumberOfMultipleMatches = 1;
199- state = 1;
211+ state = 2;
200212 };
201213 F423361A12334362005BA1B8 /* PlistBookmark */ = {
202214 isa = PlistBookmark;
@@ -229,75 +241,162 @@
229241 vrLen = 810;
230242 vrLoc = 25;
231243 };
232- F423362A12334BB7005BA1B8 /* PBXTextBookmark */ = {
244+ F45032530F669A9500B0B042 /* PSPreviewerInterface.h */ = {
245+ uiCtxt = {
246+ sepNavIntBoundsRect = "{{0, 0}, {869, 572}}";
247+ sepNavSelRange = "{787, 0}";
248+ sepNavVisRange = "{30, 1229}";
249+ };
250+ };
251+ F450329E0F66AB5A00B0B042 /* PlistBookmark */ = {
252+ isa = PlistBookmark;
253+ fRef = 089C167EFE841241C02AAC07 /* English */;
254+ fallbackIsa = PBXBookmark;
255+ isK = 0;
256+ kPath = (
257+ );
258+ name = /Volumes/MachintoshHD/Users/masaki/Project/PreviewerSelector/English.lproj/InfoPlist.strings;
259+ rLen = 0;
260+ rLoc = 2147483647;
261+ };
262+ F458F28B123C58A600A546E4 /* PBXTextBookmark */ = {
233263 isa = PBXTextBookmark;
234264 fRef = F4F160440A0D1FC000C7526C /* PreviewerSelector.m */;
235- name = "PreviewerSelector.m: 407";
265+ name = "PreviewerSelector.m: 112";
266+ rLen = 1;
267+ rLoc = 3260;
268+ rType = 0;
269+ vrLen = 1143;
270+ vrLoc = 3111;
271+ };
272+ F458F28C123C58A600A546E4 /* PBXTextBookmark */ = {
273+ isa = PBXTextBookmark;
274+ fRef = F4F160440A0D1FC000C7526C /* PreviewerSelector.m */;
275+ name = "PreviewerSelector.m: 492";
236276 rLen = 0;
237- rLoc = 10478;
277+ rLoc = 12647;
238278 rType = 0;
239- vrLen = 1047;
240- vrLoc = 9575;
279+ vrLen = 1102;
280+ vrLoc = 12207;
281+ };
282+ F458F295123C58E100A546E4 /* PreviewerSelector.m:488 */ = {
283+ isa = PBXFileBreakpoint;
284+ actions = (
285+ );
286+ breakpointStyle = 0;
287+ continueAfterActions = 0;
288+ countType = 0;
289+ delayBeforeContinue = 0;
290+ fileReference = F4F160440A0D1FC000C7526C /* PreviewerSelector.m */;
291+ functionName = "-initWithPreferences:";
292+ hitCount = 0;
293+ ignoreCount = 0;
294+ lineNumber = 488;
295+ location = ImagePreviewer;
296+ modificationTime = 305947000.455669;
297+ originalNumberOfMultipleMatches = 1;
298+ state = 2;
241299 };
242- F423362B12334BB7005BA1B8 /* PBXTextBookmark */ = {
300+ F458F299123C58EA00A546E4 /* PBXTextBookmark */ = {
243301 isa = PBXTextBookmark;
244- fRef = F4E0BA8C0CF73509003E4686 /* English */;
245- name = "Localizable.strings: 1";
302+ fRef = F4F160440A0D1FC000C7526C /* PreviewerSelector.m */;
303+ name = "PreviewerSelector.m: 492";
246304 rLen = 0;
247- rLoc = 0;
305+ rLoc = 12647;
248306 rType = 0;
249- vrLen = 0;
250- vrLoc = 0;
307+ vrLen = 1102;
308+ vrLoc = 12207;
251309 };
252- F423362C12334BB7005BA1B8 /* PBXTextBookmark */ = {
310+ F458F29A123C58EA00A546E4 /* PBXTextBookmark */ = {
253311 isa = PBXTextBookmark;
254- fRef = F4E0BA910CF73521003E4686 /* Japanese */;
255- name = "Localizable.strings: 13";
312+ fRef = F4F160440A0D1FC000C7526C /* PreviewerSelector.m */;
313+ name = "PreviewerSelector.m: 492";
256314 rLen = 0;
257- rLoc = 373;
315+ rLoc = 12647;
258316 rType = 0;
259- vrLen = 373;
260- vrLoc = 0;
317+ vrLen = 1102;
318+ vrLoc = 12207;
261319 };
262- F432B5AC0F4854EC00E28D22 /* PBXTextBookmark */ = {
320+ F458F2A9123C5B9800A546E4 /* PBXTextBookmark */ = {
263321 isa = PBXTextBookmark;
264- fRef = F4F160350A0D1ED000C7526C /* PSPreference.h */;
265- name = "PSPreference.h: 9";
322+ fRef = F4F160440A0D1FC000C7526C /* PreviewerSelector.m */;
323+ name = "PreviewerSelector.m: 486";
266324 rLen = 0;
267- rLoc = 175;
325+ rLoc = 12549;
268326 rType = 0;
269- vrLen = 316;
270- vrLoc = 0;
327+ vrLen = 1060;
328+ vrLoc = 12207;
271329 };
272- F45032530F669A9500B0B042 /* PSPreviewerInterface.h */ = {
330+ F458F2AA123C5B9800A546E4 /* PBXTextBookmark */ = {
331+ isa = PBXTextBookmark;
332+ fRef = F458F2AB123C5B9800A546E4 /* NSKeyedArchiver.h */;
333+ name = "NSKeyedArchiver.h: 96";
334+ rLen = 22;
335+ rLoc = 2803;
336+ rType = 0;
337+ vrLen = 1582;
338+ vrLoc = 1794;
339+ };
340+ F458F2AB123C5B9800A546E4 /* NSKeyedArchiver.h */ = {
341+ isa = PBXFileReference;
342+ lastKnownFileType = sourcecode.c.h;
343+ name = NSKeyedArchiver.h;
344+ path = /System/Library/Frameworks/Foundation.framework/Versions/C/Headers/NSKeyedArchiver.h;
345+ sourceTree = "<absolute>";
346+ };
347+ F458F2AC123C5B9800A546E4 /* PBXTextBookmark */ = {
348+ isa = PBXTextBookmark;
349+ fRef = F458F2AD123C5B9800A546E4 /* NSKeyedArchiver.h */;
350+ name = "NSKeyedArchiver.h: 96";
351+ rLen = 22;
352+ rLoc = 2803;
353+ rType = 0;
354+ vrLen = 1628;
355+ vrLoc = 1651;
356+ };
357+ F458F2AD123C5B9800A546E4 /* NSKeyedArchiver.h */ = {
358+ isa = PBXFileReference;
359+ lastKnownFileType = sourcecode.c.h;
360+ name = NSKeyedArchiver.h;
361+ path = /System/Library/Frameworks/Foundation.framework/Versions/C/Headers/NSKeyedArchiver.h;
362+ sourceTree = "<absolute>";
273363 uiCtxt = {
274- sepNavIntBoundsRect = "{{0, 0}, {869, 572}}";
275- sepNavSelRange = "{787, 0}";
276- sepNavVisRange = "{30, 1229}";
364+ sepNavIntBoundsRect = "{{0, 0}, {869, 3471}}";
365+ sepNavSelRange = "{2803, 22}";
366+ sepNavVisRange = "{1651, 1628}";
277367 };
278368 };
279- F450329C0F66AB5A00B0B042 /* PBXTextBookmark */ = {
369+ F458F2B8123C5C6300A546E4 /* PBXTextBookmark */ = {
280370 isa = PBXTextBookmark;
281- fRef = F4E0BA910CF73521003E4686 /* Japanese */;
282- name = "Localizable.strings: 13";
283- rLen = 0;
284- rLoc = 373;
371+ fRef = F458F2AD123C5B9800A546E4 /* NSKeyedArchiver.h */;
372+ name = "NSKeyedArchiver.h: 96";
373+ rLen = 22;
374+ rLoc = 2803;
285375 rType = 0;
286- vrLen = 356;
287- vrLoc = 0;
376+ vrLen = 1628;
377+ vrLoc = 1651;
288378 };
289- F450329E0F66AB5A00B0B042 /* PlistBookmark */ = {
290- isa = PlistBookmark;
291- fRef = 089C167EFE841241C02AAC07 /* English */;
292- fallbackIsa = PBXBookmark;
293- isK = 0;
294- kPath = (
295- );
296- name = /Volumes/MachintoshHD/Users/masaki/Project/PreviewerSelector/English.lproj/InfoPlist.strings;
297- rLen = 0;
298- rLoc = 2147483647;
379+ F458F2C1123C603600A546E4 /* PBXTextBookmark */ = {
380+ isa = PBXTextBookmark;
381+ fRef = F458F2AD123C5B9800A546E4 /* NSKeyedArchiver.h */;
382+ name = "NSKeyedArchiver.h: 96";
383+ rLen = 22;
384+ rLoc = 2803;
385+ rType = 0;
386+ vrLen = 1628;
387+ vrLoc = 1651;
388+ };
389+ F458F2C9123C617900A546E4 /* PBXTextBookmark */ = {
390+ isa = PBXTextBookmark;
391+ fRef = F458F2AD123C5B9800A546E4 /* NSKeyedArchiver.h */;
392+ name = "NSKeyedArchiver.h: 96";
393+ rLen = 22;
394+ rLoc = 2803;
395+ rType = 0;
396+ vrLen = 1628;
397+ vrLoc = 1651;
299398 };
300- F468C2A4121D7D01009EFA3E /* PreviewerSelector.m:301 */ = {
399+ F468C2A4121D7D01009EFA3E /* PreviewerSelector.m:293 */ = {
301400 isa = PBXFileBreakpoint;
302401 actions = (
303402 );
@@ -307,13 +406,13 @@
307406 delayBeforeContinue = 0;
308407 fileReference = F4F160440A0D1FC000C7526C /* PreviewerSelector.m */;
309408 functionName = "-loadPlugIns";
310- hitCount = 1;
409+ hitCount = 0;
311410 ignoreCount = 0;
312- lineNumber = 301;
411+ lineNumber = 293;
313412 location = ImagePreviewer;
314- modificationTime = 305349478.123632;
413+ modificationTime = 305947000.451702;
315414 originalNumberOfMultipleMatches = 1;
316- state = 0;
415+ state = 2;
317416 };
318417 F468C2A6121D7D08009EFA3E /* PBXTextBookmark */ = {
319418 isa = PBXTextBookmark;
@@ -325,7 +424,7 @@
325424 vrLen = 1229;
326425 vrLoc = 30;
327426 };
328- F468C2CC121D7D87009EFA3E /* PreviewerSelector.m:224 */ = {
427+ F468C2CC121D7D87009EFA3E /* PreviewerSelector.m:216 */ = {
329428 isa = PBXFileBreakpoint;
330429 actions = (
331430 );
@@ -337,11 +436,11 @@
337436 functionName = "-registPlugIn:name:path:";
338437 hitCount = 0;
339438 ignoreCount = 0;
340- lineNumber = 224;
439+ lineNumber = 216;
341440 location = ImagePreviewer;
342- modificationTime = 305349472.928205;
441+ modificationTime = 305947000.453261;
343442 originalNumberOfMultipleMatches = 1;
344- state = 1;
443+ state = 2;
345444 };
346445 F46DB903121C1E8F006F8C6D /* PBXTextBookmark */ = {
347446 isa = PBXTextBookmark;
@@ -383,16 +482,6 @@
383482 vrLen = 520;
384483 vrLoc = 0;
385484 };
386- F46DB90E121D6294006F8C6D /* PBXTextBookmark */ = {
387- isa = PBXTextBookmark;
388- fRef = F4F160430A0D1FC000C7526C /* PreviewerSelector.h */;
389- name = "PreviewerSelector.h: 21";
390- rLen = 0;
391- rLoc = 451;
392- rType = 0;
393- vrLen = 981;
394- vrLoc = 92;
395- };
396485 F47281760CF48168008E5A5B /* English */ = {
397486 uiCtxt = {
398487 sepNavIntBoundsRect = "{{0, 0}, {869, 473}}";
@@ -400,6 +489,92 @@
400489 sepNavVisRange = "{0, 521}";
401490 };
402491 };
492+ F49061F5123A7C0800458627 /* PBXTextBookmark */ = {
493+ isa = PBXTextBookmark;
494+ fRef = F4E0BA8C0CF73509003E4686 /* English */;
495+ name = "Localizable.strings: 1";
496+ rLen = 0;
497+ rLoc = 0;
498+ rType = 0;
499+ vrLen = 0;
500+ vrLoc = 0;
501+ };
502+ F49061F6123A7C0800458627 /* PBXTextBookmark */ = {
503+ isa = PBXTextBookmark;
504+ fRef = F4E0BA910CF73521003E4686 /* Japanese */;
505+ name = "Localizable.strings: 10";
506+ rLen = 0;
507+ rLoc = 332;
508+ rType = 0;
509+ vrLen = 375;
510+ vrLoc = 0;
511+ };
512+ F4906222123A7E4D00458627 /* PBXTextBookmark */ = {
513+ isa = PBXTextBookmark;
514+ fRef = F4906223123A7E4D00458627 /* BASE と ローカル — PSPreference.m を diff */;
515+ name = "BASE と ローカル — PSPreference.m を diff: 24";
516+ rLen = 35;
517+ rLoc = 679;
518+ rType = 0;
519+ vrLen = 1065;
520+ vrLoc = 0;
521+ };
522+ F4906223123A7E4D00458627 /* BASE と ローカル — PSPreference.m を diff */ = {
523+ isa = PBXFileReference;
524+ lastKnownFileType = file;
525+ path = "BASE と ローカル — PSPreference.m を diff";
526+ sourceTree = "<group>";
527+ };
528+ F4906224123A7E4D00458627 /* PBXTextBookmark */ = {
529+ isa = PBXTextBookmark;
530+ fRef = F4F160350A0D1ED000C7526C /* PSPreference.h */;
531+ name = "PSPreference.h: 13";
532+ rLen = 0;
533+ rLoc = 230;
534+ rType = 0;
535+ vrLen = 318;
536+ vrLoc = 0;
537+ };
538+ F4906225123A7E4D00458627 /* PBXTextBookmark */ = {
539+ isa = PBXTextBookmark;
540+ fRef = F4F160430A0D1FC000C7526C /* PreviewerSelector.h */;
541+ name = "PreviewerSelector.h: 14";
542+ rLen = 17;
543+ rLoc = 257;
544+ rType = 0;
545+ vrLen = 1073;
546+ vrLoc = 0;
547+ };
548+ F4906226123A7E4D00458627 /* PBXTextBookmark */ = {
549+ isa = PBXTextBookmark;
550+ fRef = F4F160340A0D1ED000C7526C /* PSPreference.m */;
551+ name = "PSPreference.m: 25";
552+ rLen = 0;
553+ rLoc = 537;
554+ rType = 0;
555+ vrLen = 839;
556+ vrLoc = 0;
557+ };
558+ F4906227123A7E4D00458627 /* PBXTextBookmark */ = {
559+ isa = PBXTextBookmark;
560+ fRef = F4F160440A0D1FC000C7526C /* PreviewerSelector.m */;
561+ name = "PreviewerSelector.m: 161";
562+ rLen = 0;
563+ rLoc = 4339;
564+ rType = 0;
565+ vrLen = 834;
566+ vrLoc = 3745;
567+ };
568+ F4906229123B9BFC00458627 /* PBXTextBookmark */ = {
569+ isa = PBXTextBookmark;
570+ fRef = F4F160440A0D1FC000C7526C /* PreviewerSelector.m */;
571+ name = "PreviewerSelector.m: 161";
572+ rLen = 0;
573+ rLoc = 4339;
574+ rType = 0;
575+ vrLen = 971;
576+ vrLoc = 3541;
577+ };
403578 F4A2FAE30F467CDC00A84E18 /* PSPreviewerItem.h */ = {
404579 uiCtxt = {
405580 sepNavIntBoundsRect = "{{0, 0}, {869, 550}}";
@@ -520,16 +695,6 @@
520695 vrLen = 2122;
521696 vrLoc = 4194;
522697 };
523- F4D2565B11C7B1ED00232358 /* PBXTextBookmark */ = {
524- isa = PBXTextBookmark;
525- fRef = F4F160340A0D1ED000C7526C /* PSPreference.m */;
526- name = "PSPreference.m: 124";
527- rLen = 0;
528- rLoc = 2787;
529- rType = 0;
530- vrLen = 703;
531- vrLoc = 146;
532- };
533698 F4D2566611C7B31D00232358 /* PBXTextBookmark */ = {
534699 isa = PBXTextBookmark;
535700 fRef = F4D2566711C7B31D00232358 /* NSURL.h */;
@@ -566,7 +731,7 @@
566731 };
567732 F4E0BA8C0CF73509003E4686 /* English */ = {
568733 uiCtxt = {
569- sepNavIntBoundsRect = "{{0, 0}, {869, 523}}";
734+ sepNavIntBoundsRect = "{{0, 0}, {869, 519}}";
570735 sepNavSelRange = "{0, 0}";
571736 sepNavVisRange = "{0, 0}";
572737 };
@@ -574,8 +739,8 @@
574739 F4E0BA910CF73521003E4686 /* Japanese */ = {
575740 uiCtxt = {
576741 sepNavIntBoundsRect = "{{0, 0}, {869, 519}}";
577- sepNavSelRange = "{373, 0}";
578- sepNavVisRange = "{0, 373}";
742+ sepNavSelRange = "{332, 0}";
743+ sepNavVisRange = "{0, 375}";
579744 sepNavWindowFrame = "{{15, 55}, {746, 772}}";
580745 };
581746 };
@@ -597,38 +762,38 @@
597762 };
598763 F4F160340A0D1ED000C7526C /* PSPreference.m */ = {
599764 uiCtxt = {
600- sepNavIntBoundsRect = "{{0, 0}, {1020, 3029}}";
601- sepNavSelRange = "{2787, 0}";
602- sepNavVisRange = "{146, 703}";
765+ sepNavIntBoundsRect = "{{0, 0}, {880, 2925}}";
766+ sepNavSelRange = "{2118, 0}";
767+ sepNavVisRange = "{1916, 521}";
603768 sepNavVisRect = "{{0, 1201}, {764, 759}}";
604769 sepNavWindowFrame = "{{368, 67}, {809, 765}}";
605770 };
606771 };
607772 F4F160350A0D1ED000C7526C /* PSPreference.h */ = {
608773 uiCtxt = {
609- sepNavIntBoundsRect = "{{0, 0}, {869, 472}}";
610- sepNavSelRange = "{175, 0}";
611- sepNavVisRange = "{0, 316}";
774+ sepNavIntBoundsRect = "{{0, 0}, {869, 647}}";
775+ sepNavSelRange = "{230, 0}";
776+ sepNavVisRange = "{0, 318}";
612777 sepNavVisRect = "{{0, 0}, {764, 759}}";
613778 sepNavWindowFrame = "{{368, 0}, {809, 832}}";
614779 };
615780 };
616781 F4F160430A0D1FC000C7526C /* PreviewerSelector.h */ = {
617782 uiCtxt = {
618- sepNavIntBoundsRect = "{{0, 0}, {873, 598}}";
619- sepNavSelRange = "{451, 0}";
620- sepNavVisRange = "{92, 981}";
783+ sepNavIntBoundsRect = "{{0, 0}, {873, 647}}";
784+ sepNavSelRange = "{257, 17}";
785+ sepNavVisRange = "{0, 1073}";
621786 sepNavVisRect = "{{0, 0}, {764, 759}}";
622787 sepNavWindowFrame = "{{15, -5}, {809, 832}}";
623788 };
624789 };
625790 F4F160440A0D1FC000C7526C /* PreviewerSelector.m */ = {
626791 uiCtxt = {
627- sepNavIntBoundsRect = "{{0, 0}, {720, 9399}}";
628- sepNavSelRange = "{7644, 0}";
629- sepNavVisRange = "{6864, 676}";
792+ sepNavIntBoundsRect = "{{0, 0}, {775, 9464}}";
793+ sepNavSelRange = "{12700, 0}";
794+ sepNavVisRange = "{12531, 330}";
630795 sepNavVisRect = "{{0, 534}, {764, 759}}";
631- sepNavWindowFrame = "{{263, 64}, {809, 768}}";
796+ sepNavWindowFrame = "{{263, 77}, {809, 768}}";
632797 };
633798 };
634799 F4F160540A0D200800C7526C /* BSImagePreviewerInterface.h */ = {
@@ -686,6 +851,22 @@
686851 sourceDirectories = (
687852 );
688853 variableFormatDictionary = {
854+ $cs = 1;
855+ $ds = 1;
856+ $eax = 1;
857+ $ebp = 1;
858+ $ebx = 1;
859+ $ecx = 1;
860+ $edi = 1;
861+ $edx = 1;
862+ $eflags = 1;
863+ $eip = 1;
864+ $es = 1;
865+ $esi = 1;
866+ $esp = 1;
867+ $fs = 1;
868+ $gs = 1;
869+ $ss = 1;
689870 };
690871 };
691872 F4F161400A0D3A5300C7526C /* BathyScaphe.app */ = {