Bug 507235: Clean up of Converter.java

- Remove redundant codePage parameter from Converter.java. It is not
being used by the function body. (It was last used 15 years ago in:
5fbe5d6518706b4f002ddbbebf7e1f63d1877af8)

- Remove unused defaultCodePage() method from codebase.

- Move wcsToMbcs and mbcsToWcs for single characters from Display.java
into Converter.java class, next to their siblings. Display.java should
not be responsible for platform level type conversion.

- Document functions to explain their necessity.

Change-Id: Ie19b76259247d4d200c679852b8165e465f4e53b
Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=507235
Signed-off-by: Leo Ufimtsev <lufimtse@redhat.com>
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>

2 files changed, 7 insertions, 7 deletions

diff --git a/bundles/org.eclipse.swt/Eclipse SWT Accessibility/gtk/org/eclipse/swt/accessibility/AccessibleFactory.java b/bundles/org.eclipse.swt/Eclipse SWT Accessibility/gtk/org/eclipse/swt/accessibility/AccessibleFactory.java
index da32e2995c..f2ec52e31d 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Accessibility/gtk/org/eclipse/swt/accessibility/AccessibleFactory.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Accessibility/gtk/org/eclipse/swt/accessibility/AccessibleFactory.java
@@ -306,7 +306,7 @@ class AccessibleFactory {
 		int widgetTypeNameLength = OS.strlen (typeName);
 		byte[] buffer = new byte [widgetTypeNameLength];
 		OS.memmove (buffer, typeName, widgetTypeNameLength);
-		return new String(Converter.mbcsToWcs(null, buffer));
+		return new String(Converter.mbcsToWcs(buffer));
 	}
 
 	static long /*int*/ getParentType (long /*int*/ widgetType) {
@@ -417,7 +417,7 @@ class AccessibleFactory {
 		if (text) swtTypeName += "Text"; //$NON-NLS-1$
 		if (value) swtTypeName += "Value"; //$NON-NLS-1$
 
-		byte[] nameBytes = Converter.wcsToMbcs(null, swtTypeName, true);
+		byte[] nameBytes = Converter.wcsToMbcs(swtTypeName, true);
 		long /*int*/ type = OS.g_type_from_name(nameBytes);
 		if (type == 0) {
 			if (AccessibleObject.DEBUG) AccessibleObject.print("-->New Type=" + swtTypeName); //$NON-NLS-1$
@@ -605,7 +605,7 @@ class AccessibleFactory {
 		/* If NO_OP factory is registered then OS accessibility is not active */
 		if (ATK.ATK_IS_NO_OP_OBJECT_FACTORY(factory)) return;
 		String name = FACTORY_TYPENAME + getTypeName(widgetType);
-		byte[] factoryName = Converter.wcsToMbcs(null, name, true);
+		byte[] factoryName = Converter.wcsToMbcs(name, true);
 		if (OS.g_type_from_name (factoryName) == 0) {
 			if (AccessibleObject.DEBUG) AccessibleObject.print("-->New Factory=" + name); //$NON-NLS-1$
 			/* register the factory */
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Accessibility/gtk/org/eclipse/swt/accessibility/AccessibleObject.java b/bundles/org.eclipse.swt/Eclipse SWT Accessibility/gtk/org/eclipse/swt/accessibility/AccessibleObject.java
index acb6554730..9778b0d492 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT Accessibility/gtk/org/eclipse/swt/accessibility/AccessibleObject.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT Accessibility/gtk/org/eclipse/swt/accessibility/AccessibleObject.java
@@ -47,7 +47,7 @@ class AccessibleObject {
 		if (OS.GTK_VERSION >= OS.VERSION(3, 2, 0)) {
 			ROW_ROLE = ATK.ATK_ROLE_TABLE_ROW;
 		} else {
-			ROW_ROLE = ATK.atk_role_register(Converter.wcsToMbcs(null, "row", true)); //$NON-NLS-1$
+			ROW_ROLE = ATK.atk_role_register(Converter.wcsToMbcs("row", true)); //$NON-NLS-1$
 		}
 	}
 
@@ -474,7 +474,7 @@ class AccessibleObject {
 								if (value.equals("true") || value.equals("1") || value.equals("single")) style.strikeout = true;
 							} else if (name.equals(getString(ATK.atk_text_attribute_get_name(ATK.ATK_TEXT_ATTR_FAMILY_NAME)))) {
 								// font family name
-								byte [] buffer = Converter.wcsToMbcs(null, value, true);
+								byte [] buffer = Converter.wcsToMbcs(value, true);
 								OS.pango_font_description_set_family(fontDesc, buffer);
 								createFont = true;
 							} else if (name.equals(getString(ATK.atk_text_attribute_get_name(ATK.ATK_TEXT_ATTR_SIZE)))) {
@@ -2052,11 +2052,11 @@ class AccessibleObject {
 		int length = OS.strlen (strPtr);
 		byte [] buffer = new byte [length];
 		OS.memmove (buffer, strPtr, length);
-		return new String (Converter.mbcsToWcs (null, buffer));
+		return new String (Converter.mbcsToWcs (buffer));
 	}
 
 	static long /*int*/ getStringPtr (String str) {
-		byte [] buffer = Converter.wcsToMbcs(null, str != null ? str : "", true);
+		byte [] buffer = Converter.wcsToMbcs(str != null ? str : "", true);
 		long /*int*/ ptr = OS.g_malloc(buffer.length);
 		OS.memmove(ptr, buffer, buffer.length);
 		return ptr;