Skip to content

Commit 3f9f2f1

Browse files
thurkathurka
committed
use diamond operator
1 parent fe07115 commit 3f9f2f1

File tree

19 files changed

+45
-48
lines changed

19 files changed

+45
-48
lines changed

‎visualvm/appui/src/org/graalvm/visualvm/modules/appui/AboutAction.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ private static String getIDEInstallValue() {
212212

213213
Enumeration<Object> all = Enumerations.concat(Enumerations.singleton(nbhome), more);
214214

215-
Set<File> files = new HashSet<File>();
215+
Set<File> files = new HashSet<>();
216216
StringBuilder sb = new StringBuilder ();
217217
String prefix = "";
218218
while (all.hasMoreElements ()) {

‎visualvm/appui/src/org/graalvm/visualvm/modules/appui/options/ProxySettings.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -318,7 +318,7 @@ private static String compactNonProxyHosts (String hosts) {
318318
nonProxyHosts.append(h);
319319
}
320320
st = new StringTokenizer (nonProxyHosts.toString(), "|"); //NOI18N
321-
Set<String> set = new HashSet<String> ();
321+
Set<String> set = new HashSet<> ();
322322
StringBuilder compactedProxyHosts = new StringBuilder();
323323
while (st.hasMoreTokens ()) {
324324
String t = st.nextToken ();

‎visualvm/appui/src/org/graalvm/visualvm/modules/appui/welcome/WelcomeComponent.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,7 @@
4040
public class WelcomeComponent extends TopComponent {
4141
static final long serialVersionUID=6021472310161712674L;
4242
private static final String PREFERRED_ID = "VisualVMWelcome"; //NOI18N
43-
private static WeakReference<WelcomeComponent> component =
44-
new WeakReference<WelcomeComponent>(null);
43+
private static WeakReference<WelcomeComponent> component = new WeakReference<>(null);
4544
private JComponent content;
4645

4746
private boolean initialized = false;
@@ -85,7 +84,7 @@ public static synchronized WelcomeComponent findComp() {
8584
if (tc != null) {
8685
if (tc instanceof WelcomeComponent) {
8786
wc = (WelcomeComponent)tc;
88-
component = new WeakReference<WelcomeComponent>(wc);
87+
component = new WeakReference<>(wc);
8988
} else {
9089
//Incorrect settings file?
9190
IllegalStateException exc = new IllegalStateException
@@ -112,7 +111,7 @@ public static synchronized WelcomeComponent createComp() {
112111
WelcomeComponent wc = component.get();
113112
if(wc == null) {
114113
wc = new WelcomeComponent();
115-
component = new WeakReference<WelcomeComponent>(wc);
114+
component = new WeakReference<>(wc);
116115
}
117116
return wc;
118117
}

‎visualvm/caching.api/src/org/graalvm/visualvm/api/caching/impl/CacheFactoryImpl.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -39,28 +39,28 @@
3939
@ServiceProvider(service=CacheFactoryImpl.class)
4040
public class CacheFactoryImpl {
4141
public <K,V> Cache<K,V> weakMapCache() {
42-
return new CacheImpl<K, V>(new WeakKeyFactory<K>());
42+
return new CacheImpl<>(new WeakKeyFactory<>());
4343
}
4444
public <K,V> Cache<K,V> weakMapCache(EntryFactory<K,V> resolver, Persistor<K,V> persistor) {
45-
return new CacheImpl<K, V>(resolver, new WeakKeyFactory<K>(), persistor);
45+
return new CacheImpl<>(resolver, new WeakKeyFactory<>(), persistor);
4646
}
4747
public <K,V> Cache<K,V> weakMapCache(Persistor<K,V> persistor) {
48-
return new CacheImpl<K, V>(new WeakKeyFactory<K>(), persistor);
48+
return new CacheImpl<>(new WeakKeyFactory<>(), persistor);
4949
}
5050
public <K,V> Cache<K,V> weakMapCache(EntryFactory<K,V> resolver) {
51-
return new CacheImpl<K, V>(resolver, new WeakKeyFactory<K>());
51+
return new CacheImpl<>(resolver, new WeakKeyFactory<>());
5252
}
5353

5454
public <K,V> Cache<K,V> softMapCache() {
55-
return new CacheImpl<K, V>(new SoftKeyFactory<K>());
55+
return new CacheImpl<>(new SoftKeyFactory<>());
5656
}
5757
public <K,V> Cache<K,V> softMapCache(EntryFactory<K,V> resolver, Persistor<K,V> persistor) {
58-
return new CacheImpl<K, V>(resolver, new SoftKeyFactory<K>(), persistor);
58+
return new CacheImpl<>(resolver, new SoftKeyFactory<>(), persistor);
5959
}
6060
public <K,V> Cache<K,V> softMapCache(Persistor<K,V> persistor) {
61-
return new CacheImpl<K, V>(new SoftKeyFactory<K>(), persistor);
61+
return new CacheImpl<>(new SoftKeyFactory<>(), persistor);
6262
}
6363
public <K,V> Cache<K,V> softMapCache(EntryFactory<K,V> resolver) {
64-
return new CacheImpl<K, V>(resolver, new SoftKeyFactory<K>());
64+
return new CacheImpl<>(resolver, new SoftKeyFactory<>());
6565
}
6666
}

‎visualvm/caching.api/src/org/graalvm/visualvm/api/caching/impl/CacheImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
* @author Jaroslav Bachorik
4040
*/
4141
final class CacheImpl<K, V> extends Cache<K,V> {
42-
final private Map<Reference<K>, Entry<V>> objectCache = new HashMap<Reference<K>, Entry<V>>();
42+
final private Map<Reference<K>, Entry<V>> objectCache = new HashMap<>();
4343

4444
private long update_interval = 60480000; // 7 days in milliseconds
4545

‎visualvm/caching.api/src/org/graalvm/visualvm/api/caching/impl/SoftKeyFactory.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public class SoftKeyFactory<K> implements KeyFactory<K> {
3535

3636
@Override
3737
public Reference<K> createKey(K obj) {
38-
return new SoftReferenceEx<K>(obj);
38+
return new SoftReferenceEx<>(obj);
3939
}
4040

4141
}

‎visualvm/caching.api/src/org/graalvm/visualvm/api/caching/impl/WeakKeyFactory.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public class WeakKeyFactory<K> implements KeyFactory<K> {
3535

3636
@Override
3737
public Reference<K> createKey(K obj) {
38-
return new WeakReferenceEx<K>(obj);
38+
return new WeakReferenceEx<>(obj);
3939
}
4040

4141
}

‎visualvm/caching.api/test/unit/src/com/sun/tools/visualvm/api/caching/CacheImplTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public Entry<String> createEntry(String key) {
6666
@Override
6767
public Entry<String> createEntry(String key) {
6868
cacheMissed = true;
69-
return new Entry<String>("test");
69+
return new Entry<>("test");
7070
}
7171
});
7272
}

‎visualvm/core/src/org/graalvm/visualvm/core/options/GlobalPreferences.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ public final class GlobalPreferences implements PreferenceChangeListener {
7272

7373
private final static GlobalPreferences INSTANCE = new GlobalPreferences();
7474
private final Preferences prefs;
75-
private final Map<String, Set<ComparableWeakReference<PreferenceChangeListener>>> listenerMap = new HashMap<String, Set<ComparableWeakReference<PreferenceChangeListener>>>();
75+
private final Map<String, Set<ComparableWeakReference<PreferenceChangeListener>>> listenerMap = new HashMap<>();
7676

7777
private final ExecutorService dispatcher = Executors.newCachedThreadPool();
7878

@@ -94,8 +94,8 @@ public void preferenceChange(final PreferenceChangeEvent evt) {
9494
synchronized(listenerMap) {
9595
Set<ComparableWeakReference<PreferenceChangeListener>> set = listenerMap.get(evt.getKey());
9696
if (set != null) {
97-
final Set<PreferenceChangeListener> tmpListeners = new HashSet<PreferenceChangeListener>();
98-
Collection<ComparableWeakReference<PreferenceChangeListener>> deadRefs = new ArrayList<ComparableWeakReference<PreferenceChangeListener>>();
97+
final Set<PreferenceChangeListener> tmpListeners = new HashSet<>();
98+
Collection<ComparableWeakReference<PreferenceChangeListener>> deadRefs = new ArrayList<>();
9999
for(ComparableWeakReference<PreferenceChangeListener> pclRef : set) {
100100
if (pclRef.get() != null) {
101101
tmpListeners.add(pclRef.get());
@@ -306,10 +306,10 @@ private void addListener(String property, PreferenceChangeListener pcl) {
306306
synchronized(listenerMap) {
307307
if (listenerMap.containsKey(property)) {
308308
Set<ComparableWeakReference<PreferenceChangeListener>> set = listenerMap.get(property);
309-
set.add(new ComparableWeakReference<PreferenceChangeListener>(pcl));
309+
set.add(new ComparableWeakReference<>(pcl));
310310
} else {
311-
Set<ComparableWeakReference<PreferenceChangeListener>> set = new HashSet<ComparableWeakReference<PreferenceChangeListener>>();
312-
set.add(new ComparableWeakReference<PreferenceChangeListener>(pcl));
311+
Set<ComparableWeakReference<PreferenceChangeListener>> set = new HashSet<>();
312+
set.add(new ComparableWeakReference<>(pcl));
313313
listenerMap.put(property, set);
314314
}
315315
}

‎visualvm/core/src/org/graalvm/visualvm/core/scheduler/DefaultScheduledTask.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
* @author Jaroslav Bachorik
3939
*/
4040
class DefaultScheduledTask implements ScheduledTask, SchedulerTask {
41-
static private final Map<Quantum, WeakReference<SchedulingPipe>> pipeMap = new HashMap<Quantum, WeakReference<SchedulingPipe>>();
41+
static private final Map<Quantum, WeakReference<SchedulingPipe>> pipeMap = new HashMap<>();
4242

4343
//~ Instance fields ----------------------------------------------------------------------------------------------------------
4444

@@ -82,7 +82,7 @@ public void setInterval(Quantum interval) {
8282
}
8383
if (newPipe == null && interval != Quantum.SUSPENDED) {
8484
newPipe = new SchedulingPipe(interval);
85-
pipeMap.put(interval, new WeakReference<SchedulingPipe>(newPipe));
85+
pipeMap.put(interval, new WeakReference<>(newPipe));
8686
}
8787
if (newPipe != null) {
8888
newPipe.addTask(this);

0 commit comments

Comments
 (0)