/*
 * Licensed to the Apache Software Foundation (ASF) under one
 * or more contributor license agreements.  See the NOTICE file
 * distributed with this work for additional information
 * regarding copyright ownership.  The ASF licenses this file
 * to you under the Apache License, Version 2.0 (the
 * "License"); you may not use this file except in compliance
 * with the License.  You may obtain a copy of the License at
 *
 *     http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */

package com.hp.hpl.jena.sparql.util;

import com.hp.hpl.jena.sparql.ARQException ;


public class Timer
{

    protected long timeFinish = -1 ;
    protected boolean inTimer = false ;
    protected long timeStart  = 0 ;

    public Timer() { }

    public void startTimer()
    { 
        if ( inTimer )
            throw new ARQException("Already in timer") ;

        timeStart = System.currentTimeMillis() ;
        timeFinish = -1 ;
        inTimer = true ;
    }

    /** Return time in millisecods */
    public long endTimer()
    { 
        if ( ! inTimer )
            throw new ARQException("Not in timer") ;
        timeFinish = System.currentTimeMillis() ;
        inTimer = false ;
        return getTimeInterval() ;
    }

    public long readTimer() 
    {
        if ( ! inTimer )
            throw new ARQException("Not in timer") ;
        return System.currentTimeMillis()-timeStart  ;
    }

    public long getTimeInterval()
    {
        if ( inTimer )
            throw new ARQException("Still timing") ;
        if ( timeFinish == -1 )
            throw new ARQException("No valid interval") ;

        return  timeFinish-timeStart ;
    }

    static public String timeStr(long timeInterval)
    {
//        DecimalFormat f = new DecimalFormat("#0.###") ;
//        String s = f.format(timeInterval/1000.0) ;
//        return s ;
        //Java5
        return String.format("%.3f", timeInterval/1000.0) ;
    }

    protected String timeStr(long timePoint, long startTimePoint)
    {
        return timeStr(timePoint-startTimePoint) ;
    }
}

@@ -835,16 +835,17 @@
 rql.util
+ 
 ;%0A%0Aimpor
@@ -885,17 +885,16 @@
 tion ;%0A%0A
-%0A
 public c
@@ -903,17 +903,17 @@
 ss Timer
-%0A
+ 
 %7B%0A%0A    p
@@ -922,24 +922,27 @@
 tected long 
+   
 timeFinish =
@@ -969,32 +969,35 @@
 boolean inTimer 
+   
 = false ;%0A    pr
@@ -1005,24 +1005,27 @@
 tected long 
+   
 timeStart  =
@@ -1050,17 +1050,16 @@
 imer() %7B
- 
 %7D%0A%0A    p
@@ -1077,31 +1077,26 @@
 startTimer()
-%0A   
  %7B
- 
 %0A        if 
@@ -1340,15 +1340,10 @@
 er()
-%0A   
  %7B
- 
 %0A   
@@ -1345,33 +1345,32 @@
 %7B%0A        if ( !
- 
 inTimer )%0A      
@@ -1562,21 +1562,16 @@
 Timer() 
-%0A    
 %7B%0A      
@@ -1578,17 +1578,16 @@
   if ( !
- 
 inTimer 
@@ -1682,17 +1682,19 @@
 Millis()
--
+ - 
 timeStar
@@ -1695,17 +1695,16 @@
 meStart 
- 
 ;%0A    %7D%0A
@@ -1737,20 +1737,16 @@
 terval()
-%0A   
  %7B%0A     
@@ -1922,17 +1922,16 @@
  return 
- 
 timeFini
@@ -1932,17 +1932,19 @@
 meFinish
--
+ - 
 timeStar
@@ -2009,162 +2009,10 @@
 val)
-%0A    %7B%0A//        DecimalFormat f = new DecimalFormat(%22#0.###%22) ;%0A//        String s = f.format(timeInterval/1000.0) ;%0A//        return s ;%0A        //Java5
+ %7B
 %0A   
@@ -2057,17 +2057,19 @@
 Interval
-/
+ / 
 1000.0) 
@@ -2142,20 +2142,16 @@
 mePoint)
-%0A   
  %7B%0A     
@@ -2177,17 +2177,19 @@
 imePoint
--
+ - 
 startTim

Tidy up