Skip to content

Commit 05102da

Browse files
committed
Progresshandle to review-checkking.
1 parent ef87000 commit 05102da

File tree

3 files changed

+11
-17
lines changed

3 files changed

+11
-17
lines changed

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

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,17 @@
88
import fi.helsinki.cs.tmc.model.CourseDb;
99
import fi.helsinki.cs.tmc.model.NBTmcSettings;
1010
import fi.helsinki.cs.tmc.model.ReviewDb;
11-
import fi.helsinki.cs.tmc.model.ServerAccess;
1211
import fi.helsinki.cs.tmc.model.TmcCoreSingleton;
1312
import fi.helsinki.cs.tmc.ui.ConvenientDialogDisplayer;
14-
import fi.helsinki.cs.tmc.utilities.BgTask;
15-
import fi.helsinki.cs.tmc.utilities.BgTaskListener;
1613
import hy.tmc.core.exceptions.TmcCoreException;
1714
import java.awt.event.ActionEvent;
1815
import java.awt.event.ActionListener;
1916
import java.util.List;
2017
import java.util.logging.Level;
2118
import java.util.logging.Logger;
2219
import javax.swing.SwingUtilities;
20+
import org.netbeans.api.progress.ProgressHandle;
21+
import org.netbeans.api.progress.ProgressHandleFactory;
2322
import org.openide.awt.ActionID;
2423
import org.openide.awt.ActionReference;
2524
import org.openide.awt.ActionReferences;
@@ -53,7 +52,6 @@ public static void startTimer() {
5352
}
5453
}
5554

56-
private ServerAccess serverAccess;
5755
private CourseDb courseDb;
5856
private ReviewDb reviewDb;
5957
private ConvenientDialogDisplayer dialogs;
@@ -66,7 +64,6 @@ public static void startTimer() {
6664
}
6765

6866
CheckForNewReviews(boolean beQuiet, boolean resetNotifications, boolean notifyAboutNoNewReviews) {
69-
this.serverAccess = new ServerAccess();
7067
this.courseDb = CourseDb.getInstance();
7168
this.reviewDb = ReviewDb.getInstance();
7269
this.dialogs = ConvenientDialogDisplayer.getDefault();
@@ -101,22 +98,30 @@ public void run() {
10198
}
10299

103100
private void getReviews(Course course){
101+
final ProgressHandle progress = ProgressHandleFactory.createHandle("Checking for code reviews");
102+
progress.start();
104103
try {
105-
ListenableFuture<List<Review>> reviews = TmcCoreSingleton.getInstance().getNewReviews(course, NBTmcSettings.getDefault());
104+
ListenableFuture<List<Review>> reviews = TmcCoreSingleton.getInstance().getNewReviews(
105+
course, NBTmcSettings.getDefault()
106+
);
106107
Futures.addCallback(reviews, new FutureCallback<List<Review>>() {
107108

108109
@Override
109110
public void onSuccess(List<Review> v) {
110111
success(v);
112+
progress.finish();
113+
111114
}
112115

113116
@Override
114117
public void onFailure(Throwable thrwbl) {
115118
fail(thrwbl);
119+
progress.finish();
116120
}
117121

118122
});
119123
} catch (TmcCoreException ex) {
124+
progress.finish();
120125
Exceptions.printStackTrace(ex);
121126
}
122127
}

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

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,25 +6,17 @@
66
import hy.tmc.core.domain.Exercise;
77
import fi.helsinki.cs.tmc.model.CourseDb;
88
import fi.helsinki.cs.tmc.model.ProjectMediator;
9-
import fi.helsinki.cs.tmc.model.ServerAccess;
109
import fi.helsinki.cs.tmc.model.TmcProjectInfo;
1110
import fi.helsinki.cs.tmc.model.NBTmcSettings;
1211
import fi.helsinki.cs.tmc.model.TmcCoreSingleton;
1312
import fi.helsinki.cs.tmc.ui.ConvenientDialogDisplayer;
1413
import fi.helsinki.cs.tmc.ui.PastebinDialog;
1514
import fi.helsinki.cs.tmc.ui.PastebinResponseDialog;
16-
import fi.helsinki.cs.tmc.utilities.BgTask;
17-
import fi.helsinki.cs.tmc.utilities.BgTaskListener;
18-
import fi.helsinki.cs.tmc.utilities.CancellableCallable;
19-
import fi.helsinki.cs.tmc.utilities.zip.RecursiveZipper;
2015
import hy.tmc.core.exceptions.TmcCoreException;
2116
import java.awt.event.ActionEvent;
2217
import java.awt.event.ActionListener;
2318
import java.net.URI;
24-
import java.util.HashMap;
2519
import java.util.List;
26-
import java.util.Map;
27-
import java.util.concurrent.Callable;
2820
import java.util.logging.Level;
2921
import java.util.logging.Logger;
3022
import org.netbeans.api.project.Project;

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -245,9 +245,6 @@ private String pickDestinationUrl() {
245245

246246
/**
247247
* Converts events to data[] and sends it to defined url.
248-
*
249-
* @param eventsToSend
250-
* @param url
251248
*/
252249
private void doSend(final ArrayList<LoggableEvent> eventsToSend, final String url) {
253250
NBTmcSettings settings = NBTmcSettings.getDefault();

0 commit comments

Comments
 (0)