From 7424845a869e5a4b3fa31551883a44ce65e42c26 Mon Sep 17 00:00:00 2001 From: Brad Walker Date: Wed, 21 Jun 2023 20:15:48 -0500 Subject: [PATCH] cleanup: Cleanup Map raw type warnings.. Cleanup May raw type warnings that look like this: [repeat] /home/bwalker/src/netbeans/ide/team.commons/src/org/netbeans/modules/bugtracking/commons/AttachmentsPanel.java:353: warning: [rawtypes] found raw type: Map [repeat] Map attributes = cmp.getFont().getAttributes(); [repeat] ^ [repeat] missing type arguments for generic class Map [repeat] where K,V are type-variables: [repeat] K extends Object declared in interface Map [repeat] V extends Object declared in interface Map Also, some minor code cleanup. --- .../glassfish/eecommon/api/DomainEditor.java | 16 ++++++++-------- .../impl/commonws/DescriptionBeanMultiple.java | 2 +- .../dd/impl/webservices/WebServicesProxy.java | 18 ++++++++++-------- .../dd/api/common/DescriptionInterface.java | 7 +++++-- .../dd/api/common/DisplayNameInterface.java | 7 +++++-- .../multiview/CmpRelationshipsTableModel.java | 2 +- .../multiview/EnterpriseBeansNode.java | 2 +- .../j2ee/earproject/EarActionProvider.java | 6 +++--- .../deployment/config/ConfigSupportImpl.java | 16 ++++++++-------- .../j2ee/deployment/impl/ServerInstance.java | 6 +++--- .../payara/eecommon/api/DomainEditor.java | 18 +++++++++--------- .../micro/project/DeployOnSaveManager.java | 4 +++- .../modules/tomcat5/optional/StartTomcat.java | 2 +- .../graph/layout/FreePlaceNodesLayouter.java | 6 +++--- .../project/jaxws/WebProjectJAXWSSupport.java | 2 +- .../rest/support/SourceGroupSupport.java | 4 ++-- .../actions/singlefilerun/JPDAStart.java | 4 ++-- .../netbeans/lib/ddl/impl/Specification.java | 4 ++-- .../modules/xml/dtd/grammar/DTDParser.java | 14 +++++++++----- .../gradle/java/GradleJavaDebuggerImpl.java | 2 +- .../db/DBCompletionContextResolver.java | 2 +- .../j2ee/persistence/provider/Provider.java | 2 +- .../editor/completion/beans/FxBeanCache.java | 2 +- .../api/templates/CreateFromTemplateImpl.java | 2 +- .../netbeans/core/multiview/SplitAction.java | 2 +- .../core/spi/multiview/MultiViewFactory.java | 8 ++++---- .../src/org/openide/awt/Actions.java | 8 ++++---- .../org/openide/awt/AlwaysEnabledAction.java | 8 ++++---- .../src/org/openide/awt/GeneralAction.java | 10 +++++----- .../org/openide/filesystems/XMLFileSystem.java | 2 +- 30 files changed, 101 insertions(+), 87 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 ba9ff195d427..e0e450453fd7 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 @@ -465,12 +465,12 @@ private String formatJvmOption(String jvmOption) { static final String[] sysDatasources = {"jdbc/__TimerPool", "jdbc/__CallFlowPool"}; //NOI18N - public HashMap getSunDatasourcesFromXml(){ - HashMap dSources = new HashMap<>(); + public HashMap> getSunDatasourcesFromXml(){ + HashMap> dSources = new HashMap<>(); Document domainDoc = getDomainDocument(); if (domainDoc != null) { Map dsMap = getDataSourcesAttrMap(domainDoc); - HashMap cpMap = getConnPoolsNodeMap(domainDoc); + Map cpMap = getConnPoolsNodeMap(domainDoc); dsMap.keySet().removeAll(Arrays.asList(sysDatasources)); String[] ds = dsMap.keySet().toArray(new String[dsMap.size()]); @@ -485,7 +485,7 @@ public HashMap getSunDatasourcesFromXml(){ return dSources; } - private Map getPoolValues(Map cpMap, String poolName) { + private Map getPoolValues(Map cpMap, String poolName) { Map pValues = new HashMap<>(); Node cpNode = cpMap.get(poolName); NamedNodeMap cpAttrMap = cpNode.getAttributes(); @@ -532,8 +532,8 @@ private Map getPoolValues(Map cpMap, String poolNam return pValues; } - public HashMap getConnPoolsFromXml(){ - HashMap pools = new HashMap<>(); + public HashMap> getConnPoolsFromXml(){ + HashMap> pools = new HashMap<>(); Document domainDoc = getDomainDocument(); if (domainDoc != null) { HashMap cpMap = getConnPoolsNodeMap(domainDoc); @@ -547,8 +547,8 @@ public HashMap getConnPoolsFromXml(){ return pools; } - private HashMap getDataSourcesAttrMap(Document domainDoc){ - HashMap dataSourceMap = new HashMap(); + private Map getDataSourcesAttrMap(Document domainDoc){ + Map dataSourceMap = new HashMap<>(); updateWithSampleDataSource(domainDoc); NodeList dataSourceNodeList = domainDoc.getElementsByTagName(CONST_JDBC); for(int i=0; i keys = descriptions.keySet().iterator(); diff --git a/enterprise/j2ee.dd.webservice/src/org/netbeans/modules/j2ee/dd/impl/webservices/WebServicesProxy.java b/enterprise/j2ee.dd.webservice/src/org/netbeans/modules/j2ee/dd/impl/webservices/WebServicesProxy.java index 4883f07cbe0c..6471c062fc59 100644 --- a/enterprise/j2ee.dd.webservice/src/org/netbeans/modules/j2ee/dd/impl/webservices/WebServicesProxy.java +++ b/enterprise/j2ee.dd.webservice/src/org/netbeans/modules/j2ee/dd/impl/webservices/WebServicesProxy.java @@ -26,7 +26,9 @@ import java.beans.PropertyChangeListener; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; +import java.util.Map; import org.netbeans.modules.j2ee.dd.api.webservices.Webservices; @@ -181,8 +183,8 @@ public void setId(java.lang.String value) { } } - public java.util.Map getAllDescriptions() { - return webSvc==null?new java.util.HashMap():webSvc.getAllDescriptions(); + public Map getAllDescriptions() { + return webSvc == null ? new HashMap<>() : webSvc.getAllDescriptions(); } public String getDescription(String locale) throws org.netbeans.modules.j2ee.dd.api.common.VersionNotSupportedException { @@ -193,8 +195,8 @@ public String getDefaultDescription() { return webSvc==null?null:webSvc.getDefaultDescription(); } - public java.util.Map getAllDisplayNames() { - return webSvc==null?new java.util.HashMap():webSvc.getAllDisplayNames(); + public Map getAllDisplayNames() { + return webSvc==null?new HashMap<>():webSvc.getAllDisplayNames(); } public String getDefaultDisplayName() { @@ -209,8 +211,8 @@ public org.netbeans.modules.j2ee.dd.api.common.Icon getDefaultIcon() { return webSvc==null?null:webSvc.getDefaultIcon(); } - public java.util.Map getAllIcons() { - return webSvc==null?new java.util.HashMap():webSvc.getAllIcons(); + public Map getAllIcons() { + return webSvc == null ? new HashMap<>() : webSvc.getAllIcons(); } public String getLargeIcon() { @@ -281,7 +283,7 @@ public void removeSmallIcon(String locale) throws org.netbeans.modules.j2ee.dd.a if (webSvc!=null) webSvc.removeSmallIcon(locale); } - public void setAllDescriptions(java.util.Map descriptions) throws org.netbeans.modules.j2ee.dd.api.common.VersionNotSupportedException { + public void setAllDescriptions(Map descriptions) throws org.netbeans.modules.j2ee.dd.api.common.VersionNotSupportedException { if (webSvc!=null) webSvc.setAllDescriptions(descriptions); } @@ -293,7 +295,7 @@ public void setDescription(String locale, String description) throws org.netbean if (webSvc!=null) webSvc.setDescription(locale, description); } - public void setAllDisplayNames(java.util.Map displayNames) throws org.netbeans.modules.j2ee.dd.api.common.VersionNotSupportedException { + public void setAllDisplayNames(Map displayNames) throws org.netbeans.modules.j2ee.dd.api.common.VersionNotSupportedException { if (webSvc!=null) webSvc.setAllDisplayNames(displayNames); } diff --git a/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/common/DescriptionInterface.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/common/DescriptionInterface.java index 8f89c7dda78a..e9ff444be29e 100644 --- a/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/common/DescriptionInterface.java +++ b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/common/DescriptionInterface.java @@ -18,6 +18,9 @@ */ package org.netbeans.modules.j2ee.dd.api.common; + +import java.util.Map; + /** * Super interface for all DD elements having the description property/properties. * @@ -50,7 +53,7 @@ public interface DescriptionInterface { * * @param descriptions Map of descriptions in the form of [locale,description] */ - public void setAllDescriptions(java.util.Map descriptions) throws VersionNotSupportedException; + public void setAllDescriptions(Map descriptions) throws VersionNotSupportedException; /** * Returns the description element value for particular locale.
@@ -73,7 +76,7 @@ public interface DescriptionInterface { * * @return map of all descriptions in the form of [locale:description] */ - public java.util.Map getAllDescriptions(); + public Map getAllDescriptions(); /** * Removes the description element for particular locale. diff --git a/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/common/DisplayNameInterface.java b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/common/DisplayNameInterface.java index 8e13f6dde699..088d8dd2bdc5 100644 --- a/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/common/DisplayNameInterface.java +++ b/enterprise/j2ee.dd/src/org/netbeans/modules/j2ee/dd/api/common/DisplayNameInterface.java @@ -18,6 +18,9 @@ */ package org.netbeans.modules.j2ee.dd.api.common; + +import java.util.Map; + /** * Super interface for all DD elements having the display-name property/properties. * @@ -50,7 +53,7 @@ public interface DisplayNameInterface { * * @param displayNames Map of display names in the form of [locale,display-name] */ - public void setAllDisplayNames(java.util.Map displayNames) throws VersionNotSupportedException; + public void setAllDisplayNames(Map displayNames) throws VersionNotSupportedException; /** * Returns the display-name element value for particular locale.
@@ -73,7 +76,7 @@ public interface DisplayNameInterface { * * @return map of all display-names in the form of [locale:display-name] */ - public java.util.Map getAllDisplayNames(); + public Map getAllDisplayNames(); /** * Removes the display-name element for particular locale. diff --git a/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/CmpRelationshipsTableModel.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/CmpRelationshipsTableModel.java index ae53d0b39549..f2f46f890aa9 100644 --- a/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/CmpRelationshipsTableModel.java +++ b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/CmpRelationshipsTableModel.java @@ -37,7 +37,7 @@ public class CmpRelationshipsTableModel extends InnerTableModel { private EjbJar ejbJar; - private final Map relationshipsHelperMap = new HashMap(); + private final Map relationshipsHelperMap = new HashMap<>(); private static final String[] COLUMN_NAMES = {Utils.getBundleMessage("LBL_RelationshipName"), Utils.getBundleMessage("LBL_Cardinality"), Utils.getBundleMessage("LBL_EntityBean"), diff --git a/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/EnterpriseBeansNode.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/EnterpriseBeansNode.java index a0c8ddd75e08..9517486bff73 100644 --- a/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/EnterpriseBeansNode.java +++ b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/EnterpriseBeansNode.java @@ -118,7 +118,7 @@ private synchronized boolean setChecking(boolean value) { } private void check() { - Map nodeMap = new HashMap(); + Map nodeMap = new HashMap<>(); Children children = getChildren(); Node[] nodes = children.getNodes(); for (int i = 0; i < nodes.length; i++) { diff --git a/enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/EarActionProvider.java b/enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/EarActionProvider.java index 0feabfa5eecc..081d6f573dfb 100644 --- a/enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/EarActionProvider.java +++ b/enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/EarActionProvider.java @@ -97,10 +97,10 @@ public class EarActionProvider implements ActionProvider { private final UpdateHelper updateHelper; /** Map from commands to ant targets */ - Map commands; + Map commands; public EarActionProvider(EarProject project, UpdateHelper updateHelper) { - commands = new HashMap(); + commands = new HashMap<>(); commands.put(COMMAND_BUILD, new String[] {"dist"}); // NOI18N commands.put(COMMAND_CLEAN, new String[] {"clean"}); // NOI18N commands.put(COMMAND_REBUILD, new String[] {"clean", "dist"}); // NOI18N @@ -407,7 +407,7 @@ private boolean isCosEnabled() { return Boolean.parseBoolean(project.evaluator().getProperty(EarProjectProperties.J2EE_COMPILE_ON_SAVE)); } - private void collectStartupExtenderArgs(Map p, String command) { + private void collectStartupExtenderArgs(Map p, String command) { StringBuilder b = new StringBuilder(); for (String arg : runJvmargsIde(command)) { b.append(' ').append(arg); diff --git a/enterprise/j2eeserver/src/org/netbeans/modules/j2ee/deployment/config/ConfigSupportImpl.java b/enterprise/j2eeserver/src/org/netbeans/modules/j2ee/deployment/config/ConfigSupportImpl.java index 48a6f1cd0633..2774d107ae27 100644 --- a/enterprise/j2eeserver/src/org/netbeans/modules/j2ee/deployment/config/ConfigSupportImpl.java +++ b/enterprise/j2eeserver/src/org/netbeans/modules/j2ee/deployment/config/ConfigSupportImpl.java @@ -95,8 +95,8 @@ public final class ConfigSupportImpl implements J2eeModuleProvider.ConfigSupport private static final String GENERIC_EXTENSION = ".dpf"; // NOI18N private String configurationPrimaryFileName = null; - private Map relativePaths = null; - private Map allRelativePaths = null; + private Map relativePaths = null; + private Map allRelativePaths = null; private final J2eeModuleProvider provider; private final J2eeModule j2eeModule; @@ -944,11 +944,11 @@ private J2eeModuleProvider getProvider () { return provider; } - private Map getRelativePaths() { + private Map getRelativePaths() { if (relativePaths != null) return relativePaths; - relativePaths = new HashMap(); + relativePaths = new HashMap<>(); if (hasCustomSupport()) { String [] paths = server.getDeploymentPlanFiles(getModuleType()); configurationPrimaryFileName = paths[0].substring(paths[0].lastIndexOf("/")+1); @@ -959,11 +959,11 @@ private Map getRelativePaths() { return relativePaths; } - private void collectData(Server server, Map map) { + private void collectData(Server server, Map map) { if (!hasCustomSupport(server, getModuleType())) return; - String [] paths = server.getDeploymentPlanFiles(getModuleType()); + String[] paths = server.getDeploymentPlanFiles(getModuleType()); paths = (paths == null) ? new String[0] : paths; for (int i=0; i getAllRelativePaths() { if (allRelativePaths != null) return allRelativePaths; - allRelativePaths = new HashMap(); + allRelativePaths = new HashMap<>(); Collection servers = ServerRegistry.getInstance().getServers(); for (Iterator i=servers.iterator(); i.hasNext();) { Server server = (Server) i.next(); diff --git a/enterprise/j2eeserver/src/org/netbeans/modules/j2ee/deployment/impl/ServerInstance.java b/enterprise/j2eeserver/src/org/netbeans/modules/j2ee/deployment/impl/ServerInstance.java index cbd8e2755a46..0030c6f95c1d 100644 --- a/enterprise/j2eeserver/src/org/netbeans/modules/j2ee/deployment/impl/ServerInstance.java +++ b/enterprise/j2eeserver/src/org/netbeans/modules/j2ee/deployment/impl/ServerInstance.java @@ -497,15 +497,15 @@ public ServerTarget[] getTargets() { } public Collection getTargetList() { - Map targets = getTargetMap(); + Map targets = getTargetMap(); synchronized (this) { return targets.values(); } } // PENDING use targets final variable? - private Map getTargetMap() { - Map tmpTargets = null; + private Map getTargetMap() { + Map tmpTargets = null; synchronized (this) { tmpTargets = targets; } 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 8bb0a9a5daa4..5997cb5f87e2 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 @@ -459,12 +459,12 @@ private String formatJvmOption(String jvmOption) { static final String[] sysDatasources = {"jdbc/__TimerPool", "jdbc/__CallFlowPool"}; //NOI18N - public HashMap getSunDatasourcesFromXml(){ - HashMap dSources = new HashMap<>(); + public HashMap> getSunDatasourcesFromXml(){ + HashMap> dSources = new HashMap<>(); Document domainDoc = getDomainDocument(); if (domainDoc != null) { - HashMap dsMap = getDataSourcesAttrMap(domainDoc); - HashMap cpMap = getConnPoolsNodeMap(domainDoc); + Map dsMap = getDataSourcesAttrMap(domainDoc); + Map cpMap = getConnPoolsNodeMap(domainDoc); dsMap.keySet().removeAll(Arrays.asList(sysDatasources)); String[] ds = dsMap.keySet().toArray(new String[dsMap.size()]); @@ -479,9 +479,9 @@ public HashMap getSunDatasourcesFromXml(){ return dSources; } - private Map getPoolValues(Map cpMap, String poolName) { - Map pValues = new HashMap<>(); - Node cpNode = cpMap.get(poolName); + private Map getPoolValues(Map cpMap, String poolName) { + Map pValues = new HashMap<>(); + Node cpNode = (Node) cpMap.get(poolName); NamedNodeMap cpAttrMap = cpNode.getAttributes(); Node dsClassName = cpAttrMap.getNamedItem(CONST_DS_CLASS); Node resType = cpAttrMap.getNamedItem(CONST_RES_TYPE); @@ -525,8 +525,8 @@ private Map getPoolValues(Map cpMap, String poolNam return pValues; } - public HashMap getConnPoolsFromXml(){ - HashMap pools = new HashMap<>(); + public HashMap> getConnPoolsFromXml(){ + HashMap> pools = new HashMap<>(); Document domainDoc = getDomainDocument(); if (domainDoc != null) { HashMap cpMap = getConnPoolsNodeMap(domainDoc); diff --git a/enterprise/payara.micro/src/org/netbeans/modules/fish/payara/micro/project/DeployOnSaveManager.java b/enterprise/payara.micro/src/org/netbeans/modules/fish/payara/micro/project/DeployOnSaveManager.java index a9849ae40dc3..eab5f92196b1 100644 --- a/enterprise/payara.micro/src/org/netbeans/modules/fish/payara/micro/project/DeployOnSaveManager.java +++ b/enterprise/payara.micro/src/org/netbeans/modules/fish/payara/micro/project/DeployOnSaveManager.java @@ -575,7 +575,9 @@ private void createOrReplace( FileObject targetFO, FileObject destRoot, String relativePath, - Map destMap, boolean checkTimeStamps) throws IOException { + Map destMap, + boolean checkTimeStamps + ) throws IOException { FileObject destFolder; OutputStream destStream = null; 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 379fabc3ba06..671f421a9f9e 100644 --- a/enterprise/tomcat5/src/org/netbeans/modules/tomcat5/optional/StartTomcat.java +++ b/enterprise/tomcat5/src/org/netbeans/modules/tomcat5/optional/StartTomcat.java @@ -127,7 +127,7 @@ public final class StartTomcat extends StartServer implements ProgressObject { private ProgressEventSupport pes; private int currentServerPort; // current server port Tomcat is running on - private static Map isDebugModeUri = Collections.synchronizedMap((Map)new HashMap(2,1)); + private static Map isDebugModeUri = Collections.synchronizedMap(new HashMap<>(2,1)); public StartTomcat (DeploymentManager manager) { assert manager instanceof TomcatManager : diff --git a/enterprise/web.jsf.navigation/src/org/netbeans/modules/web/jsf/navigation/graph/layout/FreePlaceNodesLayouter.java b/enterprise/web.jsf.navigation/src/org/netbeans/modules/web/jsf/navigation/graph/layout/FreePlaceNodesLayouter.java index 1dfab7e67ce5..fbaea653532a 100644 --- a/enterprise/web.jsf.navigation/src/org/netbeans/modules/web/jsf/navigation/graph/layout/FreePlaceNodesLayouter.java +++ b/enterprise/web.jsf.navigation/src/org/netbeans/modules/web/jsf/navigation/graph/layout/FreePlaceNodesLayouter.java @@ -83,7 +83,7 @@ public FreePlaceNodesLayouter( PageFlowScene scene, Rectangle visibleRectangle ) } - private final Map positions = new HashMap (); + private final Map positions = new HashMap<>(); public void layoutNodesLocations( PageFlowScene scene, Collection nodes) { final Collection allNodes = scene.getNodes(); for( Page node : nodes ) { @@ -115,7 +115,7 @@ public void addNode( Page node ) { private final int SEP_X = 250; private final int SEP_Y = 150; - private Point getNewComponentLocation(PageFlowScene scene, Map positions, Collection nodes) { + private Point getNewComponentLocation(PageFlowScene scene, Map positions, Collection nodes) { for (int a = 0; ; a++) { for (int b = 0; b <= a; b++) { final int x = SEP_Y + SEP_X * (a - b); @@ -127,7 +127,7 @@ private Point getNewComponentLocation(PageFlowScene scene, Map positions, Collec } } - private boolean isThereEmptyPlace(PageFlowScene scene, Map positions, Collection nodes, int x, int y) { + private boolean isThereEmptyPlace(PageFlowScene scene, Map positions, Collection nodes, int x, int y) { final Rectangle rectangle = new Rectangle(x, y, 100, 150); if (nodes != null) { for( Page node : nodes) { diff --git a/enterprise/web.project/src/org/netbeans/modules/web/project/jaxws/WebProjectJAXWSSupport.java b/enterprise/web.project/src/org/netbeans/modules/web/project/jaxws/WebProjectJAXWSSupport.java index 42ab71f7bc2f..e64c4a82e91b 100644 --- a/enterprise/web.project/src/org/netbeans/modules/web/project/jaxws/WebProjectJAXWSSupport.java +++ b/enterprise/web.project/src/org/netbeans/modules/web/project/jaxws/WebProjectJAXWSSupport.java @@ -157,7 +157,7 @@ protected void addServletElement(Project project, String wsName, String serviceI boolean addServletEntry = false; JAXWSSupport wss = JAXWSSupport.getJAXWSSupport(project.getProjectDirectory()); if (wss != null) { - Map properties = wss.getAntProjectHelper().getStandardPropertyEvaluator().getProperties(); + Map properties = wss.getAntProjectHelper().getStandardPropertyEvaluator().getProperties(); if (properties != null) { String serverInstance = (String)properties.get("j2ee.server.instance"); //NOI18N if (serverInstance != null) { diff --git a/enterprise/websvc.rest/src/org/netbeans/modules/websvc/rest/support/SourceGroupSupport.java b/enterprise/websvc.rest/src/org/netbeans/modules/websvc/rest/support/SourceGroupSupport.java index 442392812916..557b35b4c81a 100644 --- a/enterprise/websvc.rest/src/org/netbeans/modules/websvc/rest/support/SourceGroupSupport.java +++ b/enterprise/websvc.rest/src/org/netbeans/modules/websvc/rest/support/SourceGroupSupport.java @@ -166,7 +166,7 @@ public static FileObject getFolderForPackage(SourceGroup sourceGroup, String pgk return null; } - private static Map createFoldersToSourceGroupsMap(final SourceGroup[] sourceGroups) { + private static Map createFoldersToSourceGroupsMap(final SourceGroup[] sourceGroups) { Map result; if (sourceGroups.length == 0) { result = Collections.emptyMap(); @@ -189,7 +189,7 @@ private static Set getTestSourceGroups(SourceGroup[] sourceGroups) return testGroups; } - private static List getTestTargets(SourceGroup sourceGroup, Map foldersToSourceGroupsMap) { + private static List getTestTargets(SourceGroup sourceGroup, Map foldersToSourceGroupsMap) { final URL[] rootURLs = UnitTestForSourceQuery.findUnitTests(sourceGroup.getRootFolder()); if (rootURLs.length == 0) { return new ArrayList(); diff --git a/groovy/groovy.support/src/org/netbeans/modules/groovy/support/actions/singlefilerun/JPDAStart.java b/groovy/groovy.support/src/org/netbeans/modules/groovy/support/actions/singlefilerun/JPDAStart.java index 9293cf76f817..1c79276e8dcf 100644 --- a/groovy/groovy.support/src/org/netbeans/modules/groovy/support/actions/singlefilerun/JPDAStart.java +++ b/groovy/groovy.support/src/org/netbeans/modules/groovy/support/actions/singlefilerun/JPDAStart.java @@ -93,7 +93,7 @@ public void run() { throw new RuntimeException("No trasports named " + getTransport() + " found!"); //NOI18N } - final Map args = lc.defaultArguments(); + final Map args = lc.defaultArguments(); String address = lc.startListening(args); try { int port = Integer.parseInt(address.substring(address.indexOf(':') + 1)); @@ -105,7 +105,7 @@ public void run() { } LOG.log(Level.INFO, "Debug Port:{0}", lock[0]); //NOI18N - final Map properties = new HashMap(); + final Map properties = new HashMap<>(); ClassPath sourcePath = ClassPathSupport.createClassPath(fileObject.getParent()); diff --git a/ide/db/libsrc/org/netbeans/lib/ddl/impl/Specification.java b/ide/db/libsrc/org/netbeans/lib/ddl/impl/Specification.java index a47328f71fa1..b91e62f54fb5 100644 --- a/ide/db/libsrc/org/netbeans/lib/ddl/impl/Specification.java +++ b/ide/db/libsrc/org/netbeans/lib/ddl/impl/Specification.java @@ -38,7 +38,7 @@ public class Specification implements DatabaseSpecification { /** Used DBConnection */ - private HashMap desc; + private Map desc; /** Used JDBC Connection */ private Connection jdbccon; @@ -82,7 +82,7 @@ public Specification(HashMap description) } /** Constructor */ - public Specification(HashMap description, Connection c) + public Specification(Map description, Connection c) { desc = description; jdbccon = c; diff --git a/ide/xml.core/src/org/netbeans/modules/xml/dtd/grammar/DTDParser.java b/ide/xml.core/src/org/netbeans/modules/xml/dtd/grammar/DTDParser.java index d77c2db2cf3b..d00d661b0238 100644 --- a/ide/xml.core/src/org/netbeans/modules/xml/dtd/grammar/DTDParser.java +++ b/ide/xml.core/src/org/netbeans/modules/xml/dtd/grammar/DTDParser.java @@ -122,19 +122,23 @@ public GrammarQuery parse(InputSource in) { */ private class Handler extends DefaultHandler implements DeclHandler { - private Map attrs, elements, models, enums, attrDefaults; + private Map attrs; + private Map elements; + private Map models; + private Map enums; + private Map attrDefaults; private Set notations, entities, anys, emptyElements; private DTDGrammar dtd; Handler() { - attrs = new HashMap(); - elements = new HashMap(); + attrs = new HashMap<>(); + elements = new HashMap<>(); models = new HashMap(); notations = new TreeSet<>(); entities = new TreeSet<>(); anys = new HashSet<>(); - enums = new HashMap(); - attrDefaults = new HashMap(); + enums = new HashMap<>(); + attrDefaults = new HashMap<>(); emptyElements = new HashSet<>(); dtd = new DTDGrammar(elements, models, attrs, attrDefaults, enums, entities, notations, emptyElements); } diff --git a/java/gradle.java/src/org/netbeans/modules/gradle/java/GradleJavaDebuggerImpl.java b/java/gradle.java/src/org/netbeans/modules/gradle/java/GradleJavaDebuggerImpl.java index 16363d02e9fd..6ad1a5a6922a 100644 --- a/java/gradle.java/src/org/netbeans/modules/gradle/java/GradleJavaDebuggerImpl.java +++ b/java/gradle.java/src/org/netbeans/modules/gradle/java/GradleJavaDebuggerImpl.java @@ -61,7 +61,7 @@ public void attachDebugger(String name, String transport, String host, String ad ClassPath sourcePath = getSources(); ClassPath jdkSourcePath = getJdkSources(); - final Map properties = new HashMap(); + final Map properties = new HashMap<>(); properties.put("sourcepath", sourcePath); //NOI18N properties.put("name", name); //NOI18N properties.put("jdksources", jdkSourcePath); //NOI18N diff --git a/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/editor/completion/db/DBCompletionContextResolver.java b/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/editor/completion/db/DBCompletionContextResolver.java index 169c6c52ec82..9580b60b0ec2 100644 --- a/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/editor/completion/db/DBCompletionContextResolver.java +++ b/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/editor/completion/db/DBCompletionContextResolver.java @@ -616,7 +616,7 @@ private List completeJoinColumn(JPACodeCompletionProvider.Context ctx, CCParser. CCParser.CC tblNN = null; if(nn != null && nn.getName().equals("JoinTable")) { //NOI18N - Map attrs = nn.getAttributes(); + Map attrs = nn.getAttributes(); Object val = attrs.get("table"); //NOI18N if(val instanceof CCParser.CC) { CCParser.CC tableNN = (CCParser.CC)val; diff --git a/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/provider/Provider.java b/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/provider/Provider.java index d2f18a12aead..26e3a39dbdec 100644 --- a/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/provider/Provider.java +++ b/java/j2ee.persistence/src/org/netbeans/modules/j2ee/persistence/provider/Provider.java @@ -260,7 +260,7 @@ public String getTableGenerationDropCreateValue(){ /** * @return Map{@code } containing vendor specific properties. */ - public abstract Map getUnresolvedVendorSpecificProperties(); + public abstract Map getUnresolvedVendorSpecificProperties(); /** * @return Map{@code } containing vendor specific properties diff --git a/javafx/javafx2.editor/src/org/netbeans/modules/javafx2/editor/completion/beans/FxBeanCache.java b/javafx/javafx2.editor/src/org/netbeans/modules/javafx2/editor/completion/beans/FxBeanCache.java index a0aa77edae8e..da3642b4543f 100644 --- a/javafx/javafx2.editor/src/org/netbeans/modules/javafx2/editor/completion/beans/FxBeanCache.java +++ b/javafx/javafx2.editor/src/org/netbeans/modules/javafx2/editor/completion/beans/FxBeanCache.java @@ -146,7 +146,7 @@ public CacheRef(ClasspathCache referent, String key) { public void run() { synchronized (instance().cache) { - Map m = instance().cache; + Map> m = instance().cache; Object o = m.get(refKey); if (o == this) { m.remove(refKey); diff --git a/platform/api.templates/src/org/netbeans/api/templates/CreateFromTemplateImpl.java b/platform/api.templates/src/org/netbeans/api/templates/CreateFromTemplateImpl.java index bc9964d68667..6a5b8e0047e5 100644 --- a/platform/api.templates/src/org/netbeans/api/templates/CreateFromTemplateImpl.java +++ b/platform/api.templates/src/org/netbeans/api/templates/CreateFromTemplateImpl.java @@ -310,7 +310,7 @@ private List defaultCreate() throws IOException { if (defaultMode != FileBuilder.Mode.COPY && frm instanceof MapFormat) { MapFormat mf = (MapFormat)frm; - Map m = mf.getMap(); + Map m = mf.getMap(); Map x = null; for (Map.Entry entry : params.entrySet()) { if (m.containsKey(entry.getKey())) { diff --git a/platform/core.multiview/src/org/netbeans/core/multiview/SplitAction.java b/platform/core.multiview/src/org/netbeans/core/multiview/SplitAction.java index b9e8af21ff49..eb8a30d20212 100644 --- a/platform/core.multiview/src/org/netbeans/core/multiview/SplitAction.java +++ b/platform/core.multiview/src/org/netbeans/core/multiview/SplitAction.java @@ -55,7 +55,7 @@ public SplitAction(boolean useSplitName) { this.useSplitName = useSplitName; } - static Action createSplitAction(Map map) { + static Action createSplitAction(Map map) { if(!isSplitingEnabled()) { return null; } diff --git a/platform/core.multiview/src/org/netbeans/core/spi/multiview/MultiViewFactory.java b/platform/core.multiview/src/org/netbeans/core/spi/multiview/MultiViewFactory.java index bcbb00e992ce..98351e8629a7 100644 --- a/platform/core.multiview/src/org/netbeans/core/spi/multiview/MultiViewFactory.java +++ b/platform/core.multiview/src/org/netbeans/core/spi/multiview/MultiViewFactory.java @@ -176,7 +176,7 @@ static CloseOperationHandler createDefaultCloseOpHandler() { return new DefaultCloseHandler(); } - static MultiViewDescription createMultiViewDescription(Map map) { + static MultiViewDescription createMultiViewDescription(Map map) { return new MapMVD(map, null, false); } @@ -256,7 +256,7 @@ public boolean resolveCloseOperation(CloseOperationState[] elements) { Iterator it; if (elements != null) { boolean canBeClosed = true; - Map badOnes = new LinkedHashMap(); + Map badOnes = new LinkedHashMap<>(); for (int i = 0; i < elements.length; i++) { if (!elements[i].canClose()) { badOnes.put(elements[i].getCloseWarningID(), elements[i]); @@ -350,10 +350,10 @@ public void actionPerformed(java.awt.event.ActionEvent e) { /** default MultiViewDescription */ private static final class MapMVD implements MultiViewDescription, ContextAwareDescription , SourceCheckDescription { - private final Map map; + private final Map map; private final Lookup context; private boolean isSplitDescription; - public MapMVD(Map map, Lookup context, boolean isSplitDescription) { + public MapMVD(Map map, Lookup context, boolean isSplitDescription) { this.map = map; this.context = context; this.isSplitDescription = isSplitDescription; diff --git a/platform/openide.awt/src/org/openide/awt/Actions.java b/platform/openide.awt/src/org/openide/awt/Actions.java index 788ce4d53cc0..57581383c9d9 100644 --- a/platform/openide.awt/src/org/openide/awt/Actions.java +++ b/platform/openide.awt/src/org/openide/awt/Actions.java @@ -534,7 +534,7 @@ public static Action checkbox( String preferencesNode, String preferencesKey, String displayName, String iconBase, boolean noIconInMenu ) { - HashMap map = new HashMap(); + Map map = new HashMap<>(); map.put("preferencesNode", preferencesNode); // NOI18N map.put("preferencesKey", preferencesKey); // NOI18N map.put("displayName", displayName); // NOI18N @@ -600,7 +600,7 @@ public static ContextAwareAction callback( String key, Action fallback, boolean surviveFocusChange, String displayName, String iconBase, boolean noIconInMenu ) { - Map map = new HashMap(); + Map map = new HashMap<>(); map.put("key", key); // NOI18N map.put("surviveFocusChange", surviveFocusChange); // NOI18N map.put("fallback", fallback); // NOI18N @@ -609,7 +609,7 @@ public static ContextAwareAction callback( map.put("noIconInMenu", noIconInMenu); // NOI18N return callback(map); } - static ContextAwareAction callback(Map fo) { + static ContextAwareAction callback(Map fo) { return GeneralAction.callback(fo); } @@ -792,7 +792,7 @@ public static ContextAwareAction context( String key, String displayName, String iconBase, boolean noIconInMenu ) { - Map map = new HashMap(); + Map map = new HashMap<>(); map.put("key", key); // NOI18N map.put("surviveFocusChange", surviveFocusChange); // NOI18N map.put("delegate", delegate); // NOI18N diff --git a/platform/openide.awt/src/org/openide/awt/AlwaysEnabledAction.java b/platform/openide.awt/src/org/openide/awt/AlwaysEnabledAction.java index 07af67c85ffd..9687fe262fee 100644 --- a/platform/openide.awt/src/org/openide/awt/AlwaysEnabledAction.java +++ b/platform/openide.awt/src/org/openide/awt/AlwaysEnabledAction.java @@ -75,14 +75,14 @@ static AlwaysEnabledAction create(Map m) { return (m.containsKey(PREFERENCES_KEY)) ? new CheckBox(m) : new AlwaysEnabledAction(m); } - final Map map; + final Map map; private final AlwaysEnabledAction parent; private PropertyChangeListener weakL; ActionListener delegate; final Lookup context; final Object equals; - public AlwaysEnabledAction(Map m) { + public AlwaysEnabledAction(Map m) { super(); this.map = m; this.context = null; @@ -90,7 +90,7 @@ public AlwaysEnabledAction(Map m) { parent = null; } - AlwaysEnabledAction(Map m, AlwaysEnabledAction parent, Lookup context, Object equals) { + AlwaysEnabledAction(Map m, AlwaysEnabledAction parent, Lookup context, Object equals) { super(); this.map = m; this.parent = parent; @@ -198,7 +198,7 @@ public Object getValue(String name) { return o != null ? o : super.getValue(name); } - static final Object extractCommonAttribute(Map fo, String name) { + static final Object extractCommonAttribute(Map fo, String name) { try { if (Action.NAME.equals(name)) { String actionName = (String) fo.get("displayName"); // NOI18N diff --git a/platform/openide.awt/src/org/openide/awt/GeneralAction.java b/platform/openide.awt/src/org/openide/awt/GeneralAction.java index 3af7c62f901b..15c7c4d8b5f1 100644 --- a/platform/openide.awt/src/org/openide/awt/GeneralAction.java +++ b/platform/openide.awt/src/org/openide/awt/GeneralAction.java @@ -68,7 +68,7 @@ public static Action alwaysEnabled(Map map) { return new AlwaysEnabledAction(map); } - public static ContextAwareAction callback(Map map) { + public static ContextAwareAction callback(Map map) { Action fallback = (Action)map.get("fallback"); DelegateAction d = new DelegateAction(map, fallback); Parameters.notNull("key", d.key); @@ -88,7 +88,7 @@ public static ContextAwareAction context(Map map) { return context(map, false); } - static ContextAwareAction context(Map map, boolean instanceReady) { + static ContextAwareAction context(Map map, boolean instanceReady) { Class dataType = readClass(map.get("type")); // NOI18N ContextAwareAction ca = _context(map, dataType, Utilities.actionsGlobalContext(), instanceReady); // autodetect on/off actions @@ -104,7 +104,7 @@ public static Action bindContext(Map map, Lookup context) { return new BaseDelAction(map, _context(map, dataType, context, false)); } - private static ContextAwareAction _context(Map map, Class dataType, Lookup context, boolean instanceReady) { + private static ContextAwareAction _context(Map map, Class dataType, Lookup context, boolean instanceReady) { ContextSelection sel = readSelection(map.get("selectionType")); // NOI18N boolean survive = Boolean.TRUE.equals(map.get("surviveFocusChange")); // NOI18N StatefulMonitor enableMonitor = null; @@ -208,7 +208,7 @@ public DelegateAction(Map map, Object key, Lookup actionContext, Action fallback super(map, key, actionContext, fallback, surviveFocusChange, async); } - public DelegateAction(Map map, Action fallback) { + public DelegateAction(Map map, Action fallback) { super(map, fallback); } } // end of DelegateAction @@ -313,7 +313,7 @@ static class BaseDelAction extends Object * listens for changes of ActionMap in order to delegate * to right action. */ - protected BaseDelAction(Map map, Object key, Lookup actionContext, Action fallback, boolean surviveFocusChange, boolean async) { + protected BaseDelAction(Map map, Object key, Lookup actionContext, Action fallback, boolean surviveFocusChange, boolean async) { this.map = map; this.key = key; this.fallback = fallback; diff --git a/platform/openide.filesystems/src/org/openide/filesystems/XMLFileSystem.java b/platform/openide.filesystems/src/org/openide/filesystems/XMLFileSystem.java index 124b8649d445..19c898d77afa 100644 --- a/platform/openide.filesystems/src/org/openide/filesystems/XMLFileSystem.java +++ b/platform/openide.filesystems/src/org/openide/filesystems/XMLFileSystem.java @@ -1122,7 +1122,7 @@ static class Handler extends DefaultHandler { Stack resElemStack = new Stack(); Stack elementStack = new Stack(); URL urlContext; - private Map dtdMap; + private Map dtdMap; private ResourceElem topRE; private StringBuffer pcdata = new StringBuffer(); private int weight;