diff options
| author | stuconnolly <stuart02@gmail.com> | 2011-03-19 15:05:23 +0000 |
|---|---|---|
| committer | stuconnolly <stuart02@gmail.com> | 2011-03-19 15:05:23 +0000 |
| commit | 6d3f21336846d7745e795202c99390832c4220c8 (patch) | |
| tree | 6195dafeeb1871afc5e41f6f17a917dc8047d44a /Source/SPExportController.m | |
| parent | b2a0af91eae18b6490ddeafd2708d256b0d53cb3 (diff) | |
| download | sequelpro-6d3f21336846d7745e795202c99390832c4220c8.tar.gz sequelpro-6d3f21336846d7745e795202c99390832c4220c8.tar.bz2 sequelpro-6d3f21336846d7745e795202c99390832c4220c8.zip | |
Bring outline view branch up to date with trunk (r3235:r3245), which should resolve all warnings.
Diffstat (limited to 'Source/SPExportController.m')
| -rw-r--r-- | Source/SPExportController.m | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/Source/SPExportController.m b/Source/SPExportController.m index 04138c75..2780df54 100644 --- a/Source/SPExportController.m +++ b/Source/SPExportController.m @@ -246,29 +246,29 @@ static const NSString *SPTableViewDropColumnID = @"drop"; */ - (IBAction)export:(id)sender { - SPExportType exportType = SPSQLExport; - SPExportSource exportSource = SPTableExport; + SPExportType selectedExportType = SPSQLExport; + SPExportSource selectedExportSource = SPTableExport; - NSArray *tables = [tablesListInstance selectedTableItems]; + NSArray *selectedTables = [tablesListInstance selectedTableItems]; BOOL isCustomQuerySelected = ([tableDocumentInstance isCustomQuerySelected] && ([[customQueryInstance currentResult] count] > 1)); BOOL isContentSelected = ([[tableDocumentInstance selectedToolbarItemIdentifier] isEqualToString:SPMainToolbarTableContent] && ([[tableContentInstance currentResult] count] > 1)); if (isContentSelected) { - tables = nil; - exportType = SPCSVExport; - exportSource = SPFilteredExport; + selectedTables = nil; + selectedExportType = SPCSVExport; + selectedExportSource = SPFilteredExport; } else if (isCustomQuerySelected) { - tables = nil; - exportType = SPCSVExport; - exportSource = SPQueryExport; + selectedTables = nil; + selectedExportType = SPCSVExport; + selectedExportSource = SPQueryExport; } else { - tables = ([tables count]) ? tables : nil; + selectedTables = ([selectedTables count]) ? selectedTables : nil; } - [self exportTables:tables asFormat:exportType usingSource:exportSource]; + [self exportTables:selectedTables asFormat:selectedExportType usingSource:selectedExportSource]; // Ensure UI validation [self switchInput:exportInputPopUpButton]; |