From 19a0151a529ca69b3bef1ca821d9292018efbb7c Mon Sep 17 00:00:00 2001
From: Raffaello Giulietti <rgiulietti@openjdk.org>
Date: Mon, 25 Mar 2024 08:47:14 +0000
Subject: [PATCH] 8328700: Unused import and variable should be deleted in
 regex package

Reviewed-by: redestad, rriggs, bpb, naoto, iris
---
 .../share/classes/java/util/regex/CharPredicates.java  |  3 +--
 .../share/classes/java/util/regex/Pattern.java         | 10 +++++-----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/java.base/share/classes/java/util/regex/CharPredicates.java b/src/java.base/share/classes/java/util/regex/CharPredicates.java
index e7b2714d8cf..99943fc34e6 100644
--- a/src/java.base/share/classes/java/util/regex/CharPredicates.java
+++ b/src/java.base/share/classes/java/util/regex/CharPredicates.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011, 2024, 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
@@ -25,7 +25,6 @@
 
 package java.util.regex;
 
-import java.util.HashMap;
 import java.util.Locale;
 import java.util.regex.Pattern.CharPredicate;
 import java.util.regex.Pattern.BmpCharPredicate;
diff --git a/src/java.base/share/classes/java/util/regex/Pattern.java b/src/java.base/share/classes/java/util/regex/Pattern.java
index d5390d2b4aa..1c2fd151b8d 100644
--- a/src/java.base/share/classes/java/util/regex/Pattern.java
+++ b/src/java.base/share/classes/java/util/regex/Pattern.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2024, 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
@@ -3272,10 +3272,10 @@ loop:   for(int x=0, offset=0; x<nCodePoints; x++, offset+=len) {
             if (head.study(info)) { // Deterministic
                 GroupTail temp = (GroupTail) tail;
                 head = root = new GroupCurly(head.next, curly.cmin,
-                                   curly.cmax, curly.type,
-                                   ((GroupTail)tail).localIndex,
-                                   ((GroupTail)tail).groupIndex,
-                                             capturingGroup);
+                        curly.cmax, curly.type,
+                        temp.localIndex,
+                        temp.groupIndex,
+                        capturingGroup);
                 return head;
             } else { // Non-deterministic
                 int temp = ((GroupHead) head).localIndex;