Removing the notion that -1 was a special state value. The code was changed a while back to have properly defined states. Helps prepare for LANG-478
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/lang/trunk@749101 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
c068395793
commit
ef718fccdf
|
@ -83,12 +83,12 @@ public class StopWatch {
|
||||||
/**
|
/**
|
||||||
* The start time.
|
* The start time.
|
||||||
*/
|
*/
|
||||||
private long startTime = -1;
|
private long startTime;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The stop time.
|
* The stop time.
|
||||||
*/
|
*/
|
||||||
private long stopTime = -1;
|
private long stopTime;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* <p>
|
* <p>
|
||||||
|
@ -118,7 +118,6 @@ public class StopWatch {
|
||||||
if (this.runningState != STATE_UNSTARTED) {
|
if (this.runningState != STATE_UNSTARTED) {
|
||||||
throw new IllegalStateException("Stopwatch already started. ");
|
throw new IllegalStateException("Stopwatch already started. ");
|
||||||
}
|
}
|
||||||
this.stopTime = -1;
|
|
||||||
this.startTime = System.currentTimeMillis();
|
this.startTime = System.currentTimeMillis();
|
||||||
this.runningState = STATE_RUNNING;
|
this.runningState = STATE_RUNNING;
|
||||||
}
|
}
|
||||||
|
@ -157,8 +156,6 @@ public class StopWatch {
|
||||||
public void reset() {
|
public void reset() {
|
||||||
this.runningState = STATE_UNSTARTED;
|
this.runningState = STATE_UNSTARTED;
|
||||||
this.splitState = STATE_UNSPLIT;
|
this.splitState = STATE_UNSPLIT;
|
||||||
this.startTime = -1;
|
|
||||||
this.stopTime = -1;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -199,7 +196,6 @@ public class StopWatch {
|
||||||
if (this.splitState != STATE_SPLIT) {
|
if (this.splitState != STATE_SPLIT) {
|
||||||
throw new IllegalStateException("Stopwatch has not been split. ");
|
throw new IllegalStateException("Stopwatch has not been split. ");
|
||||||
}
|
}
|
||||||
this.stopTime = -1;
|
|
||||||
this.splitState = STATE_UNSPLIT;
|
this.splitState = STATE_UNSPLIT;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -242,7 +238,6 @@ public class StopWatch {
|
||||||
throw new IllegalStateException("Stopwatch must be suspended to resume. ");
|
throw new IllegalStateException("Stopwatch must be suspended to resume. ");
|
||||||
}
|
}
|
||||||
this.startTime += (System.currentTimeMillis() - this.stopTime);
|
this.startTime += (System.currentTimeMillis() - this.stopTime);
|
||||||
this.stopTime = -1;
|
|
||||||
this.runningState = STATE_RUNNING;
|
this.runningState = STATE_RUNNING;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue