From 71c23df9716b773f15598f65ac8579f7e8ebd93c Mon Sep 17 00:00:00 2001 From: huanghongxun Date: Mon, 18 Oct 2021 15:33:44 +0800 Subject: [PATCH] feat: use ArrayUtils from commons-lang3 instead. --- .../mickey/minecraft/skin/fx/SkinCube.java | 2 +- .../org/jackhuang/hmcl/util/ArrayUtils.java | 434 ------------------ 2 files changed, 1 insertion(+), 435 deletions(-) delete mode 100644 HMCLCore/src/main/java/org/jackhuang/hmcl/util/ArrayUtils.java diff --git a/HMCL/src/main/java/moe/mickey/minecraft/skin/fx/SkinCube.java b/HMCL/src/main/java/moe/mickey/minecraft/skin/fx/SkinCube.java index 8570a0428..226ffca3e 100644 --- a/HMCL/src/main/java/moe/mickey/minecraft/skin/fx/SkinCube.java +++ b/HMCL/src/main/java/moe/mickey/minecraft/skin/fx/SkinCube.java @@ -4,7 +4,7 @@ import javafx.scene.image.Image; import javafx.scene.shape.Mesh; import javafx.scene.shape.MeshView; import javafx.scene.shape.TriangleMesh; -import org.jackhuang.hmcl.util.ArrayUtils; +import org.apache.commons.lang3.ArrayUtils; public class SkinCube extends MeshView { diff --git a/HMCLCore/src/main/java/org/jackhuang/hmcl/util/ArrayUtils.java b/HMCLCore/src/main/java/org/jackhuang/hmcl/util/ArrayUtils.java deleted file mode 100644 index 1e25d65f7..000000000 --- a/HMCLCore/src/main/java/org/jackhuang/hmcl/util/ArrayUtils.java +++ /dev/null @@ -1,434 +0,0 @@ -/* - * Hello Minecraft! Launcher - * Copyright (C) 2021 huangyuhui and contributors - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.jackhuang.hmcl.util; - -import java.lang.reflect.Array; - -/** - * Commons-lang ArrayUtils - */ -public final class ArrayUtils { - private ArrayUtils() { - } - - public static boolean[] addAll(boolean[] array1, boolean... array2) { - if (array1 == null) { - return clone(array2); - } else if (array2 == null) { - return clone(array1); - } else { - boolean[] joinedArray = new boolean[array1.length + array2.length]; - System.arraycopy(array1, 0, joinedArray, 0, array1.length); - System.arraycopy(array2, 0, joinedArray, array1.length, array2.length); - return joinedArray; - } - } - - public static byte[] addAll(byte[] array1, byte... array2) { - if (array1 == null) { - return clone(array2); - } else if (array2 == null) { - return clone(array1); - } else { - byte[] joinedArray = new byte[array1.length + array2.length]; - System.arraycopy(array1, 0, joinedArray, 0, array1.length); - System.arraycopy(array2, 0, joinedArray, array1.length, array2.length); - return joinedArray; - } - } - - public static char[] addAll(char[] array1, char... array2) { - if (array1 == null) { - return clone(array2); - } else if (array2 == null) { - return clone(array1); - } else { - char[] joinedArray = new char[array1.length + array2.length]; - System.arraycopy(array1, 0, joinedArray, 0, array1.length); - System.arraycopy(array2, 0, joinedArray, array1.length, array2.length); - return joinedArray; - } - } - - public static double[] addAll(double[] array1, double... array2) { - if (array1 == null) { - return clone(array2); - } else if (array2 == null) { - return clone(array1); - } else { - double[] joinedArray = new double[array1.length + array2.length]; - System.arraycopy(array1, 0, joinedArray, 0, array1.length); - System.arraycopy(array2, 0, joinedArray, array1.length, array2.length); - return joinedArray; - } - } - - public static float[] addAll(float[] array1, float... array2) { - if (array1 == null) { - return clone(array2); - } else if (array2 == null) { - return clone(array1); - } else { - float[] joinedArray = new float[array1.length + array2.length]; - System.arraycopy(array1, 0, joinedArray, 0, array1.length); - System.arraycopy(array2, 0, joinedArray, array1.length, array2.length); - return joinedArray; - } - } - - public static int[] addAll(int[] array1, int... array2) { - if (array1 == null) { - return clone(array2); - } else if (array2 == null) { - return clone(array1); - } else { - int[] joinedArray = new int[array1.length + array2.length]; - System.arraycopy(array1, 0, joinedArray, 0, array1.length); - System.arraycopy(array2, 0, joinedArray, array1.length, array2.length); - return joinedArray; - } - } - - public static long[] addAll(long[] array1, long... array2) { - if (array1 == null) { - return clone(array2); - } else if (array2 == null) { - return clone(array1); - } else { - long[] joinedArray = new long[array1.length + array2.length]; - System.arraycopy(array1, 0, joinedArray, 0, array1.length); - System.arraycopy(array2, 0, joinedArray, array1.length, array2.length); - return joinedArray; - } - } - - public static short[] addAll(short[] array1, short... array2) { - if (array1 == null) { - return clone(array2); - } else if (array2 == null) { - return clone(array1); - } else { - short[] joinedArray = new short[array1.length + array2.length]; - System.arraycopy(array1, 0, joinedArray, 0, array1.length); - System.arraycopy(array2, 0, joinedArray, array1.length, array2.length); - return joinedArray; - } - } - - @SafeVarargs - public static T[] addAll(final T[] array1, final T... array2) { - if (array1 == null) { - return clone(array2); - } else if (array2 == null) { - return clone(array1); - } - final Class type1 = array1.getClass().getComponentType(); - @SuppressWarnings("unchecked") // OK, because array is of type T - final T[] joinedArray = (T[]) Array.newInstance(type1, array1.length + array2.length); - System.arraycopy(array1, 0, joinedArray, 0, array1.length); - try { - System.arraycopy(array2, 0, joinedArray, array1.length, array2.length); - } catch (final ArrayStoreException ase) { - // Check if problem was due to incompatible types - /* - * We do this here, rather than before the copy because: - * - it would be a wasted check most of the time - * - safer, in case check turns out to be too strict - */ - final Class type2 = array2.getClass().getComponentType(); - if (!type1.isAssignableFrom(type2)) { - throw new IllegalArgumentException("Cannot store " + type2.getName() + " in an array of " - + type1.getName(), ase); - } - throw ase; // No, so rethrow original - } - return joinedArray; - } - - public static boolean[] clone(final boolean[] array) { - if (array == null) { - return null; - } - return array.clone(); - } - - public static byte[] clone(final byte[] array) { - if (array == null) { - return null; - } - return array.clone(); - } - - public static char[] clone(final char[] array) { - if (array == null) { - return null; - } - return array.clone(); - } - - public static double[] clone(final double[] array) { - if (array == null) { - return null; - } - return array.clone(); - } - - public static float[] clone(final float[] array) { - if (array == null) { - return null; - } - return array.clone(); - } - - public static int[] clone(final int[] array) { - if (array == null) { - return null; - } - return array.clone(); - } - - public static long[] clone(final long[] array) { - if (array == null) { - return null; - } - return array.clone(); - } - - public static short[] clone(final short[] array) { - if (array == null) { - return null; - } - return array.clone(); - } - - public static T[] clone(final T[] array) { - if (array == null) { - return null; - } - return array.clone(); - } - - public static void reverse(final boolean[] array) { - if (array == null) { - return; - } - reverse(array, 0, array.length); - } - - public static void reverse(final byte[] array) { - if (array == null) { - return; - } - reverse(array, 0, array.length); - } - - public static void reverse(final char[] array) { - if (array == null) { - return; - } - reverse(array, 0, array.length); - } - - public static void reverse(final double[] array) { - if (array == null) { - return; - } - reverse(array, 0, array.length); - } - - public static void reverse(final float[] array) { - if (array == null) { - return; - } - reverse(array, 0, array.length); - } - - public static void reverse(final int[] array) { - if (array == null) { - return; - } - reverse(array, 0, array.length); - } - - public static void reverse(final long[] array) { - if (array == null) { - return; - } - reverse(array, 0, array.length); - } - - public static void reverse(final short[] array) { - if (array == null) { - return; - } - reverse(array, 0, array.length); - } - - public static void reverse(final Object[] array) { - if (array == null) { - return; - } - reverse(array, 0, array.length); - } - - public static void reverse(final boolean[] array, final int startIndexInclusive, final int endIndexExclusive) { - if (array == null) { - return; - } - int i = Math.max(startIndexInclusive, 0); - int j = Math.min(array.length, endIndexExclusive) - 1; - boolean tmp; - while (j > i) { - tmp = array[j]; - array[j] = array[i]; - array[i] = tmp; - j--; - i++; - } - } - - public static void reverse(final byte[] array, final int startIndexInclusive, final int endIndexExclusive) { - if (array == null) { - return; - } - int i = Math.max(startIndexInclusive, 0); - int j = Math.min(array.length, endIndexExclusive) - 1; - byte tmp; - while (j > i) { - tmp = array[j]; - array[j] = array[i]; - array[i] = tmp; - j--; - i++; - } - } - - public static void reverse(final char[] array, final int startIndexInclusive, final int endIndexExclusive) { - if (array == null) { - return; - } - int i = Math.max(startIndexInclusive, 0); - int j = Math.min(array.length, endIndexExclusive) - 1; - char tmp; - while (j > i) { - tmp = array[j]; - array[j] = array[i]; - array[i] = tmp; - j--; - i++; - } - } - - public static void reverse(final double[] array, final int startIndexInclusive, final int endIndexExclusive) { - if (array == null) { - return; - } - int i = Math.max(startIndexInclusive, 0); - int j = Math.min(array.length, endIndexExclusive) - 1; - double tmp; - while (j > i) { - tmp = array[j]; - array[j] = array[i]; - array[i] = tmp; - j--; - i++; - } - } - - public static void reverse(final float[] array, final int startIndexInclusive, final int endIndexExclusive) { - if (array == null) { - return; - } - int i = Math.max(startIndexInclusive, 0); - int j = Math.min(array.length, endIndexExclusive) - 1; - float tmp; - while (j > i) { - tmp = array[j]; - array[j] = array[i]; - array[i] = tmp; - j--; - i++; - } - } - - public static void reverse(final int[] array, final int startIndexInclusive, final int endIndexExclusive) { - if (array == null) { - return; - } - int i = Math.max(startIndexInclusive, 0); - int j = Math.min(array.length, endIndexExclusive) - 1; - int tmp; - while (j > i) { - tmp = array[j]; - array[j] = array[i]; - array[i] = tmp; - j--; - i++; - } - } - - public static void reverse(final long[] array, final int startIndexInclusive, final int endIndexExclusive) { - if (array == null) { - return; - } - int i = Math.max(startIndexInclusive, 0); - int j = Math.min(array.length, endIndexExclusive) - 1; - long tmp; - while (j > i) { - tmp = array[j]; - array[j] = array[i]; - array[i] = tmp; - j--; - i++; - } - } - - public static void reverse(final short[] array, final int startIndexInclusive, final int endIndexExclusive) { - if (array == null) { - return; - } - int i = Math.max(startIndexInclusive, 0); - int j = Math.min(array.length, endIndexExclusive) - 1; - short tmp; - while (j > i) { - tmp = array[j]; - array[j] = array[i]; - array[i] = tmp; - j--; - i++; - } - } - - public static void reverse(final Object[] array, final int startIndexInclusive, final int endIndexExclusive) { - if (array == null) { - return; - } - int i = Math.max(startIndexInclusive, 0); - int j = Math.min(array.length, endIndexExclusive) - 1; - Object tmp; - while (j > i) { - tmp = array[j]; - array[j] = array[i]; - array[i] = tmp; - j--; - i++; - } - } -} - -