Bug 514191 - Bridge support files should be updated to latest macOS

supported version (10.11)

Updated Cocoa classes and extras file after changes to bridgesupport
files.

Change-Id: I3e60736d1452ac9e062650193a6a3f258e353f55
Signed-off-by: Lakshmi Shanmugam <lshanmug@in.ibm.com>

17 files changed, 64 insertions, 46 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 58e3a92bae..671bcfe0cc 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
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2017 IBM Corporation and others.
+ * Copyright (c) 2000, 2018 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
@@ -4842,6 +4842,18 @@ JNIEXPORT jintLong JNICALL OS_NATIVE(NSModalPanelRunLoopMode)
 }
 #endif
 
+#ifndef NO_NSNotFound
+JNIEXPORT jintLong JNICALL OS_NATIVE(NSNotFound)
+	(JNIEnv *env, jclass that)
+{
+	jintLong rc = 0;
+	OS_NATIVE_ENTER(env, that, NSNotFound_FUNC);
+	rc = (jintLong)NSNotFound;
+	OS_NATIVE_EXIT(env, that, NSNotFound_FUNC);
+	return rc;
+}
+#endif
+
 #ifndef NO_NSNumberOfColorComponents
 JNIEXPORT jintLong JNICALL OS_NATIVE(NSNumberOfColorComponents)
 	(JNIEnv *env, jclass that, jintLong arg0)
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 05d934f65f..a89c16b082 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
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2017 IBM Corporation and others.
+ * Copyright (c) 2000, 2018 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
@@ -364,6 +364,7 @@ char * OS_nativeFunctionNames[] = {
 	"NSLinkAttributeName",
 	"NSLocaleLanguageCode",
 	"NSModalPanelRunLoopMode",
+	"NSNotFound",
 	"NSNumberOfColorComponents",
 	"NSObliquenessAttributeName",
 	"NSOutlineViewColumnDidMoveNotification",
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 6d43bdd89c..2c674064f8 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
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2017 IBM Corporation and others.
+ * Copyright (c) 2000, 2018 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
@@ -374,6 +374,7 @@ typedef enum {
 	NSLinkAttributeName_FUNC,
 	NSLocaleLanguageCode_FUNC,
 	NSModalPanelRunLoopMode_FUNC,
+	NSNotFound_FUNC,
 	NSNumberOfColorComponents_FUNC,
 	NSObliquenessAttributeName_FUNC,
 	NSOutlineViewColumnDidMoveNotification_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 41934477dc..abe13bd574 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
@@ -4837,7 +4837,6 @@
 	<enum name="NSButtLineCapStyle" swt_gen="true"></enum>
 	<enum name="NSCancelButton" swt_gen="true"></enum>
 	<enum name="NSCarriageReturnCharacter" swt_gen="true"></enum>
-	<enum name="NSCenterTextAlignment" swt_gen="true"></enum>
 	<enum name="NSClockAndCalendarDatePickerStyle" swt_gen="true"></enum>
 	<enum name="NSClosableWindowMask" swt_gen="true"></enum>
 	<enum name="NSClosePathBezierPathElement" swt_gen="true"></enum>
@@ -4900,7 +4899,6 @@
 	<enum name="NSImageOverlaps" swt_gen="true"></enum>
 	<enum name="NSInformationalAlertStyle" swt_gen="true"></enum>
 	<enum name="NSItalicFontMask" swt_gen="true"></enum>
-	<enum name="NSJustifiedTextAlignment" swt_gen="true"></enum>
 	<enum name="NSKeyDown" swt_gen="true"></enum>
 	<enum name="NSKeyUp" swt_gen="true"></enum>
 	<enum name="NSLandscapeOrientation" swt_gen="true"></enum>
@@ -4911,7 +4909,6 @@
 	<enum name="NSLeftMouseUp" swt_gen="true"></enum>
 	<enum name="NSLeftMouseUpMask" swt_gen="true"></enum>
 	<enum name="NSLeftTabStopType" swt_gen="true"></enum>
-	<enum name="NSLeftTextAlignment" swt_gen="true"></enum>
 	<enum name="NSLineBreakByClipping" swt_gen="true"></enum>
 	<enum name="NSLineBreakByTruncatingMiddle" swt_gen="true"></enum>
 	<enum name="NSLineBreakByTruncatingTail" swt_gen="true"></enum>
@@ -4969,7 +4966,6 @@
 	<enum name="NSRightMouseDown" swt_gen="true"></enum>
 	<enum name="NSRightMouseDragged" swt_gen="true"></enum>
 	<enum name="NSRightMouseUp" swt_gen="true"></enum>
-	<enum name="NSRightTextAlignment" swt_gen="true"></enum>
 	<enum name="NSRoundLineCapStyle" swt_gen="true"></enum>
 	<enum name="NSRoundLineJoinStyle" swt_gen="true"></enum>
 	<enum name="NSRoundedBezelStyle" swt_gen="true"></enum>
@@ -5002,6 +4998,11 @@
 	<enum name="NSTableViewSolidVerticalGridLineMask" swt_gen="true"></enum>
 	<enum name="NSTerminateCancel" swt_gen="true"></enum>
 	<enum name="NSTerminateNow" swt_gen="true"></enum>
+	<enum name="NSTextAlignmentCenter" swt_gen="true"></enum>
+	<enum name="NSTextAlignmentJustified" swt_gen="true"></enum>
+	<enum name="NSTextAlignmentLeft" swt_gen="true"></enum>
+	<enum name="NSTextAlignmentNatural" swt_gen="true"></enum>
+	<enum name="NSTextAlignmentRight" swt_gen="true"></enum>
 	<enum name="NSTextFieldAndStepperDatePickerStyle" swt_gen="true"></enum>
 	<enum name="NSTextFieldDatePickerStyle" swt_gen="true"></enum>
 	<enum name="NSTitledWindowMask" swt_gen="true"></enum>
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/FoundationFull.bridgesupport.extras b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/FoundationFull.bridgesupport.extras
index bb2a47bf9a..627e0b12fc 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/FoundationFull.bridgesupport.extras
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/FoundationFull.bridgesupport.extras
@@ -1194,6 +1194,7 @@
 	<constant name="NSDefaultRunLoopMode" swt_gen="true"></constant>
 	<constant name="NSErrorFailingURLStringKey" swt_gen="true"></constant>
 	<constant name="NSLocaleLanguageCode" swt_gen="true"></constant>
+	<constant name="NSNotFound" swt_gen="true"></constant>
 	<enum name="NSAllApplicationsDirectory" swt_gen="true"></enum>
 	<enum name="NSAllDomainsMask" swt_gen="true"></enum>
 	<enum name="NSCachesDirectory" swt_gen="true"></enum>
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 b878d3d673..9ecf4a149d 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, 2017 IBM Corporation and others.
+ * Copyright (c) 2000, 2018 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
@@ -95,9 +95,9 @@ public long /*int*/ samplesPerPixel() {
 	return OS.objc_msgSend(this.id, OS.sel_samplesPerPixel);
 }
 
-public static id imageRepWithContentsOfFile(NSString filename) {
+public static NSImageRep imageRepWithContentsOfFile(NSString filename) {
 	long /*int*/ result = OS.objc_msgSend(OS.class_NSBitmapImageRep, OS.sel_imageRepWithContentsOfFile_, filename != null ? filename.id : 0);
-	return result != 0 ? new id(result) : null;
+	return result != 0 ? new NSImageRep(result) : null;
 }
 
 }
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 85a456a456..35fde20761 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, 2017 IBM Corporation and others.
+ * Copyright (c) 2000, 2018 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
@@ -51,7 +51,7 @@ public void setBoxType(long /*int*/ boxType) {
 	OS.objc_msgSend(this.id, OS.sel_setBoxType_, boxType);
 }
 
-public void setContentView(id contentView) {
+public void setContentView(NSView contentView) {
 	OS.objc_msgSend(this.id, OS.sel_setContentView_, contentView != null ? contentView.id : 0);
 }
 
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 c739336179..28e1ddf491 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, 2017 IBM Corporation and others.
+ * Copyright (c) 2000, 2018 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
@@ -140,7 +140,7 @@ public void setFont(NSFont font) {
 	OS.objc_msgSend(this.id, OS.sel_setFont_, font != null ? font.id : 0);
 }
 
-public void setFormatter(id formatter) {
+public void setFormatter(NSFormatter formatter) {
 	OS.objc_msgSend(this.id, OS.sel_setFormatter_, formatter != null ? formatter.id : 0);
 }
 
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 a3525c9d40..29d3ca84c3 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, 2017 IBM Corporation and others.
+ * Copyright (c) 2000, 2018 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
@@ -79,8 +79,8 @@ public void setBaseWritingDirection(long /*int*/ baseWritingDirection) {
 	OS.objc_msgSend(this.id, OS.sel_setBaseWritingDirection_, baseWritingDirection);
 }
 
-public void setCell(NSCell aCell) {
-	OS.objc_msgSend(this.id, OS.sel_setCell_, aCell != null ? aCell.id : 0);
+public void setCell(NSCell cell) {
+	OS.objc_msgSend(this.id, OS.sel_setCell_, cell != null ? cell.id : 0);
 }
 
 public static void setCellClass(long /*int*/ factoryId) {
@@ -99,7 +99,7 @@ public void setFont(NSFont font) {
 	OS.objc_msgSend(this.id, OS.sel_setFont_, font != null ? font.id : 0);
 }
 
-public void setFormatter(id formatter) {
+public void setFormatter(NSFormatter formatter) {
 	OS.objc_msgSend(this.id, OS.sel_setFormatter_, formatter != null ? formatter.id : 0);
 }
 
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 29e2889dfe..152a3c06ff 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, 2017 IBM Corporation and others.
+ * Copyright (c) 2000, 2018 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,9 +41,9 @@ public boolean hasAlpha() {
 	return OS.objc_msgSend_bool(this.id, OS.sel_hasAlpha);
 }
 
-public static id imageRepWithContentsOfFile(NSString filename) {
+public static NSImageRep imageRepWithContentsOfFile(NSString filename) {
 	long /*int*/ result = OS.objc_msgSend(OS.class_NSImageRep, OS.sel_imageRepWithContentsOfFile_, filename != null ? filename.id : 0);
-	return result != 0 ? new id(result) : null;
+	return result != 0 ? new NSImageRep(result) : null;
 }
 
 public long /*int*/ pixelsHigh() {
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 5f3f2e6ad1..2c01e4e199 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, 2017 IBM Corporation and others.
+ * Copyright (c) 2000, 2018 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
@@ -194,8 +194,8 @@ public void addEventListener(NSString type, id listener, boolean useCapture) {
 	OS.objc_msgSend(this.id, OS.sel_addEventListener_listener_useCapture_, type != null ? type.id : 0, listener != null ? listener.id : 0, useCapture);
 }
 
-public void handleEvent(DOMEvent evt) {
-	OS.objc_msgSend(this.id, OS.sel_handleEvent_, evt != null ? evt.id : 0);
+public void handleEvent(DOMEvent event) {
+	OS.objc_msgSend(this.id, OS.sel_handleEvent_, event != null ? event.id : 0);
 }
 
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSString.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSString.java
index abf81f2475..333a18b97b 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSString.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSString.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2018 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,8 +62,8 @@ public void getCharacters(char[] buffer) {
 	OS.objc_msgSend(this.id, OS.sel_getCharacters_, buffer);
 }
 
-public void getCharacters(char[] buffer, NSRange aRange) {
-	OS.objc_msgSend(this.id, OS.sel_getCharacters_range_, buffer, aRange);
+public void getCharacters(char[] buffer, NSRange range) {
+	OS.objc_msgSend(this.id, OS.sel_getCharacters_range_, buffer, range);
 }
 
 public NSString initWithCharacters(char[] characters, long /*int*/ length) {
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 451be6237a..ac51a831e9 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, 2017 IBM Corporation and others.
+ * Copyright (c) 2000, 2018 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
@@ -51,7 +51,7 @@ public void setEditable(boolean editable) {
 	OS.objc_msgSend(this.id, OS.sel_setEditable_, editable);
 }
 
-public void setHeaderCell(id headerCell) {
+public void setHeaderCell(NSTableHeaderCell headerCell) {
 	OS.objc_msgSend(this.id, OS.sel_setHeaderCell_, headerCell != null ? headerCell.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 b77e3afb67..c3e9586ff5 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, 2017 IBM Corporation and others.
+ * Copyright (c) 2000, 2018 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
@@ -30,8 +30,8 @@ public NSSize containerSize() {
 	return result;
 }
 
-public NSTextContainer initWithContainerSize(NSSize size) {
-	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_initWithContainerSize_, size);
+public NSTextContainer initWithContainerSize(NSSize aContainerSize) {
+	long /*int*/ result = OS.objc_msgSend(this.id, OS.sel_initWithContainerSize_, aContainerSize);
 	return result == this.id ? this : (result != 0 ? new NSTextContainer(result) : null);
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTextStorage.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTextStorage.java
index 94d4557872..736bc6bbda 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTextStorage.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/NSTextStorage.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2012 IBM Corporation and others.
+ * Copyright (c) 2000, 2018 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,8 +24,8 @@ public NSTextStorage(id id) {
 	super(id);
 }
 
-public void addLayoutManager(NSLayoutManager obj) {
-	OS.objc_msgSend(this.id, OS.sel_addLayoutManager_, obj != null ? obj.id : 0);
+public void addLayoutManager(NSLayoutManager aLayoutManager) {
+	OS.objc_msgSend(this.id, OS.sel_addLayoutManager_, aLayoutManager != null ? aLayoutManager.id : 0);
 }
 
 public NSArray paragraphs() {
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 7b62b9b659..6ebfb3a2fc 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, 2017 IBM Corporation and others.
+ * Copyright (c) 2000, 2018 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
@@ -276,12 +276,12 @@ public void setCollectionBehavior(long /*int*/ collectionBehavior) {
 	OS.objc_msgSend(this.id, OS.sel_setCollectionBehavior_, collectionBehavior);
 }
 
-public void setContentView(id contentView) {
+public void setContentView(NSView 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 setDefaultButtonCell(NSButtonCell defaultButtonCell) {
+	OS.objc_msgSend(this.id, OS.sel_setDefaultButtonCell_, defaultButtonCell != null ? defaultButtonCell.id : 0);
 }
 
 public void setDelegate(id delegate) {
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 3ab61a3d9d..ccd13c6be6 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
@@ -2405,7 +2405,6 @@ public static final int NSBoxSeparator = 2;
 public static final int NSButtLineCapStyle = 0;
 public static final int NSCancelButton = 0;
 public static final int NSCarriageReturnCharacter = 13;
-public static final int NSCenterTextAlignment = 2;
 public static final int NSClockAndCalendarDatePickerStyle = 1;
 public static final int NSClosableWindowMask = 2;
 public static final int NSClosePathBezierPathElement = 3;
@@ -2468,7 +2467,6 @@ public static final int NSImageOnly = 1;
 public static final int NSImageOverlaps = 6;
 public static final int NSInformationalAlertStyle = 1;
 public static final int NSItalicFontMask = 1;
-public static final int NSJustifiedTextAlignment = 3;
 public static final int NSKeyDown = 10;
 public static final int NSKeyUp = 11;
 public static final int NSLandscapeOrientation = 1;
@@ -2479,7 +2477,6 @@ public static final int NSLeftMouseDraggedMask = 64;
 public static final int NSLeftMouseUp = 2;
 public static final int NSLeftMouseUpMask = 4;
 public static final int NSLeftTabStopType = 0;
-public static final int NSLeftTextAlignment = 0;
 public static final int NSLineBreakByClipping = 2;
 public static final int NSLineBreakByTruncatingMiddle = 5;
 public static final int NSLineBreakByTruncatingTail = 4;
@@ -2537,7 +2534,6 @@ public static final int NSResizableWindowMask = 8;
 public static final int NSRightMouseDown = 3;
 public static final int NSRightMouseDragged = 7;
 public static final int NSRightMouseUp = 4;
-public static final int NSRightTextAlignment = 1;
 public static final int NSRoundLineCapStyle = 1;
 public static final int NSRoundLineJoinStyle = 1;
 public static final int NSRoundedBezelStyle = 1;
@@ -2570,6 +2566,11 @@ public static final int NSTableViewNoColumnAutoresizing = 0;
 public static final int NSTableViewSolidVerticalGridLineMask = 1;
 public static final int NSTerminateCancel = 0;
 public static final int NSTerminateNow = 1;
+public static final int NSTextAlignmentCenter = 2;
+public static final int NSTextAlignmentJustified = 3;
+public static final int NSTextAlignmentLeft = 0;
+public static final int NSTextAlignmentNatural = 4;
+public static final int NSTextAlignmentRight = 1;
 public static final int NSTextFieldAndStepperDatePickerStyle = 0;
 public static final int NSTextFieldDatePickerStyle = 2;
 public static final int NSTitledWindowMask = 1;
@@ -2652,7 +2653,6 @@ public static final int kCTWritingDirectionRightToLeft = 1;
 public static final int NSAllApplicationsDirectory = 100;
 public static final int NSAllDomainsMask = 65535;
 public static final int NSCachesDirectory = 13;
-public static final int NSNotFound = 2147483647;
 public static final int NSOrderedSame = 0;
 public static final int NSURLCredentialPersistenceForSession = 1;
 public static final int NSURLErrorBadURL = -1000;
@@ -3257,6 +3257,8 @@ public static final NSString NSErrorFailingURLStringKey = new NSString(NSErrorFa
 /** @method flags=const */
 public static final native long /*int*/ NSLocaleLanguageCode();
 public static final NSString NSLocaleLanguageCode = new NSString(NSLocaleLanguageCode());
+/** @method flags=const */
+public static final native long /*int*/ NSNotFound();
 
 /** Functions */
 
@@ -3719,9 +3721,9 @@ public static final native double /*float*/ CTFontGetDescent(long /*int*/ font);
  */
 public static final native double /*float*/ CTFontGetLeading(long /*int*/ font);
 /**
- * @param string cast=(CFAttributedStringRef)
+ * @param attrString cast=(CFAttributedStringRef)
  */
-public static final native long /*int*/ CTLineCreateWithAttributedString(long /*int*/ string);
+public static final native long /*int*/ CTLineCreateWithAttributedString(long /*int*/ attrString);
 /**
  * @param line cast=(CTLineRef)
  * @param context cast=(CGContextRef)