From 176c3c2d1202ca025901dcbba9e0a902b604bc91 Mon Sep 17 00:00:00 2001 From: Seth Tisue Date: Tue, 20 Aug 2019 17:32:33 -0700 Subject: [PATCH] we don't SHOUT our constant names in Scala. let them SHOUT them in Java followup to lampepfl/dotty#6094 --- src/main/scala/EnumTypes.scala | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/main/scala/EnumTypes.scala b/src/main/scala/EnumTypes.scala index d201d33..c2e0443 100644 --- a/src/main/scala/EnumTypes.scala +++ b/src/main/scala/EnumTypes.scala @@ -13,14 +13,14 @@ object EnumTypes { def surfaceGravity = G * mass / (radius * radius) def surfaceWeight(otherMass: Double) = otherMass * surfaceGravity - case MERCURY extends Planet(3.303e+23, 2.4397e6) - case VENUS extends Planet(4.869e+24, 6.0518e6) - case EARTH extends Planet(5.976e+24, 6.37814e6) - case MARS extends Planet(6.421e+23, 3.3972e6) - case JUPITER extends Planet(1.9e+27, 7.1492e7) - case SATURN extends Planet(5.688e+26, 6.0268e7) - case URANUS extends Planet(8.686e+25, 2.5559e7) - case NEPTUNE extends Planet(1.024e+26, 2.4746e7) + case Mercury extends Planet(3.303e+23, 2.4397e6) + case Venus extends Planet(4.869e+24, 6.0518e6) + case Earth extends Planet(5.976e+24, 6.37814e6) + case Mars extends Planet(6.421e+23, 3.3972e6) + case Jupiter extends Planet(1.9e+27, 7.1492e7) + case Saturn extends Planet(5.688e+26, 6.0268e7) + case Uranus extends Planet(8.686e+25, 2.5559e7) + case Neptune extends Planet(1.024e+26, 2.4746e7) } def test: Unit = { @@ -31,7 +31,7 @@ object EnumTypes { println(list + "\n") def calculateEarthWeightOnPlanets(earthWeight: Double) = { - val mass = earthWeight/Planet.EARTH.surfaceGravity + val mass = earthWeight/Planet.Earth.surfaceGravity for (p <- Planet.values) println(s"Your weight on $p is ${p.surfaceWeight(mass)}") }