From bfee29d8e3e8250d3579653da1c1c58fea1e4f8c Mon Sep 17 00:00:00 2001 From: aj Date: Tue, 15 Jan 2019 14:42:17 +0000 Subject: [PATCH] fx package layout change --- .../fx/controller/AlbumPaneController.java | 2 +- .../fx/controller/ArtistPaneController.java | 2 +- .../fx/controller/ControllerMain.java | 18 +++++++++--------- .../fx/controller/FMObjListPaneController.java | 2 +- .../FMObjListPaneEditController.java | 6 +++--- .../ScrobbleChartPaneController.java | 4 ++-- .../fx/controller/TrackPaneController.java | 4 ++-- .../fx/{ => pane}/GenrePieChartTitledPane.java | 2 +- .../fx/{ => pane}/PieChartTitledPane.java | 2 +- .../fmframework/fx/{ => tab}/AlbumTab.java | 2 +- .../fmframework/fx/{ => tab}/ArtistTab.java | 2 +- .../fmframework/fx/{ => tab}/ConsoleTab.java | 3 ++- .../fx/{ => tab}/FMObjListEditTab.java | 2 +- .../fmframework/fx/{ => tab}/FMObjListTab.java | 2 +- .../fx/{ => tab}/ScrobbleChartTab.java | 2 +- .../fmframework/fx/{ => tab}/TrackTab.java | 2 +- 16 files changed, 29 insertions(+), 28 deletions(-) rename src/main/java/sarsoo/fmframework/fx/{ => pane}/GenrePieChartTitledPane.java (97%) rename src/main/java/sarsoo/fmframework/fx/{ => pane}/PieChartTitledPane.java (97%) rename src/main/java/sarsoo/fmframework/fx/{ => tab}/AlbumTab.java (91%) rename src/main/java/sarsoo/fmframework/fx/{ => tab}/ArtistTab.java (91%) rename src/main/java/sarsoo/fmframework/fx/{ => tab}/ConsoleTab.java (79%) rename src/main/java/sarsoo/fmframework/fx/{ => tab}/FMObjListEditTab.java (93%) rename src/main/java/sarsoo/fmframework/fx/{ => tab}/FMObjListTab.java (93%) rename src/main/java/sarsoo/fmframework/fx/{ => tab}/ScrobbleChartTab.java (92%) rename src/main/java/sarsoo/fmframework/fx/{ => tab}/TrackTab.java (91%) diff --git a/src/main/java/sarsoo/fmframework/fx/controller/AlbumPaneController.java b/src/main/java/sarsoo/fmframework/fx/controller/AlbumPaneController.java index 8c19df7..3fa680d 100644 --- a/src/main/java/sarsoo/fmframework/fx/controller/AlbumPaneController.java +++ b/src/main/java/sarsoo/fmframework/fx/controller/AlbumPaneController.java @@ -7,8 +7,8 @@ import java.util.Locale; import javafx.event.ActionEvent; import javafx.fxml.FXML; import sarsoo.fmframework.fm.FmNetwork; -import sarsoo.fmframework.fx.ArtistTab; import sarsoo.fmframework.fx.FmFramework; +import sarsoo.fmframework.fx.tab.ArtistTab; import sarsoo.fmframework.music.Album; import sarsoo.fmframework.music.Wiki; import sarsoo.fmframework.net.Key; diff --git a/src/main/java/sarsoo/fmframework/fx/controller/ArtistPaneController.java b/src/main/java/sarsoo/fmframework/fx/controller/ArtistPaneController.java index c0c6b56..3abf43d 100644 --- a/src/main/java/sarsoo/fmframework/fx/controller/ArtistPaneController.java +++ b/src/main/java/sarsoo/fmframework/fx/controller/ArtistPaneController.java @@ -7,8 +7,8 @@ import java.util.Locale; import javafx.event.ActionEvent; import javafx.fxml.FXML; import sarsoo.fmframework.fm.FmNetwork; -import sarsoo.fmframework.fx.FMObjListTab; import sarsoo.fmframework.fx.FmFramework; +import sarsoo.fmframework.fx.tab.FMObjListTab; import sarsoo.fmframework.music.Artist; import sarsoo.fmframework.music.Wiki; import sarsoo.fmframework.net.Key; diff --git a/src/main/java/sarsoo/fmframework/fx/controller/ControllerMain.java b/src/main/java/sarsoo/fmframework/fx/controller/ControllerMain.java index ee618ce..ca8f002 100644 --- a/src/main/java/sarsoo/fmframework/fx/controller/ControllerMain.java +++ b/src/main/java/sarsoo/fmframework/fx/controller/ControllerMain.java @@ -18,17 +18,17 @@ import javafx.fxml.FXML; import javafx.stage.FileChooser; import sarsoo.fmframework.file.ListPersister; import sarsoo.fmframework.fm.FmUserNetwork; -import sarsoo.fmframework.fx.AlbumTab; -import sarsoo.fmframework.fx.ArtistTab; -import sarsoo.fmframework.fx.ConsoleTab; -import sarsoo.fmframework.fx.FMObjListEditTab; import sarsoo.fmframework.fx.TextAreaConsole; -import sarsoo.fmframework.fx.FMObjListTab; +import sarsoo.fmframework.fx.pane.GenrePieChartTitledPane; +import sarsoo.fmframework.fx.pane.PieChartTitledPane; import sarsoo.fmframework.fx.FmFramework; -import sarsoo.fmframework.fx.GenrePieChartTitledPane; -import sarsoo.fmframework.fx.PieChartTitledPane; -import sarsoo.fmframework.fx.ScrobbleChartTab; -import sarsoo.fmframework.fx.TrackTab; +import sarsoo.fmframework.fx.tab.AlbumTab; +import sarsoo.fmframework.fx.tab.ArtistTab; +import sarsoo.fmframework.fx.tab.ConsoleTab; +import sarsoo.fmframework.fx.tab.FMObjListEditTab; +import sarsoo.fmframework.fx.tab.FMObjListTab; +import sarsoo.fmframework.fx.tab.ScrobbleChartTab; +import sarsoo.fmframework.fx.tab.TrackTab; import sarsoo.fmframework.music.Album; import sarsoo.fmframework.music.Artist; import sarsoo.fmframework.music.Tag; diff --git a/src/main/java/sarsoo/fmframework/fx/controller/FMObjListPaneController.java b/src/main/java/sarsoo/fmframework/fx/controller/FMObjListPaneController.java index 8c8fdf6..7addae7 100644 --- a/src/main/java/sarsoo/fmframework/fx/controller/FMObjListPaneController.java +++ b/src/main/java/sarsoo/fmframework/fx/controller/FMObjListPaneController.java @@ -15,8 +15,8 @@ import javafx.fxml.FXML; import javafx.scene.control.*; import javafx.scene.input.MouseEvent; import sarsoo.fmframework.fm.FmUserNetwork; -import sarsoo.fmframework.fx.ArtistTab; import sarsoo.fmframework.fx.FmFramework; +import sarsoo.fmframework.fx.tab.ArtistTab; import sarsoo.fmframework.music.Artist; import sarsoo.fmframework.music.FMObj; import sarsoo.fmframework.net.Key; diff --git a/src/main/java/sarsoo/fmframework/fx/controller/FMObjListPaneEditController.java b/src/main/java/sarsoo/fmframework/fx/controller/FMObjListPaneEditController.java index ad609ce..5bab014 100644 --- a/src/main/java/sarsoo/fmframework/fx/controller/FMObjListPaneEditController.java +++ b/src/main/java/sarsoo/fmframework/fx/controller/FMObjListPaneEditController.java @@ -17,10 +17,10 @@ import javafx.scene.input.MouseEvent; import sarsoo.fmframework.file.ListPersister; import sarsoo.fmframework.fm.FmNetwork; import sarsoo.fmframework.fm.FmUserNetwork; -import sarsoo.fmframework.fx.AlbumTab; -import sarsoo.fmframework.fx.ArtistTab; import sarsoo.fmframework.fx.FmFramework; -import sarsoo.fmframework.fx.TrackTab; +import sarsoo.fmframework.fx.tab.AlbumTab; +import sarsoo.fmframework.fx.tab.ArtistTab; +import sarsoo.fmframework.fx.tab.TrackTab; import sarsoo.fmframework.music.Album; import sarsoo.fmframework.music.Artist; import sarsoo.fmframework.music.FMObj; diff --git a/src/main/java/sarsoo/fmframework/fx/controller/ScrobbleChartPaneController.java b/src/main/java/sarsoo/fmframework/fx/controller/ScrobbleChartPaneController.java index a57ae72..4354c6c 100644 --- a/src/main/java/sarsoo/fmframework/fx/controller/ScrobbleChartPaneController.java +++ b/src/main/java/sarsoo/fmframework/fx/controller/ScrobbleChartPaneController.java @@ -16,9 +16,9 @@ import javafx.event.ActionEvent; import javafx.fxml.FXML; import sarsoo.fmframework.fm.FmNetwork; import sarsoo.fmframework.fm.FmUserNetwork; -import sarsoo.fmframework.fx.ArtistTab; import sarsoo.fmframework.fx.FmFramework; -import sarsoo.fmframework.fx.TrackTab; +import sarsoo.fmframework.fx.tab.ArtistTab; +import sarsoo.fmframework.fx.tab.TrackTab; import sarsoo.fmframework.music.Album; import sarsoo.fmframework.music.Wiki; import sarsoo.fmframework.net.Key; diff --git a/src/main/java/sarsoo/fmframework/fx/controller/TrackPaneController.java b/src/main/java/sarsoo/fmframework/fx/controller/TrackPaneController.java index 0acb237..552bd65 100644 --- a/src/main/java/sarsoo/fmframework/fx/controller/TrackPaneController.java +++ b/src/main/java/sarsoo/fmframework/fx/controller/TrackPaneController.java @@ -7,9 +7,9 @@ import java.util.Locale; import javafx.event.ActionEvent; import javafx.fxml.FXML; import sarsoo.fmframework.fm.FmNetwork; -import sarsoo.fmframework.fx.AlbumTab; -import sarsoo.fmframework.fx.ArtistTab; import sarsoo.fmframework.fx.FmFramework; +import sarsoo.fmframework.fx.tab.AlbumTab; +import sarsoo.fmframework.fx.tab.ArtistTab; import sarsoo.fmframework.music.Track; import sarsoo.fmframework.music.Wiki; import sarsoo.fmframework.net.Key; diff --git a/src/main/java/sarsoo/fmframework/fx/GenrePieChartTitledPane.java b/src/main/java/sarsoo/fmframework/fx/pane/GenrePieChartTitledPane.java similarity index 97% rename from src/main/java/sarsoo/fmframework/fx/GenrePieChartTitledPane.java rename to src/main/java/sarsoo/fmframework/fx/pane/GenrePieChartTitledPane.java index 3d768c8..20ab99e 100644 --- a/src/main/java/sarsoo/fmframework/fx/GenrePieChartTitledPane.java +++ b/src/main/java/sarsoo/fmframework/fx/pane/GenrePieChartTitledPane.java @@ -1,4 +1,4 @@ -package sarsoo.fmframework.fx; +package sarsoo.fmframework.fx.pane; import java.io.IOException; import java.util.ArrayList; diff --git a/src/main/java/sarsoo/fmframework/fx/PieChartTitledPane.java b/src/main/java/sarsoo/fmframework/fx/pane/PieChartTitledPane.java similarity index 97% rename from src/main/java/sarsoo/fmframework/fx/PieChartTitledPane.java rename to src/main/java/sarsoo/fmframework/fx/pane/PieChartTitledPane.java index 5896878..42f1d13 100644 --- a/src/main/java/sarsoo/fmframework/fx/PieChartTitledPane.java +++ b/src/main/java/sarsoo/fmframework/fx/pane/PieChartTitledPane.java @@ -1,4 +1,4 @@ -package sarsoo.fmframework.fx; +package sarsoo.fmframework.fx.pane; import java.io.IOException; import java.util.ArrayList; diff --git a/src/main/java/sarsoo/fmframework/fx/AlbumTab.java b/src/main/java/sarsoo/fmframework/fx/tab/AlbumTab.java similarity index 91% rename from src/main/java/sarsoo/fmframework/fx/AlbumTab.java rename to src/main/java/sarsoo/fmframework/fx/tab/AlbumTab.java index 9bb27ab..030f5ea 100644 --- a/src/main/java/sarsoo/fmframework/fx/AlbumTab.java +++ b/src/main/java/sarsoo/fmframework/fx/tab/AlbumTab.java @@ -1,4 +1,4 @@ -package sarsoo.fmframework.fx; +package sarsoo.fmframework.fx.tab; import java.io.IOException; diff --git a/src/main/java/sarsoo/fmframework/fx/ArtistTab.java b/src/main/java/sarsoo/fmframework/fx/tab/ArtistTab.java similarity index 91% rename from src/main/java/sarsoo/fmframework/fx/ArtistTab.java rename to src/main/java/sarsoo/fmframework/fx/tab/ArtistTab.java index 81d4ee2..3832cc7 100644 --- a/src/main/java/sarsoo/fmframework/fx/ArtistTab.java +++ b/src/main/java/sarsoo/fmframework/fx/tab/ArtistTab.java @@ -1,4 +1,4 @@ -package sarsoo.fmframework.fx; +package sarsoo.fmframework.fx.tab; import java.io.IOException; diff --git a/src/main/java/sarsoo/fmframework/fx/ConsoleTab.java b/src/main/java/sarsoo/fmframework/fx/tab/ConsoleTab.java similarity index 79% rename from src/main/java/sarsoo/fmframework/fx/ConsoleTab.java rename to src/main/java/sarsoo/fmframework/fx/tab/ConsoleTab.java index f2c9b11..bbb8f96 100644 --- a/src/main/java/sarsoo/fmframework/fx/ConsoleTab.java +++ b/src/main/java/sarsoo/fmframework/fx/tab/ConsoleTab.java @@ -1,6 +1,7 @@ -package sarsoo.fmframework.fx; +package sarsoo.fmframework.fx.tab; import javafx.scene.control.Tab; +import sarsoo.fmframework.fx.TextAreaConsole; public class ConsoleTab extends Tab{ diff --git a/src/main/java/sarsoo/fmframework/fx/FMObjListEditTab.java b/src/main/java/sarsoo/fmframework/fx/tab/FMObjListEditTab.java similarity index 93% rename from src/main/java/sarsoo/fmframework/fx/FMObjListEditTab.java rename to src/main/java/sarsoo/fmframework/fx/tab/FMObjListEditTab.java index 696bcfa..086c4e0 100644 --- a/src/main/java/sarsoo/fmframework/fx/FMObjListEditTab.java +++ b/src/main/java/sarsoo/fmframework/fx/tab/FMObjListEditTab.java @@ -1,4 +1,4 @@ -package sarsoo.fmframework.fx; +package sarsoo.fmframework.fx.tab; import java.io.IOException; import javafx.scene.control.*; diff --git a/src/main/java/sarsoo/fmframework/fx/FMObjListTab.java b/src/main/java/sarsoo/fmframework/fx/tab/FMObjListTab.java similarity index 93% rename from src/main/java/sarsoo/fmframework/fx/FMObjListTab.java rename to src/main/java/sarsoo/fmframework/fx/tab/FMObjListTab.java index cb98948..c05139e 100644 --- a/src/main/java/sarsoo/fmframework/fx/FMObjListTab.java +++ b/src/main/java/sarsoo/fmframework/fx/tab/FMObjListTab.java @@ -1,4 +1,4 @@ -package sarsoo.fmframework.fx; +package sarsoo.fmframework.fx.tab; import java.io.IOException; import javafx.scene.control.*; diff --git a/src/main/java/sarsoo/fmframework/fx/ScrobbleChartTab.java b/src/main/java/sarsoo/fmframework/fx/tab/ScrobbleChartTab.java similarity index 92% rename from src/main/java/sarsoo/fmframework/fx/ScrobbleChartTab.java rename to src/main/java/sarsoo/fmframework/fx/tab/ScrobbleChartTab.java index 21102d6..a108eaf 100644 --- a/src/main/java/sarsoo/fmframework/fx/ScrobbleChartTab.java +++ b/src/main/java/sarsoo/fmframework/fx/tab/ScrobbleChartTab.java @@ -1,4 +1,4 @@ -package sarsoo.fmframework.fx; +package sarsoo.fmframework.fx.tab; import java.io.IOException; diff --git a/src/main/java/sarsoo/fmframework/fx/TrackTab.java b/src/main/java/sarsoo/fmframework/fx/tab/TrackTab.java similarity index 91% rename from src/main/java/sarsoo/fmframework/fx/TrackTab.java rename to src/main/java/sarsoo/fmframework/fx/tab/TrackTab.java index ac24ba1..6477ed4 100644 --- a/src/main/java/sarsoo/fmframework/fx/TrackTab.java +++ b/src/main/java/sarsoo/fmframework/fx/tab/TrackTab.java @@ -1,4 +1,4 @@ -package sarsoo.fmframework.fx; +package sarsoo.fmframework.fx.tab; import java.io.IOException;