Drop ObjectUtils
This commit is contained in:
FooIbar authored and tarsin committed
1 parent
0adc43b243
commit
b6de84c369
3 files changed
+3
-231
No files matched your search
@@ -34,7 +34,6 @@ import com.hippo.ehviewer.spider.readCompatFromUniFile
|
||||
import com.hippo.ehviewer.spider.write
|
||||
import com.hippo.ehviewer.yorozuya.ConcurrentPool
|
||||
import com.hippo.ehviewer.yorozuya.MathUtils
|
||||
import com.hippo.ehviewer.yorozuya.ObjectUtils
|
||||
import com.hippo.ehviewer.yorozuya.SimpleHandler
|
||||
import com.hippo.ehviewer.yorozuya.collect.LongList
|
||||
import com.hippo.unifile.UniFile
|
||||
@@ -702,7 +701,7 @@ object DownloadManager : OnSpiderListener {
|
||||
return
|
||||
}
|
||||
for (info in list) {
|
||||
if (ObjectUtils.equal(info.label, label)) {
|
||||
if (info.label == label) {
|
||||
continue
|
||||
}
|
||||
val srcList: MutableList<DownloadInfo>? = getInfoListForLabel(info.label)
|
||||
|
||||
@@ -96,7 +96,6 @@ import com.hippo.ehviewer.ui.setMD3Content
|
||||
import com.hippo.ehviewer.ui.tools.CropDefaults
|
||||
import com.hippo.ehviewer.util.sendTo
|
||||
import com.hippo.ehviewer.yorozuya.FileUtils
|
||||
import com.hippo.ehviewer.yorozuya.ObjectUtils
|
||||
import com.hippo.ehviewer.yorozuya.collect.LongList
|
||||
import com.hippo.unifile.UniFile
|
||||
import eu.kanade.tachiyomi.util.lang.launchIO
|
||||
@@ -651,7 +650,7 @@ class DownloadsScene :
|
||||
}
|
||||
|
||||
override fun onRenameLabel(from: String, to: String) {
|
||||
if (!ObjectUtils.equal(mLabel, from)) {
|
||||
if (mLabel != from) {
|
||||
return
|
||||
}
|
||||
mLabel = to
|
||||
@@ -688,7 +687,7 @@ class DownloadsScene :
|
||||
} else {
|
||||
mLabels[position]
|
||||
}
|
||||
if (!ObjectUtils.equal(label1, mLabel)) {
|
||||
if (mLabel != label1) {
|
||||
mLabel = label1
|
||||
updateForLabel()
|
||||
updateView()
|
||||
|
||||
@@ -1,226 +0,0 @@
|
||||
/*
|
||||
* Copyright 2015 Hippo Seven
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package com.hippo.ehviewer.yorozuya;
|
||||
|
||||
import androidx.annotation.Nullable;
|
||||
|
||||
import java.io.PrintWriter;
|
||||
import java.lang.reflect.Field;
|
||||
import java.lang.reflect.Modifier;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Objects;
|
||||
import java.util.Set;
|
||||
|
||||
public final class ObjectUtils {
|
||||
private ObjectUtils() {
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns true if two possibly-null objects are equal.
|
||||
*/
|
||||
public static boolean equal(@Nullable Object a, @Nullable Object b) {
|
||||
return Objects.equals(a, b);
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns "null" for null or {@code o.toString()}.
|
||||
*/
|
||||
public static String toString(Object o) {
|
||||
return (o == null) ? "null" : o.toString();
|
||||
}
|
||||
|
||||
private static void dumpObject(Object o, PrintWriter writer, String prefix) {
|
||||
writer.write(prefix);
|
||||
writer.write(o.getClass().getName());
|
||||
writer.write('\n');
|
||||
}
|
||||
|
||||
private static void dumpBoolean(boolean z, PrintWriter writer, String prefix) {
|
||||
writer.write(prefix);
|
||||
writer.write(Boolean.toString(z));
|
||||
writer.write('\n');
|
||||
}
|
||||
|
||||
private static void dumpByte(byte b, PrintWriter writer, String prefix) {
|
||||
writer.write(prefix);
|
||||
writer.write(Byte.toString(b));
|
||||
writer.write('\n');
|
||||
}
|
||||
|
||||
private static void dumpChar(char c, PrintWriter writer, String prefix) {
|
||||
writer.write(prefix);
|
||||
writer.write(Character.toString(c));
|
||||
writer.write('\n');
|
||||
}
|
||||
|
||||
private static void dumpShort(short s, PrintWriter writer, String prefix) {
|
||||
writer.write(prefix);
|
||||
writer.write(Short.toString(s));
|
||||
writer.write('\n');
|
||||
}
|
||||
|
||||
private static void dumpInt(int i, PrintWriter writer, String prefix) {
|
||||
writer.write(prefix);
|
||||
writer.write(Integer.toString(i));
|
||||
writer.write('\n');
|
||||
}
|
||||
|
||||
private static void dumpLong(long j, PrintWriter writer, String prefix) {
|
||||
writer.write(prefix);
|
||||
writer.write(Long.toString(j));
|
||||
writer.write('\n');
|
||||
}
|
||||
|
||||
private static void dumpFloat(float f, PrintWriter writer, String prefix) {
|
||||
writer.write(prefix);
|
||||
writer.write(Float.toString(f));
|
||||
writer.write('\n');
|
||||
}
|
||||
|
||||
private static void dumpDouble(double d, PrintWriter writer, String prefix) {
|
||||
writer.write(prefix);
|
||||
writer.write(Double.toString(d));
|
||||
writer.write('\n');
|
||||
}
|
||||
|
||||
private static void dumpArray(Object array, PrintWriter writer, String prefix, boolean skipFirstPrefix) {
|
||||
if (skipFirstPrefix) {
|
||||
dumpObject(array, writer, "");
|
||||
} else {
|
||||
dumpObject(array, writer, prefix);
|
||||
}
|
||||
|
||||
String newPrefix = prefix + " ";
|
||||
writer.write(newPrefix);
|
||||
writer.write('[');
|
||||
writer.write('\n');
|
||||
|
||||
if (array instanceof Object[] a) {
|
||||
for (int i = 0, l = a.length; i < l; i++) {
|
||||
dump(a[i], writer, newPrefix, false);
|
||||
}
|
||||
} else if (array instanceof boolean[] a) {
|
||||
for (int i = 0, l = a.length; i < l; i++) {
|
||||
dumpBoolean(a[i], writer, newPrefix);
|
||||
}
|
||||
} else if (array instanceof byte[] a) {
|
||||
for (int i = 0, l = a.length; i < l; i++) {
|
||||
dumpByte(a[i], writer, newPrefix);
|
||||
}
|
||||
} else if (array instanceof char[] a) {
|
||||
for (int i = 0, l = a.length; i < l; i++) {
|
||||
dumpChar(a[i], writer, newPrefix);
|
||||
}
|
||||
} else if (array instanceof short[] a) {
|
||||
for (int i = 0, l = a.length; i < l; i++) {
|
||||
dumpShort(a[i], writer, newPrefix);
|
||||
}
|
||||
} else if (array instanceof int[] a) {
|
||||
for (int i = 0, l = a.length; i < l; i++) {
|
||||
dumpInt(a[i], writer, newPrefix);
|
||||
}
|
||||
} else if (array instanceof long[] a) {
|
||||
for (int i = 0, l = a.length; i < l; i++) {
|
||||
dumpLong(a[i], writer, newPrefix);
|
||||
}
|
||||
} else if (array instanceof float[] a) {
|
||||
for (int i = 0, l = a.length; i < l; i++) {
|
||||
dumpFloat(a[i], writer, newPrefix);
|
||||
}
|
||||
} else if (array instanceof double[] a) {
|
||||
for (int i = 0, l = a.length; i < l; i++) {
|
||||
dumpDouble(a[i], writer, newPrefix);
|
||||
}
|
||||
} else if (array instanceof List) {
|
||||
for (Object o : (List) array) {
|
||||
dump(o, writer, newPrefix);
|
||||
}
|
||||
} else if (array instanceof Set) {
|
||||
for (Object o : (Set) array) {
|
||||
dump(o, writer, newPrefix);
|
||||
}
|
||||
} else if (array instanceof Map map) {
|
||||
for (Object key : map.keySet()) {
|
||||
Object value = map.get(key);
|
||||
writer.write(newPrefix);
|
||||
writer.write(key.toString());
|
||||
writer.write(": ");
|
||||
dump(value, writer, newPrefix, true);
|
||||
}
|
||||
} else {
|
||||
throw new IllegalStateException(array + " is not array");
|
||||
}
|
||||
|
||||
writer.write(newPrefix);
|
||||
writer.write(']');
|
||||
writer.write('\n');
|
||||
}
|
||||
|
||||
public static void dump(Object o, PrintWriter writer) {
|
||||
dump(o, writer, "", false);
|
||||
}
|
||||
|
||||
public static void dump(Object o, PrintWriter writer, String prefix) {
|
||||
dump(o, writer, prefix, false);
|
||||
}
|
||||
|
||||
public static void dump(Object o, PrintWriter writer, String prefix, boolean skipFirstPrefix) {
|
||||
if (o == null) {
|
||||
if (!skipFirstPrefix) {
|
||||
writer.write(prefix);
|
||||
}
|
||||
writer.write("null\n");
|
||||
} else if (o.getClass().isArray() || o instanceof List || o instanceof Set || o instanceof Map) {
|
||||
dumpArray(o, writer, prefix, skipFirstPrefix);
|
||||
} else if (o.getClass().isPrimitive() || o instanceof Boolean ||
|
||||
o instanceof Byte || o instanceof Character || o instanceof Short ||
|
||||
o instanceof Integer || o instanceof Long || o instanceof Float ||
|
||||
o instanceof Double || o instanceof String) {
|
||||
if (!skipFirstPrefix) {
|
||||
writer.write(prefix);
|
||||
}
|
||||
writer.write(o.toString());
|
||||
writer.write('\n');
|
||||
} else {
|
||||
if (skipFirstPrefix) {
|
||||
dumpObject(o, writer, "");
|
||||
} else {
|
||||
dumpObject(o, writer, prefix);
|
||||
}
|
||||
|
||||
String newPrefix = prefix + " ";
|
||||
for (Field field : o.getClass().getDeclaredFields()) {
|
||||
// Skip static filed
|
||||
if (Modifier.isStatic(field.getModifiers())) {
|
||||
continue;
|
||||
}
|
||||
field.setAccessible(true);
|
||||
String name = field.getName();
|
||||
try {
|
||||
Object value = field.get(o);
|
||||
writer.write(newPrefix);
|
||||
writer.write(name);
|
||||
writer.write(": ");
|
||||
dump(value, writer, newPrefix, true);
|
||||
} catch (IllegalAccessException e) {
|
||||
// Ignore
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user