Organize imports

KaoStazos · Aug 29, 2017 · febbf88 · febbf88
1 parent 7e5a90b
commit febbf88
Show file tree

Hide file tree

Showing 184 changed files with 572 additions and 1,017 deletions.
diff --git a/client/src/main/java/au/com/codeka/warworlds/client/App.java b/client/src/main/java/au/com/codeka/warworlds/client/App.java
@@ -2,17 +2,15 @@
 
 import android.app.Application;
 import android.os.Handler;
-
-import com.google.common.base.Preconditions;
-
 import au.com.codeka.warworlds.client.concurrency.TaskRunner;
 import au.com.codeka.warworlds.client.concurrency.Threads;
 import au.com.codeka.warworlds.client.game.world.ChatManager;
+import au.com.codeka.warworlds.client.game.world.StarManager;
 import au.com.codeka.warworlds.client.net.Server;
 import au.com.codeka.warworlds.client.store.DataStore;
 import au.com.codeka.warworlds.client.util.eventbus.EventBus;
-import au.com.codeka.warworlds.client.game.world.StarManager;
 import au.com.codeka.warworlds.common.Log;
+import com.google.common.base.Preconditions;
 
 /**
  * Global {@link Application} object.

diff --git a/client/src/main/java/au/com/codeka/warworlds/client/DeviceIdService.java b/client/src/main/java/au/com/codeka/warworlds/client/DeviceIdService.java
@@ -1,10 +1,9 @@
 package au.com.codeka.warworlds.client;
 
+import au.com.codeka.warworlds.common.Log;
 import com.google.firebase.iid.FirebaseInstanceId;
 import com.google.firebase.iid.FirebaseInstanceIdService;
 
-import au.com.codeka.warworlds.common.Log;
-
 /**
  * Our implementation of {@link FirebaseInstanceIdService}.
  */

diff --git a/client/src/main/java/au/com/codeka/warworlds/client/MainActivity.java b/client/src/main/java/au/com/codeka/warworlds/client/MainActivity.java
@@ -1,26 +1,22 @@
 package au.com.codeka.warworlds.client;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 import android.content.Context;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
-import android.support.v7.widget.Toolbar;
-
-import com.google.common.base.Preconditions;
-
 import au.com.codeka.warworlds.client.activity.BaseFragmentActivity;
 import au.com.codeka.warworlds.client.ctrl.DebugView;
-import au.com.codeka.warworlds.client.opengl.RenderSurfaceView;
 import au.com.codeka.warworlds.client.game.starfield.StarfieldManager;
-import au.com.codeka.warworlds.client.util.GameSettings;
 import au.com.codeka.warworlds.client.game.welcome.CreateEmpireFragment;
 import au.com.codeka.warworlds.client.game.welcome.WarmWelcomeFragment;
 import au.com.codeka.warworlds.client.game.welcome.WelcomeFragment;
+import au.com.codeka.warworlds.client.opengl.RenderSurfaceView;
+import au.com.codeka.warworlds.client.util.GameSettings;
 import au.com.codeka.warworlds.common.Log;
 import flow.Flow;
 
