Bug 5531: Can't get complete YIN schema on Windows

[yangtools.git] / yang / yang-model-export / src / main / java / org / opendaylight / yangtools / yang / model / export / SchemaToStatementWriterAdaptor.java

diff --git a/yang/yang-model-export/src/main/java/org/opendaylight/yangtools/yang/model/export/SchemaToStatementWriterAdaptor.java b/yang/yang-model-export/src/main/java/org/opendaylight/yangtools/yang/model/export/SchemaToStatementWriterAdaptor.java
index 4712dbd745530b0df3c2c2378bdae0e8b17ed9d2..3672b941286d2ee7f3893012e08b21c1ce91c62d 100644 (file)
--- a/yang/yang-model-export/src/main/java/org/opendaylight/yangtools/yang/model/export/SchemaToStatementWriterAdaptor.java
+++ b/yang/yang-model-export/src/main/java/org/opendaylight/yangtools/yang/model/export/SchemaToStatementWriterAdaptor.java
@@ -12,6 +12,7 @@ import com.google.common.base.Preconditions;
 import com.google.common.primitives.UnsignedInteger;
 import java.net.URI;
 import java.util.Date;
+import java.util.Iterator;
 import java.util.List;
 import javax.annotation.concurrent.NotThreadSafe;
 import org.opendaylight.yangtools.yang.common.QName;
@@ -32,7 +33,7 @@ final class SchemaToStatementWriterAdaptor implements Rfc6020ModuleWriter {
         this.writer = Preconditions.checkNotNull(writer);
     }
 
-    public static final Rfc6020ModuleWriter from(final StatementTextWriter writer) {
+    public static Rfc6020ModuleWriter from(final StatementTextWriter writer) {
         return new SchemaToStatementWriterAdaptor(writer);
     }
 
@@ -93,8 +94,12 @@ final class SchemaToStatementWriterAdaptor implements Rfc6020ModuleWriter {
     public void startKeyNode(final List<QName> keyList) {
         writer.startStatement(Rfc6020Mapping.KEY);
         final StringBuilder keyStr = new StringBuilder();
-        for (final QName item : keyList) {
-            keyStr.append(item.getLocalName());
+        final Iterator<QName> iter = keyList.iterator();
+        while (iter.hasNext()) {
+            keyStr.append(iter.next().getLocalName());
+            if (iter.hasNext()) {
+                keyStr.append(' ');
+            }
         }
         writer.writeArgument(keyStr.toString());
     }