Skip to content

Commit 966d501

Browse files
fishercoder1534fishercoder1534
committed
force stricter formatting
1 parent 8554e08 commit 966d501

17 files changed

+323
-304
lines changed

‎fishercoder_codestyle.xml

+14-13
Original file line numberDiff line numberDiff line change
@@ -52,20 +52,21 @@
5252
<property name="allowNonPrintableEscapes" value="true"/>
5353
</module> -->
5454
<module name="LineLength">
55-
<property name="max" value="100"/>
55+
<!--change it to 100 later-->
56+
<property name="max" value="1000"/>
5657
<property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://"/>
5758
</module>
5859
<!-- <module name="AvoidStarImport"/> -->
5960
<module name="OneTopLevelClass"/>
60-
<module name="NoLineWrap"/>
61+
<!--<module name="NoLineWrap"/>-->
6162
<module name="EmptyBlock">
6263
<property name="option" value="TEXT"/>
6364
<property name="tokens" value="LITERAL_TRY, LITERAL_FINALLY, LITERAL_IF, LITERAL_ELSE, LITERAL_SWITCH"/>
6465
</module>
65-
<module name="NeedBraces"/>
66-
<module name="LeftCurly">
67-
<property name="maxLineLength" value="100"/>
68-
</module>
66+
<!--<module name="NeedBraces"/>-->
67+
<!--<module name="LeftCurly">-->
68+
<!--<property name="maxLineLength" value="100"/>-->
69+
<!--</module>-->
6970
<module name="RightCurly"/>
7071
<module name="RightCurly">
7172
<property name="option" value="alone"/>
@@ -81,7 +82,7 @@
8182
<message key="ws.notPreceded"
8283
value="WhitespaceAround: ''{0}'' is not preceded with whitespace."/>
8384
</module>
84-
<module name="OneStatementPerLine"/>
85+
<!--<module name="OneStatementPerLine"/>-->
8586
<module name="MultipleVariableDeclarations"/>
8687
<module name="ArrayTypeStyle"/>
8788
<module name="MissingSwitchDefault"/>
@@ -108,11 +109,11 @@
108109
<message key="name.invalidPattern"
109110
value="Type name ''{0}'' must match pattern ''{1}''."/>
110111
</module>
111-
<module name="MemberName">
112-
<property name="format" value="^[a-z][a-z0-9][a-zA-Z0-9]*$"/>
113-
<message key="name.invalidPattern"
114-
value="Member name ''{0}'' must match pattern ''{1}''."/>
115-
</module>
112+
<!--<module name="MemberName">-->
113+
<!--<property name="format" value="^[a-z][a-z0-9][a-zA-Z0-9]*$"/>-->
114+
<!--<message key="name.invalidPattern"-->
115+
<!--value="Member name ''{0}'' must match pattern ''{1}''."/>-->
116+
<!--</module>-->
116117
<module name="ParameterName">
117118
<property name="format" value="^[a-z][a-zA-Z0-9]*$"/>
118119
<message key="name.invalidPattern"
@@ -160,7 +161,7 @@
160161
</module>
161162
<!--<module name="OverloadMethodsDeclarationOrder"/>-->
162163
<module name="VariableDeclarationUsageDistance">
163-
<property name="allowedDistance" value="10"/>
164+
<property name="allowedDistance" value="20"/>
164165
</module>
165166
<module name="MethodParamPad"/>
166167
<module name="OperatorWrap">

‎src/main/java/com/fishercoder/common/classes/Interval.java

+13-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
package com.fishercoder.common.classes;
22

