REFACTOR

Author: bjrara

project/src/main/java/com/offline/training/project/pj1/DoublyLinkedList.java

@@ -26,12 +26,11 @@ public void add(int runLength, int red, int green, int blue) {
 		if (!(validateColor(red) && validateColor(green) && validateColor(blue))) {
 			throw new RuntimeException("Invalid pixel value found!");
 		}
-		DoublyLinkedNode appendObj = new DoublyLinkedNode(runLength, red,
-				green, blue);
+		DoublyLinkedNode appendObj = new DoublyLinkedNode(new Run(red, green, blue, runLength));
 		if (head == null) {
 			head = tail = appendObj;
 		} else {
-			appendObj.setPrevious(tail);
+	appendObj.setPrevious(tail);
 			tail.setNext(appendObj);
 			tail = tail.getNext();
 		}

project/src/main/java/com/offline/training/project/pj1/DoublyLinkedNode.java

@@ -1,50 +1,12 @@
 package com.offline.training.project.pj1;
 
 public class DoublyLinkedNode {
-	private int red;
-	private int green;
-	private int blue;
-	private int runLength;
-
+	private Run value;
 	private DoublyLinkedNode previous;
 	private DoublyLinkedNode next;
 
-	public DoublyLinkedNode(int runLength, int red, int green, int blue) {
-		this.runLength = runLength;
-		this.red = red;
-		this.green = green;
-		this.blue = blue;
-	}
-
-	public void Increment() {
-		runLength++;
-	}
-
-	public void Decrement() {
-		runLength--;
-	}
-
-	public int getRed() {
-		return red;
-	}
-
-	public int getGreen() {
-		return green;
-	}
-
-	public int getBlue() {
-		return blue;
-	}
-
-	public int getRunLength() {
-		return runLength;
-	}
-
-	public void setValue(int red, int green, int blue, int runLength) {
-		this.red = red;
-		this.green = green;
-		this.blue = blue;
-		this.runLength = runLength;
+	public DoublyLinkedNode(Run value) {
+		this.value = value;
 	}
 
 	public void setPrevious(DoublyLinkedNode previous) {
@@ -62,4 +24,8 @@ public void setNext(DoublyLinkedNode next) {
 	public DoublyLinkedNode getNext() {
 		return next;
 	}
+	
+	public Run getValue() {
+		return value;
+	}
 }

project/src/main/java/com/offline/training/project/pj1/Run.java

@@ -0,0 +1,62 @@
+package com.offline.training.project.pj1;
+
+public class Run {
+	private int red;
+	private int green;
+	private int blue;
+	private int runLength;
+
+	public Run(int red, int green, int blue, int runLength) {
+		this.red = red;
+		this.green = green;
+		this.blue = blue;
+		this.runLength = runLength;
+	}
+
+	public void setValue(int red, int green, int blue, int runLength) {
+		this.red = red;
+		this.green = green;
+		this.blue = blue;
+		this.runLength = runLength;
+	}
+
+	public int getRed() {
+		return red;
+	}
+
+	public void setRed(int red) {
+		this.red = red;
+	}
+
+	public int getGreen() {
+		return green;
+	}
+
+	public void setGreen(int green) {
+		this.green = green;
+	}
+
+	public int getBlue() {
+		return blue;
+	}
+
+	public void setBlue(int blue) {
+		this.blue = blue;
+	}
+
+	public int getRunLength() {
+		return runLength;
+	}
+
+	public void setRunLength(int runLength) {
+		this.runLength = runLength;
+	}
+
+	public void Increment() {
+		runLength++;
+	}
+
+	public void Decrement() {
+		runLength--;
+	}
+}

project/src/main/java/com/offline/training/project/pj1/RunIterator.java

@@ -89,8 +89,8 @@ public int[] next() {
 		if (next != null) {
 			DoublyLinkedNode currNext = next;
 			next = next.getNext();
-			return new int[] { currNext.getRunLength(), currNext.getRed(),
-					currNext.getGreen(), currNext.getBlue() };
+			return new int[] { currNext.getValue().getRunLength(), currNext.getValue().getRed(),
+					currNext.getValue().getGreen(), currNext.getValue().getBlue() };
 		}
 	  throw new NoSuchElementException("Iterator reaches the end of the list.");
   }

project/src/main/java/com/offline/training/project/pj1/RunLengthEncoding.java

@@ -203,10 +203,10 @@ public RunLengthEncoding(PixImage image) {
 							image.getBlue(0, 0));
 					continue;
 				}
-				if (runs.tail.getRed() == (int) image.getRed(x, y)
-						&& runs.tail.getGreen() == (int) image.getGreen(x, y)
-						&& runs.tail.getBlue() == (int) image.getBlue(x, y)) {
-					runs.tail.Increment();
+				if (runs.tail.getValue().getRed() == (int) image.getRed(x, y)
+						&& runs.tail.getValue().getGreen() == (int) image.getGreen(x, y)
+						&& runs.tail.getValue().getBlue() == (int) image.getBlue(x, y)) {
+					runs.tail.getValue().Increment();
 				} else {
 					runs.add(1, (int) image.getRed(x, y),
 							(int) image.getGreen(x, y),
@@ -267,27 +267,27 @@ public void setPixel(int x, int y, short red, short green, short blue) {
 
 		while (curr != null) {
 			previousIndex = currIndex;
-			currIndex += curr.getRunLength();
+			currIndex += curr.getValue().getRunLength();
 			if (currIndex >= index)
 				break;
 			curr = curr.getNext();
 		}
 
-		if (curr.getRed() == (int) red && curr.getGreen() == (int) green
-				&& curr.getBlue() == (int) blue) {
+		if (curr.getValue().getRed() == (int) red && curr.getValue().getGreen() == (int) green
+				&& curr.getValue().getBlue() == (int) blue) {
 			return;
 		} else {
 			if (index == previousIndex + 1) {
 				if (tryMerge(curr, curr.getPrevious(), red, green, blue)) {
-					if (curr.getRunLength() == 0) {
+					if (curr.getValue().getRunLength() == 0) {
 						curr.getPrevious().setNext(curr.getNext());
 					}
 					return;
 				}
 			}
 			if (index == currIndex) {
 				if (tryMerge(curr, curr.getNext(), red, green, blue)) {
-					if (curr.getRunLength() == 0) {
+					if (curr.getValue().getRunLength() == 0) {
 						curr.getNext().setPrevious(curr.getPrevious());
 					}
 					return;
@@ -305,10 +305,10 @@ private boolean tryMerge(DoublyLinkedNode curr, DoublyLinkedNode target,
 			int red, int green, int blue) {
 		if (target == null)
 			return false;
-		if (target.getRed() == (int) red && target.getGreen() == (int) green
-				&& target.getBlue() == (int) blue) {
-			target.Increment();
-			curr.Decrement();
+		if (target.getValue().getRed() == (int) red && target.getValue().getGreen() == (int) green
+				&& target.getValue().getBlue() == (int) blue) {
+			target.getValue().Increment();
+			curr.getValue().Decrement();
 			return true;
 		}
 		return false;
@@ -317,13 +317,9 @@ private boolean tryMerge(DoublyLinkedNode curr, DoublyLinkedNode target,
 	private void split(DoublyLinkedNode curr, int red, int green, int blue,
 			int previousRunLength, int nextRunLength) {
 		DoublyLinkedNode previousRun, nextRun;
-		previousRun = previousRunLength <= 0 ? curr.getPrevious()
-				: new DoublyLinkedNode(previousRunLength, (int) curr.getRed(),
-						(int) curr.getGreen(), (int) curr.getBlue());
-		nextRun = nextRunLength <= 0 ? curr.getNext() : new DoublyLinkedNode(
-				nextRunLength, (int) curr.getRed(), (int) curr.getGreen(),
-				(int) curr.getBlue());
-		curr.setValue(red, green, blue, 1);
+		previousRun = previousRunLength <= 0 ? curr.getPrevious() : new DoublyLinkedNode(new Run((int) curr.getValue().getRed(), (int) curr.getValue().getGreen(), (int) curr.getValue().getBlue(), previousRunLength));
+		nextRun = nextRunLength <= 0 ? curr.getNext() : new DoublyLinkedNode(new Run((int) curr.getValue().getRed(),(int) curr.getValue().getGreen(), (int) curr.getValue().getBlue(), nextRunLength));
+		curr.getValue().setValue(red, green, blue, 1);
 		if (previousRunLength > 0) {
 			if (curr.getPrevious() != null)
 				curr.getPrevious().setNext(previousRun);