• some further work at the new field mapper sheet

4 files changed, 38 insertions, 12 deletions

diff --git a/Source/SPFieldMapperController.h b/Source/SPFieldMapperController.h
index 21a34f0e..67dc381d 100644
--- a/Source/SPFieldMapperController.h
+++ b/Source/SPFieldMapperController.h
@@ -29,7 +29,6 @@
 
 @interface SPFieldMapperController : NSWindowController {
 
-	IBOutlet id fieldMapperView;
 	IBOutlet id fieldMapperTableView;
 	IBOutlet id tableTargetPopup;
 	IBOutlet id fileSourcePath;
@@ -58,5 +57,6 @@
 - (IBAction)changeTableTarget:(id)sender;
 - (IBAction)changeImportMethod:(id)sender;
 - (IBAction)stepRow:(id)sender;
+- (IBAction)closeSheet:(id)sender;
 
 @end
diff --git a/Source/SPFieldMapperController.m b/Source/SPFieldMapperController.m
index 70a4b049..92d0c935 100644
--- a/Source/SPFieldMapperController.m
+++ b/Source/SPFieldMapperController.m
@@ -37,7 +37,7 @@
  */
 - (id)initWithDelegate:(id)managerDelegate
 {
-	if ((self = [super initWithWindowNibName:@"DataMigrationDialog"])) {
+	if (self = [super initWithWindowNibName:@"DataMigrationDialog"]) {
 
 		fieldMappingCurrentRow = 0;
 		if(managerDelegate == nil) {
@@ -46,17 +46,11 @@
 			return nil;
 		}
 		theDelegate = managerDelegate;
-
 	}
 	
 	return self;
 }
 
-- (void)awakeFromNib
-{
-	
-}
-
 /*
  * Set the connection for use.
  * Called by the connect sheet methods.
@@ -76,6 +70,11 @@
 #pragma mark -
 #pragma mark IBAction methods
 
+- (IBAction)closeSheet:(id)sender
+{
+	[NSApp endSheet:[self window] returnCode:[sender tag]];
+}
+
 - (IBAction)changeTableTarget:(id)sender
 {
 	
@@ -131,5 +130,27 @@
 	[rowUpButton setEnabled:(fieldMappingCurrentRow != ([fieldMappingImportArray count]-1))];
 }
 
+#pragma mark -
+#pragma mark Table view datasource methods
+
+- (NSInteger)numberOfRowsInTableView:(NSTableView *)aTableView;
+{
+	return 0;
+}
+
+- (void)tableView:(NSTableView *)aTableView willDisplayCell:(id)aCell forTableColumn:(NSTableColumn *)aTableColumn row:(NSInteger)rowIndex
+{
+
+}
+
+- (id)tableView:(NSTableView *)aTableView objectValueForTableColumn:(NSTableColumn *)aTableColumn row:(NSInteger)rowIndex
+{
+	return nil;
+}
+
+- (void)tableView:(NSTableView *)aTableView setObjectValue:(id)anObject forTableColumn:(NSTableColumn *)aTableColumn row:(NSInteger)rowIndex
+{
+}
+
 
 @end
diff --git a/Source/TableDump.h b/Source/TableDump.h
index ebc686b2..644057b6 100644
--- a/Source/TableDump.h
+++ b/Source/TableDump.h
@@ -25,6 +25,7 @@
 //  Or mail to <lorenz@textor.ch>
 
 #import <Cocoa/Cocoa.h>
+#import "SPFieldMapperController.h"
 #import <MCPKit/MCPKit.h>
 
 typedef enum _SPExportModes {
@@ -115,6 +116,7 @@ typedef enum _SPExportModes {
 	BOOL progressCancelled;
 	
 	NSInteger fieldMapperSheetStatus;
+	SPFieldMapperController *fieldMapperController;
 }
 
 // IBAction methods
diff --git a/Source/TableDump.m b/Source/TableDump.m
index c835b526..04942462 100644
--- a/Source/TableDump.m
+++ b/Source/TableDump.m
@@ -38,6 +38,7 @@
 #import "RegexKitLite.h"
 #import "SPConstants.h"
 #import "SPAlertSheets.h"
+#import "SPFieldMapperController.h"
 
 @implementation TableDump
 
@@ -109,11 +110,7 @@
 
 - (IBAction)closeFieldMapperSheet:(id)sender
 {
-
 	[NSApp endSheet:fieldMappingSheet returnCode:[sender tag]];
-	// [[self window] orderOut:self];
-	// 
-	//     [NSApp endSheet:fieldMappingSheet];
 }
 
 /**
@@ -1216,7 +1213,11 @@
 
 	fieldMapperSheetStatus = 1;
 
+	// if(fieldMapperController) [fieldMapperController release];
+	// fieldMapperController = [[SPFieldMapperController alloc] initWithDelegate:self];
+
 	// Show fieldMapping sheet
+	// [NSApp beginSheet:[fieldMapperController window]
 	[NSApp beginSheet:fieldMappingSheet
 	   modalForWindow:tableWindow
 		modalDelegate:self
@@ -1227,6 +1228,8 @@
 	while (fieldMapperSheetStatus == 1)
 		usleep(100000);
 
+	// if(fieldMapperController) [fieldMapperController release];
+
 	if(fieldMapperSheetStatus == 2)
 		return YES;
 	else