Use Kotlin way in addTimeIntervals

Author: zaypen

src/iii_conventions/MyDateUtil.kt

@@ -5,13 +5,12 @@ import java.util.*
 
 fun MyDate.nextDay() = addTimeIntervals(DAY, 1)
 
-fun MyDate.addTimeIntervals(timeInterval: TimeInterval, number: Int): MyDate {
-    val c = Calendar.getInstance()
-    c.set(year, month, dayOfMonth)
-    when (timeInterval) {
-        TimeInterval.DAY -> c.add(Calendar.DAY_OF_MONTH, number)
-        TimeInterval.WEEK -> c.add(Calendar.WEEK_OF_MONTH, number)
-        TimeInterval.YEAR -> c.add(Calendar.YEAR, number)
-    }
-    return MyDate(c.get(Calendar.YEAR), c.get(Calendar.MONTH), c.get(Calendar.DATE))
+fun MyDate.addTimeIntervals(timeInterval: TimeInterval, number: Int) = Calendar.getInstance().run {
+    set(year, month, dayOfMonth)
+    add(when (timeInterval) {
+        TimeInterval.DAY -> Calendar.DAY_OF_MONTH
+        TimeInterval.WEEK -> Calendar.WEEK_OF_MONTH
+        TimeInterval.YEAR -> Calendar.YEAR
+    }, number)
+    MyDate(get(Calendar.YEAR), get(Calendar.MONTH), get(Calendar.DATE))
 }