Changeset 705

Show
Ignore:
Timestamp:
12/08/08 09:48:31 (1 month ago)
Author:
gbooker
Message:

The other half of [703]

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/SapphireFrappliance/SapphireAllFileDataImporter.m

    r461 r705  
    6868} 
    6969 
    70 - (void) wasExhumedByPoppingController:(BRLayerController *) controller 
     70- (void) wasExhumed 
    7171{ 
    72         [super wasExhumedByPoppingController:controller]; 
     72        [super wasExhumed]; 
    7373} 
    7474 

  • trunk/SapphireFrappliance/SapphireAllImporter.m

    r461 r705  
    5454} 
    5555 
    56 - (void) wasExhumedByPoppingController:(BRLayerController *) controller 
     56- (void) wasExhumed 
    5757{ 
    58         [super wasExhumedByPoppingController:controller]; 
     58        [super wasExhumed]; 
    5959} 
    6060 

  • trunk/SapphireFrappliance/SapphireApplianceController.m

    r693 r705  
    141141                        [ret appendFormat:@"\n0x%X\t%@", [key pointerValue], [mapping objectForKey:key]]; 
    142142        } 
     143        NSLog(@"%@", ret); 
    143144} 
    144145 
    …… 
    301302} 
    302303 
    303 - (void) wasPushed 
    304 { 
    305     // We've just been put on screen, the user can see this controller's content now 
    306     [self recreateMenu]; 
    307         [[self list] reload]; 
    308     // always call super 
    309     [super wasPushed]; 
    310 } 
    311  
    312 - (void) wasPopped 
    313 { 
    314     // The user pressed Menu, removing us from the screen 
    315      
    316     // always call super 
    317     [super wasPopped]; 
    318 } 
    319  
    320 - (void) wasBuriedByPushingController: (BRLayerController *) controller 
    321 { 
    322     // The user chose an option and this controller os no longer on screen 
    323      
    324     // always call super 
    325     [super wasBuriedByPushingController: controller]; 
    326 } 
    327  
    328 - (void) wasExhumedByPoppingController: (BRLayerController *) controller 
     304- (void)doInitialPush 
     305{ 
     306        @try { 
     307                // We've just been put on screen, the user can see this controller's content now 
     308                [self recreateMenu]; 
     309                [[self list] reload];            
     310        } 
     311        @catch (NSException * e) { 
     312                [SapphireApplianceController logException:e]; 
     313        } 
     314        @finally { 
     315                [super doInitialPush]; 
     316        } 
     317} 
     318 
     319- (void)doInitialExhume 
    329320{ 
    330321    // handle being revealed when the user presses Menu 
    …… 
    335326 
    336327    // always call super 
    337     [super wasExhumedByPoppingController: controller]; 
     328    [super doInitialExhume]; 
    338329} 
    339330 

  • trunk/SapphireFrappliance/SapphireBrowser.m

    r693 r705  
    169169} 
    170170 
    171 - (void) wasPushed 
     171- (void)doInitialPush 
    172172{ 
    173173    // We've just been put on screen, the user can see this controller's content now 
    …… 
    180180                [SapphireApplianceController logException:e]; 
    181181        }        
    182     // always call super 
    183     [super wasPushed]; 
     182    [super doInitialPush]; 
     183} 
     184 
     185- (void) wasPushed 
     186{ 
     187        [super wasPushed]; 
    184188        /*Get metadata when we can*/ 
    185189        [metaData resumeImport]; 
    186190} 
    187191 
    188 - (void) wasPopped 
    189 { 
    190     // The user pressed Menu, removing us from the screen 
    191     // always call super 
    192  
    193     [super wasPopped]; 
     192- (void)doInitialPop 
     193{ 
    194194        /*Cancel everything we were doing*/ 
    195195        [metaData cancelImport]; 
    196196        cancelScan = YES; 
    197197        [metaData setDelegate:nil]; 
    198 } 
    199  
    200 - (void) wasBuriedByPushingController: (BRLayerController *) controller 
     198        [super doInitialPop]; 
     199} 
     200 
     201- (void)doInitialBury 
    201202{ 
    202203    // The user chose an option and this controller is no longer on screen 
    …… 
    207208 
    208209    // always call super 
    209     [super wasBuriedByPushingController: controller]; 
    210 } 
    211  
    212 - (void) wasExhumedByPoppingController: (BRLayerController *) controller 
    213 { 
    214     // handle being revealed when the user presses Menu 
    215  
     210    [super doInitialBury]; 
     211} 
     212 
     213- (void)doInitialExhume 
     214{ 
    216215        /*Reload our display*/ 
    217216        [self setNewPredicate:[SapphireApplianceController predicate]]; 
    218  
    219     // always call super 
    220     [super wasExhumedByPoppingController: controller]; 
     217        [super doInitialExhume]; 
     218} 
     219 
     220- (void)wasExhumed 
     221{ 
     222        // always call super 
     223        [super wasExhumed]; 
    221224        /*Check to see if dir is empty*/ 
    222225        if(fileCount + dirCount == 0) 

  • trunk/SapphireFrappliance/SapphireFileDataImporter.m

    r461 r705  
    7373} 
    7474 
    75 - (void) wasExhumedByPoppingController: (BRLayerController *) controller 
     75- (void) wasExhumed 
    7676{ 
    7777} 

  • trunk/SapphireFrappliance/SapphireImporterDataMenu.h

    r693 r705  
    9898 * 
    9999 * Some importers present the user with other choices, so this lets the importer know that the "dialog" has completed. 
    100  * 
    101  * @param controller The Controller which was on top 
    102100 */ 
    103 - (void) wasExhumedByPoppingController: (BRLayerController *) controller; 
     101- (void) wasExhumed; 
    104102@end 
    105103 

  • trunk/SapphireFrappliance/SapphireImporterDataMenu.m

    r693 r705  
    438438} 
    439439 
    440 - (void) wasExhumedByPoppingController: (BRLayerController *) controller 
    441 { 
    442         [importer wasExhumedByPoppingController:controller]; 
    443         [super wasExhumedByPoppingController:controller]; 
     440- (void)wasExhumed 
     441{ 
     442        [importer wasExhumed]; 
     443        [super wasExhumed]; 
    444444} 
    445445 

  • trunk/SapphireFrappliance/SapphireMovieImporter.m

    r693 r705  
    896896} 
    897897 
    898 - (void) wasExhumedByPoppingController: (BRLayerController *) controller 
     898- (void)wasExhumed 
    899899{ 
    900900        /*See if it was a movie chooser*/ 

  • trunk/SapphireFrappliance/SapphireMultipleImporter.m

    r461 r705  
    9595} 
    9696 
    97 - (void) wasExhumedByPoppingController:(BRLayerController *) controller 
     97- (void) wasExhumed 
    9898{ 
    99         [importers makeObjectsPerformSelector:@selector(wasExhumedByPoppingController:) withObject:controller]; 
     99        [importers makeObjectsPerformSelector:@selector(wasExhumed) withObject:nil]; 
    100100} 
    101101 

  • trunk/SapphireFrappliance/SapphireTVShowImporter.m

    r693 r705  
    660660} 
    661661 
    662 - (void) wasExhumedByPoppingController: (BRLayerController *) controller 
     662- (void) wasExhumed 
    663663{ 
    664664        /*See if it was a show chooser*/ 

  • trunk/SapphireFrappliance/SapphireXMLFileDataImporter.m

    r461 r705  
    220220} 
    221221 
    222 - (void) wasExhumedByPoppingController: (BRLayerController *) controller 
     222- (void) wasExhumed 
    223223{ 
    224224}