Skip to content

[NETBEANS-2621] cleanup generic class iterator #1277

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
BradWalker wants to merge 3 commits into from
Closed

[NETBEANS-2621] cleanup generic class iterator #1277

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a8d79ba
[NETBEANS-2621] cleanup generic class iterator
BradWalker May 31, 2019
1391424
additional iterator changes..
BradWalker Jun 3, 2019
504a18c
update to GroovyVirtualSourceProvider.java
BradWalker Jun 3, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions enterprise/glassfish.javaee/src/org/netbeans/modules/glassfish/javaee/RunTimeDDCatalog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -370,9 +370,7 @@ public void removeCatalogListener(CatalogListener l) {
}

public void fireCatalogListeners() {
Iterator iter = catalogListeners.iterator();
while (iter.hasNext()) {
CatalogListener l = (CatalogListener) iter.next();
for (CatalogListener l : catalogListeners) {
l.notifyInvalidate();
}
}
Expand Down
12 changes: 4 additions & 8 deletions harness/o.n.insane/src/org/netbeans/insane/model/InsaneConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,16 +337,14 @@ private void compute() {
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);
}

Expand All @@ -367,14 +365,12 @@ private void storeHeaders() throws IOException {
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();
}

Expand Down
10 changes: 3 additions & 7 deletions ...ditor.errorstripe/src/org/netbeans/modules/editor/errorstripe/AnnotationViewDataImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,8 +231,7 @@ private static void createStatusProviders(Collection<? extends UpToDateStatusPro
}

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);
Expand All @@ -242,9 +241,7 @@ private void addListenersToStatusProviders() {
}

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);
Expand Down Expand Up @@ -474,8 +471,7 @@ public UpToDateStatus computeTotalStatusType() {

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) {
Expand Down
4 changes: 1 addition & 3 deletions java/java.freeform/src/org/netbeans/modules/java/freeform/JavaProjectGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -520,9 +520,7 @@ public static void putJavaCompilationUnits(AntProjectHelper helper,
}
}
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));
Expand Down
10 changes: 4 additions & 6 deletions platform/core.startup/src/org/netbeans/core/startup/AutomaticDependencies.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -369,9 +369,8 @@ public String toString() {
* 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;
}
}
Expand Down Expand Up @@ -406,10 +405,9 @@ public void apply(Map<String, Dependency> modDeps,
} 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);
}
}
Expand Down
18 changes: 6 additions & 12 deletions platform/o.n.swing.outline/src/org/netbeans/swing/etable/ETableColumnModel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,8 +128,7 @@ public void writeSettings(Properties p, String propertyPrefix) {
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);
Expand All @@ -138,8 +137,7 @@ public void writeSettings(Properties p, String propertyPrefix) {
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);
Expand Down Expand Up @@ -390,8 +388,7 @@ public boolean isColumnHidden(TableColumn tc) {
*/
@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);
Expand All @@ -406,8 +403,7 @@ public void clearSortedColumns() {
@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);
Expand All @@ -424,8 +420,7 @@ void clearSortedColumns(TableColumn notThisOne) {
*/
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()) {
Expand Down Expand Up @@ -464,8 +459,7 @@ public CompoundComparator() {
}
@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();
Expand Down
6 changes: 1 addition & 5 deletions platform/openide.filesystems/src/org/openide/filesystems/MultiFileObject.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,6 @@ private void update() {
}

Iterator it = now.iterator();

while (it.hasNext()) {
FileObject fo = (FileObject) it.next();
fo.removeFileChangeListener(weakL);
Expand Down Expand Up @@ -1757,10 +1756,7 @@ private FileLock getCurrentMfLock() {
}

private void releaseLockForDelegates() {
Iterator it = map.values().iterator();

while (it.hasNext()) {
FileLock l = (FileLock) it.next();
for (FileLock l : map.values()) {
l.releaseLock();
}

Expand Down