Skip to content

Remove Calendar #179

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 20, 2020
Merged

Remove Calendar #179

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
147 changes: 0 additions & 147 deletions core/js/src/main/scala/java/util/Calendar.scala
View file
Open in desktop

This file was deleted.

68 changes: 0 additions & 68 deletions core/js/src/main/scala/java/util/GregorianCalendar.scala
View file
Open in desktop

This file was deleted.

0 ...reeten/bp/chrono/JapaneseChronology.scala → ...reeten/bp/chrono/JapaneseChronology.scala
View file
Open in desktop
File renamed without changes.
0 ...org/threeten/bp/chrono/JapaneseDate.scala → ...org/threeten/bp/chrono/JapaneseDate.scala
View file
Open in desktop
File renamed without changes.
0 .../org/threeten/bp/chrono/JapaneseEra.scala → .../org/threeten/bp/chrono/JapaneseEra.scala
View file
Open in desktop
File renamed without changes.
0 .../bp/chrono/internal/TTBPJapaneseEra.scala → .../bp/chrono/internal/TTBPJapaneseEra.scala
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion core/shared/src/main/scala/org/threeten/bp/chrono/Chronology.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ object Chronology {
register(IsoChronology.INSTANCE)
register(ThaiBuddhistChronology.INSTANCE)
register(MinguoChronology.INSTANCE)
register(JapaneseChronology.INSTANCE)
// register(JapaneseChronology.INSTANCE)
register(HijrahChronology.INSTANCE)
CHRONOS_BY_ID.put("Hijrah", HijrahChronology.INSTANCE)
CHRONOS_BY_TYPE.put("islamic", HijrahChronology.INSTANCE)
Expand Down
12 changes: 6 additions & 6 deletions core/shared/src/main/scala/org/threeten/bp/temporal/WeekFields.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ import org.threeten.bp.temporal.ChronoUnit.MONTHS
import org.threeten.bp.temporal.ChronoUnit.WEEKS
import org.threeten.bp.temporal.ChronoUnit.YEARS
import java.io.Serializable
import java.util.{ GregorianCalendar, Locale, Objects }
import java.util.{ Locale, Objects }
import java.util.HashMap
import java.util.Map
import org.threeten.bp.DateTimeException
Expand Down Expand Up @@ -90,11 +90,11 @@ object WeekFields {
*/
def of(locale: Locale): WeekFields = {
Objects.requireNonNull(locale, "locale")
val newLocale = new Locale(locale.getLanguage, locale.getCountry)
val gcal: GregorianCalendar = new GregorianCalendar(newLocale)
val calDow: Int = gcal.getFirstDayOfWeek
val dow: DayOfWeek = DayOfWeek.SUNDAY.plus(calDow.toLong - 1)
val minDays: Int = gcal.getMinimalDaysInFirstWeek
// val newLocale = new Locale(locale.getLanguage, locale.getCountry)
// val gcal: GregorianCalendar = new GregorianCalendar(newLocale)
// val calDow: Int = 1 // gcal.getFirstDayOfWeek Calendar.SUNDAY in GregorianCalendar
val dow: DayOfWeek = DayOfWeek.SUNDAY //.plus(calDow - 1)
val minDays: Int = 1 // gcal.getMinimalDaysInFirstWeek
WeekFields.of(dow, minDays)
}

Expand Down
Loading