|
@@ -15,6 +15,7 @@ import javax.xml.transform.TransformerException;
|
|
|
import javax.xml.transform.TransformerFactory;
|
|
import javax.xml.transform.TransformerFactory;
|
|
|
import javax.xml.transform.dom.DOMSource;
|
|
import javax.xml.transform.dom.DOMSource;
|
|
|
import javax.xml.transform.stream.StreamResult;
|
|
import javax.xml.transform.stream.StreamResult;
|
|
|
|
|
+import net.ranides.assira.io.FileHelper;
|
|
|
import org.w3c.dom.Document;
|
|
import org.w3c.dom.Document;
|
|
|
import org.w3c.dom.Node;
|
|
import org.w3c.dom.Node;
|
|
|
import org.xml.sax.InputSource;
|
|
import org.xml.sax.InputSource;
|
|
@@ -89,7 +90,7 @@ public final class XMLTransform {
|
|
|
try {
|
|
try {
|
|
|
Transformer transformer = TransformerFactory.newInstance().newTransformer();
|
|
Transformer transformer = TransformerFactory.newInstance().newTransformer();
|
|
|
transformer.transform(new DOMSource(doc), stream);
|
|
transformer.transform(new DOMSource(doc), stream);
|
|
|
- return stream;
|
|
|
|
|
|
|
+ return stream;
|
|
|
} catch (TransformerException cause) {
|
|
} catch (TransformerException cause) {
|
|
|
throw new IllegalArgumentException(cause);
|
|
throw new IllegalArgumentException(cause);
|
|
|
}
|
|
}
|
|
@@ -102,12 +103,8 @@ public final class XMLTransform {
|
|
|
* @throws IllegalArgumentException jeśli konwersja niemożliwa
|
|
* @throws IllegalArgumentException jeśli konwersja niemożliwa
|
|
|
*/
|
|
*/
|
|
|
public static void source(OutputStream stream, Node doc) {
|
|
public static void source(OutputStream stream, Node doc) {
|
|
|
- try {
|
|
|
|
|
- source(new StreamResult(stream), doc);
|
|
|
|
|
- stream.close();
|
|
|
|
|
- } catch (IOException cause) {
|
|
|
|
|
- throw new IllegalArgumentException(cause);
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ source(new StreamResult(stream), doc);
|
|
|
|
|
+ FileHelper.close(stream);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -117,12 +114,8 @@ public final class XMLTransform {
|
|
|
* @throws IllegalArgumentException jeśli konwersja niemożliwa
|
|
* @throws IllegalArgumentException jeśli konwersja niemożliwa
|
|
|
*/
|
|
*/
|
|
|
public static void source(Writer writer, Node doc) {
|
|
public static void source(Writer writer, Node doc) {
|
|
|
- try {
|
|
|
|
|
- source(new StreamResult(writer), doc);
|
|
|
|
|
- writer.close();
|
|
|
|
|
- } catch (IOException cause) {
|
|
|
|
|
- throw new IllegalArgumentException(cause);
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ source(new StreamResult(writer), doc);
|
|
|
|
|
+ FileHelper.close(writer);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -146,5 +139,5 @@ public final class XMLTransform {
|
|
|
source(new StreamResult(writer), doc);
|
|
source(new StreamResult(writer), doc);
|
|
|
return writer.toString();
|
|
return writer.toString();
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
}
|
|
}
|