Skip to content

Commit f5db54d

Browse files
brianwaybrianway
committed
[update] format code style
1 parent 9732c15 commit f5db54d

File tree

318 files changed

+1065
-1132
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

318 files changed

+1065
-1132
lines changed

Diff for: ‎java-base/pom.xml

-1
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,4 @@
1111

1212
<artifactId>java-base</artifactId>
1313

14-
1514
</project>

Diff for: ‎java-base/src/main/java/com/brianway/learning/java/base/constructor/FatherClass.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
public class FatherClass {
77
private String name;
88

9-
public FatherClass(){
9+
public FatherClass() {
1010
System.out.println("执行了父类的无参构造方法");
1111
}
1212

Diff for: ‎java-base/src/main/java/com/brianway/learning/java/base/constructor/SonClass.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* 构造方法调用问题
99
* 子类构造方法会首先默认调用父类的无参构造方法，无论是否显式写了super();
1010
*/
11-
public class SonClass extends FatherClass{
11+
public class SonClass extends FatherClass {
1212
public SonClass(String name) {
1313
//super(name);
1414
System.out.println("执行了子类的构造方法SonClass(String name)");

Diff for: ‎java-multithread/pom.xml

-1
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,4 @@
1818
</dependency>
1919
</dependencies>
2020

21-
2221
</project>

Diff for: ‎java-multithread/src/main/java/com/brianway/learning/java/multithread/communication/example1/MyList.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package com.brianway.learning.java.multithread.communication.example1;
22

3-
43
import java.util.ArrayList;
54
import java.util.List;
65

@@ -10,10 +9,11 @@
109
public class MyList {
1110
private List list = new ArrayList();
1211

13-
public void add(){
12+
public void add() {
1413
list.add("brian");
1514
}
16-
public int size(){
15+
16+
public int size() {
1717
return list.size();
1818
}
1919
}

Diff for: ‎java-multithread/src/main/java/com/brianway/learning/java/multithread/communication/example1/Run1_TwoThreadTransData.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
public class Run1_TwoThreadTransData {
1414
public static void main(String[] args) {
1515
MyList service = new MyList();
16-
ThreadA a =new ThreadA(service);
16+
ThreadA a = new ThreadA(service);
1717
a.setName("A");
1818
a.start();
1919
ThreadB b = new ThreadB(service);

Diff for: ‎java-multithread/src/main/java/com/brianway/learning/java/multithread/communication/example1/ThreadA.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ public ThreadA(MyList list) {
1313

1414
@Override
1515
public void run() {
16-
for(int i = 0;i<10;i++){
16+
for (int i = 0; i < 10; i++) {
1717
list.add();
18-
System.out.println("添加了"+(i+1)+"元素");
18+
System.out.println("添加了" + (i + 1) + "元素");
1919
try {
2020
Thread.sleep(1000);
2121
} catch (InterruptedException e) {

Diff for: ‎java-multithread/src/main/java/com/brianway/learning/java/multithread/communication/example1/ThreadB.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ public ThreadB(MyList list) {
1414
@Override
1515
public void run() {
1616
try {
17-
while (true){
17+
while (true) {
1818
//System.out.println("in b while: "+list.size());
1919
//synchronized ("any"){}
20-
if(list.size() == 5){
20+
if (list.size() == 5) {
2121
System.out.println("达到size了，线程b要退出了");
2222
throw new InterruptedException();
2323
}

Diff for: ‎java-multithread/src/main/java/com/brianway/learning/java/multithread/communication/example10/C_Thread.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
/**
44
* Created by Brian on 2016/4/14.
55
*/
6-
public class C_Thread extends Thread{
6+
public class C_Thread extends Thread {
77
private Consumer c;
88

99
public C_Thread(Consumer c) {
@@ -13,7 +13,7 @@ public C_Thread(Consumer c) {
1313

1414
@Override
1515
public void run() {
16-
while (true){
16+
while (true) {
1717
c.popService();
1818
}
1919
}

Diff for: ‎java-multithread/src/main/java/com/brianway/learning/java/multithread/communication/example10/Consumer.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ public Consumer(MyStack myStack) {
1111
this.myStack = myStack;
1212
}
1313

14-
public void popService(){
15-
System.out.println("pop = "+ myStack.pop()+" Consumer的popService方法中打印pop返回值");
14+
public void popService() {
15+
System.out.println("pop = " + myStack.pop() + " Consumer的popService方法中打印pop返回值");
1616
}
1717

1818
}

Diff for: ‎java-multithread/src/main/java/com/brianway/learning/java/multithread/communication/example10/MyStack.java

+9-9
Original file line numberDiff line numberDiff line change
@@ -9,31 +9,31 @@
99
public class MyStack {
1010
private List list = new ArrayList();
1111

12-
synchronized public void push(){
12+
synchronized public void push() {
1313
try {
14-
while(list.size()== 1){
15-
System.out.println("push操作中的： "+ Thread.currentThread().getName()+ " 线程呈wait状态");
14+
while (list.size() == 1) {
15+
System.out.println("push操作中的： " + Thread.currentThread().getName() + " 线程呈wait状态");
1616
this.wait();
1717
}
1818
list.add(Math.random());
1919
this.notify();
20-
System.out.println("push = " + list.size() );
20+
System.out.println("push = " + list.size());
2121
} catch (InterruptedException e) {
2222
e.printStackTrace();
2323
}
2424
}
2525

26-
synchronized public String pop(){
26+
synchronized public String pop() {
2727
String returnValue = "";
2828
try {
29-
while(list.size() == 0){
30-
System.out.println("pop操作中的： "+ Thread.currentThread().getName()+ " 线程呈wait状态");
29+
while (list.size() == 0) {
30+
System.out.println("pop操作中的： " + Thread.currentThread().getName() + " 线程呈wait状态");
3131
this.wait();
3232
}
33-
returnValue =list.get(0)+ " "+Thread.currentThread().getName() ;
33+
returnValue = list.get(0) + " " + Thread.currentThread().getName();
3434
list.remove(0);
3535
this.notify();
36-
System.out.println("pop = "+ list.size()+" Mystack的pop方法中 线程"+Thread.currentThread().getName());
36+
System.out.println("pop = " + list.size() + " Mystack的pop方法中 线程" + Thread.currentThread().getName());
3737
} catch (InterruptedException e) {
3838
e.printStackTrace();
3939
}

Diff for: ‎java-multithread/src/main/java/com/brianway/learning/java/multithread/communication/example10/P_Thread.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
/**
44
* Created by Brian on 2016/4/14.
55
*/
6-
public class P_Thread extends Thread{
6+
public class P_Thread extends Thread {
77
private Producer p;
88

99
public P_Thread(Producer p) {
@@ -13,7 +13,7 @@ public P_Thread(Producer p) {
1313

1414
@Override
1515
public void run() {
16-
while (true){
16+
while (true) {
1717
p.pushService();
1818
}
1919
}

Diff for: ‎java-multithread/src/main/java/com/brianway/learning/java/multithread/communication/example10/Producer.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
package com.brianway.learning.java.multithread.communication.example10;
22

3-
43
/**
54
* Created by Brian on 2016/4/14.
65
*/
76
public class Producer {
87
private MyStack myStack;
9-
public Producer(MyStack myStack){
8+
9+
public Producer(MyStack myStack) {
1010
super();
1111
this.myStack = myStack;
1212
}
1313

14-
public void pushService(){
14+
public void pushService() {
1515
myStack.push();
1616
}
1717

Diff for: ‎java-multithread/src/main/java/com/brianway/learning/java/multithread/communication/example10/Run10_oneP_manyC.java

+3-5
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
*
1111
* while判断解决条件发生改变时没有得到及时的响应，多个呈wait状态的线程被唤醒的问题
1212
* 但会出现新的问题：假死
13-
*
1413
*/
1514
public class Run10_oneP_manyC {
1615
public static void main(String[] args) {
@@ -20,20 +19,19 @@ public static void main(String[] args) {
2019
P_Thread p_thread = new P_Thread(p);
2120
p_thread.start();
2221

23-
2422
int cNum = 5;
2523
Consumer[] consumers = new Consumer[cNum];
2624
C_Thread[] c_threads = new C_Thread[cNum];
2725

28-
for(int i=0;i<cNum;i++){
26+
for (int i = 0; i < cNum; i++) {
2927
consumers[i] = new Consumer(myStack);
3028
}
3129

32-
for (int i=0;i<cNum;i++){
30+
for (int i = 0; i < cNum; i++) {
3331
c_threads[i] = new C_Thread(consumers[i]);
3432
}
3533

36-
for (int i=0;i<cNum;i++){
34+
for (int i = 0; i < cNum; i++) {
3735
c_threads[i].start();
3836
}
3937

Diff for: ‎java-multithread/src/main/java/com/brianway/learning/java/multithread/communication/example11/C_Thread.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
/**
44
* Created by Brian on 2016/4/14.
55
*/
6-
public class C_Thread extends Thread{
6+
public class C_Thread extends Thread {
77
private Consumer c;
88

99
public C_Thread(Consumer c) {
@@ -13,7 +13,7 @@ public C_Thread(Consumer c) {
1313

1414
@Override
1515
public void run() {
16-
while (true){
16+
while (true) {
1717
c.popService();
1818
}
1919
}

Diff for: ‎java-multithread/src/main/java/com/brianway/learning/java/multithread/communication/example11/Consumer.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ public Consumer(MyStack myStack) {
1111
this.myStack = myStack;
1212
}
1313

14-
public void popService(){
15-
System.out.println("pop = "+ myStack.pop()+" Consumer的popService方法中打印pop返回值");
14+
public void popService() {
15+
System.out.println("pop = " + myStack.pop() + " Consumer的popService方法中打印pop返回值");
1616
}
1717

1818
}

Diff for: ‎java-multithread/src/main/java/com/brianway/learning/java/multithread/communication/example11/MyStack.java

+9-9
Original file line numberDiff line numberDiff line change
@@ -9,31 +9,31 @@
99
public class MyStack {
1010
private List list = new ArrayList();
1111

12-
synchronized public void push(){
12+
synchronized public void push() {
1313
try {
14-
while(list.size()== 1){
15-
System.out.println("push操作中的： "+ Thread.currentThread().getName()+ " 线程呈wait状态");
14+
while (list.size() == 1) {
15+
System.out.println("push操作中的： " + Thread.currentThread().getName() + " 线程呈wait状态");
1616
this.wait();
1717
}
1818
list.add(Math.random());
1919
this.notifyAll();
20-
System.out.println("push = " + list.size() );
20+
System.out.println("push = " + list.size());
2121
} catch (InterruptedException e) {
2222
e.printStackTrace();
2323
}
2424
}
2525

26-
synchronized public String pop(){
26+
synchronized public String pop() {
2727
String returnValue = "";
2828
try {
29-
while(list.size() == 0){
30-
System.out.println("pop操作中的： "+ Thread.currentThread().getName()+ " 线程呈wait状态");
29+
while (list.size() == 0) {
30+
System.out.println("pop操作中的： " + Thread.currentThread().getName() + " 线程呈wait状态");
3131
this.wait();
3232
}
33-
returnValue =list.get(0)+ " "+Thread.currentThread().getName() ;
33+
returnValue = list.get(0) + " " + Thread.currentThread().getName();
3434
list.remove(0);
3535
this.notifyAll();
36-
System.out.println("pop = "+ list.size()+" Mystack的pop方法中 线程"+Thread.currentThread().getName());
36+
System.out.println("pop = " + list.size() + " Mystack的pop方法中 线程" + Thread.currentThread().getName());
3737
} catch (InterruptedException e) {
3838
e.printStackTrace();
3939
}

Diff for: ‎java-multithread/src/main/java/com/brianway/learning/java/multithread/communication/example11/P_Thread.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
/**
44
* Created by Brian on 2016/4/14.
55
*/
6-
public class P_Thread extends Thread{
6+
public class P_Thread extends Thread {
77
private Producer p;
88

99
public P_Thread(Producer p) {
@@ -13,7 +13,7 @@ public P_Thread(Producer p) {
1313

1414
@Override
1515
public void run() {
16-
while (true){
16+
while (true) {
1717
p.pushService();
1818
}
1919
}

Diff for: ‎java-multithread/src/main/java/com/brianway/learning/java/multithread/communication/example11/Producer.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
package com.brianway.learning.java.multithread.communication.example11;
22

3-
43
/**
54
* Created by Brian on 2016/4/14.
65
*/
76
public class Producer {
87
private MyStack myStack;
9-
public Producer(MyStack myStack){
8+
9+
public Producer(MyStack myStack) {
1010
super();
1111
this.myStack = myStack;
1212
}
1313

14-
public void pushService(){
14+
public void pushService() {
1515
myStack.push();
1616
}
1717

Diff for: ‎java-multithread/src/main/java/com/brianway/learning/java/multithread/communication/example11/Run11_manyP_manyC.java

+4-7
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,11 @@
44
* Created by Brian on 2016/4/14.
55
*/
66

7-
import com.brianway.learning.java.multithread.communication.example10.*;
8-
97
/**
108
* P170
119
* 多生产与多消费
1210
*
1311
* 一直运行下去
14-
*
1512
*/
1613
public class Run11_manyP_manyC {
1714
public static void main(String[] args) {
@@ -21,11 +18,11 @@ public static void main(String[] args) {
2118
Producer[] producers = new Producer[pNum];
2219
P_Thread[] p_threads = new P_Thread[pNum];
2320

24-
for(int i=0;i<pNum;i++){
21+
for (int i = 0; i < pNum; i++) {
2522
producers[i] = new Producer(myStack);
2623
}
2724

28-
for (int i=0;i<pNum;i++){
25+
for (int i = 0; i < pNum; i++) {
2926
p_threads[i] = new P_Thread(producers[i]);
3027
p_threads[i].start();
3128
}
@@ -34,11 +31,11 @@ public static void main(String[] args) {
3431
Consumer[] consumers = new Consumer[cNum];
3532
C_Thread[] c_threads = new C_Thread[cNum];
3633

37-
for(int i=0;i<cNum;i++){
34+
for (int i = 0; i < cNum; i++) {
3835
consumers[i] = new Consumer(myStack);
3936
}
4037

41-
for (int i=0;i<cNum;i++){
38+
for (int i = 0; i < cNum; i++) {
4239
c_threads[i] = new C_Thread(consumers[i]);
4340
c_threads[i].start();
4441
}

0 commit comments

Comments
 (0)