Reverted FileConst class refactor

Author: msg-programs

src/com/msgprograms/audiras/gui/SettingPanel.java

@@ -15,7 +15,6 @@
 import javax.swing.JTextField;
 import javax.swing.filechooser.FileFilter;
 
-import com.msgprograms.audiras.settings.FileConst;
 import com.msgprograms.audiras.settings.Lang;
 import com.msgprograms.audiras.settings.Settings;
 import com.msgprograms.audiras.streamlogic.RecordingMaster;
@@ -137,7 +136,7 @@ public void actionPerformed(ActionEvent ae) {
 
 		if (ae.getSource().equals(dirchange)) {
 			JFileChooser jfc = new JFileChooser();
-			jfc.setCurrentDirectory(FileConst.THIS_DIR);
+			jfc.setCurrentDirectory(Settings.THIS_DIR);
 			jfc.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY);
 			int ret = jfc.showOpenDialog(null);
 
@@ -157,7 +156,7 @@ public void actionPerformed(ActionEvent ae) {
 
 		if (ae.getSource().equals(langchange)) {
 			JFileChooser jfc = new JFileChooser();
-			jfc.setCurrentDirectory(FileConst.THIS_DIR);
+			jfc.setCurrentDirectory(Settings.THIS_DIR);
 			int ret = jfc.showOpenDialog(null);
 
 			if (ret != JFileChooser.APPROVE_OPTION) {

src/com/msgprograms/audiras/gui/Window.java

@@ -11,7 +11,6 @@
 import javax.swing.event.ChangeListener;
 
 import com.msgprograms.audiras.main.RadioMain;
-import com.msgprograms.audiras.settings.FileConst;
 import com.msgprograms.audiras.settings.Lang;
 import com.msgprograms.audiras.settings.Settings;
 
@@ -31,7 +30,7 @@ public class Window extends JFrame implements ChangeListener {
 
 	public Window() {
 		super("Audiras");
-		ImageIcon icon = new ImageIcon(FileConst.ICO_FILE.getAbsolutePath());
+		ImageIcon icon = new ImageIcon(Settings.ICO_FILE.getAbsolutePath());
 		this.setIconImage(icon.getImage());
 
 		this.setMaximumSize(DIM);
@@ -45,7 +44,7 @@ public Window() {
 			public void windowClosing(WindowEvent e) {
 				dispose();
 				RadioMain.win = null;
-				System.exit(0);
+//				System.exit(0);
 			}
 		});
 

src/com/msgprograms/audiras/main/RadioMain.java

@@ -23,7 +23,6 @@
 import javax.swing.JOptionPane;
 
 import com.msgprograms.audiras.gui.Window;
-import com.msgprograms.audiras.settings.FileConst;
 import com.msgprograms.audiras.settings.Lang;
 import com.msgprograms.audiras.settings.Settings;
 import com.msgprograms.audiras.streamlogic.RecordingMaster;
@@ -34,7 +33,6 @@ public class RadioMain {
 	public static Window win = null;
 
 	public static void main(String[] args) {
-		FileConst.init();
 		Settings.init();
 		Lang.init();
 		StationList.init();
@@ -65,7 +63,7 @@ private static void initTrayIcon() {
 
 			Image i = null;
 			try {
-				i = ImageIO.read(FileConst.ICO_FILE);
+				i = ImageIO.read(Settings.ICO_FILE);
 				if (i==null) {
 					throw new IOException("ico==null!");
 				}

src/com/msgprograms/audiras/settings/FileConst.java

@@ -11,7 +11,7 @@
 
 public class Lang {
 
-	static final File LANG = new File(FileConst.THIS_DIR + "/data/lang_" + Settings.getLang() + ".txt");
+	public static final File LANG = new File(Settings.DATA_DIR+ "/lang_" + Settings.getLang() + ".txt");
 	private static HashMap<String, String> trans = new HashMap<>();
 
 	public static void init() {

src/com/msgprograms/audiras/settings/Lang.java

@@ -25,18 +25,23 @@ public class Settings {
 	public static final int SIZE_PER = 1;
 	public static final int NUM_ALL = 2;
 	public static final int SIZE_ALL = 3;
+	
+	public static final File THIS_DIR = new File(".");
+	public static final File DATA_DIR = new File(THIS_DIR.getAbsolutePath() + "\\data");
+	public static final File ICO_FILE = new File(DATA_DIR.getAbsolutePath() + "\\icon.png");
+	public static final File INI_FILE = new File(DATA_DIR.getAbsolutePath() + "\\settings.ini");
 
 	public static void init() {
 
 		try {
-			FileConst.INI_FILE.createNewFile();
+			INI_FILE.createNewFile();
 		} catch (IOException e) {
 			JOptionPane.showMessageDialog(null, Lang.get("err_iniFile"), Lang.get("err"), JOptionPane.ERROR_MESSAGE);
 			e.printStackTrace();
 		}
 
 		try {
-			BufferedReader bfr = new BufferedReader(new FileReader(FileConst.INI_FILE));
+			BufferedReader bfr = new BufferedReader(new FileReader(INI_FILE));
 
 			String line;
 			while ((line = bfr.readLine()) != null) {
@@ -52,7 +57,7 @@ public static void init() {
 
 	public static void save() {
 		try {
-			PrintStream out = new PrintStream(FileConst.INI_FILE);
+			PrintStream out = new PrintStream(INI_FILE);
 
 			for (String key : settings.keySet()) {
 				if (!key.equals("num_streams") && !key.contains("station_")) {
@@ -73,7 +78,7 @@ public static void save() {
 			out.close();
 		} catch (Exception e) {
 			try {
-				if (FileConst.INI_FILE.createNewFile()) {
+				if (INI_FILE.createNewFile()) {
 					save();
 				}
 			} catch (IOException e1) {
@@ -97,8 +102,8 @@ public static void save() {
 				PrintWriter pw = new PrintWriter(astart);
 
 				pw.println("@echo off");
-				pw.println("javaw -jar \"" + FileConst.THIS_DIR.getAbsolutePath() + "\\Audiras.jar\"");
-
+				pw.println("cd /D " + THIS_DIR.getAbsolutePath());
+				pw.println("call Audiras.bat");
 				pw.close();
 			} catch (FileNotFoundException e) {
 				e.printStackTrace();
@@ -115,7 +120,7 @@ public static void save() {
 
 	public static String getStreamDir() {
 		if (!settings.containsKey("target_dir")) {
-			settings.put("target_dir", FileConst.THIS_DIR.getAbsolutePath() + "\\Recordings");
+			settings.put("target_dir", THIS_DIR.getAbsolutePath() + "\\Recordings");
 		}
 
 		return settings.get("target_dir");

src/com/msgprograms/audiras/settings/Settings.java

@@ -10,24 +10,24 @@
 
 import javax.swing.JOptionPane;
 
-import com.msgprograms.audiras.settings.FileConst;
 import com.msgprograms.audiras.settings.Lang;
 import com.msgprograms.audiras.settings.Settings;
 
 public class StationList {
 
 	public static ArrayList<RadioStation> stations = new ArrayList<>();
+	public static final File LIST_FILE = new File(Settings.DATA_DIR.getAbsolutePath() + "\\streams.txt");
 
 	// load streams saved in file FileConst.LIST_FILE
 	public static void init() {
 
-		if (!FileConst.LIST_FILE.exists()) {
+		if (!LIST_FILE.exists()) {
 			JOptionPane.showMessageDialog(null, Lang.get("err_noStreamFile"), Lang.get("err"),
 					JOptionPane.ERROR_MESSAGE);
 		} else {
 
 			try {
-				BufferedReader br = new BufferedReader(new FileReader(FileConst.LIST_FILE));
+				BufferedReader br = new BufferedReader(new FileReader(LIST_FILE));
 				String line;
 
 				int i = 0;
@@ -63,7 +63,7 @@ public static boolean isValidStream(String url) {
 	// add inputted station to list of radiostations and the file FileConst.LIST_FILE
 	public static void add(String s) {
 		try {
-			Files.write(FileConst.LIST_FILE.toPath(), new String(s + "\n").getBytes(), StandardOpenOption.APPEND);
+			Files.write(LIST_FILE.toPath(), new String(s + "\n").getBytes(), StandardOpenOption.APPEND);
 			RadioStation rs = new RadioStation(s, stations.size());
 			stations.add(rs);
 		} catch (IOException e) {