From 31e86605f68f3069fafa8d99fc24f7fbbb5e3a54 Mon Sep 17 00:00:00 2001 From: Jérémy Zurcher Date: Fri, 18 Dec 2015 10:38:24 +0100 Subject: cleanup tree using fix_java --- core/src/ch/asynk/rustanddust/game/Engagement.java | 1 - core/src/ch/asynk/rustanddust/game/Hex.java | 5 ----- core/src/ch/asynk/rustanddust/game/Hud.java | 2 -- core/src/ch/asynk/rustanddust/game/Player.java | 2 -- core/src/ch/asynk/rustanddust/game/Unit.java | 1 - core/src/ch/asynk/rustanddust/game/battles/BattleTest.java | 1 - core/src/ch/asynk/rustanddust/game/hud/ActionButtons.java | 2 -- core/src/ch/asynk/rustanddust/game/hud/EngagementPanel.java | 2 -- core/src/ch/asynk/rustanddust/game/hud/PlayerInfo.java | 5 ----- core/src/ch/asynk/rustanddust/game/map/Map3Animations.java | 2 -- core/src/ch/asynk/rustanddust/game/states/StateBreak.java | 1 - core/src/ch/asynk/rustanddust/game/states/StateDeployment.java | 2 -- core/src/ch/asynk/rustanddust/game/states/StateEngage.java | 1 - core/src/ch/asynk/rustanddust/game/states/StatePromote.java | 2 -- core/src/ch/asynk/rustanddust/game/states/StateReinforcement.java | 1 - core/src/ch/asynk/rustanddust/game/states/StateRotate.java | 1 - core/src/ch/asynk/rustanddust/game/states/StateSelect.java | 2 -- 17 files changed, 33 deletions(-) (limited to 'core/src/ch/asynk/rustanddust/game') diff --git a/core/src/ch/asynk/rustanddust/game/Engagement.java b/core/src/ch/asynk/rustanddust/game/Engagement.java index b7630ed5..f1edfba8 100644 --- a/core/src/ch/asynk/rustanddust/game/Engagement.java +++ b/core/src/ch/asynk/rustanddust/game/Engagement.java @@ -97,7 +97,6 @@ public class Engagement implements Disposable, Pool.Poolable this.defenseSum = (unitDefense + terrainDefense + weatherDefense); } - @Override public String toString() { diff --git a/core/src/ch/asynk/rustanddust/game/Hex.java b/core/src/ch/asynk/rustanddust/game/Hex.java index 76d224f6..27b52cdb 100644 --- a/core/src/ch/asynk/rustanddust/game/Hex.java +++ b/core/src/ch/asynk/rustanddust/game/Hex.java @@ -1,15 +1,10 @@ package ch.asynk.rustanddust.game; -import java.util.List; -import java.util.Iterator; - import com.badlogic.gdx.graphics.g2d.TextureAtlas; -import ch.asynk.rustanddust.engine.Board; import ch.asynk.rustanddust.engine.Pawn; import ch.asynk.rustanddust.engine.Tile; import ch.asynk.rustanddust.engine.Orientation; -import ch.asynk.rustanddust.game.Unit.UnitType; public class Hex extends Tile { diff --git a/core/src/ch/asynk/rustanddust/game/Hud.java b/core/src/ch/asynk/rustanddust/game/Hud.java index 3ced3ddd..d9aec5ce 100644 --- a/core/src/ch/asynk/rustanddust/game/Hud.java +++ b/core/src/ch/asynk/rustanddust/game/Hud.java @@ -8,11 +8,9 @@ import com.badlogic.gdx.utils.Disposable; import com.badlogic.gdx.graphics.g2d.Batch; import com.badlogic.gdx.graphics.g2d.TextureAtlas; -import com.badlogic.gdx.graphics.g2d.BitmapFont; import com.badlogic.gdx.graphics.glutils.ShapeRenderer; import ch.asynk.rustanddust.engine.gfx.Animation; -import ch.asynk.rustanddust.game.State.StateType; import ch.asynk.rustanddust.ui.Position; import ch.asynk.rustanddust.ui.Bg; import ch.asynk.rustanddust.ui.Msg; diff --git a/core/src/ch/asynk/rustanddust/game/Player.java b/core/src/ch/asynk/rustanddust/game/Player.java index 6495e8ec..de8be769 100644 --- a/core/src/ch/asynk/rustanddust/game/Player.java +++ b/core/src/ch/asynk/rustanddust/game/Player.java @@ -1,7 +1,5 @@ package ch.asynk.rustanddust.game; -import java.util.List; - import ch.asynk.rustanddust.RustAndDust; public class Player diff --git a/core/src/ch/asynk/rustanddust/game/Unit.java b/core/src/ch/asynk/rustanddust/game/Unit.java index bbb60ef4..a3277b85 100644 --- a/core/src/ch/asynk/rustanddust/game/Unit.java +++ b/core/src/ch/asynk/rustanddust/game/Unit.java @@ -6,7 +6,6 @@ import com.badlogic.gdx.graphics.g2d.TextureAtlas.AtlasRegion; import ch.asynk.rustanddust.engine.Pawn; import ch.asynk.rustanddust.engine.Tile; import ch.asynk.rustanddust.engine.HeadedPawn; -import ch.asynk.rustanddust.engine.Orientation; import ch.asynk.rustanddust.game.Hex.Terrain; import ch.asynk.rustanddust.RustAndDust; diff --git a/core/src/ch/asynk/rustanddust/game/battles/BattleTest.java b/core/src/ch/asynk/rustanddust/game/battles/BattleTest.java index a9634f6b..bb78a558 100644 --- a/core/src/ch/asynk/rustanddust/game/battles/BattleTest.java +++ b/core/src/ch/asynk/rustanddust/game/battles/BattleTest.java @@ -4,7 +4,6 @@ import ch.asynk.rustanddust.game.Army; import ch.asynk.rustanddust.game.Player; import ch.asynk.rustanddust.game.Map; import ch.asynk.rustanddust.game.Zone; -import ch.asynk.rustanddust.game.Unit; import ch.asynk.rustanddust.game.Unit.UnitId; import ch.asynk.rustanddust.ui.Position; import ch.asynk.rustanddust.engine.Orientation; diff --git a/core/src/ch/asynk/rustanddust/game/hud/ActionButtons.java b/core/src/ch/asynk/rustanddust/game/hud/ActionButtons.java index 19483567..ef152227 100644 --- a/core/src/ch/asynk/rustanddust/game/hud/ActionButtons.java +++ b/core/src/ch/asynk/rustanddust/game/hud/ActionButtons.java @@ -2,7 +2,6 @@ package ch.asynk.rustanddust.game.hud; import com.badlogic.gdx.graphics.g2d.Sprite; import com.badlogic.gdx.graphics.g2d.Batch; -import com.badlogic.gdx.graphics.g2d.TextureAtlas; import com.badlogic.gdx.graphics.glutils.ShapeRenderer; import ch.asynk.rustanddust.RustAndDust; @@ -48,7 +47,6 @@ public class ActionButtons extends Widget this.position = Position.BOTTOM_RIGHT; this.idx = Buttons.NONE.i; - this.buttons = new Bg[Buttons.LAST.i]; this.buttons[Buttons.DONE.i] = new Bg(game.factory.getHudRegion(game.factory.ACT_DONE)); this.buttons[Buttons.ABORT.i] = new Bg(game.factory.getHudRegion(game.factory.ACT_ABORT)); diff --git a/core/src/ch/asynk/rustanddust/game/hud/EngagementPanel.java b/core/src/ch/asynk/rustanddust/game/hud/EngagementPanel.java index fa6e2060..15726aa4 100644 --- a/core/src/ch/asynk/rustanddust/game/hud/EngagementPanel.java +++ b/core/src/ch/asynk/rustanddust/game/hud/EngagementPanel.java @@ -2,8 +2,6 @@ package ch.asynk.rustanddust.game.hud; import com.badlogic.gdx.Gdx; import com.badlogic.gdx.graphics.g2d.Batch; -import com.badlogic.gdx.graphics.g2d.BitmapFont; -import com.badlogic.gdx.graphics.g2d.TextureAtlas; import com.badlogic.gdx.graphics.glutils.ShapeRenderer; import ch.asynk.rustanddust.RustAndDust; diff --git a/core/src/ch/asynk/rustanddust/game/hud/PlayerInfo.java b/core/src/ch/asynk/rustanddust/game/hud/PlayerInfo.java index 7ba43259..a7dea32c 100644 --- a/core/src/ch/asynk/rustanddust/game/hud/PlayerInfo.java +++ b/core/src/ch/asynk/rustanddust/game/hud/PlayerInfo.java @@ -3,19 +3,14 @@ package ch.asynk.rustanddust.game.hud; import com.badlogic.gdx.utils.Disposable; import com.badlogic.gdx.graphics.g2d.Batch; -import com.badlogic.gdx.graphics.g2d.TextureAtlas; -import com.badlogic.gdx.graphics.g2d.BitmapFont; import com.badlogic.gdx.graphics.glutils.ShapeRenderer; import ch.asynk.rustanddust.engine.gfx.Animation; import ch.asynk.rustanddust.engine.gfx.Drawable; import ch.asynk.rustanddust.RustAndDust; -import ch.asynk.rustanddust.game.State.StateType; import ch.asynk.rustanddust.game.Ctrl; -import ch.asynk.rustanddust.game.Hud; import ch.asynk.rustanddust.game.Army; -import ch.asynk.rustanddust.game.Unit; import ch.asynk.rustanddust.game.Player; import ch.asynk.rustanddust.ui.Bg; import ch.asynk.rustanddust.ui.LabelImage; diff --git a/core/src/ch/asynk/rustanddust/game/map/Map3Animations.java b/core/src/ch/asynk/rustanddust/game/map/Map3Animations.java index b0080ce3..ee114f7f 100644 --- a/core/src/ch/asynk/rustanddust/game/map/Map3Animations.java +++ b/core/src/ch/asynk/rustanddust/game/map/Map3Animations.java @@ -2,7 +2,6 @@ package ch.asynk.rustanddust.game.map; import com.badlogic.gdx.audio.Sound; import com.badlogic.gdx.graphics.Texture; -import com.badlogic.gdx.graphics.g2d.TextureAtlas; import ch.asynk.rustanddust.RustAndDust; import ch.asynk.rustanddust.engine.SelectedTile; @@ -19,7 +18,6 @@ import ch.asynk.rustanddust.engine.gfx.animations.RunnableAnimation; import ch.asynk.rustanddust.engine.gfx.animations.MoveToAnimation.MoveToAnimationCb; import ch.asynk.rustanddust.game.Hex; import ch.asynk.rustanddust.game.Unit; -import ch.asynk.rustanddust.game.Ctrl; import ch.asynk.rustanddust.game.Army; import ch.asynk.rustanddust.game.Player; diff --git a/core/src/ch/asynk/rustanddust/game/states/StateBreak.java b/core/src/ch/asynk/rustanddust/game/states/StateBreak.java index 62dd9f5b..56e8ba6c 100644 --- a/core/src/ch/asynk/rustanddust/game/states/StateBreak.java +++ b/core/src/ch/asynk/rustanddust/game/states/StateBreak.java @@ -1,6 +1,5 @@ package ch.asynk.rustanddust.game.states; -import ch.asynk.rustanddust.ui.Position; import ch.asynk.rustanddust.engine.Orientation; import ch.asynk.rustanddust.game.Unit; import ch.asynk.rustanddust.game.hud.ActionButtons.Buttons; diff --git a/core/src/ch/asynk/rustanddust/game/states/StateDeployment.java b/core/src/ch/asynk/rustanddust/game/states/StateDeployment.java index a014b03f..a8c30305 100644 --- a/core/src/ch/asynk/rustanddust/game/states/StateDeployment.java +++ b/core/src/ch/asynk/rustanddust/game/states/StateDeployment.java @@ -7,8 +7,6 @@ import ch.asynk.rustanddust.game.Unit; import ch.asynk.rustanddust.game.UnitList; import ch.asynk.rustanddust.game.hud.ActionButtons.Buttons; -import ch.asynk.rustanddust.RustAndDust; - public class StateDeployment extends StateCommon { private boolean completed; diff --git a/core/src/ch/asynk/rustanddust/game/states/StateEngage.java b/core/src/ch/asynk/rustanddust/game/states/StateEngage.java index 2345aa06..582e5dd0 100644 --- a/core/src/ch/asynk/rustanddust/game/states/StateEngage.java +++ b/core/src/ch/asynk/rustanddust/game/states/StateEngage.java @@ -1,7 +1,6 @@ package ch.asynk.rustanddust.game.states; import ch.asynk.rustanddust.game.Unit; -import ch.asynk.rustanddust.game.hud.ActionButtons.Buttons; import ch.asynk.rustanddust.RustAndDust; diff --git a/core/src/ch/asynk/rustanddust/game/states/StatePromote.java b/core/src/ch/asynk/rustanddust/game/states/StatePromote.java index 701b8563..e80ebecb 100644 --- a/core/src/ch/asynk/rustanddust/game/states/StatePromote.java +++ b/core/src/ch/asynk/rustanddust/game/states/StatePromote.java @@ -1,7 +1,5 @@ package ch.asynk.rustanddust.game.states; -import ch.asynk.rustanddust.game.Unit; - public class StatePromote extends StateCommon { @Override diff --git a/core/src/ch/asynk/rustanddust/game/states/StateReinforcement.java b/core/src/ch/asynk/rustanddust/game/states/StateReinforcement.java index 419373ed..846adce7 100644 --- a/core/src/ch/asynk/rustanddust/game/states/StateReinforcement.java +++ b/core/src/ch/asynk/rustanddust/game/states/StateReinforcement.java @@ -3,7 +3,6 @@ package ch.asynk.rustanddust.game.states; import ch.asynk.rustanddust.game.Hex; import ch.asynk.rustanddust.game.Zone; import ch.asynk.rustanddust.game.Unit; -import ch.asynk.rustanddust.game.hud.ActionButtons.Buttons; public class StateReinforcement extends StateCommon { diff --git a/core/src/ch/asynk/rustanddust/game/states/StateRotate.java b/core/src/ch/asynk/rustanddust/game/states/StateRotate.java index 83855709..b3159f57 100644 --- a/core/src/ch/asynk/rustanddust/game/states/StateRotate.java +++ b/core/src/ch/asynk/rustanddust/game/states/StateRotate.java @@ -1,7 +1,6 @@ package ch.asynk.rustanddust.game.states; import ch.asynk.rustanddust.engine.Orientation; -import ch.asynk.rustanddust.game.hud.ActionButtons.Buttons; import ch.asynk.rustanddust.RustAndDust; diff --git a/core/src/ch/asynk/rustanddust/game/states/StateSelect.java b/core/src/ch/asynk/rustanddust/game/states/StateSelect.java index 0bb99002..e2cfef84 100644 --- a/core/src/ch/asynk/rustanddust/game/states/StateSelect.java +++ b/core/src/ch/asynk/rustanddust/game/states/StateSelect.java @@ -1,10 +1,8 @@ package ch.asynk.rustanddust.game.states; import ch.asynk.rustanddust.ui.Position; -import ch.asynk.rustanddust.game.Map; import ch.asynk.rustanddust.game.Hex; import ch.asynk.rustanddust.game.Unit; -import ch.asynk.rustanddust.game.Ctrl; import ch.asynk.rustanddust.game.hud.ActionButtons.Buttons; import ch.asynk.rustanddust.RustAndDust; -- cgit v1.2.3