diff --git a/contrib/j2ee.jboss4/src/org/netbeans/modules/j2ee/jboss4/JBDeploymentManager.java b/contrib/j2ee.jboss4/src/org/netbeans/modules/j2ee/jboss4/JBDeploymentManager.java index f988a1100d17..5f69d8bd291a 100644 --- a/contrib/j2ee.jboss4/src/org/netbeans/modules/j2ee/jboss4/JBDeploymentManager.java +++ b/contrib/j2ee.jboss4/src/org/netbeans/modules/j2ee/jboss4/JBDeploymentManager.java @@ -104,7 +104,7 @@ public class JBDeploymentManager implements DeploymentManager { * running state by Boolean.TRUE, stopped state Boolean.FALSE. * WeakHashMap should guarantee erasing of an unregistered server instance bcs instance properties are also removed along with instance. */ - private static final Map propertiesToIsRunning = Collections.synchronizedMap(new WeakHashMap()); + private static final Map propertiesToIsRunning = Collections.synchronizedMap(new WeakHashMap<>()); /** Creates a new instance of JBDeploymentManager */ public JBDeploymentManager(DeploymentFactory df, String realUri, diff --git a/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/WildflyDeploymentManager.java b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/WildflyDeploymentManager.java index b661f2790268..ca3edf75b8c8 100644 --- a/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/WildflyDeploymentManager.java +++ b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/WildflyDeploymentManager.java @@ -84,7 +84,7 @@ public class WildflyDeploymentManager implements DeploymentManager2 { * instance. */ private static final Map PROPERTIES_TO_IS_RUNNING - = Collections.synchronizedMap(new WeakHashMap()); + = Collections.synchronizedMap(new WeakHashMap<>()); private final DeploymentFactory df; diff --git a/enterprise/tomcat5/src/org/netbeans/modules/tomcat5/optional/StartTomcat.java b/enterprise/tomcat5/src/org/netbeans/modules/tomcat5/optional/StartTomcat.java index 1b18039d85a0..139e162ad5f8 100644 --- a/enterprise/tomcat5/src/org/netbeans/modules/tomcat5/optional/StartTomcat.java +++ b/enterprise/tomcat5/src/org/netbeans/modules/tomcat5/optional/StartTomcat.java @@ -929,7 +929,7 @@ private static class TomcatFormat extends org.openide.util.MapFormat { private static final long serialVersionUID = 992972967554321415L; public TomcatFormat(File startupScript, File homeDir) { - super(new HashMap()); + super(new HashMap<>()); Map map = getMap(); String scriptPath = startupScript.getAbsolutePath(); map.put(TAG_EXEC_CMD, scriptPath); diff --git a/enterprise/tomcat5/src/org/netbeans/modules/tomcat5/util/LogManager.java b/enterprise/tomcat5/src/org/netbeans/modules/tomcat5/util/LogManager.java index 7965d70b7cd8..a6ffd41e1621 100644 --- a/enterprise/tomcat5/src/org/netbeans/modules/tomcat5/util/LogManager.java +++ b/enterprise/tomcat5/src/org/netbeans/modules/tomcat5/util/LogManager.java @@ -45,8 +45,8 @@ public class LogManager { private ServerLog serverLog; private LogViewer sharedContextLogViewer; private LogViewer juliLogViewer; - private Map tomcatModuleConfigs = Collections.synchronizedMap(new WeakHashMap()); - private Map contextLogViewers = Collections.synchronizedMap(new HashMap()); + private Map tomcatModuleConfigs = Collections.synchronizedMap(new WeakHashMap<>()); + private Map contextLogViewers = Collections.synchronizedMap(new HashMap<>()); private TomcatManager manager; private final Object serverLogLock = new Object(); diff --git a/enterprise/tomcat5/src/org/netbeans/modules/tomcat5/util/LogSupport.java b/enterprise/tomcat5/src/org/netbeans/modules/tomcat5/util/LogSupport.java index ebfcb051ef9a..ca601e2073ce 100644 --- a/enterprise/tomcat5/src/org/netbeans/modules/tomcat5/util/LogSupport.java +++ b/enterprise/tomcat5/src/org/netbeans/modules/tomcat5/util/LogSupport.java @@ -44,7 +44,7 @@ * @author Stepan Herold */ public class LogSupport { - private Map links = Collections.synchronizedMap(new HashMap()); + private Map links = Collections.synchronizedMap(new HashMap<>()); private Annotation errAnnot; /** diff --git a/enterprise/websvc.rest/src/org/netbeans/modules/websvc/rest/wizard/fromdb/EjbFacadeGenerator.java b/enterprise/websvc.rest/src/org/netbeans/modules/websvc/rest/wizard/fromdb/EjbFacadeGenerator.java index 627e79a21fbb..fc4901a81116 100644 --- a/enterprise/websvc.rest/src/org/netbeans/modules/websvc/rest/wizard/fromdb/EjbFacadeGenerator.java +++ b/enterprise/websvc.rest/src/org/netbeans/modules/websvc/rest/wizard/fromdb/EjbFacadeGenerator.java @@ -217,7 +217,7 @@ public void run(WorkingCopy workingCopy) throws Exception { maker.Modifiers(EnumSet.of(Modifier.PUBLIC, Modifier.ABSTRACT)), classTree.getSimpleName(), - Arrays.asList(maker.TypeParameter(genericsTypeName, + Arrays.asList(maker.TypeParameter(genericsTypeName, Collections.EMPTY_LIST)), null, Collections.EMPTY_LIST, diff --git a/ide/extbrowser/src/org/netbeans/modules/extbrowser/ExtWebBrowser.java b/ide/extbrowser/src/org/netbeans/modules/extbrowser/ExtWebBrowser.java index 53e86a010304..a5592c19d067 100644 --- a/ide/extbrowser/src/org/netbeans/modules/extbrowser/ExtWebBrowser.java +++ b/ide/extbrowser/src/org/netbeans/modules/extbrowser/ExtWebBrowser.java @@ -489,7 +489,7 @@ public static class UnixBrowserFormat extends org.openide.util.MapFormat { * @param url to specify URL */ public UnixBrowserFormat (String url) { - super(new java.util.HashMap ()); + super(new java.util.HashMap<>()); java.util.Map map = getMap (); map.put (TAG_URL, url); } diff --git a/ide/extbrowser/src/org/netbeans/modules/extbrowser/SimpleExtBrowser.java b/ide/extbrowser/src/org/netbeans/modules/extbrowser/SimpleExtBrowser.java index 3b8ece519165..615bde0ec6f5 100644 --- a/ide/extbrowser/src/org/netbeans/modules/extbrowser/SimpleExtBrowser.java +++ b/ide/extbrowser/src/org/netbeans/modules/extbrowser/SimpleExtBrowser.java @@ -108,7 +108,7 @@ public static class BrowserFormat extends org.openide.util.MapFormat { * @param library library path */ public BrowserFormat (String url) { - super(new HashMap()); + super(new HashMap<>()); java.util.Map map = getMap (); map.put (TAG_URL, url); diff --git a/ide/parsing.indexing/test/unit/src/org/netbeans/modules/parsing/impl/indexing/ScanStartedTest.java b/ide/parsing.indexing/test/unit/src/org/netbeans/modules/parsing/impl/indexing/ScanStartedTest.java index eec23e727187..d2ed196df151 100644 --- a/ide/parsing.indexing/test/unit/src/org/netbeans/modules/parsing/impl/indexing/ScanStartedTest.java +++ b/ide/parsing.indexing/test/unit/src/org/netbeans/modules/parsing/impl/indexing/ScanStartedTest.java @@ -120,7 +120,7 @@ protected void setUp() throws Exception { cp1 = ClassPathSupport.createClassPath(src1); bcp1 = ClassPathSupport.createClassPath(bin1); FooCPP.roots2cps = Collections.unmodifiableMap( - new HashMap() { + new HashMap<>() { { put(src1, Collections.singletonMap(FOO_SOURCES, cp1)); put(bin1, Collections.singletonMap(FOO_BINARY, bcp1)); diff --git a/ide/xml.wsdl.model/src/org/netbeans/modules/xml/wsdl/validator/WSDLInlineSchemaValidator.java b/ide/xml.wsdl.model/src/org/netbeans/modules/xml/wsdl/validator/WSDLInlineSchemaValidator.java index 963e4eb62d1d..6ed7656026e4 100644 --- a/ide/xml.wsdl.model/src/org/netbeans/modules/xml/wsdl/validator/WSDLInlineSchemaValidator.java +++ b/ide/xml.wsdl.model/src/org/netbeans/modules/xml/wsdl/validator/WSDLInlineSchemaValidator.java @@ -78,7 +78,7 @@ public class WSDLInlineSchemaValidator extends XsdBasedValidator { @SuppressWarnings("unchecked") public static final ValidationResult EMPTY_RESULT = - new ValidationResult( Collections.EMPTY_SET, + new ValidationResult( Collections.EMPTY_SET, Collections.EMPTY_SET); public String getName() { diff --git a/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/editor/completion/db/Catalog.java b/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/editor/completion/db/Catalog.java index 92475c957276..9b385934b75d 100644 --- a/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/editor/completion/db/Catalog.java +++ b/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/editor/completion/db/Catalog.java @@ -46,7 +46,7 @@ public String getName() { public synchronized Schema[] getSchemas() throws SQLException { if (schemas == null) { - schemas = new TreeMap(); + schemas = new TreeMap<>(); // (if name == null) // assuming the current catalog when the catalog name is null diff --git a/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/editor/completion/db/DBMetaDataProvider.java b/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/editor/completion/db/DBMetaDataProvider.java index d699d175510e..4047378e0ec2 100644 --- a/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/editor/completion/db/DBMetaDataProvider.java +++ b/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/editor/completion/db/DBMetaDataProvider.java @@ -48,7 +48,7 @@ public class DBMetaDataProvider { // instead of List in order to be consistent with dbschema. // Maps java.sql.Connection-s to DB metadata providers. - private static final Map CONN_TO_PROVIDER = new WeakHashMap(); + private static final Map CONN_TO_PROVIDER = new WeakHashMap<>(); // must be a weak reference -- we don't want to prevent the connection from being GCd // it is OK to be a weak reference -- the connection is hold strongly by the DB Explorer diff --git a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/debugging/NbSourceProvider.java b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/debugging/NbSourceProvider.java index a305a0c87365..1cb6fc701978 100644 --- a/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/debugging/NbSourceProvider.java +++ b/java/java.lsp.server/src/org/netbeans/modules/java/lsp/server/debugging/NbSourceProvider.java @@ -48,8 +48,8 @@ public final class NbSourceProvider { private static final Logger LOG = Logger.getLogger(NbSourceProvider.class.getName()); - private final Map fqnToURI = Collections.synchronizedMap(new CacheMap()); - private final Map uriToSource = Collections.synchronizedMap(new CacheMap()); + private final Map fqnToURI = Collections.synchronizedMap(new CacheMap<>()); + private final Map uriToSource = Collections.synchronizedMap(new CacheMap<>()); private final DebugAdapterContext context; private ClassPath sources = ClassPath.EMPTY; diff --git a/java/java.source/test/qa-functional/src/org/netbeans/test/java/generating/InnerClasses.java b/java/java.source/test/qa-functional/src/org/netbeans/test/java/generating/InnerClasses.java index 243b1d076364..4c51e3a615c0 100644 --- a/java/java.source/test/qa-functional/src/org/netbeans/test/java/generating/InnerClasses.java +++ b/java/java.source/test/qa-functional/src/org/netbeans/test/java/generating/InnerClasses.java @@ -185,10 +185,10 @@ public void run(WorkingCopy workingCopy) throws Exception { Collections.EMPTY_LIST, extendsTree, implementsList, - Collections.EMPTY_LIST); + Collections.EMPTY_LIST); innerClass = make.addClassMember(innerClass, mt); innerClass = make.addClassMember(innerClass, vt); - innerClass = make.addClassMember(innerClass, make.Block(Collections.EMPTY_LIST, false)); + innerClass = make.addClassMember(innerClass, make.Block(Collections.EMPTY_LIST, false)); ClassTree modifiedClazz = make.addClassMember(clazz, innerClass); workingCopy.rewrite(clazz, modifiedClazz); } diff --git a/platform/openide.util.lookup/test/unit/src/org/openide/util/lookup/AbstractLookupBaseHid.java b/platform/openide.util.lookup/test/unit/src/org/openide/util/lookup/AbstractLookupBaseHid.java index abe390ac7a30..06e92c9bde0a 100644 --- a/platform/openide.util.lookup/test/unit/src/org/openide/util/lookup/AbstractLookupBaseHid.java +++ b/platform/openide.util.lookup/test/unit/src/org/openide/util/lookup/AbstractLookupBaseHid.java @@ -1871,7 +1871,7 @@ public String getDisplayName() { this.ic.addPair(l); - Collection c = lookup.lookup(new Lookup.Template(String.class)).allInstances(); + Collection c = lookup.lookup(new Lookup.Template<>(String.class)).allInstances(); assertTrue("It is empty: " + c, c.isEmpty()); } diff --git a/platform/settings/test/unit/src/org/netbeans/modules/settings/convertors/SerialDataConvertorTest.java b/platform/settings/test/unit/src/org/netbeans/modules/settings/convertors/SerialDataConvertorTest.java index b46379cd7cb2..97aecfd8a59a 100644 --- a/platform/settings/test/unit/src/org/netbeans/modules/settings/convertors/SerialDataConvertorTest.java +++ b/platform/settings/test/unit/src/org/netbeans/modules/settings/convertors/SerialDataConvertorTest.java @@ -96,7 +96,7 @@ public void resultChanged(LookupEvent ev) { LocalFileSystem lfs = new LocalFileSystem(); InstanceDataObject i = InstanceDataObject.create (folder, null, lfs, null); assertNull(i.getCookie(SaveCookie.class)); - Lookup.Result scr = i.getLookup().lookup(new Lookup.Template(SaveCookie.class)); + Lookup.Result scr = i.getLookup().lookup(new Lookup.Template(SaveCookie.class)); scr.addLookupListener(ml); Collection saveCookies = scr.allInstances(); assertFalse(saveCookies.contains(lfs)); diff --git a/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/UIUtils.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/UIUtils.java index 87ee48ed51a4..11171faf6d50 100644 --- a/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/UIUtils.java +++ b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/UIUtils.java @@ -119,7 +119,7 @@ public static boolean isAquaLookAndFeel() { private static Map DARKER_CACHE; public static Color getDarker(Color c) { - if (DARKER_CACHE == null) DARKER_CACHE = new HashMap(); + if (DARKER_CACHE == null) DARKER_CACHE = new HashMap<>(); int rgb = c.getRGB(); Color d = DARKER_CACHE.get(rgb); diff --git a/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/ProfilerColumnModel.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/ProfilerColumnModel.java index 233039625bcc..5f1827d93d17 100644 --- a/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/ProfilerColumnModel.java +++ b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/ProfilerColumnModel.java @@ -105,7 +105,7 @@ public void propertyChange(PropertyChangeEvent evt) { private Map columnPreferredWidths; boolean setColumnOffset(int column, int offset) { - if (columnOffsets == null) columnOffsets = new HashMap(); + if (columnOffsets == null) columnOffsets = new HashMap<>(); Integer previousOffset = columnOffsets.put(column, offset); int _previousOffset = previousOffset == null ? 0 : previousOffset.intValue(); boolean change = _previousOffset != offset; @@ -124,7 +124,7 @@ void clearColumnsPrefferedWidth() { } boolean setColumnPreferredWidth(int column, int width) { - if (columnPreferredWidths == null) columnPreferredWidths = new HashMap(); + if (columnPreferredWidths == null) columnPreferredWidths = new HashMap<>(); Integer previousWidth = columnPreferredWidths.put(column, width); int _previousWidth = previousWidth == null ? 0 : previousWidth.intValue(); boolean change = _previousWidth != width; @@ -157,7 +157,7 @@ void setDefaultColumnWidth(int width) { } void setDefaultColumnWidth(int column, int width) { - if (defaultColumnWidths == null) defaultColumnWidths = new HashMap(); + if (defaultColumnWidths == null) defaultColumnWidths = new HashMap<>(); defaultColumnWidths.put(column, width); if (isColumnVisible(column)) { TableColumn c = getModelColumn(column); diff --git a/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/ProfilerRowSorter.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/ProfilerRowSorter.java index 2cd9137cff63..7efb5b79cd7f 100644 --- a/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/ProfilerRowSorter.java +++ b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/ProfilerRowSorter.java @@ -160,7 +160,7 @@ void setDefaultSortOrder(SortOrder sortOrder) { } void setDefaultSortOrder(int column, SortOrder sortOrder) { - if (defaultSortOrders == null) defaultSortOrders = new HashMap(); + if (defaultSortOrders == null) defaultSortOrders = new HashMap<>(); defaultSortOrders.put(column, sortOrder); } diff --git a/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/ProfilerTreeTable.java b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/ProfilerTreeTable.java index b8e1ec6bac02..1662c2302c74 100644 --- a/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/ProfilerTreeTable.java +++ b/profiler/lib.profiler.ui/src/org/netbeans/lib/profiler/ui/swing/ProfilerTreeTable.java @@ -949,7 +949,7 @@ protected void fireTreeStructureChanged(Object source, Object[] path, private List filteredChildren(Object parent) { - if (cache == null) cache = new HashMap(); + if (cache == null) cache = new HashMap<>(); TreeNode tParent = (TreeNode)parent; TreePathKey parentKey = new TreePathKey(getPathToRoot(tParent)); @@ -1067,7 +1067,7 @@ protected void fireTreeStructureChanged(Object source, Object[] path, private int[] viewToModel(Object parent) { - if (viewToModel == null) viewToModel = new HashMap(); + if (viewToModel == null) viewToModel = new HashMap<>(); TreePathKey parentKey = new TreePathKey(getPathToRoot((TreeNode)parent)); int[] indexes = viewToModel.get(parentKey); diff --git a/profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/logs/LogReader.java b/profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/logs/LogReader.java index 3bc86b51c1c6..0b69e232b171 100644 --- a/profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/logs/LogReader.java +++ b/profiler/profiler.snaptracer/src/org/netbeans/modules/profiler/snaptracer/logs/LogReader.java @@ -45,7 +45,7 @@ public final class LogReader { public LogReader(FileObject f) { logFile = f; - recordList = new TreeMap(); + recordList = new TreeMap<>(); }