cleanup — reduce usage of getChildren

diff --git a/jps/model-serialization/src/org/jetbrains/jps/model/serialization/library/JpsLibraryTableSerializer.java b/jps/model-serialization/src/org/jetbrains/jps/model/serialization/library/JpsLibraryTableSerializer.java
index 659d2d2420e2a70328c1585ec61a3d73341a1789..cb6b581d4f55bc48abee97b28d902d289e55d385 100644 (file)
--- a/jps/model-serialization/src/org/jetbrains/jps/model/serialization/library/JpsLibraryTableSerializer.java
+++ b/jps/model-serialization/src/org/jetbrains/jps/model/serialization/library/JpsLibraryTableSerializer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2012 JetBrains s.r.o.
+ * Copyright 2000-2016 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -109,7 +109,7 @@ public class JpsLibraryTableSerializer {
         recursiveJarDirectories.putValue(rootType, url);
       }
     }
-    for (Element rootsElement : JDOMUtil.getChildren(libraryElement)) {
+    for (Element rootsElement : libraryElement.getChildren()) {
       final String rootTypeId = rootsElement.getName();
       if (!rootTypeId.equals(JAR_DIRECTORY_TAG)) {
         final JpsOrderRootType rootType = getRootType(rootTypeId);

diff --git a/jps/model-serialization/src/org/jetbrains/jps/model/serialization/library/JpsSdkTableSerializer.java b/jps/model-serialization/src/org/jetbrains/jps/model/serialization/library/JpsSdkTableSerializer.java
index b9840edb56debb0bb5326e5bc79e31a6dd5aa7d5..2f0fab8d7242a61a4cb8dc2dbebb3fdd2458119e 100644 (file)
--- a/jps/model-serialization/src/org/jetbrains/jps/model/serialization/library/JpsSdkTableSerializer.java
+++ b/jps/model-serialization/src/org/jetbrains/jps/model/serialization/library/JpsSdkTableSerializer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2012 JetBrains s.r.o.
+ * Copyright 2000-2016 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,10 +26,13 @@ import org.jetbrains.jps.model.JpsElementFactory;
 import org.jetbrains.jps.model.java.JpsJavaExtensionService;
 import org.jetbrains.jps.model.java.JpsJavaSdkType;
 import org.jetbrains.jps.model.java.JpsJavaSdkTypeWrapper;
-import org.jetbrains.jps.model.library.*;
+import org.jetbrains.jps.model.library.JpsLibrary;
+import org.jetbrains.jps.model.library.JpsLibraryCollection;
+import org.jetbrains.jps.model.library.JpsLibraryRoot;
+import org.jetbrains.jps.model.library.JpsOrderRootType;
 import org.jetbrains.jps.model.library.sdk.JpsSdk;
-import org.jetbrains.jps.model.library.sdk.JpsSdkType;
 import org.jetbrains.jps.model.library.sdk.JpsSdkReference;
+import org.jetbrains.jps.model.library.sdk.JpsSdkType;
 import org.jetbrains.jps.model.module.JpsSdkReferencesTable;
 import org.jetbrains.jps.model.serialization.JpsModelSerializerExtension;
 
@@ -102,7 +105,7 @@ public class JpsSdkTableSerializer {
     for (Element rootTypeElement : JDOMUtil.getChildren(roots)) {
       JpsLibraryRootTypeSerializer rootTypeSerializer = getRootTypeSerializer(rootTypeElement.getName());
       if (rootTypeSerializer != null) {
-        for (Element rootElement : JDOMUtil.getChildren(rootTypeElement)) {
+        for (Element rootElement : rootTypeElement.getChildren()) {
           loadRoots(rootElement, library, rootTypeSerializer.getType());
         }
       }
@@ -158,7 +161,7 @@ public class JpsSdkTableSerializer {
   private static void loadRoots(Element rootElement, JpsLibrary library, JpsOrderRootType rootType) {
     final String type = rootElement.getAttributeValue(TYPE_ATTRIBUTE);
     if (type.equals(COMPOSITE_TYPE)) {
-      for (Element element : JDOMUtil.getChildren(rootElement)) {
+      for (Element element : rootElement.getChildren()) {
         loadRoots(element, library, rootType);
       }
     }

diff --git a/platform/util/src/com/intellij/openapi/util/JDOMUtil.java b/platform/util/src/com/intellij/openapi/util/JDOMUtil.java
index 22ca5440df47fc2f2dc0f2bd5a2f094977e7ff2a..4eaabf2d1ba2e11194c0a6473c1900b6c04ae419 100644 (file)
--- a/platform/util/src/com/intellij/openapi/util/JDOMUtil.java
+++ b/platform/util/src/com/intellij/openapi/util/JDOMUtil.java
@@ -426,18 +426,13 @@ public class JDOMUtil {
   }
 
   @NotNull
-  public static String writeChildren(@Nullable final Element element, @NotNull final String lineSeparator) {
-    try {
-      final StringWriter writer = new StringWriter();
-      for (Element child : getChildren(element)) {
-        writeElement(child, writer, lineSeparator);
-        writer.append(lineSeparator);
-      }
-      return writer.toString();
-    }
-    catch (IOException e) {
-      throw new RuntimeException(e);
+  public static String writeChildren(@NotNull final Element element, @NotNull final String lineSeparator) throws IOException {
+    final StringWriter writer = new StringWriter();
+    for (Element child : element.getChildren()) {
+      writeElement(child, writer, lineSeparator);
+      writer.append(lineSeparator);
     }
+    return writer.toString();
   }
 
   public static void writeDocument(@NotNull Document document, @NotNull Writer writer, String lineSeparator) throws IOException {
@@ -546,8 +541,7 @@ public class JDOMUtil {
       System.err.println(prefix);
     }
 
-    List<Element> children = getChildren(element);
-    for (final Element child : children) {
+    for (final Element child : element.getChildren()) {
       printDiagnostics(child, prefix);
     }
   }