From cbe0e497be8e466c380a5b4fa781b314ede9ada3 Mon Sep 17 00:00:00 2001 From: Draknyte1 Date: Sun, 6 Nov 2016 19:32:27 +1000 Subject: Revert "$ Cleaned up the entire project." This reverts commit 0669f5eb9d5029a8b94ec552171b0837605f7747. # Conflicts: # src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMTE_NuclearReactor.java # src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_MassFabricator.java Revert "% Cleaned up Imports." This reverts commit 3654052fb63a571c5eaca7f20714b87c17f7e966. --- .../gtPlusPlus/core/util/array/ArrayUtils.java | 16 ++++----- src/Java/gtPlusPlus/core/util/array/Pair.java | 28 ++++++++-------- src/Java/gtPlusPlus/core/util/array/Triplet.java | 38 +++++++++++----------- 3 files changed, 41 insertions(+), 41 deletions(-) (limited to 'src/Java/gtPlusPlus/core/util/array') diff --git a/src/Java/gtPlusPlus/core/util/array/ArrayUtils.java b/src/Java/gtPlusPlus/core/util/array/ArrayUtils.java index 0d78c76681..ea02aaf1da 100644 --- a/src/Java/gtPlusPlus/core/util/array/ArrayUtils.java +++ b/src/Java/gtPlusPlus/core/util/array/ArrayUtils.java @@ -4,15 +4,15 @@ import java.util.Arrays; public class ArrayUtils { - private static Object[] addElement(Object[] series, final Object newValueToAdd) { - series = Arrays.copyOf(series, series.length + 1); - series[series.length - 1] = newValueToAdd; - return series; - } - - public static void expandArray(final Object[] someArray, final Object newValueToAdd) { + public static void expandArray(Object[] someArray, Object newValueToAdd) { Object[] series = someArray; - series = ArrayUtils.addElement(series, newValueToAdd); + series = addElement(series, newValueToAdd); } + private static Object[] addElement(Object[] series, Object newValueToAdd) { + series = Arrays.copyOf(series, series.length + 1); + series[series.length - 1] = newValueToAdd; + return series; + } + } diff --git a/src/Java/gtPlusPlus/core/util/array/Pair.java b/src/Java/gtPlusPlus/core/util/array/Pair.java index 45c6aacc23..94437e6779 100644 --- a/src/Java/gtPlusPlus/core/util/array/Pair.java +++ b/src/Java/gtPlusPlus/core/util/array/Pair.java @@ -1,21 +1,21 @@ package gtPlusPlus.core.util.array; -public class Pair { - - private final K key; - private final V value; - - public Pair(final K key, final V value) { +public class Pair { + + private final K key; + private final V value; + + public Pair(final K key, final V value){ this.key = key; this.value = value; } - - final public K getKey() { - return this.key; - } - - final public V getValue() { - return this.value; - } + + final public K getKey(){ + return key; + } + + final public V getValue(){ + return value; + } } \ No newline at end of file diff --git a/src/Java/gtPlusPlus/core/util/array/Triplet.java b/src/Java/gtPlusPlus/core/util/array/Triplet.java index 7882c2f13a..07f29ae6c8 100644 --- a/src/Java/gtPlusPlus/core/util/array/Triplet.java +++ b/src/Java/gtPlusPlus/core/util/array/Triplet.java @@ -1,27 +1,27 @@ package gtPlusPlus.core.util.array; -public class Triplet { - - private final K key; - private final V value; - private final C count; - - public Triplet(final K key, final V value, final C value2) { +public class Triplet { + + private final K key; + private final V value; + private final C count; + + public Triplet(final K key, final V value, final C value2){ this.key = key; this.value = value; this.count = value2; } - - final public K getKey() { - return this.key; - } - - final public C getSecondValue() { - return this.count; - } - - final public V getValue() { - return this.value; - } + + final public K getKey(){ + return key; + } + + final public V getValue(){ + return value; + } + + final public C getSecondValue(){ + return count; + } } \ No newline at end of file -- cgit