-import static com.google.common.base.Preconditions.checkNotNull;
-
 public class MainActivity extends BaseFragmentActivity {
  private static final Log log = new Log("MainActivity");
 

diff --git a/client/src/main/java/au/com/codeka/warworlds/client/MessagingService.java b/client/src/main/java/au/com/codeka/warworlds/client/MessagingService.java
@@ -1,10 +1,9 @@
 package au.com.codeka.warworlds.client;
 
+import au.com.codeka.warworlds.common.Log;
 import com.google.firebase.messaging.FirebaseMessagingService;
 import com.google.firebase.messaging.RemoteMessage;
 
-import au.com.codeka.warworlds.common.Log;
-
 /**
  * Implementation of {@link FirebaseMessagingService}.
  */

diff --git a/client/src/main/java/au/com/codeka/warworlds/client/activity/BaseFragment.java b/client/src/main/java/au/com/codeka/warworlds/client/activity/BaseFragment.java
@@ -7,10 +7,6 @@
 import android.view.View;
 import android.view.ViewGroup;
 
-import com.google.common.base.Preconditions;
-
-import au.com.codeka.warworlds.client.R;
-
 /**
  * Base class for fragments, managed by {@link FragmentTransitionManager} and hosted inside of
  * {@link BaseFragmentActivity}.

diff --git a/client/src/main/java/au/com/codeka/warworlds/client/activity/FragmentTransitionManager.java b/client/src/main/java/au/com/codeka/warworlds/client/activity/FragmentTransitionManager.java
@@ -6,10 +6,8 @@
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentTransaction;
 import android.view.View;
-
-import com.google.common.base.Preconditions;
-
 import au.com.codeka.warworlds.common.Log;
+import com.google.common.base.Preconditions;
 
 /**
  * Manages transitions between fragments in a {@link BaseFragmentActivity}.

diff --git a/client/src/main/java/au/com/codeka/warworlds/client/activity/SharedViewHolder.java b/client/src/main/java/au/com/codeka/warworlds/client/activity/SharedViewHolder.java
@@ -1,11 +1,8 @@
 package au.com.codeka.warworlds.client.activity;
 
 import android.view.View;
-
 import com.google.common.base.Preconditions;
-
 import java.util.ArrayList;
-
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 

diff --git a/client/src/main/java/au/com/codeka/warworlds/client/activity/TabManager.java b/client/src/main/java/au/com/codeka/warworlds/client/activity/TabManager.java
@@ -1,16 +1,14 @@
 package au.com.codeka.warworlds.client.activity;
 
-import java.util.TreeMap;
-
 import android.content.Context;
 import android.support.v4.app.Fragment;
 import android.text.Html;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.TabHost;
 import android.widget.TextView;
-
 import au.com.codeka.warworlds.client.R;
+import java.util.TreeMap;
 
 /**
  * An instance of this class can be used to manage tabs (e.g. in {@link TabbedBaseFragment} but

diff --git a/client/src/main/java/au/com/codeka/warworlds/client/activity/TabbedBaseFragment.java b/client/src/main/java/au/com/codeka/warworlds/client/activity/TabbedBaseFragment.java
@@ -7,7 +7,6 @@
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TabHost;
-
 import au.com.codeka.warworlds.client.R;
 
 /**

diff --git a/client/src/main/java/au/com/codeka/warworlds/client/concurrency/ThreadPool.java b/client/src/main/java/au/com/codeka/warworlds/client/concurrency/ThreadPool.java
@@ -1,7 +1,6 @@
 package au.com.codeka.warworlds.client.concurrency;
 
 import android.support.annotation.NonNull;
-
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.Executor;
 import java.util.concurrent.LinkedBlockingQueue;

diff --git a/client/src/main/java/au/com/codeka/warworlds/client/concurrency/Threads.java b/client/src/main/java/au/com/codeka/warworlds/client/concurrency/Threads.java
@@ -1,13 +1,11 @@
 package au.com.codeka.warworlds.client.concurrency;
 
+import static com.google.common.base.Preconditions.checkState;
+
 import android.os.Handler;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 
-import com.google.common.base.Preconditions;
-
-import static com.google.common.base.Preconditions.checkState;
-
 /**
  * An enumeration of the thread types within War Worlds. Has some helper methods to ensure you run
  * on a particular thread.

diff --git a/client/src/main/java/au/com/codeka/warworlds/client/ctrl/ChatMiniView.java b/client/src/main/java/au/com/codeka/warworlds/client/ctrl/ChatMiniView.java
@@ -1,5 +1,7 @@
 package au.com.codeka.warworlds.client.ctrl;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 import android.content.Context;
 import android.graphics.Color;
 import android.text.Html;
@@ -10,11 +12,6 @@
 import android.widget.RelativeLayout;
 import android.widget.ScrollView;
 import android.widget.TextView;
-
-import java.util.Locale;
-
-import javax.annotation.Nullable;
-
 import au.com.codeka.warworlds.client.App;
 import au.com.codeka.warworlds.client.R;
 import au.com.codeka.warworlds.client.game.chat.ChatFragment;
@@ -24,8 +21,8 @@
 import au.com.codeka.warworlds.client.util.eventbus.EventHandler;
 import au.com.codeka.warworlds.common.proto.ChatMessage;
 import au.com.codeka.warworlds.common.proto.Empire;
-
-import static com.google.common.base.Preconditions.checkNotNull;
+import java.util.Locale;
+import javax.annotation.Nullable;
 
 /**
  * A view that contains the last couple of chat messages, and expands to the full

diff --git a/client/src/main/java/au/com/codeka/warworlds/client/ctrl/ColonyFocusView.java b/client/src/main/java/au/com/codeka/warworlds/client/ctrl/ColonyFocusView.java
@@ -5,15 +5,11 @@
 import android.widget.FrameLayout;
 import android.widget.ProgressBar;
 import android.widget.TextView;
-
-import com.squareup.wire.Wire;
-
-import java.util.Locale;
-
 import au.com.codeka.warworlds.client.R;
-import au.com.codeka.warworlds.common.proto.BuildRequest;
 import au.com.codeka.warworlds.common.proto.Colony;
 import au.com.codeka.warworlds.common.proto.Star;
+import com.squareup.wire.Wire;
+import java.util.Locale;
 
 public class ColonyFocusView extends FrameLayout {
  public ColonyFocusView(Context context, AttributeSet attrs) {

diff --git a/client/src/main/java/au/com/codeka/warworlds/client/ctrl/DebugView.java b/client/src/main/java/au/com/codeka/warworlds/client/ctrl/DebugView.java
@@ -16,19 +16,14 @@
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
-
-import com.google.common.base.Preconditions;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Locale;
-
 import au.com.codeka.warworlds.client.App;
 import au.com.codeka.warworlds.client.R;
 import au.com.codeka.warworlds.client.net.ServerPacketEvent;
 import au.com.codeka.warworlds.client.opengl.FrameCounter;
-import au.com.codeka.warworlds.client.util.NumberFormatter;
 import au.com.codeka.warworlds.client.util.eventbus.EventHandler;
+import com.google.common.base.Preconditions;
+import java.util.ArrayList;
+import java.util.Locale;
 
 /**
  * This is a view that's displayed over the top of the activity and shows up a little bit of

diff --git a/client/src/main/java/au/com/codeka/warworlds/client/ctrl/ExpandableStarListAdapter.java b/client/src/main/java/au/com/codeka/warworlds/client/ctrl/ExpandableStarListAdapter.java
@@ -4,14 +4,12 @@
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.BaseExpandableListAdapter;
-
-import javax.annotation.Nonnull;
-
 import au.com.codeka.warworlds.client.App;
 import au.com.codeka.warworlds.client.concurrency.Threads;
 import au.com.codeka.warworlds.client.game.world.StarCollection;
 import au.com.codeka.warworlds.client.util.eventbus.EventHandler;
 import au.com.codeka.warworlds.common.proto.Star;
+import javax.annotation.Nonnull;
 
 /**
  * Base adapter class for adapter which show an expandable list of stars which you can expand and

diff --git a/client/src/main/java/au/com/codeka/warworlds/client/ctrl/InfobarView.java b/client/src/main/java/au/com/codeka/warworlds/client/ctrl/InfobarView.java
@@ -7,7 +7,6 @@
 import android.widget.FrameLayout;
 import android.widget.ProgressBar;
 import android.widget.TextView;
-
 import au.com.codeka.warworlds.client.App;
 import au.com.codeka.warworlds.client.R;
 import au.com.codeka.warworlds.client.concurrency.Threads;

diff --git a/client/src/main/java/au/com/codeka/warworlds/client/ctrl/PlanetListSimple.java b/client/src/main/java/au/com/codeka/warworlds/client/ctrl/PlanetListSimple.java
@@ -1,19 +1,12 @@
 package au.com.codeka.warworlds.client.ctrl;
 
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-
 import android.content.Context;
 import android.util.AttributeSet;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
-
-import com.squareup.picasso.Picasso;
-
 import au.com.codeka.warworlds.client.R;
 import au.com.codeka.warworlds.client.game.world.EmpireManager;
 import au.com.codeka.warworlds.client.game.world.ImageHelper;
@@ -22,6 +15,10 @@
 import au.com.codeka.warworlds.common.proto.Fleet;
 import au.com.codeka.warworlds.common.proto.Planet;
 import au.com.codeka.warworlds.common.proto.Star;
+import com.squareup.picasso.Picasso;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
 
 /**
  * The planet list that shows up on the starfield view. It also includes details about empires

diff --git a/client/src/main/java/au/com/codeka/warworlds/client/ctrl/TransparentWebView.java b/client/src/main/java/au/com/codeka/warworlds/client/ctrl/TransparentWebView.java
@@ -1,18 +1,16 @@
 package au.com.codeka.warworlds.client.ctrl;
 
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.lang.reflect.Method;
-
 import android.content.Context;
 import android.content.res.AssetManager;
 import android.graphics.Color;
 import android.graphics.Paint;
 import android.util.AttributeSet;
 import android.view.View;
 import android.webkit.WebView;
-
 import com.google.common.io.CharStreams;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.lang.reflect.Method;
 
 /**
  * A {@link WebView} with a transparent background. It's a little tricky and the method for getting

diff --git a/client/src/main/java/au/com/codeka/warworlds/client/empire/EmpireFragment.java b/client/src/main/java/au/com/codeka/warworlds/client/empire/EmpireFragment.java
@@ -1,7 +1,6 @@
 package au.com.codeka.warworlds.client.empire;
 
 import android.os.Bundle;
-
 import au.com.codeka.warworlds.client.activity.BaseFragment;
 import au.com.codeka.warworlds.client.activity.TabbedBaseFragment;
 import au.com.codeka.warworlds.client.game.fleets.FleetsFragment;

diff --git a/client/src/main/java/au/com/codeka/warworlds/client/game/build/BuildBottomPane.java b/client/src/main/java/au/com/codeka/warworlds/client/game/build/BuildBottomPane.java
@@ -1,5 +1,7 @@
 package au.com.codeka.warworlds.client.game.build;
 
+import static com.google.common.base.Preconditions.checkState;
+
 import android.content.Context;
 import android.graphics.Color;
 import android.text.Html;
@@ -10,9 +12,6 @@
 import android.widget.RelativeLayout;
 import android.widget.SeekBar;
 import android.widget.TextView;
-
-import java.util.Locale;
-
 import au.com.codeka.warworlds.client.App;
 import au.com.codeka.warworlds.client.R;
 import au.com.codeka.warworlds.client.concurrency.Threads;
@@ -27,8 +26,7 @@
 import au.com.codeka.warworlds.common.proto.StarModification;
 import au.com.codeka.warworlds.common.sim.StarModifier;
 import au.com.codeka.warworlds.common.sim.SuspiciousModificationException;
-
-import static com.google.common.base.Preconditions.checkState;
+import java.util.Locale;
 
 /**
  * Bottom pane of the build fragment for when we're building something new.

diff --git a/client/src/main/java/au/com/codeka/warworlds/client/game/build/BuildFragment.java b/client/src/main/java/au/com/codeka/warworlds/client/game/build/BuildFragment.java
@@ -1,5 +1,7 @@
 package au.com.codeka.warworlds.client.game.build;
 
+import static com.google.common.base.Preconditions.checkNotNull;
+
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentStatePagerAdapter;
@@ -9,15 +11,6 @@
 import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
-
-import com.squareup.picasso.Picasso;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Locale;
-
-import javax.annotation.Nullable;
-
 import au.com.codeka.warworlds.client.App;
 import au.com.codeka.warworlds.client.R;
 import au.com.codeka.warworlds.client.activity.BaseFragment;
@@ -37,8 +30,11 @@
 import au.com.codeka.warworlds.common.proto.Planet;
 import au.com.codeka.warworlds.common.proto.Star;
 import au.com.codeka.warworlds.common.proto.StarModification;
-
-import static com.google.common.base.Preconditions.checkNotNull;
+import com.squareup.picasso.Picasso;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Locale;
+import javax.annotation.Nullable;
 
 /**
  * Shows buildings and ships on a planet. You can swipe left/right to switch between your colonies