fix conflict

Author: zinkko

tmc-plugin/src/fi/helsinki/cs/tmc/actions/PastebinAction.java

@@ -111,7 +111,8 @@ private void submitPaste(final TmcProjectInfo projectInfo, final Exercise exerci
         final String errorMsgLocale = settings.getErrorMsgLocale().toString();
         try {
             Path path = Paths.get(projectInfo.getProjectDirAbsPath());
-            ListenableFuture<URI> result = TmcCoreSingleton.getInstance().pasteWithComment(path, messageForReviewer);
+            ListenableFuture<URI> result = TmcCoreSingleton.getInstance()
+                    .pasteWithComment(path, messageForReviewer);
             Futures.addCallback(result, new PasteResult());
         } catch (TmcCoreException ex) {
             Exceptions.printStackTrace(ex);

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

@@ -2,6 +2,8 @@
 
 import fi.helsinki.cs.tmc.utilities.zip.RecursiveZipper;
 import java.io.File;
+import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.regex.Pattern;
 import org.netbeans.api.project.Project;
 import org.netbeans.api.project.ProjectUtils;
@@ -35,7 +37,11 @@ public FileObject getProjectDir() {
     public File getProjectDirAsFile() {
         return FileUtil.toFile(getProjectDir());
     }
-
+    
+    public Path getProjectDirAsPath() {
+        return Paths.get(getProjectDirAbsPath());
+    }
+    
     public String getProjectDirAbsPath() {
         return FileUtil.toFile(getProjectDir()).getAbsolutePath();
     }

tmc-plugin/src/fi/helsinki/cs/tmc/runners/TestRunHandler.java

@@ -73,7 +73,8 @@ public void performAction(final ResultCollector resultCollector, Project... proj
                     "Running tests.");
             runningTestsLocally.start();
             try {
-                ListenableFuture<RunResult> result = TmcCoreSingleton.getInstance().test(Paths.get(projectInfo.getProjectDirAbsPath()));
+                ListenableFuture<RunResult> result = TmcCoreSingleton.getInstance()
+                        .test(Paths.get(projectInfo.getProjectDirAbsPath()));
                 Futures.addCallback(result, new FutureCallback<RunResult>() {
                     @Override
                     public void onSuccess(final RunResult result) {