You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by bw...@apache.org on 2021/07/15 22:44:30 UTC
[netbeans] branch master updated: [NETBEANS-5682] - cleanup more of
the raw type iterator warnings..
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 4eb3f94 [NETBEANS-5682] - cleanup more of the raw type iterator warnings..
new 40c79b9 Merge pull request #2957 from BradWalker/cleanup_raw_type_iterators
4eb3f94 is described below
commit 4eb3f94259e2faef3c8bc9c34a933dffe5d90889
Author: Brad Walker <bw...@musings.com>
AuthorDate: Sat May 15 10:34:19 2021 -0600
[NETBEANS-5682] - cleanup more of the raw type iterator warnings..
I've been away for a little while due to life happening.. But, the Netbeans Rust Remover is back.. 8-)
This issue cleans up more of the raw type iterator warnings..
[repeat] /home/bwalker/src/netbeans/enterprise/web.freeform/src/org/netbeans/modules/web/freeform/ui/NewWebFreeformProjectWizardIterator.java:111: warning: [rawtypes] found raw type: Iterator
[repeat] Iterator iter = webModules.iterator();
[repeat] ^
[repeat] missing type arguments for generic class Iterator<E>
[repeat] where E is a type-variable:
[repeat] E extends Object declared in interface Iterator
---
.../j2ee/clientproject/ui/customizer/CustomizerLibraries.java | 4 ++--
.../netbeans/modules/j2ee/common/DatasourceCustomizer.java | 2 +-
.../modules/j2ee/common/ui/BrokenDatasourceSupport.java | 2 +-
.../j2ee/common/ui/MissingDatabaseConnectionWarning.java | 2 +-
.../modules/j2ee/dd/impl/commonws/ComponentBeanMultiple.java | 11 +++++++----
.../j2ee/dd/impl/commonws/DescriptionBeanMultiple.java | 4 +++-
.../netbeans/modules/j2ee/ddloaders/app/DDChangesPanel.java | 2 +-
.../modules/j2ee/ddloaders/client/DDChangesPanel.java | 2 +-
.../j2ee/ddloaders/multiview/EntityAndSessionHelper.java | 2 +-
.../modules/j2ee/ddloaders/multiview/EntityHelper.java | 4 ++--
.../netbeans/modules/j2ee/earproject/EarActionProvider.java | 4 ++--
.../j2ee/earproject/ui/customizer/CustomizerLibraries.java | 4 ++--
.../j2ee/ejbcore/api/codegeneration/CallEjbGenerator.java | 4 ++--
.../modules/j2ee/ejbjarproject/UpdateProjectImpl.java | 2 +-
.../j2ee/ejbjarproject/ui/customizer/CustomizerLibraries.java | 2 +-
.../modules/web/freeform/WebFreeFormActionProvider.java | 2 +-
.../modules/web/jsf/dialogs/AddNavigationCaseDialog.java | 2 +-
.../org/netbeans/modules/web/monitor/client/Controller.java | 2 +-
.../modules/editor/fold/ui/CaretFoldExpanderImpl.java | 4 ++--
.../src/org/netbeans/modules/xml/dtd/grammar/DTDGrammar.java | 2 +-
.../modules/xml/multiview/XmlMultiViewEditorSupport.java | 2 +-
.../org/netbeans/modules/xml/actions/CollectSystemAction.java | 4 ++--
.../java/api/common/project/ui/customizer/SourceRootsUi.java | 2 +-
.../modules/java/j2seproject/resources/build-impl.xsl | 4 ++--
.../org/netbeans/modules/java/openjdk/jtreg/JPDAStart.java | 2 +-
.../test/unit/data/simple-app/nbproject/build-impl.xml | 4 ++--
.../netbeans/modules/maven/grammar/MavenAssemblyGrammar.java | 2 +-
.../netbeans/modules/maven/grammar/MavenProjectGrammar.java | 2 +-
.../modules/xml/tools/java/generator/ElementBindings.java | 2 +-
.../xml/tools/java/generator/GenerateDOMScannerSupport.java | 1 -
.../netbeans/core/multiview/MultiViewTopComponentLookup.java | 2 +-
.../openide.actions/src/org/openide/actions/ToolsAction.java | 3 ++-
.../src/org/openide/filesystems/StreamPool.java | 2 +-
.../src/org/openide/util/lookup/ProxyLookup.java | 2 +-
34 files changed, 51 insertions(+), 46 deletions(-)
diff --git a/enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/customizer/CustomizerLibraries.java b/enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/customizer/CustomizerLibraries.java
index 4470c57..7dfac3a 100644
--- a/enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/customizer/CustomizerLibraries.java
+++ b/enterprise/j2ee.clientproject/src/org/netbeans/modules/j2ee/clientproject/ui/customizer/CustomizerLibraries.java
@@ -236,7 +236,7 @@ public class CustomizerLibraries extends JPanel implements HelpCtx.Provider, Lis
uiProperties.RUN_TEST_CLASSPATH_MODEL
};
for (int i = 0; i < models.length; i++) {
- for (Iterator it = ClassPathUiSupport.getIterator(models[i]); it.hasNext();) {
+ for (Iterator<ClassPathSupport.Item> it = ClassPathUiSupport.getIterator(models[i]); it.hasNext();) {
ClassPathSupport.Item itm = (ClassPathSupport.Item) it.next();
if (itm.getType() == ClassPathSupport.Item.TYPE_LIBRARY) {
itm.reassignLibraryManager(man);
@@ -263,7 +263,7 @@ public class CustomizerLibraries extends JPanel implements HelpCtx.Provider, Lis
boolean broken = false;
for( int i = 0; i < models.length; i++ ) {
- for( Iterator it = ClassPathUiSupport.getIterator( models[i] ); it.hasNext(); ) {
+ for (Iterator<ClassPathSupport.Item> it = ClassPathUiSupport.getIterator( models[i] ); it.hasNext(); ) {
if ( ((ClassPathSupport.Item)it.next()).isBroken() ) {
broken = true;
break;
diff --git a/enterprise/j2ee.common/src/org/netbeans/modules/j2ee/common/DatasourceCustomizer.java b/enterprise/j2ee.common/src/org/netbeans/modules/j2ee/common/DatasourceCustomizer.java
index b9e2e12..2f46371 100644
--- a/enterprise/j2ee.common/src/org/netbeans/modules/j2ee/common/DatasourceCustomizer.java
+++ b/enterprise/j2ee.common/src/org/netbeans/modules/j2ee/common/DatasourceCustomizer.java
@@ -61,7 +61,7 @@ class DatasourceCustomizer extends javax.swing.JPanel {
public DatasourceCustomizer(List<Datasource> datasources) {
if (datasources != null) { // transform Set to Map for faster searching
this.datasources = new HashMap<String, Datasource>();
- for (Iterator it = datasources.iterator(); it.hasNext();) {
+ for (Iterator<Datasource> it = datasources.iterator(); it.hasNext();) {
Datasource ds = (Datasource) it.next();
if (ds.getJndiName() != null)
this.datasources.put(ds.getJndiName(), ds);
diff --git a/enterprise/j2ee.common/src/org/netbeans/modules/j2ee/common/ui/BrokenDatasourceSupport.java b/enterprise/j2ee.common/src/org/netbeans/modules/j2ee/common/ui/BrokenDatasourceSupport.java
index 92cb203..86b9f82 100644
--- a/enterprise/j2ee.common/src/org/netbeans/modules/j2ee/common/ui/BrokenDatasourceSupport.java
+++ b/enterprise/j2ee.common/src/org/netbeans/modules/j2ee/common/ui/BrokenDatasourceSupport.java
@@ -134,7 +134,7 @@ public class BrokenDatasourceSupport {
}
Set<Datasource> brokenDatasources = new HashSet<Datasource>();
- Iterator it = dss.iterator();
+ Iterator<Datasource> it = dss.iterator();
while (it.hasNext()) {
Datasource ds = (Datasource)it.next();
if(!isFound(ds)){
diff --git a/enterprise/j2ee.common/src/org/netbeans/modules/j2ee/common/ui/MissingDatabaseConnectionWarning.java b/enterprise/j2ee.common/src/org/netbeans/modules/j2ee/common/ui/MissingDatabaseConnectionWarning.java
index 7c22b89..5abce0f 100644
--- a/enterprise/j2ee.common/src/org/netbeans/modules/j2ee/common/ui/MissingDatabaseConnectionWarning.java
+++ b/enterprise/j2ee.common/src/org/netbeans/modules/j2ee/common/ui/MissingDatabaseConnectionWarning.java
@@ -257,7 +257,7 @@ public final class MissingDatabaseConnectionWarning extends JPanel {
if (!jButtonAddConnection.isEnabled()) {
jButtonAddConnection.setEnabled(true);
}
- Iterator it = datasources.iterator();
+ Iterator<Datasource> it = datasources.iterator();
int i = 0;
while (it.hasNext()) {
if (index >= 0 && index <= datasources.size()) {
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 89ee621..8db8433 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
@@ -24,8 +24,11 @@
*/
package org.netbeans.modules.j2ee.dd.impl.commonws;
+import java.util.Iterator;
+import java.util.List;
import org.netbeans.modules.schema2beans.Version;
import org.netbeans.modules.j2ee.dd.api.common.*;
+import org.netbeans.modules.j2ee.dd.api.common.Icon;
import org.openide.ErrorManager;
public abstract class ComponentBeanMultiple extends DescriptionBeanMultiple implements DisplayNameInterface, IconInterface {
@@ -83,7 +86,7 @@ public abstract class ComponentBeanMultiple extends DescriptionBeanMultiple impl
public void setAllDisplayNames(java.util.Map displayNames) throws VersionNotSupportedException {
removeAllDisplayNames();
if (displayNames!=null) {
- java.util.Iterator keys = displayNames.keySet().iterator();
+ Iterator<String> keys = displayNames.keySet().iterator();
int i=0;
while (keys.hasNext()) {
String key = (String) keys.next();
@@ -317,8 +320,8 @@ public abstract class ComponentBeanMultiple extends DescriptionBeanMultiple impl
}
public void removeIcon(String locale, boolean isSmall) throws VersionNotSupportedException {
- org.netbeans.modules.j2ee.dd.api.common.Icon[] icons = getIcon();
- java.util.List iconList = new java.util.ArrayList();
+ Icon[] icons = getIcon();
+ List<Icon> iconList = new java.util.ArrayList<>();
for (int i=0;i<icons.length;i++) {
String loc=icons[i].getXmlLang();
if ((locale==null && loc==null) || (locale!=null && locale.equalsIgnoreCase(loc))) {
@@ -331,7 +334,7 @@ public abstract class ComponentBeanMultiple extends DescriptionBeanMultiple impl
}
}
}
- java.util.Iterator it = iconList.iterator();
+ Iterator<Icon> it = iconList.iterator();
while(it.hasNext()) removeIcon((org.netbeans.modules.j2ee.dd.api.common.Icon)it.next());
}
}
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 f966294..b76e230 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
@@ -25,6 +25,8 @@
package org.netbeans.modules.j2ee.dd.impl.commonws;
+import java.util.Iterator;
+
import org.netbeans.modules.schema2beans.Version;
import org.netbeans.modules.j2ee.dd.api.common.*;
import org.openide.ErrorManager;
@@ -76,7 +78,7 @@ public abstract class DescriptionBeanMultiple extends EnclosingBean implements D
public void setAllDescriptions(java.util.Map descriptions) throws VersionNotSupportedException {
removeAllDescriptions();
if (descriptions!=null) {
- java.util.Iterator keys = descriptions.keySet().iterator();
+ Iterator<String> keys = descriptions.keySet().iterator();
int i=0;
while (keys.hasNext()) {
String key = (String) keys.next();
diff --git a/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/app/DDChangesPanel.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/app/DDChangesPanel.java
index d38aacd..5b26709 100644
--- a/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/app/DDChangesPanel.java
+++ b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/app/DDChangesPanel.java
@@ -104,7 +104,7 @@ public class DDChangesPanel extends JPanel {
synchronized void setChanges (List changes) {
listModel.clear ();
if (changes != null) {
- Iterator it = changes.iterator ();
+ Iterator<?> it = changes.iterator ();
while (it.hasNext ())
listModel.addElement (it.next ());
}
diff --git a/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/client/DDChangesPanel.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/client/DDChangesPanel.java
index 629431a..c330500 100644
--- a/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/client/DDChangesPanel.java
+++ b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/client/DDChangesPanel.java
@@ -104,7 +104,7 @@ public class DDChangesPanel extends JPanel {
synchronized void setChanges (List changes) {
listModel.clear ();
if (changes != null) {
- Iterator it = changes.iterator ();
+ Iterator<?> it = changes.iterator ();
while (it.hasNext ())
listModel.addElement (it.next ());
}
diff --git a/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/EntityAndSessionHelper.java b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/EntityAndSessionHelper.java
index ec13991..fd69cbf 100644
--- a/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/EntityAndSessionHelper.java
+++ b/enterprise/j2ee.ddloaders/src/org/netbeans/modules/j2ee/ddloaders/multiview/EntityAndSessionHelper.java
@@ -91,7 +91,7 @@ public abstract class EntityAndSessionHelper implements PropertyChangeListener,
}
protected void firePropertyChange(PropertyChangeEvent evt) {
- for (Iterator iterator = listeners.iterator(); iterator.hasNext();) {
+ for (Iterator<PropertyChangeListener> iterator = listeners.iterator(); iterator.hasNext();) {
((PropertyChangeListener) iterator.next()).propertyChange(evt);
}
}
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 d07ef49..2c251a1 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
@@ -195,7 +195,7 @@ public class EntityHelper extends EntityAndSessionHelper {
}
protected void firePropertyChange(PropertyChangeEvent evt) {
- for (Iterator iterator = listeners.iterator(); iterator.hasNext();) {
+ for (Iterator<PropertyChangeListener> iterator = listeners.iterator(); iterator.hasNext();) {
((PropertyChangeListener) iterator.next()).propertyChange(evt);
}
}
@@ -301,7 +301,7 @@ public class EntityHelper extends EntityAndSessionHelper {
}
protected void firePropertyChange(PropertyChangeEvent evt) {
- for (Iterator iterator = listeners.iterator(); iterator.hasNext();) {
+ for (Iterator<PropertyChangeListener> iterator = listeners.iterator(); iterator.hasNext();) {
((PropertyChangeListener) iterator.next()).propertyChange(evt);
}
}
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 914d62d..73fe5d3 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
@@ -245,7 +245,7 @@ public class EarActionProvider implements ActionProvider {
if (null != spp) {
StringBuilder edbd = new StringBuilder();
final Set s = spp.getSubprojects();
- Iterator iter = s.iterator();
+ Iterator<Project> iter = s.iterator();
while (iter.hasNext()) {
Project proj = (Project) iter.next();
WebModuleProvider wmp = proj.getLookup().lookup(WebModuleProvider.class);
@@ -278,7 +278,7 @@ public class EarActionProvider implements ActionProvider {
if (null != spp) {
StringBuilder edbd = new StringBuilder();
final Set s = spp.getSubprojects();
- Iterator iter = s.iterator();
+ Iterator<Project> iter = s.iterator();
while (iter.hasNext()) {
Project proj = (Project) iter.next();
WebModuleProvider wmp = proj.getLookup().lookup(WebModuleProvider.class);
diff --git a/enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/customizer/CustomizerLibraries.java b/enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/customizer/CustomizerLibraries.java
index e7a8f84..206fcd4 100644
--- a/enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/customizer/CustomizerLibraries.java
+++ b/enterprise/j2ee.earproject/src/org/netbeans/modules/j2ee/earproject/ui/customizer/CustomizerLibraries.java
@@ -101,7 +101,7 @@ public final class CustomizerLibraries extends JPanel implements HelpCtx.Provide
boolean broken = false;
for( int i = 0; i < models.length; i++ ) {
- for( Iterator it = ClassPathUiSupport.getIterator( models[i] ); it.hasNext(); ) {
+ for (Iterator<ClassPathSupport.Item> it = ClassPathUiSupport.getIterator( models[i] ); it.hasNext(); ) {
if ( ((ClassPathSupport.Item)it.next()).isBroken() ) {
broken = true;
break;
@@ -157,7 +157,7 @@ public final class CustomizerLibraries extends JPanel implements HelpCtx.Provide
uiProperties.ENDORSED_CLASSPATH_MODEL,
};
for (int i = 0; i < models.length; i++) {
- for (Iterator it = ClassPathUiSupport.getIterator(models[i]); it.hasNext();) {
+ for (Iterator<ClassPathSupport.Item> it = ClassPathUiSupport.getIterator(models[i]); it.hasNext();) {
ClassPathSupport.Item itm = (ClassPathSupport.Item) it.next();
if (itm.getType() == ClassPathSupport.Item.TYPE_LIBRARY) {
itm.reassignLibraryManager(man);
diff --git a/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/CallEjbGenerator.java b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/CallEjbGenerator.java
index 0d25cc2..cc648dc 100644
--- a/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/CallEjbGenerator.java
+++ b/enterprise/j2ee.ejbcore/src/org/netbeans/modules/j2ee/ejbcore/api/codegeneration/CallEjbGenerator.java
@@ -436,7 +436,7 @@ public class CallEjbGenerator {
}
}
if (!throwCheckedExceptions) {
- Iterator exIt = exceptions.iterator();
+ Iterator<String> exIt = exceptions.iterator();
StringBuffer catchBody = new StringBuffer("try {\n" + body + "}\n"); // NOI18N
while (exIt.hasNext()) {
String exceptionName = (String) exIt.next();
@@ -517,7 +517,7 @@ public class CallEjbGenerator {
body = sls.genLocalEjbStringLookup(refName, homeName, referencingFO, referencingClassName, genCreate);
}
if (!throwCheckedExceptions) {
- Iterator exIt = exceptions.iterator();
+ Iterator<String> exIt = exceptions.iterator();
StringBuffer catchBody = new StringBuffer("try {\n" + body + "\n}"); // NOI18N
while (exIt.hasNext()) {
String exceptionName = (String) exIt.next();
diff --git a/enterprise/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/UpdateProjectImpl.java b/enterprise/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/UpdateProjectImpl.java
index a38b474..8a40ad3 100644
--- a/enterprise/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/UpdateProjectImpl.java
+++ b/enterprise/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/UpdateProjectImpl.java
@@ -195,7 +195,7 @@ public class UpdateProjectImpl implements UpdateImplementation {
List/*<URL>*/ roots = LibraryManager.getDefault().getLibrary(libName).getContent("classpath"); //NOI18N
ArrayList<FileObject> files = new ArrayList<FileObject>();
ArrayList<FileObject> dirs = new ArrayList<FileObject>();
- for (Iterator it = roots.iterator(); it.hasNext();) {
+ for (Iterator<URL> it = roots.iterator(); it.hasNext();) {
URL rootUrl = (URL) it.next();
FileObject root = org.openide.filesystems.URLMapper.findFileObject (rootUrl);
if ("jar".equals(rootUrl.getProtocol())) { //NOI18N
diff --git a/enterprise/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/ui/customizer/CustomizerLibraries.java b/enterprise/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/ui/customizer/CustomizerLibraries.java
index 540c275..11e79ac 100644
--- a/enterprise/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/ui/customizer/CustomizerLibraries.java
+++ b/enterprise/j2ee.ejbjarproject/src/org/netbeans/modules/j2ee/ejbjarproject/ui/customizer/CustomizerLibraries.java
@@ -205,7 +205,7 @@ public class CustomizerLibraries extends JPanel implements HelpCtx.Provider, Lis
uiProperties.RUN_TEST_CLASSPATH_MODEL
};
for (int i = 0; i < models.length; i++) {
- for (Iterator it = ClassPathUiSupport.getIterator(models[i]); it.hasNext();) {
+ for (Iterator<ClassPathSupport.Item> it = ClassPathUiSupport.getIterator(models[i]); it.hasNext();) {
ClassPathSupport.Item itm = (ClassPathSupport.Item) it.next();
if (itm.getType() == ClassPathSupport.Item.TYPE_LIBRARY) {
itm.reassignLibraryManager(man);
diff --git a/enterprise/web.freeform/src/org/netbeans/modules/web/freeform/WebFreeFormActionProvider.java b/enterprise/web.freeform/src/org/netbeans/modules/web/freeform/WebFreeFormActionProvider.java
index c50725f..3748440 100644
--- a/enterprise/web.freeform/src/org/netbeans/modules/web/freeform/WebFreeFormActionProvider.java
+++ b/enterprise/web.freeform/src/org/netbeans/modules/web/freeform/WebFreeFormActionProvider.java
@@ -664,7 +664,7 @@ public class WebFreeFormActionProvider implements ActionProvider {
Element data = Util.getPrimaryConfigurationData(helper);
Element foldersEl = XMLUtil.findElement(data, "folders", Util.NAMESPACE); // NOI18N
if (foldersEl != null) {
- for (Iterator i = XMLUtil.findSubElements(foldersEl).iterator(); i.hasNext();) {
+ for (Iterator<Element> i = XMLUtil.findSubElements(foldersEl).iterator(); i.hasNext();) {
Element sourceFolderEl = (Element)i.next();
Element typeEl = XMLUtil.findElement(sourceFolderEl , "type", Util.NAMESPACE); // NOI18N
if (typeEl == null || !XMLUtil.findText(typeEl).equals(type))
diff --git a/enterprise/web.jsf/src/org/netbeans/modules/web/jsf/dialogs/AddNavigationCaseDialog.java b/enterprise/web.jsf/src/org/netbeans/modules/web/jsf/dialogs/AddNavigationCaseDialog.java
index eba910e..3246611 100644
--- a/enterprise/web.jsf/src/org/netbeans/modules/web/jsf/dialogs/AddNavigationCaseDialog.java
+++ b/enterprise/web.jsf/src/org/netbeans/modules/web/jsf/dialogs/AddNavigationCaseDialog.java
@@ -48,7 +48,7 @@ public class AddNavigationCaseDialog extends javax.swing.JPanel implements Valid
DefaultComboBoxModel modelT = (DefaultComboBoxModel)jComboBoxToView.getModel();
modelF.addElement("");
modelT.addElement("");
- Iterator iter = facesConfig.getNavigationRules().iterator();
+ Iterator<NavigationRule> iter = facesConfig.getNavigationRules().iterator();
while (iter.hasNext()) {
String fromViewID=((NavigationRule)iter.next()).getFromViewId();
if (fromViewID != null && fromViewID.trim().length() > 0){
diff --git a/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/client/Controller.java b/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/client/Controller.java
index 3ccfb0e..e59b71b 100644
--- a/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/client/Controller.java
+++ b/enterprise/web.monitor/src/org/netbeans/modules/web/monitor/client/Controller.java
@@ -959,7 +959,7 @@ class Controller {
}
RequestProcessor.getDefault().post(new Runnable () {
public void run() {
- for (Iterator it = fileObjectsToDelete.iterator(); it.hasNext(); ) {
+ for (Iterator<FileObject> it = fileObjectsToDelete.iterator(); it.hasNext(); ) {
try {
((FileObject) it.next()).delete();
} catch (IOException e) {
diff --git a/ide/editor.fold.nbui/src/org/netbeans/modules/editor/fold/ui/CaretFoldExpanderImpl.java b/ide/editor.fold.nbui/src/org/netbeans/modules/editor/fold/ui/CaretFoldExpanderImpl.java
index a6247e6..7629602 100644
--- a/ide/editor.fold.nbui/src/org/netbeans/modules/editor/fold/ui/CaretFoldExpanderImpl.java
+++ b/ide/editor.fold.nbui/src/org/netbeans/modules/editor/fold/ui/CaretFoldExpanderImpl.java
@@ -54,7 +54,7 @@ public final class CaretFoldExpanderImpl extends CaretFoldExpander {
} else {
endOffset = offset;
}
- Iterator collapsedFoldIterator = FoldUtilities.collapsedFoldIterator(foldHierarchy, offset, endOffset);
+ Iterator<Fold> collapsedFoldIterator = FoldUtilities.collapsedFoldIterator(foldHierarchy, offset, endOffset);
List<Fold> foldsToExpand;
Fold lastFold;
boolean lastFoldExpandAdded = false;
@@ -106,7 +106,7 @@ public final class CaretFoldExpanderImpl extends CaretFoldExpander {
foldHierarchy.lock();
try {
int offset = c.viewToModel(p);
- Iterator collapsedFoldIterator = FoldUtilities.collapsedFoldIterator(foldHierarchy, offset, offset);
+ Iterator<Fold> collapsedFoldIterator = FoldUtilities.collapsedFoldIterator(foldHierarchy, offset, offset);
if (collapsedFoldIterator.hasNext()) {
Fold fold = (Fold) collapsedFoldIterator.next();
// Expand even if the offset is at fold's begining/end because that's what viewToModel() will return
diff --git a/ide/xml.core/src/org/netbeans/modules/xml/dtd/grammar/DTDGrammar.java b/ide/xml.core/src/org/netbeans/modules/xml/dtd/grammar/DTDGrammar.java
index 4fc1b30..da36c98 100644
--- a/ide/xml.core/src/org/netbeans/modules/xml/dtd/grammar/DTDGrammar.java
+++ b/ide/xml.core/src/org/netbeans/modules/xml/dtd/grammar/DTDGrammar.java
@@ -272,7 +272,7 @@ class DTDGrammar implements ExtendedGrammarQuery {
String prefix = ctx.getCurrentPrefix();
LinkedList en = new LinkedList ();
- Iterator it = values.iterator();
+ Iterator<String> it = values.iterator();
while (it.hasNext()) {
String next = (String) it.next();
if (next.startsWith(prefix)) {
diff --git a/ide/xml.multiview/src/org/netbeans/modules/xml/multiview/XmlMultiViewEditorSupport.java b/ide/xml.multiview/src/org/netbeans/modules/xml/multiview/XmlMultiViewEditorSupport.java
index c38f803..10aed72 100644
--- a/ide/xml.multiview/src/org/netbeans/modules/xml/multiview/XmlMultiViewEditorSupport.java
+++ b/ide/xml.multiview/src/org/netbeans/modules/xml/multiview/XmlMultiViewEditorSupport.java
@@ -793,7 +793,7 @@ public class XmlMultiViewEditorSupport extends DataEditorSupport implements Seri
Set closed = ((Set) evt.getOldValue());
if (closed != null) {
closed.removeAll((Set) evt.getNewValue());
- for (Iterator iterator = closed.iterator(); iterator.hasNext();) {
+ for (Iterator<?> iterator = closed.iterator(); iterator.hasNext();) {
Object o = iterator.next();
if (o instanceof CloneableTopComponent) {
final CloneableTopComponent topComponent = (CloneableTopComponent) o;
diff --git a/ide/xml/src/org/netbeans/modules/xml/actions/CollectSystemAction.java b/ide/xml/src/org/netbeans/modules/xml/actions/CollectSystemAction.java
index b927b59..8fa8494 100644
--- a/ide/xml/src/org/netbeans/modules/xml/actions/CollectSystemAction.java
+++ b/ide/xml/src/org/netbeans/modules/xml/actions/CollectSystemAction.java
@@ -90,7 +90,7 @@ public abstract class CollectSystemAction extends SystemAction implements Presen
if (xmlActionsResult == null) return;
synchronized (registeredAction) {
Collection lookupActions = xmlActionsResult.allInstances();
- Iterator it = lookupActions.iterator();
+ Iterator<?> it = lookupActions.iterator();
while (it.hasNext()) {
Object lookupAction = it.next();
String lookupActionClassName = lookupAction.getClass().getName();
@@ -118,7 +118,7 @@ public abstract class CollectSystemAction extends SystemAction implements Presen
List<JMenuItem> items = new ArrayList<>();
- Iterator it = coll.iterator();
+ Iterator<SystemAction> it = coll.iterator();
while (it.hasNext ()) {
SystemAction a = (SystemAction) it.next();
diff --git a/java/java.api.common/src/org/netbeans/modules/java/api/common/project/ui/customizer/SourceRootsUi.java b/java/java.api.common/src/org/netbeans/modules/java/api/common/project/ui/customizer/SourceRootsUi.java
index af0337a..00e6963 100644
--- a/java/java.api.common/src/org/netbeans/modules/java/api/common/project/ui/customizer/SourceRootsUi.java
+++ b/java/java.api.common/src/org/netbeans/modules/java/api/common/project/ui/customizer/SourceRootsUi.java
@@ -242,7 +242,7 @@ public final class SourceRootsUi {
this.ownedFolders.clear();
this.rootsModel = (DefaultTableModel)rootsList.getModel();
Vector data = rootsModel.getDataVector();
- for (Iterator it = data.iterator(); it.hasNext();) {
+ for (Iterator<Vector<File>> it = data.iterator(); it.hasNext();) {
Vector row = (Vector) it.next ();
File f = (File) row.elementAt(0);
this.ownedFolders.add (f);
diff --git a/java/java.j2seproject/src/org/netbeans/modules/java/j2seproject/resources/build-impl.xsl b/java/java.j2seproject/src/org/netbeans/modules/java/j2seproject/resources/build-impl.xsl
index a911dec..7c4c00e 100644
--- a/java/java.j2seproject/src/org/netbeans/modules/java/j2seproject/resources/build-impl.xsl
+++ b/java/java.j2seproject/src/org/netbeans/modules/java/j2seproject/resources/build-impl.xsl
@@ -132,8 +132,8 @@ is divided into following sections:
<property file="${{user.properties.file}}"/>
<xsl:comment> The two properties below are usually overridden </xsl:comment>
<xsl:comment> by the active platform. Just a fallback. </xsl:comment>
- <property name="default.javac.source" value="1.6"/>
- <property name="default.javac.target" value="1.6"/>
+ <property name="default.javac.source" value="1.8"/>
+ <property name="default.javac.target" value="1.8"/>
</target>
<target name="-init-project">
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 3ec6052..934802c 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
@@ -235,7 +235,7 @@ public class JPDAStart implements Runnable {
DebuggerManager.PROP_DEBUGGER_ENGINES,
this
);
- Iterator it = debuggers.iterator();
+ Iterator<JPDADebugger> it = debuggers.iterator();
while (it.hasNext()) {
JPDADebugger d = (JPDADebugger) it.next();
d.removePropertyChangeListener(
diff --git a/java/java.project.ui/test/unit/data/simple-app/nbproject/build-impl.xml b/java/java.project.ui/test/unit/data/simple-app/nbproject/build-impl.xml
index 71e0f04..34238fc 100644
--- a/java/java.project.ui/test/unit/data/simple-app/nbproject/build-impl.xml
+++ b/java/java.project.ui/test/unit/data/simple-app/nbproject/build-impl.xml
@@ -36,8 +36,8 @@ is divided into following sections:
<property file="${user.properties.file}"/>
<!-- The two properties below are usually overridden -->
<!-- by the active platform. Just a fallback. -->
-<property name="default.javac.source" value="1.6"/>
-<property name="default.javac.target" value="1.6"/>
+<property name="default.javac.source" value="1.8"/>
+<property name="default.javac.target" value="1.8"/>
</target>
<target name="-init-project" depends="-pre-init,-init-private,-init-user">
<property file="nbproject/project.properties"/>
diff --git a/java/maven.grammar/src/org/netbeans/modules/maven/grammar/MavenAssemblyGrammar.java b/java/maven.grammar/src/org/netbeans/modules/maven/grammar/MavenAssemblyGrammar.java
index f2126a8..bd8d515 100644
--- a/java/maven.grammar/src/org/netbeans/modules/maven/grammar/MavenAssemblyGrammar.java
+++ b/java/maven.grammar/src/org/netbeans/modules/maven/grammar/MavenAssemblyGrammar.java
@@ -86,7 +86,7 @@ public class MavenAssemblyGrammar extends AbstractSchemaBasedGrammar {
scope = "runtime"; //NOI18N
}
scope = scope.trim();
- Iterator it;
+ Iterator<Dependency> it;
if ("runtime".equals(scope)) { //NOI18N
it = project.getRuntimeDependencies().iterator();
} else if ("test".equals(scope)) { //NOI18N
diff --git a/java/maven.grammar/src/org/netbeans/modules/maven/grammar/MavenProjectGrammar.java b/java/maven.grammar/src/org/netbeans/modules/maven/grammar/MavenProjectGrammar.java
index dabaa95..4ce49e4 100644
--- a/java/maven.grammar/src/org/netbeans/modules/maven/grammar/MavenProjectGrammar.java
+++ b/java/maven.grammar/src/org/netbeans/modules/maven/grammar/MavenProjectGrammar.java
@@ -290,7 +290,7 @@ public class MavenProjectGrammar extends AbstractSchemaBasedGrammar {
}
private List<GrammarResult> collectPluginParams(Document pluginDoc, HintContext hintCtx) {
- Iterator it = pluginDoc.getRootElement().getDescendants(new Filter() {
+ Iterator<Element> it = pluginDoc.getRootElement().getDescendants(new Filter() {
@Override
public boolean matches(Object object) {
if (object instanceof Element) {
diff --git a/java/xml.tools.java/src/org/netbeans/modules/xml/tools/java/generator/ElementBindings.java b/java/xml.tools.java/src/org/netbeans/modules/xml/tools/java/generator/ElementBindings.java
index e7de1b1..788ce49 100644
--- a/java/xml.tools.java/src/org/netbeans/modules/xml/tools/java/generator/ElementBindings.java
+++ b/java/xml.tools.java/src/org/netbeans/modules/xml/tools/java/generator/ElementBindings.java
@@ -153,7 +153,7 @@ public class ElementBindings extends HashMap {
}
public String toString() {
- Iterator it = values().iterator();
+ Iterator<String> it = values().iterator();
StringBuffer sb = new StringBuffer();
sb.append("{"); // NOI18N
while (it.hasNext()) {
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 7f2d22c..7dec58f 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
@@ -168,7 +168,6 @@ public class GenerateDOMScannerSupport implements XMLGenerateCookie {
*
*/
private void dtd2java (FileObject clazz, String tempRootName) throws IOException {
- Iterator it;
final String constructorName = clazz.getName();
JavaSource targetSource = JavaSource.forFileObject(clazz);
diff --git a/platform/core.multiview/src/org/netbeans/core/multiview/MultiViewTopComponentLookup.java b/platform/core.multiview/src/org/netbeans/core/multiview/MultiViewTopComponentLookup.java
index 0a7721e..a5ec0b2 100644
--- a/platform/core.multiview/src/org/netbeans/core/multiview/MultiViewTopComponentLookup.java
+++ b/platform/core.multiview/src/org/netbeans/core/multiview/MultiViewTopComponentLookup.java
@@ -110,7 +110,7 @@ class MultiViewTopComponentLookup extends Lookup {
public Collection allItems() {
// remove duplicates..
Set s = new HashSet(delegate.allItems());
- Iterator it = s.iterator();
+ Iterator<Lookup.Item> it = s.iterator();
Set instances = new HashSet();
while (it.hasNext()) {
Lookup.Item i = (Lookup.Item)it.next();
diff --git a/platform/openide.actions/src/org/openide/actions/ToolsAction.java b/platform/openide.actions/src/org/openide/actions/ToolsAction.java
index 97c965d..7e6c0d4 100644
--- a/platform/openide.actions/src/org/openide/actions/ToolsAction.java
+++ b/platform/openide.actions/src/org/openide/actions/ToolsAction.java
@@ -18,6 +18,7 @@
*/
package org.openide.actions;
+import java.awt.Component;
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
import java.beans.PropertyChangeSupport;
@@ -362,7 +363,7 @@ public class ToolsAction extends SystemAction implements ContextAwareAction, Pre
removeAll();
- Iterator it = generate(toolsAction, false).iterator();
+ Iterator<JMenuItem> it = generate(toolsAction, false).iterator();
while (it.hasNext()) {
java.awt.Component item = (java.awt.Component) it.next();
diff --git a/platform/openide.filesystems/src/org/openide/filesystems/StreamPool.java b/platform/openide.filesystems/src/org/openide/filesystems/StreamPool.java
index c1e25be..350bc87 100644
--- a/platform/openide.filesystems/src/org/openide/filesystems/StreamPool.java
+++ b/platform/openide.filesystems/src/org/openide/filesystems/StreamPool.java
@@ -157,7 +157,7 @@ final class StreamPool extends Object {
synchronized (StreamPool.class) {
if (iStreams != null) {
- Iterator itIs = iStreams.iterator();
+ Iterator<InputStream> itIs = iStreams.iterator();
NotifyInputStream nis;
while (itIs.hasNext()) {
diff --git a/platform/openide.util.lookup/src/org/openide/util/lookup/ProxyLookup.java b/platform/openide.util.lookup/src/org/openide/util/lookup/ProxyLookup.java
index 17cb46e..3d1f394 100644
--- a/platform/openide.util.lookup/src/org/openide/util/lookup/ProxyLookup.java
+++ b/platform/openide.util.lookup/src/org/openide/util/lookup/ProxyLookup.java
@@ -231,7 +231,7 @@ public class ProxyLookup extends Lookup {
class Notify implements Runnable {
public void run() {
- Iterator it = evAndListeners.iterator();
+ Iterator<?> it = evAndListeners.iterator();
while (it.hasNext()) {
LookupEvent ev = (LookupEvent)it.next();
LookupListener l = (LookupListener)it.next();
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@netbeans.apache.org
For additional commands, e-mail: commits-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists