@@ -163,8 +163,8 @@ - (BOOL)_retrieveImageForEntity:(id <FICEntity>)entity withFormatName:(NSString
163
163
BOOL imageExists = NO ;
164
164
165
165
FICImageTable *imageTable = [_imageTables objectForKey: formatName];
166
- NSString *entityUUID = [entity FIC_UUID ];
167
- NSString *sourceImageUUID = [entity FIC_sourceImageUUID ];
166
+ NSString *entityUUID = [entity fic_UUID ];
167
+ NSString *sourceImageUUID = [entity fic_sourceImageUUID ];
168
168
169
169
if (loadSynchronously == NO && [imageTable entryExistsForEntityUUID: entityUUID sourceImageUUID: sourceImageUUID]) {
170
170
imageExists = YES ;
@@ -196,7 +196,7 @@ - (BOOL)_retrieveImageForEntity:(id <FICEntity>)entity withFormatName:(NSString
196
196
197
197
if (image == nil ) {
198
198
// No image for this UUID exists in the image table. We'll need to ask the delegate to retrieve the source asset.
199
- NSURL *sourceImageURL = [entity FIC_sourceImageURLWithFormatName : formatName];
199
+ NSURL *sourceImageURL = [entity fic_sourceImageURLWithFormatName : formatName];
200
200
201
201
if (sourceImageURL != nil ) {
202
202
// We check to see if this image is already being fetched.
@@ -216,9 +216,9 @@ - (BOOL)_retrieveImageForEntity:(id <FICEntity>)entity withFormatName:(NSString
216
216
if (needsToFetch) {
217
217
@autoreleasepool {
218
218
UIImage *image;
219
- if ([entity respondsToSelector: @selector (FIC_imageForFormat : )]){
219
+ if ([entity respondsToSelector: @selector (fic_imageForFormat : )]){
220
220
FICImageFormat *format = [self formatWithName: formatName];
221
- image = [entity FIC_imageForFormat : format];
221
+ image = [entity fic_imageForFormat : format];
222
222
}
223
223
224
224
if (image){
@@ -274,7 +274,7 @@ - (void)_imageDidLoad:(UIImage *)image forURL:(NSURL *)URL {
274
274
}
275
275
276
276
static void _FICAddCompletionBlockForEntity (NSString *formatName, NSMutableDictionary *entityRequestsDictionary, id <FICEntity> entity, FICImageCacheCompletionBlock completionBlock) {
277
- NSString *entityUUID = [entity FIC_UUID ];
277
+ NSString *entityUUID = [entity fic_UUID ];
278
278
NSMutableDictionary *requestDictionary = [entityRequestsDictionary objectForKey: entityUUID];
279
279
NSMutableDictionary *completionBlocks = nil ;
280
280
@@ -315,7 +315,7 @@ - (void)setImage:(UIImage *)image forEntity:(id <FICEntity>)entity withFormatNam
315
315
completionBlocksDictionary = [NSDictionary dictionaryWithObject: [NSArray arrayWithObject: [completionBlock copy ]] forKey: formatName];
316
316
}
317
317
318
- NSString *entityUUID = [entity FIC_UUID ];
318
+ NSString *entityUUID = [entity fic_UUID ];
319
319
FICImageTable *imageTable = [_imageTables objectForKey: formatName];
320
320
if (imageTable) {
321
321
[imageTable deleteEntryForEntityUUID: entityUUID];
@@ -338,21 +338,21 @@ - (void)_processImage:(UIImage *)image forEntity:(id <FICEntity>)entity completi
338
338
339
339
- (void )_processImage : (UIImage *)image forEntity : (id <FICEntity>)entity imageTable : (FICImageTable *)imageTable completionBlocks : (NSArray *)completionBlocks {
340
340
if (imageTable != nil ) {
341
- if ([entity FIC_UUID ] == nil ) {
341
+ if ([entity fic_UUID ] == nil ) {
342
342
[self _logMessage: [NSString stringWithFormat: @" *** FIC Error: %s entity %@ is missing its UUID." , __PRETTY_FUNCTION__, entity]];
343
343
return ;
344
344
}
345
345
346
- if ([entity FIC_sourceImageUUID ] == nil ) {
346
+ if ([entity fic_sourceImageUUID ] == nil ) {
347
347
[self _logMessage: [NSString stringWithFormat: @" *** FIC Error: %s entity %@ is missing its source image UUID." , __PRETTY_FUNCTION__, entity]];
348
348
return ;
349
349
}
350
350
351
- NSString *entityUUID = [entity FIC_UUID ];
352
- NSString *sourceImageUUID = [entity FIC_sourceImageUUID ];
351
+ NSString *entityUUID = [entity fic_UUID ];
352
+ NSString *sourceImageUUID = [entity fic_sourceImageUUID ];
353
353
FICImageFormat *imageFormat = [imageTable imageFormat ];
354
354
NSString *imageFormatName = [imageFormat name ];
355
- FICEntityImageDrawingBlock imageDrawingBlock = [entity FIC_drawingBlockForImage : image withFormatName: imageFormatName];
355
+ FICEntityImageDrawingBlock imageDrawingBlock = [entity fic_drawingBlockForImage : image withFormatName: imageFormatName];
356
356
357
357
dispatch_async ([FICImageCache dispatchQueue ], ^{
358
358
[imageTable setEntryForEntityUUID: entityUUID sourceImageUUID: sourceImageUUID imageDrawingBlock: imageDrawingBlock];
@@ -412,7 +412,7 @@ - (NSSet *)formatsToProcessForCompletionBlocks:(NSDictionary *)completionBlocksD
412
412
}
413
413
414
414
// If the image already exists, keep going
415
- if ([table entryExistsForEntityUUID: entity.FIC_UUID sourceImageUUID: entity.FIC_sourceImageUUID ]) {
415
+ if ([table entryExistsForEntityUUID: entity.fic_UUID sourceImageUUID: entity.fic_sourceImageUUID ]) {
416
416
continue ;
417
417
}
418
418
@@ -427,8 +427,8 @@ - (NSSet *)formatsToProcessForCompletionBlocks:(NSDictionary *)completionBlocksD
427
427
428
428
- (BOOL )imageExistsForEntity : (id <FICEntity>)entity withFormatName : (NSString *)formatName {
429
429
FICImageTable *imageTable = [_imageTables objectForKey: formatName];
430
- NSString *entityUUID = [entity FIC_UUID ];
431
- NSString *sourceImageUUID = [entity FIC_sourceImageUUID ];
430
+ NSString *entityUUID = [entity fic_UUID ];
431
+ NSString *sourceImageUUID = [entity fic_sourceImageUUID ];
432
432
433
433
BOOL imageExists = [imageTable entryExistsForEntityUUID: entityUUID sourceImageUUID: sourceImageUUID];
434
434
@@ -439,13 +439,13 @@ - (BOOL)imageExistsForEntity:(id <FICEntity>)entity withFormatName:(NSString *)f
439
439
440
440
- (void )deleteImageForEntity : (id <FICEntity>)entity withFormatName : (NSString *)formatName {
441
441
FICImageTable *imageTable = [_imageTables objectForKey: formatName];
442
- NSString *entityUUID = [entity FIC_UUID ];
442
+ NSString *entityUUID = [entity fic_UUID ];
443
443
[imageTable deleteEntryForEntityUUID: entityUUID];
444
444
}
445
445
446
446
- (void )cancelImageRetrievalForEntity : (id <FICEntity>)entity withFormatName : (NSString *)formatName {
447
- NSURL *sourceImageURL = [entity FIC_sourceImageURLWithFormatName : formatName];
448
- NSString *entityUUID = [entity FIC_UUID ];
447
+ NSURL *sourceImageURL = [entity fic_sourceImageURLWithFormatName : formatName];
448
+ NSString *entityUUID = [entity fic_UUID ];
449
449
450
450
BOOL cancelImageLoadingForEntity = NO ;
451
451
@synchronized (_requests) {
0 commit comments