Bug 547195 - [Cocoa] Clean up .bridgesupport.extras

* Remove all uses of swt_alloc, swt_param_name, swt_param_cast,
  swt_java_type64.
* Remove redundant uses of swt_java_type.
* Fix incorrect swt_java_type in CGContextSetLineDash.
* Migrate from obsolete protocol names to modern equivalents.

Change-Id: I0d4a410c06fd3bb1443f6e434190b9369a035e73
Signed-off-by: Nikita Nemkin <nikita@nemkin.ru>

16 files changed, 193 insertions, 173 deletions

diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os.c b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os.c
index 4de205fe18..d3d683bc32 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os.c
@@ -1359,14 +1359,14 @@ JNIEXPORT void JNICALL OS_NATIVE(CGContextSetLineCap)
 
 #ifndef NO_CGContextSetLineDash
 JNIEXPORT void JNICALL OS_NATIVE(CGContextSetLineDash)
-	(JNIEnv *env, jclass that, jlong arg0, jdouble arg1, jfloatArray arg2, jlong arg3)
+	(JNIEnv *env, jclass that, jlong arg0, jdouble arg1, jdoubleArray arg2, jlong arg3)
 {
-	jfloat *lparg2=NULL;
+	jdouble *lparg2=NULL;
 	OS_NATIVE_ENTER(env, that, CGContextSetLineDash_FUNC);
-	if (arg2) if ((lparg2 = (*env)->GetFloatArrayElements(env, arg2, NULL)) == NULL) goto fail;
+	if (arg2) if ((lparg2 = (*env)->GetDoubleArrayElements(env, arg2, NULL)) == NULL) goto fail;
 	CGContextSetLineDash((CGContextRef)arg0, (CGFloat)arg1, (CGFloat*)lparg2, (size_t)arg3);
 fail:
-	if (arg2 && lparg2) (*env)->ReleaseFloatArrayElements(env, arg2, lparg2, 0);
+	if (arg2 && lparg2) (*env)->ReleaseDoubleArrayElements(env, arg2, lparg2, 0);
 	OS_NATIVE_EXIT(env, that, CGContextSetLineDash_FUNC);
 }
 #endif
@@ -1489,7 +1489,7 @@ JNIEXPORT jlong JNICALL OS_NATIVE(CGEventCreateScrollWheelEvent)
 {
 	jlong rc = 0;
 	OS_NATIVE_ENTER(env, that, CGEventCreateScrollWheelEvent_FUNC);
-	rc = (jlong)CGEventCreateScrollWheelEvent((CGEventSourceRef)arg0, (CGScrollEventUnit)arg1, (CGWheelCount)arg2, (int32_t)arg3);
+	rc = (jlong)CGEventCreateScrollWheelEvent((CGEventSourceRef)arg0, (CGScrollEventUnit)arg1, (uint32_t)arg2, (int32_t)arg3);
 	OS_NATIVE_EXIT(env, that, CGEventCreateScrollWheelEvent_FUNC);
 	return rc;
 }
@@ -1537,7 +1537,7 @@ JNIEXPORT jint JNICALL OS_NATIVE(CGGetDisplaysWithRect)
 	jint rc = 0;
 	OS_NATIVE_ENTER(env, that, CGGetDisplaysWithRect_FUNC);
 	if (arg0) if ((lparg0 = getCGRectFields(env, arg0, &_arg0)) == NULL) goto fail;
-	rc = (jint)CGGetDisplaysWithRect(*lparg0, (CGDisplayCount)arg1, (CGDirectDisplayID*)arg2, (CGDisplayCount*)arg3);
+	rc = (jint)CGGetDisplaysWithRect(*lparg0, (uint32_t)arg1, (CGDirectDisplayID*)arg2, (uint32_t*)arg3);
 fail:
 	if (arg0 && lparg0) setCGRectFields(env, arg0, lparg0);
 	OS_NATIVE_EXIT(env, that, CGGetDisplaysWithRect_FUNC);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/AppKitFull.bridgesupport.extras b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/AppKitFull.bridgesupport.extras
index c7a2a6c879..83a6a749ec 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/AppKitFull.bridgesupport.extras
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/AppKitFull.bridgesupport.extras
@@ -342,7 +342,7 @@
 			<retval swt_gen="true"></retval>
 		</method>
 		<method selector="setLineDash:count:phase:" swt_gen="true">
-			<arg swt_gen="true" swt_java_type="float[]" swt_java_type64="double[]"></arg>
+			<arg swt_gen="true" swt_java_type="double[]"></arg>
 			<arg swt_gen="true"></arg>
 			<arg swt_gen="true"></arg>
 			<retval swt_gen="true"></retval>
@@ -405,11 +405,11 @@
 			<arg swt_gen="true"></arg>
 			<arg swt_gen="true"></arg>
 			<arg swt_gen="true"></arg>
-			<retval swt_gen="true" swt_java_type="NSBitmapImageRep"></retval>
+			<retval swt_gen="true"></retval>
 		</method>
 		<method selector="initWithData:" swt_gen="true">
 			<arg swt_gen="true"></arg>
-			<retval swt_gen="true" swt_java_type="NSBitmapImageRep"></retval>
+			<retval swt_gen="true"></retval>
 		</method>
 		<method selector="isPlanar" swt_gen="true">
 			<retval swt_gen="true"></retval>
@@ -423,7 +423,7 @@
 			<retval swt_gen="true"></retval>
 		</method>
 		<method selector="contentView" swt_gen="true">
-			<retval swt_gen="true" swt_java_type="NSView"></retval>
+			<retval swt_gen="true"></retval>
 		</method>
 		<method selector="contentViewMargins" swt_gen="true">
 			<retval swt_gen="true"></retval>
@@ -787,7 +787,7 @@
 			<retval swt_gen="true"></retval>
 		</method>
 		<method selector="getComponents:" swt_gen="true">
-			<arg swt_gen="true" swt_java_type="float[]" swt_java_type64="double[]"></arg>
+			<arg swt_gen="true" swt_java_type="double[]"></arg>
 			<retval swt_gen="true"></retval>
 		</method>
 		<method selector="greenComponent" swt_gen="true">
@@ -943,7 +943,7 @@
 			<retval swt_gen="true"></retval>
 		</method>
 		<method selector="cell" swt_gen="true">
-			<retval swt_gen="true" swt_java_type="NSCell"></retval>
+			<retval swt_gen="true"></retval>
 		</method>
 		<method class_method="true" selector="cellClass" swt_gen="true">
 			<retval swt_gen="true"></retval>
@@ -1038,7 +1038,7 @@
 		<method selector="initWithImage:hotSpot:" swt_gen="true">
 			<arg swt_gen="true"></arg>
 			<arg swt_gen="true"></arg>
-			<retval swt_gen="true" swt_java_type="NSCursor"></retval>
+			<retval swt_gen="true"></retval>
 		</method>
 		<method class_method="true" selector="operationNotAllowedCursor" swt_gen="true">
 			<retval swt_gen="true"></retval>
@@ -1331,7 +1331,7 @@
 		<method selector="initWithStartingColor:endingColor:" swt_gen="true">
 			<arg swt_gen="true"></arg>
 			<arg swt_gen="true"></arg>
-			<retval swt_gen="true" swt_java_type="NSGradient"></retval>
+			<retval swt_gen="true"></retval>
 		</method>
 	</class>
 	<class name="NSGraphicsContext" swt_gen="mixed">
@@ -1423,15 +1423,15 @@
 		</method>
 		<method class_method="true" selector="imageNamed:" swt_gen="true">
 			<arg swt_gen="true"></arg>
-			<retval swt_gen="true" swt_java_type="NSImage"></retval>
+			<retval swt_gen="true"></retval>
 		</method>
 		<method selector="initByReferencingFile:" swt_gen="true">
 			<arg swt_gen="true"></arg>
-			<retval swt_gen="true" swt_java_type="NSImage"></retval>
+			<retval swt_gen="true"></retval>
 		</method>
 		<method selector="initWithContentsOfFile:" swt_gen="true">
 			<arg swt_gen="true"></arg>
-			<retval swt_gen="true" swt_java_type="NSImage"></retval>
+			<retval swt_gen="true"></retval>
 		</method>
 		<method selector="initWithData:" swt_gen="true">
 			<arg swt_gen="true"></arg>
@@ -1439,11 +1439,11 @@
 		</method>
 		<method selector="initWithIconRef:" swt_gen="true">
 			<arg swt_gen="true"></arg>
