Rewrite the library in kotlin #8
Conversation
| // If we are using the equinox calculation method, or if we are within the dates the | ||
| // calendar was used (regardless of the selected calculation method), use the equinox | ||
| // calculation method. | ||
| val result: FrenchRevolutionaryCalendarDate? |
There was a problem hiding this comment.
I think you can use
val result = when {
calculationMethod == CalculationMethod.EQUINOX || gregorianDate.after(frenchEraYearOne) && gregorianDate.before(frenchEraEnd) -> getDateEquinox(gregorianDate)
...
| private fun getDateEquinox(gregorianDate: Calendar): FrenchRevolutionaryCalendarDate { | ||
|
|
||
| val gyear = gregorianDate.get(Calendar.YEAR) | ||
| val gAutumnEquinox = getAutumnEquinox(gyear) ?: throw IllegalArgumentException("Date not supported: " + gregorianDate) |
There was a problem hiding this comment.
"Date not supported: $gregorianDate"
| val gAutumnEquinox = getAutumnEquinox(gyear) ?: throw IllegalArgumentException("Date not supported: " + gregorianDate) | ||
|
|
||
| // Determine the first day of the French year. | ||
| var g1stVendemiaire : Calendar? |
There was a problem hiding this comment.
var g1stVendemiaire = gAutumnEquinox
| // last year | ||
| if (gregorianDate < gAutumnEquinox) { | ||
| g1stVendemiaire = getAutumnEquinox(gyear - 1) | ||
| if (g1stVendemiaire == null) throw IllegalArgumentException("Date not supported: " + gregorianDate) |
There was a problem hiding this comment.
"Date not supported: $gregorianDate"
| fakeFrenchDate.timeInMillis = fakeFrenchTimestamp | ||
|
|
||
| // Extract the year, and day in year from the French date. | ||
| val frenchYear = fakeFrenchDate.get(Calendar.YEAR) |
There was a problem hiding this comment.
Instead of .get(Calendar.YEAR) you can use [Calendar.YEAR] - not sure if it's really clearer
| /** | ||
| * @return a number from 1 to 10. | ||
| */ | ||
| val dayInWeek: Int |
There was a problem hiding this comment.
Does this need to be a getter (computed every time)? Could be calculated only once:
val dayInWeek = (dayOfMonth - 1) % 10 + 1
| val weekInMonth: Int | ||
| get() = (dayOfMonth - 1) / 10 + 1 | ||
|
|
||
| val objectType: DailyObjectType |
There was a problem hiding this comment.
Maybe val objectType = when { etc.
| get() { | ||
| val type = objectType | ||
| return FrenchRevolutionaryCalendarLabels.getInstance(locale).getDailyObjectTypeName(type) | ||
| } |
There was a problem hiding this comment.
val objectTypeName = FrenchRevolutionaryCalendarLabels.getInstance(locale).getDailyObjectTypeName(objectType) ?
|
|
||
| * @author calvarez | ||
| */ | ||
| abstract class FrenchRevolutionaryCalendarLabels internal constructor(private val weekdays: Array<String>, private val months: Array<String>, private val daysOfYear: Array<Array<String>>, private val dailyObjectTypes: Array<String>) { |
There was a problem hiding this comment.
Not sure about the visibility of this one. Should it be hidden from the users of the lib?
| var result: FrenchRevolutionaryCalendarLabels? = instances[language] | ||
| if (result != null) return result | ||
| if (Locale.ENGLISH.language == language) result = FrenchRevolutionaryCalendarLabelsEN() | ||
| else if ("es" == language) result = FrenchRevolutionaryCalendarLabelsES() |
| * from 0 to 9, the minute is from 0 to 99, and the second is from | ||
| * 0 to 99. | ||
| */ | ||
| fun getFrenchTime(gtime: Calendar): Triple<Int, Int, Int> { |
There was a problem hiding this comment.
This shouldn't return a Triple, it breaks the api
* Specify sourceDirectory so cobertura can show covered lines * Split a huge method in EquinoxDates into smaller methods
Set the kotlin-maven-plugin phase to process-sources
caarmen
force-pushed
the
dependency-updates
branch
from
7aeb327
to
7f55332
Compare
No description provided.