提交 d7a09b05 authored 作者: Thomas Mueller Graf's avatar Thomas Mueller Graf

Code style: avoid import static

上级 1e6aef6a
...@@ -5,8 +5,6 @@ ...@@ -5,8 +5,6 @@
*/ */
package org.h2.expression; package org.h2.expression;
import static org.h2.util.ToChar.toChar;
import java.io.FileOutputStream; import java.io.FileOutputStream;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
...@@ -54,6 +52,7 @@ import org.h2.util.MathUtils; ...@@ -54,6 +52,7 @@ import org.h2.util.MathUtils;
import org.h2.util.New; import org.h2.util.New;
import org.h2.util.StatementBuilder; import org.h2.util.StatementBuilder;
import org.h2.util.StringUtils; import org.h2.util.StringUtils;
import org.h2.util.ToChar;
import org.h2.util.Utils; import org.h2.util.Utils;
import org.h2.value.DataType; import org.h2.value.DataType;
import org.h2.value.Value; import org.h2.value.Value;
...@@ -1409,7 +1408,7 @@ public class Function extends Expression implements FunctionCall { ...@@ -1409,7 +1408,7 @@ public class Function extends Expression implements FunctionCall {
case Value.TIME: case Value.TIME:
case Value.DATE: case Value.DATE:
case Value.TIMESTAMP: case Value.TIMESTAMP:
result = ValueString.get(toChar(v0.getTimestamp(), result = ValueString.get(ToChar.toChar(v0.getTimestamp(),
v1 == null ? null : v1.getString(), v1 == null ? null : v1.getString(),
v2 == null ? null : v2.getString()), v2 == null ? null : v2.getString()),
database.getMode().treatEmptyStringsAsNull); database.getMode().treatEmptyStringsAsNull);
...@@ -1420,7 +1419,7 @@ public class Function extends Expression implements FunctionCall { ...@@ -1420,7 +1419,7 @@ public class Function extends Expression implements FunctionCall {
case Value.DECIMAL: case Value.DECIMAL:
case Value.DOUBLE: case Value.DOUBLE:
case Value.FLOAT: case Value.FLOAT:
result = ValueString.get(toChar(v0.getBigDecimal(), result = ValueString.get(ToChar.toChar(v0.getBigDecimal(),
v1 == null ? null : v1.getString(), v1 == null ? null : v1.getString(),
v2 == null ? null : v2.getString()), v2 == null ? null : v2.getString()),
database.getMode().treatEmptyStringsAsNull); database.getMode().treatEmptyStringsAsNull);
......
...@@ -5,7 +5,6 @@ ...@@ -5,7 +5,6 @@
*/ */
package org.h2.util; package org.h2.util;
import static java.lang.Math.abs;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.sql.Date; import java.sql.Date;
import java.sql.Timestamp; import java.sql.Timestamp;
...@@ -134,7 +133,7 @@ public class ToChar { ...@@ -134,7 +133,7 @@ public class ToChar {
int pow = number.precision() - number.scale() - 1; int pow = number.precision() - number.scale() - 1;
number = number.movePointLeft(pow); number = number.movePointLeft(pow);
return number.toPlainString() + "E" + return number.toPlainString() + "E" +
(pow < 0 ? '-' : '+') + (abs(pow) < 10 ? "0" : "") + abs(pow); (pow < 0 ? '-' : '+') + (Math.abs(pow) < 10 ? "0" : "") + Math.abs(pow);
} else if (formatUp.equals("RN")) { } else if (formatUp.equals("RN")) {
boolean lowercase = format.startsWith("r"); boolean lowercase = format.startsWith("r");
String rn = StringUtils.pad(toRomanNumeral(number.intValue()), 15, " ", false); String rn = StringUtils.pad(toRomanNumeral(number.intValue()), 15, " ", false);
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论