Author: andy
Date: Thu Jun 12 21:21:51 2014
New Revision: 1602294
URL: http://svn.apache.org/r1602294
Log:
Clean for Java7
Modified:
jena/trunk/jena-iri/src/test/java/org/apache/jena/iri/TestCreator.java
jena/trunk/jena-iri/src/test/java/org/apache/jena/iri/TestMoreExamples.java
jena/trunk/jena-iri/src/test/java/org/apache/jena/iri/test/TestCreator.java
jena/trunk/jena-iri/src/test/java/org/apache/jena/iri/test/TestMoreExamples.java
Modified: jena/trunk/jena-iri/src/test/java/org/apache/jena/iri/TestCreator.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-iri/src/test/java/org/apache/jena/iri/TestCreator.java?rev=1602294&r1=1602293&r2=1602294&view=diff
==============================================================================
--- jena/trunk/jena-iri/src/test/java/org/apache/jena/iri/TestCreator.java
(original)
+++ jena/trunk/jena-iri/src/test/java/org/apache/jena/iri/TestCreator.java Thu
Jun 12 21:21:51 2014
@@ -82,14 +82,11 @@ final class TestCreator extends DefaultH
));
out.println("<UriTests>");
- InputStream in =
TestCreator.class.getClassLoader().getResourceAsStream("org/apache/jena/iri/uris.xml");
- fact.newSAXParser().parse(in,
- new TestCreator()
- );
-
- out.println("</UriTests>");
- in.close();
- out.close();
+ try ( InputStream in =
TestCreator.class.getClassLoader().getResourceAsStream("org/apache/jena/iri/uris.xml")
) {
+ fact.newSAXParser().parse(in, new TestCreator() );
+ out.println("</UriTests>");
+ out.close();
+ }
}
static public void main(String args[]) throws IOException,
ParserConfigurationException, SAXException{
Modified:
jena/trunk/jena-iri/src/test/java/org/apache/jena/iri/TestMoreExamples.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-iri/src/test/java/org/apache/jena/iri/TestMoreExamples.java?rev=1602294&r1=1602293&r2=1602294&view=diff
==============================================================================
--- jena/trunk/jena-iri/src/test/java/org/apache/jena/iri/TestMoreExamples.java
(original)
+++ jena/trunk/jena-iri/src/test/java/org/apache/jena/iri/TestMoreExamples.java
Thu Jun 12 21:21:51 2014
@@ -247,13 +247,10 @@ public class TestMoreExamples extends Te
SAXParserFactory fact = SAXParserFactory.newInstance();
TestSuite result = new TestSuite();
result.setName("More IRI Tests");
- InputStream in =
TestCreator.class.getClassLoader().getResourceAsStream("org/apache/jena/iri/test/test.xml");
- fact.newSAXParser().parse(in,
- new TestReader(result)
- );
-
- in.close();
- return result;
+ try ( InputStream in =
TestCreator.class.getClassLoader().getResourceAsStream("org/apache/jena/iri/test/test.xml")
) {
+ fact.newSAXParser().parse(in, new TestReader(result) );
+ return result;
+ }
}
public static TestSuite suite() {
try {
Modified:
jena/trunk/jena-iri/src/test/java/org/apache/jena/iri/test/TestCreator.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-iri/src/test/java/org/apache/jena/iri/test/TestCreator.java?rev=1602294&r1=1602293&r2=1602294&view=diff
==============================================================================
--- jena/trunk/jena-iri/src/test/java/org/apache/jena/iri/test/TestCreator.java
(original)
+++ jena/trunk/jena-iri/src/test/java/org/apache/jena/iri/test/TestCreator.java
Thu Jun 12 21:21:51 2014
@@ -82,14 +82,11 @@ final class TestCreator extends DefaultH
));
out.println("<UriTests>");
- InputStream in =
TestCreator.class.getClassLoader().getResourceAsStream("org/apache/jena/iri/test/uris.xml");
- fact.newSAXParser().parse(in,
- new TestCreator()
- );
-
- out.println("</UriTests>");
- in.close();
- out.close();
+ try (InputStream in =
TestCreator.class.getClassLoader().getResourceAsStream("org/apache/jena/iri/test/uris.xml"))
{
+ fact.newSAXParser().parse(in, new TestCreator()) ;
+ out.println("</UriTests>") ;
+ out.close() ;
+ }
}
static public void main(String args[]) throws IOException,
ParserConfigurationException, SAXException{
Modified:
jena/trunk/jena-iri/src/test/java/org/apache/jena/iri/test/TestMoreExamples.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-iri/src/test/java/org/apache/jena/iri/test/TestMoreExamples.java?rev=1602294&r1=1602293&r2=1602294&view=diff
==============================================================================
---
jena/trunk/jena-iri/src/test/java/org/apache/jena/iri/test/TestMoreExamples.java
(original)
+++
jena/trunk/jena-iri/src/test/java/org/apache/jena/iri/test/TestMoreExamples.java
Thu Jun 12 21:21:51 2014
@@ -247,13 +247,10 @@ public class TestMoreExamples extends Te
SAXParserFactory fact = SAXParserFactory.newInstance();
TestSuite result = new TestSuite();
result.setName("More IRI Tests");
- InputStream in =
TestCreator.class.getClassLoader().getResourceAsStream("org/apache/jena/iri/test/test.xml");
- fact.newSAXParser().parse(in,
- new TestReader(result)
- );
-
- in.close();
- return result;
+ try (InputStream in =
TestCreator.class.getClassLoader().getResourceAsStream("org/apache/jena/iri/test/test.xml"))
{
+ fact.newSAXParser().parse(in,new TestReader(result));
+ return result;
+ }
}
public static TestSuite suite() {
try {
