Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

8274496: Use String.contains() instead of String.indexOf() in java.desktop #5565

Conversation

turbanoff
Copy link
Member

@turbanoff turbanoff commented Sep 17, 2021

String.contains was introduced in Java 5.
Some code in java.desktop still uses old approach with String.indexOf to check if String contains specified substring.
I propose to migrate such usages. Makes code shorter and easier to read.


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change must be properly reviewed

Issue

  • JDK-8274496: Use String.contains() instead of String.indexOf() in java.desktop

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk pull/5565/head:pull/5565
$ git checkout pull/5565

Update a local copy of the PR:
$ git checkout pull/5565
$ git pull https://git.openjdk.java.net/jdk pull/5565/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 5565

View PR using the GUI difftool:
$ git pr show -t 5565

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk/pull/5565.diff

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Sep 17, 2021

👋 Welcome back turbanoff! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

@openjdk
Copy link

@openjdk openjdk bot commented Sep 17, 2021

@turbanoff The following label will be automatically applied to this pull request:

  • client

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing list. If you would like to change these labels, use the /label pull request command.

@openjdk openjdk bot added the client label Sep 17, 2021
@mrserb
Copy link
Member

@mrserb mrserb commented Sep 29, 2021

Looks fine.

@turbanoff turbanoff changed the title [PATCH] Use String.contains() instead of String.indexOf() in java.desktop 8274496: Use String.contains() instead of String.indexOf() in java.desktop Sep 29, 2021
@openjdk openjdk bot added the rfr label Sep 29, 2021
@mlbridge
Copy link

@mlbridge mlbridge bot commented Sep 29, 2021

Webrevs

Copy link

@pankaj-bansal pankaj-bansal left a comment

looks good to me

@openjdk
Copy link

@openjdk openjdk bot commented Sep 29, 2021

@turbanoff This change now passes all automated pre-integration checks.

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

After integration, the commit message for the final commit will be:

8274496: Use String.contains() instead of String.indexOf() in java.desktop

Reviewed-by: pbansal, serb

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been 229 new commits pushed to the master branch:

  • 2faced0: 8274738: ZGC: Use relaxed atomic load when reading bits in the live map
  • 8a4d2b4: 8274680: Remove unnecessary conversion to String in java.desktop
  • 986ee5d: 8274670: Improve version string handling in SA
  • df7b0c7: 8274715: Implement forEach in Collections.CopiesList
  • d4e8712: 8274797: ProblemList resourcehogs/serviceability/sa/TestHeapDumpForLargeArray.java on macosx-x64
  • 4726267: 8274642: jdk/jshell/CommandCompletionTest.java fails with NoSuchElementException after JDK-8271287
  • 83b2219: 8273612: Fix for JDK-8272873 causes timeout in running some tests with -Xcomp
  • d34ec6c: 8274793: Suppress warnings on non-serializable non-transient instance fields in sun.net
  • 332f067: 8274729: Define Position.NOPOS == Diagnostic.NOPOS
  • 1e75203: 8274656: Remove default_checksum and safe_checksum_type from krb5.conf
  • ... and 219 more: https://git.openjdk.java.net/jdk/compare/2f8c2211c8c7f9661e283c8df914fde5bda197a6...master

As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change. Possible candidates are the reviewers of this PR (@pankaj-bansal, @mrserb) but any other Committer may sponsor as well.

➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).

@openjdk openjdk bot added the ready label Sep 29, 2021
mrserb
mrserb approved these changes Sep 29, 2021
@turbanoff
Copy link
Member Author

@turbanoff turbanoff commented Oct 6, 2021

/integrate

@openjdk openjdk bot added the sponsor label Oct 6, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Oct 6, 2021

@turbanoff
Your change (at version a0278d5) is now ready to be sponsored by a Committer.

@pankaj-bansal
Copy link

@pankaj-bansal pankaj-bansal commented Oct 6, 2021

/sponsor

@openjdk
Copy link

@openjdk openjdk bot commented Oct 6, 2021

Going to push as commit 9759fcb.
Since your change was applied there have been 232 commits pushed to the master branch:

  • cdf8930: 8274625: Search field placeholder behavior
  • df125f6: 8273410: IR verification framework fails with "Should find method name in validIrRulesMap"
  • c74726d: 8274730: AArch64: AES/GCM acceleration is broken by the fix for JDK-8273297
  • 2faced0: 8274738: ZGC: Use relaxed atomic load when reading bits in the live map
  • 8a4d2b4: 8274680: Remove unnecessary conversion to String in java.desktop
  • 986ee5d: 8274670: Improve version string handling in SA
  • df7b0c7: 8274715: Implement forEach in Collections.CopiesList
  • d4e8712: 8274797: ProblemList resourcehogs/serviceability/sa/TestHeapDumpForLargeArray.java on macosx-x64
  • 4726267: 8274642: jdk/jshell/CommandCompletionTest.java fails with NoSuchElementException after JDK-8271287
  • 83b2219: 8273612: Fix for JDK-8272873 causes timeout in running some tests with -Xcomp
  • ... and 222 more: https://git.openjdk.java.net/jdk/compare/2f8c2211c8c7f9661e283c8df914fde5bda197a6...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot closed this Oct 6, 2021
@openjdk openjdk bot added integrated and removed ready rfr sponsor labels Oct 6, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Oct 6, 2021

@pankaj-bansal @turbanoff Pushed as commit 9759fcb.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

@turbanoff turbanoff deleted the use_String.contains_instead_of_String.indexOf_in_java.desktop branch Feb 21, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
client integrated
3 participants