Browse Source

change classname CCSection

Marino Faggiana 8 years ago
parent
commit
4687378261

+ 3 - 3
iOSClient/Main/CCMain.m

@@ -83,7 +83,7 @@
     CCHud *_hudDeterminate;
     
     // Datasource
-    CCSectionDataSource *_sectionDataSource;
+    CCSectionDataSourceMetadata *_sectionDataSource;
     NSDate *_dateReadDataSource;
     
     // Search
@@ -4678,7 +4678,7 @@
         
         if ([selector length] == 0 || [selector isEqualToString:selectorSearch]) {
         
-            _sectionDataSource = [CCSection creataDataSourseSectionMetadata:_searchResultMetadatas listProgressMetadata:nil groupByField:_directoryGroupBy replaceDateToExifDate:NO activeAccount:app.activeAccount];
+            _sectionDataSource = [CCSectionMetadata creataDataSourseSectionMetadata:_searchResultMetadatas listProgressMetadata:nil groupByField:_directoryGroupBy replaceDateToExifDate:NO activeAccount:app.activeAccount];
             
         } else {
             
@@ -4734,7 +4734,7 @@
     
         NSArray *recordsTableMetadata = [CCCoreData getTableMetadataWithPredicate:[NSPredicate predicateWithFormat:@"(account == %@) AND (directoryID == %@)", app.activeAccount, [CCCoreData getDirectoryIDFromServerUrl:serverUrl activeAccount:app.activeAccount]] fieldOrder:[CCUtility getOrderSettings] ascending:[CCUtility getAscendingSettings]];
     
-        _sectionDataSource = [CCSection creataDataSourseSectionMetadata:recordsTableMetadata listProgressMetadata:nil groupByField:_directoryGroupBy replaceDateToExifDate:NO activeAccount:app.activeAccount];
+        _sectionDataSource = [CCSectionMetadata creataDataSourseSectionMetadata:recordsTableMetadata listProgressMetadata:nil groupByField:_directoryGroupBy replaceDateToExifDate:NO activeAccount:app.activeAccount];
         
     } else {
         

+ 4 - 4
iOSClient/Main/CCSection.h

@@ -23,7 +23,7 @@
 
 #import <Foundation/Foundation.h>
 
-@interface CCSectionDataSource : NSObject
+@interface CCSectionDataSourceMetadata : NSObject
     
 @property (nonatomic, strong) NSMutableDictionary *allRecordsDataSource;
 @property (nonatomic, strong) NSMutableArray *allFileID;
@@ -40,11 +40,11 @@
 
 @end
 
-@interface CCSection : NSObject
+@interface CCSectionMetadata : NSObject
 
-+ (CCSectionDataSource *)creataDataSourseSectionMetadata:(NSArray *)records listProgressMetadata:(NSMutableDictionary *)listProgressMetadata groupByField:(NSString *)groupByField replaceDateToExifDate:(BOOL)replaceDateToExifDate activeAccount:(NSString *)activeAccount;
++ (CCSectionDataSourceMetadata *)creataDataSourseSectionMetadata:(NSArray *)records listProgressMetadata:(NSMutableDictionary *)listProgressMetadata groupByField:(NSString *)groupByField replaceDateToExifDate:(BOOL)replaceDateToExifDate activeAccount:(NSString *)activeAccount;
 
-+ (void)removeAllObjectsSectionDataSource:(CCSectionDataSource *)sectionDataSource;
++ (void)removeAllObjectsSectionDataSource:(CCSectionDataSourceMetadata *)sectionDataSource;
 
 @end
 

+ 5 - 5
iOSClient/Main/CCSection.m

@@ -27,7 +27,7 @@
 #import "CCCoreData.h"
 #import "CCExifGeo.h"
 
-@implementation CCSectionDataSource
+@implementation CCSectionDataSourceMetadata
 
 - (id)init {
     
@@ -51,12 +51,12 @@
 @end
 
 
-@implementation CCSection
+@implementation CCSectionMetadata
 
 //
 // orderByField : nil, date, typeFile
 //
-+ (CCSectionDataSource *)creataDataSourseSectionMetadata:(NSArray *)records listProgressMetadata:(NSMutableDictionary *)listProgressMetadata groupByField:(NSString *)groupByField replaceDateToExifDate:(BOOL)replaceDateToExifDate activeAccount:(NSString *)activeAccount
++ (CCSectionDataSourceMetadata *)creataDataSourseSectionMetadata:(NSArray *)records listProgressMetadata:(NSMutableDictionary *)listProgressMetadata groupByField:(NSString *)groupByField replaceDateToExifDate:(BOOL)replaceDateToExifDate activeAccount:(NSString *)activeAccount
 {
     id dataSection;
     long counterSessionDownload = 0;
@@ -64,7 +64,7 @@
     NSMutableArray *copyRecords = [[NSMutableArray alloc] init];
     NSMutableDictionary *dictionaryFileIDMetadataForIndexPath = [[NSMutableDictionary alloc] init];
     
-    CCSectionDataSource *sectionDataSource = [[CCSectionDataSource alloc] init];
+    CCSectionDataSourceMetadata *sectionDataSource = [CCSectionDataSourceMetadata new];
     
     /*
      Initialize datasource
@@ -229,7 +229,7 @@
     return sectionDataSource;
 }
 
-+ (void)removeAllObjectsSectionDataSource:(CCSectionDataSource *)sectionDataSource
++ (void)removeAllObjectsSectionDataSource:(CCSectionDataSourceMetadata *)sectionDataSource
 {
     [sectionDataSource.allRecordsDataSource removeAllObjects];
     [sectionDataSource.allFileID removeAllObjects];

+ 2 - 2
iOSClient/MenuAccount+ControlCenter/CCControlCenterTransfer.m

@@ -23,7 +23,7 @@
 @interface CCControlCenterTransfer ()
 {    
     // Datasource
-    CCSectionDataSource *_sectionDataSource;
+    CCSectionDataSourceMetadata *_sectionDataSource;
 }
 @end
 
@@ -241,7 +241,7 @@
         
         NSArray *recordsTableMetadata = [CCCoreData getTableMetadataWithPredicate:[NSPredicate predicateWithFormat:@"(account == %@) AND ((session CONTAINS 'upload') OR (session CONTAINS 'download' AND (sessionSelector != 'loadPlist')))", app.activeAccount] fieldOrder:@"sessionTaskIdentifier" ascending:YES];
         
-        _sectionDataSource  = [CCSection creataDataSourseSectionMetadata:recordsTableMetadata listProgressMetadata:app.listProgressMetadata groupByField:@"session" replaceDateToExifDate:NO activeAccount:app.activeAccount];
+        _sectionDataSource  = [CCSectionMetadata creataDataSourseSectionMetadata:recordsTableMetadata listProgressMetadata:app.listProgressMetadata groupByField:@"session" replaceDateToExifDate:NO activeAccount:app.activeAccount];
         
         if ([_sectionDataSource.allRecordsDataSource count] == 0) {
             

+ 2 - 2
iOSClient/Offline/CCOfflinePageContent.m

@@ -464,7 +464,7 @@
             recordsTableMetadata = [CCCoreData getTableMetadataWithPredicate:[NSPredicate predicateWithFormat:@"(account == %@) AND (directoryID == %@)", app.activeAccount, directoryID] fieldOrder:[CCUtility getOrderSettings] ascending:[CCUtility getAscendingSettings]];
         }
         
-        CCSectionDataSource *sectionDataSource = [CCSection creataDataSourseSectionMetadata:recordsTableMetadata listProgressMetadata:nil groupByField:nil replaceDateToExifDate:NO activeAccount:app.activeAccount];
+        CCSectionDataSourceMetadata *sectionDataSource = [CCSectionMetadata creataDataSourseSectionMetadata:recordsTableMetadata listProgressMetadata:nil groupByField:nil replaceDateToExifDate:NO activeAccount:app.activeAccount];
         
         NSArray *fileIDs = [sectionDataSource.sectionArrayRow objectForKey:@"_none_"];
         for (NSString *fileID in fileIDs)
@@ -488,7 +488,7 @@
             recordsTableMetadata = [CCCoreData getTableMetadataWithPredicate:[NSPredicate predicateWithFormat:@"(account == %@) AND (directoryID == %@)", app.activeAccount, directoryID] fieldOrder:[CCUtility getOrderSettings] ascending:[CCUtility getAscendingSettings]];
         }
         
-        CCSectionDataSource *sectionDataSource = [CCSection creataDataSourseSectionMetadata:recordsTableMetadata listProgressMetadata:nil groupByField:nil replaceDateToExifDate:NO activeAccount:app.activeAccount];
+        CCSectionDataSourceMetadata *sectionDataSource = [CCSectionMetadata creataDataSourseSectionMetadata:recordsTableMetadata listProgressMetadata:nil groupByField:nil replaceDateToExifDate:NO activeAccount:app.activeAccount];
             
         NSArray *fileIDs = [sectionDataSource.sectionArrayRow objectForKey:@"_none_"];
         for (NSString *fileID in fileIDs)

+ 3 - 3
iOSClient/PhotosCameraUpload/CCPhotosCameraUpload.m

@@ -41,7 +41,7 @@
     NSUInteger _numSelectedMetadatas;
     //BOOL _AutomaticCameraUploadInProgress;      // START/STOP new request : initStateCameraUpload
     
-    CCSectionDataSource *_sectionDataSource;
+    CCSectionDataSourceMetadata *_sectionDataSource;
     
     CCHud *_hud;
 }
@@ -528,7 +528,7 @@
 
 - (void)reloadDatasourceForced
 {
-    [CCSection removeAllObjectsSectionDataSource:_sectionDataSource];
+    [CCSectionMetadata removeAllObjectsSectionDataSource:_sectionDataSource];
     [self reloadDatasource];
 }
 
@@ -543,7 +543,7 @@
     // datasource
     NSArray *recordsTableMetadata = [CCCoreData getRecordsTableMetadataPhotosCameraUpload:serverUrl activeAccount:app.activeAccount];
     
-    _sectionDataSource = [CCSection creataDataSourseSectionMetadata:recordsTableMetadata listProgressMetadata:nil groupByField:@"date" replaceDateToExifDate:YES activeAccount:app.activeAccount];
+    _sectionDataSource = [CCSectionMetadata creataDataSourseSectionMetadata:recordsTableMetadata listProgressMetadata:nil groupByField:@"date" replaceDateToExifDate:YES activeAccount:app.activeAccount];
         
     //if ([_sectionDataSource.allRecordsDataSource count] == 0)
     //    _dateReadDataSource = nil;