-			<retval swt_gen="true" swt_java_type="NSImage"></retval>
+			<retval swt_gen="true"></retval>
 		</method>
 		<method selector="initWithSize:" swt_gen="true">
 			<arg swt_gen="true"></arg>
-			<retval swt_gen="true" swt_java_type="NSImage"></retval>
+			<retval swt_gen="true"></retval>
 		</method>
 		<method selector="lockFocus" swt_gen="true">
 			<retval swt_gen="true"></retval>
@@ -1592,7 +1592,7 @@
 		<method selector="glyphIndexForPoint:inTextContainer:fractionOfDistanceThroughGlyph:" swt_gen="true">
 			<arg swt_gen="true"></arg>
 			<arg swt_gen="true"></arg>
-			<arg swt_gen="true" swt_java_type="float[]" swt_java_type64="double[]"></arg>
+			<arg swt_gen="true" swt_java_type="double[]"></arg>
 			<retval swt_gen="true"></retval>
 		</method>
 		<method selector="glyphRangeForCharacterRange:actualCharacterRange:" swt_gen="true">
@@ -1626,14 +1626,14 @@
 			<arg swt_gen="true"></arg>
 			<arg swt_gen="true"></arg>
 			<arg swt_gen="true"></arg>
-			<arg swt_gen="true" swt_java_type="int[]" swt_java_type64="long[]"></arg>
+			<arg swt_gen="true" swt_java_type="long[]"></arg>
 			<retval swt_gen="true"></retval>
 		</method>
 		<method selector="rectArrayForGlyphRange:withinSelectedGlyphRange:inTextContainer:rectCount:" swt_gen="true">
 			<arg swt_gen="true"></arg>
 			<arg swt_gen="true"></arg>
 			<arg swt_gen="true"></arg>
-			<arg swt_gen="true" swt_java_type="int[]" swt_java_type64="long[]"></arg>
+			<arg swt_gen="true" swt_java_type="long[]"></arg>
 			<retval swt_gen="true"></retval>
 		</method>
 		<method selector="removeTemporaryAttribute:forCharacterRange:" swt_gen="true">
@@ -1682,7 +1682,7 @@
 		</method>
 		<method selector="initWithTitle:" swt_gen="true">
 			<arg swt_gen="true"></arg>
-			<retval swt_gen="true" swt_java_type="NSMenu"></retval>
+			<retval swt_gen="true"></retval>
 		</method>
 		<method selector="insertItem:atIndex:" swt_gen="true">
 			<arg swt_gen="true"></arg>
@@ -1756,7 +1756,7 @@
 			<arg swt_gen="true"></arg>
 			<arg swt_gen="true"></arg>
 			<arg swt_gen="true"></arg>
-			<retval swt_gen="true" swt_java_type="NSMenuItem"></retval>
+			<retval swt_gen="true"></retval>
 		</method>
 		<method selector="isHidden" swt_gen="true">
 			<retval swt_gen="true"></retval>
@@ -1967,7 +1967,7 @@
 		<method selector="initWithFormat:shareContext:" swt_gen="true">
 			<arg swt_gen="true"></arg>
 			<arg swt_gen="true"></arg>
-			<retval swt_gen="true" swt_java_type="NSOpenGLContext"></retval>
+			<retval swt_gen="true"></retval>
 		</method>
 		<method selector="makeCurrentContext" swt_gen="true">
 			<retval swt_gen="true"></retval>
@@ -1990,7 +1990,7 @@
 	</class>
 	<class name="NSOpenGLPixelFormat" swt_gen="mixed">
 		<method selector="getValues:forAttribute:forVirtualScreen:" swt_gen="true">
-			<arg swt_gen="true" swt_java_type="int[]" swt_java_type64="long[]"></arg>
+			<arg swt_gen="true" swt_java_type="long[]"></arg>
 			<arg swt_gen="true"></arg>
 			<arg swt_gen="true"></arg>
 			<retval swt_gen="true"></retval>
@@ -2168,7 +2168,7 @@
 		<method selector="initWithFrame:pullsDown:" swt_gen="true">
 			<arg swt_gen="true"></arg>
 			<arg swt_gen="true"></arg>
-			<retval swt_gen="true" swt_java_type="NSPopUpButton"></retval>
+			<retval swt_gen="true"></retval>
 		</method>
 		<method selector="itemAtIndex:" swt_gen="true">
 			<arg swt_gen="true"></arg>
@@ -2929,11 +2929,11 @@
 			<retval swt_gen="true" swt_java_type="NSCell"></retval>
 		</method>
 		<method selector="headerCell" swt_gen="true">
-			<retval swt_gen="true" swt_java_type="NSTableHeaderCell"></retval>
+			<retval swt_gen="true"></retval>
 		</method>
 		<method selector="initWithIdentifier:" swt_gen="true">
 			<arg swt_gen="true"></arg>
-			<retval swt_gen="true" swt_java_type="NSTableColumn"></retval>
+			<retval swt_gen="true"></retval>
 		</method>
 		<method selector="resizingMask" swt_gen="true">
 			<retval swt_gen="true"></retval>
@@ -2995,7 +2995,7 @@
 	</class>
 	<class name="NSTableView" swt_gen="mixed" swt_superclass="NSControl">
 		<method selector="addTableColumn:" swt_gen="true">
-			<arg swt_gen="true" swt_param_name="column"></arg>
+			<arg swt_gen="true"></arg>
 			<retval swt_gen="true"></retval>
 		</method>
 		<method selector="canDragRowsWithIndexes:atPoint:" swt_gen="true" swt_gen_custom_callback="true" swt_gen_super_msgSend="true">
@@ -3052,7 +3052,7 @@
 			<retval swt_gen="true"></retval>
 		</method>
 		<method selector="moveColumn:toColumn:" swt_gen="true">
-			<arg swt_gen="true" swt_param_name="column"></arg>
+			<arg swt_gen="true"></arg>
 			<arg swt_gen="true"></arg>
 			<retval swt_gen="true"></retval>
 		</method>
@@ -3085,7 +3085,7 @@
 			<retval swt_gen="true"></retval>
 		</method>
 		<method selector="removeTableColumn:" swt_gen="true">
-			<arg swt_gen="true" swt_param_name="column"></arg>
+			<arg swt_gen="true"></arg>
 			<retval swt_gen="true"></retval>
 		</method>
 		<method selector="rowAtPoint:" swt_gen="true">
@@ -3148,11 +3148,11 @@
 		</method>
 		<method selector="setDropRow:dropOperation:" swt_gen="true">
 			<arg swt_gen="true"></arg>
-			<arg swt_gen="true" swt_param_name="op"></arg>
+			<arg swt_gen="true"></arg>
 			<retval swt_gen="true"></retval>
 		</method>
 		<method selector="setGridStyleMask:" swt_gen="true">
-			<arg swt_gen="true" swt_param_name="gridStyle"></arg>
+			<arg swt_gen="true"></arg>
 			<retval swt_gen="true"></retval>
 		</method>
 		<method selector="setHeaderView:" swt_gen="true">
@@ -3160,12 +3160,12 @@
 			<retval swt_gen="true"></retval>
 		</method>
 		<method selector="setHighlightedTableColumn:" swt_gen="true">
-			<arg swt_gen="true" swt_param_name="tc"></arg>
+			<arg swt_gen="true"></arg>
 			<retval swt_gen="true"></retval>
 		</method>
 		<method selector="setIndicatorImage:inTableColumn:" swt_gen="true">
 			<arg swt_gen="true"></arg>
-			<arg swt_gen="true" swt_param_name="tc"></arg>
+			<arg swt_gen="true"></arg>
 			<retval swt_gen="true"></retval>
 		</method>
 		<method selector="setIntercellSpacing:" swt_gen="true">
@@ -3285,7 +3285,7 @@
 	<class name="NSTextAttachment" swt_gen="mixed">
 		<method selector="initWithFileWrapper:" swt_gen="true">
 			<arg swt_gen="true"></arg>
-			<retval swt_gen="true" swt_java_type="NSTextAttachment" swt_java_type64="NSTextAttachment"></retval>
+			<retval swt_gen="true"></retval>
 		</method>
 		<method selector="setAttachmentCell:" swt_gen="true">
 			<arg swt_gen="true"></arg>
@@ -3293,9 +3293,9 @@
 		</method>
 	</class>
 	<class name="NSTextContainer" swt_gen="mixed">
