Skip to content

Commit 6e3b679

Browse files
jamojamo
committed
Merge pull request #116 from nimirum/core_integration
Update NetBeans Plugin to reflect out tmc-core string to path api changes.
2 parents 4eb5424 + a1f0aa8 commit 6e3b679

File tree

9 files changed

+31
-25
lines changed

9 files changed

+31
-25
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>2.1.2-SNAPSHOT</version>
289+
<version>2.1.1</version>
290290
<exclusions>
291291
<exclusion>
292292
<groupId>com.puppycrawl.tools</groupId>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ public void bgTaskFailed(Throwable ex) {
141141
public Course call() throws Exception {
142142
logger.info("Downloading course to refresh cache");
143143
currentCourseFuture =
144-
tmcCore.getCourse(currentCourseBeforeUpdate.getDetailsUrlAsUri());
144+
tmcCore.getCourse(currentCourseBeforeUpdate.getDetailsUrl());
145145
return currentCourseFuture.get();
146146
}
147147

‎tmc-plugin/src/fi/helsinki/cs/tmc/actions/ReviewEventListener.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import java.awt.event.ActionEvent;
2525
import java.awt.event.ActionListener;
2626
import java.io.IOException;
27+
import java.net.URI;
2728
import java.nio.charset.Charset;
2829
import java.util.logging.Level;
2930
import java.util.logging.Logger;
@@ -175,7 +176,7 @@ private void sendLoggableEvent(Review review) {
175176
private static class ReviewOpened {
176177
public final int id;
177178
public final int submissionId;
178-
public final String url;
179+
public final URI url;
179180
public final boolean markedAsRead;
180181

181182
public ReviewOpened(Review review) {

‎tmc-plugin/src/fi/helsinki/cs/tmc/model/CourseDb.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
import java.io.IOException;
1212
import java.io.Reader;
1313
import java.io.Writer;
14+
import java.net.URI;
1415
import java.util.ArrayList;
1516
import java.util.Collections;
1617
import java.util.HashMap;
@@ -142,13 +143,13 @@ public List<Exercise> getCurrentCourseUnlockableExercises() {
142143
List<Exercise> result = new ArrayList<Exercise>();
143144
Course course = getCurrentCourse();
144145
if (course != null) {
145-
List<String> unlockables = course.getUnlockables();
146+
List<URI> unlockables = course.getUnlockables();
146147
if (unlockables == null) {
147148
unlockables = Collections.emptyList();
148149
}
149-
for (String exerciseName : unlockables) {
150+
for (URI exerciseName : unlockables) {
150151
for (Exercise ex : course.getExercises()) {
151-
if (ex.getName().equals(exerciseName)) {
152+
if (ex.getName().equals(exerciseName.toString())) {
152153
result.add(ex);
153154
}
154155
}

‎tmc-plugin/src/fi/helsinki/cs/tmc/model/PushEventListener.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
import fi.helsinki.cs.tmc.events.TmcEvent;
55
import fi.helsinki.cs.tmc.events.TmcEventBus;
66
import fi.helsinki.cs.tmc.events.TmcEventListener;
7+
8+
import java.net.URI;
79
import java.util.HashMap;
810
import java.util.Map;
911
import java.util.TimerTask;
@@ -120,12 +122,12 @@ private synchronized void initClientIfPossible() {
120122
return;
121123
}
122124

123-
String cometUrl = course.getCometUrl();
125+
URI cometUrl = course.getCometUrl();
124126
if (cometUrl == null) {
125127
return;
126128
}
127-
ClientTransport transport = createWebSocketTransport(cometUrl);
128-
client = new BayeuxClient(cometUrl, transport);
129+
ClientTransport transport = createWebSocketTransport(cometUrl.toString());
130+
client = new BayeuxClient(cometUrl.toString(), transport);
129131
client.getChannel(Channel.META_HANDSHAKE).addListener(handshakeListener);
130132
client.getChannel(Channel.META_DISCONNECT).addListener(disconnectListener);
131133

‎tmc-plugin/src/fi/helsinki/cs/tmc/model/ServerAccess.java

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -134,8 +134,8 @@ public boolean cancel() {
134134

135135
@Deprecated
136136
public CancellableCallable<Course> getFullCourseInfoTask(Course courseStub) {
137-
String url = addApiCallQueryParameters(courseStub.getDetailsUrl());
138-
final CancellableCallable<String> download = createHttpTasks().getForText(url);
137+
URI url = URI.create(addApiCallQueryParameters(courseStub.getDetailsUrl().toString()));
138+
final CancellableCallable<String> download = createHttpTasks().getForText(url.toString());
139139
return new CancellableCallable<Course>() {
140140
@Override
141141
public Course call() throws Exception {
@@ -177,22 +177,22 @@ public boolean cancel() {
177177
}
178178

179179
private String getUnlockUrl(Course course) {
180-
return addApiCallQueryParameters(course.getUnlockUrl());
180+
return addApiCallQueryParameters(course.getUnlockUrl().toString());
181181
}
182182

183183
public CancellableCallable<byte[]> getDownloadingExerciseZipTask(Exercise exercise) {
184-
String zipUrl = exercise.getDownloadUrl();
185-
return createHttpTasks().getForBinary(zipUrl);
184+
URI zipUrl = exercise.getDownloadUrl();
185+
return createHttpTasks().getForBinary(zipUrl.toString());
186186
}
187187

188188
public CancellableCallable<byte[]> getDownloadingExerciseSolutionZipTask(Exercise exercise) {
189-
String zipUrl = exercise.getSolutionDownloadUrl();
190-
return createHttpTasks().getForBinary(zipUrl);
189+
URI zipUrl = exercise.getSolutionDownloadUrl();
190+
return createHttpTasks().getForBinary(zipUrl.toString());
191191
}
192192

193193
public CancellableCallable<SubmissionResponse> getSubmittingExerciseTask(
194194
final Exercise exercise, final byte[] sourceZip, Map<String, String> extraParams) {
195-
final String submitUrl = addApiCallQueryParameters(exercise.getReturnUrl());
195+
final URI submitUrl = URI.create(addApiCallQueryParameters(exercise.getReturnUrl().toString()));
196196

197197
Map<String, String> params = new LinkedHashMap<String, String>();
198198
params.put("client_time", "" + (System.currentTimeMillis() / 1000L));
@@ -202,7 +202,7 @@ public CancellableCallable<SubmissionResponse> getSubmittingExerciseTask(
202202
final CancellableCallable<String> upload =
203203
createHttpTasks()
204204
.uploadFileForTextDownload(
205-
submitUrl, params, "submission[file]", sourceZip);
205+
submitUrl.toString(), params, "submission[file]", sourceZip);
206206

207207
return new CancellableCallable<SubmissionResponse>() {
208208
@Override
@@ -254,8 +254,8 @@ public CancellableCallable<String> getSubmissionFetchTask(String submissionUrl)
254254
}
255255

256256
public CancellableCallable<List<Review>> getDownloadingReviewListTask(Course course) {
257-
String url = addApiCallQueryParameters(course.getReviewsUrl());
258-
final CancellableCallable<String> download = createHttpTasks().getForText(url);
257+
URI url = URI.create(addApiCallQueryParameters(course.getReviewsUrl().toString()));
258+
final CancellableCallable<String> download = createHttpTasks().getForText(url.toString());
259259
return new CancellableCallable<List<Review>>() {
260260
@Override
261261
public List<Review> call() throws Exception {

‎tmc-plugin/src/fi/helsinki/cs/tmc/spyware/EventSendBuffer.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import org.openide.util.Exceptions;
2424

2525
import java.io.IOException;
26+
import java.net.URI;
2627
import java.util.ArrayDeque;
2728
import java.util.ArrayList;
2829
import java.util.Arrays;
@@ -248,15 +249,15 @@ private String pickDestinationUrl() {
248249
return null;
249250
}
250251

251-
List<String> urls = course.getSpywareUrls();
252+
List<URI> urls = course.getSpywareUrls();
252253
if (urls == null || urls.isEmpty()) {
253254
log.log(
254255
Level.INFO,
255256
"Not sending events because no URL provided by server");
256257
return null;
257258
}
258259

259-
String url = urls.get(random.nextInt(urls.size()));
260+
String url = urls.get(random.nextInt(urls.size())).toString();
260261

261262
return url;
262263
}
@@ -316,8 +317,8 @@ private void clearAfterSend(List<HttpResult> success) {
316317

317318
private void addCorrectSpywareUrl(
318319
final String url, Optional<Course> currentCourse) {
319-
List<String> spywareUrls = new ArrayList<String>();
320-
String finalUrl = serverAccess.addApiCallQueryParameters(url);
320+
List<URI> spywareUrls = new ArrayList<URI>();
321+
URI finalUrl = URI.create(serverAccess.addApiCallQueryParameters(url));
321322
spywareUrls.add(finalUrl);
322323
currentCourse.get().setSpywareUrls(spywareUrls);
323324
}

‎tmc-plugin/src/fi/helsinki/cs/tmc/ui/CodeReviewDialog.form

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
</Properties>
88
<SyntheticProperties>
99
<SyntheticProperty name="formSizePolicy" type="int" value="1"/>
10+
<SyntheticProperty name="generateCenter" type="boolean" value="false"/>
1011
</SyntheticProperties>
1112
<AuxValues>
1213
<AuxValue name="FormSettings_autoResourcing" type="java.lang.Integer" value="1"/>

‎tmc-plugin/src/fi/helsinki/cs/tmc/ui/CodeReviewDialog.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ private String getPointsAwardedText(Review review) {
5959

6060
private void openInBrowser() {
6161
try {
62-
HtmlBrowser.URLDisplayer.getDefault().showURLExternal(new URL(review.getUrl()));
62+
HtmlBrowser.URLDisplayer.getDefault().showURLExternal(new URL(review.getUrl().toString()));
6363
} catch (MalformedURLException ex) {
6464
log.log(Level.WARNING, "Malformed URL: " + ex.getMessage(), ex);
6565
}

0 commit comments

Comments
 (0)