sarsoo/fmframework
1
0
Fork 0
Code Issues 6 Pull Requests Packages Projects Releases Wiki Activity

restructuring fx package

Browse Source
This commit is contained in:
aj 2019-05-01 14:20:09 +01:00
parent e4ebf5a20b
commit e66893e54c
15 changed files with 30 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/main/java/sarsoo/fmframework/fx/controller/AlbumGetPaneController.java
View File

@ -1,24 +0,0 @@
package sarsoo.fmframework.fx.controller;
import javafx.fxml.FXML;
import javafx.scene.control.*;
public class AlbumGetPaneController {
@FXML
private Label albumName;
@FXML
private Label artistName;
@FXML
private Button getButton;
// private
// @FXML
// protected void handleGetButton(ActionEvent event) {
//
// }
}

2
src/main/java/sarsoo/fmframework/fx/controller/AlbumPaneController.java
View File

@ -7,8 +7,8 @@ import java.util.Locale;
import javafx.event.ActionEvent;
import javafx.fxml.FXML;
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.Album;
import sarsoo.fmframework.music.Wiki;
import sarsoo.fmframework.net.Key;

2
src/main/java/sarsoo/fmframework/fx/controller/ArtistPaneController.java
View File

@ -7,8 +7,8 @@ import java.util.Locale;
import javafx.event.ActionEvent;
import javafx.fxml.FXML;
import sarsoo.fmframework.fm.FmUserNetwork;
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;

14
src/main/java/sarsoo/fmframework/fx/controller/ControllerMain.java
View File

@ -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.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.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.music.Album;
import sarsoo.fmframework.music.Artist;
import sarsoo.fmframework.music.Tag;

2
src/main/java/sarsoo/fmframework/fx/controller/FMObjListPaneController.java
View File

@ -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;

6
src/main/java/sarsoo/fmframework/fx/controller/FMObjListPaneEditController.java
View File

@ -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;

4
src/main/java/sarsoo/fmframework/fx/controller/TrackPaneController.java
View File

@ -7,9 +7,9 @@ import java.util.Locale;
import javafx.event.ActionEvent;
import javafx.fxml.FXML;
import sarsoo.fmframework.fm.FmUserNetwork;
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;

4
src/main/java/sarsoo/fmframework/fx/AlbumTab.java → src/main/java/sarsoo/fmframework/fx/tab/AlbumTab.java
View File