-		<method selector="initWithContainerSize:" swt_gen="mixed">
+		<method selector="initWithContainerSize:" swt_gen="true">
 			<arg swt_gen="true"></arg>
-			<retval swt_java_type="NSTextContainer"></retval>
+			<retval swt_gen="true"></retval>
 		</method>
 		<method selector="setContainerSize:" swt_gen="true">
 			<arg swt_gen="true"></arg>
@@ -3367,7 +3367,7 @@
 		<method selector="initWithType:location:" swt_gen="true">
 			<arg swt_gen="true"></arg>
 			<arg swt_gen="true"></arg>
-			<retval swt_gen="true" swt_java_type="NSTextTab"></retval>
+			<retval swt_gen="true"></retval>
 		</method>
 	</class>
 	<class name="NSTextView" swt_gen="mixed" swt_superclass="NSText">
@@ -3385,7 +3385,7 @@
 			<retval swt_gen="true"></retval>
 		</method>
 		<method selector="drawViewBackgroundInRect:" swt_gen="true" swt_gen_custom_callback="true" swt_gen_super_msgSend="true">
-			<arg swt_gen="true" swt_java_type="NSRect"></arg>
+			<arg swt_gen="true"></arg>
 			<retval swt_gen="true"></retval>
 		</method>
 		<method selector="layoutManager" swt_gen="true">
@@ -3446,7 +3446,7 @@
 	<class name="NSToolbar" swt_gen="mixed">
 		<method selector="initWithIdentifier:" swt_gen="true">
 			<arg swt_gen="true"></arg>
-			<retval swt_gen="true" swt_java_type="NSToolbar"></retval>
+			<retval swt_gen="true"></retval>
 		</method>
 		<method selector="insertItemWithItemIdentifier:atIndex:" swt_gen="true">
 			<arg swt_gen="true"></arg>
@@ -3484,7 +3484,7 @@
 	<class name="NSToolbarItem" swt_gen="mixed">
 		<method selector="initWithItemIdentifier:" swt_gen="true">
 			<arg swt_gen="true"></arg>
-			<retval swt_gen="true" swt_java_type="NSToolbarItem"></retval>
+			<retval swt_gen="true"></retval>
 		</method>
 		<method selector="itemIdentifier" swt_gen="true">
 			<retval swt_gen="true"></retval>
@@ -3661,7 +3661,7 @@
 			<retval swt_gen="true"></retval>
 		</method>
 		<method selector="drawRect:" swt_gen="true" swt_gen_custom_callback="true">
-			<arg swt_gen="true" swt_param_name="rect"></arg>
+			<arg swt_gen="true"></arg>
 			<retval swt_gen="true"></retval>
 		</method>
 		<method selector="endDocument" swt_gen="true">
@@ -3679,7 +3679,7 @@
 		</method>
 		<method selector="initWithFrame:" swt_gen="true">
 			<arg swt_gen="true"></arg>
-			<retval swt_gen="true" swt_java_type="NSView"></retval>
+			<retval swt_gen="true"></retval>
 		</method>
 		<method selector="isDescendantOf:" swt_gen="true">
 			<arg swt_gen="true"></arg>
@@ -3867,7 +3867,7 @@
 			<retval swt_gen="true"></retval>
 		</method>
 		<method selector="contentView" swt_gen="true">
-			<retval swt_gen="true" swt_java_type="NSView"></retval>
+			<retval swt_gen="true"></retval>
 		</method>
 		<method selector="convertBaseToScreen:" swt_gen="true">
 			<arg swt_gen="true"></arg>
@@ -3935,7 +3935,7 @@
 			<arg swt_gen="true"></arg>
 			<arg swt_gen="true"></arg>
 			<arg swt_gen="true"></arg>
-			<retval swt_gen="true" swt_java_type="NSWindow"></retval>
+			<retval swt_gen="true"></retval>
 		</method>
 		<method selector="initWithContentRect:styleMask:backing:defer:screen:" swt_gen="true">
 			<arg swt_gen="true"></arg>
@@ -3943,7 +3943,7 @@
 			<arg swt_gen="true"></arg>
 			<arg swt_gen="true"></arg>
 			<arg swt_gen="true"></arg>
-			<retval swt_gen="true" swt_java_type="NSWindow"></retval>
+			<retval swt_gen="true"></retval>
 		</method>
 		<method selector="invalidateShadow" swt_gen="true">
 			<retval swt_gen="true"></retval>
@@ -4654,6 +4654,14 @@
 			<arg swt_gen="true"></arg>
 			<retval></retval>
 		</method>
+		<method selector="applicationDidBecomeActive:" swt_gen="true">
+			<arg swt_gen="true"></arg>
+			<retval swt_gen="true"></retval>
+		</method>
+		<method selector="applicationDidResignActive:" swt_gen="true">
+			<arg swt_gen="true"></arg>
+			<retval swt_gen="true"></retval>
+		</method>
 		<method selector="applicationDockMenu:" swt_gen="true">
 			<arg swt_gen="true"></arg>
 			<retval></retval>
@@ -4667,16 +4675,9 @@
 			<arg swt_gen="true"></arg>
 			<retval></retval>
 		</method>
-	</informal_protocol>
-	<informal_protocol name="NSApplicationNotifications" swt_gen="mixed">
-		<method selector="applicationDidBecomeActive:" swt_gen="true">
-			<arg swt_gen="true"></arg>
-		</method>
-		<method selector="applicationDidResignActive:" swt_gen="true">
-			<arg swt_gen="true"></arg>
-		</method>
 		<method selector="applicationWillFinishLaunching:" swt_gen="true">
 			<arg swt_gen="true"></arg>
+			<retval swt_gen="true"></retval>
 		</method>
 	</informal_protocol>
 	<informal_protocol name="NSColorPanelResponderMethod" swt_gen="true">
@@ -4685,15 +4686,18 @@
 			<retval></retval>
 		</method>
 	</informal_protocol>
-	<informal_protocol name="NSComboBoxNotifications" swt_gen="mixed">
+	<informal_protocol name="NSComboBoxDelegate" swt_gen="mixed">
 		<method selector="comboBoxSelectionDidChange:" swt_gen="true">
 			<arg swt_gen="true"></arg>
+			<retval swt_gen="true"></retval>
 		</method>
 		<method selector="comboBoxWillDismiss:" swt_gen="true">
 			<arg swt_gen="true"></arg>
+			<retval swt_gen="true"></retval>
 		</method>
 		<method selector="comboBoxWillPopUp:" swt_gen="true">
 			<arg swt_gen="true"></arg>
+			<retval swt_gen="true"></retval>
 		</method>
 	</informal_protocol>
 	<informal_protocol name="NSDraggingDestination" swt_gen="mixed">
@@ -4717,20 +4721,25 @@
 			<retval></retval>
 		</method>
 	</informal_protocol>
-	<informal_protocol name="NSDraggingSource" swt_gen="mixed">
+	<informal_protocol name="NSDraggingSourceDeprecated" swt_gen="mixed">
 		<method selector="draggedImage:beganAt:" swt_gen="true">
 			<arg swt_gen="true"></arg>
 			<arg swt_gen="true"></arg>
+			<retval swt_gen="true"></retval>
 		</method>
 		<method selector="draggedImage:endedAt:operation:" swt_gen="true" swt_gen_custom_callback="true">
 			<arg swt_gen="true"></arg>
 			<arg swt_gen="true"></arg>
 			<arg swt_gen="true"></arg>
+			<retval swt_gen="true"></retval>
 		</method>
 		<method selector="draggingSourceOperationMaskForLocal:" swt_gen="true">
 			<arg swt_gen="true"></arg>
+			<retval swt_gen="true"></retval>
+		</method>
+		<method selector="ignoreModifierKeysWhileDragging" swt_gen="true">
+			<retval swt_gen="true"></retval>
 		</method>
-		<method selector="ignoreModifierKeysWhileDragging" swt_gen="true"></method>
 	</informal_protocol>
 	<informal_protocol name="NSFontManagerResponderMethod" swt_gen="true">
 		<method selector="changeFont:" swt_gen="true">
@@ -4851,19 +4860,21 @@
 			<arg swt_gen="true"></arg>
 			<retval></retval>
 		</method>
-	</informal_protocol>
-	<informal_protocol name="NSOutlineViewNotifications" swt_gen="mixed">
 		<method selector="outlineViewColumnDidMove:" swt_gen="true">
 			<arg swt_gen="true"></arg>
