Code cleanup : modernize switch expressions #934
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Comment on lines
1673
to
1674
| NSNumber styleObj = null; | ||
| switch (style) { | ||
| case SWT.UNDERLINE_SINGLE: | ||
| styleObj = NSNumber.numberWithInt(OS.kAXUnderlineStyleSingle); | ||
| break; | ||
| case SWT.UNDERLINE_DOUBLE: | ||
| styleObj = NSNumber.numberWithInt(OS.kAXUnderlineStyleDouble); | ||
| break; | ||
| case SWT.UNDERLINE_SQUIGGLE: | ||
| styleObj = switch (style) { |
There was a problem hiding this comment.
Could those 2 lines be joined?
Comment on lines
1718
to
1720
| int osAlignment = 0; | ||
| // FIXME: Doesn't account for right-to-left text? | ||
| switch (docAttributes.alignment) { | ||
| case SWT.CENTER: | ||
| osAlignment = OS.NSTextAlignmentCenter; | ||
| break; | ||
| case SWT.RIGHT: | ||
| osAlignment = OS.NSTextAlignmentRight; | ||
| break; | ||
| case SWT.LEFT: | ||
| default: | ||
| osAlignment = OS.NSTextAlignmentLeft; | ||
| break; | ||
| } | ||
| osAlignment = switch (docAttributes.alignment) { |
Comment on lines
253
to
263
| newCursor = switch (cursorOrientation) { | ||
| case SWT.UP -> new Cursor(display, SWT.CURSOR_SIZENS); | ||
| case SWT.DOWN -> new Cursor(display, SWT.CURSOR_SIZENS); | ||
| case SWT.LEFT -> new Cursor(display, SWT.CURSOR_SIZEWE); | ||
| case SWT.RIGHT -> new Cursor(display, SWT.CURSOR_SIZEWE); | ||
| case SWT.LEFT | SWT.UP -> new Cursor(display, SWT.CURSOR_SIZENWSE); | ||
| case SWT.RIGHT | SWT.DOWN -> new Cursor(display, SWT.CURSOR_SIZENWSE); | ||
| case SWT.LEFT | SWT.DOWN -> new Cursor(display, SWT.CURSOR_SIZENESW); | ||
| case SWT.RIGHT | SWT.UP -> new Cursor(display, SWT.CURSOR_SIZENESW); | ||
| default -> new Cursor(display, SWT.CURSOR_SIZEALL); | ||
| }; |
There was a problem hiding this comment.
Could be something like
Cursor newCursor = new Cursor(display, switch (cursorOrientation) {
case SWT.UP, SWT.DOWN -> SWT.CURSOR_SIZENS;
case SWT.LEFT, SWT.RIGHT -> SWT.CURSOR_SIZEWE;
case (SWT.LEFT | SWT.UP), (SWT.RIGHT | SWT.DOWN ) -> new Cursor(display, SWT.CURSOR_SIZENWSE);
...
});
Comment on lines
254
to
255
| case NEAREST -> imageData.scaledTo (scaledWidth, scaledHeight); | ||
| default -> imageData.scaledTo (scaledWidth, scaledHeight); |
There was a problem hiding this comment.
default should be sufficient t cover both cases
Comment on lines
2466
to
2467
| case JCS_GRAYSCALE: | ||
| yield 1; |
There was a problem hiding this comment.
Why not case JCS_GRAYSCALE -> 1; ?
There was a problem hiding this comment.
when I applied your changes I was getting this error "mixing of different case semantics is not allowed". I converted all the cases into one single format. Not sure if I did it right. Can you suggest?
There was a problem hiding this comment.
the -> syntax must be used on all fields; it's not allowed to mix case X: ... and case Y -> ...
There was a problem hiding this comment.
I have addressed that way.
Comment on lines
239
to
240
| OutputStream os = null; | ||
| switch (loader.compression) { | ||
| case 0: | ||
| os = new DeflaterOutputStream(baos, new Deflater(NO_COMPRESSION)); | ||
| break; | ||
| case 1: | ||
| os = new DeflaterOutputStream(baos, new Deflater(BEST_SPEED)); | ||
| break; | ||
| case 3: | ||
| os = new DeflaterOutputStream(baos, new Deflater(BEST_COMPRESSION)); | ||
| break; | ||
| default: | ||
| os = new DeflaterOutputStream(baos, new Deflater(DEFAULT_COMPRESSION)); | ||
| break; | ||
| } | ||
| os = switch (loader.compression) { |
There was a problem hiding this comment.
Those lines could be joined,
There was a problem hiding this comment.
Or even better
OutputStream os = new DeflaterOutputStream(baos, switch (loader.compression) {
case 0 -> NO_COMPRESSION;
case 1 -> BEST_SPEED;
case 3 -> BEST_COMPRESSION;
default -> DEFAULT_COMPRESSION;
}There was a problem hiding this comment.
addressed the changes.
|
Thank you! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Code cleanup : modernize switch expressions