diff --git a/jar/PDFLibrary.jar b/jar/PDFLibrary.jar index 8e56dcb70759aaba37895023aad256ed750336cc..7aeab358e933e4149dca62b3f926d91a93b1a0d0 100644 Binary files a/jar/PDFLibrary.jar and b/jar/PDFLibrary.jar differ diff --git a/src/main/java/fybug/nulll/pdfunctionlibrary/Util/DataContainer.java b/src/main/java/fybug/nulll/pdfunctionlibrary/Util/DataContainer.java index 8482b5b6550b0df24d03af7b2c0896dea0ff57d0..c4b8c56bbf2ee67f949b768b59d43a9f1a605729 100644 --- a/src/main/java/fybug/nulll/pdfunctionlibrary/Util/DataContainer.java +++ b/src/main/java/fybug/nulll/pdfunctionlibrary/Util/DataContainer.java @@ -46,15 +46,20 @@ import static fybug.nulll.pdfunctionlibrary.Processing.CheckUtil.checkArrayTable public abstract class DataContainer extends ConsistentField implements Cloneable, CanEmpty { // V - @Nullable protected Object[] value = new Object[1]; + @Nullable protected Object[] value; /**

构造一个空的数据容器.

*/ protected - DataContainer() {} + DataContainer() { + value = new Object[1]; + } /**

构造一个数据容器并初始化.

*/ protected - DataContainer(@Nullable final V t) { setValue(t); } + DataContainer(@Nullable final V t) { + this(); + setValue(t); + } @Override protected @@ -206,7 +211,7 @@ class DataContainer extends ConsistentField implements Cloneable, CanEmpty { public static abstract class Synchronized extends DataContainer { protected - Synchronized() {} + Synchronized() { super(); } protected Synchronized(@NotNull final V t) @@ -219,7 +224,7 @@ class DataContainer extends ConsistentField implements Cloneable, CanEmpty { @NotNull protected DataContainer setValue(@Nullable final V value) { - Cleanable.checkClose(Cleanable.errmessage, this.value); + Cleanable.checkClose(Cleanable.errmessage, (Object) this.value); @Nullable final Object[] v; synchronized ( this ){ @@ -261,7 +266,7 @@ class DataContainer extends ConsistentField implements Cloneable, CanEmpty { public static abstract class DataCONTAINER extends DataContainer { protected - DataCONTAINER() {} + DataCONTAINER() {super();} protected DataCONTAINER(V t) @@ -274,7 +279,7 @@ class DataContainer extends ConsistentField implements Cloneable, CanEmpty { @NotNull protected DataContainer setValue(@Nullable final V value) { - Cleanable.checkClose(Cleanable.errmessage, this.value); + Cleanable.checkClose(Cleanable.errmessage, (Object) this.value); @Nullable final Object[] v; v = this.value; if (CheckObject.checkNull(v).length < 1) diff --git a/src/main/java/fybug/nulll/pdfunctionlibrary/lang/CloseAll.java b/src/main/java/fybug/nulll/pdfunctionlibrary/lang/CloseAll.java index 2acc54f8e6577bf80c569acfee18846ac8ad3956..e4bf3b4ba716d4c1dc869ddcb59dc2973899474d 100644 --- a/src/main/java/fybug/nulll/pdfunctionlibrary/lang/CloseAll.java +++ b/src/main/java/fybug/nulll/pdfunctionlibrary/lang/CloseAll.java @@ -29,11 +29,11 @@ import fybug.nulll.pdfunctionlibrary.Util.Processing.Arrarys; public abstract class CloseAll extends ConsistentField implements AutoCloseable, MaybeSynchronized { /**

保存要关闭的对象.

*/ - @NotNull protected LinkedList linkedList = new LinkedList<>(); + @NotNull protected LinkedList linkedList; /**

构造一个空的关闭容器.

*/ protected - CloseAll() {} + CloseAll() {linkedList = new LinkedList<>();} /** *

构造关闭容器并添加要关闭的对象.

@@ -41,7 +41,10 @@ class CloseAll extends ConsistentField implements AutoCloseable, MaybeSynchroniz * @param close 要关闭的对象 */ protected - CloseAll(@Nullable final AutoCloseable... close) {append(close);} + CloseAll(@Nullable final AutoCloseable... close) { + this(); + append(close); + } @NoSynchronized @Override