Strings refactored to Paths

Author: nimirum

tmc-plugin/src/fi/helsinki/cs/tmc/layergen/UpdateCenterLayerGen.java

@@ -14,6 +14,7 @@
 import java.io.UnsupportedEncodingException;
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.nio.file.Paths;
 import java.util.Collection;
 
 /**
@@ -44,7 +45,7 @@ public InputStream openInputStream() {
     public UpdateCenterLayerGen() {
         synchronized (UpdateCenterLayerGen.class) {
             if (!callbackRegistered) {
-                CallbackURLStreamHandler.registerCallback(CALLBACK_NAME, callback);
+                CallbackURLStreamHandler.registerCallback(Paths.get(CALLBACK_NAME), callback);
             }
             callbackRegistered = true;
         }

tmc-plugin/src/fi/helsinki/cs/tmc/model/NbTmcSettings.java

@@ -7,6 +7,9 @@
 import fi.helsinki.cs.tmc.tailoring.Tailoring;
 import fi.helsinki.cs.tmc.core.configuration.TmcSettings;
 import fi.helsinki.cs.tmc.core.domain.Course;
+
+import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.Locale;
 
 /**
@@ -143,7 +146,7 @@ public void setSavingPassword(boolean shouldSave) {
         if (shouldSave) {
             settings.put(PREF_PASSWORD, unsavedPassword);
         } else {
-            settings.remove(PREF_PASSWORD);
+                settings.remove(PREF_PASSWORD);
         }
     }
 
@@ -153,9 +156,9 @@ public boolean isSavingPassword() {
 
     @Override
     public String getTmcMainDirectory() {
-        String path = settings.get(PREF_PROJECT_ROOT_DIR, null);
+        Path path = Paths.get(settings.get(PREF_PROJECT_ROOT_DIR, null));
         if (path != null) {
-            return path;
+            return path.toString();
         } else {
             // Can sometimes take a while. That's why we don't pass it as a default above.
             return ProjectMediator.getDefaultProjectRootDir();

tmc-plugin/src/fi/helsinki/cs/tmc/model/ProjectMediator.java

@@ -2,8 +2,11 @@
 
 import fi.helsinki.cs.tmc.core.domain.Exercise;
 import fi.helsinki.cs.tmc.utilities.ExceptionUtils;
+
 import java.io.File;
 import java.io.IOException;
+import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -113,13 +116,13 @@ public File getCourseRootDir(String courseName) {
      * The exercise must have a course name set.
      */
     public File getProjectDirForExercise(Exercise ex) {
-        String path =
+        Path path = Paths.get(
                 getProjectRootDir()
                         + File.separator
                         + ex.getCourseName()
                         + File.separator
-                        + ex.getName().replaceAll("-", "/");
-        File file = new File(path);
+                        + ex.getName().replaceAll("-", "/"));
+        File file = path.toFile();
         return FileUtil.normalizeFile(file);
     }
 

tmc-plugin/src/fi/helsinki/cs/tmc/model/SourceFileLookup.java

@@ -2,6 +2,9 @@
 
 import fi.helsinki.cs.tmc.core.domain.Exercise;
 
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
 import org.netbeans.api.java.classpath.GlobalPathRegistry;
 import org.openide.filesystems.FileObject;
 
@@ -24,20 +27,20 @@ private SourceFileLookup(
 
     public FileObject findSourceFileFor(Exercise exercise, String className) {
         String outerClassName = className.replaceAll("\\$.*$", "");
-        String path = outerClassName.replace('.', '/') + ".java";
+        Path path = Paths.get(outerClassName.replace('.', '/') + ".java");
 
         TmcProjectInfo correctProject = projectMediator.tryGetProjectForExercise(exercise);
         for (FileObject sr : globalPathRegistry.getSourceRoots()) {
             TmcProjectInfo p = projectMediator.tryGetProjectOwningFile(sr);
             if (p != null && p.equals(correctProject)) {
-                FileObject result = sr.getFileObject(path);
+                FileObject result = sr.getFileObject(path.toString());
                 if (result != null) {
                     return result;
                 }
             }
         }
 
         // Fall back to findResource picking a source root from any project.
-        return GlobalPathRegistry.getDefault().findResource(path);
+        return GlobalPathRegistry.getDefault().findResource(path.toString());
     }
 }

tmc-plugin/src/fi/helsinki/cs/tmc/utilities/urlcallback/CallbackURLStreamHandler.java

@@ -9,6 +9,7 @@
 import java.net.URL;
 import java.net.URLConnection;
 import java.net.URLStreamHandler;
+import java.nio.file.Path;
 import java.util.Map;
 
 /**
@@ -23,11 +24,11 @@ public class CallbackURLStreamHandler extends URLStreamHandler {
 
     private static final Map<String, URLCallback> callbacks = Maps.newHashMap();
 
-    public static void registerCallback(String path, URLCallback callback) {
+    public static void registerCallback(Path path, URLCallback callback) {
         if (callback == null) {
-            callbacks.remove(path);
+            callbacks.remove(path.toString());
         } else {
-            callbacks.put(path, callback);
+            callbacks.put(path.toString(), callback);
         }
     }