• improved issues for tooltip in Content and Custom tables

- added not yet supported MCPGeometryData view
- removed @try clauses, instead make usage of pthread_mutex_lock etc. approach
• adjusted autodetectWidthForColumnDefinition: for SPCopyTable to calculate the width by taking the WKT string of MCPGeometryData
• added SPGeometryDataView class which will be used for displaying GEOMETRY data as image (for tooltips, inside field editor sheet) [not yet implemented]

1 files changed, 20 insertions, 8 deletions

diff --git a/Source/SPCustomQuery.m b/Source/SPCustomQuery.m
index 5184edf7..74505e23 100644
--- a/Source/SPCustomQuery.m
+++ b/Source/SPCustomQuery.m
@@ -2193,16 +2193,25 @@
 	NSPoint pos = [NSEvent mouseLocation];
 	pos.y -= 20;
 
-	// Try to get the original data. If not possible return nil.
-	// @try clause is used due to the multifarious cases of
-	// possible exceptions (eg for reloading tables etc.)
-	id theValue;
-	@try{
+	id theValue = nil;
+
+	// While the table is being loaded, additional validation is required - data
+	// locks must be used to avoid crashes, and indexes higher than the available
+	// rows or columns may be requested.  Return "..." to indicate loading in these
+	// cases.
+	if (isWorking) {
+		pthread_mutex_lock(&resultDataLock);
+		if (row < resultDataCount && [[aTableColumn identifier] integerValue] < [resultData columnCount]) {
+			theValue = [[SPDataStorageObjectAtRowAndColumn(resultData, row, [[aTableColumn identifier] integerValue]) copy] autorelease];
+		}
+		pthread_mutex_unlock(&resultDataLock);
+
+		if (!theValue) theValue = @"...";
+	} else {
 		theValue = SPDataStorageObjectAtRowAndColumn(resultData, row, [[aTableColumn identifier] integerValue]);
 	}
-	@catch(id ae) {
-		return nil;
-	}
+
+	if(theValue == nil) return nil;
 
 	// Get the original data for trying to display the blob data as an image
 	if ([theValue isKindOfClass:[NSData class]]) {
@@ -2212,6 +2221,9 @@
 			return nil;
 		}
 	}
+	else if ([theValue isKindOfClass:[MCPGeometryData class]]) {
+		; // TODO
+	}
 
 	// Show the cell string value as tooltip (including line breaks and tabs)
 	// by using the cell's font