Merge pull request #20882 from Konrado85

* pr/20882:
  Polish "Polish JarFile to extra anonymous inner class"
  Polish JarFile to extra anonymous inner class

Closes gh-20882
This commit is contained in:
Stephane Nicoll
2020-04-15 09:42:45 +02:00

View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2019 the original author or authors.
* Copyright 2012-2020 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -191,20 +191,7 @@ public class JarFile extends java.util.jar.JarFile {
@Override
public Enumeration<java.util.jar.JarEntry> entries() {
final Iterator<JarEntry> iterator = this.entries.iterator();
return new Enumeration<java.util.jar.JarEntry>() {
@Override
public boolean hasMoreElements() {
return iterator.hasNext();
}
@Override
public java.util.jar.JarEntry nextElement() {
return iterator.next();
}
};
return new JarEntryEnumeration(this.entries.iterator());
}
public JarEntry getJarEntry(CharSequence name) {
@@ -421,4 +408,27 @@ public class JarFile extends java.util.jar.JarFile {
}
/**
* An {@link Enumeration} on {@linkplain java.util.jar.JarEntry jar entries}.
*/
private static class JarEntryEnumeration implements Enumeration<java.util.jar.JarEntry> {
private final Iterator<JarEntry> iterator;
JarEntryEnumeration(Iterator<JarEntry> iterator) {
this.iterator = iterator;
}
@Override
public boolean hasMoreElements() {
return this.iterator.hasNext();
}
@Override
public java.util.jar.JarEntry nextElement() {
return this.iterator.next();
}
}
}