Skip to content

Commit

Permalink
Merge pull request CyC2018#1011 from qizhengzhong/master
Browse files Browse the repository at this point in the history
文本小错误更改
  • Loading branch information
CyC2018 authored Nov 19, 2020
2 parents fb9f2a6 + 5ee7c7c commit efc0bcd
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 2 deletions.
2 changes: 1 addition & 1 deletion notes/Java 基础.md
Original file line number Diff line number Diff line change
Expand Up @@ -1400,7 +1400,7 @@ public class Box<T> {
}
```

- [Java 泛型详解](http://www.importnew.com/24029.html)
- [Java 泛型详解](https://www.cnblogs.com/Blue-Keroro/p/8875898.html)
- [10Java 泛型面试题](https://cloud.tencent.com/developer/article/1033693)

## 十、注解
Expand Down
1 change: 1 addition & 0 deletions notes/Java 并发.md
Original file line number Diff line number Diff line change
Expand Up @@ -613,6 +613,7 @@ public static void main(String[] args) {
WaitNotifyExample example = new WaitNotifyExample();
executorService.execute(() -> example.after());
executorService.execute(() -> example.before());
executorService.shutdown();
}
```

Expand Down
5 changes: 5 additions & 0 deletions notes/Linux.md
Original file line number Diff line number Diff line change
Expand Up @@ -1077,6 +1077,11 @@ dmtsai tty1 Fri May 29 11:55 - 12:11 (00:15)

```html
$ last -n 5 | awk '{print $1 "\t" $3}'
dmtsai 192.168.1.100
dmtsai 192.168.1.100
dmtsai 192.168.1.100
dmtsai 192.168.1.100
dmtsai Fri
```

可以根据字段的某些条件进行匹配,例如匹配字段小于某个值的那行数据。
Expand Down
2 changes: 1 addition & 1 deletion notes/设计模式 - 备忘录.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

- Originator:原始对象
- Caretaker:负责保存好备忘录
- Memento:备忘录,存储原始对象的的状态。备忘录实际上有两个接口,个是提供给 Caretaker 的窄接口:它只能将备忘录传递给其它对象;个是提供给 Originator 的宽接口,允许它访问到先前状态所需的所有数据。理想情况是只允许 Originator 访问本备忘录的内部状态。
- Memento:备忘录,存储原始对象的状态。备忘录实际上有两个接口,个是提供给 Caretaker 的窄接口:它只能将备忘录传递给其它对象;个是提供给 Originator 的宽接口,允许它访问到先前状态所需的所有数据。理想情况是只允许 Originator 访问本备忘录的内部状态。

<div align="center"> <img src="https://cs-notes-1256109796.cos.ap-guangzhou.myqcloud.com/50678f34-694f-45a4-91c6-34d985c83fee.png"/> </div><br>

Expand Down

0 comments on commit efc0bcd

Please sign in to comment.