This is an automated email from the ASF dual-hosted git repository.
bwalker 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 754c2cd Simple changes to reduce warning messages. (#3760)
754c2cd is described below
commit 754c2cd6b3e21acec851e41f994f30aa54e18277
Author: Brad Walker <bwal...@musings.com>
AuthorDate: Thu Mar 10 17:51:11 2022 -0700
Simple changes to reduce warning messages. (#3760)
These changes strictly reduce HashMap warning messages like the following:
[repeat]
/home/bwalker/src/netbeans/platform/core.netigso/src/org/netbeans/core/netigso/Netigso.java:121:
warning: [rawtypes] found raw type: HashMap
[repeat] Map configMap = new HashMap();
[repeat] ^
[repeat] missing type arguments for generic class HashMap<K,V>
[repeat] where K,V are type-variables:
[repeat] K extends Object declared in class HashMap
[repeat] V extends Object declared in class HashMap
---
.../modules/glassfish/eecommon/api/DomainEditor.java | 4 ++--
.../modules/j2ee/dd/impl/commonws/ComponentBeanMultiple.java | 12 +++++++-----
.../j2ee/dd/impl/commonws/DescriptionBeanMultiple.java | 9 ++++++---
.../modules/j2ee/dd/impl/common/ComponentBeanMultiple.java | 6 +++---
.../j2ee/ddloaders/multiview/EjbJarMultiViewDataObject.java | 4 ++--
.../modules/j2ee/ddloaders/multiview/EntityHelper.java | 5 +++--
.../netbeans/modules/payara/eecommon/api/DomainEditor.java | 4 ++--
.../modules/web/beans/completion/CCPaintComponent.java | 4 ++--
.../src/org/netbeans/api/debugger/DebuggerManager.java | 2 +-
.../src/org/netbeans/api/debugger/Properties.java | 6 +++---
.../netbeans/modules/xml/catalog/user/UserXMLCatalog.java | 6 +++---
.../xml/tax/beans/editor/TreeNodeFilterCustomEditor.java | 2 +-
.../modules/dbschema/jdbcimpl/SchemaElementImpl.java | 4 ++--
.../netbeans/modules/dbschema/jdbcimpl/TableElementImpl.java | 6 +++---
.../j2ee/persistence/editor/completion/CCPaintComponent.java | 2 +-
.../j2ee/persistence/entitygenerator/CMPMappingModel.java | 2 +-
.../src/org/netbeans/api/templates/FileBuilder.java | 2 +-
.../src/org/openide/explorer/ExplorerActions.java | 2 +-
.../src/org/openide/filesystems/DefaultAttributes.java | 5 +++--
19 files changed, 47 insertions(+), 40 deletions(-)
diff --git
a/enterprise/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/DomainEditor.java
b/enterprise/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/DomainEditor.java
index b98e490..efd8359 100644
---
a/enterprise/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/DomainEditor.java
+++
b/enterprise/glassfish.eecommon/src/org/netbeans/modules/glassfish/eecommon/api/DomainEditor.java
@@ -485,8 +485,8 @@ public class DomainEditor {
return dSources;
}
- private HashMap<String,String> getPoolValues(HashMap cpMap, String
poolName) {
- HashMap<String,String> pValues = new HashMap<String,String>();
+ private Map<String,String> getPoolValues(Map<String, Node> cpMap, String
poolName) {
+ Map<String,String> pValues = new HashMap<>();
Node cpNode = (Node) cpMap.get(poolName);
NamedNodeMap cpAttrMap = cpNode.getAttributes();
Node dsClassName = cpAttrMap.getNamedItem(CONST_DS_CLASS);
diff --git
a/enterprise/j2ee.dd.webservice/src/org/netbeans/modules/j2ee/dd/impl/commonws/ComponentBeanMultiple.java
b/enterprise/j2ee.dd.webservice/src/org/netbeans/modules/j2ee/dd/impl/commonws/ComponentBeanMultiple.java
index 862b906..30de21a 100644
---
a/enterprise/j2ee.dd.webservice/src/org/netbeans/modules/j2ee/dd/impl/commonws/ComponentBeanMultiple.java
+++
b/enterprise/j2ee.dd.webservice/src/org/netbeans/modules/j2ee/dd/impl/commonws/ComponentBeanMultiple.java
@@ -25,7 +25,9 @@
package org.netbeans.modules.j2ee.dd.impl.commonws;
import java.util.Iterator;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
import org.netbeans.modules.schema2beans.Version;
import org.netbeans.modules.j2ee.dd.api.common.*;
import org.netbeans.modules.j2ee.dd.api.common.Icon;
@@ -110,8 +112,8 @@ public abstract class ComponentBeanMultiple extends
DescriptionBeanMultiple impl
return getDisplayName(null);
} catch (VersionNotSupportedException ex){return null;}
}
- public java.util.Map getAllDisplayNames() {
- java.util.Map map =new java.util.HashMap();
+ public Map getAllDisplayNames() {
+ Map<String, String> map =new HashMap<>();
for (int i=0;i<sizeDisplayName();i++) {
String desc=getDisplayName(i);
String loc=getDisplayNameXmlLang(i);
@@ -121,7 +123,7 @@ public abstract class ComponentBeanMultiple extends
DescriptionBeanMultiple impl
}
public void removeDisplayNameForLocale(String locale) throws
VersionNotSupportedException {
- java.util.Map map = new java.util.HashMap();
+ Map<String, String> map = new HashMap<>();
for (int i=0;i<sizeDisplayName();i++) {
String desc=getDisplayName(i);
String loc=getDisplayNameXmlLang(i);
@@ -223,8 +225,8 @@ public abstract class ComponentBeanMultiple extends
DescriptionBeanMultiple impl
}
return null;
}
- public java.util.Map getAllIcons() {
- java.util.Map map =new java.util.HashMap();
+ public Map getAllIcons() {
+ Map<String, String[]> map =new HashMap<>();
org.netbeans.modules.j2ee.dd.api.common.Icon[] icons = getIcon();
for (int i=0;i<icons.length;i++) {
String[] iconPair = new String[]
{icons[i].getSmallIcon(),icons[i].getLargeIcon()};
diff --git
a/enterprise/j2ee.dd.webservice/src/org/netbeans/modules/j2ee/dd/impl/commonws/DescriptionBeanMultiple.java
b/enterprise/j2ee.dd.webservice/src/org/netbeans/modules/j2ee/dd/impl/commonws/DescriptionBeanMultiple.java
index 071ffb4..b9cb402 100644
---
a/enterprise/j2ee.dd.webservice/src/org/netbeans/modules/j2ee/dd/impl/commonws/DescriptionBeanMultiple.java
+++
b/enterprise/j2ee.dd.webservice/src/org/netbeans/modules/j2ee/dd/impl/commonws/DescriptionBeanMultiple.java
@@ -26,6 +26,8 @@
package org.netbeans.modules.j2ee.dd.impl.commonws;
import java.util.Iterator;
+import java.util.HashMap;
+import java.util.Map;
import org.netbeans.modules.schema2beans.Version;
import org.netbeans.modules.j2ee.dd.api.common.*;
@@ -102,8 +104,9 @@ public abstract class DescriptionBeanMultiple extends
EnclosingBean implements D
return getDescription(null);
} catch (VersionNotSupportedException ex){return null;}
}
- public java.util.Map getAllDescriptions() {
- java.util.Map map =new java.util.HashMap();
+
+ public Map getAllDescriptions() {
+ Map<String, String> map =new HashMap<>();
for (int i=0;i<sizeDescription();i++) {
String desc=getDescription(i);
String loc=getDescriptionXmlLang(i);
@@ -113,7 +116,7 @@ public abstract class DescriptionBeanMultiple extends
EnclosingBean implements D
}
public void removeDescriptionForLocale(String locale) throws
VersionNotSupportedException {
- java.util.Map map = new java.util.HashMap();
+ Map<String, String> map = new HashMap<>();
for (int i=0;i<sizeDescription();i++) {
String desc=getDescription(i);
String loc=getDescriptionXmlLang(i);
diff --git
a/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/common/ComponentBeanMultiple.java
b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/common/ComponentBeanMultiple.java
index 3b5f780..d9c42c3 100644
---
a/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/common/ComponentBeanMultiple.java
+++
b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/impl/common/ComponentBeanMultiple.java
@@ -26,10 +26,10 @@ package org.netbeans.modules.j2ee.dd.impl.common;
import java.util.ArrayList;
import java.util.logging.Level;
-import java.util.Map;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
+import java.util.Map;
import java.util.logging.Logger;
import org.netbeans.modules.schema2beans.Version;
import org.netbeans.modules.j2ee.dd.api.common.IconInterface;
@@ -130,7 +130,7 @@ public abstract class ComponentBeanMultiple extends
DescriptionBeanMultiple impl
}
public void removeDisplayNameForLocale(String locale) throws
VersionNotSupportedException {
- Map map = new java.util.HashMap();
+ Map<String, String> map = new HashMap<>();
for (int i=0;i<sizeDisplayName();i++) {
String desc=getDisplayName(i);
String loc=getDisplayNameXmlLang(i);
@@ -243,7 +243,7 @@ public abstract class ComponentBeanMultiple extends
DescriptionBeanMultiple impl
return null;
}
public Map getAllIcons() {
- Map map =new java.util.HashMap();
+ Map<String, String[]> map =new HashMap<>();
org.netbeans.modules.j2ee.dd.api.common.Icon[] icons = getIcon();
for (int i=0;i<icons.length;i++) {
String[] iconPair = new String[]
{icons[i].getSmallIcon(),icons[i].getLargeIcon()};
diff --git
a/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/EjbJarMultiViewDataObject.java
b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/EjbJarMultiViewDataObject.java
index a06043e..9573b45 100644
---
a/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/EjbJarMultiViewDataObject.java
+++
b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/EjbJarMultiViewDataObject.java
@@ -107,8 +107,8 @@ public class EjbJarMultiViewDataObject extends
DDMultiViewDataObject
private boolean initialized = false;
private PropertyChangeListener ejbJarChangeListener;
- private Map entityHelperMap = new HashMap();
- private Map sessionHelperMap = new HashMap();
+ private Map<Entity, EntityHelper> entityHelperMap = new HashMap<>();
+ private Map<Session, SessionHelper> sessionHelperMap = new HashMap<>();
private static final long serialVersionUID = 8857563089355069362L;
diff --git
a/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/EntityHelper.java
b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/EntityHelper.java
index 2c251a1..d87ffbf 100644
---
a/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/EntityHelper.java
+++
b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/EntityHelper.java
@@ -30,6 +30,7 @@ import java.util.HashMap;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
+import java.util.Map;
/**
* @author pfiala
@@ -120,7 +121,7 @@ public class EntityHelper extends EntityAndSessionHelper {
public class CmpFields implements PropertyChangeSource {
private List listeners = new LinkedList();
- private HashMap cmpFieldHelperMap = new HashMap();
+ private Map<CmpField, CmpFieldHelper> cmpFieldHelperMap = new
HashMap<>();
private CmpFieldsTableModel cmpFieldsTableModel = new
CmpFieldsTableModel(this);
public int getCmpFieldCount() {
@@ -221,7 +222,7 @@ public class EntityHelper extends EntityAndSessionHelper {
public class Queries implements PropertyChangeSource {
private List listeners = new LinkedList();
- private HashMap queryMethodHelperMap = new HashMap();
+ private Map<Query, QueryMethodHelper> queryMethodHelperMap = new
HashMap<>();
private Query[] selectMethods;
private Query[] finderMethods;
public static final String SELECT_PREFIX = "ejbSelect"; //NOI18N
diff --git
a/enterprise/payara.eecommon/src/org/netbeans/modules/payara/eecommon/api/DomainEditor.java
b/enterprise/payara.eecommon/src/org/netbeans/modules/payara/eecommon/api/DomainEditor.java
index 06abe2c..0ec6dff 100644
---
a/enterprise/payara.eecommon/src/org/netbeans/modules/payara/eecommon/api/DomainEditor.java
+++
b/enterprise/payara.eecommon/src/org/netbeans/modules/payara/eecommon/api/DomainEditor.java
@@ -479,8 +479,8 @@ public class DomainEditor {
return dSources;
}
- private HashMap<String,String> getPoolValues(HashMap cpMap, String
poolName) {
- HashMap<String,String> pValues = new HashMap<String,String>();
+ private Map<String,String> getPoolValues(Map<String, Node> cpMap, String
poolName) {
+ Map<String,String> pValues = new HashMap<>();
Node cpNode = (Node) cpMap.get(poolName);
NamedNodeMap cpAttrMap = cpNode.getAttributes();
Node dsClassName = cpAttrMap.getNamedItem(CONST_DS_CLASS);
diff --git
a/enterprise/web.beans/src/org/netbeans/modules/web/beans/completion/CCPaintComponent.java
b/enterprise/web.beans/src/org/netbeans/modules/web/beans/completion/CCPaintComponent.java
index f5f5ad0..03f889b 100644
---
a/enterprise/web.beans/src/org/netbeans/modules/web/beans/completion/CCPaintComponent.java
+++
b/enterprise/web.beans/src/org/netbeans/modules/web/beans/completion/CCPaintComponent.java
@@ -54,7 +54,7 @@ public class CCPaintComponent extends JPanel {
private int ascent;
- private Map widths;
+ private Map<String, Integer> widths;
private FontMetrics fontMetrics;
@@ -252,7 +252,7 @@ public class CCPaintComponent extends JPanel {
if (widths != null) {
widths.clear();
} else {
- widths = new HashMap();
+ widths = new HashMap<>();
}
for (int i = 0; i < frequentWords.length; i++) {
storeWidth(frequentWords[i]);
diff --git
a/ide/api.debugger/src/org/netbeans/api/debugger/DebuggerManager.java
b/ide/api.debugger/src/org/netbeans/api/debugger/DebuggerManager.java
index f0b2ea3..2c59029 100644
--- a/ide/api.debugger/src/org/netbeans/api/debugger/DebuggerManager.java
+++ b/ide/api.debugger/src/org/netbeans/api/debugger/DebuggerManager.java
@@ -168,7 +168,7 @@ public final class DebuggerManager implements
ContextProvider {
private ThreadLocal<Boolean> watchesInitializing = new
ThreadLocal<Boolean>();
private SessionListener sessionListener = new
SessionListener ();
private Vector<DebuggerManagerListener> listeners = new Vector<>();
- private final HashMap listenersMap = new HashMap ();
+ private final Map<String, Vector<DebuggerManagerListener>>
listenersMap = new HashMap<>();
private ActionsManager actionsManager = null;
private Lookup lookup = new Lookup.MetaInf
(null);
diff --git a/ide/api.debugger/src/org/netbeans/api/debugger/Properties.java
b/ide/api.debugger/src/org/netbeans/api/debugger/Properties.java
index 1369242..0569573 100644
--- a/ide/api.debugger/src/org/netbeans/api/debugger/Properties.java
+++ b/ide/api.debugger/src/org/netbeans/api/debugger/Properties.java
@@ -406,10 +406,10 @@ public abstract class Properties {
private static final class PrimitiveRegister {
- private HashMap properties = new HashMap ();
+ private Map<String, String> properties = new HashMap<>();
private boolean isInitialized = false;
- private HashMap<String, ReentrantReadWriteLock> propertyRWLocks = new
HashMap<String, ReentrantReadWriteLock>();
- private HashMap<String, Integer> propertyRWLockCounts = new
HashMap<String, Integer>();
+ private Map<String, ReentrantReadWriteLock> propertyRWLocks = new
HashMap<>();
+ private Map<String, Integer> propertyRWLockCounts = new HashMap<>();
public String getProperty (String propertyName, String defaultValue) {
diff --git
a/ide/xml.catalog.ui/src/org/netbeans/modules/xml/catalog/user/UserXMLCatalog.java
b/ide/xml.catalog.ui/src/org/netbeans/modules/xml/catalog/user/UserXMLCatalog.java
index 9651d08..2f69df1 100644
---
a/ide/xml.catalog.ui/src/org/netbeans/modules/xml/catalog/user/UserXMLCatalog.java
+++
b/ide/xml.catalog.ui/src/org/netbeans/modules/xml/catalog/user/UserXMLCatalog.java
@@ -50,7 +50,7 @@ import org.xml.sax.ext.LexicalHandler;
*/
public class UserXMLCatalog implements CatalogReader, CatalogWriter,
CatalogDescriptor2, EntityResolver {
private static final String PROPERTY_LEX_HANDLER =
"http://xml.org/sax/properties/lexical-handler";;
- private Map publicIds;
+ private Map<String, String> publicIds;
private List<CatalogListener> catalogListeners;
private static final String catalogResource =
"xml/catalogs/UserXMLCatalog.xml"; // NOI18N
private static final String URI_PREFIX = "URI:"; // NOI18N
@@ -181,10 +181,10 @@ public class UserXMLCatalog implements CatalogReader,
CatalogWriter, CatalogDesc
FileObject userCatalog =
FileUtil.getConfigFile(catalogResource);
publicIds = parse(userCatalog);
} catch (java.io.IOException ex) {
- publicIds = new HashMap();
+ publicIds = new HashMap<>();
org.openide.ErrorManager.getDefault().notify(ex);
} catch (SAXException ex) {
- publicIds = new HashMap();
+ publicIds = new HashMap<>();
org.openide.ErrorManager.getDefault().notify(ex);
}
}
diff --git
a/ide/xml.tax/src/org/netbeans/modules/xml/tax/beans/editor/TreeNodeFilterCustomEditor.java
b/ide/xml.tax/src/org/netbeans/modules/xml/tax/beans/editor/TreeNodeFilterCustomEditor.java
index 18dbce1..648ba2d 100644
---
a/ide/xml.tax/src/org/netbeans/modules/xml/tax/beans/editor/TreeNodeFilterCustomEditor.java
+++
b/ide/xml.tax/src/org/netbeans/modules/xml/tax/beans/editor/TreeNodeFilterCustomEditor.java
@@ -44,7 +44,7 @@ public class TreeNodeFilterCustomEditor extends JPanel
implements EnhancedCustom
/** */
- private static final Map<Class<?>, String> publicNodeTypeNamesMap = new
HashMap();
+ private static final Map<Class<?>, String> publicNodeTypeNamesMap = new
HashMap<>();
//
diff --git
a/java/dbschema/src/org/netbeans/modules/dbschema/jdbcimpl/SchemaElementImpl.java
b/java/dbschema/src/org/netbeans/modules/dbschema/jdbcimpl/SchemaElementImpl.java
index a7522e4..3031488 100644
---
a/java/dbschema/src/org/netbeans/modules/dbschema/jdbcimpl/SchemaElementImpl.java
+++
b/java/dbschema/src/org/netbeans/modules/dbschema/jdbcimpl/SchemaElementImpl.java
@@ -343,7 +343,7 @@ public class SchemaElementImpl extends DBElementImpl
implements SchemaElement.Im
rs = dmd.getImportedKeys(catalog, schema,
tables.get(i).toString());
if (rs != null) {
- Map<Integer, String> rset = new HashMap();
+ Map<Integer, String> rset = new HashMap<>();
String c1, c2, s1, s2;
while (rs.next()) {
if (bridge != null) {
@@ -582,7 +582,7 @@ public class SchemaElementImpl extends DBElementImpl
implements SchemaElement.Im
rs =
cp.getDatabaseMetaData().getImportedKeys(cp.getConnection().getCatalog(),
cp.getSchema(), tables.get(j).toString());
if (rs != null) {
- Map<Integer, String> rset = new HashMap();
+ Map<Integer, String> rset = new HashMap<>();
LinkedList local = new LinkedList();
LinkedList ref = new LinkedList();
LinkedList fk = new LinkedList();
diff --git
a/java/dbschema/src/org/netbeans/modules/dbschema/jdbcimpl/TableElementImpl.java
b/java/dbschema/src/org/netbeans/modules/dbschema/jdbcimpl/TableElementImpl.java
index 449bd26..b8f4675 100644
---
a/java/dbschema/src/org/netbeans/modules/dbschema/jdbcimpl/TableElementImpl.java
+++
b/java/dbschema/src/org/netbeans/modules/dbschema/jdbcimpl/TableElementImpl.java
@@ -311,7 +311,7 @@ public class TableElementImpl extends DBElementImpl
implements TableElement.Impl
boolean unq;
LinkedList idxs = new LinkedList();
if (rs != null) {
- Map rset = new HashMap();
+ Map<Integer, String> rset = new HashMap<>();
String uniqueStr;
while (rs.next()) {
if (bridge != null) {
@@ -463,7 +463,7 @@ public class TableElementImpl extends DBElementImpl
implements TableElement.Impl
String name, fkColName, pkTableName, pkColName, c1, c2, s1, s2;
if (rs != null) {
- Map rset = new HashMap();
+ Map<Integer, String> rset = new HashMap<>();
while (rs.next()) {
if (bridge != null) {
rset = bridge.getDriverSpecification().getRow();
@@ -559,7 +559,7 @@ public class TableElementImpl extends DBElementImpl
implements TableElement.Impl
Object keySeq;
String colName;
if (rs != null) {
- Map rset = new HashMap();
+ Map<Integer, String> rset = new HashMap<>();
while (rs.next()) {
if (bridge != null) {
rset = bridge.getDriverSpecification().getRow();
diff --git
a/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/editor/completion/CCPaintComponent.java
b/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/editor/completion/CCPaintComponent.java
index 05dc804..119c043 100644
---
a/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/editor/completion/CCPaintComponent.java
+++
b/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/editor/completion/CCPaintComponent.java
@@ -262,7 +262,7 @@ public class CCPaintComponent extends JPanel {
if (widths != null) {
widths.clear();
} else {
- widths = new HashMap();
+ widths = new HashMap<>();
}
for (int i = 0; i < frequentWords.length; i++) {
storeWidth(frequentWords[i]);
diff --git
a/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/entitygenerator/CMPMappingModel.java
b/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/entitygenerator/CMPMappingModel.java
index 5fa08fc..e168c86 100644
---
a/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/entitygenerator/CMPMappingModel.java
+++
b/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/entitygenerator/CMPMappingModel.java
@@ -41,7 +41,7 @@ public class CMPMappingModel {
cmpFieldMapping = new HashMap<String, String>();
cmrFieldMapping = new HashMap<String, ColumnData[]>();
cmrJoinMapping = new HashMap<String, String>();
- joinTableColumnMappings = new HashMap();
+ joinTableColumnMappings = new HashMap<>();
}
public void setTableName(String tableName) {
diff --git
a/platform/api.templates/src/org/netbeans/api/templates/FileBuilder.java
b/platform/api.templates/src/org/netbeans/api/templates/FileBuilder.java
index 93efe8f..c7598d3 100644
--- a/platform/api.templates/src/org/netbeans/api/templates/FileBuilder.java
+++ b/platform/api.templates/src/org/netbeans/api/templates/FileBuilder.java
@@ -338,7 +338,7 @@ public final class FileBuilder {
switch (defaultMode) {
case FORMAT:
- MapFormat mf = new MapFormat(new HashMap());
+ MapFormat mf = new MapFormat(new HashMap<>());
mf.setExactMatch(false);
mf.setLeftBrace("__");
mf.setRightBrace("__");
diff --git
a/platform/openide.compat/src/org/openide/explorer/ExplorerActions.java
b/platform/openide.compat/src/org/openide/explorer/ExplorerActions.java
index 336139e..7ed71d1 100644
--- a/platform/openide.compat/src/org/openide/explorer/ExplorerActions.java
+++ b/platform/openide.compat/src/org/openide/explorer/ExplorerActions.java
@@ -251,7 +251,7 @@ public class ExplorerActions {
// copy (#13418), cut (#13426). If one node is a parent of
another,
// assume that the situation is sketchy and prevent it.
// For k==1 it is impossible so do not waste time on it.
- Map allNodes = new HashMap(101);
+ Map<Node, Node> allNodes = new HashMap<>(101);
for (i = 0; i < k; i++) {
if (!checkParents(path[i], allNodes)) {
diff --git
a/platform/openide.filesystems/src/org/openide/filesystems/DefaultAttributes.java
b/platform/openide.filesystems/src/org/openide/filesystems/DefaultAttributes.java
index e75bc7d..b67ad2b 100644
---
a/platform/openide.filesystems/src/org/openide/filesystems/DefaultAttributes.java
+++
b/platform/openide.filesystems/src/org/openide/filesystems/DefaultAttributes.java
@@ -42,6 +42,7 @@ import java.util.HashSet;
import java.util.Iterator;
import java.util.Locale;
import java.util.Map;
+import java.util.Set;
import java.util.TreeSet;
import java.util.logging.Level;
import javax.xml.parsers.FactoryConfigurationError;
@@ -882,12 +883,12 @@ public class DefaultAttributes extends Object implements
AbstractFileSystem.Attr
/** Enum of attributes for one file.
*/
public Enumeration<String> attrs(String fileName) {
- Map m = (Map) get(fileName);
+ Map<String, Map> m = (Map) get(fileName);
if (m == null) {
return Enumerations.empty();
} else {
- HashSet<String> s = new HashSet<>(m.keySet());
+ Set<String> s = new HashSet<>(m.keySet());
return Collections.enumeration(s);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org
For additional commands, e-mail: commits-h...@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
