Skip to content

Commit f0174c5

Browse files
authored
Merge pull request #179 from cquiroz/no-calendar
Remove Calendar
2 parents bc9f4ca + 5a9b59e commit f0174c5

File tree

15 files changed

+45
-454
lines changed

15 files changed

+45
-454
lines changed

core/js/src/main/scala/java/util/Calendar.scala

Lines changed: 0 additions & 147 deletions
This file was deleted.

core/js/src/main/scala/java/util/GregorianCalendar.scala

Lines changed: 0 additions & 68 deletions
This file was deleted.

core/shared/src/main/scala/org/threeten/bp/chrono/Chronology.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ object Chronology {
184184
register(IsoChronology.INSTANCE)
185185
register(ThaiBuddhistChronology.INSTANCE)
186186
register(MinguoChronology.INSTANCE)
187-
register(JapaneseChronology.INSTANCE)
187+
// register(JapaneseChronology.INSTANCE)
188188
register(HijrahChronology.INSTANCE)
189189
CHRONOS_BY_ID.put("Hijrah", HijrahChronology.INSTANCE)
190190
CHRONOS_BY_TYPE.put("islamic", HijrahChronology.INSTANCE)

core/shared/src/main/scala/org/threeten/bp/temporal/WeekFields.scala

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ import org.threeten.bp.temporal.ChronoUnit.MONTHS
4141
import org.threeten.bp.temporal.ChronoUnit.WEEKS
4242
import org.threeten.bp.temporal.ChronoUnit.YEARS
4343
import java.io.Serializable
44-
import java.util.{ GregorianCalendar, Locale, Objects }
44+
import java.util.{ Locale, Objects }
4545
import java.util.HashMap
4646
import java.util.Map
4747
import org.threeten.bp.DateTimeException
@@ -90,11 +90,11 @@ object WeekFields {
9090
*/
9191
def of(locale: Locale): WeekFields = {
9292
Objects.requireNonNull(locale, "locale")
93-
val newLocale = new Locale(locale.getLanguage, locale.getCountry)
94-
val gcal: GregorianCalendar = new GregorianCalendar(newLocale)
95-
val calDow: Int = gcal.getFirstDayOfWeek
96-
val dow: DayOfWeek = DayOfWeek.SUNDAY.plus(calDow.toLong - 1)
97-
val minDays: Int = gcal.getMinimalDaysInFirstWeek
93+
// val newLocale = new Locale(locale.getLanguage, locale.getCountry)
94+
// val gcal: GregorianCalendar = new GregorianCalendar(newLocale)
95+
// val calDow: Int = 1 // gcal.getFirstDayOfWeek Calendar.SUNDAY in GregorianCalendar
96+
val dow: DayOfWeek = DayOfWeek.SUNDAY //.plus(calDow - 1)
97+
val minDays: Int = 1 // gcal.getMinimalDaysInFirstWeek
9898
WeekFields.of(dow, minDays)
9999
}
100100

0 commit comments

Comments
 (0)