Author: andy
Date: Tue Jul 29 15:59:11 2014
New Revision: 1614394
URL: http://svn.apache.org/r1614394
Log:
Java7-isms
Modified:
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/Version.java
jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/io/TestIndentedWriter.java
Modified:
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/Version.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/Version.java?rev=1614394&r1=1614393&r2=1614394&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/Version.java
(original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/Version.java
Tue Jul 29 15:59:11 2014
@@ -73,26 +73,26 @@ public class Version
* @return Version information
*/
public String toString(boolean singleLine) {
- IndentedLineBuffer buffer = new IndentedLineBuffer(false);
-
- Iterator<Class<?>> iter = classes.iterator();
- while (iter.hasNext())
- {
- Class<?> c = iter.next();
- String component = Utils.classShortName(c) ;
- String version = field(FIELD_VERSION, c);
- String timestamp = field(FIELD_BUILD_DATE, c);
- buffer.append("%s Version %s (Built %s)", component, version,
timestamp);
- if (iter.hasNext()) {
- if (!singleLine) {
- buffer.println();
- } else {
- buffer.print(", ");
+ try ( IndentedLineBuffer buffer = new IndentedLineBuffer(false) ) {
+ Iterator<Class<?>> iter = classes.iterator();
+ while (iter.hasNext())
+ {
+ Class<?> c = iter.next();
+ String component = Utils.classShortName(c) ;
+ String version = field(FIELD_VERSION, c);
+ String timestamp = field(FIELD_BUILD_DATE, c);
+ buffer.append("%s Version %s (Built %s)", component, version,
timestamp);
+ if (iter.hasNext()) {
+ if (!singleLine) {
+ buffer.println();
+ } else {
+ buffer.print(", ");
+ }
}
}
+
+ return buffer.asString();
}
-
- return buffer.asString();
}
/**
Modified:
jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/io/TestIndentedWriter.java
URL:
http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/io/TestIndentedWriter.java?rev=1614394&r1=1614393&r2=1614394&view=diff
==============================================================================
---
jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/io/TestIndentedWriter.java
(original)
+++
jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/io/TestIndentedWriter.java
Tue Jul 29 15:59:11 2014
@@ -26,31 +26,33 @@ public class TestIndentedWriter extends
{
@Test public void write01()
{
- IndentedLineBuffer b = new IndentedLineBuffer() ;
- b.print("hell") ;
- b.print("o") ;
- assertEquals("hello", b.asString()) ;
+ try(IndentedLineBuffer b = new IndentedLineBuffer()) {
+ b.print("hell") ;
+ b.print("o") ;
+ assertEquals("hello", b.asString()) ;
+ }
}
@Test public void write02()
{
- IndentedLineBuffer b = new IndentedLineBuffer() ;
- b.incIndent() ;
- b.print("hell") ;
- b.print("o") ;
- b.decIndent() ;
- assertEquals(" hello", b.asString()) ;
+ try(IndentedLineBuffer b = new IndentedLineBuffer()) {
+ b.incIndent() ;
+ b.print("hell") ;
+ b.print("o") ;
+ b.decIndent() ;
+ assertEquals(" hello", b.asString()) ;
+ }
}
@Test public void write03()
{
- IndentedLineBuffer b = new IndentedLineBuffer() ;
- b.incIndent() ;
- b.printf("0x%04X", 1) ;
- b.println() ;
- b.print("XX") ;
- b.decIndent() ;
- assertEquals(" 0x0001\n XX", b.asString()) ;
+ try(IndentedLineBuffer b = new IndentedLineBuffer()) {
+ b.incIndent() ;
+ b.printf("0x%04X", 1) ;
+ b.println() ;
+ b.print("XX") ;
+ b.decIndent() ;
+ assertEquals(" 0x0001\n XX", b.asString()) ;
+ }
}
-
}
