Using File.pathSeparator instead of adding it to API...

Not sure what's wrong with me ;)
tomsik68 · Aug 28, 2014 · 7fab19a · 7fab19a
1 parent e2eb8ad
commit 7fab19a
Show file tree

Hide file tree

Showing 10 changed files with 22 additions and 35 deletions.
diff --git a/src/sk/tomsik68/mclauncher/api/common/IOperatingSystem.java b/src/sk/tomsik68/mclauncher/api/common/IOperatingSystem.java
@@ -40,10 +40,4 @@ public interface IOperatingSystem {
      */
     public String getArchitecture();
 
-    /**
-     * 
-     * @return System-specific char or string which will be used to separate
-     *         multiple paths
-     */
-    public String getLibrarySeparator();
 }
diff --git a/src/sk/tomsik68/mclauncher/api/servers/ServerPingPacketFactory.java b/src/sk/tomsik68/mclauncher/api/servers/ServerPingPacketFactory.java
@@ -0,0 +1,11 @@
+package sk.tomsik68.mclauncher.api.servers;
+
+public class ServerPingPacketFactory {
+    public ServerPingPacketFactory() {
+
+    }
+
+    public byte[] create() {
+        return null;
+    }
+}
diff --git a/src/sk/tomsik68/mclauncher/impl/common/LinuxOS.java b/src/sk/tomsik68/mclauncher/impl/common/LinuxOS.java
@@ -37,8 +37,4 @@ public String getArchitecture() {
         return System.getProperty("sun.arch.data.model");
     }
 
-    @Override
-    public String getLibrarySeparator() {
-        return ":";
-    }
 }
diff --git a/src/sk/tomsik68/mclauncher/impl/common/MacintoshOS.java b/src/sk/tomsik68/mclauncher/impl/common/MacintoshOS.java
@@ -34,9 +34,5 @@ public File getWorkingDirectory() {
     public String getArchitecture() {
         return System.getProperty("sun.arch.data.model");
     }
-    @Override
-    public String getLibrarySeparator() {
-        return ":";
-    }
 
 }
diff --git a/src/sk/tomsik68/mclauncher/impl/common/SolarisOS.java b/src/sk/tomsik68/mclauncher/impl/common/SolarisOS.java
@@ -37,8 +37,4 @@ public String getArchitecture() {
         return System.getProperty("sun.arch.data.model");
     }
 
-    @Override
-    public String getLibrarySeparator() {
-        return ":";
-    }
 }
diff --git a/src/sk/tomsik68/mclauncher/impl/common/UnknownOS.java b/src/sk/tomsik68/mclauncher/impl/common/UnknownOS.java
@@ -36,9 +36,5 @@ public File getWorkingDirectory() {
     public String getArchitecture() {
         return System.getProperty("sun.arch.data.model");
     }
-    @Override
-    public String getLibrarySeparator() {
-        return ";";
-    }
 
 }
diff --git a/src/sk/tomsik68/mclauncher/impl/common/WindowsOS.java b/src/sk/tomsik68/mclauncher/impl/common/WindowsOS.java
@@ -39,8 +39,4 @@ public File getWorkingDirectory() {
     public String getArchitecture() {
         return System.getProperty("sun.arch.data.model");
     }
-    @Override
-    public String getLibrarySeparator() {
-        return ";";
-    }
 }
diff --git a/src/sk/tomsik68/mclauncher/impl/versions/mcdownload/MCDownloadVersionInstaller.java b/src/sk/tomsik68/mclauncher/impl/versions/mcdownload/MCDownloadVersionInstaller.java
@@ -75,15 +75,17 @@ public void install(IVersion v, IMinecraftInstance mc, IProgressMonitor progress
         updateResources(mc, version, progress);
         File jarDest = mc.getJarProvider().getVersionFile(version.getUniqueID());
         File jsonDest = new File(jarDest.getParentFile(), "info.json");
-        if (!jsonDest.exists())
-            FileUtils.writeFile(jsonDest, version.toJSON().toJSONString(JSONStyle.LT_COMPRESS));
-        if (!jarDest.exists()) {
+        // always overwrite json file
+        // if (!jsonDest.exists())
+        FileUtils.writeFile(jsonDest, version.toJSON().toJSONString(JSONStyle.LT_COMPRESS));
+        // and jar file
+        // if (!jarDest.exists()) 
             try {
                 FileUtils.downloadFileWithProgress(MCLauncherAPI.URLS.NEW_JAR_DOWNLOAD_URL.replace("<VERSION>", version.getId()), jarDest, progress);
             } catch (Exception e) {
                 e.printStackTrace();
             }
-        }
+
         notifyListeners(version);
         if (progress != null)
             progress.finish();

diff --git a/src/sk/tomsik68/mclauncher/impl/versions/mcdownload/MCDownloadVersionLauncher.java b/src/sk/tomsik68/mclauncher/impl/versions/mcdownload/MCDownloadVersionLauncher.java
@@ -97,7 +97,7 @@ public List<String> getLaunchCommand(ISession session, IMinecraftInstance mc, IS
         command.add("-Djava.library.path=" + nativesDir.getAbsolutePath());
         command.add("-cp");
         StringBuilder sb = new StringBuilder();
-        final String LIBRARY_SEPARATOR = Platform.getCurrentPlatform().getLibrarySeparator();
+        final String LIBRARY_SEPARATOR = File.pathSeparator;
         for (Library lib : version.getLibraries()) {
             if (lib.isCompatible())
                 sb = sb.append(mc.getLibraryProvider().getLibraryFile(lib).getAbsolutePath()).append(LIBRARY_SEPARATOR);

diff --git a/src/sk/tomsik68/mclauncher/util/FilePathBuilder.java b/src/sk/tomsik68/mclauncher/util/FilePathBuilder.java
@@ -3,17 +3,17 @@
 import java.io.File;
 
 public class FilePathBuilder {
-    private File file;
+    private String path;
 
     public FilePathBuilder(File start) {
-        this.file = start;
+        this.path = start.getAbsolutePath();
     }
 
     public FilePathBuilder append(String s) {
-        file = new File(file, s);
+        path += File.separator + s;
         return this;
     }
     public File getResult(){
-        return file;
+        return new File(path);
     }
 }