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

deprecated fmnetwork constructor with username, removed unused imports

Browse Source
This commit is contained in:
aj 2019-02-06 21:05:29 +00:00
parent 6ecf2ad982
commit 6d9212cf7c
13 changed files with 11 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/sarsoo/fmframework/fx/FmFramework.java
View File

@ -1,7 +1,5 @@
package sarsoo.fmframework.fx; package sarsoo.fmframework.fx;
import java.io.IOException;
import javafx.application.Application; import javafx.application.Application;
import javafx.fxml.FXMLLoader; import javafx.fxml.FXMLLoader;
import javafx.scene.Parent; import javafx.scene.Parent;
@ -19,7 +17,7 @@ public class FmFramework extends Application {
@Override @Override
public void start(Stage stage) throws Exception { public void start(Stage stage) throws Exception {
this.stage = stage; FmFramework.stage = stage;
Reference.setUserName("sarsoo"); Reference.setUserName("sarsoo");
FXMLLoader loader = new FXMLLoader(getClass().getResource("ui/main.fxml")); FXMLLoader loader = new FXMLLoader(getClass().getResource("ui/main.fxml"));

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

@ -4,11 +4,7 @@ import java.io.IOException;
import javafx.scene.control.*; import javafx.scene.control.*;
import javafx.scene.layout.*; import javafx.scene.layout.*;
import sarsoo.fmframework.fx.controller.AlbumPaneController;
import sarsoo.fmframework.fx.controller.ScrobbleChartPaneController; import sarsoo.fmframework.fx.controller.ScrobbleChartPaneController;
import sarsoo.fmframework.music.Album;
import javafx.fxml.FXMLLoader; import javafx.fxml.FXMLLoader;
public class ScrobbleChartTab extends Tab { public class ScrobbleChartTab extends Tab {

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

@ -6,7 +6,7 @@ import java.util.Locale;
import javafx.event.ActionEvent; import javafx.event.ActionEvent;
import javafx.fxml.FXML; import javafx.fxml.FXML;
import sarsoo.fmframework.fm.FmNetwork; import sarsoo.fmframework.fm.FmUserNetwork;
import sarsoo.fmframework.fx.ArtistTab; import sarsoo.fmframework.fx.ArtistTab;
import sarsoo.fmframework.fx.FmFramework; import sarsoo.fmframework.fx.FmFramework;
import sarsoo.fmframework.music.Album; import sarsoo.fmframework.music.Album;
@ -103,7 +103,7 @@ public class AlbumPaneController {
} }
public void refresh() { public void refresh() {
album = new FmNetwork(Key.getKey(), Reference.getUserName()).refresh(album); album = new FmUserNetwork(Key.getKey(), Reference.getUserName()).refresh(album);
NumberFormat numberFormat = NumberFormat.getNumberInstance(Locale.US); NumberFormat numberFormat = NumberFormat.getNumberInstance(Locale.US);

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

@ -6,7 +6,7 @@ import java.util.Locale;
import javafx.event.ActionEvent; import javafx.event.ActionEvent;
import javafx.fxml.FXML; import javafx.fxml.FXML;
import sarsoo.fmframework.fm.FmNetwork; import sarsoo.fmframework.fm.FmUserNetwork;
import sarsoo.fmframework.fx.FMObjListTab; import sarsoo.fmframework.fx.FMObjListTab;
import sarsoo.fmframework.fx.FmFramework; import sarsoo.fmframework.fx.FmFramework;
import sarsoo.fmframework.music.Artist; import sarsoo.fmframework.music.Artist;
@ -106,7 +106,7 @@ public class ArtistPaneController {
} }
public void refresh() { public void refresh() {
artist = new FmNetwork(Key.getKey(), Reference.getUserName()).refresh(artist); artist = new FmUserNetwork(Key.getKey(), Reference.getUserName()).refresh(artist);
NumberFormat numberFormat = NumberFormat.getNumberInstance(Locale.US); NumberFormat numberFormat = NumberFormat.getNumberInstance(Locale.US);

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

@ -141,7 +141,7 @@ public class FMObjListPaneEditController {
public void updateList() { public void updateList() {
FmNetwork net = new FmNetwork(Key.getKey(), Reference.getUserName()); FmNetwork net = new FmUserNetwork(Key.getKey(), Reference.getUserName());
FMObjList newList = new FMObjList(); FMObjList newList = new FMObjList();
int counter; int counter;
@ -249,7 +249,7 @@ public class FMObjListPaneEditController {
@FXML @FXML
protected void handleAddTrack(ActionEvent event) { protected void handleAddTrack(ActionEvent event) {
FmNetwork net = new FmNetwork(Key.getKey(), Reference.getUserName()); FmNetwork net = new FmUserNetwork(Key.getKey(), Reference.getUserName());
String name = textTrack.getText(); String name = textTrack.getText();
String album = textAlbum.getText(); String album = textAlbum.getText();
@ -276,7 +276,7 @@ public class FMObjListPaneEditController {
@FXML @FXML
protected void handleAddAlbum(ActionEvent event) { protected void handleAddAlbum(ActionEvent event) {
FmNetwork net = new FmNetwork(Key.getKey(), Reference.getUserName()); FmNetwork net = new FmUserNetwork(Key.getKey(), Reference.getUserName());
String album = textAlbum.getText(); String album = textAlbum.getText();
String artist = textArtist.getText(); String artist = textArtist.getText();
@ -295,7 +295,7 @@ public class FMObjListPaneEditController {
@FXML @FXML
protected void handleAddArtist(ActionEvent event) { protected void handleAddArtist(ActionEvent event) {
FmNetwork net = new FmNetwork(Key.getKey(), Reference.getUserName()); FmNetwork net = new FmUserNetwork(Key.getKey(), Reference.getUserName());
String artist = textArtist.getText(); String artist = textArtist.getText();

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

@ -1,30 +1,16 @@
package sarsoo.fmframework.fx.controller; package sarsoo.fmframework.fx.controller;
import java.io.IOException;
import java.text.NumberFormat;
import java.time.LocalDate; import java.time.LocalDate;
import java.util.Locale;
import java.util.concurrent.CountDownLatch; import java.util.concurrent.CountDownLatch;
import javax.swing.JOptionPane;
import javafx.application.Platform; import javafx.application.Platform;
import javafx.collections.FXCollections;
import javafx.concurrent.Service; import javafx.concurrent.Service;
import javafx.concurrent.Task; import javafx.concurrent.Task;
import javafx.event.ActionEvent; import javafx.event.ActionEvent;
import javafx.fxml.FXML; import javafx.fxml.FXML;
import sarsoo.fmframework.fm.FmNetwork;
import sarsoo.fmframework.fm.FmUserNetwork; import sarsoo.fmframework.fm.FmUserNetwork;
import sarsoo.fmframework.fx.ArtistTab;
import sarsoo.fmframework.fx.FmFramework;
import sarsoo.fmframework.fx.TrackTab;
import sarsoo.fmframework.music.Album; import sarsoo.fmframework.music.Album;
import sarsoo.fmframework.music.Wiki;
import sarsoo.fmframework.net.Key; import sarsoo.fmframework.net.Key;
import sarsoo.fmframework.net.Network;
import sarsoo.fmframework.util.Maths;
import sarsoo.fmframework.util.Reference;
import javafx.scene.chart.LineChart; import javafx.scene.chart.LineChart;
import javafx.scene.chart.XYChart; import javafx.scene.chart.XYChart;
import javafx.scene.control.*; import javafx.scene.control.*;

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

@ -6,7 +6,7 @@ import java.util.Locale;
import javafx.event.ActionEvent; import javafx.event.ActionEvent;
import javafx.fxml.FXML; import javafx.fxml.FXML;
import sarsoo.fmframework.fm.FmNetwork; import sarsoo.fmframework.fm.FmUserNetwork;
import sarsoo.fmframework.fx.AlbumTab; import sarsoo.fmframework.fx.AlbumTab;
import sarsoo.fmframework.fx.ArtistTab; import sarsoo.fmframework.fx.ArtistTab;
import sarsoo.fmframework.fx.FmFramework; import sarsoo.fmframework.fx.FmFramework;
@ -117,7 +117,7 @@ public class TrackPaneController {
} }
public void refresh() { public void refresh() {
track = new FmNetwork(Key.getKey(), Reference.getUserName()).refresh(track); track = new FmUserNetwork(Key.getKey(), Reference.getUserName()).refresh(track);
NumberFormat numberFormat = NumberFormat.getNumberInstance(Locale.US); NumberFormat numberFormat = NumberFormat.getNumberInstance(Locale.US);

1
src/main/java/sarsoo/fmframework/music/Artist.java
View File

@ -5,7 +5,6 @@ import java.util.ArrayList;
import org.w3c.dom.Document; import org.w3c.dom.Document;
import sarsoo.fmframework.music.Album.AlbumBuilder;
import sarsoo.fmframework.net.Network; import sarsoo.fmframework.net.Network;
import sarsoo.fmframework.net.URLBuilder; import sarsoo.fmframework.net.URLBuilder;
//import sarsoo.fmframework.net.TestCall; //import sarsoo.fmframework.net.TestCall;

1
src/main/java/sarsoo/fmframework/music/Track.java
View File

@ -6,7 +6,6 @@ import java.util.ArrayList;
import org.w3c.dom.Document; import org.w3c.dom.Document;
import sarsoo.fmframework.jframe.TrackView; import sarsoo.fmframework.jframe.TrackView;
import sarsoo.fmframework.music.Artist.ArtistBuilder;
import sarsoo.fmframework.net.Network; import sarsoo.fmframework.net.Network;
import sarsoo.fmframework.net.URLBuilder; import sarsoo.fmframework.net.URLBuilder;
//import sarsoo.fmframework.net.TestCall; //import sarsoo.fmframework.net.TestCall;

1
src/main/java/sarsoo/fmframework/util/tagpool/TagPool.java
View File

@ -3,7 +3,6 @@ package sarsoo.fmframework.util.tagpool;
import java.util.ArrayList; import java.util.ArrayList;
import sarsoo.fmframework.fm.FmUserNetwork; import sarsoo.fmframework.fm.FmUserNetwork;
import sarsoo.fmframework.music.Tag;
import sarsoo.fmframework.net.Key; import sarsoo.fmframework.net.Key;
import sarsoo.fmframework.util.FMObjList; import sarsoo.fmframework.util.FMObjList;
import sarsoo.fmframework.util.Reference; import sarsoo.fmframework.util.Reference;

4
src/test/java/sarsoo/fmframework/fm/FmNetworkTest.java
View File

@ -1,11 +1,7 @@
package sarsoo.fmframework.fm; package sarsoo.fmframework.fm;
import static org.junit.Assert.*;
import org.junit.Test; import org.junit.Test;
import sarsoo.fmframework.music.Album;
import sarsoo.fmframework.music.Artist;
import sarsoo.fmframework.music.Track; import sarsoo.fmframework.music.Track;
public class FmNetworkTest { public class FmNetworkTest {

6
src/test/java/sarsoo/fmframework/fm/FmUserNetworkTest.java
View File

@ -1,13 +1,7 @@
package sarsoo.fmframework.fm; package sarsoo.fmframework.fm;
import static org.junit.Assert.*;
import org.junit.Test; import org.junit.Test;
import sarsoo.fmframework.music.Artist;
import sarsoo.fmframework.music.FMObj;
import sarsoo.fmframework.util.FMObjList;
public class FmUserNetworkTest { public class FmUserNetworkTest {
@Test @Test

2
src/test/java/sarsoo/fmframework/util/FMObjListTest.java
View File

@ -1,7 +1,5 @@
package sarsoo.fmframework.util; package sarsoo.fmframework.util;
import static org.junit.Assert.*;
import org.junit.Test; import org.junit.Test;
public class FMObjListTest { public class FMObjListTest {