You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by ma...@apache.org on 2019/06/09 19:16:59 UTC
[netbeans] branch master updated: [NETBEANS-2621] cleanup generic
class iterator
This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing 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 fb01691 [NETBEANS-2621] cleanup generic class iterator
fb01691 is described below
commit fb016919734b98643341c01c5f720d205e48ecff
Author: Brad Walker <bw...@musings.com>
AuthorDate: Fri May 31 14:16:49 2019 -0600
[NETBEANS-2621] cleanup generic class iterator
reduce the # of instances of the following error..
[repeat] /home/bwalker/netbeans-11.0/platform/core.startup/src/org/
netbeans/core/startup/AutomaticDependencies.java:372: warning: [rawtypes] found raw type: Iterator
[repeat] Iterator it = exclusions.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
---
.../modules/glassfish/javaee/RunTimeDDCatalog.java | 4 +---
.../src/org/netbeans/insane/model/InsaneConverter.java | 12 ++++--------
.../editor/errorstripe/AnnotationViewDataImpl.java | 10 +++-------
.../modules/java/freeform/JavaProjectGenerator.java | 4 +---
.../netbeans/core/startup/AutomaticDependencies.java | 10 ++++------
.../org/netbeans/swing/etable/ETableColumnModel.java | 18 ++++++------------
.../src/org/openide/filesystems/MultiFileObject.java | 6 +-----
7 files changed, 20 insertions(+), 44 deletions(-)
diff --git a/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/RunTimeDDCatalog.java b/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/RunTimeDDCatalog.java
index 8f4fa8f..26d8a85 100644
--- a/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/RunTimeDDCatalog.java
+++ b/enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/RunTimeDDCatalog.java
@@ -370,9 +370,7 @@ public class RunTimeDDCatalog extends GrammarQueryManager implements CatalogRead
}
public void fireCatalogListeners() {
- Iterator iter = catalogListeners.iterator();
- while (iter.hasNext()) {
- CatalogListener l = (CatalogListener) iter.next();
+ for (CatalogListener l : catalogListeners) {
l.notifyInvalidate();
}
}
diff --git a/harness/o.n.insane/src/org/netbeans/insane/model/InsaneConverter.java b/harness/o.n.insane/src/org/netbeans/insane/model/InsaneConverter.java
index 871bcc7..e63e4ab 100644
--- a/harness/o.n.insane/src/org/netbeans/insane/model/InsaneConverter.java
+++ b/harness/o.n.insane/src/org/netbeans/insane/model/InsaneConverter.java
@@ -337,16 +337,14 @@ final class InsaneConverter {
int currentOffset = 4+4+4;
// compute offset of classes
- for (Iterator it = classInfo.values().iterator(); it.hasNext(); ) {
- ClassInfo info = (ClassInfo)it.next();
+ for (ClassInfo info : classInfo.values()) {
currentOffset = info.computeNextOffset(currentOffset);
}
refsOffset = currentOffset;
// compute offsets of refs
- for (Iterator it = refInfo.values().iterator(); it.hasNext(); ) {
- RefInfo info = (RefInfo)it.next();
+ for (RefInfo info : refInfo.values()) {
currentOffset = info.computeNextOffset(currentOffset);
}
@@ -367,14 +365,12 @@ final class InsaneConverter {
store.putInt(objsOffset);
// store classes
- for (Iterator it = classInfo.values().iterator(); it.hasNext(); ) {
- ClassInfo info = (ClassInfo)it.next();
+ for (ClassInfo info : classInfo.values()) {
info.storeHeader();
}
// store refs
- for (Iterator it = refInfo.values().iterator(); it.hasNext(); ) {
- RefInfo info = (RefInfo)it.next();
+ for (RefInfo info : refInfo.values()) {
info.storeHeader();
}
diff --git a/ide/editor.errorstripe/src/org/netbeans/modules/editor/errorstripe/AnnotationViewDataImpl.java b/ide/editor.errorstripe/src/org/netbeans/modules/editor/errorstripe/AnnotationViewDataImpl.java
index 29eb50d..b4828a4 100644
--- a/ide/editor.errorstripe/src/org/netbeans/modules/editor/errorstripe/AnnotationViewDataImpl.java
+++ b/ide/editor.errorstripe/src/org/netbeans/modules/editor/errorstripe/AnnotationViewDataImpl.java
@@ -231,8 +231,7 @@ final class AnnotationViewDataImpl implements PropertyChangeListener, Annotation
}
private void addListenersToStatusProviders() {
- for (Iterator p = statusProviders.iterator(); p.hasNext(); ) {
- UpToDateStatusProvider provider = (UpToDateStatusProvider) p.next();
+ for (UpToDateStatusProvider provider : statusProviders) {
// removePropertyChangeListener() is non-public but present in UpToDateStatusProvider - will the weak listener removal work??
PropertyChangeListener weakL = WeakListeners.propertyChange(this, provider);
@@ -242,9 +241,7 @@ final class AnnotationViewDataImpl implements PropertyChangeListener, Annotation
}
private void addListenersToMarkProviders() {
- for (Iterator p = markProviders.iterator(); p.hasNext(); ) {
- MarkProvider provider = (MarkProvider) p.next();
-
+ for (MarkProvider provider : markProviders) {
PropertyChangeListener weakL = WeakListeners.propertyChange(this, provider);
provider.addPropertyChangeListener(weakL);
statusProvidersWeakLs.add(weakL);
@@ -474,8 +471,7 @@ final class AnnotationViewDataImpl implements PropertyChangeListener, Annotation
UpToDateStatus statusType = UpToDateStatus.UP_TO_DATE_OK;
- for (Iterator p = statusProviders.iterator(); p.hasNext(); ) {
- UpToDateStatusProvider provider = (UpToDateStatusProvider) p.next();
+ for ( UpToDateStatusProvider provider : statusProviders) {
UpToDateStatus newType = provider.getUpToDate();
if (newType.compareTo(statusType) > 0) {
diff --git a/java/java.freeform/src/org/netbeans/modules/java/freeform/JavaProjectGenerator.java b/java/java.freeform/src/org/netbeans/modules/java/freeform/JavaProjectGenerator.java
index e5c982d..9504bab 100644
--- a/java/java.freeform/src/org/netbeans/modules/java/freeform/JavaProjectGenerator.java
+++ b/java/java.freeform/src/org/netbeans/modules/java/freeform/JavaProjectGenerator.java
@@ -520,9 +520,7 @@ public class JavaProjectGenerator {
}
}
if (cu.javadoc != null) {
- Iterator it3 = cu.javadoc.iterator();
- while (it3.hasNext()) {
- String javadoc = (String) it3.next();
+ for (String javadoc : cu.javadoc) {
assert JavaProjectNature.namespaceAtLeast(namespace, JavaProjectNature.NS_JAVA_2);
el = doc.createElementNS(data.getNamespaceURI(), "javadoc-built-to"); // NOI18N
el.appendChild(doc.createTextNode(javadoc));
diff --git a/platform/core.startup/src/org/netbeans/core/startup/AutomaticDependencies.java b/platform/core.startup/src/org/netbeans/core/startup/AutomaticDependencies.java
index f69c236..66400b6 100644
--- a/platform/core.startup/src/org/netbeans/core/startup/AutomaticDependencies.java
+++ b/platform/core.startup/src/org/netbeans/core/startup/AutomaticDependencies.java
@@ -369,9 +369,8 @@ public final class AutomaticDependencies {
* Is the given code name base excluded from this group of transformations?
*/
public boolean isExcluded(String cnb) {
- Iterator it = exclusions.iterator();
- while (it.hasNext()) {
- if (((Exclusion)it.next()).matches(cnb)) {
+ for (Exclusion e : exclusions) {
+ if (e.matches(cnb)) {
return true;
}
}
@@ -406,10 +405,9 @@ public final class AutomaticDependencies {
} else {
throw new IllegalStateException(triggerType);
}
+
// Add in results.
- Iterator it = results.iterator();
- while (it.hasNext()) {
- Dep nue = (Dep)it.next();
+ for (Dep nue : results) {
nue.update(modDeps, tokDeps, pkgDeps, dependencies);
}
}
diff --git a/platform/o.n.swing.outline/src/org/netbeans/swing/etable/ETableColumnModel.java b/platform/o.n.swing.outline/src/org/netbeans/swing/etable/ETableColumnModel.java
index 0615771..b6caacc 100644
--- a/platform/o.n.swing.outline/src/org/netbeans/swing/etable/ETableColumnModel.java
+++ b/platform/o.n.swing.outline/src/org/netbeans/swing/etable/ETableColumnModel.java
@@ -128,8 +128,7 @@ public class ETableColumnModel extends DefaultTableColumnModel {
int i = 0;
int numColumns = tableColumns.size();
p.setProperty(propertyPrefix + NUMBER_OF_COLUMNS, Integer.toString(numColumns));
- for (Iterator it = tableColumns.iterator(); it.hasNext(); ) {
- Object obj = it.next();
+ for (Object obj : tableColumns) {
if (obj instanceof ETableColumn) {
ETableColumn etc = (ETableColumn) obj;
etc.writeSettings(p, i++, propertyPrefix);
@@ -138,8 +137,7 @@ public class ETableColumnModel extends DefaultTableColumnModel {
i = 0;
int numHiddenColumns = hiddenColumns.size();
p.setProperty(propertyPrefix + NUMBER_OF_HIDDEN_COLUMNS, Integer.toString(numHiddenColumns));
- for (Iterator it = hiddenColumns.iterator(); it.hasNext(); ) {
- Object obj = it.next();
+ for (Object obj : hiddenColumns) {
if (obj instanceof ETableColumn) {
ETableColumn etc = (ETableColumn) obj;
etc.writeSettings(p, i++, propertyPrefix + PROP_HIDDEN_PREFIX);
@@ -390,8 +388,7 @@ public class ETableColumnModel extends DefaultTableColumnModel {
*/
@SuppressWarnings("deprecation")
public void clearSortedColumns() {
- for (Iterator it = sortedColumns.iterator(); it.hasNext(); ) {
- Object o = it.next();
+ for (Object o : sortedColumns) {
if (o instanceof ETableColumn) {
ETableColumn etc = (ETableColumn)o;
etc.setSorted(0, false);
@@ -406,8 +403,7 @@ public class ETableColumnModel extends DefaultTableColumnModel {
@SuppressWarnings("deprecation")
void clearSortedColumns(TableColumn notThisOne) {
boolean wasSorted = sortedColumns.contains(notThisOne);
- for (Iterator it = sortedColumns.iterator(); it.hasNext(); ) {
- Object o = it.next();
+ for (Object o : sortedColumns) {
if ((o instanceof ETableColumn) && (o != notThisOne)) {
ETableColumn etc = (ETableColumn)o;
etc.setSorted(0, false);
@@ -424,8 +420,7 @@ public class ETableColumnModel extends DefaultTableColumnModel {
*/
private void updateRanks() {
int i = 1;
- for (Iterator it = sortedColumns.iterator(); it.hasNext(); i++) {
- Object o = it.next();
+ for (Object o : sortedColumns) {
if (o instanceof ETableColumn) {
ETableColumn etc = (ETableColumn)o;
if (etc.isSorted()) {
@@ -464,8 +459,7 @@ public class ETableColumnModel extends DefaultTableColumnModel {
}
@Override
public int compare(RowMapping o1, RowMapping o2) {
- for (Iterator it = sortedColumns.iterator(); it.hasNext(); ) {
- Object o = it.next();
+ for (Object o : sortedColumns) {
if (o instanceof ETableColumn) {
ETableColumn etc = (ETableColumn)o;
Comparator<RowMapping> c = etc.getComparator();
diff --git a/platform/openide.filesystems/src/org/openide/filesystems/MultiFileObject.java b/platform/openide.filesystems/src/org/openide/filesystems/MultiFileObject.java
index 41095fa..3a19ee3 100644
--- a/platform/openide.filesystems/src/org/openide/filesystems/MultiFileObject.java
+++ b/platform/openide.filesystems/src/org/openide/filesystems/MultiFileObject.java
@@ -205,7 +205,6 @@ final class MultiFileObject extends AbstractFolder implements FileObject.Priorit
}
Iterator it = now.iterator();
-
while (it.hasNext()) {
FileObject fo = (FileObject) it.next();
fo.removeFileChangeListener(weakL);
@@ -1757,10 +1756,7 @@ final class MultiFileObject extends AbstractFolder implements FileObject.Priorit
}
private void releaseLockForDelegates() {
- Iterator it = map.values().iterator();
-
- while (it.hasNext()) {
- FileLock l = (FileLock) it.next();
+ for (FileLock l : map.values()) {
l.releaseLock();
}
---------------------------------------------------------------------
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