Skip to content

Commit 7f099e6

Browse files
cquirozcquiroz
committed
Cosmetic improvements
1 parent 0237131 commit 7f099e6

File tree

3 files changed

+25
-29
lines changed

3 files changed

+25
-29
lines changed

‎build.sbt

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -115,12 +115,6 @@ def copyAndReplace(srcDirs: Seq[File], destinationDir: File): Seq[File] = {
115115
.replaceAll("package object bp", "package object time")
116116
.replaceAll("package org.threeten.bp", "package java.time")
117117
.replaceAll("""import org.threeten.bp(\..*)?(\.[A-Z_{][^\.]*)""", "import java.time$1$2")
118-
/*.replaceAll("""import org.threeten.bp(\.[A-Z].*)""", "import java.time$1")
119-
.replaceAll("import org.threeten.bp.chrono", "import java.time.chrono")
120-
.replaceAll("""import org.threeten.bp.format(\.[A-Z].*)""", "import java.time.format$1")
121-
.replaceAll("""import org.threeten.bp.temporal(\.[A-Z] .*)""", "import java.time.temporal$1")
122-
.replaceAll("import org.threeten.bp.zone", "import java.time.zone")
123-
.replaceAll("import org.threeten.bp", "import java.time")*/
124118
.replaceAll("import zonedb.threeten", "import zonedb.java")
125119
.replaceAll("private\\s*\\[bp\\]", "private[time]")
126120
}

‎shared/src/main/scala/org/threeten/bp/format/DateTimeFormatter.scala

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ import java.text.FieldPosition
4545
import java.text.Format
4646
import java.text.ParseException
4747
import java.text.ParsePosition
48+
import java.lang.StringBuilder
4849
import java.util.{Arrays, Collections, Locale, Objects}
4950

