You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by ma...@apache.org on 2020/02/29 08:54:29 UTC
[netbeans] branch master updated: [NETBEANS-3923] - cleanup
ThreadLocal rawtype warnings
This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing 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 1450671 [NETBEANS-3923] - cleanup ThreadLocal rawtype warnings
new 5027717 Merge pull request #1984 from BradWalker/cleanup_ThreadLocal_rawtype
1450671 is described below
commit 14506716571b754fa04dd605d17bb80d97abd387
Author: Brad Walker <ch...@netapp.com>
AuthorDate: Wed Feb 26 14:44:46 2020 -0700
[NETBEANS-3923] - cleanup ThreadLocal rawtype warnings
This removes all the ThreadLocal rawtype warnings..
[repeat] /home/bwalker/src/netbeans/platform/masterfs/src/org/netbeans/modules/masterfs/ProvidedExtensionsProxy.java:44: warning: [rawtypes] found ra
w type: ThreadLocal
[repeat] private static ThreadLocal reentrantCheck = new ThreadLocal();
[repeat] ^
[repeat] missing type arguments for generic class ThreadLocal<T>
[repeat] where T is a type-variable:
[repeat] T extends Object declared in class ThreadLocal
---
ide/versioning.util/src/org/netbeans/modules/turbo/Memory.java | 8 ++++----
.../org/netbeans/modules/masterfs/ProvidedExtensionsProxy.java | 2 +-
.../src/org/openide/util/lookup/ProxyLookup.java | 4 ++--
.../modules/javascript2/knockout/index/KnockoutIndexer.java | 2 +-
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/ide/versioning.util/src/org/netbeans/modules/turbo/Memory.java b/ide/versioning.util/src/org/netbeans/modules/turbo/Memory.java
index 853615a..6c94017 100644
--- a/ide/versioning.util/src/org/netbeans/modules/turbo/Memory.java
+++ b/ide/versioning.util/src/org/netbeans/modules/turbo/Memory.java
@@ -53,7 +53,7 @@ final class Memory {
public static final Object NULL = new Object();
/** Keep reference to last isPrepared result. */
- public static final ThreadLocal prepared = new ThreadLocal();
+ public static final ThreadLocal<Entry> prepared = new ThreadLocal<>();
private final Statistics statistics;
@@ -105,7 +105,7 @@ final class Memory {
}
putLive(key, attributes);
minimalMap.put(key, attributes);
- Entry entry = (Entry) prepared.get();
+ Entry entry = prepared.get();
if (entry != null) {
if (key.equals(entry.key) && name.equals(entry.name)) {
if (value != null) {
@@ -167,7 +167,7 @@ final class Memory {
}
// have not been promised by existsEntry but eliminated by GC?
- Entry entry = (Entry) prepared.get();
+ Entry entry = prepared.get();
if (entry != null) {
if (key.equals(entry.key) && name.equals(entry.name)) {
prepared.set(null); // here ends our promised contract
@@ -192,7 +192,7 @@ final class Memory {
// keep promised value in tread local to survive paralell GC
boolean isPrepared = attributes != null && attributes.keySet().contains(name);
if (isPrepared) {
- Entry entry = (Entry) prepared.get();
+ Entry entry = prepared.get();
if (entry == null) {
entry = new Entry();
}
diff --git a/platform/masterfs/src/org/netbeans/modules/masterfs/ProvidedExtensionsProxy.java b/platform/masterfs/src/org/netbeans/modules/masterfs/ProvidedExtensionsProxy.java
index 11157a7..204a0f2 100644
--- a/platform/masterfs/src/org/netbeans/modules/masterfs/ProvidedExtensionsProxy.java
+++ b/platform/masterfs/src/org/netbeans/modules/masterfs/ProvidedExtensionsProxy.java
@@ -41,7 +41,7 @@ import org.openide.filesystems.FileSystem;
*/
public class ProvidedExtensionsProxy extends ProvidedExtensions {
private Collection<BaseAnnotationProvider> annotationProviders;
- private static ThreadLocal reentrantCheck = new ThreadLocal();
+ private static ThreadLocal<Boolean> reentrantCheck = new ThreadLocal<>();
/** Creates a new instance of ProvidedExtensionsProxy */
public ProvidedExtensionsProxy(Collection/*AnnotationProvider*/ annotationProviders) {
diff --git a/platform/openide.util.lookup/src/org/openide/util/lookup/ProxyLookup.java b/platform/openide.util.lookup/src/org/openide/util/lookup/ProxyLookup.java
index a40bf1a..e18d04d 100644
--- a/platform/openide.util.lookup/src/org/openide/util/lookup/ProxyLookup.java
+++ b/platform/openide.util.lookup/src/org/openide/util/lookup/ProxyLookup.java
@@ -549,9 +549,9 @@ public class ProxyLookup extends Lookup {
collectFires(null);
}
- private static ThreadLocal<R> IN = new ThreadLocal<R>();
+ private static ThreadLocal<R<?>> IN = new ThreadLocal<>();
protected void collectFires(Collection<Object> evAndListeners) {
- R prev = IN.get();
+ R<?> prev = IN.get();
if (this == prev) {
// Thread.dumpStack();
return;
diff --git a/webcommon/javascript2.knockout/src/org/netbeans/modules/javascript2/knockout/index/KnockoutIndexer.java b/webcommon/javascript2.knockout/src/org/netbeans/modules/javascript2/knockout/index/KnockoutIndexer.java
index 98f1bb5..4b6f8e1 100644
--- a/webcommon/javascript2.knockout/src/org/netbeans/modules/javascript2/knockout/index/KnockoutIndexer.java
+++ b/webcommon/javascript2.knockout/src/org/netbeans/modules/javascript2/knockout/index/KnockoutIndexer.java
@@ -55,7 +55,7 @@ public class KnockoutIndexer extends EmbeddingIndexer {
private static final Logger LOG = Logger.getLogger(KnockoutIndexer.class.getName());
- private static final ThreadLocal<Map<URI, Collection<KnockoutCustomElement>>> CUSTOM_ELEMENTS = new ThreadLocal();
+ private static final ThreadLocal<Map<URI, Collection<KnockoutCustomElement>>> CUSTOM_ELEMENTS = new ThreadLocal<>();
@Override
protected void index(Indexable indexable, Parser.Result parserResult, Context context) {
---------------------------------------------------------------------
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