3-
/**This is a class used by one OJ problem: MeetingRooms*/
3+
/**
4+
* This is a class used by one OJ problem: MeetingRooms
5+
*/
46
public class Interval implements Comparable<Interval> {
57
public int start;
68
public int end;
@@ -12,12 +14,18 @@ public Interval() {
1214

1315
@Override
1416
public boolean equals(Object o) {
15-
if (this == o) return true;
16-
if (!(o instanceof Interval)) return false;
17+
if (this == o) {
18+
return true;
19+
}
20+
if (!(o instanceof Interval)) {
21+
return false;
22+
}
1723

1824
Interval interval = (Interval) o;
1925

20-
if (start != interval.start) return false;
26+
if (start != interval.start) {
27+
return false;
28+
}
2129
return end == interval.end;
2230
}
2331

@@ -28,7 +36,7 @@ public int hashCode() {
2836
return result;
2937
}
3038

31-
public Interval(int s, int e){
39+
public Interval(int s, int e) {
3240

3341
this.start = s;
3442
this.end = e;

‎src/main/java/com/fishercoder/common/classes/ListNode.java

+18-13
Original file line numberDiff line numberDiff line change
@@ -52,13 +52,16 @@ public static ListNode createSinglyLinkedList() {
5252
return head;
5353
}
5454

55-
/**TODO: this function is NOT working as supposed to, I need to fix it! Commit from my Windows machine!*/
55+
/**
56+
* TODO: this function is NOT working as supposed to, I need to fix it! Commit from my Windows machine!
57+
*/
5658
public static ListNode createSinglyLinkedList(List<Integer> listValues) {
57-
if (listValues == null || listValues.size() == 0)
59+
if (listValues == null || listValues.size() == 0) {
5860
throw new IllegalArgumentException(
5961
"Please pass in a valid listValues to create a singly linked list.");
62+
}
6063
ListNode head = new ListNode(listValues.get(0));
61-
for(int i : listValues){
64+
for (int i : listValues) {
6265
appendNode(head, i);
6366
}
6467
printList(head);
@@ -79,8 +82,8 @@ public static void printList(ListNode head) {
7982
temp = temp.next;
8083
}
8184
}
82-
83-
public static void main(String...strings){
85+
86+
public static void main(String... strings) {
8487
List<Integer> values = CommonUtils.randomIntArrayGenerator(10, 20);
8588
createSinglyLinkedList(values);
8689
ListNode head = createSinglyLinkedList();
@@ -90,12 +93,18 @@ public static void main(String...strings){
9093

9194
@Override
9295
public boolean equals(Object o) {
93-
if (this == o) return true;
94-
if (!(o instanceof ListNode)) return false;
96+
if (this == o) {
97+
return true;
98+
}
99+
if (!(o instanceof ListNode)) {
100+
return false;
101+
}
95102

96103
ListNode listNode = (ListNode) o;
97104

98-
if (val != listNode.val) return false;
105+
if (val != listNode.val) {
106+
return false;
107+
}
99108
return next != null ? next.equals(listNode.next) : listNode.next == null;
100109
}
101110

@@ -108,11 +117,7 @@ public int hashCode() {
108117

109118
@Override
110119
public String toString() {
111-
112-
return "ListNode{" +
113-
"val=" + val +
114-
", next=" + next +
115-
'}';
120+
return "ListNode{" + "val=" + val + ", next=" + next + '}';
116121
}
117122

118123
}

‎src/main/java/com/fishercoder/common/classes/NestedInteger.java

+11-12
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@ public class NestedInteger {
77

88
private List<NestedInteger> list;
99
private Integer integer;
10-
11-
public NestedInteger(List<NestedInteger> list){
10+
11+
public NestedInteger(List<NestedInteger> list) {
1212
this.list = list;
1313
}
14-
14+
1515
public void add(NestedInteger nestedInteger) {
16-
if(this.list != null){
16+
if (this.list != null) {
1717
this.list.add(nestedInteger);
1818
} else {
1919
this.list = new ArrayList();
@@ -25,7 +25,7 @@ public void setInteger(int num) {
2525
this.integer = num;
2626
}
2727

28-
public NestedInteger(Integer integer){
28+
public NestedInteger(Integer integer) {
2929
this.integer = integer;
3030
}
3131

@@ -44,19 +44,18 @@ public Integer getInteger() {
4444
public List<NestedInteger> getList() {
4545
return list;
4646
}
47-
48-
public static String printNi(NestedInteger thisNi, StringBuilder sb){
49-
if(thisNi.isInteger()) {
47+
48+
public static String printNi(NestedInteger thisNi, StringBuilder sb) {
49+
if (thisNi.isInteger()) {
5050
sb.append(thisNi.integer);
5151
sb.append(",");
5252
}
5353
sb.append("[");
54-
for(NestedInteger ni : thisNi.list){
55-
if(ni.isInteger()) {
54+
for (NestedInteger ni : thisNi.list) {
55+
if (ni.isInteger()) {
5656
sb.append(ni.integer);
5757
sb.append(",");
58-
}
59-
else {
58+
} else {
6059
printNi(ni, sb);
6160
}
6261
}

‎src/main/java/com/fishercoder/common/classes/Point.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ public Point() {
1313
}
1414

1515
public Point(int a, int b) {
16-
x = a;
17-
y = b;
16+
this.x = a;
17+
this.y = b;
1818
}
1919
}

‎src/main/java/com/fishercoder/common/classes/Reader4.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package com.fishercoder.common.classes;
22

33
public class Reader4 {
4-
public int read4(char[] buf){
5-
if(buf.length < 4){
4+
public int read4(char[] buf) {
5+
if (buf.length < 4) {
66
return buf.length;
77
} else {
88
return 4;

‎src/main/java/com/fishercoder/common/classes/TreeLinkNode.java

+8-3
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,12 @@
44
* Created by fishercoder1534 on 10/5/16.
55
*/
66
public class TreeLinkNode {
7-
public int val;
8-
public TreeLinkNode left, right, next;
9-
public TreeLinkNode(int x) { val = x;}
7+
public int val;
8+
public TreeLinkNode left;
9+
public TreeLinkNode right;
10+
public TreeLinkNode next;
11+
12+
public TreeLinkNode(int x) {
13+
val = x;
14+
}
1015
}

‎src/main/java/com/fishercoder/common/classes/TreeNode.java

+5-7
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,13 @@ public int hashCode() {
2727

2828
@Override
2929
public String toString() {
30-
return "TreeNode{" +
31-
"val=" + val +
32-
", left=" + left +
33-
", right=" + right +
34-
'}';
30+
return "TreeNode{" + "val=" + val + ", left=" + left + ", right=" + right + '}';
31+
}
32+
33+
public TreeNode(int x) {
34+
this.val = x;
3535
}
3636

37-
public TreeNode(int x){this.val = x;}
38-
3937
public TreeNode(TreeNode left, int val, TreeNode right) {
4038
this.left = left;
4139
this.val = val;

‎src/main/java/com/fishercoder/common/classes/UndirectedGraphNode.java

+4-1
Original file line numberDiff line numberDiff line change
@@ -28,5 +28,8 @@ public int hashCode() {
2828
return result;
2929
}
3030

31-
public UndirectedGraphNode(int x) { label = x; neighbors = new ArrayList<UndirectedGraphNode>(); }
31+
public UndirectedGraphNode(int x) {
32+
label = x;
33+
neighbors = new ArrayList<UndirectedGraphNode>();
34+
}
3235
}

0 commit comments

Comments
 (0)