From f4ed2c54fe77b48430d12157a8768c96b1318779 Mon Sep 17 00:00:00 2001 From: Stefan Dollase Date: Thu, 10 Dec 2015 13:43:00 +0100 Subject: [PATCH] moved and renamed classes --- src/amidst/gui/MainWindow.java | 8 ++++---- src/amidst/gui/menu/{MenuActions.java => Actions.java} | 5 ++--- src/amidst/gui/menu/AmidstMenuBuilder.java | 4 ++-- src/amidst/gui/menu/BiomeColorMenuFactory.java | 8 ++++---- src/amidst/gui/{ => menu}/MovePlayerPopupMenu.java | 7 +++---- src/amidst/gui/worldsurroundings/ViewerMouseListener.java | 6 +++--- .../gui/worldsurroundings/WorldSurroundingsBuilder.java | 4 ++-- 7 files changed, 20 insertions(+), 22 deletions(-) rename src/amidst/gui/menu/{MenuActions.java => Actions.java} (98%) rename src/amidst/gui/{ => menu}/MovePlayerPopupMenu.java (90%) diff --git a/src/amidst/gui/MainWindow.java b/src/amidst/gui/MainWindow.java index ca247dba..f7ae09e0 100644 --- a/src/amidst/gui/MainWindow.java +++ b/src/amidst/gui/MainWindow.java @@ -21,10 +21,10 @@ import amidst.Application; import amidst.Options; import amidst.documentation.AmidstThread; import amidst.documentation.CalledOnlyBy; +import amidst.gui.menu.Actions; import amidst.gui.menu.AmidstMenu; import amidst.gui.menu.AmidstMenuBuilder; import amidst.gui.menu.LevelFileFilter; -import amidst.gui.menu.MenuActions; import amidst.gui.menu.PNGFileFilter; import amidst.gui.worldsurroundings.WorldSurroundings; import amidst.gui.worldsurroundings.WorldSurroundingsBuilder; @@ -46,7 +46,7 @@ public class MainWindow { private final JFrame frame; private final Container contentPane; - private final MenuActions actions; + private final Actions actions; private final AmidstMenu menuBar; private final AtomicReference worldSurroundings = new AtomicReference(); @@ -94,8 +94,8 @@ public class MainWindow { return contentPane; } - private MenuActions createMenuActions() { - return new MenuActions(application, mojangApi, this, worldSurroundings, + private Actions createMenuActions() { + return new Actions(application, mojangApi, this, worldSurroundings, skinLoader, updatePrompt, options.biomeColorProfileSelection); } diff --git a/src/amidst/gui/menu/MenuActions.java b/src/amidst/gui/menu/Actions.java similarity index 98% rename from src/amidst/gui/menu/MenuActions.java rename to src/amidst/gui/menu/Actions.java index 3adaf176..2cf0bf65 100644 --- a/src/amidst/gui/menu/MenuActions.java +++ b/src/amidst/gui/menu/Actions.java @@ -14,7 +14,6 @@ import javax.imageio.ImageIO; import amidst.Application; import amidst.gui.MainWindow; -import amidst.gui.MovePlayerPopupMenu; import amidst.gui.SkinLoader; import amidst.gui.UpdatePrompt; import amidst.gui.worldsurroundings.WorldSurroundings; @@ -28,7 +27,7 @@ import amidst.mojangapi.world.icon.WorldIcon; import amidst.preferences.BiomeColorProfile; import amidst.preferences.BiomeColorProfileSelection; -public class MenuActions { +public class Actions { private static final String ABOUT_MESSAGE = "Advanced Minecraft Interfacing and Data/Structure Tracking (AMIDST)\n" + "By Skidoodle (amidst.project@gmail.com)"; @@ -40,7 +39,7 @@ public class MenuActions { private final UpdatePrompt updatePrompt; private final BiomeColorProfileSelection biomeColorProfileSelection; - public MenuActions(Application application, MojangApi mojangApi, + public Actions(Application application, MojangApi mojangApi, MainWindow mainWindow, AtomicReference worldSurroundings, SkinLoader skinLoader, UpdatePrompt updatePrompt, diff --git a/src/amidst/gui/menu/AmidstMenuBuilder.java b/src/amidst/gui/menu/AmidstMenuBuilder.java index f1cd4437..4c5fbb9e 100644 --- a/src/amidst/gui/menu/AmidstMenuBuilder.java +++ b/src/amidst/gui/menu/AmidstMenuBuilder.java @@ -21,13 +21,13 @@ import amidst.resources.ResourceLoader; public class AmidstMenuBuilder { private final Options options; - private final MenuActions actions; + private final Actions actions; private final JMenuBar menuBar; private JMenu worldMenu; private JMenuItem savePlayerLocationsMenu; private JMenuItem reloadPlayerLocationsMenu; - public AmidstMenuBuilder(Options options, MenuActions actions) { + public AmidstMenuBuilder(Options options, Actions actions) { this.options = options; this.actions = actions; this.menuBar = createMenuBar(); diff --git a/src/amidst/gui/menu/BiomeColorMenuFactory.java b/src/amidst/gui/menu/BiomeColorMenuFactory.java index 45f985a6..381f2175 100644 --- a/src/amidst/gui/menu/BiomeColorMenuFactory.java +++ b/src/amidst/gui/menu/BiomeColorMenuFactory.java @@ -25,10 +25,10 @@ public class BiomeColorMenuFactory { private ActionListener firstListener; private boolean isFirstContainer = true; - private final MenuActions actions; + private final Actions actions; private BiomeColorProfileVisitorImpl(JMenu parentMenu, - MenuActions actions) { + Actions actions) { this.actions = actions; menuStack.add(parentMenu); } @@ -110,10 +110,10 @@ public class BiomeColorMenuFactory { } private final JMenu parentMenu = new JMenu("Biome profile"); - private final MenuActions actions; + private final Actions actions; private final BiomeColorProfileLoader biomeColorProfileLoader = new BiomeColorProfileLoader(); - public BiomeColorMenuFactory(MenuActions actions) { + public BiomeColorMenuFactory(Actions actions) { this.actions = actions; Log.i("Checking for additional biome color profiles."); initParentMenu(); diff --git a/src/amidst/gui/MovePlayerPopupMenu.java b/src/amidst/gui/menu/MovePlayerPopupMenu.java similarity index 90% rename from src/amidst/gui/MovePlayerPopupMenu.java rename to src/amidst/gui/menu/MovePlayerPopupMenu.java index b91a7305..6c92fbe1 100644 --- a/src/amidst/gui/MovePlayerPopupMenu.java +++ b/src/amidst/gui/menu/MovePlayerPopupMenu.java @@ -1,4 +1,4 @@ -package amidst.gui; +package amidst.gui.menu; import java.awt.Component; import java.awt.event.ActionEvent; @@ -7,17 +7,16 @@ import java.awt.event.ActionListener; import javax.swing.JMenuItem; import javax.swing.JPopupMenu; -import amidst.gui.menu.MenuActions; import amidst.mojangapi.world.CoordinatesInWorld; import amidst.mojangapi.world.MovablePlayerList; import amidst.mojangapi.world.Player; public class MovePlayerPopupMenu { - private final MenuActions actions; + private final Actions actions; private final MovablePlayerList movablePlayerList; private final CoordinatesInWorld targetCoordinates; - public MovePlayerPopupMenu(MenuActions actions, + public MovePlayerPopupMenu(Actions actions, MovablePlayerList movablePlayerList, CoordinatesInWorld targetCoordinates) { this.actions = actions; diff --git a/src/amidst/gui/worldsurroundings/ViewerMouseListener.java b/src/amidst/gui/worldsurroundings/ViewerMouseListener.java index dc672a8d..cde3d0e7 100644 --- a/src/amidst/gui/worldsurroundings/ViewerMouseListener.java +++ b/src/amidst/gui/worldsurroundings/ViewerMouseListener.java @@ -8,7 +8,7 @@ import java.awt.event.MouseWheelEvent; import java.awt.event.MouseWheelListener; import amidst.fragment.FragmentGraph; -import amidst.gui.menu.MenuActions; +import amidst.gui.menu.Actions; import amidst.gui.widget.WidgetManager; public class ViewerMouseListener implements MouseListener, MouseWheelListener { @@ -17,11 +17,11 @@ public class ViewerMouseListener implements MouseListener, MouseWheelListener { private final FragmentGraphToScreenTranslator translator; private final Zoom zoom; private final Movement movement; - private final MenuActions actions; + private final Actions actions; public ViewerMouseListener(WidgetManager widgetManager, FragmentGraph graph, FragmentGraphToScreenTranslator translator, - Zoom zoom, Movement movement, MenuActions actions) { + Zoom zoom, Movement movement, Actions actions) { this.widgetManager = widgetManager; this.graph = graph; this.translator = translator; diff --git a/src/amidst/gui/worldsurroundings/WorldSurroundingsBuilder.java b/src/amidst/gui/worldsurroundings/WorldSurroundingsBuilder.java index 6e795eb5..41d91036 100644 --- a/src/amidst/gui/worldsurroundings/WorldSurroundingsBuilder.java +++ b/src/amidst/gui/worldsurroundings/WorldSurroundingsBuilder.java @@ -10,7 +10,7 @@ import amidst.fragment.layer.LayerBuilder; import amidst.fragment.layer.LayerDeclaration; import amidst.fragment.layer.LayerLoader; import amidst.fragment.layer.LayerReloader; -import amidst.gui.menu.MenuActions; +import amidst.gui.menu.Actions; import amidst.gui.widget.Widget; import amidst.gui.widget.WidgetBuilder; import amidst.gui.widget.WidgetManager; @@ -33,7 +33,7 @@ public class WorldSurroundingsBuilder { layerBuilder.getNumberOfLayers()); } - public WorldSurroundings create(World world, MenuActions actions) { + public WorldSurroundings create(World world, Actions actions) { Movement movement = new Movement(options.smoothScrolling); WorldIconSelection worldIconSelection = new WorldIconSelection(); List declarations = layerBuilder.getDeclarations();