8304098: [testbug] Test compilation failure in ControlUtils.java afte…

…r JDK-8292353 Reviewed-by: kcr
openjdk · Mar 14, 2023 · 5ff6556 · 5ff6556 · openjdk-notifier · Mar 14, 2023
1 parent 55f5576
commit 5ff6556
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/ControlUtils.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/ControlUtils.java
@@ -107,7 +107,8 @@ public static TreeTableView<String> createTreeTableView() {
     public static TreeTableCell getTreeTableCell(TreeTableView t, int row, int column) {
         TreeTableColumn col = (TreeTableColumn)t.getColumns().get(column);
         return findTheOnly(t, ".tree-table-cell", TreeTableCell.class, (n) -> {
-            if (n instanceof TreeTableCell c) {
+            if (n instanceof TreeTableCell) {
+                TreeTableCell c = (TreeTableCell)n;
                 if (row == c.getTableRow().getIndex()) {
                     if (col == c.getTableColumn()) {
                         return true;
@@ -124,7 +125,8 @@ public static TreeTableCell getTreeTableCell(TreeTableView t, int row, int colum
      */
     public static TreeTableRow getTreeTableRow(TreeTableView t, int row) {
         return findTheOnly(t, ".tree-table-row-cell", TreeTableRow.class, (n) -> {
-            if (n instanceof TreeTableRow c) {
+            if (n instanceof TreeTableRow) {
+                TreeTableRow c = (TreeTableRow)n;
                 if (row == c.getIndex()) {
                     return true;
                 }
@@ -140,7 +142,8 @@ public static TreeTableRow getTreeTableRow(TreeTableView t, int row) {
     public static TableCell getTableCell(TableView t, int row, int column) {
         TableColumn col = (TableColumn)t.getColumns().get(column);
         return findTheOnly(t, ".table-cell", TableCell.class, (x) -> {
-            if (x instanceof TableCell c) {
+            if (x instanceof TableCell) {
+                TableCell c = (TableCell)x;
                 if (row == c.getTableRow().getIndex()) {
                     if (col == c.getTableColumn()) {
                         return true;
@@ -157,7 +160,8 @@ public static TableCell getTableCell(TableView t, int row, int column) {
      */
     public static TableRow getTableRow(TableView t, int row) {
         return findTheOnly(t, ".table-row-cell", TableRow.class, (x) -> {
-            if (x instanceof TableRow c) {
+            if (x instanceof TableRow) {
+                TableRow c = (TableRow)x;
                 if (row == c.getIndex()) {
                     return true;
                 }

diff --git a/modules/javafx.controls/src/test/java/test/javafx/scene/control/TreeAndTableViewTest.java b/modules/javafx.controls/src/test/java/test/javafx/scene/control/TreeAndTableViewTest.java
@@ -105,7 +105,8 @@ public void test_TableView_jdk_8187145() {
         // toggling sorting ascending -> descending -> none
         {
             for (Object x: table.lookupAll(".table-column")) {
-                if (x instanceof TableColumnHeader n) {
+                if (x instanceof TableColumnHeader) {
+                    TableColumnHeader n = (TableColumnHeader)x;
                     mouseClick(n);
                     assertEquals(1, table.getSortOrder().size());
                     table.sort();
@@ -179,7 +180,8 @@ public void test_TreeTableView_jdk_8187145() {
         // toggling sorting ascending -> descending -> none
         {
             for (Object x: tree.lookupAll(".table-column")) {
-                if (x instanceof TableColumnHeader n) {
+                if (x instanceof TableColumnHeader) {
+                    TableColumnHeader n = (TableColumnHeader)x;
                     mouseClick(n);
                     assertEquals(1, tree.getSortOrder().size());
                     tree.sort();