Correction on getPercent implementation

zanata · Oct 24, 2013 · 49cbdc9 · 49cbdc9
1 parent 7824d27
commit 49cbdc9
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 45 deletions.
diff --git a/zanata-common-api/src/main/java/org/zanata/common/AbstractTranslationCount.java b/zanata-common-api/src/main/java/org/zanata/common/AbstractTranslationCount.java
@@ -114,23 +114,10 @@ public int getTranslated() {
         return translated;
     }
 
-    public int getNotApproved() {
-        return untranslated + needReview + rejected + translated;
-    }
-
     public int getRejected() {
         return rejected;
     }
 
-    public double getPercentTranslated() {
-        long total = getTotal();
-        if (total <= 0) {
-            return 0;
-        } else {
-            return 100d * (getTranslated() + getApproved()) / total;
-        }
-    }
-
     @Override
     public boolean equals(Object obj) {
         if (obj == this)

diff --git a/zanata-common-api/src/main/java/org/zanata/common/statistic/AbstractStatistic.java b/zanata-common-api/src/main/java/org/zanata/common/statistic/AbstractStatistic.java
@@ -21,7 +21,7 @@ protected AbstractStatistic() {
     }
 
     protected AbstractStatistic(int approved, int needReview, int untranslated,
-        int translated, int rejected) {
+            int translated, int rejected) {
         this.approved = approved;
         this.needReview = needReview;
         this.untranslated = untranslated;
@@ -39,41 +39,41 @@ public void decrement(ContentState state, int count) {
 
     public void set(ContentState state, int value) {
         switch (state) {
-            case Translated:
-                translated = value;
-                break;
-            case NeedReview:
-                needReview = value;
-                break;
-            case New:
-                untranslated = value;
-                break;
-            case Approved:
-                approved = value;
-                break;
-            case Rejected:
-                rejected = value;
-                break;
-            default:
-                throw new RuntimeException("not implemented for state "
+        case Translated:
+            translated = value;
+            break;
+        case NeedReview:
+            needReview = value;
+            break;
+        case New:
+            untranslated = value;
+            break;
+        case Approved:
+            approved = value;
+            break;
+        case Rejected:
+            rejected = value;
+            break;
+        default:
+            throw new RuntimeException("not implemented for state "
                     + state.name());
         }
     }
 
     public int get(ContentState state) {
         switch (state) {
-            case Translated:
-                return translated;
-            case NeedReview:
-                return needReview;
-            case New:
-                return untranslated;
-            case Approved:
-                return approved;
-            case Rejected:
-                return rejected;
-            default:
-                throw new RuntimeException("not implemented for state "
+        case Translated:
+            return translated;
+        case NeedReview:
+            return needReview;
+        case New:
+            return untranslated;
+        case Approved:
+            return approved;
+        case Rejected:
+            return rejected;
+        default:
+            throw new RuntimeException("not implemented for state "
                     + state.name());
         }
     }
@@ -122,6 +122,15 @@ public int getDraft() {
         return needReview + rejected;
     }
 
+    public double getPercentTranslated() {
+        long total = getTotal();
+        if (total <= 0) {
+            return 0;
+        } else {
+            return 100d * (getTranslated() + getApproved()) / total;
+        }
+    }
+
     @Override
     public boolean equals(Object obj) {
         if (obj == this)
@@ -131,8 +140,8 @@ public boolean equals(Object obj) {
         if (obj instanceof AbstractStatistic) {
             AbstractStatistic o = (AbstractStatistic) obj;
             return (approved == o.approved && needReview == o.needReview
-                && untranslated == o.untranslated
-                && translated == o.translated && rejected == o.rejected);
+                    && untranslated == o.untranslated
+                    && translated == o.translated && rejected == o.rejected);
         }
         return false;
     }