From a83d2fd4add18299e307031dec3ff7709e4bd602 Mon Sep 17 00:00:00 2001 From: Zukkari Date: Thu, 5 Sep 2019 13:56:09 +0300 Subject: [PATCH 1/3] Remove 'new' keyword when creating instances of 'Circle' class in 'Singleton Objects' section. Class 'Circle' is defined as case class in given code segment. Using 'new' keyword is redundant when creating instances of case class as explained in section 'Case Classes'. --- _ja/tour/singleton-objects.md | 2 +- _ru/tour/singleton-objects.md | 2 +- _tour/singleton-objects.md | 2 +- _zh-cn/tour/singleton-objects.md | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/_ja/tour/singleton-objects.md b/_ja/tour/singleton-objects.md index feea0e5171..fe9bcc9bcc 100644 --- a/_ja/tour/singleton-objects.md +++ b/_ja/tour/singleton-objects.md @@ -76,7 +76,7 @@ object Circle { private def calculateArea(radius: Double): Double = Pi * pow(radius, 2.0) } -val circle1 = new Circle(5.0) +val circle1 = Circle(5.0) circle1.area ``` diff --git a/_ru/tour/singleton-objects.md b/_ru/tour/singleton-objects.md index eab6688c75..2867dda492 100644 --- a/_ru/tour/singleton-objects.md +++ b/_ru/tour/singleton-objects.md @@ -66,7 +66,7 @@ object Circle { private def calculateArea(radius: Double): Double = Pi * pow(radius, 2.0) } -val circle1 = new Circle(5.0) +val circle1 = Circle(5.0) circle1.area ``` diff --git a/_tour/singleton-objects.md b/_tour/singleton-objects.md index 00937045d1..4cf51286e3 100644 --- a/_tour/singleton-objects.md +++ b/_tour/singleton-objects.md @@ -66,7 +66,7 @@ object Circle { private def calculateArea(radius: Double): Double = Pi * pow(radius, 2.0) } -val circle1 = new Circle(5.0) +val circle1 = Circle(5.0) circle1.area ``` diff --git a/_zh-cn/tour/singleton-objects.md b/_zh-cn/tour/singleton-objects.md index b05ef062a0..f970a7ed24 100644 --- a/_zh-cn/tour/singleton-objects.md +++ b/_zh-cn/tour/singleton-objects.md @@ -68,7 +68,7 @@ object Circle { private def calculateArea(radius: Double): Double = Pi * pow(radius, 2.0) } -val circle1 = new Circle(5.0) +val circle1 = Circle(5.0) circle1.area ``` From 78e3f687faa778cdd520db49734778bfadfe0f0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=B5=C5=A1kovski=20Stanislav?= Date: Wed, 11 Sep 2019 08:23:53 +0300 Subject: [PATCH 2/3] Remove 'new' keyword when creating case class Remove 'new' keyword when creating instances of case class in 'Lower type bounds' section. --- _ba/tour/lower-type-bounds.md | 2 +- _ja/tour/lower-type-bounds.md | 2 +- _ru/tour/lower-type-bounds.md | 2 +- _tour/lower-type-bounds.md | 2 +- _zh-cn/tour/lower-type-bounds.md | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/_ba/tour/lower-type-bounds.md b/_ba/tour/lower-type-bounds.md index 9b9b7bd7c9..8261a2e77c 100644 --- a/_ba/tour/lower-type-bounds.md +++ b/_ba/tour/lower-type-bounds.md @@ -68,6 +68,6 @@ case class EuropeanSwallow() extends Bird val africanSwallowList= ListNode[AfricanSwallow](AfricanSwallow(), Nil()) val birdList: Node[Bird] = africanSwallowList -birdList.prepend(new EuropeanSwallow) +birdList.prepend(EuropeanSwallow()) ``` `Node[Bird]` može biti dodijeljena `africanSwallowList` ali onda prihvatiti `EuropeanSwallow`e. diff --git a/_ja/tour/lower-type-bounds.md b/_ja/tour/lower-type-bounds.md index b6b98cebdb..e522216a76 100644 --- a/_ja/tour/lower-type-bounds.md +++ b/_ja/tour/lower-type-bounds.md @@ -69,7 +69,7 @@ case class EuropeanSwallow() extends Bird val africanSwallowList= ListNode[AfricanSwallow](AfricanSwallow(), Nil()) val birdList: Node[Bird] = africanSwallowList -birdList.prepend(new EuropeanSwallow) +birdList.prepend(EuropeanSwallow()) ``` `Node[Bird]`は`africanSwallowList`をアサインできますが、その後`EuropeanSwallow`を受け入れられます。 diff --git a/_ru/tour/lower-type-bounds.md b/_ru/tour/lower-type-bounds.md index fe42c61630..27000cc863 100644 --- a/_ru/tour/lower-type-bounds.md +++ b/_ru/tour/lower-type-bounds.md @@ -65,6 +65,6 @@ case class EuropeanSwallow() extends Bird val africanSwallowList= ListNode[AfricanSwallow](AfricanSwallow(), Nil()) val birdList: Node[Bird] = africanSwallowList -birdList.prepend(new EuropeanSwallow) +birdList.prepend(EuropeanSwallow()) ``` `Node[Bird]` может быть присвоен `africanSwallowList` , но затем может добавлять и `EuropeanSwallow`. diff --git a/_tour/lower-type-bounds.md b/_tour/lower-type-bounds.md index 1b608f8185..ec023c130c 100644 --- a/_tour/lower-type-bounds.md +++ b/_tour/lower-type-bounds.md @@ -62,6 +62,6 @@ case class EuropeanSwallow() extends Bird val africanSwallowList= ListNode[AfricanSwallow](AfricanSwallow(), Nil()) val birdList: Node[Bird] = africanSwallowList -birdList.prepend(new EuropeanSwallow) +birdList.prepend(EuropeanSwallow()) ``` The `Node[Bird]` can be assigned the `africanSwallowList` but then accept `EuropeanSwallow`s. diff --git a/_zh-cn/tour/lower-type-bounds.md b/_zh-cn/tour/lower-type-bounds.md index 3443c752cf..26c1bfba81 100644 --- a/_zh-cn/tour/lower-type-bounds.md +++ b/_zh-cn/tour/lower-type-bounds.md @@ -62,6 +62,6 @@ case class EuropeanSwallow() extends Bird val africanSwallowList= ListNode[AfricanSwallow](AfricanSwallow(), Nil()) val birdList: Node[Bird] = africanSwallowList -birdList.prepend(new EuropeanSwallow) +birdList.prepend(EuropeanSwallow()) ``` 可以为 `Node[Bird]` 赋值 `africanSwallowList`，然后再加入一个 `EuropeanSwallow`。 From 49b809aa8b06968487d43e1efcc06afd63755221 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=B5=C5=A1kovski=20Stanislav?= Date: Wed, 11 Sep 2019 08:30:57 +0300 Subject: [PATCH 3/3] Apply IntelliJ suggestion to make the code more concise Apply IntelliJ suggestion in 'Inner classes' section to make code more concise and shorter. --- _ba/tour/inner-classes.md | 4 ++-- _es/tour/inner-classes.md | 4 ++-- _ja/tour/inner-classes.md | 4 ++-- _ko/tour/inner-classes.md | 4 ++-- _pl/tour/inner-classes.md | 4 ++-- _pt-br/tour/inner-classes.md | 4 ++-- _ru/tour/inner-classes.md | 4 ++-- _tour/inner-classes.md | 4 ++-- _zh-cn/tour/inner-classes.md | 4 ++-- 9 files changed, 18 insertions(+), 18 deletions(-) diff --git a/_ba/tour/inner-classes.md b/_ba/tour/inner-classes.md index c5f46c4466..41dd73ed91 100644 --- a/_ba/tour/inner-classes.md +++ b/_ba/tour/inner-classes.md @@ -22,7 +22,7 @@ class Graph { class Node { var connectedNodes: List[Node] = Nil def connectTo(node: Node) { - if (connectedNodes.find(node.equals).isEmpty) { + if (!connectedNodes.exists(node.equals)) { connectedNodes = node :: connectedNodes } } @@ -75,7 +75,7 @@ class Graph { class Node { var connectedNodes: List[Graph#Node] = Nil def connectTo(node: Graph#Node) { - if (connectedNodes.find(node.equals).isEmpty) { + if (!connectedNodes.exists(node.equals)) { connectedNodes = node :: connectedNodes } } diff --git a/_es/tour/inner-classes.md b/_es/tour/inner-classes.md index 4b36fd1e63..461c72eeb1 100644 --- a/_es/tour/inner-classes.md +++ b/_es/tour/inner-classes.md @@ -16,7 +16,7 @@ En Scala es posible que las clases tengan como miembro otras clases. A diferenci class Node { var connectedNodes: List[Node] = Nil def connectTo(node: Node) { - if (connectedNodes.find(node.equals).isEmpty) { + if (!connectedNodes.exists(node.equals)) { connectedNodes = node :: connectedNodes } } @@ -71,7 +71,7 @@ Por favor note que en Java la última linea del ejemplo anterior hubiese sido co class Node { var connectedNodes: List[Graph#Node] = Nil // Graph#Node en lugar de Node def connectTo(node: Graph#Node) { - if (connectedNodes.find(node.equals).isEmpty) { + if (!connectedNodes.exists(node.equals)) { connectedNodes = node :: connectedNodes } } diff --git a/_ja/tour/inner-classes.md b/_ja/tour/inner-classes.md index 03450fdc14..4745d445aa 100644 --- a/_ja/tour/inner-classes.md +++ b/_ja/tour/inner-classes.md @@ -25,7 +25,7 @@ class Graph { class Node { var connectedNodes: List[Node] = Nil def connectTo(node: Node) { - if (connectedNodes.find(node.equals).isEmpty) { + if (!connectedNodes.exists(node.equals)) { connectedNodes = node :: connectedNodes } } @@ -75,7 +75,7 @@ class Graph { class Node { var connectedNodes: List[Graph#Node] = Nil def connectTo(node: Graph#Node) { - if (connectedNodes.find(node.equals).isEmpty) { + if (!connectedNodes.exists(node.equals)) { connectedNodes = node :: connectedNodes } } diff --git a/_ko/tour/inner-classes.md b/_ko/tour/inner-classes.md index f55c531475..7588145c39 100644 --- a/_ko/tour/inner-classes.md +++ b/_ko/tour/inner-classes.md @@ -16,7 +16,7 @@ previous-page: lower-type-bounds class Node { var connectedNodes: List[Node] = Nil def connectTo(node: Node) { - if (connectedNodes.find(node.equals).isEmpty) { + if (!connectedNodes.exists(node.equals)) { connectedNodes = node :: connectedNodes } } @@ -70,7 +70,7 @@ previous-page: lower-type-bounds class Node { var connectedNodes: List[Graph#Node] = Nil def connectTo(node: Graph#Node) { - if (connectedNodes.find(node.equals).isEmpty) { + if (!connectedNodes.exists(node.equals)) { connectedNodes = node :: connectedNodes } } diff --git a/_pl/tour/inner-classes.md b/_pl/tour/inner-classes.md index fbcb51c965..b5a923adb7 100644 --- a/_pl/tour/inner-classes.md +++ b/_pl/tour/inner-classes.md @@ -16,7 +16,7 @@ class Graph { class Node { var connectedNodes: List[Node] = Nil def connectTo(node: Node) { - if (connectedNodes.find(node.equals).isEmpty) { + if (!connectedNodes.exists(node.equals)) { connectedNodes = node :: connectedNodes } } @@ -79,7 +79,7 @@ class Graph { class Node { var connectedNodes: List[Graph#Node] = Nil def connectTo(node: Graph#Node) { - if (connectedNodes.find(node.equals).isEmpty) { + if (!connectedNodes.exists(node.equals)) { connectedNodes = node :: connectedNodes } } diff --git a/_pt-br/tour/inner-classes.md b/_pt-br/tour/inner-classes.md index 7d6c4ebf8f..dbcbe4c93e 100644 --- a/_pt-br/tour/inner-classes.md +++ b/_pt-br/tour/inner-classes.md @@ -16,7 +16,7 @@ class Graph { class Node { var connectedNodes: List[Node] = Nil def connectTo(node: Node) { - if (connectedNodes.find(node.equals).isEmpty) { + if (!connectedNodes.exists(node.equals)) { connectedNodes = node :: connectedNodes } } @@ -78,7 +78,7 @@ class Graph { class Node { var connectedNodes: List[Graph#Node] = Nil def connectTo(node: Graph#Node) { - if (connectedNodes.find(node.equals).isEmpty) { + if (!connectedNodes.exists(node.equals)) { connectedNodes = node :: connectedNodes } } diff --git a/_ru/tour/inner-classes.md b/_ru/tour/inner-classes.md index 64fca34b24..d56cdcdd32 100644 --- a/_ru/tour/inner-classes.md +++ b/_ru/tour/inner-classes.md @@ -22,7 +22,7 @@ class Graph { class Node { var connectedNodes: List[Node] = Nil def connectTo(node: Node) { - if (connectedNodes.find(node.equals).isEmpty) { + if (!connectedNodes.exists(node.equals)) { connectedNodes = node :: connectedNodes } } @@ -66,7 +66,7 @@ class Graph { class Node { var connectedNodes: List[Graph#Node] = Nil def connectTo(node: Graph#Node) { - if (connectedNodes.find(node.equals).isEmpty) { + if (!connectedNodes.exists(node.equals)) { connectedNodes = node :: connectedNodes } } diff --git a/_tour/inner-classes.md b/_tour/inner-classes.md index 903506d633..46f134c46c 100644 --- a/_tour/inner-classes.md +++ b/_tour/inner-classes.md @@ -19,7 +19,7 @@ class Graph { class Node { var connectedNodes: List[Node] = Nil def connectTo(node: Node): Unit = { - if (connectedNodes.find(node.equals).isEmpty) { + if (!connectedNodes.exists(node.equals)) { connectedNodes = node :: connectedNodes } } @@ -63,7 +63,7 @@ class Graph { class Node { var connectedNodes: List[Graph#Node] = Nil def connectTo(node: Graph#Node): Unit = { - if (connectedNodes.find(node.equals).isEmpty) { + if (!connectedNodes.exists(node.equals)) { connectedNodes = node :: connectedNodes } } diff --git a/_zh-cn/tour/inner-classes.md b/_zh-cn/tour/inner-classes.md index 3a3a7a3e45..499dd26b19 100644 --- a/_zh-cn/tour/inner-classes.md +++ b/_zh-cn/tour/inner-classes.md @@ -20,7 +20,7 @@ class Graph { class Node { var connectedNodes: List[Node] = Nil def connectTo(node: Node) { - if (connectedNodes.find(node.equals).isEmpty) { + if (!connectedNodes.exists(node.equals)) { connectedNodes = node :: connectedNodes } } @@ -64,7 +64,7 @@ class Graph { class Node { var connectedNodes: List[Graph#Node] = Nil def connectTo(node: Graph#Node) { - if (connectedNodes.find(node.equals).isEmpty) { + if (!connectedNodes.exists(node.equals)) { connectedNodes = node :: connectedNodes } }