diff options
| author | Alexdoru <57050655+Alexdoru@users.noreply.github.com> | 2024-10-02 07:31:08 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-10-02 05:31:08 +0000 |
| commit | 3b9bd1188e932e6bb8041f7bb9afbf3ce75e26d3 (patch) | |
| tree | 107d9d2442891990ef1cdef1d8bb2df6bb96952a /src/main/java/gtPlusPlus/api/objects/data | |
| parent | bfc7b2b07f72d0903a70791ff96f9c837ddd5ff0 (diff) | |
| download | GT5-Unofficial-3b9bd1188e932e6bb8041f7bb9afbf3ce75e26d3.tar.gz GT5-Unofficial-3b9bd1188e932e6bb8041f7bb9afbf3ce75e26d3.tar.bz2 GT5-Unofficial-3b9bd1188e932e6bb8041f7bb9afbf3ce75e26d3.zip | |
Cleanup the codebase (#3311)
Co-authored-by: boubou19 <miisterunknown@gmail.com>
Diffstat (limited to 'src/main/java/gtPlusPlus/api/objects/data')
| -rw-r--r-- | src/main/java/gtPlusPlus/api/objects/data/TypeCounter.java | 10 | ||||
| -rw-r--r-- | src/main/java/gtPlusPlus/api/objects/data/WeightedCollection.java | 4 |
2 files changed, 5 insertions, 9 deletions
diff --git a/src/main/java/gtPlusPlus/api/objects/data/TypeCounter.java b/src/main/java/gtPlusPlus/api/objects/data/TypeCounter.java index ea12972af4..eb4b3cfd59 100644 --- a/src/main/java/gtPlusPlus/api/objects/data/TypeCounter.java +++ b/src/main/java/gtPlusPlus/api/objects/data/TypeCounter.java @@ -10,7 +10,7 @@ import gtPlusPlus.api.objects.Logger; public class TypeCounter<V> implements Set<V> { - private Map<String, InternalTypeCounterObject<V>> mInternalMap = new LinkedHashMap<>(); + private final Map<String, InternalTypeCounterObject<V>> mInternalMap = new LinkedHashMap<>(); private String mHighestValueKey; private int mHighestValue = 0; private final Class mClass; @@ -55,7 +55,7 @@ public class TypeCounter<V> implements Set<V> { String aKey = aKeyName != null ? aKeyName : arg0.toString(); InternalTypeCounterObject<V> aValue = mInternalMap.get(aKey); if (aValue == null) { - aValue = new InternalTypeCounterObject<>((V) arg0); + aValue = new InternalTypeCounterObject<>(arg0); Logger.WARNING("Adding new key to map: " + aKey); } aValue.add(); @@ -115,11 +115,7 @@ public class TypeCounter<V> implements Set<V> { @Override public boolean remove(Object arg0) { InternalTypeCounterObject<V> aValue = mInternalMap.remove(arg0.toString()); - if (aValue != null) { - return true; - } else { - return false; - } + return aValue != null; } @Override diff --git a/src/main/java/gtPlusPlus/api/objects/data/WeightedCollection.java b/src/main/java/gtPlusPlus/api/objects/data/WeightedCollection.java index 5d99097169..6a14b97e0b 100644 --- a/src/main/java/gtPlusPlus/api/objects/data/WeightedCollection.java +++ b/src/main/java/gtPlusPlus/api/objects/data/WeightedCollection.java @@ -11,8 +11,8 @@ import gregtech.api.objects.XSTR; public class WeightedCollection<E> implements Map<Integer, E> { - private NavigableMap<Integer, E> map = new TreeMap<>(); - private Random random; + private final NavigableMap<Integer, E> map = new TreeMap<>(); + private final Random random; private int total = 0; public WeightedCollection() { |