Updating to tmc-core with paths

Author: jamo

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

@@ -20,6 +20,7 @@
 import fi.helsinki.cs.tmc.core.exceptions.TmcCoreException;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
+import java.net.URI;
 import java.util.ArrayList;
 import javax.swing.AbstractAction;
 import javax.swing.Icon;
@@ -96,10 +97,9 @@ public void run() {
         }
     }
 
-    private String detailUrl(final Course currentCourseBeforeUpdate) {
-        return new ServerAccess().addApiCallQueryParameters(
-                currentCourseBeforeUpdate.getDetailsUrl()
-        );
+    private URI detailUrl(final Course currentCourseBeforeUpdate) {
+        return URI.create(new ServerAccess().addApiCallQueryParameters(
+                currentCourseBeforeUpdate.getDetailsUrl()));
     }
 
     /**

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

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

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

@@ -125,7 +125,7 @@ public void onSuccess(final List<Course> courses) {
                             createSystemHandle("Loading course");
                     loadingCourse.start();
                     ListenableFuture<Course> courseFuture = tmcCore.getCourse(
-                            currentCourse.getDetailsUrl()
+                            currentCourse.getDetailsUrlAsUri()
                     );
                     Futures.addCallback(courseFuture, new UpdateCourse(courses, loadingCourse));
                 } catch (TmcCoreException ex) {

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

@@ -14,6 +14,7 @@
 import fi.helsinki.cs.tmc.core.domain.submission.SubmissionResult;
 import fi.helsinki.cs.tmc.core.exceptions.TmcCoreException;
 import java.io.IOException;
+import java.net.URI;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -41,13 +42,11 @@ public void run() {
         try {
             ListenableFuture<HttpResult> feedbackFuture;
             feedbackFuture = core.sendFeedback(
-                    getFeedbackAnswers(), result.getFeedbackAnswerUrl()
+                    getFeedbackAnswers(), URI.create(result.getFeedbackAnswerUrl())
             );
             Futures.addCallback(feedbackFuture, new FeedbackReplyCallback());
         } catch (TmcCoreException ex) {
             Exceptions.printStackTrace(ex);
-        } catch (IOException ex) {
-            Exceptions.printStackTrace(ex);
         }
     }
 

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

@@ -83,7 +83,7 @@ private void submitProject(TmcProjectInfo info) {
         final SubmissionResultWaitingDialog dialog = SubmissionResultWaitingDialog.createAndShow();
         try {
             ListenableFuture<SubmissionResult> result;
-            result = core.submit(info.getProjectDirAbsPath());
+            result = core.submit(info.getProjectDirAsPath());
             Futures.addCallback(result, new SubmissionCallback(exercise, dialog));
         } catch (TmcCoreException ex) {
             String message = "There was an error submitting project " + info.getProjectName();

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/CheckstyleRunHandler.java

@@ -14,6 +14,7 @@
 import fi.helsinki.cs.tmc.stylerunner.validation.Strategy;
 import fi.helsinki.cs.tmc.stylerunner.validation.ValidationError;
 import java.io.File;
+import java.nio.file.Paths;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -37,7 +38,7 @@ public void performAction(final ResultCollector resultCollector, final Project p
         ProjectMediator.getInstance().saveAllFiles();
 
         try {
-            ListenableFuture<ValidationResult> result = TmcCoreSingleton.getInstance().runCheckstyle(projectInfo.getProjectDirAsFile().getAbsolutePath());
+            ListenableFuture<ValidationResult> result = TmcCoreSingleton.getInstance().runCheckstyle(projectInfo.getProjectDirAsPath());
             Futures.addCallback(result, new ExplainValidationResult(resultCollector, dialogDisplayer));
 
         } catch (TmcCoreException ex) {

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

@@ -24,6 +24,7 @@
 import fi.helsinki.cs.tmc.ui.ConvenientDialogDisplayer;
 import fi.helsinki.cs.tmc.ui.TestResultDisplayer;
 import fi.helsinki.cs.tmc.core.exceptions.TmcCoreException;
+import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.List;
 import static java.util.logging.Level.INFO;
@@ -72,7 +73,7 @@ public void performAction(final ResultCollector resultCollector, Project... proj
                     "Running tests.");
             runningTestsLocally.start();
             try {
-                ListenableFuture<RunResult> result = TmcCoreSingleton.getInstance().test(projectInfo.getProjectDirAbsPath());
+                ListenableFuture<RunResult> result = TmcCoreSingleton.getInstance().test(projectInfo.getProjectDirAsPath());
                 Futures.addCallback(result, new FutureCallback<RunResult>() {
                     @Override
                     public void onSuccess(final RunResult result) {