+			<retval swt_gen="true"></retval>
 		</method>
 		<method selector="outlineViewColumnDidResize:" swt_gen="true">
 			<arg swt_gen="true"></arg>
+			<retval swt_gen="true"></retval>
 		</method>
 		<method selector="outlineViewSelectionDidChange:" swt_gen="true">
 			<arg swt_gen="true"></arg>
+			<retval swt_gen="true"></retval>
 		</method>
 		<method selector="outlineViewSelectionIsChanging:" swt_gen="true">
 			<arg swt_gen="true"></arg>
+			<retval swt_gen="true"></retval>
 		</method>
 	</informal_protocol>
 	<informal_protocol name="NSPasteboardOwner" swt_gen="mixed">
@@ -4885,37 +4896,43 @@
 			<retval swt_gen="true"></retval>
 		</method>
 	</informal_protocol>
-	<informal_protocol name="NSTableDataSource" swt_gen="mixed">
+	<informal_protocol name="NSTableViewDataSource" swt_gen="mixed">
 		<method selector="numberOfRowsInTableView:" swt_gen="true">
 			<arg swt_gen="true"></arg>
+			<retval swt_gen="true"></retval>
 		</method>
 		<method selector="tableView:acceptDrop:row:dropOperation:" swt_gen="true">
 			<arg swt_gen="true"></arg>
 			<arg swt_gen="true"></arg>
 			<arg swt_gen="true"></arg>
 			<arg swt_gen="true"></arg>
+			<retval swt_gen="true"></retval>
 		</method>
 		<method selector="tableView:objectValueForTableColumn:row:" swt_gen="true">
 			<arg swt_gen="true"></arg>
 			<arg swt_gen="true"></arg>
 			<arg swt_gen="true"></arg>
+			<retval swt_gen="true"></retval>
 		</method>
 		<method selector="tableView:setObjectValue:forTableColumn:row:" swt_gen="true">
 			<arg swt_gen="true"></arg>
 			<arg swt_gen="true"></arg>
 			<arg swt_gen="true"></arg>
 			<arg swt_gen="true"></arg>
+			<retval swt_gen="true"></retval>
 		</method>
 		<method selector="tableView:validateDrop:proposedRow:proposedDropOperation:" swt_gen="true">
 			<arg swt_gen="true"></arg>
 			<arg swt_gen="true"></arg>
 			<arg swt_gen="true"></arg>
 			<arg swt_gen="true"></arg>
+			<retval swt_gen="true"></retval>
 		</method>
 		<method selector="tableView:writeRowsWithIndexes:toPasteboard:" swt_gen="true">
 			<arg swt_gen="true"></arg>
 			<arg swt_gen="true"></arg>
 			<arg swt_gen="true"></arg>
+			<retval swt_gen="true"></retval>
 		</method>
 	</informal_protocol>
 	<informal_protocol name="NSTableViewDelegate" swt_gen="mixed">
@@ -4937,19 +4954,21 @@
 			<arg swt_gen="true"></arg>
 			<retval></retval>
 		</method>
-	</informal_protocol>
-	<informal_protocol name="NSTableViewNotifications" swt_gen="true">
 		<method selector="tableViewColumnDidMove:" swt_gen="true">
 			<arg swt_gen="true"></arg>
+			<retval swt_gen="true"></retval>
 		</method>
 		<method selector="tableViewColumnDidResize:" swt_gen="true">
 			<arg swt_gen="true"></arg>
+			<retval swt_gen="true"></retval>
 		</method>
 		<method selector="tableViewSelectionDidChange:" swt_gen="true">
 			<arg swt_gen="true"></arg>
+			<retval swt_gen="true"></retval>
 		</method>
 		<method selector="tableViewSelectionIsChanging:" swt_gen="true">
 			<arg swt_gen="true"></arg>
+			<retval swt_gen="true"></retval>
 		</method>
 	</informal_protocol>
 	<informal_protocol name="NSTextAttachmentCell" swt_gen="mixed">
@@ -5053,32 +5072,37 @@
 		</method>
 	</informal_protocol>
 	<informal_protocol name="NSWindowDelegate" swt_gen="mixed">
-		<method selector="windowShouldClose:" swt_gen="true">
-			<arg swt_gen="true"></arg>
-			<retval></retval>
-		</method>
-	</informal_protocol>
-	<informal_protocol name="NSWindowNotifications" swt_gen="mixed">
 		<method selector="windowDidBecomeKey:" swt_gen="true">
 			<arg swt_gen="true"></arg>
+			<retval swt_gen="true"></retval>
 		</method>
 		<method selector="windowDidDeminiaturize:" swt_gen="true">
 			<arg swt_gen="true"></arg>
+			<retval swt_gen="true"></retval>
 		</method>
 		<method selector="windowDidMiniaturize:" swt_gen="true">
 			<arg swt_gen="true"></arg>
+			<retval swt_gen="true"></retval>
 		</method>
 		<method selector="windowDidMove:" swt_gen="true">
 			<arg swt_gen="true"></arg>
+			<retval swt_gen="true"></retval>
 		</method>
 		<method selector="windowDidResignKey:" swt_gen="true">
 			<arg swt_gen="true"></arg>
+			<retval swt_gen="true"></retval>
 		</method>
 		<method selector="windowDidResize:" swt_gen="true">
 			<arg swt_gen="true"></arg>
+			<retval swt_gen="true"></retval>
+		</method>
+		<method selector="windowShouldClose:" swt_gen="true">
+			<arg swt_gen="true"></arg>
+			<retval></retval>
 		</method>
 		<method selector="windowWillClose:" swt_gen="true">
 			<arg swt_gen="true"></arg>
+			<retval swt_gen="true"></retval>
 		</method>
 	</informal_protocol>
 </signatures>
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/CoreGraphicsFull.bridgesupport.extras b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/CoreGraphicsFull.bridgesupport.extras
index 1ca8d62bdf..d694bac6a2 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/CoreGraphicsFull.bridgesupport.extras
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/CoreGraphicsFull.bridgesupport.extras
@@ -36,13 +36,13 @@
 		<arg swt_gen="true"></arg>
 		<arg swt_gen="true"></arg>
 		<arg swt_gen="true"></arg>
-		<arg swt_gen="true" swt_param_name="colorspace"></arg>
+		<arg swt_gen="true"></arg>
 		<arg swt_gen="true"></arg>
 		<retval swt_gen="true"></retval>
 	</function>
 	<function name="CGColorCreate" swt_gen="true">
 		<arg swt_gen="true"></arg>
-		<arg swt_gen="true" swt_java_type="float[]" swt_java_type64="double[]"></arg>
+		<arg swt_gen="true" swt_java_type="double[]"></arg>
 		<retval swt_gen="true"></retval>
 	</function>
 	<function name="CGColorRelease" swt_gen="true">
@@ -114,13 +114,13 @@
 		<retval></retval>
 	</function>
 	<function name="CGContextSetFillColor" swt_gen="true">
-		<arg swt_gen="true" swt_param_name="c"></arg>
-		<arg swt_gen="true" swt_java_type="float[]" swt_java_type64="double[]"></arg>
+		<arg swt_gen="true"></arg>
+		<arg swt_gen="true" swt_java_type="double[]"></arg>
 		<retval></retval>
 	</function>
 	<function name="CGContextSetFillColorSpace" swt_gen="true">
-		<arg swt_gen="true" swt_param_name="c"></arg>
-		<arg swt_gen="true" swt_param_name="colorspace"></arg>
+		<arg swt_gen="true"></arg>
+		<arg swt_gen="true"></arg>
 		<retval></retval>
 	</function>
 	<function name="CGContextSetLineCap" swt_gen="true">
@@ -131,7 +131,7 @@
 	<function name="CGContextSetLineDash" swt_gen="true">
 		<arg swt_gen="true"></arg>
 		<arg swt_gen="true"></arg>
-		<arg swt_gen="true" swt_java_type="float[]" swt_java_type64="float[]"></arg>
+		<arg swt_gen="true" swt_java_type="double[]"></arg>
 		<arg swt_gen="true"></arg>
 		<retval></retval>
 	</function>
@@ -196,7 +196,7 @@
 	<function name="CGEventCreateScrollWheelEvent" swt_gen="true">
 		<arg swt_gen="true"></arg>
 		<arg swt_gen="true"></arg>
-		<arg swt_gen="true" swt_param_cast="CGWheelCount"></arg>
+		<arg swt_gen="true"></arg>
 		<arg swt_gen="true"></arg>
 		<retval swt_gen="true"></retval>
 	</function>
