From 029d4616a4c9a5a96ef3b21a2c154d4cc34daa6f Mon Sep 17 00:00:00 2001
From: ROG <1049378767@qq.com>
Date: Wed, 22 Sep 2021 14:34:45 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E5=B7=A5=E5=8E=82=E6=96=B9=E6=B3=95?=
=?UTF-8?q?=E6=A8=A1=E5=BC=8F=E5=AE=9E=E6=88=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../com/github/hcsp/encapsulation/Cat.java | 19 ++++++++++++++++++-
1 file changed, 18 insertions(+), 1 deletion(-)
diff --git a/src/main/java/com/github/hcsp/encapsulation/Cat.java b/src/main/java/com/github/hcsp/encapsulation/Cat.java
index 97eba15..511dcd8 100644
--- a/src/main/java/com/github/hcsp/encapsulation/Cat.java
+++ b/src/main/java/com/github/hcsp/encapsulation/Cat.java
@@ -18,7 +18,24 @@ public class Cat {
* @param name 名字
* @return 创建的猫
*/
- public static Cat newCat(String name, int age) {}
+ public static Cat newCat(String name, int age) {
+ if(name==null||name.isEmpty()){
+
+ return INVALID_CAT;
+
+ }else if(age<=0){
+
+ return INVALID_CAT;
+
+ }
+
+ return new Cat(name,age);
+ }
+
+ private Cat(String name,int age){
+ this.name = name;
+ this.age = age;
+ }
public String getName() {
return name;
From 0c6de561ed2a22b2551d8c31b0a267897a472c54 Mon Sep 17 00:00:00 2001
From: ROG <1049378767@qq.com>
Date: Wed, 22 Sep 2021 14:41:24 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E5=B7=A5=E5=8E=82=E6=96=B9=E6=B3=95?=
=?UTF-8?q?=E6=A8=A1=E5=BC=8F=E5=AE=9E=E6=88=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/main/java/com/github/hcsp/encapsulation/Cat.java | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/src/main/java/com/github/hcsp/encapsulation/Cat.java b/src/main/java/com/github/hcsp/encapsulation/Cat.java
index 511dcd8..567160b 100644
--- a/src/main/java/com/github/hcsp/encapsulation/Cat.java
+++ b/src/main/java/com/github/hcsp/encapsulation/Cat.java
@@ -19,11 +19,7 @@ public class Cat {
* @return 创建的猫
*/
public static Cat newCat(String name, int age) {
- if(name==null||name.isEmpty()){
-
- return INVALID_CAT;
-
- }else if(age<=0){
+ if((name == null||name.isEmpty())||(age <= 0)){
return INVALID_CAT;
From 19b801261bcfe7a4b337a627183f62d5bfeb2c4d Mon Sep 17 00:00:00 2001
From: ROG <1049378767@qq.com>
Date: Wed, 22 Sep 2021 14:49:56 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E5=B7=A5=E5=8E=82=E6=96=B9=E6=B3=95?=
=?UTF-8?q?=E6=A8=A1=E5=BC=8F=E5=AE=9E=E6=88=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/main/java/com/github/hcsp/encapsulation/Cat.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/github/hcsp/encapsulation/Cat.java b/src/main/java/com/github/hcsp/encapsulation/Cat.java
index 567160b..cbb0e0c 100644
--- a/src/main/java/com/github/hcsp/encapsulation/Cat.java
+++ b/src/main/java/com/github/hcsp/encapsulation/Cat.java
@@ -14,21 +14,21 @@ public class Cat {
*
* 否则，返回一只新创建的猫
*
- * @param age 年龄
+ * @param age 年龄
* @param name 名字
* @return 创建的猫
*/
public static Cat newCat(String name, int age) {
- if((name == null||name.isEmpty())||(age <= 0)){
+ if ((name == null || name.isEmpty()) || (age <= 0)) {
return INVALID_CAT;
}
- return new Cat(name,age);
+ return new Cat(name, age);
}
- private Cat(String name,int age){
+ private Cat(String name, int age) {
this.name = name;
this.age = age;
}
From f9ab78bd29b11454041e0dc3bb3a593fe238cd15 Mon Sep 17 00:00:00 2001
From: ROG <1049378767@qq.com>
Date: Wed, 22 Sep 2021 14:49:56 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E9=9D=99=E6=80=81=E5=B7=A5=E5=8E=82?=
=?UTF-8?q?=E6=96=B9=E6=B3=95=E5=AE=9E=E6=88=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/main/java/com/github/hcsp/encapsulation/Cat.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/github/hcsp/encapsulation/Cat.java b/src/main/java/com/github/hcsp/encapsulation/Cat.java
index 567160b..cbb0e0c 100644
--- a/src/main/java/com/github/hcsp/encapsulation/Cat.java
+++ b/src/main/java/com/github/hcsp/encapsulation/Cat.java
@@ -14,21 +14,21 @@ public class Cat {
*
*
否则，返回一只新创建的猫
*
- * @param age 年龄
+ * @param age 年龄
* @param name 名字
* @return 创建的猫
*/
public static Cat newCat(String name, int age) {
- if((name == null||name.isEmpty())||(age <= 0)){
+ if ((name == null || name.isEmpty()) || (age <= 0)) {
return INVALID_CAT;
}
- return new Cat(name,age);
+ return new Cat(name, age);
}
- private Cat(String name,int age){
+ private Cat(String name, int age) {
this.name = name;
this.age = age;
}