TmcFileUtils returns Path instead of String

Author: nimirum

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

@@ -156,9 +156,10 @@ public boolean isSavingPassword() {
 
     @Override
     public String getTmcMainDirectory() {
-        Path path = Paths.get(settings.get(PREF_PROJECT_ROOT_DIR, null));
-        if (path != null) {
-            return path.toString();
+        String target = settings.get(PREF_PROJECT_ROOT_DIR, null);
+        //TODO: Change String to Path in TmcSettings
+        if (target != null) {
+            return target;
         } 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/spyware/eventsources/SourceSnapshotEventSource.java

@@ -24,7 +24,6 @@
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Path;
-import java.nio.file.Paths;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import javax.swing.SwingUtilities;
@@ -104,7 +103,7 @@ public void fileRenamed(FileRenameEvent fre) {
     public void fileAttributeChanged(FileAttributeEvent fae) {}
 
     private void reactToChange(final ChangeType changeType, final FileObject fileObject) {
-        Path filePath = Paths.get(TmcFileUtils.tryGetPathRelativeToProject(fileObject));
+        Path filePath = TmcFileUtils.tryGetPathRelativeToProject(fileObject);
         if (filePath == null) {
             return;
         }
@@ -117,7 +116,7 @@ private void reactToChange(final ChangeType changeType, final FileObject fileObj
     }
 
     private void reactToRename(final ChangeType changeType, final FileRenameEvent renameEvent) {
-        Path filePath = Paths.get(TmcFileUtils.tryGetPathRelativeToProject(renameEvent.getFile()));
+        Path filePath = TmcFileUtils.tryGetPathRelativeToProject(renameEvent.getFile());
         if (filePath == null) {
             return;
         }

tmc-plugin/src/fi/helsinki/cs/tmc/spyware/eventsources/TextInsertEventSource.java

@@ -26,7 +26,6 @@
 import java.io.Closeable;
 import java.nio.charset.Charset;
 import java.nio.file.Path;
-import java.nio.file.Paths;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -170,7 +169,7 @@ private void sendEvent(Exercise ex, String eventType, String text) {
 
                 private String generatePatchDescription(
                         FileObject fo, List<Patch> patches, boolean patchContainsFullDocument) {
-                    Path filePath = Paths.get(TmcFileUtils.tryGetPathRelativeToProject(fo));
+                    Path filePath = TmcFileUtils.tryGetPathRelativeToProject(fo);
                     if (filePath != null) {
                         return JsonMaker.create()
                                 .add("file", filePath.toString())

tmc-plugin/src/fi/helsinki/cs/tmc/utilities/TmcFileUtils.java

@@ -14,7 +14,7 @@ public class TmcFileUtils {
      *
      * Otherwise returns null.
      */
-    public static String tryGetPathRelativeToProject(FileObject fileObject) {
+    public static Path tryGetPathRelativeToProject(FileObject fileObject) {
         Path filePath = Paths.get(fileObject.getPath());
 
         try {
@@ -29,6 +29,6 @@ public static String tryGetPathRelativeToProject(FileObject fileObject) {
             return null;
         }
 
-        return filePath.toString();
+        return filePath;
     }
 }