Skip to content

Commit 49f71bb

Browse files
committed
Update to latest tmc-checkstyle-runner
1 parent 43badf8 commit 49f71bb

File tree

8 files changed

+17
-19
lines changed

8 files changed

+17
-19
lines changed

maven-wrapper/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,7 @@
286286
<dependency>
287287
<groupId>${project.groupId}</groupId>
288288
<artifactId>tmc-checkstyle-runner</artifactId>
289-
<version>1.0.2</version>
289+
<version>2.1.2-SNAPSHOT</version>
290290
<exclusions>
291291
<exclusion>
292292
<groupId>com.puppycrawl.tools</groupId>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,8 +108,8 @@ public void bgTaskReady(final List<Course> courses) {
108108
@Override
109109
public Course call() throws Exception {
110110
lf =
111-
tmcCore.getCourse(
112-
currentCourseStub.getDetailsUrlAsUri());
111+
tmcCore.getCourseByName(
112+
currentCourseStub.getName());
113113
return lf.get();
114114
}
115115

tmc-plugin/src/fi/helsinki/cs/tmc/data/ResultCollector.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
package fi.helsinki.cs.tmc.data;
22

3-
import fi.helsinki.cs.tmc.stylerunner.validation.Strategy;
4-
import fi.helsinki.cs.tmc.stylerunner.validation.ValidationResult;
53
import fi.helsinki.cs.tmc.ui.TestResultWindow;
64
import fi.helsinki.cs.tmc.core.domain.Exercise;
7-
import fi.helsinki.cs.tmc.core.domain.Course;
5+
import fi.helsinki.cs.tmc.langs.abstraction.Strategy;
6+
import fi.helsinki.cs.tmc.langs.abstraction.ValidationResult;
87

98
import java.util.List;
109

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@
44
import fi.helsinki.cs.tmc.model.ProjectMediator;
55
import fi.helsinki.cs.tmc.model.TmcProjectInfo;
66
import fi.helsinki.cs.tmc.model.TmcCoreSingleton;
7-
import fi.helsinki.cs.tmc.stylerunner.validation.CheckstyleResult;
8-
import fi.helsinki.cs.tmc.stylerunner.validation.ValidationResult;
97
import fi.helsinki.cs.tmc.ui.ConvenientDialogDisplayer;
108
import fi.helsinki.cs.tmc.core.exceptions.TmcCoreException;
119
import fi.helsinki.cs.tmc.utilities.BgTask;
1210
import fi.helsinki.cs.tmc.utilities.BgTaskListener;
1311

1412
import com.google.common.util.concurrent.ListenableFuture;
13+
import fi.helsinki.cs.tmc.langs.abstraction.ValidationResult;
14+
import fi.helsinki.cs.tmc.stylerunner.validation.CheckstyleResult;
1515

1616
import org.netbeans.api.project.Project;
1717

@@ -43,7 +43,7 @@ public void bgTaskCancelled() {}
4343

4444
@Override
4545
public void bgTaskReady(final Object nothing) {
46-
resultCollector.setValidationResult(validationResult);
46+
resultCollector.setValidationResult((fi.helsinki.cs.tmc.langs.abstraction.ValidationResult) validationResult);
4747
}
4848
});
4949
}

tmc-plugin/src/fi/helsinki/cs/tmc/ui/TestResultDisplayer.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
import fi.helsinki.cs.tmc.data.ResultCollector;
77
import fi.helsinki.cs.tmc.core.domain.submission.SubmissionResult;
88
import fi.helsinki.cs.tmc.data.TestCaseResult;
9-
import fi.helsinki.cs.tmc.stylerunner.validation.Strategy;
109
import fi.helsinki.cs.tmc.core.domain.submission.TestCase;
10+
import fi.helsinki.cs.tmc.langs.abstraction.Strategy;
1111
import java.awt.Dialog;
1212
import java.awt.event.ActionEvent;
1313
import java.awt.event.ActionListener;
@@ -52,7 +52,7 @@ public void showSubmissionResult(Exercise exercise, SubmissionResult result, fin
5252
break;
5353
}
5454
}
55-
55+
5656
private List<TestCaseResult> convertToTestCaseResults(List<TestCase> cases){
5757
List<TestCaseResult> resultList = new ArrayList<TestCaseResult>();
5858
for (TestCase te : cases) {
@@ -127,7 +127,7 @@ public void showLocalRunResult(final List<TestCaseResult> results,
127127
final boolean returnable,
128128
final Runnable submissionCallback,
129129
final ResultCollector resultCollector) {
130-
130+
131131
System.out.println("Näyttämässä lokaalia testitulosta");
132132

133133
resultCollector.setSubmissionCallback(submissionCallback);
@@ -174,5 +174,4 @@ private List<TestCaseResult> maybeAddValdrindToResults(SubmissionResult result)
174174

175175
return resultList;
176176
}
177-
178-
}
177+
}

tmc-plugin/src/fi/helsinki/cs/tmc/ui/TestResultPanel.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import fi.helsinki.cs.tmc.core.domain.Exercise;
44
import fi.helsinki.cs.tmc.data.TestCaseResult;
5-
import fi.helsinki.cs.tmc.stylerunner.validation.ValidationResult;
5+
import fi.helsinki.cs.tmc.langs.abstraction.ValidationResult;
66

77
import java.awt.GridBagConstraints;
88
import java.awt.GridBagLayout;
@@ -106,4 +106,4 @@ public void setAllTestsVisible(final boolean allTestsVisible) {
106106

107107
rebuildCells();
108108
}
109-
}
109+
}

tmc-plugin/src/fi/helsinki/cs/tmc/ui/TestResultWindow.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import com.google.common.base.Function;
44
import fi.helsinki.cs.tmc.core.domain.Exercise;
55
import fi.helsinki.cs.tmc.data.TestCaseResult;
6-
import fi.helsinki.cs.tmc.stylerunner.validation.ValidationResult;
6+
import fi.helsinki.cs.tmc.langs.abstraction.ValidationResult;
77
import java.awt.Component;
88
import java.awt.Dimension;
99
import java.awt.event.ItemEvent;

tmc-plugin/src/fi/helsinki/cs/tmc/ui/ValidationResultBuilder.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package fi.helsinki.cs.tmc.ui;
22

3+
import fi.helsinki.cs.tmc.langs.abstraction.ValidationError;
4+
import fi.helsinki.cs.tmc.langs.abstraction.ValidationResult;
35
import fi.helsinki.cs.tmc.resources.LocalizedMessage;
4-
import fi.helsinki.cs.tmc.stylerunner.validation.ValidationError;
5-
import fi.helsinki.cs.tmc.stylerunner.validation.ValidationResult;
66

77
import java.awt.Color;
88
import java.io.File;

0 commit comments

Comments
 (0)