diff --git a/.idea/misc.xml b/.idea/misc.xml
index 87a20fc..62269df 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,7 +1,7 @@
-
+
\ No newline at end of file
diff --git a/src/main/java/nx/peter/java/util/Util.java b/src/main/java/nx/peter/java/util/Util.java
index 7b8e2be..e69bac0 100644
--- a/src/main/java/nx/peter/java/util/Util.java
+++ b/src/main/java/nx/peter/java/util/Util.java
@@ -147,7 +147,7 @@ else if (isObject(value))
else if (isArray(value))
value = format ? toPrettyJson((List) value, indent + 1) : toJson((List) value, indent + 1);
return (format ? "\n" + tab(indent + 1) : "") + value;
- }).toList().toString();
+ }).collect(Collectors.toList()).toString();
}
public static String toJson(Map json, int indent, boolean format) {
@@ -160,7 +160,7 @@ else if (isObject(value))
else if (isArray(value))
value = format ? toPrettyJson((List) value, indent + 1) : toJson((List) value, indent + 1);
return (format ? "\n" + tab(indent + 1) : "") + "\"" + e.getKey() + "\": " + value;
- }).toList().toString();
+ }).collect(Collectors.toList()).toString();
}
@@ -1104,8 +1104,10 @@ public String toString() {
}
}
- public record MinMax(N min, N max) {
- public MinMax {
+ public static class MinMax {
+ protected N max, min;
+
+ public MinMax(N min, N max) {
N a = min, b = max;
if (a != null && b != null) {
if (a instanceof Integer) {
@@ -1218,6 +1220,8 @@ public record MinMax(N min, N max) {
}
}
}
+ this.max = max;
+ this.min = min;
}
public N diff() {
@@ -1294,6 +1298,14 @@ public boolean isLong() {
return max instanceof Long;
}
+ public N min() {
+ return min;
+ }
+
+ public N max() {
+ return max;
+ }
+
@Override
public String toString() {
return "[min=" + min + ", max=" + max + ']';
@@ -1493,7 +1505,22 @@ public String toString() {
}
- public record DataCount(D data, int count) implements Comparable> {
+ public static class DataCount implements Comparable> {
+ protected int count;
+ protected D data;
+
+ public DataCount(D data, int count) {
+ this.data = data;
+ this.count = count;
+ }
+
+ public D data() {
+ return data;
+ }
+
+ public int count() {
+ return count;
+ }
public boolean equals(DataCount> other) {
return other != null && equals(other.data()) && count == other.count;
@@ -1644,7 +1671,22 @@ public String toString() {
}
- public record TrimmedLine(String line, String trimmed) {
+ public static class TrimmedLine {
+ protected String line, trimmed;
+
+ public TrimmedLine(String line, String trimmed) {
+ this.line = line;
+ this.trimmed = trimmed;
+ }
+
+ public String line() {
+ return line;
+ }
+
+ public String trimmed() {
+ return trimmed;
+ }
+
}
public enum Position {
diff --git a/src/main/java/nx/peter/java/util/data/Index.java b/src/main/java/nx/peter/java/util/data/Index.java
index cb11658..dc217f4 100644
--- a/src/main/java/nx/peter/java/util/data/Index.java
+++ b/src/main/java/nx/peter/java/util/data/Index.java
@@ -161,7 +161,7 @@ public double getIndex() {
ind.append('.');
else
ind.append(getIndex(c));
- return ind.isEmpty() ? 0 : (index > 0 ? -1 : 1) * Double.parseDouble(ind.toString());
+ return ind.toString().isEmpty() ? 0 : (index > 0 ? -1 : 1) * Double.parseDouble(ind.toString());
}
public Fraction toFraction() {
diff --git a/src/main/java/nx/peter/java/util/data/Letters.java b/src/main/java/nx/peter/java/util/data/Letters.java
index c8f5dbb..49db316 100644
--- a/src/main/java/nx/peter/java/util/data/Letters.java
+++ b/src/main/java/nx/peter/java/util/data/Letters.java
@@ -7,6 +7,7 @@
import java.util.*;
import java.util.concurrent.atomic.AtomicLong;
+import java.util.stream.Collectors;
import java.util.stream.Stream;
@@ -975,9 +976,9 @@ private int endIndexOf(CharSequence delimiter, int start, CharSequence ifContain
// System.out.println(substring(start, end));
Word sub = new Word(substring(start, end));
if (containsAll(sub.get(), mustContain))
- if (!ifContain.isEmpty() && sub.contains(ifContain)) {
+ if (!ifContain.toString().isEmpty() && sub.contains(ifContain)) {
String ender = getEndDelimiter(sub.get(), delimiter);
- if (mustEnd.isEmpty() || (ender != null ? sub.subLetters(0, sub.lastIndexOf(ender)) : sub.trim()).endsWith(mustEnd.toString()))
+ if (mustEnd.toString().isEmpty() || (ender != null ? sub.subLetters(0, sub.lastIndexOf(ender)) : sub.trim()).endsWith(mustEnd.toString()))
return end;
} else return end;
}
@@ -1196,7 +1197,7 @@ public Letters getParent() {
}
public List toList() {
- return stream().toList();
+ return new ArrayList<>(items);
}
public List toStringList() {
diff --git a/src/main/java/nx/peter/java/util/data/Subscript.java b/src/main/java/nx/peter/java/util/data/Subscript.java
index 0a6357d..63c09f3 100644
--- a/src/main/java/nx/peter/java/util/data/Subscript.java
+++ b/src/main/java/nx/peter/java/util/data/Subscript.java
@@ -195,7 +195,7 @@ protected static String toSubscript(char data) {
protected static String toSubscript(CharSequence data) {
StringBuilder sub = new StringBuilder();
- if (data != null && !data.isEmpty())
+ if (data != null && !data.toString().isEmpty())
for (char c : data.toString().toCharArray())
if (!isSubscript(c)) {
sub.append(toSubscript(c));
diff --git a/src/main/java/nx/peter/java/util/data/Superscript.java b/src/main/java/nx/peter/java/util/data/Superscript.java
index 0df403f..e6c0b49 100644
--- a/src/main/java/nx/peter/java/util/data/Superscript.java
+++ b/src/main/java/nx/peter/java/util/data/Superscript.java
@@ -253,7 +253,7 @@ protected static String toSuperscript(char data) {
protected static String toSuperscript(CharSequence data) {
StringBuilder sub = new StringBuilder();
- if (data != null && !data.isEmpty())
+ if (data != null && !data.toString().isEmpty())
for (char c : data.toString().toCharArray())
if (!isSuperscript(c)) {
sub.append(toSuperscript(c));