svn commit: r1625994 - in /jena/trunk/jena-arq/src/main/java: com/hp/hpl/jena/sparql/serializer/FormatterElement.java org/apache/jena/atlas/logging/ProgressLogger.java

[andy]

Author: andy
Date: Thu Sep 18 14:30:28 2014
New Revision: 1625994

URL: http://svn.apache.org/r1625994
Log:
Print time at end

Modified:
    
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/serializer/FormatterElement.java
    
jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/logging/ProgressLogger.java

Modified: 
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/serializer/FormatterElement.java
URL: 
http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/serializer/FormatterElement.java?rev=1625994&r1=1625993&r2=1625994&view=diff
==============================================================================
--- 
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/serializer/FormatterElement.java
 (original)
+++ 
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/serializer/FormatterElement.java
 Thu Sep 18 14:30:28 2014
@@ -446,6 +446,7 @@ public class FormatterElement extends Fo
         out.decIndent(INDENT) ;
     }
     
+    @SuppressWarnings("deprecation")
     @Override
     public void visit(ElementSubQuery el)
     {

Modified: 
jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/logging/ProgressLogger.java
URL: 
http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/logging/ProgressLogger.java?rev=1625994&r1=1625993&r2=1625994&view=diff
==============================================================================
--- 
jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/logging/ProgressLogger.java
 (original)
+++ 
jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/logging/ProgressLogger.java
 Thu Sep 18 14:30:28 2014
@@ -56,8 +56,10 @@ public class ProgressLogger
     
         // *1000L is milli to second conversion
         if ( timePoint != 0 ) {
+            double time = timePoint/1000.0 ;
             long runAvgRate   = (counterTotal * 1000L) / timePoint ;
-            print("Finished: %,d %s (Avg: %,d)", counterTotal, label, 
runAvgRate) ;
+            
+            print("Finished: %,d %s %.2fs (Avg: %,d)", counterTotal, label, 
time, runAvgRate) ;
         }
         else
             print("Finished: %,d %s (Avg: ----)", counterTotal, label) ;