Added argument 0 for changing path to equations file.

groowyCZ · Feb 22, 2019 · 9b7c887 · 9b7c887
1 parent 6dcbb50
commit 9b7c887
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 12 deletions.
diff --git a/LaTeX/dist/LaTeX.jar b/LaTeX/dist/LaTeX.jar
diff --git a/LaTeX/src/latex/Latex.java b/LaTeX/src/latex/Latex.java
@@ -28,7 +28,8 @@
  */
 public class Latex {
 
-    static String EQUATIONS_PATH = getDefaultPath() + "equations.xml";
+    static final char SEPARATOR = System.getProperty("user.dir").contains("/") ? '/' : '\\';
+    static String EQUATIONS_PATH = System.getProperty("user.dir") + Latex.SEPARATOR + "equations.xml";
 
 
     public static TeXIcon textToTeXIcon(String math, int size) {
@@ -43,13 +44,6 @@ public static TeXIcon textToTeXIcon(String math){
         return textToTeXIcon(math, 40);
     }
 
-    private static String getDefaultPath() {
-        String defaultPath = System.getProperty("user.dir");
-        String pathSeparator = defaultPath.contains("/") ? "/" : "\\";
-        defaultPath += pathSeparator;
-        return defaultPath;
-    }
-
     public static void writeEquations(ArrayList<String> classes, ArrayList<String> categories, ArrayList<Equation> equations) throws FileNotFoundException, XMLStreamException, IOException {
         // OPEN
         Files.write(Paths.get(EQUATIONS_PATH), Arrays.asList(""), Charset.forName("UTF-8"));

diff --git a/LaTeX/src/latex/Main.java b/LaTeX/src/latex/Main.java
@@ -10,9 +10,15 @@ public class Main {
 
     public static void main(String[] args) {
         if(args.length > 0){
-            String newPath = args[0];
-            newPath = newPath.substring(0, newPath.length()-7) + "equations.xml";
-            Latex.EQUATIONS_PATH = newPath;
+            String str = args[0];
+            if(str.lastIndexOf(".") < 0){
+                if(str.charAt(str.length() - 1) != Latex.SEPARATOR){
+                    str += Latex.SEPARATOR;
+                }
+                str += "equations.xml";
+            }
+            System.out.println(str);
+            Latex.EQUATIONS_PATH = str;
         }
         System.out.println("- " + Latex.EQUATIONS_PATH);
         MainWindow window = new MainWindow();

diff --git a/LaTeX/store/LaTeX.jar b/LaTeX/store/LaTeX.jar
diff --git a/LaTeX/store/MeX.exe b/LaTeX/store/MeX.exe
diff --git a/LaTeX/store/equations.xml b/LaTeX/store/equations.xml