Comments Fixes

Author: ShahzaibIbrahim

bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/FontData.java

@@ -200,10 +200,13 @@ public FontData(String string) {
 public FontData(FontData fontData) {
 	if (fontData == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
 
-	setName(fontData.name);
-	setHeight(fontData.height);
-	setStyle(fontData.style);
+	this.name = fontData.name;
+	this.height = fontData.height;
+	this.style = fontData.style;
 	this.nsName = fontData.nsName;
+	this.lang = fontData.lang;
+	this.country = fontData.country;
+	this.variant = fontData.variant;
 }
 
 /**

bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/graphics/FontData.java

@@ -198,9 +198,17 @@ public FontData(String string) {
 public FontData(FontData fontData) {
 	if (fontData == null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
 
-	setName(fontData.name);
-	setHeight(fontData.height);
-	setStyle(fontData.style);
+	this.name = fontData.name;
+	this.height = fontData.height;
+	this.style = fontData.style;
+	this.lang = fontData.lang;
+	this.country = fontData.country;
+	this.variant = fontData.variant;
+
+	if (fontData.string != null) {
+		this.string = new byte[fontData.string.length];
+		System.arraycopy(fontData.string , 0, this.string, 0, fontData.string.length);
+	}
 }
 
 /**

bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/FontData.java

@@ -256,33 +256,37 @@ public FontData(FontData fontData) {
 	if (fontData == null)
 		SWT.error(SWT.ERROR_NULL_ARGUMENT);
 
-	if (fontData.data != null) {
-		LOGFONT newData = new LOGFONT();
-		setHeight(fontData.getHeightF());
-		newData.lfHeight = fontData.data.lfHeight;
-		newData.lfWidth = fontData.data.lfWidth;
-		newData.lfEscapement = fontData.data.lfEscapement;
-		newData.lfOrientation = fontData.data.lfOrientation;
-		newData.lfWeight = fontData.data.lfWeight;
-		newData.lfItalic = fontData.data.lfItalic;
-		newData.lfUnderline = fontData.data.lfUnderline;
-		newData.lfStrikeOut = fontData.data.lfStrikeOut;
-		newData.lfCharSet = fontData.data.lfCharSet;
-		newData.lfOutPrecision = fontData.data.lfOutPrecision;
-		newData.lfClipPrecision = fontData.data.lfClipPrecision;
-		newData.lfQuality = fontData.data.lfQuality;
-		newData.lfPitchAndFamily = fontData.data.lfPitchAndFamily;
-
-		// Deep copy of the char array lfFaceName
-		if (fontData.data.lfFaceName != null) {
-			newData.lfFaceName = new char[fontData.data.lfFaceName.length];
-			System.arraycopy(fontData.data.lfFaceName, 0, newData.lfFaceName, 0, fontData.data.lfFaceName.length);
-		}
+	this.height = fontData.height;
+	this.lang = fontData.lang;
+	this.country = fontData.country;
+	this.variant = fontData.variant;
+	this.data = cloneLogFont(fontData);
+}
 
-		this.data = newData;
-	} else {
-		this.data = null;
+private static LOGFONT cloneLogFont(FontData fontData) {
+	if(fontData.data == null) return null;
+
+	LOGFONT newData = new LOGFONT();
+	newData.lfHeight = fontData.data.lfHeight;
+	newData.lfWidth = fontData.data.lfWidth;
+	newData.lfEscapement = fontData.data.lfEscapement;
+	newData.lfOrientation = fontData.data.lfOrientation;
+	newData.lfWeight = fontData.data.lfWeight;
+	newData.lfItalic = fontData.data.lfItalic;
+	newData.lfUnderline = fontData.data.lfUnderline;
+	newData.lfStrikeOut = fontData.data.lfStrikeOut;
+	newData.lfCharSet = fontData.data.lfCharSet;
+	newData.lfOutPrecision = fontData.data.lfOutPrecision;
+	newData.lfClipPrecision = fontData.data.lfClipPrecision;
+	newData.lfQuality = fontData.data.lfQuality;
+	newData.lfPitchAndFamily = fontData.data.lfPitchAndFamily;
+
+	// Deep copy of the char array lfFaceName
+	if (fontData.data.lfFaceName != null) {
+		newData.lfFaceName = new char[fontData.data.lfFaceName.length];
+		System.arraycopy(fontData.data.lfFaceName, 0, newData.lfFaceName, 0, fontData.data.lfFaceName.length);
 	}
+	return newData;
 }