@@ -211,14 +211,14 @@
 		<retval></retval>
 	</function>
 	<function name="CGEventSourceCreate" swt_gen="true">
-		<arg swt_gen="true" swt_param_name="sourceState"></arg>
+		<arg swt_gen="true"></arg>
 		<retval swt_gen="true"></retval>
 	</function>
 	<function name="CGGetDisplaysWithRect" swt_gen="true">
 		<arg swt_gen="true"></arg>
-		<arg swt_gen="true" swt_param_cast="CGDisplayCount"></arg>
-		<arg swt_gen="true" swt_param_name="dspys"></arg>
-		<arg swt_gen="true" swt_param_cast="CGDisplayCount*" swt_param_name="dspyCnt"></arg>
+		<arg swt_gen="true"></arg>
+		<arg swt_gen="true"></arg>
+		<arg swt_gen="true"></arg>
 		<retval swt_gen="true"></retval>
 	</function>
 	<function name="CGImageCreate" swt_gen="true">
@@ -227,7 +227,7 @@
 		<arg swt_gen="true"></arg>
 		<arg swt_gen="true"></arg>
 		<arg swt_gen="true"></arg>
-		<arg swt_gen="true" swt_param_name="colorspace"></arg>
+		<arg swt_gen="true"></arg>
 		<arg swt_gen="true"></arg>
 		<arg swt_gen="true"></arg>
 		<arg swt_gen="true"></arg>
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/FoundationFull.bridgesupport.extras b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/FoundationFull.bridgesupport.extras
index 0b2349313f..ef199a756e 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/FoundationFull.bridgesupport.extras
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/FoundationFull.bridgesupport.extras
@@ -3,7 +3,7 @@
 	<class name="NSAffineTransform" swt_gen="mixed">
 		<method selector="initWithTransform:" swt_gen="true">
 			<arg swt_gen="true"></arg>
-			<retval swt_gen="true" swt_java_type="NSAffineTransform"></retval>
+			<retval swt_gen="true"></retval>
 		</method>
 		<method selector="invert" swt_gen="true">
 			<retval swt_gen="true"></retval>
@@ -47,16 +47,16 @@
 	</class>
 	<class name="NSAppleEventDescriptor" swt_gen="mixed">
 		<method selector="initListDescriptor" swt_gen="true">
-			<retval swt_gen="true" swt_java_type="NSAppleEventDescriptor"></retval>
+			<retval swt_gen="true"></retval>
 		</method>
 	</class>
 	<class name="NSArray" swt_gen="mixed">
 		<method class_method="true" selector="array" swt_gen="true">
-			<retval swt_gen="true" swt_java_type="NSArray"></retval>
+			<retval swt_gen="true"></retval>
 		</method>
 		<method class_method="true" selector="arrayWithObject:" swt_gen="true">
 			<arg swt_gen="true"></arg>
-			<retval swt_alloc="true" swt_gen="true" swt_java_type="NSArray"></retval>
+			<retval swt_gen="true"></retval>
 		</method>
 		<method selector="containsObject:" swt_gen="true">
 			<arg swt_gen="true"></arg>
@@ -93,12 +93,12 @@
 		</method>
 		<method selector="initWithString:" swt_gen="true">
 			<arg swt_gen="true"></arg>
-			<retval swt_gen="true" swt_java_type="NSAttributedString"></retval>
+			<retval swt_gen="true"></retval>
 		</method>
 		<method selector="initWithString:attributes:" swt_gen="true">
 			<arg swt_gen="true"></arg>
 			<arg swt_gen="true"></arg>
-			<retval swt_gen="true" swt_java_type="NSAttributedString"></retval>
+			<retval swt_gen="true"></retval>
 		</method>
 		<method selector="length" swt_gen="true">
 			<retval swt_gen="true"></retval>
@@ -195,7 +195,7 @@
 		<method class_method="true" selector="dataWithBytes:length:" swt_gen="true">
 			<arg swt_gen="true" swt_java_type="byte[]"></arg>
 			<arg swt_gen="true"></arg>
-			<retval swt_gen="true" swt_java_type="NSData"></retval>
+			<retval swt_gen="true"></retval>
 		</method>
 		<method selector="getBytes:" swt_gen="true">
 			<arg swt_gen="true" swt_java_type="byte[]"></arg>
@@ -213,10 +213,10 @@
 		</method>
 		<method class_method="true" selector="dateWithTimeIntervalSinceNow:" swt_gen="true">
 			<arg swt_gen="true"></arg>
-			<retval swt_alloc="true" swt_gen="true" swt_java_type="NSDate"></retval>
+			<retval swt_gen="true"></retval>
 		</method>
 		<method class_method="true" selector="distantFuture" swt_gen="true">
-			<retval swt_alloc="true" swt_gen="true" swt_java_type="NSDate"></retval>
+			<retval swt_gen="true"></retval>
 		</method>
 	</class>
 	<class name="NSDictionary" swt_gen="mixed">
@@ -229,7 +229,7 @@
 		<method class_method="true" selector="dictionaryWithObject:forKey:" swt_gen="true">
 			<arg swt_gen="true"></arg>
 			<arg swt_gen="true"></arg>
-			<retval swt_alloc="true" swt_gen="true" swt_java_type="NSDictionary"></retval>
+			<retval swt_gen="true"></retval>
 		</method>
 		<method selector="objectEnumerator" swt_gen="true">
 			<retval swt_gen="true"></retval>
@@ -337,18 +337,18 @@
 			<retval swt_gen="true"></retval>
 		</method>
 		<method selector="getIndexes:maxCount:inIndexRange:" swt_gen="true">
-			<arg swt_gen="true" swt_java_type="int[]" swt_java_type64="long[]"></arg>
+			<arg swt_gen="true" swt_java_type="long[]"></arg>
 			<arg swt_gen="true"></arg>
 			<arg swt_gen="true"></arg>
 			<retval swt_gen="true"></retval>
 		</method>
 		<method selector="initWithIndex:" swt_gen="true">
 			<arg swt_gen="true"></arg>
-			<retval swt_gen="true" swt_java_type="NSIndexSet"></retval>
+			<retval swt_gen="true"></retval>
 		</method>
 		<method selector="initWithIndexesInRange:" swt_gen="true">
 			<arg swt_gen="true"></arg>
-			<retval swt_gen="true" swt_java_type="NSIndexSet"></retval>
+			<retval swt_gen="true"></retval>
 		</method>
 	</class>
 	<class name="NSKeyedArchiver" swt_gen="mixed" swt_superclass="NSCoder">
@@ -385,11 +385,11 @@
 		</method>
 		<method class_method="true" selector="arrayWithCapacity:" swt_gen="true">
 			<arg swt_gen="true"></arg>
-			<retval swt_gen="true" swt_java_type="NSMutableArray"></retval>
+			<retval swt_gen="true"></retval>
 		</method>
 		<method selector="initWithCapacity:" swt_gen="true">
 			<arg swt_gen="true"></arg>
-			<retval swt_gen="true" swt_java_type="NSMutableArray"></retval>
+			<retval swt_gen="true"></retval>
 		</method>
 		<method selector="removeLastObject" swt_gen="true">
 			<retval swt_gen="true"></retval>
@@ -442,11 +442,11 @@
 	<class name="NSMutableDictionary" swt_gen="mixed" swt_superclass="NSDictionary">
 		<method class_method="true" selector="dictionaryWithCapacity:" swt_gen="true">
 			<arg swt_gen="true"></arg>
-			<retval swt_gen="true" swt_java_type="NSMutableDictionary"></retval>
+			<retval swt_gen="true"></retval>
 		</method>
 		<method selector="initWithCapacity:" swt_gen="true">
 			<arg swt_gen="true"></arg>
-			<retval swt_gen="true" swt_java_type="NSMutableDictionary"></retval>
+			<retval swt_gen="true"></retval>
 		</method>
 		<method selector="removeObjectForKey:" swt_gen="true">
 			<arg swt_gen="true"></arg>
@@ -529,7 +529,7 @@
 			<retval swt_gen="true"></retval>
 		</method>
 		<method class_method="true" selector="defaultCenter" swt_gen="true">
-			<retval swt_gen="true" swt_java_type="NSNotificationCenter"></retval>
+			<retval swt_gen="true"></retval>
 		</method>
 		<method selector="removeObserver:" swt_gen="true">
 			<arg swt_gen="true"></arg>