5051
import org.threeten.bp.DateTimeException
@@ -1126,7 +1127,7 @@ final class DateTimeFormatter private[format](private val printerParser: Composi
11261127
* @throws DateTimeException if an error occurs during formatting
11271128
*/
11281129
def format(temporal: TemporalAccessor): String = {
1129-
val buf: Appendable = new java.lang.StringBuilder(32)
1130+
val buf: StringBuilder = new StringBuilder(32)
11301131
formatTo(temporal, buf)
11311132
buf.toString
11321133
}
@@ -1150,10 +1151,10 @@ final class DateTimeFormatter private[format](private val printerParser: Composi
11501151
Objects.requireNonNull(appendable, "appendable")
11511152
try {
11521153
val context: TTBPDateTimePrintContext = new TTBPDateTimePrintContext(temporal, this)
1153-
if (appendable.isInstanceOf[java.lang.StringBuilder])
1154-
printerParser.print(context, appendable.asInstanceOf[java.lang.StringBuilder])
1154+
if (appendable.isInstanceOf[StringBuilder])
1155+
printerParser.print(context, appendable.asInstanceOf[StringBuilder])
11551156
else {
1156-
val buf = new java.lang.StringBuilder(32)
1157+
val buf = new StringBuilder(32)
11571158
printerParser.print(context, buf)
11581159
appendable.append(buf)
11591160
}

‎shared/src/main/scala/org/threeten/bp/format/internal/TTBPDateTimeFormatterBuilder.scala

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package org.threeten.bp.format.internal
22

33
import java.math.{BigDecimal, BigInteger, RoundingMode}
44
import java.util._
5+
import java.lang.StringBuilder
56

67
import org.threeten.bp._
78
import org.threeten.bp.chrono.{ChronoLocalDate, Chronology}
@@ -56,7 +57,7 @@ object TTBPDateTimeFormatterBuilder {
5657
* @return false if unable to query the value from the date-time, true otherwise
5758
* @throws DateTimeException if the date-time cannot be printed successfully
5859
*/
59-
def print(context: TTBPDateTimePrintContext, buf: java.lang.StringBuilder): Boolean
60+
def print(context: TTBPDateTimePrintContext, buf: StringBuilder): Boolean
6061

6162
/** Parses text into date-time information.
6263
*
@@ -93,7 +94,7 @@ object TTBPDateTimeFormatterBuilder {
9394
else
9495
new CompositePrinterParser(printerParsers, optional)
9596

96-
def print(context: TTBPDateTimePrintContext, buf: java.lang.StringBuilder): Boolean = {
97+
def print(context: TTBPDateTimePrintContext, buf: StringBuilder): Boolean = {
9798
val length: Int = buf.length
9899
if (optional)
99100
context.startOptional()
@@ -164,7 +165,7 @@ object TTBPDateTimeFormatterBuilder {
164165
*/
165166
private[format] final class PadPrinterParserDecorator private[format](private val printerParser: DateTimePrinterParser, private val padWidth: Int, private val padChar: Char) extends DateTimePrinterParser {
166167

167-
def print(context: TTBPDateTimePrintContext, buf: java.lang.StringBuilder): Boolean = {
168+
def print(context: TTBPDateTimePrintContext, buf: StringBuilder): Boolean = {
168169
val preLen: Int = buf.length
169170
if (!printerParser.print(context, buf))
170171
return false
@@ -216,7 +217,7 @@ object TTBPDateTimeFormatterBuilder {
216217
}
217218

218219
private[format] final class SettingsParser private(name: String, ordinal: Int) extends Enum[SettingsParser](name, ordinal) with DateTimePrinterParser {
219-
def print(context: TTBPDateTimePrintContext, buf: java.lang.StringBuilder): Boolean = true
220+
def print(context: TTBPDateTimePrintContext, buf: StringBuilder): Boolean = true
220221

221222
def parse(context: TTBPDateTimeParseContext, text: CharSequence, position: Int): Int = {
222223
ordinal match {
@@ -241,7 +242,7 @@ object TTBPDateTimeFormatterBuilder {
241242
/** Used by parseDefaulting(). */
242243
private[format] class DefaultingParser private[format](private val field: TemporalField, private val value: Long) extends DateTimePrinterParser {
243244

244-
def print(context: TTBPDateTimePrintContext, buf: java.lang.StringBuilder): Boolean = true
245+
def print(context: TTBPDateTimePrintContext, buf: StringBuilder): Boolean = true
245246

246247
def parse(context: TTBPDateTimeParseContext, text: CharSequence, position: Int): Int = {
247248
if (context.getParsed(field) == null)
@@ -253,7 +254,7 @@ object TTBPDateTimeFormatterBuilder {
253254
/** Prints or parses a character literal. */
254255
final class CharLiteralPrinterParser private[format](private val literal: Char) extends DateTimePrinterParser {
255256

256-
def print(context: TTBPDateTimePrintContext, buf: java.lang.StringBuilder): Boolean = {
257+
def print(context: TTBPDateTimePrintContext, buf: StringBuilder): Boolean = {
257258
buf.append(literal)
258259
true
259260
}
@@ -280,7 +281,7 @@ object TTBPDateTimeFormatterBuilder {
280281
/** Prints or parses a string literal. */
281282
private[format] final class StringLiteralPrinterParser private[format](private val literal: String) extends DateTimePrinterParser {
282283

283-
def print(context: TTBPDateTimePrintContext, buf: java.lang.StringBuilder): Boolean = {
284+
def print(context: TTBPDateTimePrintContext, buf: StringBuilder): Boolean = {
284285
buf.append(literal)
285286
true
286287
}
@@ -351,7 +352,7 @@ object TTBPDateTimeFormatterBuilder {
351352
private[format] def withSubsequentWidth(subsequentWidth: Int): NumberPrinterParser =
352353
new NumberPrinterParser(field, minWidth, maxWidth, signStyle, this.subsequentWidth + subsequentWidth)
353354

354-
def print(context: TTBPDateTimePrintContext, buf: java.lang.StringBuilder): Boolean = {
355+
def print(context: TTBPDateTimePrintContext, buf: StringBuilder): Boolean = {
355356
val valueLong: java.lang.Long = context.getValue(field)
356357
if (valueLong == null)
357358
return false
@@ -661,7 +662,7 @@ object TTBPDateTimeFormatterBuilder {
661662
if (maxWidth < minWidth)
662663
throw new IllegalArgumentException(s"Maximum width must exceed or equal the minimum width but $maxWidth < $minWidth")
663664

664-
def print(context: TTBPDateTimePrintContext, buf: java.lang.StringBuilder): Boolean = {
665+
def print(context: TTBPDateTimePrintContext, buf: StringBuilder): Boolean = {
665666
val value: java.lang.Long = context.getValue(field)
666667
if (value == null) {
667668
return false
@@ -804,7 +805,7 @@ object TTBPDateTimeFormatterBuilder {
804805

805806

806807

807-
def print(context: TTBPDateTimePrintContext, buf: java.lang.StringBuilder): Boolean = {
808+
def print(context: TTBPDateTimePrintContext, buf: StringBuilder): Boolean = {
808809
val value: java.lang.Long = context.getValue(field)
809810
if (value == null) {
810811
return false
@@ -863,7 +864,7 @@ object TTBPDateTimeFormatterBuilder {
863864

864865
private[format] final class InstantPrinterParser private[format](private val fractionalDigits: Int) extends DateTimePrinterParser {
865866

866-
def print(context: TTBPDateTimePrintContext, buf: java.lang.StringBuilder): Boolean = {
867+
def print(context: TTBPDateTimePrintContext, buf: StringBuilder): Boolean = {
867868
val inSecs: java.lang.Long = context.getValue(ChronoField.INSTANT_SECONDS)
868869
var inNanos: Long = 0L
869870
if (context.getTemporal.isSupported(ChronoField.NANO_OF_SECOND))
@@ -1003,7 +1004,7 @@ object TTBPDateTimeFormatterBuilder {
10031004
throw new IllegalArgumentException(s"Invalid zone offset pattern: $pattern")
10041005
}
10051006

1006-
def print(context: TTBPDateTimePrintContext, buf: java.lang.StringBuilder): Boolean = {
1007+
def print(context: TTBPDateTimePrintContext, buf: StringBuilder): Boolean = {
10071008
val offsetSecs: java.lang.Long = context.getValue(ChronoField.OFFSET_SECONDS)
10081009
if (offsetSecs == null) {
10091010
return false
@@ -1114,7 +1115,7 @@ object TTBPDateTimeFormatterBuilder {
11141115
/** Prints or parses a localized offset. */
11151116
private[format] final class LocalizedOffsetPrinterParser(private val style: TextStyle) extends DateTimePrinterParser {
11161117

1117-
def print(context: TTBPDateTimePrintContext, buf: java.lang.StringBuilder): Boolean = {
1118+
def print(context: TTBPDateTimePrintContext, buf: StringBuilder): Boolean = {
11181119
val offsetSecs: java.lang.Long = context.getValue(ChronoField.OFFSET_SECONDS)
11191120
if (offsetSecs == null) {
11201121
return false
@@ -1231,7 +1232,7 @@ object TTBPDateTimeFormatterBuilder {
12311232
private[format] final class ZoneTextPrinterParser private[format](private val textStyle: TextStyle) extends DateTimePrinterParser {
12321233
Objects.requireNonNull(textStyle, "textStyle")
12331234

1234-
def print(context: TTBPDateTimePrintContext, buf: java.lang.StringBuilder): Boolean = {
1235+
def print(context: TTBPDateTimePrintContext, buf: StringBuilder): Boolean = {
12351236
val zone: ZoneId = context.getValue(TemporalQueries.zoneId)
12361237
if (zone == null)
12371238
return false
@@ -1369,7 +1370,7 @@ object TTBPDateTimeFormatterBuilder {
13691370

13701371
private[format] final class ZoneIdPrinterParser private[format](private val query: TemporalQuery[ZoneId], private val description: String) extends DateTimePrinterParser {
13711372

1372-
def print(context: TTBPDateTimePrintContext, buf: java.lang.StringBuilder): Boolean = {
1373+
def print(context: TTBPDateTimePrintContext, buf: StringBuilder): Boolean = {
13731374
val zone: ZoneId = context.getValue(query)
13741375
if (zone == null)
13751376
false
@@ -1500,7 +1501,7 @@ object TTBPDateTimeFormatterBuilder {
15001501
*/
15011502
private[format] final class ChronoPrinterParser private[format](private val textStyle: TextStyle) extends DateTimePrinterParser {
15021503

1503-
def print(context: TTBPDateTimePrintContext, buf: java.lang.StringBuilder): Boolean = {
1504+
def print(context: TTBPDateTimePrintContext, buf: StringBuilder): Boolean = {
15041505
val chrono: Chronology = context.getValue(TemporalQueries.chronology)
15051506
if (chrono == null)
15061507
return false
@@ -1552,7 +1553,7 @@ object TTBPDateTimeFormatterBuilder {
15521553
*/
15531554
private[format] final class LocalizedPrinterParser private[format](private val dateStyle: FormatStyle, private val timeStyle: FormatStyle) extends DateTimePrinterParser {
15541555

1555-
def print(context: TTBPDateTimePrintContext, buf: java.lang.StringBuilder): Boolean = {
1556+
def print(context: TTBPDateTimePrintContext, buf: StringBuilder): Boolean = {
15561557
val chrono = Chronology.from(context.getTemporal)
15571558
formatter(context.getLocale, chrono).toPrinterParser(false).print(context, buf)
15581559
}
@@ -1578,7 +1579,7 @@ object TTBPDateTimeFormatterBuilder {
15781579
/** Prints or parses a localized pattern. */
15791580
private[format] final class WeekFieldsPrinterParser(private val letter: Char, private val count: Int) extends DateTimePrinterParser {
15801581

1581-
def print(context: TTBPDateTimePrintContext, buf: java.lang.StringBuilder): Boolean = {
1582+
def print(context: TTBPDateTimePrintContext, buf: StringBuilder): Boolean = {
15821583
val weekFields: WeekFields = WeekFields.of(context.getLocale)
15831584
val pp: DateTimePrinterParser = evaluate(weekFields)
15841585
pp.print(context, buf)
@@ -1611,7 +1612,7 @@ object TTBPDateTimeFormatterBuilder {
16111612
}
16121613

16131614
override def toString: String = {
1614-
val sb: java.lang.StringBuilder = new java.lang.StringBuilder(30)
1615+
val sb: StringBuilder = new StringBuilder(30)
16151616
sb.append("Localized(")
16161617
if (letter == 'Y') {
16171618
if (count == 1)

0 commit comments

Comments
 (0)