Changeset 708

Show
Ignore:
Timestamp:
12/08/08 10:10:33 (1 month ago)
Author:
gbooker
Message:

The equivalent of [705]

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/CoreData/SapphireFrappliance/Browser/SapphireBrowser.m

    r696 r708  
    195195} 
    196196 
    197 - (void) wasPushed 
    198 { 
    199     // We've just been put on screen, the user can see this controller's content now 
     197- (void)doInitialPush 
     198{ 
    200199        /*Reload upon display*/ 
    201200        @try { 
    …… 
    205204        @catch (NSException * e) { 
    206205                [SapphireApplianceController logException:e]; 
    207         }        
    208     // always call super 
     206        } 
     207        [super doInitialPush]; 
     208} 
     209 
     210- (void)wasPushed 
     211{ 
    209212    [super wasPushed]; 
    210213        /*Get metadata when we can*/ 
    …… 
    212215} 
    213216 
    214 - (void) wasPopped 
    215 { 
    216     // The user pressed Menu, removing us from the screen 
    217     // always call super 
    218  
     217- (void)wasPopped 
     218{ 
    219219    [super wasPopped]; 
    220220        /*Cancel everything we were doing*/ 
    …… 
    224224} 
    225225 
    226 - (void) wasBuriedByPushingController: (BRLayerController *) controller 
    227 { 
    228     // The user chose an option and this controller is no longer on screen 
    229  
     226- (void)wasBuried 
     227{ 
    230228        /*Cancel everything we were doing*/ 
    231229        [metaData cancelImport]; 
    …… 
    234232 
    235233    // always call super 
    236     [super wasBuriedByPushingController: controller]; 
    237 } 
    238  
    239 - (void) wasExhumedByPoppingController: (BRLayerController *) controller 
    240 { 
    241     // handle being revealed when the user presses Menu 
    242  
     234    [super wasBuried]; 
     235} 
     236 
     237- (void)doInitialExhume 
     238{ 
    243239        /*Reload our display*/ 
    244240        [metaData setDelegate:self]; 
    245241        [self setNewPredicate:[SapphireApplianceController predicate]]; 
    246  
    247     // always call super 
    248     [super wasExhumedByPoppingController: controller]; 
     242} 
     243 
     244- (void)wasExhumed 
     245{ 
     246    [super wasExhumed]; 
    249247        /*Check to see if dir is empty*/ 
    250248        if(fileCount + dirCount == 0) 

  • branches/CoreData/SapphireFrappliance/Browser/SapphireMarkMenu.m

    r696 r708  
    284284} 
    285285 
    286 - (void) wasPushed 
    287 { 
    288     // We've just been put on screen, the user can see this controller's content now 
    289      
    290     // always call super 
    291     [super wasPushed]; 
    292 } 
    293  
    294 - (void) wasPopped 
    295 { 
    296     // The user pressed Menu, removing us from the screen 
    297      
    298     // always call super 
    299     [super wasPopped]; 
    300 } 
    301  
    302 - (void) wasBuriedByPushingController: (BRLayerController *) controller 
    303 { 
    304     // The user chose an option and this controller os no longer on screen 
    305      
    306     // always call super 
    307     [super wasBuriedByPushingController: controller]; 
    308 } 
    309  
    310 - (void) wasExhumedByPoppingController: (BRLayerController *) controller 
    311 { 
    312     // handle being revealed when the user presses Menu 
    313      
    314     // always call super 
    315     [super wasExhumedByPoppingController: controller]; 
    316 } 
    317  
    318286- (long) itemCount 
    319287{ 

  • branches/CoreData/SapphireFrappliance/FRAppliance/SapphireApplianceController.m

    r696 r708  
    487487} 
    488488 
    489 - (void) wasPushed 
     489- (void)doInitialPush 
    490490{ 
    491491    // We've just been put on screen, the user can see this controller's content now 
    …… 
    493493        [[self list] reload]; 
    494494    // always call super 
    495     [super wasPushed]; 
    496 } 
    497  
    498 - (void) wasPopped 
    499 { 
    500     // The user pressed Menu, removing us from the screen 
    501      
    502     // always call super 
    503     [super wasPopped]; 
    504 } 
    505  
    506 - (void) wasBuriedByPushingController: (BRLayerController *) controller 
    507 { 
    508     // The user chose an option and this controller os no longer on screen 
    509      
    510     // always call super 
    511     [super wasBuriedByPushingController: controller]; 
    512 } 
    513  
    514 - (void) wasExhumedByPoppingController: (BRLayerController *) controller 
     495    [super doInitialPush]; 
     496} 
     497 
     498- (void)doInitialExhume 
    515499{ 
    516500    // handle being revealed when the user presses Menu 
    …… 
    521505 
    522506    // always call super 
    523     [super wasExhumedByPoppingController: controller]; 
     507    [super doInitialExhume]; 
    524508} 
    525509 

  • branches/CoreData/SapphireFrappliance/MetaDataImporting/SapphireAllFileDataImporter.m

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

  • branches/CoreData/SapphireFrappliance/MetaDataImporting/SapphireAllImporter.m

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

  • branches/CoreData/SapphireFrappliance/MetaDataImporting/SapphireFileDataImporter.m

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

  • branches/CoreData/SapphireFrappliance/MetaDataImporting/SapphireImporterDataMenu.h

    r696 r708  
    9797 * 
    9898 * Some importers present the user with other choices, so this lets the importer know that the "dialog" has completed. 
    99  * 
    100  * @param controller The Controller which was on top 
    10199 */ 
    102 - (void) wasExhumedByPoppingController: (BRLayerController *) controller; 
     100- (void)wasExhumed; 
    103101@end 
    104102 

  • branches/CoreData/SapphireFrappliance/MetaDataImporting/SapphireImporterDataMenu.m

    r696 r708  
    490490} 
    491491 
    492 - (void) wasExhumedByPoppingController: (BRLayerController *) controller 
    493 { 
    494         [importer wasExhumedByPoppingController:controller]; 
    495         [super wasExhumedByPoppingController:controller]; 
     492- (void)wasExhumed 
     493{ 
     494        [importer wasExhumed]; 
     495        [super wasExhumed]; 
    496496} 
    497497 

  • branches/CoreData/SapphireFrappliance/MetaDataImporting/SapphireMovieImporter.m

    r700 r708  
    890890} 
    891891 
    892 - (void) wasExhumedByPoppingController: (BRLayerController *) controller 
     892- (void)wasExhumed 
    893893{ 
    894894        /*See if it was a movie chooser*/ 

  • branches/CoreData/SapphireFrappliance/MetaDataImporting/SapphireMultipleImporter.m

    r557 r708  
    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 

  • branches/CoreData/SapphireFrappliance/MetaDataImporting/SapphireTVShowImporter.m

    r696 r708  
    635635} 
    636636 
    637 - (void) wasExhumedByPoppingController: (BRLayerController *) controller 
     637- (void)wasExhumed 
    638638{ 
    639639        /*See if it was a show chooser*/ 

  • branches/CoreData/SapphireFrappliance/MetaDataImporting/SapphireXMLFileDataImporter.m

    r560 r708  
    251251} 
    252252 
    253 - (void) wasExhumedByPoppingController: (BRLayerController *) controller 
     253- (void)wasExhumed 
    254254{ 
    255255} 

  • branches/CoreData/SapphireFrappliance/Settings/SapphireSettings.m

    r696 r708  
    324324} 
    325325 
    326 - (void) wasPushed 
    327 { 
    328     // We've just been put on screen, the user can see this controller's content now 
    329      
    330     // always call super 
    331     [super wasPushed]; 
    332 } 
    333  
    334 - (void) wasPopped 
    335 { 
    336     // The user pressed Menu, removing us from the screen 
    337      
    338     // always call super 
    339     [super wasPopped]; 
    340 } 
    341  
    342 - (void) wasBuriedByPushingController: (BRLayerController *) controller 
    343 { 
    344     // The user chose an option and this controller is no longer on screen 
    345      
    346     // always call super 
    347     [super wasBuriedByPushingController: controller]; 
    348 } 
    349  
    350 - (void) wasExhumedByPoppingController: (BRLayerController *) controller 
     326- (void)wasExhumed 
    351327{ 
    352328    // handle being revealed when the user presses Menu 
    …… 
    372348     
    373349    // always call super 
    374     [super wasExhumedByPoppingController: controller]; 
     350    [super wasExhumed]; 
    375351} 
    376352