From 2f74acb78f578f654b86e6c7d173a4656bbaeda3 Mon Sep 17 00:00:00 2001 From: Michael Bien Date: Tue, 14 Feb 2023 15:12:16 +0100 Subject: [PATCH] partial revert of #5487 to fix master. --- .../data/CreateConstructorNonDefaultConstructor.java | 2 +- .../modules/java/completion/data/CreateConstructorTest.java | 2 +- .../completion/data/CreateConstructorWithConstructors.java | 2 +- .../data/CreateConstructorWithDefaultConstructor.java | 2 +- .../data/CreateConstructorNonDefaultConstructor.java | 2 +- .../java/editor/completion/data/CreateConstructorTest.java | 2 +- .../completion/data/CreateConstructorWithConstructors.java | 2 +- .../data/CreateConstructorWithDefaultConstructor.java | 2 +- .../test/java/hints/SuppressWarningsFixerTest/Test.java | 4 ++-- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/java/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/CreateConstructorNonDefaultConstructor.java b/java/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/CreateConstructorNonDefaultConstructor.java index a4694aed6693..a9e9e3d832ef 100644 --- a/java/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/CreateConstructorNonDefaultConstructor.java +++ b/java/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/CreateConstructorNonDefaultConstructor.java @@ -37,7 +37,7 @@ private static class X implements Runnable { private byte a; private Map> map1; - private Map> map2 = new HashMap<>(); + private Map> map2 = new HashMap(); public X(byte a, Map> map1) {} diff --git a/java/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/CreateConstructorTest.java b/java/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/CreateConstructorTest.java index d792a0965d13..d7ba836bd8db 100644 --- a/java/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/CreateConstructorTest.java +++ b/java/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/CreateConstructorTest.java @@ -35,7 +35,7 @@ private static class X implements Runnable { private byte a; private Map> map1; - private Map> map2 = new HashMap<>(); + private Map> map2 = new HashMap(); public void run() { } diff --git a/java/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/CreateConstructorWithConstructors.java b/java/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/CreateConstructorWithConstructors.java index 125852e7d97b..7ecaabe4cac7 100644 --- a/java/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/CreateConstructorWithConstructors.java +++ b/java/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/CreateConstructorWithConstructors.java @@ -38,7 +38,7 @@ private static class X implements Runnable { private byte a; private Map> map1; - private Map> map2 = new HashMap<>(); + private Map> map2 = new HashMap(); public X() {} public X(byte a, Map> map1) {} diff --git a/java/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/CreateConstructorWithDefaultConstructor.java b/java/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/CreateConstructorWithDefaultConstructor.java index b7a6acd0d197..d73d89beeffd 100644 --- a/java/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/CreateConstructorWithDefaultConstructor.java +++ b/java/java.completion/test/unit/data/org/netbeans/modules/java/completion/data/CreateConstructorWithDefaultConstructor.java @@ -37,7 +37,7 @@ private static class X implements Runnable { private byte a; private Map> map1; - private Map> map2 = new HashMap<>(); + private Map> map2 = new HashMap(); public X() {} diff --git a/java/java.editor/test/unit/data/org/netbeans/modules/java/editor/completion/data/CreateConstructorNonDefaultConstructor.java b/java/java.editor/test/unit/data/org/netbeans/modules/java/editor/completion/data/CreateConstructorNonDefaultConstructor.java index 76516eb0eb52..0cefc11c015d 100644 --- a/java/java.editor/test/unit/data/org/netbeans/modules/java/editor/completion/data/CreateConstructorNonDefaultConstructor.java +++ b/java/java.editor/test/unit/data/org/netbeans/modules/java/editor/completion/data/CreateConstructorNonDefaultConstructor.java @@ -18,7 +18,7 @@ private static class X implements Runnable { private byte a; private Map> map1; - private Map> map2 = new HashMap<>(); + private Map> map2 = new HashMap(); public X(byte a, Map> map1) {} diff --git a/java/java.editor/test/unit/data/org/netbeans/modules/java/editor/completion/data/CreateConstructorTest.java b/java/java.editor/test/unit/data/org/netbeans/modules/java/editor/completion/data/CreateConstructorTest.java index a1e1a1286c3b..73ff1d24b122 100644 --- a/java/java.editor/test/unit/data/org/netbeans/modules/java/editor/completion/data/CreateConstructorTest.java +++ b/java/java.editor/test/unit/data/org/netbeans/modules/java/editor/completion/data/CreateConstructorTest.java @@ -16,7 +16,7 @@ private static class X implements Runnable { private byte a; private Map> map1; - private Map> map2 = new HashMap<>(); + private Map> map2 = new HashMap(); public void run() { } diff --git a/java/java.editor/test/unit/data/org/netbeans/modules/java/editor/completion/data/CreateConstructorWithConstructors.java b/java/java.editor/test/unit/data/org/netbeans/modules/java/editor/completion/data/CreateConstructorWithConstructors.java index 31f120055d1b..e073838fb43b 100644 --- a/java/java.editor/test/unit/data/org/netbeans/modules/java/editor/completion/data/CreateConstructorWithConstructors.java +++ b/java/java.editor/test/unit/data/org/netbeans/modules/java/editor/completion/data/CreateConstructorWithConstructors.java @@ -19,7 +19,7 @@ private static class X implements Runnable { private byte a; private Map> map1; - private Map> map2 = new HashMap<>(); + private Map> map2 = new HashMap(); public X() {} public X(byte a, Map> map1) {} diff --git a/java/java.editor/test/unit/data/org/netbeans/modules/java/editor/completion/data/CreateConstructorWithDefaultConstructor.java b/java/java.editor/test/unit/data/org/netbeans/modules/java/editor/completion/data/CreateConstructorWithDefaultConstructor.java index f7b2c2925a64..9d44ea381974 100644 --- a/java/java.editor/test/unit/data/org/netbeans/modules/java/editor/completion/data/CreateConstructorWithDefaultConstructor.java +++ b/java/java.editor/test/unit/data/org/netbeans/modules/java/editor/completion/data/CreateConstructorWithDefaultConstructor.java @@ -18,7 +18,7 @@ private static class X implements Runnable { private byte a; private Map> map1; - private Map> map2 = new HashMap<>(); + private Map> map2 = new HashMap(); public X() {} diff --git a/java/java.hints/test/unit/data/org/netbeans/test/java/hints/SuppressWarningsFixerTest/Test.java b/java/java.hints/test/unit/data/org/netbeans/test/java/hints/SuppressWarningsFixerTest/Test.java index 6b7b450b56d9..b7fa4a6cb499 100644 --- a/java/java.hints/test/unit/data/org/netbeans/test/java/hints/SuppressWarningsFixerTest/Test.java +++ b/java/java.hints/test/unit/data/org/netbeans/test/java/hints/SuppressWarningsFixerTest/Test.java @@ -5,10 +5,10 @@ public class Test { - private List l = new ArrayList<>(); + private List l = new ArrayList(); { - l = new ArrayList<>(); + l = new ArrayList(); } private void test1() {