Changed grind to ground

steveonjava · steveonjava · commit 68be56bb6384 · 2015-09-18T14:14:36.000-07:00
diff --git a/src/com/nighthacking/recipes/AeroPressCoffee.java b/src/com/nighthacking/recipes/AeroPressCoffee.java
@@ -16,7 +16,7 @@ public class AeroPressCoffee implements Recipe {
   private final Ingredient extraWater;
 
   public AeroPressCoffee(double strength) {
-    beans = Ingredient.byWeight(CoffeeCalculator.grindWeight(strength, CUP_SIZE), "Coffee Beans");
+    beans = Ingredient.byWeight(CoffeeCalculator.groundWeight(strength, CUP_SIZE), "Coffee Beans");
     brewingWater = Ingredient.byWeight(beans.getWeight() / BREW_RATIO, "Water");
     extraWater = Ingredient.byWeight(CUP_SIZE - brewingWater.getWeight(), "Water");
   }
@@ -43,7 +43,7 @@ public Step[] steps() {
       Step.waitFor(beans),
       Step.say("Great, take your beans off the scale now."),
       Step.waitForClear(),
-      Step.say("Put your AeroPress filled with grinds on"),
+      Step.say("Put your AeroPress filled with grounds on"),
       Step.waitForContents(),
       Step.tare(),
       Step.say("Pour " + brewingWater + " at 200F"),
diff --git a/src/com/nighthacking/recipes/CleverCoffeeDripper.java b/src/com/nighthacking/recipes/CleverCoffeeDripper.java
@@ -14,7 +14,7 @@ public class CleverCoffeeDripper implements Recipe {
   private final Ingredient water;
 
   public CleverCoffeeDripper(double strength) {
-    beans = Ingredient.byWeight(CoffeeCalculator.grindWeight(strength, CUP_SIZE), "Graos de Cafe");
+    beans = Ingredient.byWeight(CoffeeCalculator.groundWeight(strength, CUP_SIZE), "Graos de Cafe");
     water = Ingredient.byWeight(CUP_SIZE, "Agua");
   }
 
diff --git a/src/com/nighthacking/recipes/CoffeeCalculator.java b/src/com/nighthacking/recipes/CoffeeCalculator.java
@@ -10,13 +10,13 @@ public class CoffeeCalculator {
   public static final double STRONG = 62;
 
   /**
-   * Calculates the weight of grinds needed to reach a target coffee strength.
+   * Calculates the weight of grounds needed to reach a target coffee strength.
    *
    * @param strength Target strength in grams/liter
    * @param water Final water volume in grams (1g = 1ml)
-   * @return Amount of grinds needed in grams
+   * @return Amount of grounds needed in grams
    */
-  public static double grindWeight(double strength, double water) {
+  public static double groundWeight(double strength, double water) {
     return strength * (water / 1000);
   }
 }
diff --git a/src/com/nighthacking/recipes/PourOverCoffee.java b/src/com/nighthacking/recipes/PourOverCoffee.java
@@ -16,7 +16,7 @@ public class PourOverCoffee implements Recipe {
   private final Ingredient extraWater;
 
   public PourOverCoffee(double strength) {
-    beans = Ingredient.byWeight(CoffeeCalculator.grindWeight(strength, CUP_SIZE), "Coffee Beans");
+    beans = Ingredient.byWeight(CoffeeCalculator.groundWeight(strength, CUP_SIZE), "Coffee Beans");
     brewingWater = Ingredient.byWeight(CUP_SIZE * BREW_RATIO, "Water");
     extraWater = Ingredient.byWeight(CUP_SIZE - brewingWater.getWeight(), "Water");
   }
@@ -43,7 +43,7 @@ public Step[] steps() {
       Step.waitFor(beans),
       Step.say("Great, take your beans off the scale now."),
       Step.waitForClear(),
-      Step.say("Put your cup, dripper, filter, and grinds on"),
+      Step.say("Put your cup, dripper, filter, and grounds on"),
       Step.waitForContents(),
       Step.tare(),
       Step.say("Pour " + brewingWater + " at 200F"),

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ public class CleverCoffeeDripper implements Recipe {`
`14`	`14`	`private final Ingredient water;`
`15`	`15`
`16`	`16`	`public CleverCoffeeDripper(double strength) {`
`17`		`- beans = Ingredient.byWeight(CoffeeCalculator.grindWeight(strength, CUP_SIZE), "Graos de Cafe");`
	`17`	`+ beans = Ingredient.byWeight(CoffeeCalculator.groundWeight(strength, CUP_SIZE), "Graos de Cafe");`
`18`	`18`	`water = Ingredient.byWeight(CUP_SIZE, "Agua");`
`19`	`19`	`}`
`20`	`20`
Original file line number	Diff line number	Diff line change
`@@ -10,13 +10,13 @@ public class CoffeeCalculator {`
`10`	`10`	`public static final double STRONG = 62;`
`11`	`11`
`12`	`12`	`/**`
`13`		`- * Calculates the weight of grinds needed to reach a target coffee strength.`
	`13`	`+ * Calculates the weight of grounds needed to reach a target coffee strength.`
`14`	`14`	`*`
`15`	`15`	`* @param strength Target strength in grams/liter`
`16`	`16`	`* @param water Final water volume in grams (1g = 1ml)`
`17`		`- * @return Amount of grinds needed in grams`
	`17`	`+ * @return Amount of grounds needed in grams`
`18`	`18`	`*/`
`19`		`- public static double grindWeight(double strength, double water) {`
	`19`	`+ public static double groundWeight(double strength, double water) {`
`20`	`20`	`return strength * (water / 1000);`
`21`	`21`	`}`
`22`	`22`	`}`