refactor for format

fishercoder1534 · fishercoder1534 · commit eb1805a67cea · 2017-08-28T13:08:15.000-07:00
diff --git a/fishercoder_checkstyle.xml b/fishercoder_checkstyle.xml
@@ -26,14 +26,6 @@
 
     <property name="severity" value="error"/>
 
-    <!--this cannot be enabled because right now Intellij CE cannot import my fishercoder_checkstyle.xml as -->
-    <!--my chosen Java code style-->
-    <!-- Checks for whitespace                               -->
-    <!-- See http://checkstyle.sf.net/config_whitespace.html -->
-    <!--<module name="FileTabCharacter">-->
-      <!--<property name="eachLine" value="false"/>-->
-    <!--</module>-->
-
     <module name="SuppressionCommentFilter">
         <property name="offCommentFormat" value="CHECKSTYLE_OFF\: ([\w\|]+)"/>
         <property name="onCommentFormat" value="CHECKSTYLE_OFF\: ([\w\|]+)"/>
@@ -184,16 +176,6 @@
                      value="GenericWhitespace ''{0}'' is not preceded with whitespace."/>
         </module>
 
-        <!--I need to import this .xml format as my Intellij Java codestyle to make it work-->
-        <!--<module name="Indentation">-->
-            <!--<property name="basicOffset" value="4"/>-->
-            <!--<property name="braceAdjustment" value="0"/>-->
-            <!--<property name="caseIndent" value="4"/>-->
-            <!--<property name="throwsIndent" value="4"/>-->
-            <!--<property name="lineWrappingIndentation" value="4"/>-->
-            <!--<property name="arrayInitIndent" value="4"/>-->
-        <!--</module>-->
-
         <module name="AbbreviationAsWordInName">
             <property name="ignoreFinal" value="false"/>
             <property name="allowedAbbreviationLength" value="10"/>
diff --git a/src/main/java/com/fishercoder/common/utils/TreeUtils.java b/src/main/java/com/fishercoder/common/utils/TreeUtils.java
@@ -9,7 +9,6 @@
 import java.util.List;
 import java.util.Queue;
 
-
 /**
  * This is a util class to contain all tree related methods.
  */
@@ -26,8 +25,8 @@ public class TreeUtils {
         1
 */
 @Notes(context = "This is usually how Leetcode OJ passes a binary tree into testing: "
-		+ "https://leetcode.com/faq/#binary-tree, I wrote this function for my own ease of testing when copying"
-		+ "the test case from Leetcode in the form of [1, null, 2, 3].")
+	+ "https://leetcode.com/faq/#binary-tree, I wrote this function for my own ease of testing when copying"
+	+ "the test case from Leetcode in the form of [1, null, 2, 3].")
 public static TreeNode constructBinaryTree(List<Integer> treeValues) {
 	TreeNode root = new TreeNode(treeValues.get(0));
 	Queue<TreeNode> queue = new LinkedList<>();
@@ -61,11 +60,11 @@ private static int maxLevel(TreeNode root) {
 		}
 
 		return Math.max(TreeUtils.maxLevel(root.left),
-				TreeUtils.maxLevel(root.right)) + 1;
+			TreeUtils.maxLevel(root.right)) + 1;
 	}
 
 	private static void printNodeInternal(
-			List<TreeNode> list, int level, int maxLevel) {
+		List<TreeNode> list, int level, int maxLevel) {
 		if (list.isEmpty() || CommonUtils.isAllElementsNull(list)) {
 			return;
 		}
@@ -98,7 +97,7 @@ private static void printNodeInternal(
 				CommonUtils.printWhitespaces(firstSpaces - i);
 				if (list.get(j) == null) {
 					CommonUtils.printWhitespaces(endgeLines + endgeLines + i
-							+ 1);
+						+ 1);
 					continue;
 				}
 
@@ -145,9 +144,9 @@ public static void main(String... args) {
 		List<Integer> treeValues2 = Arrays.asList(0, 1, 2, 3, 4, 5, 6);
 
 		//test tree construction
-//		TreeNode root1 = bruteForceConstructBinaryTree(treeValues2);
-//		inOrderTraversal(root1);
-//		printBinaryTree(root1);
+		//		TreeNode root1 = bruteForceConstructBinaryTree(treeValues2);
+		//		inOrderTraversal(root1);
+		//		printBinaryTree(root1);
 
 		// test tree construction
 		TreeNode root2 = constructBinaryTree(treeValues);
@@ -157,7 +156,7 @@ public static void main(String... args) {
 		List<Integer> treeVals = new ArrayList<>(Arrays.asList(1, null, 2, 3));
 		CommonUtils.printList(treeVals);
 		root2 = constructBinaryTree(treeVals);
-//		inOrderTraversal(root2);
+		//		inOrderTraversal(root2);
 		printBinaryTree(root2);
 	}
 }
diff --git a/src/main/java/com/fishercoder/solutions/_6.java b/src/main/java/com/fishercoder/solutions/_6.java
@@ -15,30 +15,30 @@
 
 public class _6 {
 
-    public String convert(String s, int numRows) {
-        StringBuilder[] sb = new StringBuilder[numRows];
-        char[] c = s.toCharArray();
-        int len = s.length();
-        for (int i = 0; i < numRows; i++) {
-            sb[i] = new StringBuilder();//this is an important step to initialize it
-        }
-        int i = 0;
-        while (i < len) {
-            for (int index = 0; index < numRows && i < len; index++) {
-                sb[index].append(c[i++]);// vertically down
-            }
-
-            for (int index = numRows - 2; index >= 1 && i < len; index--) {
-                /**Why it should start from numRows - 2? Think of the example when numRows = 3
-             the starting point of obliquely going up is 1, which is numRows-2.*/
-                sb[index].append(c[i++]);// obliquely up
-            }
-        }
-
-        for (i = 1; i < numRows; i++) {
-            sb[0].append(sb[i]);
-        }
-        return sb[0].toString();
-    }
+	public String convert(String s, int numRows) {
+		StringBuilder[] sb = new StringBuilder[numRows];
+		char[] c = s.toCharArray();
+		int len = s.length();
+		for (int i = 0; i < numRows; i++) {
+			sb[i] = new StringBuilder();//this is an important step to initialize it
+		}
+		int i = 0;
+		while (i < len) {
+			for (int index = 0; index < numRows && i < len; index++) {
+				sb[index].append(c[i++]);// vertically down
+			}
+
+			for (int index = numRows - 2; index >= 1 && i < len; index--) {
+				/**Why it should start from numRows - 2? Think of the example when numRows = 3
+				 the starting point of obliquely going up is 1, which is numRows-2.*/
+				sb[index].append(c[i++]);// obliquely up
+			}
+		}
+
+		for (i = 1; i < numRows; i++) {
+			sb[0].append(sb[i]);
+		}
+		return sb[0].toString();
+	}
 
 }
