Small style stuff

[zxing.git] / core / src / com / google / zxing / qrcode / detector / FinderPatternFinder.java

diff --git a/core/src/com/google/zxing/qrcode/detector/FinderPatternFinder.java b/core/src/com/google/zxing/qrcode/detector/FinderPatternFinder.java
index ebed5d0..9968f00 100755 (executable)
--- a/core/src/com/google/zxing/qrcode/detector/FinderPatternFinder.java
+++ b/core/src/com/google/zxing/qrcode/detector/FinderPatternFinder.java
@@ -553,7 +553,7 @@ public class FinderPatternFinder {
    */\r
   private static class FurthestFromAverageComparator implements Comparator {\r
     private final float average;\r
-    public FurthestFromAverageComparator(float f) {\r
+    private FurthestFromAverageComparator(float f) {\r
       average = f;\r
     }\r
     public int compare(Object center1, Object center2) {\r
@@ -568,16 +568,16 @@ public class FinderPatternFinder {
    */\r
   private static class CenterComparator implements Comparator {\r
     private final float average;\r
-    public CenterComparator(float f) {\r
+    private CenterComparator(float f) {\r
       average = f;\r
     }\r
     public int compare(Object center1, Object center2) {\r
-      if (((FinderPattern) center2).getCount() != ((FinderPattern) center1).getCount()) {\r
-        return ((FinderPattern) center2).getCount() - ((FinderPattern) center1).getCount();\r
-      } else {\r
+      if (((FinderPattern) center2).getCount() == ((FinderPattern) center1).getCount()) {\r
         float dA = Math.abs(((FinderPattern) center2).getEstimatedModuleSize() - average);\r
         float dB = Math.abs(((FinderPattern) center1).getEstimatedModuleSize() - average);\r
         return dA < dB ? 1 : (dA == dB ? 0 : -1);\r
+      } else {\r
+        return ((FinderPattern) center2).getCount() - ((FinderPattern) center1).getCount();\r
       }\r
     }\r
   }\r