You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by mb...@apache.org on 2023/02/14 16:20:15 UTC
[netbeans] branch master updated: partial revert of #5487 to fix master.
This is an automated email from the ASF dual-hosted git repository.
mbien pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new 2f74acb78f partial revert of #5487 to fix master.
new 15ad55e3f2 Merge pull request #5492 from mbien/partial-revert-5487
2f74acb78f is described below
commit 2f74acb78f578f654b86e6c7d173a4656bbaeda3
Author: Michael Bien <mb...@gmail.com>
AuthorDate: Tue Feb 14 15:12:16 2023 +0100
partial revert of #5487 to fix master.
---
.../java/completion/data/CreateConstructorNonDefaultConstructor.java | 2 +-
.../netbeans/modules/java/completion/data/CreateConstructorTest.java | 2 +-
.../java/completion/data/CreateConstructorWithConstructors.java | 2 +-
.../java/completion/data/CreateConstructorWithDefaultConstructor.java | 2 +-
.../completion/data/CreateConstructorNonDefaultConstructor.java | 2 +-
.../modules/java/editor/completion/data/CreateConstructorTest.java | 2 +-
.../editor/completion/data/CreateConstructorWithConstructors.java | 2 +-
.../completion/data/CreateConstructorWithDefaultConstructor.java | 2 +-
.../org/netbeans/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 a4694aed66..a9e9e3d832 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 @@ public class Test {
private byte a;
private Map<String, Set<String>> map1;
- private Map<String, Set<String>> map2 = new HashMap<>();
+ private Map<String, Set<String>> map2 = new HashMap();
public X(byte a, Map<String, Set<String>> 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 d792a0965d..d7ba836bd8 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 @@ public class Test {
private byte a;
private Map<String, Set<String>> map1;
- private Map<String, Set<String>> map2 = new HashMap<>();
+ private Map<String, Set<String>> 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 125852e7d9..7ecaabe4ca 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 @@ public class Test {
private byte a;
private Map<String, Set<String>> map1;
- private Map<String, Set<String>> map2 = new HashMap<>();
+ private Map<String, Set<String>> map2 = new HashMap();
public X() {}
public X(byte a, Map<String, Set<String>> 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 b7a6acd0d1..d73d89beef 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 @@ public class Test {
private byte a;
private Map<String, Set<String>> map1;
- private Map<String, Set<String>> map2 = new HashMap<>();
+ private Map<String, Set<String>> 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 76516eb0eb..0cefc11c01 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 @@ public class Test {
private byte a;
private Map<String, Set<String>> map1;
- private Map<String, Set<String>> map2 = new HashMap<>();
+ private Map<String, Set<String>> map2 = new HashMap();
public X(byte a, Map<String, Set<String>> 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 a1e1a1286c..73ff1d24b1 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 @@ public class Test {
private byte a;
private Map<String, Set<String>> map1;
- private Map<String, Set<String>> map2 = new HashMap<>();
+ private Map<String, Set<String>> 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 31f120055d..e073838fb4 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 @@ public class Test {
private byte a;
private Map<String, Set<String>> map1;
- private Map<String, Set<String>> map2 = new HashMap<>();
+ private Map<String, Set<String>> map2 = new HashMap();
public X() {}
public X(byte a, Map<String, Set<String>> 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 f7b2c2925a..9d44ea3819 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 @@ public class Test {
private byte a;
private Map<String, Set<String>> map1;
- private Map<String, Set<String>> map2 = new HashMap<>();
+ private Map<String, Set<String>> 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 6b7b450b56..b7fa4a6cb4 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 @@ import java.util.List;
public class Test {
- private List<String> l = new ArrayList<>();
+ private List<String> l = new ArrayList();
{
- l = new ArrayList<>();
+ l = new ArrayList();
}
private void test1() {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@netbeans.apache.org
For additional commands, e-mail: commits-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists