Skip to content

Commit

Permalink
8263530: sun.awt.X11.ListHelper.removeAll() should use clear()
Browse files Browse the repository at this point in the history 
Reviewed-by: serb, kizune
  • Loading branch information
@shipilev
shipilev committed Mar 15, 2021
1 parent 32c7fcc commit 7b4aefe
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/java.desktop/unix/classes/sun/awt/X11/ListHelper.java
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2003, 2018, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2003, 2021, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
Expand Down Expand Up @@ -147,7 +147,7 @@ void remove(int index) {
}

void removeAll() {
items.removeAll(items);
items.clear();
updateScrollbars();
}

Expand Down

3 comments on commit 7b4aefe

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Review

Issues

@SoniaZaldana
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/backport jdk11u-dev

@openjdk
Copy link

@openjdk openjdk bot commented on 7b4aefe Oct 24, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@SoniaZaldana Could not automatically backport 7b4aefe9 to openjdk/jdk11u-dev due to conflicts in the following files:

  • src/java.desktop/unix/classes/sun/awt/X11/ListHelper.java

Please fetch the appropriate branch/commit and manually resolve these conflicts by using the following commands in your personal fork of openjdk/jdk11u-dev. Note: these commands are just some suggestions and you can use other equivalent commands you know.

# Fetch the up-to-date version of the target branch
$ git fetch --no-tags https://git.openjdk.org/jdk11u-dev.git master:master

# Check out the target branch and create your own branch to backport
$ git checkout master
$ git checkout -b SoniaZaldana-backport-7b4aefe9

# Fetch the commit you want to backport
$ git fetch --no-tags https://git.openjdk.org/jdk.git 7b4aefe9e1e5bcd370de1bf510a1ed97e57a65bb

# Backport the commit
$ git cherry-pick --no-commit 7b4aefe9e1e5bcd370de1bf510a1ed97e57a65bb
# Resolve conflicts now

# Commit the files you have modified
$ git add files/with/resolved/conflicts
$ git commit -m 'Backport 7b4aefe9e1e5bcd370de1bf510a1ed97e57a65bb'

Once you have resolved the conflicts as explained above continue with creating a pull request towards the openjdk/jdk11u-dev with the title Backport 7b4aefe9e1e5bcd370de1bf510a1ed97e57a65bb.

Please sign in to comment.