@ -1,4 +1,4 @@
package sarsoo.fmframework.fx;
package sarsoo.fmframework.fx.tab;
import java.io.IOException;
@ -16,7 +16,7 @@ public class AlbumTab extends Tab {
setText(album.getName());
FXMLLoader loader = new FXMLLoader(getClass().getResource("ui/AlbumPane.fxml"));
FXMLLoader loader = new FXMLLoader(getClass().getResource("../ui/AlbumPane.fxml"));
AnchorPane pane = (AnchorPane) loader.load();

4
src/main/java/sarsoo/fmframework/fx/ArtistTab.java → src/main/java/sarsoo/fmframework/fx/tab/ArtistTab.java
View File

@ -1,4 +1,4 @@
package sarsoo.fmframework.fx;
package sarsoo.fmframework.fx.tab;
import java.io.IOException;
@ -14,7 +14,7 @@ public class ArtistTab extends Tab {
setText(artist.getName());
FXMLLoader loader = new FXMLLoader(getClass().getResource("ui/ArtistPane.fxml"));
FXMLLoader loader = new FXMLLoader(getClass().getResource("../ui/ArtistPane.fxml"));
AnchorPane pane = (AnchorPane) loader.load();

3
src/main/java/sarsoo/fmframework/fx/ConsoleTab.java → src/main/java/sarsoo/fmframework/fx/tab/ConsoleTab.java
View File

@ -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{

6
src/main/java/sarsoo/fmframework/fx/FMObjListEditTab.java → src/main/java/sarsoo/fmframework/fx/tab/FMObjListEditTab.java
View File

@ -1,4 +1,4 @@
package sarsoo.fmframework.fx;
package sarsoo.fmframework.fx.tab;
import java.io.IOException;
import javafx.scene.control.*;
@ -13,7 +13,7 @@ public class FMObjListEditTab extends Tab {
setText("List");
FXMLLoader loader = new FXMLLoader(getClass().getResource("ui/FMObjListPaneEdit.fxml"));
FXMLLoader loader = new FXMLLoader(getClass().getResource("../ui/FMObjListPaneEdit.fxml"));
AnchorPane pane = (AnchorPane) loader.load();
@ -40,7 +40,7 @@ public class FMObjListEditTab extends Tab {
setText("list");
}
FXMLLoader loader = new FXMLLoader(getClass().getResource("ui/FMObjListPaneEdit.fxml"));
FXMLLoader loader = new FXMLLoader(getClass().getResource("../ui/FMObjListPaneEdit.fxml"));
AnchorPane pane = (AnchorPane) loader.load();

4
src/main/java/sarsoo/fmframework/fx/FMObjListTab.java → src/main/java/sarsoo/fmframework/fx/tab/FMObjListTab.java
View File

@ -1,4 +1,4 @@
package sarsoo.fmframework.fx;
package sarsoo.fmframework.fx.tab;
import java.io.IOException;
import javafx.scene.control.*;
@ -13,7 +13,7 @@ public class FMObjListTab extends Tab {
setText(list.getGroupName());
FXMLLoader loader = new FXMLLoader(getClass().getResource("ui/FMObjListPane.fxml"));
FXMLLoader loader = new FXMLLoader(getClass().getResource("../ui/FMObjListPane.fxml"));
AnchorPane pane = (AnchorPane) loader.load();

4
src/main/java/sarsoo/fmframework/fx/ScrobbleChartTab.java → src/main/java/sarsoo/fmframework/fx/tab/ScrobbleChartTab.java
View File

@ -1,4 +1,4 @@
package sarsoo.fmframework.fx;
package sarsoo.fmframework.fx.tab;
import java.io.IOException;
@ -13,7 +13,7 @@ public class ScrobbleChartTab extends Tab {
setText("scrobbles");
FXMLLoader loader = new FXMLLoader(getClass().getResource("ui/ScrobbleChartPane.fxml"));
FXMLLoader loader = new FXMLLoader(getClass().getResource("../ui/ScrobbleChartPane.fxml"));
AnchorPane pane = (AnchorPane) loader.load();

4
src/main/java/sarsoo/fmframework/fx/TrackTab.java → src/main/java/sarsoo/fmframework/fx/tab/TrackTab.java
View File

@ -1,4 +1,4 @@
package sarsoo.fmframework.fx;
package sarsoo.fmframework.fx.tab;
import java.io.IOException;
@ -14,7 +14,7 @@ public class TrackTab extends Tab {
setText(track.getName());
FXMLLoader loader = new FXMLLoader(getClass().getResource("ui/TrackPane.fxml"));
FXMLLoader loader = new FXMLLoader(getClass().getResource("../ui/TrackPane.fxml"));
AnchorPane pane = (AnchorPane) loader.load();

24
src/main/resources/sarsoo/fmframework/fx/ui/albumgetpane.fxml
View File

@ -1,24 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<?import javafx.scene.control.*?>
<?import java.lang.*?>
<?import javafx.scene.layout.*?>
<GridPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" xmlns:fx="http://javafx.com/fxml/1" xmlns="http://javafx.com/javafx/8" fx:controller="sarsoo.fmframework.fx.controller.albumGetPaneController">
<columnConstraints>
<ColumnConstraints hgrow="SOMETIMES" maxWidth="343.0" minWidth="10.0" prefWidth="238.0" />
<ColumnConstraints hgrow="SOMETIMES" maxWidth="423.0" minWidth="10.0" prefWidth="362.0" />
</columnConstraints>
<rowConstraints>
<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
</rowConstraints>
<children>
<Button fx:id="getButton" mnemonicParsing="false" text="get" GridPane.columnIndex="1" GridPane.halignment="CENTER" GridPane.rowIndex="2" />
<TextField fx:id="albumName" GridPane.columnIndex="1" />
<TextField fx:id="artistName" GridPane.columnIndex="1" GridPane.rowIndex="1" />
<Label text="album" GridPane.halignment="CENTER" />
<Label text="artist" GridPane.halignment="CENTER" GridPane.rowIndex="1" />
</children>
</GridPane>