Skip to content

Commit 43badf8

Browse files
jamojamo
committed
Reformat code to follow the google style guide
1 parent fb3156b commit 43badf8

File tree

101 files changed

+2035
-1617
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

101 files changed

+2035
-1617
lines changed

‎maven-wrapper/src/main/java/fi/helsinki/cs/tmc/maven/wrapper/MavenWrapperDummy.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,4 @@
44
* Exists to satisfy the build system.
55
*/
66
public class MavenWrapperDummy {
7-
87
}

‎maven-wrapper/test-project/src/test/java/fi/helsinki/cs/tmc/maven/TestProjectTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,4 @@ public class TestProjectTest {
88
public void trivialTestCase() {
99
System.out.println("Hello from TestProject trivial test case.");
1010
}
11-
1211
}

‎tmc-application/src/fi/helsinki/cs/tmc/application/TmcAppModuleInstall.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ public void restored() {
1414
private void setApplicationBuildNumberToTmcModuleVersion() {
1515
// This version number will be shown in the title bar.
1616
// See http://netbeansrcp.wordpress.com/2009/04/15/change-the-version-number-in-a-netbeans-platform-application/
17-
String version = Modules.getDefault().ownerOf(TmcPlugin.class).getSpecificationVersion().toString();
17+
String version =
18+
Modules.getDefault().ownerOf(TmcPlugin.class).getSpecificationVersion().toString();
1819
System.setProperty("netbeans.buildnumber", version);
1920
}
20-
2121
}

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

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,21 @@
2121
public abstract class AbstractExerciseSensitiveAction extends NodeAction {
2222

2323
public AbstractExerciseSensitiveAction() {
24-
TmcEventBus.getDefault().subscribeDependent(new TmcEventListener() {
25-
public void receive(CourseDb.ChangedEvent event) throws Throwable {
26-
boolean enable = AbstractExerciseSensitiveAction.this.enable(getActivatedNodes());
27-
setEnabled(enable);
28-
}
29-
}, this);
24+
TmcEventBus.getDefault()
25+
.subscribeDependent(
26+
new TmcEventListener() {
27+
public void receive(CourseDb.ChangedEvent event) throws Throwable {
28+
boolean enable =
29+
AbstractExerciseSensitiveAction.this
30+
.enable(getActivatedNodes());
31+
setEnabled(enable);
32+
}
33+
},
34+
this);
3035
}
3136

3237
protected abstract ProjectMediator getProjectMediator();
38+
3339
protected abstract CourseDb getCourseDb();
3440

3541
@Override
@@ -48,7 +54,7 @@ protected boolean asynchronous() {
4854
}
4955

5056
/*package (for tests)*/
51-
public boolean enable(Project ... projects) {
57+
public boolean enable(Project... projects) {
5258
if (projects.length == 0) {
5359
return false;
5460
}
@@ -115,6 +121,7 @@ private Project projectFromDataObject(DataObject dataObj) {
115121
}
116122

117123
protected Exercise exerciseForProject(Project project) {
118-
return getProjectMediator().tryGetExerciseForProject(getProjectMediator().wrapProject(project), getCourseDb());
124+
return getProjectMediator()
125+
.tryGetExerciseForProject(getProjectMediator().wrapProject(project), getCourseDb());
119126
}
120-
}
127+
}

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

Lines changed: 77 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -35,25 +35,25 @@
3535
import javax.swing.AbstractAction;
3636
import javax.swing.Icon;
3737

38-
@ActionID(category = "TMC",
39-
id = "fi.helsinki.cs.tmc.actions.CheckForNewExercisesOrUpdates")
38+
@ActionID(category = "TMC", id = "fi.helsinki.cs.tmc.actions.CheckForNewExercisesOrUpdates")
4039
@ActionRegistration(displayName = "#CTL_CheckForNewExercisesOrUpdates")
41-
@ActionReferences({
42-
@ActionReference(path = "Menu/TM&C", position = -50)
43-
})
40+
@ActionReferences({@ActionReference(path = "Menu/TM&C", position = -50)})
4441
@Messages("CTL_CheckForNewExercisesOrUpdates=&Download/update exercises")
4542
public class CheckForNewExercisesOrUpdates extends AbstractAction {
4643

4744
public static void startTimer() {
4845
int interval = 20 * 60 * 1000; // 20 minutes
49-
javax.swing.Timer timer = new javax.swing.Timer(interval, new CheckForNewExercisesOrUpdates(true, true));
46+
javax.swing.Timer timer =
47+
new javax.swing.Timer(interval, new CheckForNewExercisesOrUpdates(true, true));
5048
timer.setRepeats(true);
5149
timer.start();
5250
}
5351

54-
private static final Logger logger = Logger.getLogger(CheckForNewExercisesOrUpdates.class.getName());
52+
private static final Logger logger =
53+
Logger.getLogger(CheckForNewExercisesOrUpdates.class.getName());
5554

56-
private static final TmcNotificationDisplayer.SingletonToken notifierToken = TmcNotificationDisplayer.createSingletonToken();
55+
private static final TmcNotificationDisplayer.SingletonToken notifierToken =
56+
TmcNotificationDisplayer.createSingletonToken();
5757

5858
private CourseDb courseDb;
5959
private TmcNotificationDisplayer notifier;
@@ -83,61 +83,75 @@ public void actionPerformed(ActionEvent e) {
8383
public void run() {
8484
final Course currentCourseBeforeUpdate = courseDb.getCurrentCourse();
8585

86-
BgTaskListener bgTaskListener = new BgTaskListener<Course>() {
87-
@Override
88-
public void bgTaskReady(Course receivedCourse) {
89-
if (receivedCourse != null) {
90-
91-
courseDb.putDetailedCourse(receivedCourse);
86+
BgTaskListener bgTaskListener =
87+
new BgTaskListener<Course>() {
88+
@Override
89+
public void bgTaskReady(Course receivedCourse) {
90+
if (receivedCourse != null) {
91+
92+
courseDb.putDetailedCourse(receivedCourse);
93+
94+
final LocalExerciseStatus status =
95+
LocalExerciseStatus.get(receivedCourse.getExercises());
96+
97+
if (status.thereIsSomethingToDownload(false)) {
98+
if (beQuiet) {
99+
displayNotification(
100+
status,
101+
new ActionListener() {
102+
@Override
103+
public void actionPerformed(ActionEvent e) {
104+
DownloadOrUpdateExercisesDialog.display(
105+
status.unlockable,
106+
status.downloadableUncompleted,
107+
status.updateable);
108+
}
109+
});
110+
} else {
111+
DownloadOrUpdateExercisesDialog.display(
112+
status.unlockable,
113+
status.downloadableUncompleted,
114+
status.updateable);
115+
}
116+
} else if (!beQuiet) {
117+
dialogs.displayMessage("No new exercises or updates to download.");
118+
}
119+
}
120+
}
92121

93-
final LocalExerciseStatus status = LocalExerciseStatus.get(receivedCourse.getExercises());
122+
@Override
123+
public void bgTaskCancelled() {}
94124

95-
if (status.thereIsSomethingToDownload(false)) {
96-
if (beQuiet) {
97-
displayNotification(status, new ActionListener() {
98-
@Override
99-
public void actionPerformed(ActionEvent e) {
100-
DownloadOrUpdateExercisesDialog.display(status.unlockable, status.downloadableUncompleted, status.updateable);
101-
}
102-
});
103-
} else {
104-
DownloadOrUpdateExercisesDialog.display(status.unlockable, status.downloadableUncompleted, status.updateable);
125+
@Override
126+
public void bgTaskFailed(Throwable ex) {
127+
if (!beQuiet || ex instanceof ObsoleteClientException) {
128+
dialogs.displayError(
129+
"Failed to check for new exercises.\n"
130+
+ ServerErrorHelper.getServerExceptionMsg(ex));
105131
}
106-
} else if (!beQuiet) {
107-
dialogs.displayMessage("No new exercises or updates to download.");
108132
}
109-
}
110-
}
111-
112-
@Override
113-
public void bgTaskCancelled() {
114-
}
115-
116-
@Override
117-
public void bgTaskFailed(Throwable ex) {
118-
if (!beQuiet || ex instanceof ObsoleteClientException) {
119-
dialogs.displayError("Failed to check for new exercises.\n" + ServerErrorHelper.getServerExceptionMsg(ex));
120-
}
121-
}
122-
};
123-
124-
BgTask.start("Checking for new exercises", new CancellableCallable<Course>() {
125-
ListenableFuture<Course> currentCourseFuture;
126-
127-
@Override
128-
public Course call() throws Exception {
129-
logger.info("Downloading course to refresh cache");
130-
currentCourseFuture = tmcCore.getCourse(currentCourseBeforeUpdate.getDetailsUrlAsUri());
131-
return currentCourseFuture.get();
132-
}
133-
134-
@Override
135-
public boolean cancel() {
136-
logger.log(INFO, "Get course (refresh list) cancelled.");
137-
return currentCourseFuture.cancel(true);
138-
}
139-
}, bgTaskListener);
133+
};
134+
135+
BgTask.start(
136+
"Checking for new exercises",
137+
new CancellableCallable<Course>() {
138+
ListenableFuture<Course> currentCourseFuture;
139+
140+
@Override
141+
public Course call() throws Exception {
142+
logger.info("Downloading course to refresh cache");
143+
currentCourseFuture =
144+
tmcCore.getCourse(currentCourseBeforeUpdate.getDetailsUrlAsUri());
145+
return currentCourseFuture.get();
146+
}
140147

148+
@Override
149+
public boolean cancel() {
150+
logger.log(INFO, "Get course (refresh list) cancelled.");
151+
return currentCourseFuture.cancel(true);
152+
}
153+
},
154+
bgTaskListener);
141155
}
142156

143157
private void displayNotification(LocalExerciseStatus status, ActionListener action) {
@@ -157,10 +171,10 @@ private void displayNotification(LocalExerciseStatus status, ActionListener acti
157171
actions.add("update");
158172
}
159173

160-
int total
161-
= status.unlockable.size()
162-
+ status.downloadableUncompleted.size()
163-
+ status.updateable.size();
174+
int total =
175+
status.unlockable.size()
176+
+ status.downloadableUncompleted.size()
177+
+ status.updateable.size();
164178

165179
String msg = TmcStringUtils.joinCommaAnd(items);
166180
msg += " " + Inflector.pluralize(total, "is") + " available.";
@@ -174,4 +188,4 @@ private void displayNotification(LocalExerciseStatus status, ActionListener acti
174188
private Icon getNotificationIcon() {
175189
return ImageUtilities.loadImageIcon("fi/helsinki/cs/tmc/smile.gif", false);
176190
}
177-
}
191+
}

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

Lines changed: 46 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,9 @@
2626
import java.util.logging.Logger;
2727
import javax.swing.SwingUtilities;
2828

29-
@ActionID(category = "TMC",
30-
id = "fi.helsinki.cs.tmc.actions.CheckForNewReviews")
29+
@ActionID(category = "TMC", id = "fi.helsinki.cs.tmc.actions.CheckForNewReviews")
3130
@ActionRegistration(displayName = "#CTL_CheckForNewReviews")
32-
@ActionReferences({
33-
@ActionReference(path = "Menu/TM&C", position = -40)
34-
})
31+
@ActionReferences({@ActionReference(path = "Menu/TM&C", position = -40)})
3532
@NbBundle.Messages("CTL_CheckForNewReviews=Check for new code &reviews")
3633
public class CheckForNewReviews implements ActionListener, Runnable {
3734

@@ -63,7 +60,8 @@ public static void startTimer() {
6360
this(false, true, true);
6461
}
6562

66-
CheckForNewReviews(boolean beQuiet, boolean resetNotifications, boolean notifyAboutNoNewReviews) {
63+
CheckForNewReviews(
64+
boolean beQuiet, boolean resetNotifications, boolean notifyAboutNoNewReviews) {
6765
this.courseDb = CourseDb.getInstance();
6866
this.reviewDb = ReviewDb.getInstance();
6967
this.dialogs = ConvenientDialogDisplayer.getDefault();
@@ -93,40 +91,46 @@ public void run() {
9391
if (course.getReviewsUrl() == null) {
9492
return;
9593
}
96-
BgTaskListener bgTaskListener = new BgTaskListener<List<Review>>() {
97-
@Override
98-
public void bgTaskReady(List<Review> result) {
99-
boolean newReviews = reviewDb.setReviews(result);
100-
if (!newReviews && notifyAboutNoNewReviews) {
101-
dialogs.displayMessage("You have no unread code reviews.");
102-
}
103-
}
104-
105-
@Override
106-
public void bgTaskFailed(final Throwable ex) {
107-
final String msg = "Failed to check for code reviews";
108-
log.log(INFO, msg, ex);
109-
if (!beQuiet) {
110-
dialogs.displayError(msg, ex);
111-
}
112-
}
113-
114-
@Override
115-
public void bgTaskCancelled() {
116-
}
117-
};
118-
BgTask.start("Checking for code reviews", new CancellableCallable<List<Review>>() {
119-
private ListenableFuture<List<Review>> lf;
120-
@Override
121-
public List<Review> call() throws Exception {
122-
lf = TmcCoreSingleton.getInstance().getNewReviews(courseDb.getCurrentCourse());
123-
return lf.get();
124-
}
125-
126-
@Override
127-
public boolean cancel() {
128-
return lf.cancel(true);
129-
}
130-
}, bgTaskListener);
94+
BgTaskListener bgTaskListener =
95+
new BgTaskListener<List<Review>>() {
96+
@Override
97+
public void bgTaskReady(List<Review> result) {
98+
boolean newReviews = reviewDb.setReviews(result);
99+
if (!newReviews && notifyAboutNoNewReviews) {
100+
dialogs.displayMessage("You have no unread code reviews.");
101+
}
102+
}
103+
104+
@Override
105+
public void bgTaskFailed(final Throwable ex) {
106+
final String msg = "Failed to check for code reviews";
107+
log.log(INFO, msg, ex);
108+
if (!beQuiet) {
109+
dialogs.displayError(msg, ex);
110+
}
111+
}
112+
113+
@Override
114+
public void bgTaskCancelled() {}
115+
};
116+
BgTask.start(
117+
"Checking for code reviews",
118+
new CancellableCallable<List<Review>>() {
119+
private ListenableFuture<List<Review>> lf;
120+
121+
@Override
122+
public List<Review> call() throws Exception {
123+
lf =
124+
TmcCoreSingleton.getInstance()
125+
.getNewReviews(courseDb.getCurrentCourse());
126+
return lf.get();
127+
}
128+
129+
@Override
130+
public boolean cancel() {
131+
return lf.cancel(true);
132+
}
133+
},
134+
bgTaskListener);
131135
}
132-
}
136+
}

0 commit comments

Comments
 (0)