Merge pull request #8 from romankh3/refactoring

Refactoring.

Author: romankh3

src/main/java/ua/comparison/image/ImageComparison.java

@@ -1,9 +1,7 @@
 package ua.comparison.image;
 
-import javax.imageio.ImageIO;
 import java.awt.*;
 import java.awt.image.BufferedImage;
-import java.io.File;
 import java.io.IOException;
 import java.net.URISyntaxException;
 
@@ -65,24 +63,9 @@ public static BufferedImage drawTheDifference( String image1Name, String image2N
     private static void drawRectangles( int[][] matrix, Graphics2D graphics, int counter, int lastNumberCount ) {
         if( counter > lastNumberCount ) return;
 
-        int minX = Integer.MAX_VALUE;
-        int minY = Integer.MAX_VALUE;
-        int maxX = Integer.MIN_VALUE;
-        int maxY = Integer.MIN_VALUE;
+        Rectangle rectangle = createRectangle( matrix, counter );
 
-        for ( int y = 0; y < matrix.length; y++ ) {
-            for ( int x = 0; x < matrix[0].length; x++ ) {
-                if ( matrix[y][x] == counter ) {
-
-                    if ( x < minX ) minX = x;
-                    if ( x > maxX ) maxX = x;
-
-                    if ( y < minY ) minY = y;
-                    if ( y > maxY ) maxY = y;
-                }
-            }
-        }
-        graphics.drawRect( minY, minX, maxY - minY, maxX - minX );
+        graphics.drawRect( rectangle.getMinY(), rectangle.getMinX(), rectangle.getWidth(), rectangle.getHeight() );
         drawRectangles( matrix, graphics, ++counter, lastNumberCount );
     }
 
@@ -93,15 +76,10 @@ private static void drawRectangles( int[][] matrix, Graphics2D graphics, int cou
      * @return populated binary matrix.
      */
     public static int[][] populateTheMatrixOfTheDifferences(BufferedImage image1, BufferedImage image2 ) {
-
         int[][] matrix = new int[image1.getWidth()][image1.getHeight()];
         for ( int y = 0; y < image1.getHeight(); y++ ) {
             for ( int x = 0; x < image1.getWidth(); x++ ) {
-                if ( isDifferent( x, y, image1, image2 ) ) {
-                    matrix[x][y] = 1;
-                } else {
-                    matrix[x][y] = 0;
-                }
+                matrix[x][y] = isDifferent( x, y, image1, image2 ) ? 1 : 0;
             }
         }
         return matrix;
@@ -110,7 +88,7 @@ public static int[][] populateTheMatrixOfTheDifferences(BufferedImage image1, Bu
     /**
      * Group rectangle regions in binary matrix.
      * @param matrix The binary matrix.
-     * @return the last number which marks the lat region.
+     * @return the last number which marks the last region.
      */
     private static int groupRegions( int[][] matrix ) {
         int regionCount = 2;

src/main/java/ua/comparison/image/ImageComparisonTools.java

@@ -32,6 +32,11 @@ public static Frame createGUI(BufferedImage image ) {
         return frame;
     }
 
+    /**
+     * Make a copy of the {@code BufferedImage} object.
+     * @param image the provided image.
+     * @return copy of the provided image.
+     */
     static BufferedImage deepCopy( BufferedImage image ) {
         ColorModel cm = image.getColorModel();
         boolean isAlphaPremultiplied = cm.isAlphaPremultiplied();
@@ -75,6 +80,29 @@ public static boolean isDifferent( int x, int y, BufferedImage image1, BufferedI
         return result;
     }
 
+    /**
+     * Create a {@code Rectangle} object.
+     * @param matrix the matrix of the Conformity pixels.
+     * @param counter the number from marks regions.
+     * @return the {@code Rectangle} object.
+     */
+    public static Rectangle createRectangle( int[][] matrix, int counter ) {
+        Rectangle rect = new Rectangle();
+
+        for ( int y = 0; y < matrix.length; y++ ) {
+            for ( int x = 0; x < matrix[0].length; x++ ) {
+                if ( matrix[y][x] == counter ) {
+                    if ( x < rect.getMinX() ) rect.setMinX( x );
+                    if ( x > rect.getMaxX() ) rect.setMaxX( x );
+
+                    if ( y < rect.getMinY() ) rect.setMinY( y );
+                    if ( y > rect.getMaxY() ) rect.setMaxY( y );
+                }
+            }
+        }
+        return rect;
+    }
+
     /**
      * Reads image from the provided path.
      * @param path the path where contains image.

src/main/java/ua/comparison/image/Rectangle.java

@@ -0,0 +1,42 @@
+package ua.comparison.image;
+
+/**
+ * Object contained data for a rectangle.
+ */
+public class Rectangle {
+
+    private int minX = Integer.MAX_VALUE;
+    private int minY = Integer.MAX_VALUE;
+    private int maxX = Integer.MIN_VALUE;
+    private int maxY = Integer.MIN_VALUE;
+
+    public void setMinX(int minX) {
+        this.minX = minX;
+    }
+
+    public void setMinY(int minY) {
+        this.minY = minY;
+    }
+
+    public void setMaxX(int maxX) {
+        this.maxX = maxX;
+    }
+
+    public void setMaxY(int maxY) {
+        this.maxY = maxY;
+    }
+
+    public int getMinX() {
+        return minX;
+    }
+
+    public int getMinY() { return minY; }
+
+    public int getMaxX() { return maxX; }
+
+    public int getMaxY() { return maxY; }
+
+    public int getWidth() { return maxY - minY; }
+
+    public int getHeight() { return maxX - minX; }
+}

src/test/java/ua/comparison/image/RectangleUnitTest.java

@@ -0,0 +1,32 @@
+package ua.comparison.image;
+
+import org.junit.Test;
+import ua.comparison.image.Rectangle;
+
+import static org.junit.Assert.assertEquals;
+
+/**
+ * Unit-level testing for {@link Rectangle} object.
+ */
+public class RectangleUnitTest {
+
+    @Test
+    public void testGetterSetter() {
+        Rectangle rectangle = new Rectangle();
+
+        assertEquals( rectangle.getMinX(), Integer.MAX_VALUE );
+        assertEquals( rectangle.getMinY(), Integer.MAX_VALUE );
+        assertEquals( rectangle.getMaxX(), Integer.MIN_VALUE );
+        assertEquals( rectangle.getMaxY(), Integer.MIN_VALUE );
+
+        rectangle.setMinX( 10 );
+        rectangle.setMinY( 20 );
+        rectangle.setMaxX( 30 );
+        rectangle.setMaxY( 40 );
+
+        assertEquals( rectangle.getMinX(), 10 );
+        assertEquals( rectangle.getMinY(), 20 );
+        assertEquals( rectangle.getMaxX(), 30 );
+        assertEquals( rectangle.getMaxY(), 40 );
+    }
+}