Use SWT constant and make the code more readable.

deepika-u · deepika-u · commit ed5c94cd92b2 · 2025-01-23T15:40:05.000+05:30
diff --git a/bundles/org.eclipse.swt.tools.spies/src/org/eclipse/swt/tools/views/SpyView.java b/bundles/org.eclipse.swt.tools.spies/src/org/eclipse/swt/tools/views/SpyView.java
@@ -139,7 +139,7 @@ String getName(Object object) {
 		if (object == null) return "null";
 		String name = object.toString ();
 		if (fullyQualifiedAction.isChecked()) {
-			int index = name.indexOf(' ');
+			int index = name.indexOf(SWT.SPACE);
 			if (index >= 0 && name.length() >= 1) {
 				name = object.getClass ().getName () + name.substring(index);
 			}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/StyledText.java b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/StyledText.java
@@ -5295,7 +5295,7 @@ int insertBlockSelectionText(String text, boolean fillWithSpaces) {
 				int numSpaces = maxLength - length;
 				StringBuilder buffer = new StringBuilder(length + numSpaces);
 				buffer.append(line);
-				for (int j = 0; j < numSpaces; j++) buffer.append(' ');
+				for (int j = 0; j < numSpaces; j++) buffer.append(SWT.SPACE);
 				lines[i] = buffer.toString();
 			}
 		}
@@ -8104,7 +8104,7 @@ int sendTextEvent(int left, int right, int lineIndex, String text, boolean fillW
 		int spacesWidth = left - lineWidth + horizontalScrollOffset - leftMargin;
 		int spacesCount = spacesWidth / renderer.averageCharWidth;
 		for (int i = 0; i < spacesCount; i++) {
-			buffer.append(' ');
+			buffer.append(SWT.SPACE);
 		}
 	}
 	buffer.append(text);
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/StyledTextRenderer.java b/bundles/org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom/StyledTextRenderer.java
@@ -1256,7 +1256,7 @@ TextLayout getTextLayout(int lineIndex, int orientation, int width, int lineSpac
 				if (style.metrics != null && line.substring(start, endIndex).contains("\t")) {
 					line =
 						line.substring(0, start) +
-						line.substring(start, endIndex).replace('\t', ' ') +
+						line.substring(start, endIndex).replace('\t', SWT.SPACE) +
 						(end < line.length() ? line.substring(end + 1, line.length()) : "");
 				}
 				styleEntries.add(new StyleEntry(style, start, end));
@@ -1494,7 +1494,7 @@ void setFont(Font font, int tabs) {
 	layout.setFont(regularFont);
 	StringBuilder tabBuffer = new StringBuilder(tabs);
 	for (int i = 0; i < tabs; i++) {
-		tabBuffer.append(' ');
+		tabBuffer.append(SWT.SPACE);
 	}
 	layout.setText(tabBuffer.toString());
 	tabWidth = layout.getBounds().width;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/common/org/eclipse/swt/dnd/DropTargetEvent.java b/bundles/org.eclipse.swt/Eclipse SWT Drag and Drop/common/org/eclipse/swt/dnd/DropTargetEvent.java
@@ -139,7 +139,7 @@ public String toString() {
 	sb.append(" dataTypes={ ");
 	if (dataTypes != null) {
 		for (TransferData dataType : dataTypes) {
-			sb.append(dataType.type); sb.append(' ');
+			sb.append(dataType.type); sb.append(SWT.SPACE);
 		}
 	}
 	sb.append('}');
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/TextLayout.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/graphics/TextLayout.java
@@ -2438,7 +2438,7 @@ public void setDefaultTabWidth(int tabLength) {
 	String oldString = getText();
 	StringBuilder tabBuffer = new StringBuilder(tabLength);
 	for (int i = 0; i < tabLength; i++) {
-		tabBuffer.append(' ');
+		tabBuffer.append(SWT.SPACE);
 	}
 	setText(tabBuffer.toString());
 	ignoreSegments = true;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/DateTime.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/DateTime.java
@@ -1353,7 +1353,7 @@ void selectField(FieldPosition fieldPosition) {
 	display.syncExec(() -> {
 		if (textEntryHandle != 0) {
 			String value = getText(getText(), start, end - 1);
-			int s = value.lastIndexOf(' ');
+			int s = value.lastIndexOf(SWT.SPACE);
 			s = (s == -1) ? start : start + s + 1;
 			setTextSelection(s, end);
 		}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Shell.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Shell.java
@@ -2890,7 +2890,7 @@ public void setText (String string) {
 	int length = string.length ();
 	char [] chars = new char [Math.max (6, length) + 1];
 	string.getChars (0, length , chars, 0);
-	for (int i=length; i<chars.length; i++)  chars [i] = ' ';
+	for (int i=length; i<chars.length; i++)  chars [i] = SWT.SPACE;
 	byte [] buffer = Converter.wcsToMbcs (chars, true);
 	GTK.gtk_window_set_title (shellHandle, buffer);
 }
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Widget.java b/bundles/org.eclipse.swt/Eclipse SWT/gtk/org/eclipse/swt/widgets/Widget.java
@@ -1226,7 +1226,7 @@ boolean filters (int eventType) {
 				 */
 			case '(':
 				if (removeAppended && i + 4 == string.length () && text [i + 1] == '&' && text [i + 3] == ')') {
-					if (replace) result [j++] = ' ';
+					if (replace) result [j++] = SWT.SPACE;
 					i += 4;
 					break; // break switch case only if we are removing the mnemonic
 				}
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/GC.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/GC.java
@@ -2578,7 +2578,7 @@ void drawTextGDIP(long gdipGraphics, String string, int x, int y, int flags, boo
 		buffer = string.toCharArray();
 	} else {
 		if (draw) return;
-		buffer = new char[]{' '};
+		buffer = new char[]{SWT.SPACE};
 	}
 	PointF pt = new PointF();
 	long format = Gdip.StringFormat_Clone(Gdip.StringFormat_GenericTypographic());
@@ -4026,7 +4026,7 @@ public boolean isDisposed() {
 float measureSpace(long font, long format) {
 	PointF pt = new PointF();
 	RectF bounds = new RectF();
-	Gdip.Graphics_MeasureString(data.gdipGraphics, new char[]{' '}, 1, font, pt, format, bounds);
+	Gdip.Graphics_MeasureString(data.gdipGraphics, new char[]{SWT.SPACE}, 1, font, pt, format, bounds);
 	return bounds.Width;
 }
 
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/TextLayout.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/graphics/TextLayout.java
@@ -2896,7 +2896,7 @@ StyleItem[] itemize () {
 		for (int i = 0, latestNeutralIndex = -2, latestUnicodeIndex = -2; i < length; i++) {
 			char c = chars[i];
 
-			if (c >= ' ' && c <= '~' && !Character.isAlphabetic(c)) {
+			if (c >= SWT.SPACE && c <= '~' && !Character.isAlphabetic(c)) {
 				latestNeutralIndex = i;
 			} else if (c > 255) {
 				latestUnicodeIndex = i;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Control.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Control.java
@@ -5562,7 +5562,7 @@ LRESULT WM_SYSCOMMAND (long wParam, long lParam) {
 				* the keystroke.
 				*/
 				if (hooks (SWT.KeyDown) || hooks (SWT.KeyUp)) {
-					if (lParam != ' ') {
+					if (lParam != SWT.SPACE) {
 						Decorations shell = menuShell ();
 						Menu menu = shell.getMenuBar ();
 						if (menu != null) {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Table.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Table.java
@@ -4853,7 +4853,7 @@ boolean setScrollWidth (TableItem item, boolean force) {
 		* space.
 		*/
 		if (newWidth == 0) {
-			char [] buffer = {' ', '\0'};
+			char [] buffer = {SWT.SPACE, '\0'};
 			newWidth = Math.max (newWidth, (int)OS.SendMessage (handle, OS.LVM_GETSTRINGWIDTH, 0, buffer));
 		}
 		long hStateList = OS.SendMessage (handle, OS.LVM_GETIMAGELIST, OS.LVSIL_STATE, 0);
@@ -5817,7 +5817,7 @@ LRESULT WM_CHAR (long wParam, long lParam) {
 	LRESULT result = super.WM_CHAR (wParam, lParam);
 	if (result != null) return result;
 	switch ((int)wParam) {
-		case ' ':
+		case SWT.SPACE:
 			if ((style & SWT.CHECK) != 0) {
 				int index = -1;
 				while ((index = (int)OS.SendMessage (handle, OS.LVM_GETNEXTITEM, index, OS.LVNI_SELECTED)) != -1) {
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ToolBar.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/ToolBar.java
@@ -1373,7 +1373,7 @@ LRESULT WM_CHAR (long wParam, long lParam) {
 	LRESULT result = super.WM_CHAR (wParam, lParam);
 	if (result != null) return result;
 	switch ((int)wParam) {
-		case ' ':
+		case SWT.SPACE:
 			int index = (int)OS.SendMessage (handle, OS.TB_GETHOTITEM, 0, 0);
 			if (index != -1) {
 				TBBUTTON lpButton = new TBBUTTON ();
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Tree.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Tree.java
@@ -6164,7 +6164,7 @@ LRESULT WM_CHAR (long wParam, long lParam) {
 	* proc in these cases.
 	*/
 	switch ((int)wParam) {
-		case ' ': {
+		case SWT.SPACE: {
 			long hItem = OS.SendMessage (handle, OS.TVM_GETNEXTITEM, OS.TVGN_CARET, 0);
 			if (hItem != 0) {
 				hAnchor = hItem;
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Widget.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Widget.java
@@ -525,12 +525,12 @@ Widget findItem (long id) {
 	while (i < buffer.length) {
 		if (buffer [i] == '&') {
 			if (i + 1 < buffer.length && buffer [i + 1] == '&') {
-				buffer [j++] = spaces ? ' ' : buffer [i];
+				buffer [j++] = spaces ? SWT.SPACE : buffer [i];
 				i++;
 			}
 			i++;
 		} else if (buffer [i] == '(' && removeAppended && i + 4 == string.length () && buffer [i + 1] == '&' && buffer [i + 3] == ')') {
-			if (spaces) buffer [j++] = ' ';
+			if (spaces) buffer [j++] = SWT.SPACE;
 			i += 4;
 		} else {
 			buffer [j++] = buffer [i++];
diff --git a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/accessibility/CTable.java b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/accessibility/CTable.java
@@ -2626,7 +2626,7 @@ void onKeyDown (Event event) {
 			onEnd (event.stateMask);
 			return;
 	}
-	if (event.character == ' ') {
+	if (event.character == SWT.SPACE) {
 		onSpace ();
 		return;
 	}
diff --git a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/dnd/DNDExample.java b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/dnd/DNDExample.java
@@ -421,7 +421,7 @@ public void dragStart(org.eclipse.swt.dnd.DragSourceEvent event) {
 			if (dragDataText != null) {
 				dragDataRTF = "{\\rtf1{\\colortbl;\\red255\\green0\\blue0;}\\cf1\\b "+dragDataText+"}";
 				dragDataHTML = "<b>"+dragDataText+"</b>";
-				dragDataURL = "http://" + dragDataText.replace(' ', '.');
+				dragDataURL = "http://" + dragDataText.replace(SWT.SPACE, '.');
 				try {
 					new URL(dragDataURL);
 				} catch (MalformedURLException e) {
diff --git a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/imageanalyzer/ImageAnalyzer.java b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/imageanalyzer/ImageAnalyzer.java
@@ -2015,12 +2015,12 @@ String dataHexDump(String lineDelimiter) {
 					dump[index++] = Character.forDigit(line / 10 % 10, 10);
 					dump[index++] = Character.forDigit(line % 10, 10);
 					dump[index++] = ':';
-					dump[index++] = ' ';
+					dump[index++] = SWT.SPACE;
 				}
 				byte b = imageData.data[i];
 				dump[index++] = Character.forDigit((b & 0xF0) >> 4, 16);
 				dump[index++] = Character.forDigit(b & 0x0F, 16);
-				dump[index++] = ' ';
+				dump[index++] = SWT.SPACE;
 				if ((i + 1) % imageData.bytesPerLine == 0) {
 					dump[index++] = lineDelimiter.charAt(0);
 					if (lineDelimiter.length() > 1) {
@@ -2047,12 +2047,12 @@ String dataHexDump(String lineDelimiter) {
 						dump[index++] = Character.forDigit(line / 10 % 10, 10);
 						dump[index++] = Character.forDigit(line % 10, 10);
 						dump[index++] = ':';
-						dump[index++] = ' ';
+						dump[index++] = SWT.SPACE;
 					}
 					byte b = alphas[i];
 					dump[index++] = Character.forDigit((b & 0xF0) >> 4, 16);
 					dump[index++] = Character.forDigit(b & 0x0F, 16);
-					dump[index++] = ' ';
+					dump[index++] = SWT.SPACE;
 					if ((i + 1) % imageData.width == 0) {
 						dump[index++] = lineDelimiter.charAt(0);
 						if (lineDelimiter.length() > 1) {
diff --git a/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/layoutexample/FormLayoutTab.java b/examples/org.eclipse.swt.examples/src/org/eclipse/swt/examples/layoutexample/FormLayoutTab.java
@@ -661,7 +661,7 @@ public String open () {
 					oldPos = oldAttach.substring (0, oldAttach.indexOf (','));
 					oldOffset = oldAttach.substring (oldAttach.indexOf (',') + 1);
 					if (oldOffset.endsWith (")")) { // i.e. (Default)
-						oldOffset = oldOffset.substring (0, oldOffset.indexOf (' '));
+						oldOffset = oldOffset.substring (0, oldOffset.indexOf (SWT.SPACE));
 					}
 				}
 			}

Original file line number	Diff line number	Diff line change
`@@ -139,7 +139,7 @@ String getName(Object object) {`
`139`	`139`	`if (object == null) return "null";`
`140`	`140`	`String name = object.toString ();`
`141`	`141`	`if (fullyQualifiedAction.isChecked()) {`
`142`		`- int index = name.indexOf(' ');`
	`142`	`+ int index = name.indexOf(SWT.SPACE);`
`143`	`143`	`if (index >= 0 && name.length() >= 1) {`
`144`	`144`	`name = object.getClass ().getName () + name.substring(index);`
`145`	`145`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5295,7 +5295,7 @@ int insertBlockSelectionText(String text, boolean fillWithSpaces) {`
`5295`	`5295`	`int numSpaces = maxLength - length;`
`5296`	`5296`	`StringBuilder buffer = new StringBuilder(length + numSpaces);`
`5297`	`5297`	`buffer.append(line);`
`5298`		`- for (int j = 0; j < numSpaces; j++) buffer.append(' ');`
	`5298`	`+ for (int j = 0; j < numSpaces; j++) buffer.append(SWT.SPACE);`
`5299`	`5299`	`lines[i] = buffer.toString();`
`5300`	`5300`	`}`
`5301`	`5301`	`}`
`@@ -8104,7 +8104,7 @@ int sendTextEvent(int left, int right, int lineIndex, String text, boolean fillW`
`8104`	`8104`	`int spacesWidth = left - lineWidth + horizontalScrollOffset - leftMargin;`
`8105`	`8105`	`int spacesCount = spacesWidth / renderer.averageCharWidth;`
`8106`	`8106`	`for (int i = 0; i < spacesCount; i++) {`
`8107`		`- buffer.append(' ');`
	`8107`	`+ buffer.append(SWT.SPACE);`
`8108`	`8108`	`}`
`8109`	`8109`	`}`
`8110`	`8110`	`buffer.append(text);`
Original file line number	Diff line number	Diff line change
`@@ -139,7 +139,7 @@ public String toString() {`
`139`	`139`	`sb.append(" dataTypes={ ");`
`140`	`140`	`if (dataTypes != null) {`
`141`	`141`	`for (TransferData dataType : dataTypes) {`
`142`		`- sb.append(dataType.type); sb.append(' ');`
	`142`	`+ sb.append(dataType.type); sb.append(SWT.SPACE);`
`143`	`143`	`}`
`144`	`144`	`}`
`145`	`145`	`sb.append('}');`
Original file line number	Diff line number	Diff line change
`@@ -2438,7 +2438,7 @@ public void setDefaultTabWidth(int tabLength) {`
`2438`	`2438`	`String oldString = getText();`
`2439`	`2439`	`StringBuilder tabBuffer = new StringBuilder(tabLength);`
`2440`	`2440`	`for (int i = 0; i < tabLength; i++) {`
`2441`		`- tabBuffer.append(' ');`
	`2441`	`+ tabBuffer.append(SWT.SPACE);`
`2442`	`2442`	`}`
`2443`	`2443`	`setText(tabBuffer.toString());`
`2444`	`2444`	`ignoreSegments = true;`
Original file line number	Diff line number	Diff line change
`@@ -1353,7 +1353,7 @@ void selectField(FieldPosition fieldPosition) {`
`1353`	`1353`	`display.syncExec(() -> {`
`1354`	`1354`	`if (textEntryHandle != 0) {`
`1355`	`1355`	`String value = getText(getText(), start, end - 1);`
`1356`		`- int s = value.lastIndexOf(' ');`
	`1356`	`+ int s = value.lastIndexOf(SWT.SPACE);`
`1357`	`1357`	`s = (s == -1) ? start : start + s + 1;`
`1358`	`1358`	`setTextSelection(s, end);`
`1359`	`1359`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2890,7 +2890,7 @@ public void setText (String string) {`
`2890`	`2890`	`int length = string.length ();`
`2891`	`2891`	`char [] chars = new char [Math.max (6, length) + 1];`
`2892`	`2892`	`string.getChars (0, length , chars, 0);`
`2893`		`- for (int i=length; i<chars.length; i++) chars [i] = ' ';`
	`2893`	`+ for (int i=length; i<chars.length; i++) chars [i] = SWT.SPACE;`
`2894`	`2894`	`byte [] buffer = Converter.wcsToMbcs (chars, true);`
`2895`	`2895`	`GTK.gtk_window_set_title (shellHandle, buffer);`
`2896`	`2896`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1226,7 +1226,7 @@ boolean filters (int eventType) {`
`1226`	`1226`	`*/`
`1227`	`1227`	`case '(':`
`1228`	`1228`	`if (removeAppended && i + 4 == string.length () && text [i + 1] == '&' && text [i + 3] == ')') {`
`1229`		`- if (replace) result [j++] = ' ';`
	`1229`	`+ if (replace) result [j++] = SWT.SPACE;`
`1230`	`1230`	`i += 4;`
`1231`	`1231`	`break; // break switch case only if we are removing the mnemonic`
`1232`	`1232`	`}`