fixup! Merge branch 'reorganize-forge-gui' into 'master'

forge-gui-android/src/forge/app/Main.java

@@ -44,7 +44,7 @@ import com.badlogic.gdx.backends.android.AndroidApplication;
 import forge.Forge;
 import forge.interfaces.IDeviceAdapter;
 import forge.model.FModel;
-import forge.properties.ForgePreferences;
+import forge.localinstance.properties.ForgePreferences;
 import forge.util.FileUtil;
 import forge.util.ThreadUtil;
 

forge-gui-ios/src/forge/ios/Main.java

@@ -1,23 +1,25 @@
 package forge.ios;
 
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+
+import org.robovm.apple.foundation.NSAutoreleasePool;
+import org.robovm.apple.uikit.UIApplication;
+import org.robovm.apple.uikit.UIPasteboard;
+
 import com.badlogic.gdx.ApplicationListener;
 import com.badlogic.gdx.Gdx;
 import com.badlogic.gdx.backends.iosrobovm.IOSApplication;
 import com.badlogic.gdx.backends.iosrobovm.IOSApplicationConfiguration;
 import com.badlogic.gdx.backends.iosrobovm.IOSFiles;
+
 import forge.Forge;
 import forge.assets.AssetsDownloader;
 import forge.interfaces.IDeviceAdapter;
+import forge.localinstance.properties.ForgePreferences;
 import forge.model.FModel;
-import forge.properties.ForgePreferences;
 import forge.util.FileUtil;
-import org.robovm.apple.foundation.NSAutoreleasePool;
-import org.robovm.apple.uikit.UIApplication;
-import org.robovm.apple.uikit.UIPasteboard;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
 
 public class Main extends IOSApplication.Delegate {
 

forge-gui-mobile/src/forge/screens/settings/FilesPage.java

@@ -5,24 +5,11 @@ import java.util.List;
 import java.util.Map;
 import java.util.TreeMap;
 
-import forge.Forge;
-import forge.download.GuiDownloadAchievementImages;
-import forge.download.GuiDownloadPicturesLQ;
-import forge.download.GuiDownloadPrices;
-import forge.download.GuiDownloadQuestImages;
-import forge.download.GuiDownloadSetPicturesLQ;
-import forge.download.GuiDownloadService;
-import forge.download.GuiDownloadSkins;
-import forge.download.GuiDownloadZipService;
-import forge.properties.ForgeConstants;
-import forge.util.FileUtil;
-import forge.localinstance.properties.ForgeProfileProperties;
-import forge.util.Localizer;
-
 import org.apache.commons.lang3.StringUtils;
 
 import com.badlogic.gdx.utils.Align;
 
+import forge.Forge;
 import forge.Graphics;
 import forge.assets.FSkinColor;
 import forge.assets.FSkinFont;
@@ -34,6 +21,9 @@ import forge.gui.download.GuiDownloadQuestImages;
 import forge.gui.download.GuiDownloadService;
 import forge.gui.download.GuiDownloadSetPicturesLQ;
 import forge.gui.download.GuiDownloadSkins;
+import forge.gui.download.GuiDownloadZipService;
+import forge.localinstance.properties.ForgeConstants;
+import forge.localinstance.properties.ForgeProfileProperties;
 import forge.screens.TabPageScreen.TabPage;
 import forge.toolbox.FFileChooser;
 import forge.toolbox.FFileChooser.ChoiceType;
@@ -42,6 +32,8 @@ import forge.toolbox.FList;
 import forge.toolbox.FOptionPane;
 import forge.toolbox.GuiChoose;
 import forge.util.Callback;
+import forge.util.FileUtil;
+import forge.util.Localizer;
 
 public class FilesPage extends TabPage<SettingsScreen> {
     private final FGroupList<FilesItem> lstItems = add(new FGroupList<>());

forge-gui/src/main/java/forge/deck/NetDeckArchiveBlock.java

@@ -3,17 +3,22 @@ package forge.deck;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
 
-import forge.GuiBase;
 import forge.deck.io.DeckSerializer;
 import forge.deck.io.DeckStorage;
-import forge.download.GuiDownloadZipService;
 import forge.game.GameType;
-import forge.properties.ForgeConstants;
+import forge.gui.GuiBase;
+import forge.gui.download.GuiDownloadZipService;
+import forge.gui.util.SGuiChoose;
+import forge.localinstance.properties.ForgeConstants;
 import forge.util.FileUtil;
 import forge.util.WaitCallback;
-import forge.util.gui.SGuiChoose;
 import forge.util.storage.StorageBase;
 
 public class NetDeckArchiveBlock extends StorageBase<Deck> {