Treer
/
amidstest
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

moved injectors to proper packages

master
Stefan Dollase 2017-02-24 20:36:17 +01:00
parent 8b22871654
commit f1a5508848
4 changed files with 6 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/amidst/Amidst.java
View File

@ -11,7 +11,6 @@ import org.kohsuke.args4j.CmdLineException;
import org.kohsuke.args4j.CmdLineParser;
import org.kohsuke.args4j.ParserProperties;
import amidst.dependency.injection.PerApplicationInjector;
import amidst.documentation.AmidstThread;
import amidst.documentation.CalledByAny;
import amidst.documentation.CalledOnlyBy;

8
src/main/java/amidst/dependency/injection/PerApplicationInjector.java → src/main/java/amidst/PerApplicationInjector.java
View File

@ -1,9 +1,5 @@
package amidst.dependency.injection;
package amidst;
import amidst.AmidstMetaData;
import amidst.AmidstSettings;
import amidst.Application;
import amidst.CommandLineParameters;
import amidst.documentation.AmidstThread;
import amidst.documentation.CalledOnlyBy;
import amidst.documentation.NotThreadSafe;
@ -13,8 +9,10 @@ import amidst.gui.license.LicenseWindow;
import amidst.gui.main.Actions;
import amidst.gui.main.MainWindow;
import amidst.gui.main.MainWindowDialogs;
import amidst.gui.main.PerMainWindowInjector;
import amidst.gui.main.UpdatePrompt;
import amidst.gui.main.viewer.BiomeSelection;
import amidst.gui.main.viewer.PerViewerFacadeInjector;
import amidst.gui.main.viewer.ViewerFacade;
import amidst.gui.main.viewer.Zoom;
import amidst.gui.profileselect.ProfileSelectWindow;

7
src/main/java/amidst/dependency/injection/PerMainWindowInjector.java → src/main/java/amidst/gui/main/PerMainWindowInjector.java
View File

@ -1,4 +1,4 @@
package amidst.dependency.injection;
package amidst.gui.main;
import java.awt.Container;
import java.util.concurrent.atomic.AtomicReference;
@ -8,13 +8,10 @@ import javax.swing.JFrame;
import amidst.AmidstMetaData;
import amidst.AmidstSettings;
import amidst.Application;
import amidst.dependency.injection.Factory2;
import amidst.documentation.AmidstThread;
import amidst.documentation.CalledOnlyBy;
import amidst.documentation.NotThreadSafe;
import amidst.gui.main.Actions;
import amidst.gui.main.MainWindow;
import amidst.gui.main.MainWindowDialogs;
import amidst.gui.main.WorldSwitcher;
import amidst.gui.main.menu.AmidstMenu;
import amidst.gui.main.menu.AmidstMenuBuilder;
import amidst.gui.main.viewer.ViewerFacade;

13
src/main/java/amidst/dependency/injection/PerViewerFacadeInjector.java → src/main/java/amidst/gui/main/viewer/PerViewerFacadeInjector.java
View File

@ -1,4 +1,4 @@
package amidst.dependency.injection;
package amidst.gui.main.viewer;
import java.util.Arrays;
import java.util.List;
@ -15,17 +15,6 @@ import amidst.fragment.layer.LayerBuilder;
import amidst.fragment.layer.LayerManager;
import amidst.fragment.layer.LayerReloader;
import amidst.gui.main.Actions;
import amidst.gui.main.viewer.BiomeSelection;
import amidst.gui.main.viewer.Drawer;
import amidst.gui.main.viewer.FragmentGraphToScreenTranslator;
import amidst.gui.main.viewer.Graphics2DAccelerationCounter;
import amidst.gui.main.viewer.Movement;
import amidst.gui.main.viewer.ProgressMessageHolder;
import amidst.gui.main.viewer.Viewer;
import amidst.gui.main.viewer.ViewerFacade;
import amidst.gui.main.viewer.ViewerMouseListener;
import amidst.gui.main.viewer.WorldIconSelection;
import amidst.gui.main.viewer.Zoom;
import amidst.gui.main.viewer.widget.BiomeToggleWidget;
import amidst.gui.main.viewer.widget.BiomeWidget;
import amidst.gui.main.viewer.widget.ChangeableTextWidget;