@@ -612,7 +612,7 @@
 	</class>
 	<class name="NSObject" swt_gen="mixed">
 		<method selector="autorelease" swt_gen="true">
-			<retval swt_gen="true" swt_java_type="NSObject"></retval>
+			<retval swt_gen="true"></retval>
 		</method>
 		<method selector="cancelAuthenticationChallenge:" swt_gen="true">
 			<arg swt_gen="true"></arg>
@@ -635,7 +635,7 @@
 			<retval swt_gen="true"></retval>
 		</method>
 		<method selector="init" swt_gen="true">
-			<retval swt_gen="true" swt_java_type="NSObject"></retval>
+			<retval swt_gen="true"></retval>
 		</method>
 		<method selector="isEqual:" swt_gen="true">
 			<arg swt_gen="true"></arg>
@@ -726,7 +726,7 @@
 			<retval swt_gen="true"></retval>
 		</method>
 		<method class_method="true" selector="set" swt_gen="true">
-			<retval swt_alloc="true" swt_gen="true" swt_java_type="NSSet"></retval>
+			<retval swt_gen="true"></retval>
 		</method>
 	</class>
 	<class name="NSString" swt_gen="mixed">
@@ -735,7 +735,7 @@
 		</method>
 		<method selector="characterAtIndex:" swt_gen="true">
 			<arg swt_gen="true"></arg>
-			<retval swt_gen="true" swt_java_type="int" swt_java_type64="long"></retval>
+			<retval swt_gen="true" swt_java_type="char"></retval>
 		</method>
 		<method selector="compare:" swt_gen="true">
 			<arg swt_gen="true"></arg>
@@ -753,7 +753,7 @@
 		<method selector="initWithCharacters:length:" swt_gen="true">
 			<arg swt_gen="true" swt_java_type="char[]"></arg>
 			<arg swt_gen="true"></arg>
-			<retval swt_gen="true" swt_java_type="NSString"></retval>
+			<retval swt_gen="true"></retval>
 		</method>
 		<method selector="isEqualToString:" swt_gen="true">
 			<arg swt_gen="true"></arg>
@@ -772,7 +772,7 @@
 			<retval swt_gen="true"></retval>
 		</method>
 		<method class_method="true" selector="string" swt_gen="true">
-			<retval swt_gen="true" swt_java_type="NSString"></retval>
+			<retval swt_gen="true"></retval>
 		</method>
 		<method selector="stringByAddingPercentEscapesUsingEncoding:" swt_gen="true">
 			<arg swt_gen="true"></arg>
@@ -808,11 +808,11 @@
 		<method class_method="true" selector="stringWithCharacters:length:" swt_gen="true">
 			<arg swt_gen="true" swt_java_type="char[]"></arg>
 			<arg swt_gen="true"></arg>
-			<retval swt_alloc="true" swt_gen="true" swt_java_type="NSString"></retval>
+			<retval swt_gen="true"></retval>
 		</method>
 		<method class_method="true" selector="stringWithUTF8String:" swt_gen="true">
 			<arg swt_gen="true"></arg>
-			<retval swt_gen="true" swt_java_type="NSString"></retval>
+			<retval swt_gen="true"></retval>
 		</method>
 	</class>
 	<class name="NSThread" swt_gen="mixed">
@@ -854,14 +854,14 @@
 	<class name="NSURL" swt_gen="mixed">
 		<method class_method="true" selector="URLWithString:" swt_gen="true">
 			<arg swt_gen="true"></arg>
-			<retval swt_gen="true" swt_java_type="NSURL"></retval>
+			<retval swt_gen="true"></retval>
 		</method>
 		<method selector="absoluteString" swt_gen="true">
 			<retval swt_gen="true"></retval>
 		</method>
 		<method class_method="true" selector="fileURLWithPath:" swt_gen="true">
 			<arg swt_gen="true"></arg>
-			<retval swt_gen="true" swt_java_type="NSURL"></retval>
+			<retval swt_gen="true"></retval>
 		</method>
 		<method selector="host" swt_gen="true">
 			<retval swt_gen="true"></retval>
@@ -931,7 +931,7 @@
 		</method>
 		<method class_method="true" selector="requestWithURL:" swt_gen="true">
 			<arg swt_gen="true"></arg>
-			<retval swt_alloc="true" swt_gen="true" swt_java_type="NSURLRequest"></retval>
+			<retval swt_gen="true"></retval>
 		</method>
 	</class>
 	<class name="NSUndoManager" swt_gen="mixed">
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSCalendarDate.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSCalendarDate.java
index 35ab7cc13b..59cf6ff5e6 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSCalendarDate.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSCalendarDate.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2019 IBM Corporation and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -66,14 +66,14 @@ public long yearOfCommonEra() {
 	return OS.objc_msgSend(this.id, OS.sel_yearOfCommonEra);
 }
 
