Bug 502090 - [Cocoa] Bridge support files should be updated to latest

macOS supported version

Source changes generated by the MacGenerator using the updated bridge
support files from macOS 10.10

Change-Id: Id9b0cffb795bfb0b5ca304efc00ef5d8f23b86af

70 files changed, 593 insertions, 608 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 fb0d2a45ca..46bb4a1a7f 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
@@ -641,8 +641,8 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(CALLBACK_1highlightSelectionInClipRect_1)
 
 #ifndef NO_CALLBACK_1hitTestForEvent_1inRect_1ofView_1
 static jintLong CALLBACK_1hitTestForEvent_1inRect_1ofView_1;
-static NSUInteger proc_CALLBACK_1hitTestForEvent_1inRect_1ofView_1(id arg0, SEL arg1, NSEvent* arg2, NSRect arg3, NSView* arg4) {
-	return ((NSUInteger (*)(id, SEL, NSEvent*, NSRect*, NSView*))CALLBACK_1hitTestForEvent_1inRect_1ofView_1)(arg0, arg1, arg2, &arg3, arg4);
+static NSCellHitResult proc_CALLBACK_1hitTestForEvent_1inRect_1ofView_1(id arg0, SEL arg1, NSEvent* arg2, NSRect arg3, NSView* arg4) {
+	return ((NSCellHitResult (*)(id, SEL, NSEvent*, NSRect*, NSView*))CALLBACK_1hitTestForEvent_1inRect_1ofView_1)(arg0, arg1, arg2, &arg3, arg4);
 }
 static jintLong CALLBACK_hitTestForEvent_inRect_ofView_(jintLong func) {
 	CALLBACK_1hitTestForEvent_1inRect_1ofView_1 = func;
@@ -2204,7 +2204,7 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(CTParagraphStyleCreate)
 {
 	jintLong rc = 0;
 	OS_NATIVE_ENTER(env, that, CTParagraphStyleCreate_FUNC);
-	rc = (jintLong)CTParagraphStyleCreate((CTParagraphStyleSetting*)arg0, (CFIndex)arg1);
+	rc = (jintLong)CTParagraphStyleCreate((CTParagraphStyleSetting*)arg0, (size_t)arg1);
 	OS_NATIVE_EXIT(env, that, CTParagraphStyleCreate_FUNC);
 	return rc;
 }
@@ -5140,6 +5140,18 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(NSSpellingStateAttributeName)
 }
 #endif
 
+#ifndef NO_NSSquareStatusItemLength
+JNIEXPORT jfloatDouble JNICALL OS_NATIVE(NSSquareStatusItemLength)
+	(JNIEnv *env, jclass that)
+{
+	jfloatDouble rc = 0;
+	OS_NATIVE_ENTER(env, that, NSSquareStatusItemLength_FUNC);
+	rc = (jfloatDouble)NSSquareStatusItemLength;
+	OS_NATIVE_EXIT(env, that, NSSquareStatusItemLength_FUNC);
+	return rc;
+}
+#endif
+
 #ifndef NO_NSStrikethroughColorAttributeName
 JNIEXPORT jintLong JNICALL OS_NATIVE(NSStrikethroughColorAttributeName)
 	(JNIEnv *env, jclass that)
@@ -8845,11 +8857,11 @@ fail:
 }
 #endif
 
-#if (!defined(NO_objc_1msgSend__II_3II) && !defined(JNI64)) || (!defined(NO_objc_1msgSend__JJ_3II) && defined(JNI64))
+#if (!defined(NO_objc_1msgSend__II_3II) && !defined(JNI64)) || (!defined(NO_objc_1msgSend__JJ_3IJ) && defined(JNI64))
 #ifndef JNI64
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__II_3II)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintArray arg2, jint arg3)
+JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__II_3II)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintArray arg2, jintLong arg3)
 #else
-JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__JJ_3II)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintArray arg2, jint arg3)
+JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__JJ_3IJ)(JNIEnv *env, jclass that, jintLong arg0, jintLong arg1, jintArray arg2, jintLong arg3)
 #endif
 {
 	jint *lparg2=NULL;
@@ -8857,16 +8869,16 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(objc_1msgSend__JJ_3II)(JNIEnv *env, jclass
 #ifndef JNI64
 	OS_NATIVE_ENTER(env, that, objc_1msgSend__II_3II_FUNC);
 #else
-	OS_NATIVE_ENTER(env, that, objc_1msgSend__JJ_3II_FUNC);
+	OS_NATIVE_ENTER(env, that, objc_1msgSend__JJ_3IJ_FUNC);
 #endif
 	if (arg2) if ((lparg2 = (*env)->GetIntArrayElements(env, arg2, NULL)) == NULL) goto fail;
-	rc = (jintLong)((jintLong (*)(jintLong, jintLong, jint *, jint))objc_msgSend)(arg0, arg1, lparg2, arg3);
+	rc = (jintLong)((jintLong (*)(jintLong, jintLong, jint *, jintLong))objc_msgSend)(arg0, arg1, lparg2, arg3);
 fail:
 	if (arg2 && lparg2) (*env)->ReleaseIntArrayElements(env, arg2, lparg2, 0);
 #ifndef JNI64
 	OS_NATIVE_EXIT(env, that, objc_1msgSend__II_3II_FUNC);
 #else
-	OS_NATIVE_EXIT(env, that, objc_1msgSend__JJ_3II_FUNC);
+	OS_NATIVE_EXIT(env, that, objc_1msgSend__JJ_3IJ_FUNC);
 #endif
 	return rc;
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os_stats.c b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os_stats.c
index 1e02574e98..9df0f95c8e 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os_stats.c
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os_stats.c
@@ -390,6 +390,7 @@ char * OS_nativeFunctionNames[] = {
 	"NSSearchPathForDirectoriesInDomains",
 	"NSSize_1sizeof",
 	"NSSpellingStateAttributeName",
+	"NSSquareStatusItemLength",
 	"NSStrikethroughColorAttributeName",
 	"NSStrikethroughStyleAttributeName",
 	"NSStrokeWidthAttributeName",
@@ -947,7 +948,7 @@ char * OS_nativeFunctionNames[] = {
 #ifndef JNI64
 	"objc_1msgSend__II_3II",
 #else
-	"objc_1msgSend__JJ_3II",
+	"objc_1msgSend__JJ_3IJ",
 #endif
 #ifndef JNI64
 	"objc_1msgSend__II_3III",
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os_stats.h b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os_stats.h
index 0d9f8e770d..92513cec10 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os_stats.h
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/library/os_stats.h
@@ -400,6 +400,7 @@ typedef enum {
 	NSSearchPathForDirectoriesInDomains_FUNC,
 	NSSize_1sizeof_FUNC,
 	NSSpellingStateAttributeName_FUNC,
+	NSSquareStatusItemLength_FUNC,
 	NSStrikethroughColorAttributeName_FUNC,
 	NSStrikethroughStyleAttributeName_FUNC,
 	NSStrokeWidthAttributeName_FUNC,
@@ -957,7 +958,7 @@ typedef enum {
 #ifndef JNI64
 	objc_1msgSend__II_3II_FUNC,
 #else
-	objc_1msgSend__JJ_3II_FUNC,
+	objc_1msgSend__JJ_3IJ_FUNC,
 #endif
 #ifndef JNI64
 	objc_1msgSend__II_3III_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 ca9f470a9d..57c24c7599 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
@@ -4739,6 +4739,7 @@
 	<constant name="NSPrintScalingFactor" swt_gen="true"></constant>
 	<constant name="NSPrintSpoolJob" swt_gen="true"></constant>
 	<constant name="NSSpellingStateAttributeName" swt_gen="true"></constant>
+	<constant name="NSSquareStatusItemLength" swt_gen="true"></constant>
 	<constant name="NSStrikethroughColorAttributeName" swt_gen="true"></constant>
 	<constant name="NSStrikethroughStyleAttributeName" swt_gen="true"></constant>
 	<constant name="NSStrokeWidthAttributeName" swt_gen="true"></constant>
@@ -4941,7 +4942,6 @@
 	<enum name="NSShiftKeyMask" swt_gen="true"></enum>
 	<enum name="NSSmallControlSize" swt_gen="true"></enum>
 	<enum name="NSSquareLineCapStyle" swt_gen="true"></enum>
-	<enum name="NSSquareStatusItemLength" swt_gen="true"></enum>
 	<enum name="NSStatusWindowLevel" swt_gen="true"></enum>
 	<enum name="NSStringDrawingUsesLineFragmentOrigin" swt_gen="true"></enum>
 	<enum name="NSSubmenuWindowLevel" swt_gen="true"></enum>
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/DOMWheelEvent.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/DOMWheelEvent.java
index 2584f198ff..ece66a6e3e 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/DOMWheelEvent.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/DOMWheelEvent.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2017 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -10,7 +10,7 @@
  *******************************************************************************/
 package org.eclipse.swt.internal.cocoa;
 
-public class DOMWheelEvent extends NSObject {
+public class DOMWheelEvent extends DOMMouseEvent {
 
 public DOMWheelEvent() {
 	super();
@@ -24,32 +24,16 @@ public DOMWheelEvent(id id) {
 	super(id);
 }
 
-public boolean altKey() {
-	return OS.objc_msgSend_bool(this.id, OS.sel_altKey);
-}
-
-public boolean ctrlKey() {
-	return OS.objc_msgSend_bool(this.id, OS.sel_ctrlKey);
-}
-
-public boolean metaKey() {
-	return OS.objc_msgSend_bool(this.id, OS.sel_metaKey);
-}
-
-public int screenX() {
-	return (int)/*64*/OS.objc_msgSend(this.id, OS.sel_screenX);
-}
-
-public int screenY() {
-	return (int)/*64*/OS.objc_msgSend(this.id, OS.sel_screenY);
+public int wheelDelta() {
+	return (int)/*64*/OS.objc_msgSend(this.id, OS.sel_wheelDelta);
 }
 
-public boolean shiftKey() {
-	return OS.objc_msgSend_bool(this.id, OS.sel_shiftKey);
+public int wheelDeltaX() {
+	return (int)/*64*/OS.objc_msgSend(this.id, OS.sel_wheelDeltaX);
 }
 
-public int wheelDelta() {
-	return (int)/*64*/OS.objc_msgSend(this.id, OS.sel_wheelDelta);
+public int wheelDeltaY() {
+	return (int)/*64*/OS.objc_msgSend(this.id, OS.sel_wheelDeltaY);
 }
 
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSActionCell.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSActionCell.java
index 0abca10471..3d3256df46 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSActionCell.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSActionCell.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2017 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -28,12 +28,12 @@ public long /*int*/ action() {
 	return OS.objc_msgSend(this.id, OS.sel_action);
 }
 
-public void setAction(long /*int*/ aSelector) {
-	OS.objc_msgSend(this.id, OS.sel_setAction_, aSelector);
+public void setAction(long /*int*/ action) {
+	OS.objc_msgSend(this.id, OS.sel_setAction_, action);
 }
 
-public void setTarget(id anObject) {
-	OS.objc_msgSend(this.id, OS.sel_setTarget_, anObject != null ? anObject.id : 0);
+public void setTarget(id target) {
+	OS.objc_msgSend(this.id, OS.sel_setTarget_, target != null ? target.id : 0);
 }
 
 public id target() {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSAlert.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSAlert.java
index 0546a4d088..1f275b7ee4 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSAlert.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSAlert.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2017 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -37,8 +37,8 @@ public long /*int*/ runModal() {
 	return OS.objc_msgSend(this.id, OS.sel_runModal);
 }
 
-public void setAlertStyle(long /*int*/ style) {
-	OS.objc_msgSend(this.id, OS.sel_setAlertStyle_, style);
+public void setAlertStyle(long /*int*/ alertStyle) {
+	OS.objc_msgSend(this.id, OS.sel_setAlertStyle_, alertStyle);
 }
 
 public void setMessageText(NSString messageText) {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSApplication.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSApplication.java
index 0df7103522..bcfc7e752e 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSApplication.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSApplication.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2013 IBM Corporation and others.
+ * Copyright (c) 2000, 2017 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -132,24 +132,24 @@ public boolean setActivationPolicy(long /*int*/ activationPolicy) {
 	return OS.objc_msgSend_bool(this.id, OS.sel_setActivationPolicy_, activationPolicy);
 }
 
-public void setApplicationIconImage(NSImage image) {
-	OS.objc_msgSend(this.id, OS.sel_setApplicationIconImage_, image != null ? image.id : 0);
+public void setApplicationIconImage(NSImage applicationIconImage) {
+	OS.objc_msgSend(this.id, OS.sel_setApplicationIconImage_, applicationIconImage != null ? applicationIconImage.id : 0);
 }
 
-public void setDelegate(id anObject) {
-	OS.objc_msgSend(this.id, OS.sel_setDelegate_, anObject != null ? anObject.id : 0);
+public void setDelegate(id delegate) {
+	OS.objc_msgSend(this.id, OS.sel_setDelegate_, delegate != null ? delegate.id : 0);
 }
 
 public void setHelpMenu(NSMenu helpMenu) {
 	OS.objc_msgSend(this.id, OS.sel_setHelpMenu_, helpMenu != null ? helpMenu.id : 0);
 }
 
-public void setMainMenu(NSMenu aMenu) {
-	OS.objc_msgSend(this.id, OS.sel_setMainMenu_, aMenu != null ? aMenu.id : 0);
+public void setMainMenu(NSMenu mainMenu) {
+	OS.objc_msgSend(this.id, OS.sel_setMainMenu_, mainMenu != null ? mainMenu.id : 0);
 }
 
-public void setServicesMenu(NSMenu aMenu) {
-	OS.objc_msgSend(this.id, OS.sel_setServicesMenu_, aMenu != null ? aMenu.id : 0);
+public void setServicesMenu(NSMenu servicesMenu) {
+	OS.objc_msgSend(this.id, OS.sel_setServicesMenu_, servicesMenu != null ? servicesMenu.id : 0);
 }
 
 public static NSApplication sharedApplication() {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSBitmapImageRep.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSBitmapImageRep.java
index 4ae8b8ff0f..b878d3d673 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSBitmapImageRep.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSBitmapImageRep.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2015 IBM Corporation and others.
+ * Copyright (c) 2000, 2017 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -58,9 +58,9 @@ public void getBitmapDataPlanes(long[] /*int[]*/ data) {
 	OS.objc_msgSend(this.id, OS.sel_getBitmapDataPlanes_, data);
 }
 
-public static id imageRepWithData(NSData data) {
+public static NSBitmapImageRep imageRepWithData(NSData data) {
 	long /*int*/ result = OS.objc_msgSend(OS.class_NSBitmapImageRep, OS.sel_imageRepWithData_, data != null ? data.id : 0);
-	return result != 0 ? new id(result) : null;
+	return result != 0 ? new NSBitmapImageRep(result) : null;
 }
 
 public NSBitmapImageRep initWithBitmapDataPlanes(long /*int*/ planes, long /*int*/ width, long /*int*/ height, long /*int*/ bps, long /*int*/ spp, boolean alpha, boolean isPlanar, NSString colorSpaceName, long /*int*/ bitmapFormat, long /*int*/ rBytes, long /*int*/ pBits) {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSBox.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSBox.java
index c8b01e0691..85a456a456 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSBox.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSBox.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2017 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -39,8 +39,8 @@ public NSSize contentViewMargins() {
 	return result;
 }
 
-public void setBorderType(long /*int*/ aType) {
-	OS.objc_msgSend(this.id, OS.sel_setBorderType_, aType);
+public void setBorderType(long /*int*/ borderType) {
+	OS.objc_msgSend(this.id, OS.sel_setBorderType_, borderType);
 }
 
 public void setBorderWidth(double /*float*/ borderWidth) {
@@ -51,12 +51,12 @@ public void setBoxType(long /*int*/ boxType) {
 	OS.objc_msgSend(this.id, OS.sel_setBoxType_, boxType);
 }
 
-public void setContentView(NSView aView) {
-	OS.objc_msgSend(this.id, OS.sel_setContentView_, aView != null ? aView.id : 0);
+public void setContentView(id contentView) {
+	OS.objc_msgSend(this.id, OS.sel_setContentView_, contentView != null ? contentView.id : 0);
 }
 
-public void setContentViewMargins(NSSize offsetSize) {
-	OS.objc_msgSend(this.id, OS.sel_setContentViewMargins_, offsetSize);
+public void setContentViewMargins(NSSize contentViewMargins) {
+	OS.objc_msgSend(this.id, OS.sel_setContentViewMargins_, contentViewMargins);
 }
 
 public void setFillColor(NSColor fillColor) {
@@ -67,16 +67,16 @@ public void setFrameFromContentFrame(NSRect contentFrame) {
 	OS.objc_msgSend(this.id, OS.sel_setFrameFromContentFrame_, contentFrame);
 }
 
-public void setTitle(NSString aString) {
-	OS.objc_msgSend(this.id, OS.sel_setTitle_, aString != null ? aString.id : 0);
+public void setTitle(NSString title) {
+	OS.objc_msgSend(this.id, OS.sel_setTitle_, title != null ? title.id : 0);
 }
 
-public void setTitleFont(NSFont fontObj) {
-	OS.objc_msgSend(this.id, OS.sel_setTitleFont_, fontObj != null ? fontObj.id : 0);
+public void setTitleFont(NSFont titleFont) {
+	OS.objc_msgSend(this.id, OS.sel_setTitleFont_, titleFont != null ? titleFont.id : 0);
 }
 
-public void setTitlePosition(long /*int*/ aPosition) {
-	OS.objc_msgSend(this.id, OS.sel_setTitlePosition_, aPosition);
+public void setTitlePosition(long /*int*/ titlePosition) {
+	OS.objc_msgSend(this.id, OS.sel_setTitlePosition_, titlePosition);
 }
 
 public void sizeToFit() {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSBrowserCell.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSBrowserCell.java
index ea8a1d285b..14afbfd97a 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSBrowserCell.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSBrowserCell.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2017 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -29,8 +29,8 @@ public NSColor highlightColorInView(NSView controlView) {
 	return result != 0 ? new NSColor(result) : null;
 }
 
-public void setLeaf(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setLeaf_, flag);
+public void setLeaf(boolean leaf) {
+	OS.objc_msgSend(this.id, OS.sel_setLeaf_, leaf);
 }
 
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSButton.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSButton.java
index bd61310000..ac9edf4477 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSButton.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSButton.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2017 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -29,20 +29,20 @@ public NSAttributedString attributedTitle() {
 	return result != 0 ? new NSAttributedString(result) : null;
 }
 
-public void setAllowsMixedState(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setAllowsMixedState_, flag);
+public void setAllowsMixedState(boolean allowsMixedState) {
+	OS.objc_msgSend(this.id, OS.sel_setAllowsMixedState_, allowsMixedState);
 }
 
-public void setAttributedTitle(NSAttributedString aString) {
-	OS.objc_msgSend(this.id, OS.sel_setAttributedTitle_, aString != null ? aString.id : 0);
+public void setAttributedTitle(NSAttributedString attributedTitle) {
+	OS.objc_msgSend(this.id, OS.sel_setAttributedTitle_, attributedTitle != null ? attributedTitle.id : 0);
 }
 
 public void setBezelStyle(long /*int*/ bezelStyle) {
 	OS.objc_msgSend(this.id, OS.sel_setBezelStyle_, bezelStyle);
 }
 
-public void setBordered(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setBordered_, flag);
+public void setBordered(boolean bordered) {
+	OS.objc_msgSend(this.id, OS.sel_setBordered_, bordered);
 }
 
 public void setButtonType(long /*int*/ aType) {
@@ -53,20 +53,20 @@ public void setImage(NSImage image) {
 	OS.objc_msgSend(this.id, OS.sel_setImage_, image != null ? image.id : 0);
 }
 
-public void setImagePosition(long /*int*/ aPosition) {
-	OS.objc_msgSend(this.id, OS.sel_setImagePosition_, aPosition);
+public void setImagePosition(long /*int*/ imagePosition) {
+	OS.objc_msgSend(this.id, OS.sel_setImagePosition_, imagePosition);
 }
 
-public void setKeyEquivalent(NSString charCode) {
-	OS.objc_msgSend(this.id, OS.sel_setKeyEquivalent_, charCode != null ? charCode.id : 0);
+public void setKeyEquivalent(NSString keyEquivalent) {
+	OS.objc_msgSend(this.id, OS.sel_setKeyEquivalent_, keyEquivalent != null ? keyEquivalent.id : 0);
 }
 
-public void setState(long /*int*/ value) {
-	OS.objc_msgSend(this.id, OS.sel_setState_, value);
+public void setState(long /*int*/ state) {
+	OS.objc_msgSend(this.id, OS.sel_setState_, state);
 }
 
-public void setTitle(NSString aString) {
-	OS.objc_msgSend(this.id, OS.sel_setTitle_, aString != null ? aString.id : 0);
+public void setTitle(NSString title) {
+	OS.objc_msgSend(this.id, OS.sel_setTitle_, title != null ? title.id : 0);
 }
 
 public long /*int*/ state() {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSButtonCell.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSButtonCell.java
index c6397e7fad..f90fa8993a 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSButtonCell.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSButtonCell.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2017 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -39,23 +39,22 @@ public NSRect drawTitle(NSAttributedString title, NSRect frame, NSView controlVi
 	return result;
 }
 
-public void setBackgroundColor(NSColor color) {
-	OS.objc_msgSend(this.id, OS.sel_setBackgroundColor_, color != null ? color.id : 0);
+public void setBackgroundColor(NSColor backgroundColor) {
+	OS.objc_msgSend(this.id, OS.sel_setBackgroundColor_, backgroundColor != null ? backgroundColor.id : 0);
 }
 
 public void setButtonType(long /*int*/ aType) {
 	OS.objc_msgSend(this.id, OS.sel_setButtonType_, aType);
 }
 
-public void setHighlightsBy(long /*int*/ aType) {
-	OS.objc_msgSend(this.id, OS.sel_setHighlightsBy_, aType);
+public void setHighlightsBy(long /*int*/ highlightsBy) {
+	OS.objc_msgSend(this.id, OS.sel_setHighlightsBy_, highlightsBy);
 }
 
-public void setImagePosition(long /*int*/ aPosition) {
-	OS.objc_msgSend(this.id, OS.sel_setImagePosition_, aPosition);
+public void setImagePosition(long /*int*/ imagePosition) {
+	OS.objc_msgSend(this.id, OS.sel_setImagePosition_, imagePosition);
 }
 
-@Override
 public NSString title() {
 	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_title);
 	return result != 0 ? new NSString(result) : null;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSCell.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSCell.java
index ee0a562d58..c739336179 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSCell.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSCell.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2015 IBM Corporation and others.
+ * Copyright (c) 2000, 2017 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -108,72 +108,72 @@ public long /*int*/ nextState() {
 	return OS.objc_msgSend(this.id, OS.sel_nextState);
 }
 
-public void setAlignment(long /*int*/ mode) {
-	OS.objc_msgSend(this.id, OS.sel_setAlignment_, mode);
+public void setAlignment(long /*int*/ alignment) {
+	OS.objc_msgSend(this.id, OS.sel_setAlignment_, alignment);
 }
 
-public void setAllowsMixedState(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setAllowsMixedState_, flag);
+public void setAllowsMixedState(boolean allowsMixedState) {
+	OS.objc_msgSend(this.id, OS.sel_setAllowsMixedState_, allowsMixedState);
 }
 
-public void setAttributedStringValue(NSAttributedString obj) {
-	OS.objc_msgSend(this.id, OS.sel_setAttributedStringValue_, obj != null ? obj.id : 0);
+public void setAttributedStringValue(NSAttributedString attributedStringValue) {
+	OS.objc_msgSend(this.id, OS.sel_setAttributedStringValue_, attributedStringValue != null ? attributedStringValue.id : 0);
 }
 
-public void setBackgroundStyle(long /*int*/ style) {
-	OS.objc_msgSend(this.id, OS.sel_setBackgroundStyle_, style);
+public void setBackgroundStyle(long /*int*/ backgroundStyle) {
+	OS.objc_msgSend(this.id, OS.sel_setBackgroundStyle_, backgroundStyle);
 }
 
-public void setBaseWritingDirection(long /*int*/ writingDirection) {
-	OS.objc_msgSend(this.id, OS.sel_setBaseWritingDirection_, writingDirection);
+public void setBaseWritingDirection(long /*int*/ baseWritingDirection) {
+	OS.objc_msgSend(this.id, OS.sel_setBaseWritingDirection_, baseWritingDirection);
 }
 
-public void setControlSize(long /*int*/ size) {
-	OS.objc_msgSend(this.id, OS.sel_setControlSize_, size);
+public void setControlSize(long /*int*/ controlSize) {
+	OS.objc_msgSend(this.id, OS.sel_setControlSize_, controlSize);
 }
 
-public void setEnabled(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setEnabled_, flag);
+public void setEnabled(boolean enabled) {
+	OS.objc_msgSend(this.id, OS.sel_setEnabled_, enabled);
 }
 
-public void setFont(NSFont fontObj) {
-	OS.objc_msgSend(this.id, OS.sel_setFont_, fontObj != null ? fontObj.id : 0);
+public void setFont(NSFont font) {
+	OS.objc_msgSend(this.id, OS.sel_setFont_, font != null ? font.id : 0);
 }
 
-public void setFormatter(NSFormatter newFormatter) {
-	OS.objc_msgSend(this.id, OS.sel_setFormatter_, newFormatter != null ? newFormatter.id : 0);
+public void setFormatter(id formatter) {
+	OS.objc_msgSend(this.id, OS.sel_setFormatter_, formatter != null ? formatter.id : 0);
 }
 
-public void setHighlighted(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setHighlighted_, flag);
+public void setHighlighted(boolean highlighted) {
+	OS.objc_msgSend(this.id, OS.sel_setHighlighted_, highlighted);
 }
 
 public void setImage(NSImage image) {
 	OS.objc_msgSend(this.id, OS.sel_setImage_, image != null ? image.id : 0);
 }
 
-public void setLineBreakMode(long /*int*/ mode) {
-	OS.objc_msgSend(this.id, OS.sel_setLineBreakMode_, mode);
+public void setLineBreakMode(long /*int*/ lineBreakMode) {
+	OS.objc_msgSend(this.id, OS.sel_setLineBreakMode_, lineBreakMode);
 }
 
-public void setObjectValue(id obj) {
-	OS.objc_msgSend(this.id, OS.sel_setObjectValue_, obj != null ? obj.id : 0);
+public void setObjectValue(id objectValue) {
+	OS.objc_msgSend(this.id, OS.sel_setObjectValue_, objectValue != null ? objectValue.id : 0);
 }
 
-public void setScrollable(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setScrollable_, flag);
+public void setScrollable(boolean scrollable) {
+	OS.objc_msgSend(this.id, OS.sel_setScrollable_, scrollable);
 }
 
-public void setTitle(NSString aString) {
-	OS.objc_msgSend(this.id, OS.sel_setTitle_, aString != null ? aString.id : 0);
+public void setTitle(NSString title) {
+	OS.objc_msgSend(this.id, OS.sel_setTitle_, title != null ? title.id : 0);
 }
 
-public void setUsesSingleLineMode(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setUsesSingleLineMode_, flag);
+public void setUsesSingleLineMode(boolean usesSingleLineMode) {
+	OS.objc_msgSend(this.id, OS.sel_setUsesSingleLineMode_, usesSingleLineMode);
 }
 
-public void setWraps(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setWraps_, flag);
+public void setWraps(boolean wraps) {
+	OS.objc_msgSend(this.id, OS.sel_setWraps_, wraps);
 }
 
 public NSString title() {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSCharacterSet.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSCharacterSet.java
index 3350e104e6..cfa0b9373f 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSCharacterSet.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSCharacterSet.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2017 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -28,9 +28,9 @@ public boolean characterIsMember(short aCharacter) {
 	return OS.objc_msgSend_bool(this.id, OS.sel_characterIsMember_, aCharacter);
 }
 
-public static id decimalDigitCharacterSet() {
+public static NSCharacterSet decimalDigitCharacterSet() {
 	long /*int*/ result = OS.objc_msgSend(OS.class_NSCharacterSet, OS.sel_decimalDigitCharacterSet);
-	return result != 0 ? new id(result) : null;
+	return result != 0 ? new NSCharacterSet(result) : null;
 }
 
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSClipView.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSClipView.java
index fc007aa89e..11552f206b 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSClipView.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSClipView.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2017 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -37,16 +37,16 @@ public void scrollToPoint(NSPoint newOrigin) {
 	OS.objc_msgSend(this.id, OS.sel_scrollToPoint_, newOrigin);
 }
 
-public void setCopiesOnScroll(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setCopiesOnScroll_, flag);
+public void setCopiesOnScroll(boolean copiesOnScroll) {
+	OS.objc_msgSend(this.id, OS.sel_setCopiesOnScroll_, copiesOnScroll);
 }
 
-public void setDocumentCursor(NSCursor anObj) {
-	OS.objc_msgSend(this.id, OS.sel_setDocumentCursor_, anObj != null ? anObj.id : 0);
+public void setDocumentCursor(NSCursor documentCursor) {
+	OS.objc_msgSend(this.id, OS.sel_setDocumentCursor_, documentCursor != null ? documentCursor.id : 0);
 }
 
-public void setDrawsBackground(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setDrawsBackground_, flag);
+public void setDrawsBackground(boolean drawsBackground) {
+	OS.objc_msgSend(this.id, OS.sel_setDrawsBackground_, drawsBackground);
 }
 
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSColorList.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSColorList.java
index 9d9f39c76d..7b28cfe474 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSColorList.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSColorList.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2017 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -39,9 +39,9 @@ public NSColor colorWithKey(NSString key) {
 	return result != 0 ? new NSColor(result) : null;
 }
 
-public id initWithName(NSString name) {
+public NSColorList initWithName(NSString name) {
 	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_initWithName_, name != null ? name.id : 0);
-	return result != 0 ? new id(result) : null;
+	return result == this.id ? this : (result != 0 ? new NSColorList(result) : null);
 }
 
 public void insertColor(NSColor color, NSString key, long /*int*/ loc) {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSComboBox.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSComboBox.java
index 9b502c97cf..771649847f 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSComboBox.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSComboBox.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2017 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -69,8 +69,8 @@ public void selectItemAtIndex(long /*int*/ index) {
 	OS.objc_msgSend(this.id, OS.sel_selectItemAtIndex_, index);
 }
 
-public void setNumberOfVisibleItems(long /*int*/ visibleItems) {
-	OS.objc_msgSend(this.id, OS.sel_setNumberOfVisibleItems_, visibleItems);
+public void setNumberOfVisibleItems(long /*int*/ numberOfVisibleItems) {
+	OS.objc_msgSend(this.id, OS.sel_setNumberOfVisibleItems_, numberOfVisibleItems);
 }
 
 public static long /*int*/ cellClass() {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSControl.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSControl.java
index 5f5b77485c..bc1fb2a51d 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSControl.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSControl.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2017 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -63,16 +63,16 @@ public boolean sendAction(long /*int*/ theAction, id theTarget) {
 	return OS.objc_msgSend_bool(this.id, OS.sel_sendAction_to_, theAction, theTarget != null ? theTarget.id : 0);
 }
 
-public void setAction(long /*int*/ aSelector) {
-	OS.objc_msgSend(this.id, OS.sel_setAction_, aSelector);
+public void setAction(long /*int*/ action) {
+	OS.objc_msgSend(this.id, OS.sel_setAction_, action);
 }
 
-public void setAlignment(long /*int*/ mode) {
-	OS.objc_msgSend(this.id, OS.sel_setAlignment_, mode);
+public void setAlignment(long /*int*/ alignment) {
+	OS.objc_msgSend(this.id, OS.sel_setAlignment_, alignment);
 }
 
-public void setBaseWritingDirection(long /*int*/ writingDirection) {
-	OS.objc_msgSend(this.id, OS.sel_setBaseWritingDirection_, writingDirection);
+public void setBaseWritingDirection(long /*int*/ baseWritingDirection) {
+	OS.objc_msgSend(this.id, OS.sel_setBaseWritingDirection_, baseWritingDirection);
 }
 
 public void setCell(NSCell aCell) {
@@ -83,28 +83,28 @@ public static void setCellClass(long /*int*/ factoryId) {
 	OS.objc_msgSend(OS.class_NSControl, OS.sel_setCellClass_, factoryId);
 }
 
-public void setDoubleValue(double aDouble) {
-	OS.objc_msgSend(this.id, OS.sel_setDoubleValue_, aDouble);
+public void setDoubleValue(double doubleValue) {
+	OS.objc_msgSend(this.id, OS.sel_setDoubleValue_, doubleValue);
 }
 
-public void setEnabled(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setEnabled_, flag);
+public void setEnabled(boolean enabled) {
+	OS.objc_msgSend(this.id, OS.sel_setEnabled_, enabled);
 }
 
-public void setFont(NSFont fontObj) {
-	OS.objc_msgSend(this.id, OS.sel_setFont_, fontObj != null ? fontObj.id : 0);
+public void setFont(NSFont font) {
+	OS.objc_msgSend(this.id, OS.sel_setFont_, font != null ? font.id : 0);
 }
 
-public void setFormatter(NSFormatter newFormatter) {
-	OS.objc_msgSend(this.id, OS.sel_setFormatter_, newFormatter != null ? newFormatter.id : 0);
+public void setFormatter(id formatter) {
+	OS.objc_msgSend(this.id, OS.sel_setFormatter_, formatter != null ? formatter.id : 0);
 }
 
-public void setStringValue(NSString aString) {
-	OS.objc_msgSend(this.id, OS.sel_setStringValue_, aString != null ? aString.id : 0);
+public void setStringValue(NSString stringValue) {
+	OS.objc_msgSend(this.id, OS.sel_setStringValue_, stringValue != null ? stringValue.id : 0);
 }
 
-public void setTarget(id anObject) {
-	OS.objc_msgSend(this.id, OS.sel_setTarget_, anObject != null ? anObject.id : 0);
+public void setTarget(id target) {
+	OS.objc_msgSend(this.id, OS.sel_setTarget_, target != null ? target.id : 0);
 }
 
 public void sizeToFit() {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSDatePicker.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSDatePicker.java
index d39f81a56a..445cc96a28 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSDatePicker.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSDatePicker.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2017 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -29,36 +29,36 @@ public NSDate dateValue() {
 	return result != 0 ? new NSDate(result) : null;
 }
 
-public void setBackgroundColor(NSColor color) {
-	OS.objc_msgSend(this.id, OS.sel_setBackgroundColor_, color != null ? color.id : 0);
+public void setBackgroundColor(NSColor backgroundColor) {
+	OS.objc_msgSend(this.id, OS.sel_setBackgroundColor_, backgroundColor != null ? backgroundColor.id : 0);
 }
 
-public void setBezeled(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setBezeled_, flag);
+public void setBezeled(boolean bezeled) {
+	OS.objc_msgSend(this.id, OS.sel_setBezeled_, bezeled);
 }
 
-public void setBordered(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setBordered_, flag);
+public void setBordered(boolean bordered) {
+	OS.objc_msgSend(this.id, OS.sel_setBordered_, bordered);
 }
 
-public void setDatePickerElements(long /*int*/ elementFlags) {
-	OS.objc_msgSend(this.id, OS.sel_setDatePickerElements_, elementFlags);
+public void setDatePickerElements(long /*int*/ datePickerElements) {
+	OS.objc_msgSend(this.id, OS.sel_setDatePickerElements_, datePickerElements);
 }
 
-public void setDatePickerStyle(long /*int*/ newStyle) {
-	OS.objc_msgSend(this.id, OS.sel_setDatePickerStyle_, newStyle);
+public void setDatePickerStyle(long /*int*/ datePickerStyle) {
+	OS.objc_msgSend(this.id, OS.sel_setDatePickerStyle_, datePickerStyle);
 }
 
-public void setDateValue(NSDate newStartDate) {
-	OS.objc_msgSend(this.id, OS.sel_setDateValue_, newStartDate != null ? newStartDate.id : 0);
+public void setDateValue(NSDate dateValue) {
+	OS.objc_msgSend(this.id, OS.sel_setDateValue_, dateValue != null ? dateValue.id : 0);
 }
 
-public void setDrawsBackground(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setDrawsBackground_, flag);
+public void setDrawsBackground(boolean drawsBackground) {
+	OS.objc_msgSend(this.id, OS.sel_setDrawsBackground_, drawsBackground);
 }
 
-public void setTextColor(NSColor color) {
-	OS.objc_msgSend(this.id, OS.sel_setTextColor_, color != null ? color.id : 0);
+public void setTextColor(NSColor textColor) {
+	OS.objc_msgSend(this.id, OS.sel_setTextColor_, textColor != null ? textColor.id : 0);
 }
 
 public static long /*int*/ cellClass() {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSDictionary.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSDictionary.java
index 31b84b3934..f85d2c971c 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSDictionary.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSDictionary.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2017 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -48,7 +48,6 @@ public id objectForKey(id aKey) {
 	return result != 0 ? new id(result) : null;
 }
 
-@Override
 public id valueForKey(NSString key) {
 	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_valueForKey_, key != null ? key.id : 0);
 	return result != 0 ? new id(result) : null;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSDockTile.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSDockTile.java
index 6b639de488..b0cff1c6af 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSDockTile.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSDockTile.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2017 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -29,8 +29,8 @@ public NSString badgeLabel() {
 	return result != 0 ? new NSString(result) : null;
 }
 
-public void setBadgeLabel(NSString string) {
-	OS.objc_msgSend(this.id, OS.sel_setBadgeLabel_, string != null ? string.id : 0);
+public void setBadgeLabel(NSString badgeLabel) {
+	OS.objc_msgSend(this.id, OS.sel_setBadgeLabel_, badgeLabel != null ? badgeLabel.id : 0);
 }
 
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSGraphicsContext.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSGraphicsContext.java
index 72e694cfd9..581c561e3d 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSGraphicsContext.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSGraphicsContext.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2017 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -80,24 +80,24 @@ public void saveGraphicsState() {
 	OS.objc_msgSend(this.id, OS.sel_saveGraphicsState);
 }
 
-public void setCompositingOperation(long /*int*/ operation) {
-	OS.objc_msgSend(this.id, OS.sel_setCompositingOperation_, operation);
+public void setCompositingOperation(long /*int*/ compositingOperation) {
+	OS.objc_msgSend(this.id, OS.sel_setCompositingOperation_, compositingOperation);
 }
 
 public static void setCurrentContext(NSGraphicsContext context) {
 	OS.objc_msgSend(OS.class_NSGraphicsContext, OS.sel_setCurrentContext_, context != null ? context.id : 0);
 }
 
-public void setImageInterpolation(long /*int*/ interpolation) {
-	OS.objc_msgSend(this.id, OS.sel_setImageInterpolation_, interpolation);
+public void setImageInterpolation(long /*int*/ imageInterpolation) {
+	OS.objc_msgSend(this.id, OS.sel_setImageInterpolation_, imageInterpolation);
 }
 
-public void setPatternPhase(NSPoint phase) {
-	OS.objc_msgSend(this.id, OS.sel_setPatternPhase_, phase);
+public void setPatternPhase(NSPoint patternPhase) {
+	OS.objc_msgSend(this.id, OS.sel_setPatternPhase_, patternPhase);
 }
 
-public void setShouldAntialias(boolean antialias) {
-	OS.objc_msgSend(this.id, OS.sel_setShouldAntialias_, antialias);
+public void setShouldAntialias(boolean shouldAntialias) {
+	OS.objc_msgSend(this.id, OS.sel_setShouldAntialias_, shouldAntialias);
 }
 
 public boolean shouldAntialias() {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSImage.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSImage.java
index fcb6e62331..b93d6ad92f 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSImage.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSImage.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2017 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -61,9 +61,9 @@ public NSImage initWithContentsOfFile(NSString fileName) {
 	return result == this.id ? this : (result != 0 ? new NSImage(result) : null);
 }
 
-public id initWithData(NSData data) {
+public NSImage initWithData(NSData data) {
 	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_initWithData_, data != null ? data.id : 0);
-	return result != 0 ? new id(result) : null;
+	return result == this.id ? this : (result != 0 ? new NSImage(result) : null);
 }
 
 public NSImage initWithIconRef(long /*int*/ iconRef) {
@@ -89,16 +89,16 @@ public NSArray representations() {
 	return result != 0 ? new NSArray(result) : null;
 }
 
-public void setCacheMode(long /*int*/ mode) {
-	OS.objc_msgSend(this.id, OS.sel_setCacheMode_, mode);
+public void setCacheMode(long /*int*/ cacheMode) {
+	OS.objc_msgSend(this.id, OS.sel_setCacheMode_, cacheMode);
 }
 
 public void setScalesWhenResized(boolean flag) {
 	OS.objc_msgSend(this.id, OS.sel_setScalesWhenResized_, flag);
 }
 
-public void setSize(NSSize aSize) {
-	OS.objc_msgSend(this.id, OS.sel_setSize_, aSize);
+public void setSize(NSSize size) {
+	OS.objc_msgSend(this.id, OS.sel_setSize_, size);
 }
 
 public NSSize size() {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSImageRep.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSImageRep.java
index 7e81da1a2c..29e2889dfe 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSImageRep.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSImageRep.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2015 IBM Corporation and others.
+ * Copyright (c) 2000, 2017 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -54,12 +54,12 @@ public long /*int*/ pixelsWide() {
 	return OS.objc_msgSend(this.id, OS.sel_pixelsWide);
 }
 
-public void setAlpha(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setAlpha_, flag);
+public void setAlpha(boolean alpha) {
+	OS.objc_msgSend(this.id, OS.sel_setAlpha_, alpha);
 }
 
-public void setSize(NSSize aSize) {
-	OS.objc_msgSend(this.id, OS.sel_setSize_, aSize);
+public void setSize(NSSize size) {
+	OS.objc_msgSend(this.id, OS.sel_setSize_, size);
 }
 
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSImageView.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSImageView.java
index db8604dc6a..47a43a789f 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSImageView.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSImageView.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2017 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -29,16 +29,16 @@ public NSImage image() {
 	return result != 0 ? new NSImage(result) : null;
 }
 
-public void setImage(NSImage newImage) {
-	OS.objc_msgSend(this.id, OS.sel_setImage_, newImage != null ? newImage.id : 0);
+public void setImage(NSImage image) {
+	OS.objc_msgSend(this.id, OS.sel_setImage_, image != null ? image.id : 0);
 }
 
-public void setImageAlignment(long /*int*/ newAlign) {
-	OS.objc_msgSend(this.id, OS.sel_setImageAlignment_, newAlign);
+public void setImageAlignment(long /*int*/ imageAlignment) {
+	OS.objc_msgSend(this.id, OS.sel_setImageAlignment_, imageAlignment);
 }
 
-public void setImageScaling(long /*int*/ newScaling) {
-	OS.objc_msgSend(this.id, OS.sel_setImageScaling_, newScaling);
+public void setImageScaling(long /*int*/ imageScaling) {
+	OS.objc_msgSend(this.id, OS.sel_setImageScaling_, imageScaling);
 }
 
 public static long /*int*/ cellClass() {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSIndexSet.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSIndexSet.java
index 6cc1f2735d..58afd249e4 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSIndexSet.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSIndexSet.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2017 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -40,9 +40,9 @@ public long /*int*/ getIndexes(long[] /*int[]*/ indexBuffer, long /*int*/ buffer
 	return OS.objc_msgSend(this.id, OS.sel_getIndexes_maxCount_inIndexRange_, indexBuffer, bufferSize, range);
 }
 
-public static id indexSetWithIndex(long /*int*/ value) {
+public static NSIndexSet indexSetWithIndex(long /*int*/ value) {
 	long /*int*/ result = OS.objc_msgSend(OS.class_NSIndexSet, OS.sel_indexSetWithIndex_, value);
-	return result != 0 ? new id(result) : null;
+	return result != 0 ? new NSIndexSet(result) : null;
 }
 
 public NSIndexSet initWithIndex(long /*int*/ value) {
@@ -50,9 +50,9 @@ public NSIndexSet initWithIndex(long /*int*/ value) {
 	return result == this.id ? this : (result != 0 ? new NSIndexSet(result) : null);
 }
 
-public id initWithIndexSet(NSIndexSet indexSet) {
+public NSIndexSet initWithIndexSet(NSIndexSet indexSet) {
 	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_initWithIndexSet_, indexSet != null ? indexSet.id : 0);
-	return result != 0 ? new id(result) : null;
+	return result == this.id ? this : (result != 0 ? new NSIndexSet(result) : null);
 }
 
 public NSIndexSet initWithIndexesInRange(NSRange range) {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSLayoutManager.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSLayoutManager.java
index 5706bc368e..679735aa8c 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSLayoutManager.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSLayoutManager.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2017 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -120,8 +120,8 @@ public void removeTemporaryAttribute(NSString attrName, NSRange charRange) {
 	OS.objc_msgSend(this.id, OS.sel_removeTemporaryAttribute_forCharacterRange_, attrName != null ? attrName.id : 0, charRange);
 }
 
-public void setBackgroundLayoutEnabled(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setBackgroundLayoutEnabled_, flag);
+public void setBackgroundLayoutEnabled(boolean backgroundLayoutEnabled) {
+	OS.objc_msgSend(this.id, OS.sel_setBackgroundLayoutEnabled_, backgroundLayoutEnabled);
 }
 
 public void setLineFragmentRect(NSRect fragmentRect, NSRange glyphRange, NSRect usedRect) {
@@ -132,8 +132,8 @@ public void setTextStorage(NSTextStorage textStorage) {
 	OS.objc_msgSend(this.id, OS.sel_setTextStorage_, textStorage != null ? textStorage.id : 0);
 }
 
-public void setUsesScreenFonts(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setUsesScreenFonts_, flag);
+public void setUsesScreenFonts(boolean usesScreenFonts) {
+	OS.objc_msgSend(this.id, OS.sel_setUsesScreenFonts_, usesScreenFonts);
 }
 
 public NSTypesetter typesetter() {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSLocale.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSLocale.java
index b7a137b515..92492a6315 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSLocale.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSLocale.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2017 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -29,9 +29,9 @@ public NSString displayNameForKey(id key, id value) {
 	return result != 0 ? new NSString(result) : null;
 }
 
-public id initWithLocaleIdentifier(NSString string) {
+public NSLocale initWithLocaleIdentifier(NSString string) {
 	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_initWithLocaleIdentifier_, string != null ? string.id : 0);
-	return result != 0 ? new id(result) : null;
+	return result == this.id ? this : (result != 0 ? new NSLocale(result) : null);
 }
 
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMenu.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMenu.java
index 56ecf4e62b..3a15acdf2e 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMenu.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMenu.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2013 IBM Corporation and others.
+ * Copyright (c) 2000, 2017 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -85,20 +85,20 @@ public void removeItemAtIndex(long /*int*/ index) {
 	OS.objc_msgSend(this.id, OS.sel_removeItemAtIndex_, index);
 }
 
-public void setAutoenablesItems(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setAutoenablesItems_, flag);
+public void setAutoenablesItems(boolean autoenablesItems) {
+	OS.objc_msgSend(this.id, OS.sel_setAutoenablesItems_, autoenablesItems);
 }
 
-public void setDelegate(id anObject) {
-	OS.objc_msgSend(this.id, OS.sel_setDelegate_, anObject != null ? anObject.id : 0);
+public void setDelegate(id delegate) {
+	OS.objc_msgSend(this.id, OS.sel_setDelegate_, delegate != null ? delegate.id : 0);
 }
 
 public void setSubmenu(NSMenu aMenu, NSMenuItem anItem) {
 	OS.objc_msgSend(this.id, OS.sel_setSubmenu_forItem_, aMenu != null ? aMenu.id : 0, anItem != null ? anItem.id : 0);
 }
 
-public void setTitle(NSString aString) {
-	OS.objc_msgSend(this.id, OS.sel_setTitle_, aString != null ? aString.id : 0);
+public void setTitle(NSString title) {
+	OS.objc_msgSend(this.id, OS.sel_setTitle_, title != null ? title.id : 0);
 }
 
 public NSString title() {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMenuItem.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMenuItem.java
index 4c9fc4ed4a..6c880df5ce 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMenuItem.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMenuItem.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2017 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -65,32 +65,32 @@ public static NSMenuItem separatorItem() {
 	return result != 0 ? new NSMenuItem(result) : null;
 }
 
-public void setAction(long /*int*/ aSelector) {
-	OS.objc_msgSend(this.id, OS.sel_setAction_, aSelector);
+public void setAction(long /*int*/ action) {
+	OS.objc_msgSend(this.id, OS.sel_setAction_, action);
 }
 
-public void setAttributedTitle(NSAttributedString string) {
-	OS.objc_msgSend(this.id, OS.sel_setAttributedTitle_, string != null ? string.id : 0);
+public void setAttributedTitle(NSAttributedString attributedTitle) {
+	OS.objc_msgSend(this.id, OS.sel_setAttributedTitle_, attributedTitle != null ? attributedTitle.id : 0);
 }
 
-public void setEnabled(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setEnabled_, flag);
+public void setEnabled(boolean enabled) {
+	OS.objc_msgSend(this.id, OS.sel_setEnabled_, enabled);
 }
 
 public void setHidden(boolean hidden) {
 	OS.objc_msgSend(this.id, OS.sel_setHidden_, hidden);
 }
 
-public void setImage(NSImage menuImage) {
-	OS.objc_msgSend(this.id, OS.sel_setImage_, menuImage != null ? menuImage.id : 0);
+public void setImage(NSImage image) {
+	OS.objc_msgSend(this.id, OS.sel_setImage_, image != null ? image.id : 0);
 }
 
-public void setKeyEquivalent(NSString aKeyEquivalent) {
-	OS.objc_msgSend(this.id, OS.sel_setKeyEquivalent_, aKeyEquivalent != null ? aKeyEquivalent.id : 0);
+public void setKeyEquivalent(NSString keyEquivalent) {
+	OS.objc_msgSend(this.id, OS.sel_setKeyEquivalent_, keyEquivalent != null ? keyEquivalent.id : 0);
 }
 
-public void setKeyEquivalentModifierMask(long /*int*/ mask) {
-	OS.objc_msgSend(this.id, OS.sel_setKeyEquivalentModifierMask_, mask);
+public void setKeyEquivalentModifierMask(long /*int*/ keyEquivalentModifierMask) {
+	OS.objc_msgSend(this.id, OS.sel_setKeyEquivalentModifierMask_, keyEquivalentModifierMask);
 }
 
 public void setMenu(NSMenu menu) {
@@ -105,16 +105,16 @@ public void setSubmenu(NSMenu submenu) {
 	OS.objc_msgSend(this.id, OS.sel_setSubmenu_, submenu != null ? submenu.id : 0);
 }
 
-public void setTag(long /*int*/ anInt) {
-	OS.objc_msgSend(this.id, OS.sel_setTag_, anInt);
+public void setTag(long /*int*/ tag) {
+	OS.objc_msgSend(this.id, OS.sel_setTag_, tag);
 }
 
-public void setTarget(id anObject) {
-	OS.objc_msgSend(this.id, OS.sel_setTarget_, anObject != null ? anObject.id : 0);
+public void setTarget(id target) {
+	OS.objc_msgSend(this.id, OS.sel_setTarget_, target != null ? target.id : 0);
 }
 
-public void setTitle(NSString aString) {
-	OS.objc_msgSend(this.id, OS.sel_setTitle_, aString != null ? aString.id : 0);
+public void setTitle(NSString title) {
+	OS.objc_msgSend(this.id, OS.sel_setTitle_, title != null ? title.id : 0);
 }
 
 public void setToolTip(NSString toolTip) {
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 802d6ebd93..fce9c688f0 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, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2017 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -46,7 +46,6 @@ public void setObject(id anObject, id aKey) {
 	OS.objc_msgSend(this.id, OS.sel_setObject_forKey_, anObject != null ? anObject.id : 0, aKey != null ? aKey.id : 0);
 }
 
-@Override
 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);
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMutableIndexSet.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMutableIndexSet.java
index b61e55541a..80f19b0d25 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMutableIndexSet.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMutableIndexSet.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2017 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -32,9 +32,9 @@ public void removeIndex(long /*int*/ value) {
 	OS.objc_msgSend(this.id, OS.sel_removeIndex_, value);
 }
 
-public static id indexSetWithIndex(long /*int*/ value) {
+public static NSMutableIndexSet indexSetWithIndex(long /*int*/ value) {
 	long /*int*/ result = OS.objc_msgSend(OS.class_NSMutableIndexSet, OS.sel_indexSetWithIndex_, value);
-	return result != 0 ? new id(result) : null;
+	return result != 0 ? new NSMutableIndexSet(result) : null;
 }
 
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMutableParagraphStyle.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMutableParagraphStyle.java
index c330f626d1..3ccf12cfb0 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMutableParagraphStyle.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSMutableParagraphStyle.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2017 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -32,32 +32,32 @@ public void setAlignment(long /*int*/ alignment) {
 	OS.objc_msgSend(this.id, OS.sel_setAlignment_, alignment);
 }
 
-public void setBaseWritingDirection(long /*int*/ writingDirection) {
-	OS.objc_msgSend(this.id, OS.sel_setBaseWritingDirection_, writingDirection);
+public void setBaseWritingDirection(long /*int*/ baseWritingDirection) {
+	OS.objc_msgSend(this.id, OS.sel_setBaseWritingDirection_, baseWritingDirection);
 }
 
-public void setDefaultTabInterval(double /*float*/ aFloat) {
-	OS.objc_msgSend(this.id, OS.sel_setDefaultTabInterval_, aFloat);
+public void setDefaultTabInterval(double /*float*/ defaultTabInterval) {
+	OS.objc_msgSend(this.id, OS.sel_setDefaultTabInterval_, defaultTabInterval);
 }
 
-public void setFirstLineHeadIndent(double /*float*/ aFloat) {
-	OS.objc_msgSend(this.id, OS.sel_setFirstLineHeadIndent_, aFloat);
+public void setFirstLineHeadIndent(double /*float*/ firstLineHeadIndent) {
+	OS.objc_msgSend(this.id, OS.sel_setFirstLineHeadIndent_, firstLineHeadIndent);
 }
 
-public void setHeadIndent(double /*float*/ aFloat) {
-	OS.objc_msgSend(this.id, OS.sel_setHeadIndent_, aFloat);
+public void setHeadIndent(double /*float*/ headIndent) {
+	OS.objc_msgSend(this.id, OS.sel_setHeadIndent_, headIndent);
 }
 
-public void setLineBreakMode(long /*int*/ mode) {
-	OS.objc_msgSend(this.id, OS.sel_setLineBreakMode_, mode);
+public void setLineBreakMode(long /*int*/ lineBreakMode) {
+	OS.objc_msgSend(this.id, OS.sel_setLineBreakMode_, lineBreakMode);
 }
 
-public void setLineSpacing(double /*float*/ aFloat) {
-	OS.objc_msgSend(this.id, OS.sel_setLineSpacing_, aFloat);
+public void setLineSpacing(double /*float*/ lineSpacing) {
+	OS.objc_msgSend(this.id, OS.sel_setLineSpacing_, lineSpacing);
 }
 
-public void setTabStops(NSArray array) {
-	OS.objc_msgSend(this.id, OS.sel_setTabStops_, array != null ? array.id : 0);
+public void setTabStops(NSArray tabStops) {
+	OS.objc_msgSend(this.id, OS.sel_setTabStops_, tabStops != null ? tabStops.id : 0);
 }
 
 }
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 6b81bd0833..b85ca3474a 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
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2017 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -24,16 +24,16 @@ public NSMutableURLRequest(id id) {
 	super(id);
 }
 
-public void setCachePolicy(long /*int*/ policy) {
-	OS.objc_msgSend(this.id, OS.sel_setCachePolicy_, policy);
+public void setCachePolicy(long /*int*/ cachePolicy) {
+	OS.objc_msgSend(this.id, OS.sel_setCachePolicy_, cachePolicy);
 }
 
-public void setHTTPBody(NSData data) {
-	OS.objc_msgSend(this.id, OS.sel_setHTTPBody_, data != null ? data.id : 0);
+public void setHTTPBody(NSData HTTPBody) {
+	OS.objc_msgSend(this.id, OS.sel_setHTTPBody_, HTTPBody != null ? HTTPBody.id : 0);
 }
 
-public void setHTTPMethod(NSString method) {
-	OS.objc_msgSend(this.id, OS.sel_setHTTPMethod_, method != null ? method.id : 0);
+public void setHTTPMethod(NSString HTTPMethod) {
+	OS.objc_msgSend(this.id, OS.sel_setHTTPMethod_, HTTPMethod != null ? HTTPMethod.id : 0);
 }
 
 public void setURL(NSURL URL) {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSNumberFormatter.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSNumberFormatter.java
index e6be5673f8..cb73adfee0 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSNumberFormatter.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSNumberFormatter.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2017 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -55,40 +55,40 @@ public NSNumber minimum() {
 	return result != 0 ? new NSNumber(result) : null;
 }
 
-public void setAllowsFloats(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setAllowsFloats_, flag);
+public void setAllowsFloats(boolean allowsFloats) {
+	OS.objc_msgSend(this.id, OS.sel_setAllowsFloats_, allowsFloats);
 }
 
-public void setMaximum(NSNumber number) {
-	OS.objc_msgSend(this.id, OS.sel_setMaximum_, number != null ? number.id : 0);
+public void setMaximum(NSNumber maximum) {
+	OS.objc_msgSend(this.id, OS.sel_setMaximum_, maximum != null ? maximum.id : 0);
 }
 
-public void setMaximumFractionDigits(long /*int*/ number) {
-	OS.objc_msgSend(this.id, OS.sel_setMaximumFractionDigits_, number);
+public void setMaximumFractionDigits(long /*int*/ maximumFractionDigits) {
+	OS.objc_msgSend(this.id, OS.sel_setMaximumFractionDigits_, maximumFractionDigits);
 }
 
-public void setMaximumIntegerDigits(long /*int*/ number) {
-	OS.objc_msgSend(this.id, OS.sel_setMaximumIntegerDigits_, number);
+public void setMaximumIntegerDigits(long /*int*/ maximumIntegerDigits) {
+	OS.objc_msgSend(this.id, OS.sel_setMaximumIntegerDigits_, maximumIntegerDigits);
 }
 
-public void setMinimum(NSNumber number) {
-	OS.objc_msgSend(this.id, OS.sel_setMinimum_, number != null ? number.id : 0);
+public void setMinimum(NSNumber minimum) {
+	OS.objc_msgSend(this.id, OS.sel_setMinimum_, minimum != null ? minimum.id : 0);
 }
 
-public void setMinimumFractionDigits(long /*int*/ number) {
-	OS.objc_msgSend(this.id, OS.sel_setMinimumFractionDigits_, number);
+public void setMinimumFractionDigits(long /*int*/ minimumFractionDigits) {
+	OS.objc_msgSend(this.id, OS.sel_setMinimumFractionDigits_, minimumFractionDigits);
 }
 
-public void setMinimumIntegerDigits(long /*int*/ number) {
-	OS.objc_msgSend(this.id, OS.sel_setMinimumIntegerDigits_, number);
+public void setMinimumIntegerDigits(long /*int*/ minimumIntegerDigits) {
+	OS.objc_msgSend(this.id, OS.sel_setMinimumIntegerDigits_, minimumIntegerDigits);
 }
 
-public void setNumberStyle(long /*int*/ style) {
-	OS.objc_msgSend(this.id, OS.sel_setNumberStyle_, style);
+public void setNumberStyle(long /*int*/ numberStyle) {
+	OS.objc_msgSend(this.id, OS.sel_setNumberStyle_, numberStyle);
 }
 
-public void setPartialStringValidationEnabled(boolean b) {
-	OS.objc_msgSend(this.id, OS.sel_setPartialStringValidationEnabled_, b);
+public void setPartialStringValidationEnabled(boolean partialStringValidationEnabled) {
+	OS.objc_msgSend(this.id, OS.sel_setPartialStringValidationEnabled_, partialStringValidationEnabled);
 }
 
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSObject.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSObject.java
index f530fd9f58..5f3f2e6ad1 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSObject.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSObject.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2015 IBM Corporation and others.
+ * Copyright (c) 2000, 2017 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -164,9 +164,9 @@ public boolean respondsToSelector(long /*int*/ aSelector) {
 	return OS.objc_msgSend_bool(this.id, OS.sel_respondsToSelector_, aSelector);
 }
 
-public id retain() {
+public NSObject retain() {
 	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_retain);
-	return result != 0 ? new id(result) : null;
+	return result == this.id ? this : (result != 0 ? new NSObject(result) : null);
 }
 
 public long /*int*/ retainCount() {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSOpenGLContext.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSOpenGLContext.java
index 5ab0604d74..5f2c3a6022 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSOpenGLContext.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSOpenGLContext.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2017 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -50,7 +50,7 @@ public void makeCurrentContext() {
 	OS.objc_msgSend(this.id, OS.sel_makeCurrentContext);
 }
 
-public void setValues(int[] vals, int param) {
+public void setValues(int[] vals, long /*int*/ param) {
 	OS.objc_msgSend(this.id, OS.sel_setValues_forParameter_, vals, param);
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSOpenGLPixelFormat.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSOpenGLPixelFormat.java
index b70bda87f3..9dc2919229 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSOpenGLPixelFormat.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSOpenGLPixelFormat.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2017 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -28,9 +28,9 @@ public void getValues(long[] /*int[]*/ vals, int attrib, int screen) {
 	OS.objc_msgSend(this.id, OS.sel_getValues_forAttribute_forVirtualScreen_, vals, attrib, screen);
 }
 
-public id initWithAttributes(int[] attribs) {
+public NSOpenGLPixelFormat initWithAttributes(int[] attribs) {
 	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_initWithAttributes_, attribs);
-	return result != 0 ? new id(result) : null;
+	return result == this.id ? this : (result != 0 ? new NSOpenGLPixelFormat(result) : null);
 }
 
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSOpenPanel.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSOpenPanel.java
index 23ca1f8319..4c7b4b2b5c 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSOpenPanel.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSOpenPanel.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2017 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -34,16 +34,16 @@ public static NSOpenPanel openPanel() {
 	return result != 0 ? new NSOpenPanel(result) : null;
 }
 
-public void setAllowsMultipleSelection(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setAllowsMultipleSelection_, flag);
+public void setAllowsMultipleSelection(boolean allowsMultipleSelection) {
+	OS.objc_msgSend(this.id, OS.sel_setAllowsMultipleSelection_, allowsMultipleSelection);
 }
 
-public void setCanChooseDirectories(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setCanChooseDirectories_, flag);
+public void setCanChooseDirectories(boolean canChooseDirectories) {
+	OS.objc_msgSend(this.id, OS.sel_setCanChooseDirectories_, canChooseDirectories);
 }
 
-public void setCanChooseFiles(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setCanChooseFiles_, flag);
+public void setCanChooseFiles(boolean canChooseFiles) {
+	OS.objc_msgSend(this.id, OS.sel_setCanChooseFiles_, canChooseFiles);
 }
 
 public static NSSavePanel savePanel() {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSOutlineView.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSOutlineView.java
index 15f73b708d..5e8b0da83c 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSOutlineView.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSOutlineView.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2017 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -76,12 +76,12 @@ public long /*int*/ rowForItem(id item) {
 	return OS.objc_msgSend(this.id, OS.sel_rowForItem_, item != null ? item.id : 0);
 }
 
-public void setAutoresizesOutlineColumn(boolean resize) {
-	OS.objc_msgSend(this.id, OS.sel_setAutoresizesOutlineColumn_, resize);
+public void setAutoresizesOutlineColumn(boolean autoresizesOutlineColumn) {
+	OS.objc_msgSend(this.id, OS.sel_setAutoresizesOutlineColumn_, autoresizesOutlineColumn);
 }
 
-public void setAutosaveExpandedItems(boolean save) {
-	OS.objc_msgSend(this.id, OS.sel_setAutosaveExpandedItems_, save);
+public void setAutosaveExpandedItems(boolean autosaveExpandedItems) {
+	OS.objc_msgSend(this.id, OS.sel_setAutosaveExpandedItems_, autosaveExpandedItems);
 }
 
 public void setDropItem(id item, long /*int*/ index) {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPanel.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPanel.java
index c83f3e6917..e852c1d737 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPanel.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPanel.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2017 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -24,16 +24,16 @@ public NSPanel(id id) {
 	super(id);
 }
 
-public void setBecomesKeyOnlyIfNeeded(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setBecomesKeyOnlyIfNeeded_, flag);
+public void setBecomesKeyOnlyIfNeeded(boolean becomesKeyOnlyIfNeeded) {
+	OS.objc_msgSend(this.id, OS.sel_setBecomesKeyOnlyIfNeeded_, becomesKeyOnlyIfNeeded);
 }
 
-public void setFloatingPanel(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setFloatingPanel_, flag);
+public void setFloatingPanel(boolean floatingPanel) {
+	OS.objc_msgSend(this.id, OS.sel_setFloatingPanel_, floatingPanel);
 }
 
-public void setWorksWhenModal(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setWorksWhenModal_, flag);
+public void setWorksWhenModal(boolean worksWhenModal) {
+	OS.objc_msgSend(this.id, OS.sel_setWorksWhenModal_, worksWhenModal);
 }
 
 public boolean worksWhenModal() {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPopUpButton.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPopUpButton.java
index d68c52fd8e..b8daea3138 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPopUpButton.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPopUpButton.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2017 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -68,12 +68,12 @@ public void selectItemAtIndex(long /*int*/ index) {
 	OS.objc_msgSend(this.id, OS.sel_selectItemAtIndex_, index);
 }
 
-public void setAutoenablesItems(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setAutoenablesItems_, flag);
+public void setAutoenablesItems(boolean autoenablesItems) {
+	OS.objc_msgSend(this.id, OS.sel_setAutoenablesItems_, autoenablesItems);
 }
 
-public void setPullsDown(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setPullsDown_, flag);
+public void setPullsDown(boolean pullsDown) {
+	OS.objc_msgSend(this.id, OS.sel_setPullsDown_, pullsDown);
 }
 
 public NSString titleOfSelectedItem() {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPrintInfo.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPrintInfo.java
index 2ab8681065..d80963d516 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPrintInfo.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPrintInfo.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2014 IBM Corporation and others.
+ * Copyright (c) 2000, 2017 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -78,8 +78,8 @@ public NSPrinter printer() {
 	return result != 0 ? new NSPrinter(result) : null;
 }
 
-public void setJobDisposition(NSString disposition) {
-	OS.objc_msgSend(this.id, OS.sel_setJobDisposition_, disposition != null ? disposition.id : 0);
+public void setJobDisposition(NSString jobDisposition) {
+	OS.objc_msgSend(this.id, OS.sel_setJobDisposition_, jobDisposition != null ? jobDisposition.id : 0);
 }
 
 public void setPrinter(NSPrinter printer) {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPrintOperation.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPrintOperation.java
index 2f2648540d..06c950e67d 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPrintOperation.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSPrintOperation.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2017 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -63,12 +63,12 @@ public void setJobTitle(NSString jobTitle) {
 	OS.objc_msgSend(this.id, OS.sel_setJobTitle_, jobTitle != null ? jobTitle.id : 0);
 }
 
-public void setShowsPrintPanel(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setShowsPrintPanel_, flag);
+public void setShowsPrintPanel(boolean showsPrintPanel) {
+	OS.objc_msgSend(this.id, OS.sel_setShowsPrintPanel_, showsPrintPanel);
 }
 
-public void setShowsProgressPanel(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setShowsProgressPanel_, flag);
+public void setShowsProgressPanel(boolean showsProgressPanel) {
+	OS.objc_msgSend(this.id, OS.sel_setShowsProgressPanel_, showsProgressPanel);
 }
 
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSProgressIndicator.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSProgressIndicator.java
index dbebc59cda..b141e949df 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSProgressIndicator.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSProgressIndicator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2017 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -40,28 +40,28 @@ public double minValue() {
 	return OS.objc_msgSend_fpret(this.id, OS.sel_minValue);
 }
 
-public void setControlSize(long /*int*/ size) {
-	OS.objc_msgSend(this.id, OS.sel_setControlSize_, size);
+public void setControlSize(long /*int*/ controlSize) {
+	OS.objc_msgSend(this.id, OS.sel_setControlSize_, controlSize);
 }
 
 public void setDoubleValue(double doubleValue) {
 	OS.objc_msgSend(this.id, OS.sel_setDoubleValue_, doubleValue);
 }
 
-public void setIndeterminate(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setIndeterminate_, flag);
+public void setIndeterminate(boolean indeterminate) {
+	OS.objc_msgSend(this.id, OS.sel_setIndeterminate_, indeterminate);
 }
 
-public void setMaxValue(double newMaximum) {
-	OS.objc_msgSend(this.id, OS.sel_setMaxValue_, newMaximum);
+public void setMaxValue(double maxValue) {
+	OS.objc_msgSend(this.id, OS.sel_setMaxValue_, maxValue);
 }
 
-public void setMinValue(double newMinimum) {
-	OS.objc_msgSend(this.id, OS.sel_setMinValue_, newMinimum);
+public void setMinValue(double minValue) {
+	OS.objc_msgSend(this.id, OS.sel_setMinValue_, minValue);
 }
 
-public void setUsesThreadedAnimation(boolean threadedAnimation) {
-	OS.objc_msgSend(this.id, OS.sel_setUsesThreadedAnimation_, threadedAnimation);
+public void setUsesThreadedAnimation(boolean usesThreadedAnimation) {
+	OS.objc_msgSend(this.id, OS.sel_setUsesThreadedAnimation_, usesThreadedAnimation);
 }
 
 public void sizeToFit() {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSavePanel.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSavePanel.java
index 09834988d3..8b6b3d5213 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSavePanel.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSavePanel.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2015 IBM Corporation and others.
+ * Copyright (c) 2000, 2017 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -42,20 +42,20 @@ public static NSSavePanel savePanel() {
 	return result != 0 ? new NSSavePanel(result) : null;
 }
 
-public void setAccessoryView(NSView view) {
-	OS.objc_msgSend(this.id, OS.sel_setAccessoryView_, view != null ? view.id : 0);
+public void setAccessoryView(NSView accessoryView) {
+	OS.objc_msgSend(this.id, OS.sel_setAccessoryView_, accessoryView != null ? accessoryView.id : 0);
 }
 
-public void setAllowedFileTypes(NSArray types) {
-	OS.objc_msgSend(this.id, OS.sel_setAllowedFileTypes_, types != null ? types.id : 0);
+public void setAllowedFileTypes(NSArray allowedFileTypes) {
+	OS.objc_msgSend(this.id, OS.sel_setAllowedFileTypes_, allowedFileTypes != null ? allowedFileTypes.id : 0);
 }
 
-public void setAllowsOtherFileTypes(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setAllowsOtherFileTypes_, flag);
+public void setAllowsOtherFileTypes(boolean allowsOtherFileTypes) {
+	OS.objc_msgSend(this.id, OS.sel_setAllowsOtherFileTypes_, allowsOtherFileTypes);
 }
 
-public void setCanCreateDirectories(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setCanCreateDirectories_, flag);
+public void setCanCreateDirectories(boolean canCreateDirectories) {
+	OS.objc_msgSend(this.id, OS.sel_setCanCreateDirectories_, canCreateDirectories);
 }
 
 public void setDirectory(NSString path) {
@@ -66,13 +66,12 @@ public void setMessage(NSString message) {
 	OS.objc_msgSend(this.id, OS.sel_setMessage_, message != null ? message.id : 0);
 }
 
-@Override
 public void setTitle(NSString title) {
 	OS.objc_msgSend(this.id, OS.sel_setTitle_, title != null ? title.id : 0);
 }
 
-public void setTreatsFilePackagesAsDirectories(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setTreatsFilePackagesAsDirectories_, flag);
+public void setTreatsFilePackagesAsDirectories(boolean treatsFilePackagesAsDirectories) {
+	OS.objc_msgSend(this.id, OS.sel_setTreatsFilePackagesAsDirectories_, treatsFilePackagesAsDirectories);
 }
 
 public void validateVisibleColumns() {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSScrollView.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSScrollView.java
index 3c586cf885..5a332f85bb 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSScrollView.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSScrollView.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2015 IBM Corporation and others.
+ * Copyright (c) 2000, 2017 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -62,40 +62,40 @@ public void reflectScrolledClipView(NSClipView cView) {
 	OS.objc_msgSend(this.id, OS.sel_reflectScrolledClipView_, cView != null ? cView.id : 0);
 }
 
-public void setAutohidesScrollers(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setAutohidesScrollers_, flag);
+public void setAutohidesScrollers(boolean autohidesScrollers) {
+	OS.objc_msgSend(this.id, OS.sel_setAutohidesScrollers_, autohidesScrollers);
 }
 
-public void setBorderType(long /*int*/ aType) {
-	OS.objc_msgSend(this.id, OS.sel_setBorderType_, aType);
+public void setBorderType(long /*int*/ borderType) {
+	OS.objc_msgSend(this.id, OS.sel_setBorderType_, borderType);
 }
 
-public void setDocumentView(NSView aView) {
-	OS.objc_msgSend(this.id, OS.sel_setDocumentView_, aView != null ? aView.id : 0);
+public void setDocumentView(id documentView) {
+	OS.objc_msgSend(this.id, OS.sel_setDocumentView_, documentView != null ? documentView.id : 0);
 }
 
-public void setDrawsBackground(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setDrawsBackground_, flag);
+public void setDrawsBackground(boolean drawsBackground) {
+	OS.objc_msgSend(this.id, OS.sel_setDrawsBackground_, drawsBackground);
 }
 
-public void setHasHorizontalScroller(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setHasHorizontalScroller_, flag);
+public void setHasHorizontalScroller(boolean hasHorizontalScroller) {
+	OS.objc_msgSend(this.id, OS.sel_setHasHorizontalScroller_, hasHorizontalScroller);
 }
 
-public void setHasVerticalScroller(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setHasVerticalScroller_, flag);
+public void setHasVerticalScroller(boolean hasVerticalScroller) {
+	OS.objc_msgSend(this.id, OS.sel_setHasVerticalScroller_, hasVerticalScroller);
 }
 
-public void setHorizontalScroller(NSScroller anObject) {
-	OS.objc_msgSend(this.id, OS.sel_setHorizontalScroller_, anObject != null ? anObject.id : 0);
+public void setHorizontalScroller(NSScroller horizontalScroller) {
+	OS.objc_msgSend(this.id, OS.sel_setHorizontalScroller_, horizontalScroller != null ? horizontalScroller.id : 0);
 }
 
-public void setVerticalScrollElasticity(long /*int*/ elasticity) {
-	OS.objc_msgSend(this.id, OS.sel_setVerticalScrollElasticity_, elasticity);
+public void setVerticalScrollElasticity(long /*int*/ verticalScrollElasticity) {
+	OS.objc_msgSend(this.id, OS.sel_setVerticalScrollElasticity_, verticalScrollElasticity);
 }
 
-public void setVerticalScroller(NSScroller anObject) {
-	OS.objc_msgSend(this.id, OS.sel_setVerticalScroller_, anObject != null ? anObject.id : 0);
+public void setVerticalScroller(NSScroller verticalScroller) {
+	OS.objc_msgSend(this.id, OS.sel_setVerticalScroller_, verticalScroller != null ? verticalScroller.id : 0);
 }
 
 public void tile() {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSearchFieldCell.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSearchFieldCell.java
index 6638f7baec..bf3a4b9368 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSearchFieldCell.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSearchFieldCell.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2017 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -40,12 +40,12 @@ public NSRect searchTextRectForBounds(NSRect rect) {
 	return result;
 }
 
-public void setCancelButtonCell(NSButtonCell cell) {
-	OS.objc_msgSend(this.id, OS.sel_setCancelButtonCell_, cell != null ? cell.id : 0);
+public void setCancelButtonCell(NSButtonCell cancelButtonCell) {
+	OS.objc_msgSend(this.id, OS.sel_setCancelButtonCell_, cancelButtonCell != null ? cancelButtonCell.id : 0);
 }
 
-public void setSearchButtonCell(NSButtonCell cell) {
-	OS.objc_msgSend(this.id, OS.sel_setSearchButtonCell_, cell != null ? cell.id : 0);
+public void setSearchButtonCell(NSButtonCell searchButtonCell) {
+	OS.objc_msgSend(this.id, OS.sel_setSearchButtonCell_, searchButtonCell != null ? searchButtonCell.id : 0);
 }
 
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSegmentedCell.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSegmentedCell.java
index 477d67af95..79f134714b 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSegmentedCell.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSegmentedCell.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2017 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -40,8 +40,8 @@ public void setMenu(NSMenu menu, long /*int*/ segment) {
 	OS.objc_msgSend(this.id, OS.sel_setMenu_forSegment_, menu != null ? menu.id : 0, segment);
 }
 
-public void setSegmentCount(long /*int*/ count) {
-	OS.objc_msgSend(this.id, OS.sel_setSegmentCount_, count);
+public void setSegmentCount(long /*int*/ segmentCount) {
+	OS.objc_msgSend(this.id, OS.sel_setSegmentCount_, segmentCount);
 }
 
 public void setSegmentStyle(long /*int*/ segmentStyle) {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSlider.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSlider.java
index a41779b598..c894ce44a0 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSlider.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSSlider.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2017 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -36,12 +36,12 @@ public double minValue() {
 	return OS.objc_msgSend_fpret(this.id, OS.sel_minValue);
 }
 
-public void setMaxValue(double aDouble) {
-	OS.objc_msgSend(this.id, OS.sel_setMaxValue_, aDouble);
+public void setMaxValue(double maxValue) {
+	OS.objc_msgSend(this.id, OS.sel_setMaxValue_, maxValue);
 }
 
-public void setMinValue(double aDouble) {
-	OS.objc_msgSend(this.id, OS.sel_setMinValue_, aDouble);
+public void setMinValue(double minValue) {
+	OS.objc_msgSend(this.id, OS.sel_setMinValue_, minValue);
 }
 
 public static long /*int*/ cellClass() {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTabView.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTabView.java
index b97c8a3f5a..0f0d1dd095 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTabView.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTabView.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2017 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -61,8 +61,8 @@ public void setControlSize(long /*int*/ controlSize) {
 	OS.objc_msgSend(this.id, OS.sel_setControlSize_, controlSize);
 }
 
-public void setDelegate(id anObject) {
-	OS.objc_msgSend(this.id, OS.sel_setDelegate_, anObject != null ? anObject.id : 0);
+public void setDelegate(id delegate) {
+	OS.objc_msgSend(this.id, OS.sel_setDelegate_, delegate != null ? delegate.id : 0);
 }
 
 public void setFont(NSFont font) {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTabViewItem.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTabViewItem.java
index 20bc299892..ee0d3b6916 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTabViewItem.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTabViewItem.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2017 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -28,9 +28,9 @@ public void drawLabel(boolean shouldTruncateLabel, NSRect labelRect) {
 	OS.objc_msgSend(this.id, OS.sel_drawLabel_inRect_, shouldTruncateLabel, labelRect);
 }
 
-public id initWithIdentifier(id identifier) {
+public NSTabViewItem initWithIdentifier(id identifier) {
 	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_initWithIdentifier_, identifier != null ? identifier.id : 0);
-	return result != 0 ? new id(result) : null;
+	return result == this.id ? this : (result != 0 ? new NSTabViewItem(result) : null);
 }
 
 public void setLabel(NSString label) {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTableColumn.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTableColumn.java
index 935720601d..451be6237a 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTableColumn.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTableColumn.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2017 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -43,16 +43,16 @@ public long /*int*/ resizingMask() {
 	return OS.objc_msgSend(this.id, OS.sel_resizingMask);
 }
 
-public void setDataCell(NSCell cell) {
-	OS.objc_msgSend(this.id, OS.sel_setDataCell_, cell != null ? cell.id : 0);
+public void setDataCell(id dataCell) {
+	OS.objc_msgSend(this.id, OS.sel_setDataCell_, dataCell != null ? dataCell.id : 0);
 }
 
-public void setEditable(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setEditable_, flag);
+public void setEditable(boolean editable) {
+	OS.objc_msgSend(this.id, OS.sel_setEditable_, editable);
 }
 
-public void setHeaderCell(NSCell cell) {
-	OS.objc_msgSend(this.id, OS.sel_setHeaderCell_, cell != null ? cell.id : 0);
+public void setHeaderCell(id headerCell) {
+	OS.objc_msgSend(this.id, OS.sel_setHeaderCell_, headerCell != null ? headerCell.id : 0);
 }
 
 public void setIdentifier(NSString identifier) {
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 d10381a5db..aad5ba72b7 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
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2017 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -183,20 +183,20 @@ public NSIndexSet selectedRowIndexes() {
 	return result != 0 ? new NSIndexSet(result) : null;
 }
 
-public void setAllowsColumnReordering(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setAllowsColumnReordering_, flag);
+public void setAllowsColumnReordering(boolean allowsColumnReordering) {
+	OS.objc_msgSend(this.id, OS.sel_setAllowsColumnReordering_, allowsColumnReordering);
 }
 
-public void setAllowsMultipleSelection(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setAllowsMultipleSelection_, flag);
+public void setAllowsMultipleSelection(boolean allowsMultipleSelection) {
+	OS.objc_msgSend(this.id, OS.sel_setAllowsMultipleSelection_, allowsMultipleSelection);
 }
 
-public void setBackgroundColor(NSColor color) {
-	OS.objc_msgSend(this.id, OS.sel_setBackgroundColor_, color != null ? color.id : 0);
+public void setBackgroundColor(NSColor backgroundColor) {
+	OS.objc_msgSend(this.id, OS.sel_setBackgroundColor_, backgroundColor != null ? backgroundColor.id : 0);
 }
 
-public void setColumnAutoresizingStyle(long /*int*/ style) {
-	OS.objc_msgSend(this.id, OS.sel_setColumnAutoresizingStyle_, style);
+public void setColumnAutoresizingStyle(long /*int*/ columnAutoresizingStyle) {
+	OS.objc_msgSend(this.id, OS.sel_setColumnAutoresizingStyle_, columnAutoresizingStyle);
 }
 
 public void setDataSource(id aSource) {
@@ -207,8 +207,8 @@ public void setDelegate(id delegate) {
 	OS.objc_msgSend(this.id, OS.sel_setDelegate_, delegate != null ? delegate.id : 0);
 }
 
-public void setDoubleAction(long /*int*/ aSelector) {
-	OS.objc_msgSend(this.id, OS.sel_setDoubleAction_, aSelector);
+public void setDoubleAction(long /*int*/ doubleAction) {
+	OS.objc_msgSend(this.id, OS.sel_setDoubleAction_, doubleAction);
 }
 
 public void setDropRow(long /*int*/ row, long /*int*/ op) {
@@ -231,16 +231,16 @@ 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 setIntercellSpacing(NSSize aSize) {
-	OS.objc_msgSend(this.id, OS.sel_setIntercellSpacing_, aSize);
+public void setIntercellSpacing(NSSize intercellSpacing) {
+	OS.objc_msgSend(this.id, OS.sel_setIntercellSpacing_, intercellSpacing);
 }
 
 public void setRowHeight(double /*float*/ rowHeight) {
 	OS.objc_msgSend(this.id, OS.sel_setRowHeight_, rowHeight);
 }
 
-public void setUsesAlternatingRowBackgroundColors(boolean useAlternatingRowColors) {
-	OS.objc_msgSend(this.id, OS.sel_setUsesAlternatingRowBackgroundColors_, useAlternatingRowColors);
+public void setUsesAlternatingRowBackgroundColors(boolean usesAlternatingRowBackgroundColors) {
+	OS.objc_msgSend(this.id, OS.sel_setUsesAlternatingRowBackgroundColors_, usesAlternatingRowBackgroundColors);
 }
 
 public NSArray tableColumns() {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSText.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSText.java
index 46f829d8da..89b3feec83 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSText.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSText.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2017 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -68,60 +68,60 @@ public NSRange selectedRange() {
 	return result;
 }
 
-public void setAlignment(long /*int*/ mode) {
-	OS.objc_msgSend(this.id, OS.sel_setAlignment_, mode);
+public void setAlignment(long /*int*/ alignment) {
+	OS.objc_msgSend(this.id, OS.sel_setAlignment_, alignment);
 }
 
-public void setBackgroundColor(NSColor color) {
-	OS.objc_msgSend(this.id, OS.sel_setBackgroundColor_, color != null ? color.id : 0);
+public void setBackgroundColor(NSColor backgroundColor) {
+	OS.objc_msgSend(this.id, OS.sel_setBackgroundColor_, backgroundColor != null ? backgroundColor.id : 0);
 }
 
-public void setBaseWritingDirection(long /*int*/ writingDirection) {
-	OS.objc_msgSend(this.id, OS.sel_setBaseWritingDirection_, writingDirection);
+public void setBaseWritingDirection(long /*int*/ baseWritingDirection) {
+	OS.objc_msgSend(this.id, OS.sel_setBaseWritingDirection_, baseWritingDirection);
 }
 
-public void setDelegate(id anObject) {
-	OS.objc_msgSend(this.id, OS.sel_setDelegate_, anObject != null ? anObject.id : 0);
+public void setDelegate(id delegate) {
+	OS.objc_msgSend(this.id, OS.sel_setDelegate_, delegate != null ? delegate.id : 0);
 }
 
-public void setDrawsBackground(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setDrawsBackground_, flag);
+public void setDrawsBackground(boolean drawsBackground) {
+	OS.objc_msgSend(this.id, OS.sel_setDrawsBackground_, drawsBackground);
 }
 
-public void setEditable(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setEditable_, flag);
+public void setEditable(boolean editable) {
+	OS.objc_msgSend(this.id, OS.sel_setEditable_, editable);
 }
 
-public void setFont(NSFont obj) {
-	OS.objc_msgSend(this.id, OS.sel_setFont_, obj != null ? obj.id : 0);
+public void setFont(NSFont font) {
+	OS.objc_msgSend(this.id, OS.sel_setFont_, font != null ? font.id : 0);
 }
 
-public void setHorizontallyResizable(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setHorizontallyResizable_, flag);
+public void setHorizontallyResizable(boolean horizontallyResizable) {
+	OS.objc_msgSend(this.id, OS.sel_setHorizontallyResizable_, horizontallyResizable);
 }
 
-public void setMaxSize(NSSize newMaxSize) {
-	OS.objc_msgSend(this.id, OS.sel_setMaxSize_, newMaxSize);
+public void setMaxSize(NSSize maxSize) {
+	OS.objc_msgSend(this.id, OS.sel_setMaxSize_, maxSize);
 }
 
-public void setMinSize(NSSize newMinSize) {
-	OS.objc_msgSend(this.id, OS.sel_setMinSize_, newMinSize);
+public void setMinSize(NSSize minSize) {
+	OS.objc_msgSend(this.id, OS.sel_setMinSize_, minSize);
 }
 
-public void setSelectable(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setSelectable_, flag);
+public void setSelectable(boolean selectable) {
+	OS.objc_msgSend(this.id, OS.sel_setSelectable_, selectable);
 }
 
-public void setSelectedRange(NSRange range) {
-	OS.objc_msgSend(this.id, OS.sel_setSelectedRange_, range);
+public void setSelectedRange(NSRange selectedRange) {
+	OS.objc_msgSend(this.id, OS.sel_setSelectedRange_, selectedRange);
 }
 
 public void setString(NSString string) {
 	OS.objc_msgSend(this.id, OS.sel_setString_, string != null ? string.id : 0);
 }
 
-public void setTextColor(NSColor color) {
-	OS.objc_msgSend(this.id, OS.sel_setTextColor_, color != null ? color.id : 0);
+public void setTextColor(NSColor textColor) {
+	OS.objc_msgSend(this.id, OS.sel_setTextColor_, textColor != null ? textColor.id : 0);
 }
 
 public void sizeToFit() {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTextAttachment.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTextAttachment.java
index 7cfe036132..1876cfedbc 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTextAttachment.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTextAttachment.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2017 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -29,8 +29,8 @@ public NSTextAttachment initWithFileWrapper(NSFileWrapper fileWrapper) {
 	return result == this.id ? this : (result != 0 ? new NSTextAttachment(result) : null);
 }
 
-public void setAttachmentCell(id cell) {
-	OS.objc_msgSend(this.id, OS.sel_setAttachmentCell_, cell != null ? cell.id : 0);
+public void setAttachmentCell(id attachmentCell) {
+	OS.objc_msgSend(this.id, OS.sel_setAttachmentCell_, attachmentCell != null ? attachmentCell.id : 0);
 }
 
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTextContainer.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTextContainer.java
index 1f6cb9cc0a..b77e3afb67 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTextContainer.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTextContainer.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2017 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -35,16 +35,16 @@ public NSTextContainer initWithContainerSize(NSSize size) {
 	return result == this.id ? this : (result != 0 ? new NSTextContainer(result) : null);
 }
 
-public void setContainerSize(NSSize size) {
-	OS.objc_msgSend(this.id, OS.sel_setContainerSize_, size);
+public void setContainerSize(NSSize containerSize) {
+	OS.objc_msgSend(this.id, OS.sel_setContainerSize_, containerSize);
 }
 
-public void setLineFragmentPadding(double /*float*/ pad) {
-	OS.objc_msgSend(this.id, OS.sel_setLineFragmentPadding_, pad);
+public void setLineFragmentPadding(double /*float*/ lineFragmentPadding) {
+	OS.objc_msgSend(this.id, OS.sel_setLineFragmentPadding_, lineFragmentPadding);
 }
 
-public void setWidthTracksTextView(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setWidthTracksTextView_, flag);
+public void setWidthTracksTextView(boolean widthTracksTextView) {
+	OS.objc_msgSend(this.id, OS.sel_setWidthTracksTextView_, widthTracksTextView);
 }
 
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTextField.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTextField.java
index 9728351bf7..9c233d2c3a 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTextField.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTextField.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2017 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -28,32 +28,32 @@ public void selectText(id sender) {
 	OS.objc_msgSend(this.id, OS.sel_selectText_, sender != null ? sender.id : 0);
 }
 
-public void setBackgroundColor(NSColor color) {
-	OS.objc_msgSend(this.id, OS.sel_setBackgroundColor_, color != null ? color.id : 0);
+public void setBackgroundColor(NSColor backgroundColor) {
+	OS.objc_msgSend(this.id, OS.sel_setBackgroundColor_, backgroundColor != null ? backgroundColor.id : 0);
 }
 
-public void setBordered(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setBordered_, flag);
+public void setBordered(boolean bordered) {
+	OS.objc_msgSend(this.id, OS.sel_setBordered_, bordered);
 }
 
-public void setDelegate(id anObject) {
-	OS.objc_msgSend(this.id, OS.sel_setDelegate_, anObject != null ? anObject.id : 0);
+public void setDelegate(id delegate) {
+	OS.objc_msgSend(this.id, OS.sel_setDelegate_, delegate != null ? delegate.id : 0);
 }
 
-public void setDrawsBackground(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setDrawsBackground_, flag);
+public void setDrawsBackground(boolean drawsBackground) {
+	OS.objc_msgSend(this.id, OS.sel_setDrawsBackground_, drawsBackground);
 }
 
-public void setEditable(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setEditable_, flag);
+public void setEditable(boolean editable) {
+	OS.objc_msgSend(this.id, OS.sel_setEditable_, editable);
 }
 
-public void setSelectable(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setSelectable_, flag);
+public void setSelectable(boolean selectable) {
+	OS.objc_msgSend(this.id, OS.sel_setSelectable_, selectable);
 }
 
-public void setTextColor(NSColor color) {
-	OS.objc_msgSend(this.id, OS.sel_setTextColor_, color != null ? color.id : 0);
+public void setTextColor(NSColor textColor) {
+	OS.objc_msgSend(this.id, OS.sel_setTextColor_, textColor != null ? textColor.id : 0);
 }
 
 public static long /*int*/ cellClass() {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTextFieldCell.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTextFieldCell.java
index 53d8e08fea..a4ec5ded1f 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTextFieldCell.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTextFieldCell.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2017 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -24,12 +24,12 @@ public NSTextFieldCell(id id) {
 	super(id);
 }
 
-public void setPlaceholderString(NSString string) {
-	OS.objc_msgSend(this.id, OS.sel_setPlaceholderString_, string != null ? string.id : 0);
+public void setPlaceholderString(NSString placeholderString) {
+	OS.objc_msgSend(this.id, OS.sel_setPlaceholderString_, placeholderString != null ? placeholderString.id : 0);
 }
 
-public void setTextColor(NSColor color) {
-	OS.objc_msgSend(this.id, OS.sel_setTextColor_, color != null ? color.id : 0);
+public void setTextColor(NSColor textColor) {
+	OS.objc_msgSend(this.id, OS.sel_setTextColor_, textColor != null ? textColor.id : 0);
 }
 
 public NSColor textColor() {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTextView.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTextView.java
index 6f1e409956..6af0f269f3 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTextView.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTextView.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2017 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -61,36 +61,36 @@ public NSDictionary selectedTextAttributes() {
 	return result != 0 ? new NSDictionary(result) : null;
 }
 
-public void setAllowsUndo(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setAllowsUndo_, flag);
+public void setAllowsUndo(boolean allowsUndo) {
+	OS.objc_msgSend(this.id, OS.sel_setAllowsUndo_, allowsUndo);
 }
 
 public void setBaseWritingDirection(long /*int*/ writingDirection, NSRange range) {
 	OS.objc_msgSend(this.id, OS.sel_setBaseWritingDirection_range_, writingDirection, range);
 }
 
-public void setDefaultParagraphStyle(NSParagraphStyle paragraphStyle) {
-	OS.objc_msgSend(this.id, OS.sel_setDefaultParagraphStyle_, paragraphStyle != null ? paragraphStyle.id : 0);
+public void setDefaultParagraphStyle(NSParagraphStyle defaultParagraphStyle) {
+	OS.objc_msgSend(this.id, OS.sel_setDefaultParagraphStyle_, defaultParagraphStyle != null ? defaultParagraphStyle.id : 0);
 }
 
-public void setDisplaysLinkToolTips(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setDisplaysLinkToolTips_, flag);
+public void setDisplaysLinkToolTips(boolean displaysLinkToolTips) {
+	OS.objc_msgSend(this.id, OS.sel_setDisplaysLinkToolTips_, displaysLinkToolTips);
 }
 
-public void setLinkTextAttributes(NSDictionary attributeDictionary) {
-	OS.objc_msgSend(this.id, OS.sel_setLinkTextAttributes_, attributeDictionary != null ? attributeDictionary.id : 0);
+public void setLinkTextAttributes(NSDictionary linkTextAttributes) {
+	OS.objc_msgSend(this.id, OS.sel_setLinkTextAttributes_, linkTextAttributes != null ? linkTextAttributes.id : 0);
 }
 
-public void setRichText(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setRichText_, flag);
+public void setRichText(boolean richText) {
+	OS.objc_msgSend(this.id, OS.sel_setRichText_, richText);
 }
 
-public void setSelectedTextAttributes(NSDictionary attributeDictionary) {
-	OS.objc_msgSend(this.id, OS.sel_setSelectedTextAttributes_, attributeDictionary != null ? attributeDictionary.id : 0);
+public void setSelectedTextAttributes(NSDictionary selectedTextAttributes) {
+	OS.objc_msgSend(this.id, OS.sel_setSelectedTextAttributes_, selectedTextAttributes != null ? selectedTextAttributes.id : 0);
 }
 
-public void setUsesFontPanel(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setUsesFontPanel_, flag);
+public void setUsesFontPanel(boolean usesFontPanel) {
+	OS.objc_msgSend(this.id, OS.sel_setUsesFontPanel_, usesFontPanel);
 }
 
 public boolean shouldChangeTextInRange(NSRange affectedCharRange, NSString replacementString) {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTimer.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTimer.java
index 7b1f9b0484..adb63dbe67 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTimer.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTimer.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2017 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -33,8 +33,8 @@ public static NSTimer scheduledTimerWithTimeInterval(double ti, id aTarget, long
 	return result != 0 ? new NSTimer(result) : null;
 }
 
-public void setFireDate(NSDate date) {
-	OS.objc_msgSend(this.id, OS.sel_setFireDate_, date != null ? date.id : 0);
+public void setFireDate(NSDate fireDate) {
+	OS.objc_msgSend(this.id, OS.sel_setFireDate_, fireDate != null ? fireDate.id : 0);
 }
 
 public id userInfo() {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSToolbar.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSToolbar.java
index 98b4fa9a11..5f3271175a 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSToolbar.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSToolbar.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2017 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -41,8 +41,8 @@ public void removeItemAtIndex(long /*int*/ index) {
 	OS.objc_msgSend(this.id, OS.sel_removeItemAtIndex_, index);
 }
 
-public void setAllowsUserCustomization(boolean allowCustomization) {
-	OS.objc_msgSend(this.id, OS.sel_setAllowsUserCustomization_, allowCustomization);
+public void setAllowsUserCustomization(boolean allowsUserCustomization) {
+	OS.objc_msgSend(this.id, OS.sel_setAllowsUserCustomization_, allowsUserCustomization);
 }
 
 public void setDelegate(id delegate) {
@@ -53,12 +53,12 @@ public void setDisplayMode(long /*int*/ displayMode) {
 	OS.objc_msgSend(this.id, OS.sel_setDisplayMode_, displayMode);
 }
 
-public void setSelectedItemIdentifier(NSString itemIdentifier) {
-	OS.objc_msgSend(this.id, OS.sel_setSelectedItemIdentifier_, itemIdentifier != null ? itemIdentifier.id : 0);
+public void setSelectedItemIdentifier(NSString selectedItemIdentifier) {
+	OS.objc_msgSend(this.id, OS.sel_setSelectedItemIdentifier_, selectedItemIdentifier != null ? selectedItemIdentifier.id : 0);
 }
 
-public void setVisible(boolean shown) {
-	OS.objc_msgSend(this.id, OS.sel_setVisible_, shown);
+public void setVisible(boolean visible) {
+	OS.objc_msgSend(this.id, OS.sel_setVisible_, visible);
 }
 
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSToolbarItem.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSToolbarItem.java
index 72b4937e6a..71c6b3a9f8 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSToolbarItem.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSToolbarItem.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2017 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -50,16 +50,16 @@ public void setLabel(NSString label) {
 	OS.objc_msgSend(this.id, OS.sel_setLabel_, label != null ? label.id : 0);
 }
 
-public void setMaxSize(NSSize size) {
-	OS.objc_msgSend(this.id, OS.sel_setMaxSize_, size);
+public void setMaxSize(NSSize maxSize) {
+	OS.objc_msgSend(this.id, OS.sel_setMaxSize_, maxSize);
 }
 
-public void setMenuFormRepresentation(NSMenuItem menuItem) {
-	OS.objc_msgSend(this.id, OS.sel_setMenuFormRepresentation_, menuItem != null ? menuItem.id : 0);
+public void setMenuFormRepresentation(NSMenuItem menuFormRepresentation) {
+	OS.objc_msgSend(this.id, OS.sel_setMenuFormRepresentation_, menuFormRepresentation != null ? menuFormRepresentation.id : 0);
 }
 
-public void setMinSize(NSSize size) {
-	OS.objc_msgSend(this.id, OS.sel_setMinSize_, size);
+public void setMinSize(NSSize minSize) {
+	OS.objc_msgSend(this.id, OS.sel_setMinSize_, minSize);
 }
 
 public void setPaletteLabel(NSString paletteLabel) {
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 61efe09316..5c4fb6c633 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
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2016 IBM Corporation and others.
+ * Copyright (c) 2000, 2017 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -260,28 +260,28 @@ public boolean scrollRectToVisible(NSRect aRect) {
 	return OS.objc_msgSend_bool(this.id, OS.sel_scrollRectToVisible_, aRect);
 }
 
-public void setAcceptsTouchEvents(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setAcceptsTouchEvents_, flag);
+public void setAcceptsTouchEvents(boolean acceptsTouchEvents) {
+	OS.objc_msgSend(this.id, OS.sel_setAcceptsTouchEvents_, acceptsTouchEvents);
 }
 
-public void setAutoresizesSubviews(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setAutoresizesSubviews_, flag);
+public void setAutoresizesSubviews(boolean autoresizesSubviews) {
+	OS.objc_msgSend(this.id, OS.sel_setAutoresizesSubviews_, autoresizesSubviews);
 }
 
-public void setAutoresizingMask(long /*int*/ mask) {
-	OS.objc_msgSend(this.id, OS.sel_setAutoresizingMask_, mask);
+public void setAutoresizingMask(long /*int*/ autoresizingMask) {
+	OS.objc_msgSend(this.id, OS.sel_setAutoresizingMask_, autoresizingMask);
 }
 
-public void setBoundsRotation(double /*float*/ angle) {
-	OS.objc_msgSend(this.id, OS.sel_setBoundsRotation_, angle);
+public void setBoundsRotation(double /*float*/ boundsRotation) {
+	OS.objc_msgSend(this.id, OS.sel_setBoundsRotation_, boundsRotation);
 }
 
 public void setFocusRingType(long /*int*/ focusRingType) {
 	OS.objc_msgSend(this.id, OS.sel_setFocusRingType_, focusRingType);
 }
 
-public void setFrame(NSRect frameRect) {
-	OS.objc_msgSend(this.id, OS.sel_setFrame_, frameRect);
+public void setFrame(NSRect frame) {
+	OS.objc_msgSend(this.id, OS.sel_setFrame_, frame);
 }
 
 public void setFrameOrigin(NSPoint newOrigin) {
@@ -292,24 +292,24 @@ public void setFrameSize(NSSize newSize) {
 	OS.objc_msgSend(this.id, OS.sel_setFrameSize_, newSize);
 }
 
-public void setHidden(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setHidden_, flag);
+public void setHidden(boolean hidden) {
+	OS.objc_msgSend(this.id, OS.sel_setHidden_, hidden);
 }
 
-public void setNeedsDisplay(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setNeedsDisplay_, flag);
+public void setNeedsDisplay(boolean needsDisplay) {
+	OS.objc_msgSend(this.id, OS.sel_setNeedsDisplay_, needsDisplay);
 }
 
 public void setNeedsDisplayInRect(NSRect invalidRect) {
 	OS.objc_msgSend(this.id, OS.sel_setNeedsDisplayInRect_, invalidRect);
 }
 
-public void setToolTip(NSString string) {
-	OS.objc_msgSend(this.id, OS.sel_setToolTip_, string != null ? string.id : 0);
+public void setToolTip(NSString toolTip) {
+	OS.objc_msgSend(this.id, OS.sel_setToolTip_, toolTip != null ? toolTip.id : 0);
 }
 
-public void setWantsRestingTouches(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setWantsRestingTouches_, flag);
+public void setWantsRestingTouches(boolean wantsRestingTouches) {
+	OS.objc_msgSend(this.id, OS.sel_setWantsRestingTouches_, wantsRestingTouches);
 }
 
 public boolean shouldDelayWindowOrderingForEvent(NSEvent theEvent) {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSWindow.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSWindow.java
index 75cfc67fc3..7b62b9b659 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSWindow.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSWindow.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2015 IBM Corporation and others.
+ * Copyright (c) 2000, 2017 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -260,36 +260,36 @@ public void sendEvent(NSEvent theEvent) {
 	OS.objc_msgSend(this.id, OS.sel_sendEvent_, theEvent != null ? theEvent.id : 0);
 }
 
-public void setAcceptsMouseMovedEvents(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setAcceptsMouseMovedEvents_, flag);
+public void setAcceptsMouseMovedEvents(boolean acceptsMouseMovedEvents) {
+	OS.objc_msgSend(this.id, OS.sel_setAcceptsMouseMovedEvents_, acceptsMouseMovedEvents);
 }
 
-public void setAlphaValue(double /*float*/ windowAlpha) {
-	OS.objc_msgSend(this.id, OS.sel_setAlphaValue_, windowAlpha);
+public void setAlphaValue(double /*float*/ alphaValue) {
+	OS.objc_msgSend(this.id, OS.sel_setAlphaValue_, alphaValue);
 }
 
-public void setBackgroundColor(NSColor color) {
-	OS.objc_msgSend(this.id, OS.sel_setBackgroundColor_, color != null ? color.id : 0);
+public void setBackgroundColor(NSColor backgroundColor) {
+	OS.objc_msgSend(this.id, OS.sel_setBackgroundColor_, backgroundColor != null ? backgroundColor.id : 0);
 }
 
-public void setCollectionBehavior(long /*int*/ behavior) {
-	OS.objc_msgSend(this.id, OS.sel_setCollectionBehavior_, behavior);
+public void setCollectionBehavior(long /*int*/ collectionBehavior) {
+	OS.objc_msgSend(this.id, OS.sel_setCollectionBehavior_, collectionBehavior);
 }
 
-public void setContentView(NSView aView) {
-	OS.objc_msgSend(this.id, OS.sel_setContentView_, aView != null ? aView.id : 0);
+public void setContentView(id contentView) {
+	OS.objc_msgSend(this.id, OS.sel_setContentView_, contentView != null ? contentView.id : 0);
 }
 
 public void setDefaultButtonCell(NSButtonCell defButt) {
 	OS.objc_msgSend(this.id, OS.sel_setDefaultButtonCell_, defButt != null ? defButt.id : 0);
 }
 
-public void setDelegate(id anObject) {
-	OS.objc_msgSend(this.id, OS.sel_setDelegate_, anObject != null ? anObject.id : 0);
+public void setDelegate(id delegate) {
+	OS.objc_msgSend(this.id, OS.sel_setDelegate_, delegate != null ? delegate.id : 0);
 }
 
-public void setDocumentEdited(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setDocumentEdited_, flag);
+public void setDocumentEdited(boolean documentEdited) {
+	OS.objc_msgSend(this.id, OS.sel_setDocumentEdited_, documentEdited);
 }
 
 public void setFrame(NSRect frameRect, boolean flag) {
@@ -304,48 +304,48 @@ public void setHasShadow(boolean hasShadow) {
 	OS.objc_msgSend(this.id, OS.sel_setHasShadow_, hasShadow);
 }
 
-public void setHidesOnDeactivate(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setHidesOnDeactivate_, flag);
+public void setHidesOnDeactivate(boolean hidesOnDeactivate) {
+	OS.objc_msgSend(this.id, OS.sel_setHidesOnDeactivate_, hidesOnDeactivate);
 }
 
-public void setLevel(long /*int*/ newLevel) {
-	OS.objc_msgSend(this.id, OS.sel_setLevel_, newLevel);
+public void setLevel(long /*int*/ level) {
+	OS.objc_msgSend(this.id, OS.sel_setLevel_, level);
 }
 
-public void setMinSize(NSSize size) {
-	OS.objc_msgSend(this.id, OS.sel_setMinSize_, size);
+public void setMinSize(NSSize minSize) {
+	OS.objc_msgSend(this.id, OS.sel_setMinSize_, minSize);
 }
 
-public void setMovable(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setMovable_, flag);
+public void setMovable(boolean movable) {
+	OS.objc_msgSend(this.id, OS.sel_setMovable_, movable);
 }
 
-public void setOpaque(boolean isOpaque) {
-	OS.objc_msgSend(this.id, OS.sel_setOpaque_, isOpaque);
+public void setOpaque(boolean opaque) {
+	OS.objc_msgSend(this.id, OS.sel_setOpaque_, opaque);
 }
 
-public void setReleasedWhenClosed(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setReleasedWhenClosed_, flag);
+public void setReleasedWhenClosed(boolean releasedWhenClosed) {
+	OS.objc_msgSend(this.id, OS.sel_setReleasedWhenClosed_, releasedWhenClosed);
 }
 
-public void setRepresentedFilename(NSString aString) {
-	OS.objc_msgSend(this.id, OS.sel_setRepresentedFilename_, aString != null ? aString.id : 0);
+public void setRepresentedFilename(NSString representedFilename) {
+	OS.objc_msgSend(this.id, OS.sel_setRepresentedFilename_, representedFilename != null ? representedFilename.id : 0);
 }
 
-public void setRepresentedURL(NSURL url) {
-	OS.objc_msgSend(this.id, OS.sel_setRepresentedURL_, url != null ? url.id : 0);
+public void setRepresentedURL(NSURL representedURL) {
+	OS.objc_msgSend(this.id, OS.sel_setRepresentedURL_, representedURL != null ? representedURL.id : 0);
 }
 
-public void setShowsResizeIndicator(boolean show) {
-	OS.objc_msgSend(this.id, OS.sel_setShowsResizeIndicator_, show);
+public void setShowsResizeIndicator(boolean showsResizeIndicator) {
+	OS.objc_msgSend(this.id, OS.sel_setShowsResizeIndicator_, showsResizeIndicator);
 }
 
-public void setShowsToolbarButton(boolean show) {
-	OS.objc_msgSend(this.id, OS.sel_setShowsToolbarButton_, show);
+public void setShowsToolbarButton(boolean showsToolbarButton) {
+	OS.objc_msgSend(this.id, OS.sel_setShowsToolbarButton_, showsToolbarButton);
 }
 
-public void setTitle(NSString aString) {
-	OS.objc_msgSend(this.id, OS.sel_setTitle_, aString != null ? aString.id : 0);
+public void setTitle(NSString title) {
+	OS.objc_msgSend(this.id, OS.sel_setTitle_, title != null ? title.id : 0);
 }
 
 public void setToolbar(NSToolbar toolbar) {
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 ddef5763f8..77d74f6ec7 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
@@ -707,7 +707,7 @@ public static final native long /*int*/ CALLBACK_headerRectOfColumn_(long /*int*
 public static final native long /*int*/ CALLBACK_highlightSelectionInClipRect_(long /*int*/ func);
 /** @method callback_types=NSView*;id;SEL;NSPoint;,callback_flags=none;none;none;struct; */
 public static final native long /*int*/ CALLBACK_hitTest_(long /*int*/ func);
-/** @method callback_types=NSUInteger;id;SEL;NSEvent*;NSRect;NSView*;,callback_flags=none;none;none;none;struct;none; */
+/** @method callback_types=NSCellHitResult;id;SEL;NSEvent*;NSRect;NSView*;,callback_flags=none;none;none;none;struct;none; */
 public static final native long /*int*/ CALLBACK_hitTestForEvent_inRect_ofView_(long /*int*/ func);
 /** @method callback_types=NSRect;id;SEL;NSRect;,callback_flags=struct;none;none;struct; */
 public static final native long /*int*/ CALLBACK_imageRectForBounds_(long /*int*/ func);
@@ -2305,6 +2305,8 @@ public static final long /*int*/ sel_webViewShow_ = sel_registerName("webViewSho
 public static final long /*int*/ sel_webViewUnfocus_ = sel_registerName("webViewUnfocus:");
 public static final long /*int*/ sel_weightOfFont_ = sel_registerName("weightOfFont:");
 public static final long /*int*/ sel_wheelDelta = sel_registerName("wheelDelta");
+public static final long /*int*/ sel_wheelDeltaX = sel_registerName("wheelDeltaX");
+public static final long /*int*/ sel_wheelDeltaY = sel_registerName("wheelDeltaY");
 public static final long /*int*/ sel_width = sel_registerName("width");
 public static final long /*int*/ sel_window = sel_registerName("window");
 public static final long /*int*/ sel_windowBackgroundColor = sel_registerName("windowBackgroundColor");
@@ -2507,7 +2509,6 @@ public static final int NSShadowlessSquareBezelStyle = 6;
 public static final int NSShiftKeyMask = 131072;
 public static final int NSSmallControlSize = 1;
 public static final int NSSquareLineCapStyle = 2;
-public static final int NSSquareStatusItemLength = -2;
 public static final int NSStatusWindowLevel = 25;
 public static final int NSStringDrawingUsesLineFragmentOrigin = 1;
 public static final int NSSubmenuWindowLevel = 3;
@@ -3112,6 +3113,8 @@ public static final NSString NSPrintSpoolJob = new NSString(NSPrintSpoolJob());
 public static final native long /*int*/ NSSpellingStateAttributeName();
 public static final NSString NSSpellingStateAttributeName = new NSString(NSSpellingStateAttributeName());
 /** @method flags=const */
+public static final native double /*float*/ NSSquareStatusItemLength();
+/** @method flags=const */
 public static final native long /*int*/ NSStrikethroughColorAttributeName();
 public static final NSString NSStrikethroughColorAttributeName = new NSString(NSStrikethroughColorAttributeName());
 /** @method flags=const */
@@ -3698,7 +3701,7 @@ public static final native void CTLineDraw(long /*int*/ line, long /*int*/ conte
 public static final native double CTLineGetTypographicBounds(long /*int*/ line, double[] /*float[]*/ ascent, double[] /*float[]*/ descent, double[] /*float[]*/ leading);
 /**
  * @param settings cast=(CTParagraphStyleSetting*)
- * @param settingCount cast=(CFIndex)
+ * @param settingCount cast=(size_t)
  */
 public static final native long /*int*/ CTParagraphStyleCreate(long /*int*/ settings, long /*int*/ settingCount);
 /**
@@ -4161,7 +4164,7 @@ public static final native long /*int*/ objc_msgSend(long /*int*/ id, long /*int
 /** @method flags=cast */
 public static final native long /*int*/ objc_msgSend(long /*int*/ id, long /*int*/ sel, long[] /*int[]*/ arg0, int arg1, int arg2);
 /** @method flags=cast */
-public static final native long /*int*/ objc_msgSend(long /*int*/ id, long /*int*/ sel, int[] arg0, int arg1);
+public static final native long /*int*/ objc_msgSend(long /*int*/ id, long /*int*/ sel, int[] arg0, long /*int*/ arg1);
 /** @method flags=cast */
 public static final native int objc_msgSend(int id, int sel, float arg0);
 /** @method flags=cast */
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 5c2f3a6dc9..34948ce86e 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
@@ -58,26 +58,14 @@
 			<retval swt_gen="true"></retval>
 		</method>
 	</class>
-	<class name="DOMWheelEvent" swt_gen="mixed">
-		<method selector="altKey" swt_gen="true">
-			<retval swt_gen="true"></retval>
-		</method>
-		<method selector="ctrlKey" swt_gen="true">
-			<retval swt_gen="true"></retval>
-		</method>
-		<method selector="metaKey" swt_gen="true">
-			<retval swt_gen="true"></retval>
-		</method>
-		<method selector="screenX" swt_gen="true">
-			<retval swt_gen="true"></retval>
-		</method>
-		<method selector="screenY" swt_gen="true">
+	<class name="DOMWheelEvent" swt_gen="mixed" swt_superclass="DOMMouseEvent">
+		<method selector="wheelDelta" swt_gen="true">
 			<retval swt_gen="true"></retval>
 		</method>
-		<method selector="shiftKey" swt_gen="true">
+		<method selector="wheelDeltaX" swt_gen="true">
 			<retval swt_gen="true"></retval>
 		</method>
-		<method selector="wheelDelta" swt_gen="true">
+		<method selector="wheelDeltaY" swt_gen="true">
 			<retval swt_gen="true"></retval>
 		</method>
 	</class>
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/WebPreferences.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/WebPreferences.java
index 57b75b1aed..e50f11ede5 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/WebPreferences.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/WebPreferences.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2017 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -24,12 +24,12 @@ public WebPreferences(id id) {
 	super(id);
 }
 
-public void setJavaEnabled(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setJavaEnabled_, flag);
+public void setJavaEnabled(boolean javaEnabled) {
+	OS.objc_msgSend(this.id, OS.sel_setJavaEnabled_, javaEnabled);
 }
 
-public void setJavaScriptEnabled(boolean flag) {
-	OS.objc_msgSend(this.id, OS.sel_setJavaScriptEnabled_, flag);
+public void setJavaScriptEnabled(boolean javaScriptEnabled) {
+	OS.objc_msgSend(this.id, OS.sel_setJavaScriptEnabled_, javaScriptEnabled);
 }
 
 public static WebPreferences standardPreferences() {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/WebView.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/WebView.java
index 435602698c..04d1e361ba 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/WebView.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/WebView.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2017 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -70,36 +70,36 @@ public void reload(id sender) {
 	OS.objc_msgSend(this.id, OS.sel_reload_, sender != null ? sender.id : 0);
 }
 
-public void setApplicationNameForUserAgent(NSString applicationName) {
-	OS.objc_msgSend(this.id, OS.sel_setApplicationNameForUserAgent_, applicationName != null ? applicationName.id : 0);
+public void setApplicationNameForUserAgent(NSString applicationNameForUserAgent) {
+	OS.objc_msgSend(this.id, OS.sel_setApplicationNameForUserAgent_, applicationNameForUserAgent != null ? applicationNameForUserAgent.id : 0);
 }
 
-public void setCustomUserAgent(NSString userAgentString) {
-	OS.objc_msgSend(this.id, OS.sel_setCustomUserAgent_, userAgentString != null ? userAgentString.id : 0);
+public void setCustomUserAgent(NSString customUserAgent) {
+	OS.objc_msgSend(this.id, OS.sel_setCustomUserAgent_, customUserAgent != null ? customUserAgent.id : 0);
 }
 
-public void setDownloadDelegate(id delegate) {
-	OS.objc_msgSend(this.id, OS.sel_setDownloadDelegate_, delegate != null ? delegate.id : 0);
+public void setDownloadDelegate(id downloadDelegate) {
+	OS.objc_msgSend(this.id, OS.sel_setDownloadDelegate_, downloadDelegate != null ? downloadDelegate.id : 0);
 }
 
-public void setFrameLoadDelegate(id delegate) {
-	OS.objc_msgSend(this.id, OS.sel_setFrameLoadDelegate_, delegate != null ? delegate.id : 0);
+public void setFrameLoadDelegate(id frameLoadDelegate) {
+	OS.objc_msgSend(this.id, OS.sel_setFrameLoadDelegate_, frameLoadDelegate != null ? frameLoadDelegate.id : 0);
 }
 
-public void setPolicyDelegate(id delegate) {
-	OS.objc_msgSend(this.id, OS.sel_setPolicyDelegate_, delegate != null ? delegate.id : 0);
+public void setPolicyDelegate(id policyDelegate) {
+	OS.objc_msgSend(this.id, OS.sel_setPolicyDelegate_, policyDelegate != null ? policyDelegate.id : 0);
 }
 
-public void setPreferences(WebPreferences prefs) {
-	OS.objc_msgSend(this.id, OS.sel_setPreferences_, prefs != null ? prefs.id : 0);
+public void setPreferences(WebPreferences preferences) {
+	OS.objc_msgSend(this.id, OS.sel_setPreferences_, preferences != null ? preferences.id : 0);
 }
 
-public void setResourceLoadDelegate(id delegate) {
-	OS.objc_msgSend(this.id, OS.sel_setResourceLoadDelegate_, delegate != null ? delegate.id : 0);
+public void setResourceLoadDelegate(id resourceLoadDelegate) {
+	OS.objc_msgSend(this.id, OS.sel_setResourceLoadDelegate_, resourceLoadDelegate != null ? resourceLoadDelegate.id : 0);
 }
 
-public void setUIDelegate(id delegate) {
-	OS.objc_msgSend(this.id, OS.sel_setUIDelegate_, delegate != null ? delegate.id : 0);
+public void setUIDelegate(id UIDelegate) {
+	OS.objc_msgSend(this.id, OS.sel_setUIDelegate_, UIDelegate != null ? UIDelegate.id : 0);
 }
 
 public void stopLoading(id sender) {