diff --git a/enterprise/glassfish.eecommon/nbproject/project.properties b/enterprise/glassfish.eecommon/nbproject/project.properties index 20b292e51e28..0f1f2a99658f 100644 --- a/enterprise/glassfish.eecommon/nbproject/project.properties +++ b/enterprise/glassfish.eecommon/nbproject/project.properties @@ -15,7 +15,7 @@ # specific language governing permissions and limitations # under the License. is.autoload=true -javac.source=1.6 +javac.source=1.8 javac.compilerargs=-Xlint -Xlint:-serial spec.version.base=1.44.0 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 501c79e6b70f..ef0a69a5fce5 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 @@ -497,7 +497,7 @@ private HashMap getPoolValues(HashMap cpMap, String poolName) { NodeList propsNodeList = cpElement.getElementsByTagName(CONST_PROP); //Cycle through each property element - HashMap map = new HashMap(); + HashMap map = new HashMap<>(); for (int j = 0; j < propsNodeList.getLength(); j++) { Node propNode = propsNodeList.item(j); NamedNodeMap propsMap = propNode.getAttributes(); diff --git a/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/templates/WebLogicDDWizardPanel.java b/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/templates/WebLogicDDWizardPanel.java index 87409534a95f..5015e16edf28 100644 --- a/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/templates/WebLogicDDWizardPanel.java +++ b/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/templates/WebLogicDDWizardPanel.java @@ -46,8 +46,7 @@ public class WebLogicDDWizardPanel implements WizardDescriptor.Panel { * The visual component that displays this panel. If you need to access the * component from this class, just use getComponent(). */ -// private final Set listeners = new HashSet(1); - private final Set listeners = new HashSet(1); + private final Set listeners = new HashSet(1); private WebLogicDDVisualPanel component = new WebLogicDDVisualPanel(); private WizardDescriptor wizardDescriptor; private Project project; @@ -129,16 +128,13 @@ public final void removeChangeListener(ChangeListener l) { } protected final void fireChangeEvent() { -// Iterator it; - Iterator it; + Iterator it; synchronized (listeners) { -// it = new HashSet(listeners).iterator(); - it = new HashSet(listeners).iterator(); + it = new HashSet(listeners).iterator(); } ChangeEvent ev = new ChangeEvent(this); while (it.hasNext()) { -// it.next().stateChanged(ev); - ((ChangeListener)it.next()).stateChanged(ev); + it.next().stateChanged(ev); } } diff --git a/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/TaskEvent.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/TaskEvent.java index c47a1dfb0090..380fe20fd10a 100644 --- a/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/TaskEvent.java +++ b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/TaskEvent.java @@ -130,7 +130,7 @@ public enum TaskEvent { * conversion. */ private static final Map stringValuesMap - = new HashMap(values().length); + = new HashMap<>(values().length); // Initialize backward String conversion Map. static { diff --git a/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/TaskState.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/TaskState.java index 3fc434b0c770..b5285b66ec18 100644 --- a/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/TaskState.java +++ b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/TaskState.java @@ -65,7 +65,7 @@ public enum TaskState { * conversion. */ private static final Map stringValuesMap - = new HashMap(values().length); + = new HashMap<>(values().length); // Initialize backward String conversion Map. static { diff --git a/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/data/GlassFishStatusCheck.java b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/data/GlassFishStatusCheck.java index b6bb45f7181e..b773c3839812 100644 --- a/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/data/GlassFishStatusCheck.java +++ b/enterprise/glassfish.tooling/src/org/netbeans/modules/glassfish/tooling/data/GlassFishStatusCheck.java @@ -64,7 +64,7 @@ public enum GlassFishStatusCheck { /** Stored String values for backward String * conversion. */ private static final Map stringValuesMap - = new HashMap(values().length); + = new HashMap<>(values().length); static { for (GlassFishStatusCheck state : GlassFishStatusCheck.values()) { stringValuesMap.put(state.toString().toUpperCase(), state); 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 47fd179e6d2e..43098262a591 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 @@ -492,7 +492,7 @@ private HashMap getPoolValues(HashMap cpMap, String poolName) { NodeList propsNodeList = cpElement.getElementsByTagName(CONST_PROP); //Cycle through each property element - HashMap map = new HashMap(); + Map map = new HashMap<>(); for (int j = 0; j < propsNodeList.getLength(); j++) { Node propNode = propsNodeList.item(j); NamedNodeMap propsMap = propNode.getAttributes(); diff --git a/enterprise/payara.eecommon/src/org/netbeans/modules/payara/eecommon/dd/wizard/PayaraDDWizardPanel.java b/enterprise/payara.eecommon/src/org/netbeans/modules/payara/eecommon/dd/wizard/PayaraDDWizardPanel.java index e5b2d85f3790..f1a70325010a 100644 --- a/enterprise/payara.eecommon/src/org/netbeans/modules/payara/eecommon/dd/wizard/PayaraDDWizardPanel.java +++ b/enterprise/payara.eecommon/src/org/netbeans/modules/payara/eecommon/dd/wizard/PayaraDDWizardPanel.java @@ -41,7 +41,7 @@ */ public class PayaraDDWizardPanel implements WizardDescriptor.Panel { - private final Set listeners = new HashSet(1); + private final Set listeners = new HashSet<>(1); private final PayaraDDVisualPanel component = new PayaraDDVisualPanel(); private WizardDescriptor wizardDescriptor; private Project project; @@ -117,13 +117,13 @@ public final void removeChangeListener(ChangeListener l) { } protected final void fireChangeEvent() { - Iterator it; + Iterator it; synchronized (listeners) { - it = new HashSet(listeners).iterator(); + it = new HashSet(listeners).iterator(); } ChangeEvent ev = new ChangeEvent(this); while (it.hasNext()) { - ((ChangeListener)it.next()).stateChanged(ev); + it.next().stateChanged(ev); } } 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 77a316e081e9..53044d20020f 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 @@ -503,7 +503,7 @@ private void distributeOnSave(File destDir, Iterable artifacts) throws // create target FOs map keyed by relative paths java.util.Enumeration destFiles = destRoot.getChildren(true); - Map destMap = new HashMap(); + Map destMap = new HashMap<>(); int rootPathLen = destRoot.getPath().length(); for (; destFiles.hasMoreElements();) { FileObject destFO = (FileObject) destFiles.nextElement(); diff --git a/enterprise/payara.tooling/src/org/netbeans/modules/payara/tooling/TaskEvent.java b/enterprise/payara.tooling/src/org/netbeans/modules/payara/tooling/TaskEvent.java index f059742ba52d..8990b3b52dc5 100644 --- a/enterprise/payara.tooling/src/org/netbeans/modules/payara/tooling/TaskEvent.java +++ b/enterprise/payara.tooling/src/org/netbeans/modules/payara/tooling/TaskEvent.java @@ -130,7 +130,7 @@ public enum TaskEvent { * conversion. */ private static final Map stringValuesMap - = new HashMap(values().length); + = new HashMap<>(values().length); // Initialize backward String conversion Map. static { diff --git a/enterprise/payara.tooling/src/org/netbeans/modules/payara/tooling/TaskState.java b/enterprise/payara.tooling/src/org/netbeans/modules/payara/tooling/TaskState.java index c61c32cc397e..49b7caff91d3 100644 --- a/enterprise/payara.tooling/src/org/netbeans/modules/payara/tooling/TaskState.java +++ b/enterprise/payara.tooling/src/org/netbeans/modules/payara/tooling/TaskState.java @@ -65,7 +65,7 @@ public enum TaskState { * conversion. */ private static final Map stringValuesMap - = new HashMap(values().length); + = new HashMap<>(values().length); // Initialize backward String conversion Map. static { diff --git a/enterprise/payara.tooling/src/org/netbeans/modules/payara/tooling/data/PayaraAdminInterface.java b/enterprise/payara.tooling/src/org/netbeans/modules/payara/tooling/data/PayaraAdminInterface.java index a04a18c3e6aa..d0701be20520 100644 --- a/enterprise/payara.tooling/src/org/netbeans/modules/payara/tooling/data/PayaraAdminInterface.java +++ b/enterprise/payara.tooling/src/org/netbeans/modules/payara/tooling/data/PayaraAdminInterface.java @@ -53,7 +53,7 @@ public enum PayaraAdminInterface { * conversion. */ private static final Map stringValuesMap - = new HashMap(values().length); + = new HashMap<>(values().length); // Initialize backward String conversion Map. static { diff --git a/enterprise/payara.tooling/src/org/netbeans/modules/payara/tooling/data/PayaraStatusCheck.java b/enterprise/payara.tooling/src/org/netbeans/modules/payara/tooling/data/PayaraStatusCheck.java index 84146b275322..edc02b2b2311 100644 --- a/enterprise/payara.tooling/src/org/netbeans/modules/payara/tooling/data/PayaraStatusCheck.java +++ b/enterprise/payara.tooling/src/org/netbeans/modules/payara/tooling/data/PayaraStatusCheck.java @@ -64,7 +64,7 @@ public enum PayaraStatusCheck { /** Stored String values for backward String * conversion. */ private static final Map stringValuesMap - = new HashMap(values().length); + = new HashMap<>(values().length); static { for (PayaraStatusCheck state : PayaraStatusCheck.values()) { stringValuesMap.put(state.toString().toUpperCase(), state); diff --git a/enterprise/payara.tooling/src/org/netbeans/modules/payara/tooling/data/PayaraVersion.java b/enterprise/payara.tooling/src/org/netbeans/modules/payara/tooling/data/PayaraVersion.java index a32f021121e0..55ec694c8902 100644 --- a/enterprise/payara.tooling/src/org/netbeans/modules/payara/tooling/data/PayaraVersion.java +++ b/enterprise/payara.tooling/src/org/netbeans/modules/payara/tooling/data/PayaraVersion.java @@ -199,7 +199,7 @@ public enum PayaraVersion { * conversion. */ private static final Map stringValuesMap - = new HashMap(2 * values().length); + = new HashMap<>(2 * values().length); // Initialize backward String conversion Map. static { diff --git a/groovy/gradle.java/src/org/netbeans/modules/gradle/java/GradleJavaTokenProvider.java b/groovy/gradle.java/src/org/netbeans/modules/gradle/java/GradleJavaTokenProvider.java index 8e79ed4681a5..7922fb1450e3 100644 --- a/groovy/gradle.java/src/org/netbeans/modules/gradle/java/GradleJavaTokenProvider.java +++ b/groovy/gradle.java/src/org/netbeans/modules/gradle/java/GradleJavaTokenProvider.java @@ -45,7 +45,7 @@ @ProjectServiceProvider(service = ReplaceTokenProvider.class, projectType = NbGradleProject.GRADLE_PLUGIN_TYPE + "/java-base") public class GradleJavaTokenProvider implements ReplaceTokenProvider { - private static final Set SUPPORTED = Collections.unmodifiableSet(new HashSet(Arrays.asList( + private static final Set SUPPORTED = Collections.unmodifiableSet(new HashSet(Arrays.asList( "selectedClass", //NOI18N "selectedMethod", //NOI18N "affectedBuildTasks" //NOI18N diff --git a/groovy/groovy.support/src/org/netbeans/modules/groovy/support/debug/GroovyBreakpointAnnotationListener.java b/groovy/groovy.support/src/org/netbeans/modules/groovy/support/debug/GroovyBreakpointAnnotationListener.java index 183a559a6ac8..1e406a78a970 100644 --- a/groovy/groovy.support/src/org/netbeans/modules/groovy/support/debug/GroovyBreakpointAnnotationListener.java +++ b/groovy/groovy.support/src/org/netbeans/modules/groovy/support/debug/GroovyBreakpointAnnotationListener.java @@ -39,7 +39,7 @@ */ public class GroovyBreakpointAnnotationListener extends DebuggerManagerAdapter { - private HashMap breakpointToAnnotation = new HashMap (); + private HashMap breakpointToAnnotation = new HashMap<>(); private boolean listen = true; @Override diff --git a/ide/db/src/org/netbeans/modules/db/explorer/DbDriverManager.java b/ide/db/src/org/netbeans/modules/db/explorer/DbDriverManager.java index 609080f3516b..69a87956e02f 100644 --- a/ide/db/src/org/netbeans/modules/db/explorer/DbDriverManager.java +++ b/ide/db/src/org/netbeans/modules/db/explorer/DbDriverManager.java @@ -59,7 +59,7 @@ public class DbDriverManager { private static final DbDriverManager DEFAULT = new DbDriverManager(); - private Set registeredDrivers; + private Set registeredDrivers; /** * Maps each connection to the driver used to create that connection. @@ -165,7 +165,7 @@ public Connection getSameDriverConnection(Connection existingConn, String databa */ public synchronized void registerDriver(Driver driver) { if (registeredDrivers == null) { - registeredDrivers = new HashSet(); + registeredDrivers = new HashSet<>(); } registeredDrivers.add(driver); } diff --git a/ide/editor.deprecated.pre65formatting/nbproject/project.properties b/ide/editor.deprecated.pre65formatting/nbproject/project.properties index 50fca260aaee..4b2b17e61809 100644 --- a/ide/editor.deprecated.pre65formatting/nbproject/project.properties +++ b/ide/editor.deprecated.pre65formatting/nbproject/project.properties @@ -15,6 +15,6 @@ # specific language governing permissions and limitations # under the License. is.autoload=true -javac.source=1.6 +javac.source=1.8 javac.compilerargs=-Xlint -Xlint:-serial spec.version.base=1.38.0 diff --git a/ide/editor.deprecated.pre65formatting/src/org/netbeans/editor/ext/ExtFormatter.java b/ide/editor.deprecated.pre65formatting/src/org/netbeans/editor/ext/ExtFormatter.java index 01ca107e3bb3..788b46a8828f 100644 --- a/ide/editor.deprecated.pre65formatting/src/org/netbeans/editor/ext/ExtFormatter.java +++ b/ide/editor.deprecated.pre65formatting/src/org/netbeans/editor/ext/ExtFormatter.java @@ -85,7 +85,7 @@ public class ExtFormatter extends Formatter implements FormatLayer { private static final Object NULL_VALUE = new Object(); /** Map that contains the requested [setting-name, setting-value] pairs */ - private final HashMap settingsMap = new HashMap(); + private final HashMap settingsMap = new HashMap<>(); private Acceptor indentHotCharsAcceptor; private boolean reindentWithTextBefore; diff --git a/ide/editor.deprecated.pre65formatting/src/org/netbeans/editor/ext/FormatTokenPositionSupport.java b/ide/editor.deprecated.pre65formatting/src/org/netbeans/editor/ext/FormatTokenPositionSupport.java index f31ba105e620..37778bfc3d12 100644 --- a/ide/editor.deprecated.pre65formatting/src/org/netbeans/editor/ext/FormatTokenPositionSupport.java +++ b/ide/editor.deprecated.pre65formatting/src/org/netbeans/editor/ext/FormatTokenPositionSupport.java @@ -43,7 +43,7 @@ class FormatTokenPositionSupport { private SaveSet lastSet; /** Map holding the [token, token-position-list] pairs. */ - private final HashMap tokens2positionLists = new HashMap(); + private final HashMap tokens2positionLists = new HashMap<>(); FormatTokenPositionSupport(FormatWriter formatWriter) { this.formatWriter = formatWriter; diff --git a/ide/editor.macros/src/org/netbeans/modules/editor/macros/storage/ui/TableSorter.java b/ide/editor.macros/src/org/netbeans/modules/editor/macros/storage/ui/TableSorter.java index ca9900b15df1..6e1eb444cd1b 100644 --- a/ide/editor.macros/src/org/netbeans/modules/editor/macros/storage/ui/TableSorter.java +++ b/ide/editor.macros/src/org/netbeans/modules/editor/macros/storage/ui/TableSorter.java @@ -66,7 +66,7 @@ public int compare(Object o1, Object o2) { private JTableHeader tableHeader; private MouseListener mouseListener; private TableModelListener tableModelListener; - private Map columnComparators = new HashMap(); + private Map columnComparators = new HashMap<>(); private List sortingColumns = new ArrayList(); public TableSorter() { diff --git a/ide/spi.debugger.ui/src/org/netbeans/spi/debugger/ui/EditorContextDispatcher.java b/ide/spi.debugger.ui/src/org/netbeans/spi/debugger/ui/EditorContextDispatcher.java index 3b608d390690..2da7842d5a2b 100644 --- a/ide/spi.debugger.ui/src/org/netbeans/spi/debugger/ui/EditorContextDispatcher.java +++ b/ide/spi.debugger.ui/src/org/netbeans/spi/debugger/ui/EditorContextDispatcher.java @@ -474,7 +474,7 @@ public void removePropertyChangeListener(PropertyChangeListener l) { pcs.removePropertyChangeListener(l); // Also remove the listener from all MIME types synchronized (pcsByMIMEType) { - Set MIMETypes = new HashSet(pcsByMIMEType.keySet()); + Set MIMETypes = new HashSet<>(pcsByMIMEType.keySet()); for (String MIMEType : MIMETypes) { PropertyChangeSupport _pcs = pcsByMIMEType.get(MIMEType); _pcs.removePropertyChangeListener(l); @@ -567,7 +567,7 @@ private void firePropertyChange(PropertyChangeEvent evt, String preferredMIMETyp Map> lastEvents; synchronized (this) { lastMIMEType = lastFiredMIMEType; - lastEvents = new HashMap(lastMIMETypeEvents); + lastEvents = new HashMap<>(lastMIMETypeEvents); if (lastMIMEType != null && lastMIMEType.equals(oldMIMEType)) { lastFiredMIMEType = null; lastMIMETypeEvents.clear(); diff --git a/ide/xml.catalog.ui/nbproject/project.properties b/ide/xml.catalog.ui/nbproject/project.properties index 10534adcdc49..055a9c8c6f9b 100644 --- a/ide/xml.catalog.ui/nbproject/project.properties +++ b/ide/xml.catalog.ui/nbproject/project.properties @@ -14,6 +14,6 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -javac.source=1.6 +javac.source=1.8 javac.compilerargs=-Xlint -Xlint:-serial spec.version.base=2.10.0 diff --git a/ide/xml.catalog.ui/src/org/netbeans/modules/xml/catalog/CatalogNode.java b/ide/xml.catalog.ui/src/org/netbeans/modules/xml/catalog/CatalogNode.java index d02c4218850f..569dd695afec 100644 --- a/ide/xml.catalog.ui/src/org/netbeans/modules/xml/catalog/CatalogNode.java +++ b/ide/xml.catalog.ui/src/org/netbeans/modules/xml/catalog/CatalogNode.java @@ -272,7 +272,7 @@ public Node[] createNodes(Object key) { public void reload() { //if ( Util.THIS.isLoggable() ) /* then */ Util.THIS.debug(" Reloading kids of " + peer + "..."); // NOI18N - Set previous = new HashSet(keys); + Set previous = new HashSet<>(keys); keys.clear(); Iterator it = peer.getPublicIDs(); if (it != null) { diff --git a/ide/xml.multiview/src/org/netbeans/modules/xml/multiview/ui/SectionNodeView.java b/ide/xml.multiview/src/org/netbeans/modules/xml/multiview/ui/SectionNodeView.java index ef80f0f4c176..75b1379120dc 100644 --- a/ide/xml.multiview/src/org/netbeans/modules/xml/multiview/ui/SectionNodeView.java +++ b/ide/xml.multiview/src/org/netbeans/modules/xml/multiview/ui/SectionNodeView.java @@ -38,7 +38,7 @@ public abstract class SectionNodeView extends SectionView { private final XmlMultiViewDataObject dataObject; private SectionNode rootNode = null; - private HashMap nodes = new HashMap(); + private HashMap nodes = new HashMap<>(); private final RequestProcessor.Task refreshTask = RequestProcessor.getDefault().create(new Runnable() { public void run() { diff --git a/ide/xml.multiview/src/org/netbeans/modules/xml/multiview/ui/SectionView.java b/ide/xml.multiview/src/org/netbeans/modules/xml/multiview/ui/SectionView.java index caa1074fc190..cdd676eae93d 100644 --- a/ide/xml.multiview/src/org/netbeans/modules/xml/multiview/ui/SectionView.java +++ b/ide/xml.multiview/src/org/netbeans/modules/xml/multiview/ui/SectionView.java @@ -21,6 +21,7 @@ import javax.swing.JPanel; import java.awt.*; +import java.util.Hashtable; import org.openide.nodes.Node; import org.netbeans.modules.xml.multiview.cookies.SectionFocusCookie; @@ -34,7 +35,7 @@ public class SectionView extends PanelView implements SectionFocusCookie, ContainerPanel { private JPanel scrollPanel, filler; javax.swing.JScrollPane scrollPane; - private java.util.Hashtable map; + private Hashtable map; private int sectionCount=0; private NodeSectionPanel activePanel; private InnerPanelFactory factory = null; @@ -59,7 +60,7 @@ public SectionView() { public void initComponents() { super.initComponents(); - map = new java.util.Hashtable(); + map = new Hashtable<>(); setLayout(new java.awt.BorderLayout()); scrollPanel = new JPanel(); scrollPanel.setLayout(new java.awt.GridBagLayout()); diff --git a/ide/xml.multiview/src/org/netbeans/modules/xml/multiview/ui/TreePanelView.java b/ide/xml.multiview/src/org/netbeans/modules/xml/multiview/ui/TreePanelView.java index 0629495d2e39..5d009b378bae 100644 --- a/ide/xml.multiview/src/org/netbeans/modules/xml/multiview/ui/TreePanelView.java +++ b/ide/xml.multiview/src/org/netbeans/modules/xml/multiview/ui/TreePanelView.java @@ -21,6 +21,7 @@ import javax.swing.*; import java.awt.*; +import java.util.HashMap; /** * TreePanelView.java @@ -30,7 +31,7 @@ */ public class TreePanelView extends PanelView { - java.util.HashMap map; + HashMap map; JPanel cardPanel; CardLayout cardLayout; public TreePanelView() { @@ -41,7 +42,7 @@ public void initComponents() { setLayout(new BorderLayout()); cardLayout = new CardLayout(); cardPanel = new JPanel(cardLayout); - map = new java.util.HashMap(); + map = new HashMap<>(); JScrollPane scrollPane = new JScrollPane(); scrollPane.setViewportView(cardPanel); add (scrollPane, BorderLayout.CENTER); 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 70d7cf0230ed..78e42c96eaaf 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 publicNodeTypeNamesMap = new HashMap(); + private static final Map, String> publicNodeTypeNamesMap = new HashMap(); // diff --git a/ide/xsl/nbproject/project.properties b/ide/xsl/nbproject/project.properties index a638f743606a..52c357a969c6 100644 --- a/ide/xsl/nbproject/project.properties +++ b/ide/xsl/nbproject/project.properties @@ -16,6 +16,6 @@ # under the License. javac.compilerargs=-Xlint -Xlint:-serial -javac.source=1.6 +javac.source=1.8 test.config.stableBTD.includes=**/*Test.class diff --git a/ide/xsl/src/org/netbeans/modules/xsl/grammar/XSLGrammarQuery.java b/ide/xsl/src/org/netbeans/modules/xsl/grammar/XSLGrammarQuery.java index bc2379398724..dd09311c335c 100644 --- a/ide/xsl/src/org/netbeans/modules/xsl/grammar/XSLGrammarQuery.java +++ b/ide/xsl/src/org/netbeans/modules/xsl/grammar/XSLGrammarQuery.java @@ -55,13 +55,13 @@ public final class XSLGrammarQuery implements GrammarQuery{ * allowed XSL children. Neither the element name keys nor the names in the * value set should contain the namespace prefix. */ - private static Map elementDecls; + private static Map elementDecls; /** Contains a mapping from XSL namespace element names to set of names of * allowed XSL attributes for that element. The element name keys should * not contain the namespace prefix. */ - private static Map attrDecls; + private static Map attrDecls; /** A Set of XSL attributes which should be allowd for result elements*/ private static Set resultElementAttr; @@ -130,8 +130,8 @@ public XSLGrammarQuery(DataObject dataObject) { private static Map getElementDecls() { if (elementDecls == null) { - elementDecls = new HashMap(); - attrDecls = new HashMap(); + elementDecls = new HashMap<>(); + attrDecls = new HashMap<>(); // Commonly used variables Set emptySet = new TreeSet(); diff --git a/java/ant.debugger/src/org/netbeans/modules/ant/debugger/AntDebugger.java b/java/ant.debugger/src/org/netbeans/modules/ant/debugger/AntDebugger.java index 55a9bf6a0b83..f9989468b483 100644 --- a/java/ant.debugger/src/org/netbeans/modules/ant/debugger/AntDebugger.java +++ b/java/ant.debugger/src/org/netbeans/modules/ant/debugger/AntDebugger.java @@ -129,8 +129,8 @@ public void taskFinished(org.openide.util.Task task) { // ActionsProvider ......................................................... - private static final Set actions = new HashSet (); - private static final Set actionsToDisable = new HashSet (); + private static final Set actions = new HashSet<>(); + private static final Set actionsToDisable = new HashSet<>(); static { actions.add (ActionsManager.ACTION_KILL); actions.add (ActionsManager.ACTION_CONTINUE); @@ -869,16 +869,16 @@ private LinkedList findPath ( /** * File as a script location is a key. Values are maps of name to Target. */ - private Map nameToTargetByFiles = new HashMap(); + private Map> nameToTargetByFiles = new HashMap<>(); /** * File as a script location is a key, values are project names. */ - private Map projectNamesByFiles = new HashMap(); + private Map projectNamesByFiles = new HashMap<>(); private synchronized TargetLister.Target findTarget(String name, File file) { - Map nameToTarget = (Map) nameToTargetByFiles.get(file); + Map nameToTarget = nameToTargetByFiles.get(file); if (nameToTarget == null) { - nameToTarget = new HashMap (); + nameToTarget = new HashMap<>(); FileObject fo = FileUtil.toFileObject(file); DataObject dob; try { diff --git a/java/ant.debugger/src/org/netbeans/modules/ant/debugger/DebuggerAntLogger.java b/java/ant.debugger/src/org/netbeans/modules/ant/debugger/DebuggerAntLogger.java index e435353c1a9f..ffa0cc70c4df 100644 --- a/java/ant.debugger/src/org/netbeans/modules/ant/debugger/DebuggerAntLogger.java +++ b/java/ant.debugger/src/org/netbeans/modules/ant/debugger/DebuggerAntLogger.java @@ -279,10 +279,10 @@ public int[] interestedInLogLevels (AntSession session) { } /** AntSession => AntDebugger */ - private Map runningDebuggers = new HashMap (); + private Map runningDebuggers = new HashMap<>(); /** AntDebugger => AntSession */ - private Map runningDebuggers2 = new HashMap (); - private Set filesToDebug = new HashSet (); + private Map runningDebuggers2 = new HashMap<>(); + private Set filesToDebug = new HashSet<>(); /** File => WeakReference -> ExecutorTask */ private Map fileExecutors = new HashMap(); diff --git a/java/ant.debugger/src/org/netbeans/modules/ant/debugger/IOManager.java b/java/ant.debugger/src/org/netbeans/modules/ant/debugger/IOManager.java index 389907ca0cdd..358430e6cb02 100644 --- a/java/ant.debugger/src/org/netbeans/modules/ant/debugger/IOManager.java +++ b/java/ant.debugger/src/org/netbeans/modules/ant/debugger/IOManager.java @@ -45,7 +45,7 @@ public class IOManager { /** output writer Thread */ - private Hashtable lines = new Hashtable (); + private Hashtable lines = new Hashtable<>(); private Listener listener = new Listener (); diff --git a/java/java.examples/src/org/netbeans/modules/java/examples/PanelConfigureProject.java b/java/java.examples/src/org/netbeans/modules/java/examples/PanelConfigureProject.java index 9184f46106b2..66a408f70505 100644 --- a/java/java.examples/src/org/netbeans/modules/java/examples/PanelConfigureProject.java +++ b/java/java.examples/src/org/netbeans/modules/java/examples/PanelConfigureProject.java @@ -66,7 +66,7 @@ public boolean isValid() { return component.valid(wizardDescriptor); } - private final Set/**/ listeners = new HashSet(1); + private final Set listeners = new HashSet<>(1); public final void addChangeListener(ChangeListener l) { synchronized (listeners) { listeners.add(l); @@ -78,13 +78,13 @@ public final void removeChangeListener(ChangeListener l) { } } protected final void fireChangeEvent() { - Iterator it; + Iterator it; synchronized (listeners) { - it = new HashSet(listeners).iterator(); + it = new HashSet(listeners).iterator(); } ChangeEvent ev = new ChangeEvent(this); while (it.hasNext()) { - ((ChangeListener)it.next()).stateChanged(ev); + it.next().stateChanged(ev); } } diff --git a/java/java.openjdk.project/src/org/netbeans/modules/java/openjdk/jtreg/JPDAStart.java b/java/java.openjdk.project/src/org/netbeans/modules/java/openjdk/jtreg/JPDAStart.java index f488aeb4516d..cf855c0c9162 100644 --- a/java/java.openjdk.project/src/org/netbeans/modules/java/openjdk/jtreg/JPDAStart.java +++ b/java/java.openjdk.project/src/org/netbeans/modules/java/openjdk/jtreg/JPDAStart.java @@ -202,7 +202,7 @@ public void run() { private static class Listener extends DebuggerManagerAdapter { private MethodBreakpoint breakpoint; - private final Set debuggers = new HashSet(); + private final Set debuggers = new HashSet<>(); Listener(MethodBreakpoint breakpoint) { diff --git a/java/maven.model/src/org/netbeans/modules/maven/model/settings/impl/ElementFactoryRegistry.java b/java/maven.model/src/org/netbeans/modules/maven/model/settings/impl/ElementFactoryRegistry.java index dea9be0aee4e..d79d1689d751 100644 --- a/java/maven.model/src/org/netbeans/modules/maven/model/settings/impl/ElementFactoryRegistry.java +++ b/java/maven.model/src/org/netbeans/modules/maven/model/settings/impl/ElementFactoryRegistry.java @@ -134,7 +134,7 @@ private Set knownElementNames() { public void addEmbeddedModelQNames(AbstractDocumentModel embeddedModel) { if (knownEmbeddedModelTypes == null) { - knownEmbeddedModelTypes = new HashSet(); + knownEmbeddedModelTypes = new HashSet<>(); } if (! knownEmbeddedModelTypes.contains(embeddedModel.getClass())) { knownQNames().addAll(embeddedModel.getQNames()); diff --git a/java/websvc.saas.codegen.java/src/org/netbeans/modules/websvc/saas/codegen/java/support/SourceGroupSupport.java b/java/websvc.saas.codegen.java/src/org/netbeans/modules/websvc/saas/codegen/java/support/SourceGroupSupport.java index 3f52f5134066..e94c4b115398 100644 --- a/java/websvc.saas.codegen.java/src/org/netbeans/modules/websvc/saas/codegen/java/support/SourceGroupSupport.java +++ b/java/websvc.saas.codegen.java/src/org/netbeans/modules/websvc/saas/codegen/java/support/SourceGroupSupport.java @@ -159,11 +159,11 @@ public static FileObject getFolderForPackage(SourceGroup sourceGroup, String pgk } private static Map createFoldersToSourceGroupsMap(final SourceGroup[] sourceGroups) { - Map result; + Map result; if (sourceGroups.length == 0) { - result = Collections.EMPTY_MAP; + result = Collections.emptyMap(); } else { - result = new HashMap(2 * sourceGroups.length, .5f); + result = new HashMap<>(2 * sourceGroups.length, .5f); for (int i = 0; i < sourceGroups.length; i++) { SourceGroup sourceGroup = sourceGroups[i]; result.put(sourceGroup.getRootFolder(), sourceGroup); @@ -172,9 +172,9 @@ private static Map createFoldersToSourceGroupsMap(final SourceGroup[] sourceGrou return result; } - private static Set/**/ getTestSourceGroups(SourceGroup[] sourceGroups) { + private static Set getTestSourceGroups(SourceGroup[] sourceGroups) { Map foldersToSourceGroupsMap = createFoldersToSourceGroupsMap(sourceGroups); - Set testGroups = new HashSet(); + Set testGroups = new HashSet<>(); for (int i = 0; i < sourceGroups.length; i++) { testGroups.addAll(getTestTargets(sourceGroups[i], foldersToSourceGroupsMap)); } diff --git a/java/xml.tools.java/src/org/netbeans/modules/xml/tools/java/generator/GenerateDOMScannerSupport.java b/java/xml.tools.java/src/org/netbeans/modules/xml/tools/java/generator/GenerateDOMScannerSupport.java index ae1ab018741a..c7deb22a47ff 100644 --- a/java/xml.tools.java/src/org/netbeans/modules/xml/tools/java/generator/GenerateDOMScannerSupport.java +++ b/java/xml.tools.java/src/org/netbeans/modules/xml/tools/java/generator/GenerateDOMScannerSupport.java @@ -311,7 +311,7 @@ public void run(Object parameter) throws Exception { private String generateElementScanner(TreeElementDecl element) { Iterator it; - Set elements = new HashSet(); + Set elements = new HashSet<>(); TreeElementDecl.ContentType type = element.getContentType(); diff --git a/platform/openide.actions/nbproject/project.properties b/platform/openide.actions/nbproject/project.properties index bc5872dd2425..a17685290a61 100644 --- a/platform/openide.actions/nbproject/project.properties +++ b/platform/openide.actions/nbproject/project.properties @@ -17,7 +17,7 @@ is.autoload=true javac.compilerargs=-Xlint -Xlint:-serial -javac.source=1.6 +javac.source=1.8 javadoc.main.page=org/openide/actions/doc-files/api.html javadoc.arch=${basedir}/arch.xml javadoc.apichanges=${basedir}/apichanges.xml diff --git a/platform/openide.actions/src/org/openide/actions/WorkspaceSwitchAction.java b/platform/openide.actions/src/org/openide/actions/WorkspaceSwitchAction.java index fcc39375f3d4..238fd69410c6 100644 --- a/platform/openide.actions/src/org/openide/actions/WorkspaceSwitchAction.java +++ b/platform/openide.actions/src/org/openide/actions/WorkspaceSwitchAction.java @@ -64,13 +64,13 @@ public JMenuItem getMenuPresenter() { final WindowManager pool = WindowManager.getDefault(); - final Hashtable menu2Workspace = new Hashtable(10); + final Hashtable menu2Workspace = new Hashtable<>(10); // ^ maps listener on workspace - final Hashtable workspace2Menu = new Hashtable(10); + final Hashtable workspace2Menu = new Hashtable<>(10); // ^ maps workspace to menuitem - final Hashtable workspace2Listener = new Hashtable(10); + final Hashtable workspace2Listener = new Hashtable<>(10); // ^ maps workspace to action listener final Workspace[] currentDeskRef = new Workspace[1]; @@ -173,8 +173,8 @@ public void propertyChange(PropertyChangeEvent che) { for (int i = 0; i < newWorkspaces.length; i++) { System.out.println ("New Value["+i+"]= "+newWorkspaces[i].getName()); }*/ - List newList = Arrays.asList(newWorkspaces); - List oldList = Arrays.asList(oldWorkspaces); + List newList = Arrays.asList(newWorkspaces); + List oldList = Arrays.asList(oldWorkspaces); // remove old for (int i = 0; i < oldWorkspaces.length; i++) { diff --git a/platform/openide.filesystems/src/org/openide/filesystems/DefaultAttributes.java b/platform/openide.filesystems/src/org/openide/filesystems/DefaultAttributes.java index 3f1b004e6277..9a519c9cf9d5 100644 --- a/platform/openide.filesystems/src/org/openide/filesystems/DefaultAttributes.java +++ b/platform/openide.filesystems/src/org/openide/filesystems/DefaultAttributes.java @@ -887,7 +887,7 @@ public Enumeration attrs(String fileName) { if (m == null) { return Enumerations.empty(); } else { - HashSet s = new HashSet(m.keySet()); + HashSet s = new HashSet<>(m.keySet()); return Collections.enumeration(s); } diff --git a/platform/openide.options/src/org/openide/options/SystemOption.java b/platform/openide.options/src/org/openide/options/SystemOption.java index 546641a1a0d8..32ba4491994e 100644 --- a/platform/openide.options/src/org/openide/options/SystemOption.java +++ b/platform/openide.options/src/org/openide/options/SystemOption.java @@ -275,7 +275,7 @@ private static boolean isInstance(Class c, Object o) { */ public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException { // hashtable that maps names of properties to setter methods - HashMap map = new HashMap(); + HashMap map = new HashMap<>(); try { synchronized (getLock()) { diff --git a/profiler/profiler.oql/src/org/netbeans/modules/profiler/oql/engine/api/impl/ReachableObjects.java b/profiler/profiler.oql/src/org/netbeans/modules/profiler/oql/engine/api/impl/ReachableObjects.java index 08c7dff39cf6..aa2f85406e05 100644 --- a/profiler/profiler.oql/src/org/netbeans/modules/profiler/oql/engine/api/impl/ReachableObjects.java +++ b/profiler/profiler.oql/src/org/netbeans/modules/profiler/oql/engine/api/impl/ReachableObjects.java @@ -42,7 +42,7 @@ public class ReachableObjects { public ReachableObjects(Instance root, final ReachableExcludes excludes) { this.root = root; this.excludes = excludes; - alreadyReached = new HashSet(); + alreadyReached = new HashSet<>(); } public Instance getRoot() { diff --git a/profiler/profiler.oql/src/org/netbeans/modules/profiler/oql/engine/api/impl/Snapshot.java b/profiler/profiler.oql/src/org/netbeans/modules/profiler/oql/engine/api/impl/Snapshot.java index 8b3853216e71..af60b912ae26 100644 --- a/profiler/profiler.oql/src/org/netbeans/modules/profiler/oql/engine/api/impl/Snapshot.java +++ b/profiler/profiler.oql/src/org/netbeans/modules/profiler/oql/engine/api/impl/Snapshot.java @@ -334,10 +334,10 @@ public State(ReferenceChain path, Iterator iterator) { this.path = path; } } - Deque stack = new ArrayDeque(); - Set ignored = new HashSet(); + Deque stack = new ArrayDeque<>(); + Set ignored = new HashSet<>(); - List result = new ArrayList(); + List result = new ArrayList<>(); Iterator toInspect = getRoots(); ReferenceChain path = null; diff --git a/webcommon/cordova.platforms.android/src/org/netbeans/modules/cordova/platforms/android/Target.java b/webcommon/cordova.platforms.android/src/org/netbeans/modules/cordova/platforms/android/Target.java index 641442765a78..47815425bc79 100644 --- a/webcommon/cordova.platforms.android/src/org/netbeans/modules/cordova/platforms/android/Target.java +++ b/webcommon/cordova.platforms.android/src/org/netbeans/modules/cordova/platforms/android/Target.java @@ -42,7 +42,7 @@ public class Target implements SDK { private static final Logger LOG = Logger.getLogger(Target.class.getName()); private Target() { - this.props = new HashMap(); + this.props = new HashMap<>(); } public static Collection parse(String output) throws IOException { diff --git a/webcommon/extbrowser.chrome/src/org/netbeans/modules/extbrowser/plugins/ExternalBrowserPlugin.java b/webcommon/extbrowser.chrome/src/org/netbeans/modules/extbrowser/plugins/ExternalBrowserPlugin.java index e907740655f5..7cb9275fca9b 100644 --- a/webcommon/extbrowser.chrome/src/org/netbeans/modules/extbrowser/plugins/ExternalBrowserPlugin.java +++ b/webcommon/extbrowser.chrome/src/org/netbeans/modules/extbrowser/plugins/ExternalBrowserPlugin.java @@ -649,21 +649,21 @@ private static String reformatFileURL(String url) { } private String createCloseTabMessage(int tabId) { - Map params = new HashMap(); + Map params = new HashMap<>(); params.put( Message.TAB_ID, tabId ); Message msg = new Message( Message.MessageType.CLOSE, params); return msg.toStringValue(); } private String createAttachDebuggerMessage(int tabId) { - Map params = new HashMap(); + Map params = new HashMap<>(); params.put( Message.TAB_ID, tabId ); Message msg = new Message( Message.MessageType.ATTACH_DEBUGGER, params); return msg.toStringValue(); } private String createDetachDebuggerMessage(int tabId) { - Map params = new HashMap(); + Map params = new HashMap<>(); params.put( Message.TAB_ID, tabId ); Message msg = new Message( Message.MessageType.DETACH_DEBUGGER, params); return msg.toStringValue(); diff --git a/webcommon/html.ojet/src/org/netbeans/modules/html/ojet/data/DataProviderImpl.java b/webcommon/html.ojet/src/org/netbeans/modules/html/ojet/data/DataProviderImpl.java index 3f49325ca87c..8e6e52094f6e 100644 --- a/webcommon/html.ojet/src/org/netbeans/modules/html/ojet/data/DataProviderImpl.java +++ b/webcommon/html.ojet/src/org/netbeans/modules/html/ojet/data/DataProviderImpl.java @@ -45,7 +45,7 @@ public class DataProviderImpl extends DataProvider { private static final String ZIP_PREFIX = "ojetdocs-"; private static final String ZIP_EXTENSION = ".zip"; protected static final String DEFAULT_VERSION = "2.0.0"; - private static final HashMap data = new HashMap(); + private static final HashMap data = new HashMap<>(); private static DataItemImpl.DataItemModule moduleData = null; private static FileObject docRoot = null; private static String currentVersion; diff --git a/webcommon/javascript2.model/src/org/netbeans/modules/javascript2/model/JsFunctionImpl.java b/webcommon/javascript2.model/src/org/netbeans/modules/javascript2/model/JsFunctionImpl.java index c5c1d0a18732..57e0d0ea7a91 100644 --- a/webcommon/javascript2.model/src/org/netbeans/modules/javascript2/model/JsFunctionImpl.java +++ b/webcommon/javascript2.model/src/org/netbeans/modules/javascript2/model/JsFunctionImpl.java @@ -162,8 +162,8 @@ public Collection getReturnTypes() { if (areReturnTypesResolved) { return Collections.emptyList(); } - Collection returns = new HashSet(); - HashSet nameReturnTypes = new HashSet(); + Collection returns = new HashSet<>(); + HashSet nameReturnTypes = new HashSet<>(); areReturnTypesResolved = true; for(TypeUsage type : returnTypes) { if (type.isResolved()) { diff --git a/webcommon/javascript2.model/src/org/netbeans/modules/javascript2/model/JsObjectImpl.java b/webcommon/javascript2.model/src/org/netbeans/modules/javascript2/model/JsObjectImpl.java index b30de27115c1..b1a62590d19f 100644 --- a/webcommon/javascript2.model/src/org/netbeans/modules/javascript2/model/JsObjectImpl.java +++ b/webcommon/javascript2.model/src/org/netbeans/modules/javascript2/model/JsObjectImpl.java @@ -384,7 +384,8 @@ public final void setJsKind(JsElement.Kind kind) { this.kind = kind; } - protected Collection resolveAssignments(JsObject jsObject, int offset) { Collection visited = new HashSet(); // for preventing infinited loops + protected Collection resolveAssignments(JsObject jsObject, int offset) { + Collection visited = new HashSet<>(); // for preventing infinited loops return resolveAssignments(jsObject, offset, visited); }