From 61558b662092dc15c810b09420503b93f2b4b6e7 Mon Sep 17 00:00:00 2001 From: Benjamin Ran Date: Sun, 6 Jan 2019 02:16:08 -0800 Subject: [PATCH 1/2] use correct package name in package object docs --- _tour/package-objects.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/_tour/package-objects.md b/_tour/package-objects.md index 9a59550b4a..eafc6c2217 100644 --- a/_tour/package-objects.md +++ b/_tour/package-objects.md @@ -37,12 +37,12 @@ object Plum extends Fruit("Plum", "blue") object Banana extends Fruit("Banana", "yellow") ``` -Now assume you want to place a variable `planted` and a method `showFruit` directly into package `gardening`. +Now assume you want to place a variable `planted` and a method `showFruit` directly into package `gardening.fruits`. Here's how this is done: ``` // in file gardening/fruits/package.scala -package gardening +package gardening.fruits package object fruits { val planted = List(Apple, Plum, Banana) def showFruit(fruit: Fruit): Unit = { From 2e4b604b30f1b567a7d2b0f7376fd548209760fb Mon Sep 17 00:00:00 2001 From: Benjamin Ran Date: Sun, 6 Jan 2019 22:29:51 -0800 Subject: [PATCH 2/2] revert package object sample code --- _tour/package-objects.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_tour/package-objects.md b/_tour/package-objects.md index eafc6c2217..628a56d3a0 100644 --- a/_tour/package-objects.md +++ b/_tour/package-objects.md @@ -42,7 +42,7 @@ Here's how this is done: ``` // in file gardening/fruits/package.scala -package gardening.fruits +package gardening package object fruits { val planted = List(Apple, Plum, Banana) def showFruit(fruit: Fruit): Unit = {