diff --git a/.classpath b/.classpath index 0f49fcb..e32929a 100644 --- a/.classpath +++ b/.classpath @@ -4,7 +4,6 @@ - diff --git a/.gitignore b/.gitignore index cb76115..0cf5b30 100644 --- a/.gitignore +++ b/.gitignore @@ -46,4 +46,5 @@ Network Trash Folder Temporary Items .apdisk config.xml +.directory diff --git a/DB_PATH b/DB_PATH deleted file mode 100644 index 9e5295d..0000000 Binary files a/DB_PATH and /dev/null differ diff --git a/bin/application/MainWindowController$1.class b/bin/application/MainWindowController$1.class index 2f56f86..f602b41 100644 Binary files a/bin/application/MainWindowController$1.class and b/bin/application/MainWindowController$1.class differ diff --git a/bin/application/MainWindowController$2.class b/bin/application/MainWindowController$2.class index 8d0e66f..fba7c04 100644 Binary files a/bin/application/MainWindowController$2.class and b/bin/application/MainWindowController$2.class differ diff --git a/bin/application/MainWindowController$3.class b/bin/application/MainWindowController$3.class index fd2ba6f..2b78f19 100644 Binary files a/bin/application/MainWindowController$3.class and b/bin/application/MainWindowController$3.class differ diff --git a/bin/application/MainWindowController$4.class b/bin/application/MainWindowController$4.class index 6295a3c..f00482b 100644 Binary files a/bin/application/MainWindowController$4.class and b/bin/application/MainWindowController$4.class differ diff --git a/bin/application/MainWindowController$5.class b/bin/application/MainWindowController$5.class index b1192f9..4726153 100644 Binary files a/bin/application/MainWindowController$5.class and b/bin/application/MainWindowController$5.class differ diff --git a/bin/application/MainWindowController$6.class b/bin/application/MainWindowController$6.class index 22546ed..c1b2b09 100644 Binary files a/bin/application/MainWindowController$6.class and b/bin/application/MainWindowController$6.class differ diff --git a/bin/application/MainWindowController$7.class b/bin/application/MainWindowController$7.class index 771b730..117bf7a 100644 Binary files a/bin/application/MainWindowController$7.class and b/bin/application/MainWindowController$7.class differ diff --git a/bin/application/MainWindowController.class b/bin/application/MainWindowController.class index 0f81e85..492d6ca 100644 Binary files a/bin/application/MainWindowController.class and b/bin/application/MainWindowController.class differ diff --git a/bin/application/updater.class b/bin/application/updater.class index 7d0f789..fd87d6d 100644 Binary files a/bin/application/updater.class and b/bin/application/updater.class differ diff --git a/src/application/MainWindowController.java b/src/application/MainWindowController.java index 82e2b8c..47e6303 100644 --- a/src/application/MainWindowController.java +++ b/src/application/MainWindowController.java @@ -41,8 +41,6 @@ import java.util.ArrayList; import java.util.Locale; import java.util.Properties; import java.util.ResourceBundle; -import org.apache.commons.lang3.SystemUtils; - import com.jfoenix.controls.JFXButton; import com.jfoenix.controls.JFXColorPicker; import com.jfoenix.controls.JFXSlider; @@ -290,8 +288,9 @@ public class MainWindowController { @FXML private void playbtnclicked(){ - if(SystemUtils.IS_OS_LINUX){ - System.out.println("This is Linux"); + System.out.println(System.getProperty("os.name")); + if(System.getProperty("os.name").contains("Linux")){ + System.out.println("This is "+System.getProperty("os.name")); String line; String output = ""; Process p; @@ -326,8 +325,8 @@ public class MainWindowController { showErrorMsg(errorPlay,e); } } - }else if(SystemUtils.IS_OS_WINDOWS || SystemUtils.IS_OS_MAC_OSX){ - System.out.println("This is Windows or Mac OSX"); + }else if(System.getProperty("os.name").contains("Windows") || System.getProperty("os.name").contains("Mac OS X")){ + System.out.println("This is "+System.getProperty("os.name")); if(mode.equals("local")){ try { Desktop.getDesktop().open(new File(getPath()+"\\"+ datPath)); diff --git a/src/application/updater.java b/src/application/updater.java index 2201323..241389c 100644 --- a/src/application/updater.java +++ b/src/application/updater.java @@ -14,6 +14,7 @@ import java.nio.channels.ReadableByteChannel; import javafx.application.Platform; +//TODO rework the process after the update is downloaded, need to replace the old config.xml public class updater extends Thread{ private MainWindowController mainWindowController; diff --git a/src/libraries/commons-lang3-3.5.jar b/src/libraries/commons-lang3-3.5.jar deleted file mode 100644 index 6328c8d..0000000 Binary files a/src/libraries/commons-lang3-3.5.jar and /dev/null differ