-public static NSDate dateWithTimeIntervalSinceNow(double secs) {
+public static NSCalendarDate dateWithTimeIntervalSinceNow(double secs) {
 	long result = OS.objc_msgSend(OS.class_NSCalendarDate, OS.sel_dateWithTimeIntervalSinceNow_, secs);
 	return result != 0 ? new NSCalendarDate(result) : null;
 }
 
 public static NSDate distantFuture() {
 	long result = OS.objc_msgSend(OS.class_NSCalendarDate, OS.sel_distantFuture);
-	return result != 0 ? new NSCalendarDate(result) : null;
+	return result != 0 ? new NSDate(result) : null;
 }
 
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMutableArray.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMutableArray.java
index 43c34d92e6..1d7d38375f 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMutableArray.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMutableArray.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2019 IBM Corporation and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -61,12 +61,12 @@ public void removeObjectIdenticalTo(id anObject) {
 	OS.objc_msgSend(this.id, OS.sel_removeObjectIdenticalTo_, anObject != null ? anObject.id : 0);
 }
 
-public static NSArray array() {
+public static NSMutableArray array() {
 	long result = OS.objc_msgSend(OS.class_NSMutableArray, OS.sel_array);
-	return result != 0 ? new NSArray(result) : null;
+	return result != 0 ? new NSMutableArray(result) : null;
 }
 
-public static NSArray arrayWithObject(id anObject) {
+public static NSMutableArray arrayWithObject(id anObject) {
 	long result = OS.objc_msgSend(OS.class_NSMutableArray, OS.sel_arrayWithObject_, anObject != null ? anObject.id : 0);
 	return result != 0 ? new NSMutableArray(result) : null;
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMutableDictionary.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMutableDictionary.java
index b9a5a531a3..3dae07048b 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMutableDictionary.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMutableDictionary.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2017 IBM Corporation and others.
+ * Copyright (c) 2000, 2019 IBM Corporation and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -53,7 +53,7 @@ public void setValue(id value, NSString key) {
 	OS.objc_msgSend(this.id, OS.sel_setValue_forKey_, value != null ? value.id : 0, key != null ? key.id : 0);
 }
 
-public static NSDictionary dictionaryWithObject(id object, id key) {
+public static NSMutableDictionary dictionaryWithObject(id object, id key) {
 	long result = OS.objc_msgSend(OS.class_NSMutableDictionary, OS.sel_dictionaryWithObject_forKey_, object != null ? object.id : 0, key != null ? key.id : 0);
 	return result != 0 ? new NSMutableDictionary(result) : null;
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMutableSet.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMutableSet.java
index 08e59aad57..beabfb3d97 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMutableSet.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMutableSet.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2019 IBM Corporation and others.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -31,7 +31,7 @@ public void addObjectsFromArray(NSArray array) {
 	OS.objc_msgSend(this.id, OS.sel_addObjectsFromArray_, array != null ? array.id : 0);
 }
 
-public static NSSet set() {
+public static NSMutableSet set() {
 	long result = OS.objc_msgSend(OS.class_NSMutableSet, OS.sel_set);
 	return result != 0 ? new NSMutableSet(result) : null;
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMutableString.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMutableString.java
index 73b5f10bc1..ceea3d5991 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMutableString.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMutableString.java
@@ -39,19 +39,19 @@ public void setString(NSString aString) {
 	OS.objc_msgSend(this.id, OS.sel_setString_, aString != null ? aString.id : 0);
 }
 
-public static NSString string() {
+public static NSMutableString string() {
 	long result = OS.objc_msgSend(OS.class_NSMutableString, OS.sel_string);
-	return result != 0 ? new NSString(result) : null;
+	return result != 0 ? new NSMutableString(result) : null;
 }
 
-public static NSString stringWithCharacters(char[] characters, long length) {
+public static NSMutableString stringWithCharacters(char[] characters, long length) {
 	long result = OS.objc_msgSend(OS.class_NSMutableString, OS.sel_stringWithCharacters_length_, characters, length);
 	return result != 0 ? new NSMutableString(result) : null;
 }
 
-public static NSString stringWithUTF8String(long nullTerminatedCString) {
+public static NSMutableString stringWithUTF8String(long nullTerminatedCString) {
 	long result = OS.objc_msgSend(OS.class_NSMutableString, OS.sel_stringWithUTF8String_, nullTerminatedCString);
-	return result != 0 ? new NSString(result) : null;
+	return result != 0 ? new NSMutableString(result) : null;
 }
 
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMutableURLRequest.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMutableURLRequest.java
index dbea7226c0..942b0e65eb 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMutableURLRequest.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMutableURLRequest.java
@@ -43,7 +43,7 @@ public void setURL(NSURL URL) {
 	OS.objc_msgSend(this.id, OS.sel_setURL_, URL != null ? URL.id : 0);
 }
 
-public static NSURLRequest requestWithURL(NSURL URL) {
+public static NSMutableURLRequest requestWithURL(NSURL URL) {
 	long result = OS.objc_msgSend(OS.class_NSMutableURLRequest, OS.sel_requestWithURL_, URL != null ? URL.id : 0);
 	return result != 0 ? new NSMutableURLRequest(result) : null;
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSString.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSString.java
index ad7806e894..d7b8aaf78c 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSString.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSString.java
@@ -49,8 +49,8 @@ public long UTF8String() {
 	return OS.objc_msgSend(this.id, OS.sel_UTF8String);
 }
 
-public long characterAtIndex(long index) {
-	return OS.objc_msgSend(this.id, OS.sel_characterAtIndex_, index);
+public char characterAtIndex(long index) {
+	return (char)OS.objc_msgSend(this.id, OS.sel_characterAtIndex_, index);
 }
 
 public long compare(NSString string) {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTableView.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTableView.java
index ad563c3fbf..6a581084dc 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTableView.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTableView.java
@@ -27,8 +27,8 @@ public NSTableView(id id) {
 	super(id);
 }
 
-public void addTableColumn(NSTableColumn column) {
-	OS.objc_msgSend(this.id, OS.sel_addTableColumn_, column != null ? column.id : 0);
+public void addTableColumn(NSTableColumn tableColumn) {
+	OS.objc_msgSend(this.id, OS.sel_addTableColumn_, tableColumn != null ? tableColumn.id : 0);
 }
 
 public boolean canDragRowsWithIndexes(NSIndexSet rowIndexes, NSPoint mouseDownPoint) {
@@ -89,8 +89,8 @@ public boolean isRowSelected(long row) {
 	return OS.objc_msgSend_bool(this.id, OS.sel_isRowSelected_, row);
 }
 
-public void moveColumn(long column, long newIndex) {
-	OS.objc_msgSend(this.id, OS.sel_moveColumn_toColumn_, column, newIndex);
+public void moveColumn(long oldIndex, long newIndex) {
+	OS.objc_msgSend(this.id, OS.sel_moveColumn_toColumn_, oldIndex, newIndex);
 }
 
 public void noteNumberOfRowsChanged() {
@@ -130,8 +130,8 @@ public void reloadData() {
 	OS.objc_msgSend(this.id, OS.sel_reloadData);
 }
 
-public void removeTableColumn(NSTableColumn column) {
-	OS.objc_msgSend(this.id, OS.sel_removeTableColumn_, column != null ? column.id : 0);
+public void removeTableColumn(NSTableColumn tableColumn) {
+	OS.objc_msgSend(this.id, OS.sel_removeTableColumn_, tableColumn != null ? tableColumn.id : 0);
 }
 
 public long rowAtPoint(NSPoint point) {
@@ -195,24 +195,24 @@ public void setDoubleAction(long doubleAction) {
 	OS.objc_msgSend(this.id, OS.sel_setDoubleAction_, doubleAction);
 }
 
-public void setDropRow(long row, long op) {
-	OS.objc_msgSend(this.id, OS.sel_setDropRow_dropOperation_, row, op);
+public void setDropRow(long row, long dropOperation) {
+	OS.objc_msgSend(this.id, OS.sel_setDropRow_dropOperation_, row, dropOperation);
 }
 
-public void setGridStyleMask(long gridStyle) {
-	OS.objc_msgSend(this.id, OS.sel_setGridStyleMask_, gridStyle);
+public void setGridStyleMask(long gridStyleMask) {
+	OS.objc_msgSend(this.id, OS.sel_setGridStyleMask_, gridStyleMask);
 }
 
 public void setHeaderView(NSTableHeaderView headerView) {
 	OS.objc_msgSend(this.id, OS.sel_setHeaderView_, headerView != null ? headerView.id : 0);
 }
 
-public void setHighlightedTableColumn(NSTableColumn tc) {
-	OS.objc_msgSend(this.id, OS.sel_setHighlightedTableColumn_, tc != null ? tc.id : 0);
+public void setHighlightedTableColumn(NSTableColumn highlightedTableColumn) {
+	OS.objc_msgSend(this.id, OS.sel_setHighlightedTableColumn_, highlightedTableColumn != null ? highlightedTableColumn.id : 0);
 }
 
-public void setIndicatorImage(NSImage anImage, NSTableColumn tc) {
-	OS.objc_msgSend(this.id, OS.sel_setIndicatorImage_inTableColumn_, anImage != null ? anImage.id : 0, tc != null ? tc.id : 0);
+public void setIndicatorImage(NSImage anImage, NSTableColumn tableColumn) {
+	OS.objc_msgSend(this.id, OS.sel_setIndicatorImage_inTableColumn_, anImage != null ? anImage.id : 0, tableColumn != null ? tableColumn.id : 0);
 }
 
 public void setIntercellSpacing(NSSize intercellSpacing) {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSView.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSView.java
index 8010b897ef..d76fc2bcfd 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSView.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSView.java
@@ -114,8 +114,8 @@ public void dragImage(NSImage anImage, NSPoint viewLocation, NSSize initialOffse
 	OS.objc_msgSend(this.id, OS.sel_dragImage_at_offset_event_pasteboard_source_slideBack_, anImage != null ? anImage.id : 0, viewLocation, initialOffset, event != null ? event.id : 0, pboard != null ? pboard.id : 0, sourceObj != null ? sourceObj.id : 0, slideFlag);
 }
 
-public void drawRect(NSRect rect) {
-	OS.objc_msgSend(this.id, OS.sel_drawRect_, rect);
+public void drawRect(NSRect dirtyRect) {
+	OS.objc_msgSend(this.id, OS.sel_drawRect_, dirtyRect);
 }
 
 public void endDocument() {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/OS.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/OS.java
index 2f43907c8b..5969261bb3 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/OS.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/OS.java
@@ -771,11 +771,10 @@ public static final long protocol_NSAccessibility = objc_getProtocol("NSAccessib
 public static final long protocol_NSAccessibilityAdditions = objc_getProtocol("NSAccessibilityAdditions");
 public static final long protocol_NSAppearanceCustomization = objc_getProtocol("NSAppearanceCustomization");
 public static final long protocol_NSApplicationDelegate = objc_getProtocol("NSApplicationDelegate");
-public static final long protocol_NSApplicationNotifications = objc_getProtocol("NSApplicationNotifications");
 public static final long protocol_NSColorPanelResponderMethod = objc_getProtocol("NSColorPanelResponderMethod");
-public static final long protocol_NSComboBoxNotifications = objc_getProtocol("NSComboBoxNotifications");
+public static final long protocol_NSComboBoxDelegate = objc_getProtocol("NSComboBoxDelegate");
 public static final long protocol_NSDraggingDestination = objc_getProtocol("NSDraggingDestination");
-public static final long protocol_NSDraggingSource = objc_getProtocol("NSDraggingSource");
+public static final long protocol_NSDraggingSourceDeprecated = objc_getProtocol("NSDraggingSourceDeprecated");
 public static final long protocol_NSFontManagerResponderMethod = objc_getProtocol("NSFontManagerResponderMethod");
 public static final long protocol_NSFontPanelValidationAdditions = objc_getProtocol("NSFontPanelValidationAdditions");
 public static final long protocol_NSMenuDelegate = objc_getProtocol("NSMenuDelegate");
@@ -783,12 +782,10 @@ public static final long protocol_NSMenuValidation = objc_getProtocol("NSMenuVal
 public static final long protocol_NSOpenSavePanelDelegate = objc_getProtocol("NSOpenSavePanelDelegate");
 public static final long protocol_NSOutlineViewDataSource = objc_getProtocol("NSOutlineViewDataSource");
 public static final long protocol_NSOutlineViewDelegate = objc_getProtocol("NSOutlineViewDelegate");
-public static final long protocol_NSOutlineViewNotifications = objc_getProtocol("NSOutlineViewNotifications");
 public static final long protocol_NSPasteboardOwner = objc_getProtocol("NSPasteboardOwner");
 public static final long protocol_NSTabViewDelegate = objc_getProtocol("NSTabViewDelegate");
-public static final long protocol_NSTableDataSource = objc_getProtocol("NSTableDataSource");
+public static final long protocol_NSTableViewDataSource = objc_getProtocol("NSTableViewDataSource");
 public static final long protocol_NSTableViewDelegate = objc_getProtocol("NSTableViewDelegate");
-public static final long protocol_NSTableViewNotifications = objc_getProtocol("NSTableViewNotifications");
 public static final long protocol_NSTextAttachmentCell = objc_getProtocol("NSTextAttachmentCell");
 public static final long protocol_NSTextDelegate = objc_getProtocol("NSTextDelegate");
 public static final long protocol_NSTextInput = objc_getProtocol("NSTextInput");
@@ -797,7 +794,6 @@ public static final long protocol_NSToolTipOwner = objc_getProtocol("NSToolTipOw
 public static final long protocol_NSToolbarDelegate = objc_getProtocol("NSToolbarDelegate");
 public static final long protocol_NSURLDownloadDelegate = objc_getProtocol("NSURLDownloadDelegate");
 public static final long protocol_NSWindowDelegate = objc_getProtocol("NSWindowDelegate");
-public static final long protocol_NSWindowNotifications = objc_getProtocol("NSWindowNotifications");
 public static final long protocol_WebDocumentRepresentation = objc_getProtocol("WebDocumentRepresentation");
 public static final long protocol_WebFrameLoadDelegate = objc_getProtocol("WebFrameLoadDelegate");
 public static final long protocol_WebOpenPanelResultListener = objc_getProtocol("WebOpenPanelResultListener");
@@ -2949,10 +2945,10 @@ public static final native long CFURLCreateStringByAddingPercentEscapes(long all
  * @param height cast=(size_t)
  * @param bitsPerComponent cast=(size_t)
  * @param bytesPerRow cast=(size_t)
- * @param colorspace cast=(CGColorSpaceRef)
+ * @param space cast=(CGColorSpaceRef)
  * @param bitmapInfo cast=(CGBitmapInfo)
  */
-public static final native long CGBitmapContextCreate(long data, long width, long height, long bitsPerComponent, long bytesPerRow, long colorspace, int bitmapInfo);
+public static final native long CGBitmapContextCreate(long data, long width, long height, long bitsPerComponent, long bytesPerRow, long space, int bitmapInfo);
 /**
  * @param space cast=(CGColorSpaceRef)
  * @param components cast=(CGFloat*)
@@ -3025,15 +3021,15 @@ public static final native void CGContextScaleCTM(long c, double sx, double sy);
  */
 public static final native void CGContextSetBlendMode(long context, int mode);
 /**
- * @param c cast=(CGContextRef)
+ * @param context cast=(CGContextRef)
  * @param components cast=(CGFloat*)
  */
-public static final native void CGContextSetFillColor(long c, double[] components);
+public static final native void CGContextSetFillColor(long context, double[] components);
 /**
- * @param c cast=(CGContextRef)
- * @param colorspace cast=(CGColorSpaceRef)
+ * @param context cast=(CGContextRef)
+ * @param space cast=(CGColorSpaceRef)
  */
-public static final native void CGContextSetFillColorSpace(long c, long colorspace);
+public static final native void CGContextSetFillColorSpace(long context, long space);
 /**
  * @param c cast=(CGContextRef)
  * @param cap cast=(CGLineCap)
@@ -3045,7 +3041,7 @@ public static final native void CGContextSetLineCap(long c, int cap);
  * @param lengths cast=(CGFloat*)
  * @param count cast=(size_t)
  */
-public static final native void CGContextSetLineDash(long c, double phase, float[] lengths, long count);
+public static final native void CGContextSetLineDash(long c, double phase, double[] lengths, long count);
 /**
  * @param c cast=(CGContextRef)
  * @param join cast=(CGLineJoin)
@@ -3102,7 +3098,7 @@ public static final native long CGEventCreateMouseEvent(long source, int mouseTy
 /**
  * @param source cast=(CGEventSourceRef)
  * @param units cast=(CGScrollEventUnit)
- * @param wheelCount cast=(CGWheelCount)
+ * @param wheelCount cast=(uint32_t)
  * @param wheel1 cast=(int32_t)
  */
 public static final native long CGEventCreateScrollWheelEvent(long source, int units, int wheelCount, int wheel1);
@@ -3117,30 +3113,30 @@ public static final native long CGEventGetIntegerValueField(long event, int fiel
  */
 public static final native void CGEventPost(int tap, long event);
 /**
- * @param sourceState cast=(CGEventSourceStateID)
+ * @param stateID cast=(CGEventSourceStateID)
  */
-public static final native long CGEventSourceCreate(int sourceState);
+public static final native long CGEventSourceCreate(int stateID);
 /**
  * @param rect flags=struct
- * @param maxDisplays cast=(CGDisplayCount)
- * @param dspys cast=(CGDirectDisplayID*)
- * @param dspyCnt cast=(CGDisplayCount*)
+ * @param maxDisplays cast=(uint32_t)
+ * @param displays cast=(CGDirectDisplayID*)
+ * @param matchingDisplayCount cast=(uint32_t*)
  */
-public static final native int CGGetDisplaysWithRect(CGRect rect, int maxDisplays, long dspys, long dspyCnt);
+public static final native int CGGetDisplaysWithRect(CGRect rect, int maxDisplays, long displays, long matchingDisplayCount);
 /**
  * @param width cast=(size_t)
  * @param height cast=(size_t)
  * @param bitsPerComponent cast=(size_t)
  * @param bitsPerPixel cast=(size_t)
  * @param bytesPerRow cast=(size_t)
- * @param colorspace cast=(CGColorSpaceRef)
+ * @param space cast=(CGColorSpaceRef)
  * @param bitmapInfo cast=(CGBitmapInfo)
  * @param provider cast=(CGDataProviderRef)
  * @param decode cast=(CGFloat*)
  * @param shouldInterpolate cast=(_Bool)
  * @param intent cast=(CGColorRenderingIntent)
  */
-public static final native long CGImageCreate(long width, long height, long bitsPerComponent, long bitsPerPixel, long bytesPerRow, long colorspace, int bitmapInfo, long provider, long decode, boolean shouldInterpolate, int intent);
+public static final native long CGImageCreate(long width, long height, long bitsPerComponent, long bitsPerPixel, long bytesPerRow, long space, int bitmapInfo, long provider, long decode, boolean shouldInterpolate, int intent);
 /**
  * @param image cast=(CGImageRef)
  */
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/WebKitFull.bridgesupport.extras b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/WebKitFull.bridgesupport.extras
index 34948ce86e..4e05e05c08 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/WebKitFull.bridgesupport.extras
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/WebKitFull.bridgesupport.extras
@@ -180,7 +180,7 @@
 			<arg swt_gen="true"></arg>
 			<arg swt_gen="true"></arg>
 			<arg swt_gen="true"></arg>
-			<retval swt_gen="true" swt_java_type="WebView"></retval>
+			<retval swt_gen="true"></retval>
 		</method>
 		<method selector="mainFrame" swt_gen="true">
 			<retval swt_gen="true"></retval>
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/GC.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/GC.java
index 0b878ecbb8..453e5da3e0 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/GC.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/GC.java
@@ -3075,7 +3075,7 @@ void initCGContext(long cgContext) {
 			case SWT.LINE_CUSTOM: dashes = data.lineDashes; break;
 		}
 		if (dashes != null) {
-			float[] lengths = new float[dashes.length];
+			double[] lengths = new double[dashes.length];
 			for (int i = 0; i < lengths.length; i++) {
 				lengths[i] = width == 0 || data.lineStyle == SWT.LINE_CUSTOM ? dashes[i] : dashes[i] * width;
 			}