CLDR-18217 For clarity in FullIterable, call iteratorWithoutExtras di…

…rectly

-Also for clarity, rename FullIterable.fileIterator to FullIterable.iteratorWithoutExtras

tools/cldr-code/src/main/java/org/unicode/cldr/util/CLDRFile.java

@@ -1564,12 +1564,12 @@ public Iterable<String> fullIterable() {
 
     private static class FullIterable implements Iterable<String>, SimpleIterator<String> {
         private final CLDRFile file;
-        private final Iterator<String> fileIterator; // dataSource only
+        private final Iterator<String> iteratorWithoutExtras;
         private Iterator<String> extraPaths;
 
         FullIterable(CLDRFile file) {
             this.file = file;
-            this.fileIterator = file.dataSource.iterator(); // file.iteratorWithoutExtras();
+            this.iteratorWithoutExtras = file.iteratorWithoutExtras();
         }
 
         @Override
@@ -1581,8 +1581,8 @@ public Iterator<String> iterator() {
 
         @Override
         public String next() {
-            if (fileIterator.hasNext()) {
-                return fileIterator.next();
+            if (iteratorWithoutExtras.hasNext()) {
+                return iteratorWithoutExtras.next();
             }
             if (extraPaths == null) {
                 extraPaths = file.getExtraPaths().iterator();