From 009752822de525cfe8922badc2465c59557be912 Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Fri, 4 Oct 2019 15:50:26 -0400 Subject: [PATCH] v0.7.5a: removed unnecessary explicit type arguments --- .../src/main/java/com/watabou/glscripts/Script.java | 2 +- .../src/main/java/com/watabou/gltextures/Atlas.java | 2 +- SPD-classes/src/main/java/com/watabou/noosa/Camera.java | 2 +- SPD-classes/src/main/java/com/watabou/noosa/Group.java | 2 +- .../src/main/java/com/watabou/noosa/TextureFilm.java | 2 +- .../src/main/java/com/watabou/utils/BitmapCache.java | 2 +- .../src/main/java/com/watabou/utils/BitmapFilm.java | 2 +- SPD-classes/src/main/java/com/watabou/utils/Bundle.java | 4 ++-- SPD-classes/src/main/java/com/watabou/utils/Graph.java | 4 ++-- .../com/shatteredpixel/shatteredpixeldungeon/Badges.java | 8 ++++---- .../com/shatteredpixel/shatteredpixeldungeon/Bones.java | 2 +- .../com/shatteredpixel/shatteredpixeldungeon/Dungeon.java | 6 +++--- .../shatteredpixel/shatteredpixeldungeon/QuickSlot.java | 4 ++-- .../shatteredpixeldungeon/actors/buffs/PinCushion.java | 4 ++-- .../shatteredpixeldungeon/actors/hero/Hero.java | 6 +++--- .../shatteredpixeldungeon/effects/FloatingText.java | 4 ++-- .../shatteredpixeldungeon/effects/SpellSprite.java | 2 +- .../shatteredpixel/shatteredpixeldungeon/items/Gold.java | 2 +- .../shatteredpixel/shatteredpixeldungeon/items/Heap.java | 4 ++-- .../shatteredpixeldungeon/items/Honeypot.java | 2 +- .../shatteredpixel/shatteredpixeldungeon/items/Item.java | 2 +- .../shatteredpixeldungeon/items/ItemStatusHandler.java | 8 ++++---- .../shatteredpixeldungeon/items/artifacts/DriedRose.java | 4 ++-- .../shatteredpixeldungeon/items/bags/Bag.java | 2 +- .../items/scrolls/ScrollOfMirrorImage.java | 2 +- .../shatteredpixeldungeon/items/wands/WandOfRegrowth.java | 4 ++-- .../shatteredpixeldungeon/levels/rooms/Room.java | 4 ++-- .../shatteredpixeldungeon/plants/Swiftthistle.java | 2 +- .../shatteredpixeldungeon/ui/AttackIndicator.java | 2 +- .../shatteredpixeldungeon/ui/BadgesList.java | 2 +- .../shatteredpixel/shatteredpixeldungeon/ui/GameLog.java | 2 +- .../shatteredpixeldungeon/ui/QuickRecipe.java | 2 +- .../shatteredpixel/shatteredpixeldungeon/utils/GLog.java | 2 +- .../shatteredpixeldungeon/windows/WndStory.java | 2 +- .../shatteredpixeldungeon/windows/WndTabbed.java | 4 ++-- 35 files changed, 55 insertions(+), 55 deletions(-) diff --git a/SPD-classes/src/main/java/com/watabou/glscripts/Script.java b/SPD-classes/src/main/java/com/watabou/glscripts/Script.java index e441e2130..e072f5f0e 100644 --- a/SPD-classes/src/main/java/com/watabou/glscripts/Script.java +++ b/SPD-classes/src/main/java/com/watabou/glscripts/Script.java @@ -30,7 +30,7 @@ import java.util.HashMap; public class Script extends Program { private static final HashMap,Script> all = - new HashMap, Script>(); + new HashMap<>(); private static Script curScript = null; private static Class curScriptClass = null; diff --git a/SPD-classes/src/main/java/com/watabou/gltextures/Atlas.java b/SPD-classes/src/main/java/com/watabou/gltextures/Atlas.java index 5cf47192e..8ad784fbe 100644 --- a/SPD-classes/src/main/java/com/watabou/gltextures/Atlas.java +++ b/SPD-classes/src/main/java/com/watabou/gltextures/Atlas.java @@ -42,7 +42,7 @@ public class Atlas { this.tx = tx; tx.atlas = this; - namedFrames = new HashMap(); + namedFrames = new HashMap<>(); } public void add( Object key, int left, int top, int right, int bottom ) { diff --git a/SPD-classes/src/main/java/com/watabou/noosa/Camera.java b/SPD-classes/src/main/java/com/watabou/noosa/Camera.java index 3cb688a7a..012ac8072 100644 --- a/SPD-classes/src/main/java/com/watabou/noosa/Camera.java +++ b/SPD-classes/src/main/java/com/watabou/noosa/Camera.java @@ -30,7 +30,7 @@ import java.util.ArrayList; public class Camera extends Gizmo { - private static ArrayList all = new ArrayList(); + private static ArrayList all = new ArrayList<>(); protected static float invW2; protected static float invH2; diff --git a/SPD-classes/src/main/java/com/watabou/noosa/Group.java b/SPD-classes/src/main/java/com/watabou/noosa/Group.java index bf8167e8a..b02d09685 100644 --- a/SPD-classes/src/main/java/com/watabou/noosa/Group.java +++ b/SPD-classes/src/main/java/com/watabou/noosa/Group.java @@ -38,7 +38,7 @@ public class Group extends Gizmo { public static boolean freezeEmitters = false; public Group() { - members = new ArrayList(); + members = new ArrayList<>(); length = 0; } diff --git a/SPD-classes/src/main/java/com/watabou/noosa/TextureFilm.java b/SPD-classes/src/main/java/com/watabou/noosa/TextureFilm.java index 636b3bedf..89cc0fcec 100644 --- a/SPD-classes/src/main/java/com/watabou/noosa/TextureFilm.java +++ b/SPD-classes/src/main/java/com/watabou/noosa/TextureFilm.java @@ -36,7 +36,7 @@ public class TextureFilm { private SmartTexture texture; - protected HashMap frames = new HashMap(); + protected HashMap frames = new HashMap<>(); public TextureFilm( Object tx ) { diff --git a/SPD-classes/src/main/java/com/watabou/utils/BitmapCache.java b/SPD-classes/src/main/java/com/watabou/utils/BitmapCache.java index b9faa5062..db2ff0f76 100644 --- a/SPD-classes/src/main/java/com/watabou/utils/BitmapCache.java +++ b/SPD-classes/src/main/java/com/watabou/utils/BitmapCache.java @@ -31,7 +31,7 @@ public class BitmapCache { private static final String DEFAULT = "__default"; - private static HashMap layers = new HashMap(); + private static HashMap layers = new HashMap<>(); public static Pixmap get( String assetName ) { return get( DEFAULT, assetName ); diff --git a/SPD-classes/src/main/java/com/watabou/utils/BitmapFilm.java b/SPD-classes/src/main/java/com/watabou/utils/BitmapFilm.java index ed0847c32..b99cbd885 100644 --- a/SPD-classes/src/main/java/com/watabou/utils/BitmapFilm.java +++ b/SPD-classes/src/main/java/com/watabou/utils/BitmapFilm.java @@ -29,7 +29,7 @@ public class BitmapFilm { public Pixmap bitmap; - protected HashMap frames = new HashMap(); + protected HashMap frames = new HashMap<>(); public BitmapFilm( Pixmap bitmap ) { this.bitmap = bitmap; diff --git a/SPD-classes/src/main/java/com/watabou/utils/Bundle.java b/SPD-classes/src/main/java/com/watabou/utils/Bundle.java index 7363f3da9..768f077b9 100644 --- a/SPD-classes/src/main/java/com/watabou/utils/Bundle.java +++ b/SPD-classes/src/main/java/com/watabou/utils/Bundle.java @@ -46,7 +46,7 @@ public class Bundle { private static final String CLASS_NAME = "__className"; - private static HashMap aliases = new HashMap(); + private static HashMap aliases = new HashMap<>(); private JSONObject data; @@ -226,7 +226,7 @@ public class Bundle { public Collection getCollection( String key ) { - ArrayList list = new ArrayList(); + ArrayList list = new ArrayList<>(); try { JSONArray array = data.getJSONArray( key ); diff --git a/SPD-classes/src/main/java/com/watabou/utils/Graph.java b/SPD-classes/src/main/java/com/watabou/utils/Graph.java index f2b204d69..ca44a3e49 100644 --- a/SPD-classes/src/main/java/com/watabou/utils/Graph.java +++ b/SPD-classes/src/main/java/com/watabou/utils/Graph.java @@ -40,7 +40,7 @@ public class Graph { node.distance( Integer.MAX_VALUE ); } - LinkedList queue = new LinkedList(); + LinkedList queue = new LinkedList<>(); focus.distance( 0 ); queue.add( focus ); @@ -63,7 +63,7 @@ public class Graph { @SuppressWarnings("unchecked") public static List buildPath( Collection nodes, T from, T to ) { - List path = new ArrayList(); + List path = new ArrayList<>(); T room = from; while (room != to) { diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/Badges.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/Badges.java index b5023f744..738700ea3 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/Badges.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/Badges.java @@ -162,7 +162,7 @@ public class Badges { } private static HashSet global; - private static HashSet local = new HashSet(); + private static HashSet local = new HashSet<>(); private static boolean saveNeeded = false; @@ -233,7 +233,7 @@ public class Badges { global = restore( bundle ); } catch (IOException e) { - global = new HashSet(); + global = new HashSet<>(); } } } @@ -855,7 +855,7 @@ public class Badges { public static List filtered( boolean global ) { - HashSet filtered = new HashSet( global ? Badges.global : Badges.local ); + HashSet filtered = new HashSet<>(global ? Badges.global : Badges.local); Iterator iterator = filtered.iterator(); while (iterator.hasNext()) { @@ -889,7 +889,7 @@ public class Badges { leaveBest( filtered, Badge.GAMES_PLAYED_1, Badge.GAMES_PLAYED_2, Badge.GAMES_PLAYED_3, Badge.GAMES_PLAYED_4 ); leaveBest( filtered, Badge.CHAMPION_1, Badge.CHAMPION_2, Badge.CHAMPION_3 ); - ArrayList list = new ArrayList( filtered ); + ArrayList list = new ArrayList<>(filtered); Collections.sort( list ); return list; diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/Bones.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/Bones.java index cca63079a..3d9d8b663 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/Bones.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/Bones.java @@ -96,7 +96,7 @@ public class Bones { Iterator iterator = hero.belongings.backpack.iterator(); Item curItem; - ArrayList items = new ArrayList(); + ArrayList items = new ArrayList<>(); while (iterator.hasNext()){ curItem = iterator.next(); if (curItem.bones) diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/Dungeon.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/Dungeon.java index fd2adbeeb..dd26f5630 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/Dungeon.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/Dungeon.java @@ -198,7 +198,7 @@ public class Dungeon { for (LimitedDrops a : LimitedDrops.values()) a.count = 0; - chapters = new HashSet(); + chapters = new HashSet<>(); Ghost.Quest.reset(); Wandmaker.Quest.reset(); @@ -413,7 +413,7 @@ public class Dungeon { int depth = Dungeon.depth + 1; ArrayList dropped = Dungeon.droppedItems.get( depth ); if (dropped == null) { - Dungeon.droppedItems.put( depth, dropped = new ArrayList() ); + Dungeon.droppedItems.put( depth, dropped = new ArrayList<>() ); } dropped.add( item ); } @@ -589,7 +589,7 @@ public class Dungeon { LimitedDrops.restore( bundle.getBundle(LIMDROPS) ); - chapters = new HashSet(); + chapters = new HashSet<>(); int ids[] = bundle.getIntArray( CHAPTERS ); if (ids != null) { for (int id : ids) { diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/QuickSlot.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/QuickSlot.java index c95ba91bc..bfb37a8ab 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/QuickSlot.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/QuickSlot.java @@ -105,7 +105,7 @@ public class QuickSlot { public Item randomNonePlaceholder(){ - ArrayList result = new ArrayList(); + ArrayList result = new ArrayList<>(); for (int i = 0; i < SIZE; i ++) if (getItem(i) != null && !isPlaceholder(i)) result.add(getItem(i)); @@ -123,7 +123,7 @@ public class QuickSlot { */ public void storePlaceholders(Bundle bundle){ - ArrayList placeholders = new ArrayList(SIZE); + ArrayList placeholders = new ArrayList<>(SIZE); boolean[] placements = new boolean[SIZE]; for (int i = 0; i < SIZE; i++) diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/PinCushion.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/PinCushion.java index 96b55876e..870854c48 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/PinCushion.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/PinCushion.java @@ -31,7 +31,7 @@ import java.util.Collection; public class PinCushion extends Buff { - private ArrayList items = new ArrayList(); + private ArrayList items = new ArrayList<>(); public void stick(MissileWeapon projectile){ for (Item item : items){ @@ -60,7 +60,7 @@ public class PinCushion extends Buff { @Override public void restoreFromBundle(Bundle bundle) { - items = new ArrayList((Collection)((Collection)bundle.getCollection( ITEMS ))); + items = new ArrayList<>((Collection) ((Collection) bundle.getCollection(ITEMS))); super.restoreFromBundle( bundle ); } } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Hero.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Hero.java index c4501bcd2..9e9ed951e 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Hero.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Hero.java @@ -191,7 +191,7 @@ public class Hero extends Char { belongings = new Belongings( this ); - visibleEnemies = new ArrayList(); + visibleEnemies = new ArrayList<>(); } public void updateHT( boolean boostHP ){ @@ -1459,7 +1459,7 @@ public class Hero extends Char { int pos = Dungeon.hero.pos; - ArrayList passable = new ArrayList(); + ArrayList passable = new ArrayList<>(); for (Integer ofs : PathFinder.NEIGHBOURS8) { int cell = pos + ofs; if ((Dungeon.level.passable[cell] || Dungeon.level.avoid[cell]) && Dungeon.level.heaps.get( cell ) == null) { @@ -1468,7 +1468,7 @@ public class Hero extends Char { } Collections.shuffle( passable ); - ArrayList items = new ArrayList( Dungeon.hero.belongings.backpack.items ); + ArrayList items = new ArrayList<>(Dungeon.hero.belongings.backpack.items); for (Integer cell : passable) { if (items.isEmpty()) { break; diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/effects/FloatingText.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/effects/FloatingText.java index 83d04f2ad..f1d1e7587 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/effects/FloatingText.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/effects/FloatingText.java @@ -42,7 +42,7 @@ public class FloatingText extends RenderedText { private float cameraZoom = -1; - private static final SparseArray> stacks = new SparseArray>(); + private static final SparseArray> stacks = new SparseArray<>(); public FloatingText() { speed.y = - DISTANCE / LIFESPAN; @@ -123,7 +123,7 @@ public class FloatingText extends RenderedText { ArrayList stack = stacks.get(key); if (stack == null) { - stack = new ArrayList(); + stack = new ArrayList<>(); stacks.put(key, stack); } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/effects/SpellSprite.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/effects/SpellSprite.java index ac5d119ab..ddd022206 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/effects/SpellSprite.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/effects/SpellSprite.java @@ -56,7 +56,7 @@ public class SpellSprite extends Image { private float duration; private float passed; - private static HashMap all = new HashMap(); + private static HashMap all = new HashMap<>(); public SpellSprite() { super( Assets.SPELL_ICONS ); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Gold.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Gold.java index 76b7a638d..5eae509c5 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Gold.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Gold.java @@ -55,7 +55,7 @@ public class Gold extends Item { @Override public ArrayList actions( Hero hero ) { - return new ArrayList(); + return new ArrayList<>(); } @Override diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Heap.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Heap.java index 21bde8604..70ecd402c 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Heap.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Heap.java @@ -82,7 +82,7 @@ public class Heap implements Bundlable { public boolean seen = false; public boolean haunted = false; - public LinkedList items = new LinkedList(); + public LinkedList items = new LinkedList<>(); public void open( Hero hero ) { switch (type) { @@ -429,7 +429,7 @@ public class Heap implements Bundlable { seen = bundle.getBoolean( SEEN ); type = Type.valueOf( bundle.getString( TYPE ) ); - items = new LinkedList( (Collection) ((Collection) bundle.getCollection( ITEMS )) ); + items = new LinkedList<>((Collection) ((Collection) bundle.getCollection(ITEMS))); items.removeAll(Collections.singleton(null)); //remove any document pages that either don't exist anymore or that the player already has diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Honeypot.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Honeypot.java index 08d45b214..d8cfb9e64 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Honeypot.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Honeypot.java @@ -100,7 +100,7 @@ public class Honeypot extends Item { int newPos = pos; if (Actor.findChar( pos ) != null) { - ArrayList candidates = new ArrayList(); + ArrayList candidates = new ArrayList<>(); boolean[] passable = Dungeon.level.passable; for (int n : PathFinder.NEIGHBOURS4) { diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Item.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Item.java index d219110b9..91d9213c3 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Item.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Item.java @@ -92,7 +92,7 @@ public class Item implements Bundlable { }; public ArrayList actions( Hero hero ) { - ArrayList actions = new ArrayList(); + ArrayList actions = new ArrayList<>(); actions.add( AC_DROP ); actions.add( AC_THROW ); return actions; diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/ItemStatusHandler.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/ItemStatusHandler.java index 083e3e3d0..a2f7a44ab 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/ItemStatusHandler.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/ItemStatusHandler.java @@ -43,9 +43,9 @@ public class ItemStatusHandler { this.itemLabels = new HashMap<>(); this.labelImages = new HashMap<>(labelImages); - known = new HashSet>(); + known = new HashSet<>(); - ArrayList labelsLeft = new ArrayList( labelImages.keySet() ); + ArrayList labelsLeft = new ArrayList<>(labelImages.keySet()); for (int i=0; i < items.length; i++) { @@ -67,7 +67,7 @@ public class ItemStatusHandler { this.labelImages = new HashMap<>(labelImages); known = new HashSet<>(); - ArrayList allLabels = new ArrayList( labelImages.keySet() ); + ArrayList allLabels = new ArrayList<>(labelImages.keySet()); restore(bundle, allLabels); } @@ -203,7 +203,7 @@ public class ItemStatusHandler { } public HashSet> unknown() { - HashSet> result = new HashSet>(); + HashSet> result = new HashSet<>(); for (Class i : items) { if (!known.contains( i )) { result.add( i ); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/DriedRose.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/DriedRose.java index 74bcb2fa8..923b581f5 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/DriedRose.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/DriedRose.java @@ -131,7 +131,7 @@ public class DriedRose extends Artifact { else if (charge != chargeCap) GLog.i( Messages.get(this, "no_charge") ); else if (cursed) GLog.i( Messages.get(this, "cursed") ); else { - ArrayList spawnPoints = new ArrayList(); + ArrayList spawnPoints = new ArrayList<>(); for (int i = 0; i < PathFinder.NEIGHBOURS8.length; i++) { int p = hero.pos + PathFinder.NEIGHBOURS8[i]; if (Actor.findChar(p) == null && (Dungeon.level.passable[p] || Dungeon.level.avoid[p])) { @@ -371,7 +371,7 @@ public class DriedRose extends Artifact { } } else if (cursed && Random.Int(100) == 0) { - ArrayList spawnPoints = new ArrayList(); + ArrayList spawnPoints = new ArrayList<>(); for (int i = 0; i < PathFinder.NEIGHBOURS8.length; i++) { int p = target.pos + PathFinder.NEIGHBOURS8[i]; diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/bags/Bag.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/bags/Bag.java index 4a3201580..bef696166 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/bags/Bag.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/bags/Bag.java @@ -48,7 +48,7 @@ public class Bag extends Item implements Iterable { public Char owner; - public ArrayList items = new ArrayList(); + public ArrayList items = new ArrayList<>(); public int size = 1; diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfMirrorImage.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfMirrorImage.java index 9ee919094..3bf069a93 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfMirrorImage.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfMirrorImage.java @@ -75,7 +75,7 @@ public class ScrollOfMirrorImage extends Scroll { //returns the number of images spawned public static int spawnImages( Hero hero, int nImages ){ - ArrayList respawnPoints = new ArrayList(); + ArrayList respawnPoints = new ArrayList<>(); for (int i = 0; i < PathFinder.NEIGHBOURS8.length; i++) { int p = hero.pos + PathFinder.NEIGHBOURS8[i]; diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfRegrowth.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfRegrowth.java index cf2b3f5c3..c4550dcb8 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfRegrowth.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfRegrowth.java @@ -292,7 +292,7 @@ public class WandOfRegrowth extends Wand { int nDrops = Random.NormalIntRange(3, 6); - ArrayList candidates = new ArrayList(); + ArrayList candidates = new ArrayList<>(); for (int i : PathFinder.NEIGHBOURS8){ if (Dungeon.level.passable[pos+i] && pos+i != Dungeon.level.entrance @@ -328,7 +328,7 @@ public class WandOfRegrowth extends Wand { int nSeeds = Random.NormalIntRange(2, 4); - ArrayList candidates = new ArrayList(); + ArrayList candidates = new ArrayList<>(); for (int i : PathFinder.NEIGHBOURS8){ if (Dungeon.level.passable[pos+i] && pos+i != Dungeon.level.entrance diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/Room.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/Room.java index 8c2cb1bd0..506d85669 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/Room.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/rooms/Room.java @@ -35,8 +35,8 @@ import java.util.LinkedHashMap; public abstract class Room extends Rect implements Graph.Node, Bundlable { - public ArrayList neigbours = new ArrayList(); - public LinkedHashMap connected = new LinkedHashMap(); + public ArrayList neigbours = new ArrayList<>(); + public LinkedHashMap connected = new LinkedHashMap<>(); public int distance; public int price = 1; diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/plants/Swiftthistle.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/plants/Swiftthistle.java index cddd598fe..75f6e409b 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/plants/Swiftthistle.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/plants/Swiftthistle.java @@ -72,7 +72,7 @@ public class Swiftthistle extends Plant { } private float left; - ArrayList presses = new ArrayList(); + ArrayList presses = new ArrayList<>(); @Override public int icon() { diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/AttackIndicator.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/AttackIndicator.java index c9e7dc21c..980dafb70 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/AttackIndicator.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/AttackIndicator.java @@ -44,7 +44,7 @@ public class AttackIndicator extends Tag { private CharSprite sprite = null; private static Mob lastTarget; - private ArrayList candidates = new ArrayList(); + private ArrayList candidates = new ArrayList<>(); public AttackIndicator() { super( DangerIndicator.COLOR ); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/BadgesList.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/BadgesList.java index b38b5ad30..3b869890e 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/BadgesList.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/BadgesList.java @@ -36,7 +36,7 @@ import java.util.ArrayList; public class BadgesList extends ScrollPane { - private ArrayList items = new ArrayList(); + private ArrayList items = new ArrayList<>(); public BadgesList( boolean global ) { super( new Component() ); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/GameLog.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/GameLog.java index 437b8812f..16abea1e3 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/GameLog.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/GameLog.java @@ -39,7 +39,7 @@ public class GameLog extends Component implements Signal.Listener { private RenderedTextMultiline lastEntry; private int lastColor; - private static ArrayList entries = new ArrayList(); + private static ArrayList entries = new ArrayList<>(); public GameLog() { super(); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/QuickRecipe.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/QuickRecipe.java index 2be7feb33..7a74bdca4 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/QuickRecipe.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/QuickRecipe.java @@ -294,7 +294,7 @@ public class QuickRecipe extends Component { i = 0; } Item item = (Item) Reflection.newInstance(cls); - ArrayList in = new ArrayList(Arrays.asList(new Bomb(), item)); + ArrayList in = new ArrayList<>(Arrays.asList(new Bomb(), item)); result.add(new QuickRecipe( r, in, r.sampleOutput(in))); i++; } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/utils/GLog.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/utils/GLog.java index 29df3dad5..94be92b69 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/utils/GLog.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/utils/GLog.java @@ -34,7 +34,7 @@ public class GLog { public static final String WARNING = "** "; public static final String HIGHLIGHT = "@@ "; - public static Signal update = new Signal(); + public static Signal update = new Signal<>(); public static void i( String text, Object... args ) { diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndStory.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndStory.java index f57de430a..718ff7565 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndStory.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndStory.java @@ -49,7 +49,7 @@ public class WndStory extends Window { public static final int ID_CITY = 3; public static final int ID_HALLS = 4; - private static final SparseArray CHAPTERS = new SparseArray(); + private static final SparseArray CHAPTERS = new SparseArray<>(); static { CHAPTERS.put( ID_SEWERS, "sewers" ); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndTabbed.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndTabbed.java index b1c7375fc..01d6efa16 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndTabbed.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndTabbed.java @@ -37,7 +37,7 @@ import java.util.ArrayList; public class WndTabbed extends Window { - protected ArrayList tabs = new ArrayList(); + protected ArrayList tabs = new ArrayList<>(); protected Tab selected; public WndTabbed() { @@ -100,7 +100,7 @@ public class WndTabbed extends Window { remove( tab ); } - ArrayList tabs = new ArrayList( this.tabs ); + ArrayList tabs = new ArrayList<>(this.tabs); this.tabs.clear(); for (Tab tab : tabs) {