From d71b828437a1af9ae4c1cc50fd6381e422160f0f Mon Sep 17 00:00:00 2001
From: shichao <ijavacs@gmail.com>
Date: Wed, 13 May 2020 16:18:09 +0800
Subject: [PATCH] format

---
 .../item2/builder/NutritionFacts.java         | 47 ++++++++++++-------
 .../item2/javabeans/NutritionFacts.java       | 43 ++++++++++++-----
 .../NutritionFacts.java                       | 13 ++---
 3 files changed, 67 insertions(+), 36 deletions(-)

diff --git a/src/effectivejava/chapter2/item2/builder/NutritionFacts.java b/src/effectivejava/chapter2/item2/builder/NutritionFacts.java
index 0c630099..d0f7f2da 100644
--- a/src/effectivejava/chapter2/item2/builder/NutritionFacts.java
+++ b/src/effectivejava/chapter2/item2/builder/NutritionFacts.java
@@ -15,24 +15,35 @@ public static class Builder {
         private final int servings;
 
         // Optional parameters - initialized to default values
-        private int calories      = 0;
-        private int fat           = 0;
-        private int sodium        = 0;
-        private int carbohydrate  = 0;
+        private int calories = 0;
+        private int fat = 0;
+        private int sodium = 0;
+        private int carbohydrate = 0;
 
         public Builder(int servingSize, int servings) {
             this.servingSize = servingSize;
-            this.servings    = servings;
+            this.servings = servings;
         }
 
-        public Builder calories(int val)
-        { calories = val;      return this; }
-        public Builder fat(int val)
-        { fat = val;           return this; }
-        public Builder sodium(int val)
-        { sodium = val;        return this; }
-        public Builder carbohydrate(int val)
-        { carbohydrate = val;  return this; }
+        public Builder calories(int val) {
+            calories = val;
+            return this;
+        }
+
+        public Builder fat(int val) {
+            fat = val;
+            return this;
+        }
+
+        public Builder sodium(int val) {
+            sodium = val;
+            return this;
+        }
+
+        public Builder carbohydrate(int val) {
+            carbohydrate = val;
+            return this;
+        }
 
         public NutritionFacts build() {
             return new NutritionFacts(this);
@@ -40,11 +51,11 @@ public NutritionFacts build() {
     }
 
     private NutritionFacts(Builder builder) {
-        servingSize  = builder.servingSize;
-        servings     = builder.servings;
-        calories     = builder.calories;
-        fat          = builder.fat;
-        sodium       = builder.sodium;
+        servingSize = builder.servingSize;
+        servings = builder.servings;
+        calories = builder.calories;
+        fat = builder.fat;
+        sodium = builder.sodium;
         carbohydrate = builder.carbohydrate;
     }
 
diff --git a/src/effectivejava/chapter2/item2/javabeans/NutritionFacts.java b/src/effectivejava/chapter2/item2/javabeans/NutritionFacts.java
index a5e4d81f..9ab2a552 100644
--- a/src/effectivejava/chapter2/item2/javabeans/NutritionFacts.java
+++ b/src/effectivejava/chapter2/item2/javabeans/NutritionFacts.java
@@ -3,21 +3,40 @@
 // JavaBeans Pattern - allows inconsistency, mandates mutability  (pages 11-12)
 public class NutritionFacts {
     // Parameters initialized to default values (if any)
-    private int servingSize  = -1; // Required; no default value
-    private int servings     = -1; // Required; no default value
-    private int calories     = 0;
-    private int fat          = 0;
-    private int sodium       = 0;
+    private int servingSize = -1; // Required; no default value
+    private int servings = -1; // Required; no default value
+    private int calories = 0;
+    private int fat = 0;
+    private int sodium = 0;
     private int carbohydrate = 0;
 
-    public NutritionFacts() { }
+    public NutritionFacts() {
+    }
+
     // Setters
-    public void setServingSize(int val)  { servingSize = val; }
-    public void setServings(int val)     { servings = val; }
-    public void setCalories(int val)     { calories = val; }
-    public void setFat(int val)          { fat = val; }
-    public void setSodium(int val)       { sodium = val; }
-    public void setCarbohydrate(int val) { carbohydrate = val; }
+    public void setServingSize(int val) {
+        servingSize = val;
+    }
+
+    public void setServings(int val) {
+        servings = val;
+    }
+
+    public void setCalories(int val) {
+        calories = val;
+    }
+
+    public void setFat(int val) {
+        fat = val;
+    }
+
+    public void setSodium(int val) {
+        sodium = val;
+    }
+
+    public void setCarbohydrate(int val) {
+        carbohydrate = val;
+    }
 
     public static void main(String[] args) {
         NutritionFacts cocaCola = new NutritionFacts();
diff --git a/src/effectivejava/chapter2/item2/telescopingconstructor/NutritionFacts.java b/src/effectivejava/chapter2/item2/telescopingconstructor/NutritionFacts.java
index 230e33cd..5e121939 100644
--- a/src/effectivejava/chapter2/item2/telescopingconstructor/NutritionFacts.java
+++ b/src/effectivejava/chapter2/item2/telescopingconstructor/NutritionFacts.java
@@ -27,13 +27,14 @@ public NutritionFacts(int servingSize, int servings,
                           int calories, int fat, int sodium) {
         this(servingSize, servings, calories, fat, sodium, 0);
     }
+
     public NutritionFacts(int servingSize, int servings,
                           int calories, int fat, int sodium, int carbohydrate) {
-        this.servingSize  = servingSize;
-        this.servings     = servings;
-        this.calories     = calories;
-        this.fat          = fat;
-        this.sodium       = sodium;
+        this.servingSize = servingSize;
+        this.servings = servings;
+        this.calories = calories;
+        this.fat = fat;
+        this.sodium = sodium;
         this.carbohydrate = carbohydrate;
     }
 
@@ -41,5 +42,5 @@ public static void main(String[] args) {
         NutritionFacts cocaCola =
                 new NutritionFacts(240, 8, 100, 0, 35, 27);
     }
-    
+
 }
\ No newline at end of file