diff options
| author | Marc R. Hoffmann <hoffmann@mountainminds.com> | 2011-01-16 18:54:23 +0000 |
|---|---|---|
| committer | Marc R. Hoffmann <hoffmann@mountainminds.com> | 2011-01-16 18:54:23 +0000 |
| commit | 2581e65594849fca406fa1d169505a59e4012394 (patch) | |
| tree | 358f41f4dec5aa1e50e395e2fab50ac81175a5f8 /org.jacoco.core/src/org/jacoco/core/internal/analysis | |
| parent | d37ff3d49e64d6c2d1088840e794c482593d484d (diff) | |
| download | jacoco-2581e65594849fca406fa1d169505a59e4012394.tar.gz | |
Code cleanup: move getStatus() to ICounter.
Diffstat (limited to 'org.jacoco.core/src/org/jacoco/core/internal/analysis')
| -rw-r--r-- | org.jacoco.core/src/org/jacoco/core/internal/analysis/CounterImpl.java | 8 | ||||
| -rw-r--r-- | org.jacoco.core/src/org/jacoco/core/internal/analysis/LineImpl.java | 12 |
2 files changed, 10 insertions, 10 deletions
diff --git a/org.jacoco.core/src/org/jacoco/core/internal/analysis/CounterImpl.java b/org.jacoco.core/src/org/jacoco/core/internal/analysis/CounterImpl.java index d936a7bc..36dcd04b 100644 --- a/org.jacoco.core/src/org/jacoco/core/internal/analysis/CounterImpl.java +++ b/org.jacoco.core/src/org/jacoco/core/internal/analysis/CounterImpl.java @@ -167,6 +167,14 @@ public abstract class CounterImpl implements ICounter { return (double) missed / (missed + covered);
}
+ public int getStatus() {
+ int status = covered > 0 ? FULLY_COVERED : EMPTY;
+ if (missed > 0) {
+ status |= NOT_COVERED;
+ }
+ return status;
+ }
+
@Override
public boolean equals(final Object obj) {
if (obj instanceof ICounter) {
diff --git a/org.jacoco.core/src/org/jacoco/core/internal/analysis/LineImpl.java b/org.jacoco.core/src/org/jacoco/core/internal/analysis/LineImpl.java index 12ef7f7b..b53b64fb 100644 --- a/org.jacoco.core/src/org/jacoco/core/internal/analysis/LineImpl.java +++ b/org.jacoco.core/src/org/jacoco/core/internal/analysis/LineImpl.java @@ -119,16 +119,8 @@ public abstract class LineImpl implements ILine { // === ILine implementation ===
- public byte getStatus() {
- byte status = NO_CODE;
- if (instructions.getMissedCount() > 0 || branches.getMissedCount() > 0) {
- status = NOT_COVERED;
- }
- if (instructions.getCoveredCount() > 0
- || branches.getCoveredCount() > 0) {
- status |= FULLY_COVERED;
- }
- return status;
+ public int getStatus() {
+ return instructions.getStatus() | branches.getStatus();
}
public ICounter getInstructionCounter() {
|