Skip to content

Commit fdc2b5b

Browse files
jamojamo
committed
Use tmc-core settings
1 parent 4acc9c0 commit fdc2b5b

27 files changed

+122
-62
lines changed

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package fi.helsinki.cs.tmc.actions;
22

3+
import fi.helsinki.cs.tmc.core.holders.TmcSettingsHolder;
4+
import fi.helsinki.cs.tmc.coreimpl.TmcCoreSettingsImpl;
35
import fi.helsinki.cs.tmc.data.Course;
46
import fi.helsinki.cs.tmc.data.CourseListUtils;
57
import fi.helsinki.cs.tmc.events.TmcEvent;
@@ -8,14 +10,14 @@
810
import fi.helsinki.cs.tmc.model.LocalExerciseStatus;
911
import fi.helsinki.cs.tmc.model.ObsoleteClientException;
1012
import fi.helsinki.cs.tmc.model.ServerAccess;
11-
import fi.helsinki.cs.tmc.model.TmcSettings;
1213
import fi.helsinki.cs.tmc.ui.DownloadOrUpdateExercisesDialog;
1314
import fi.helsinki.cs.tmc.ui.ConvenientDialogDisplayer;
1415
import fi.helsinki.cs.tmc.ui.TmcNotificationDisplayer;
1516
import fi.helsinki.cs.tmc.utilities.BgTask;
1617
import fi.helsinki.cs.tmc.utilities.BgTaskListener;
1718
import fi.helsinki.cs.tmc.utilities.Inflector;
1819
import fi.helsinki.cs.tmc.utilities.TmcStringUtils;
20+
1921
import java.awt.event.ActionEvent;
2022
import java.awt.event.ActionListener;
2123
import java.util.ArrayList;
@@ -77,8 +79,8 @@ public void actionPerformed(ActionEvent e) {
7779

7880
public void run() {
7981
final Course currentCourseBeforeUpdate = courseDb.getCurrentCourse();
80-
81-
if (backgroundCheck && !TmcSettings.getDefault().isCheckingForUpdatesInTheBackground()) {
82+
83+
if (backgroundCheck && !((TmcCoreSettingsImpl)TmcSettingsHolder.get()).isCheckingForUpdatesInTheBackground()) {
8284
return;
8385
}
8486

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

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

3+
import fi.helsinki.cs.tmc.core.holders.TmcSettingsHolder;
4+
import fi.helsinki.cs.tmc.coreimpl.TmcCoreSettingsImpl;
35
import fi.helsinki.cs.tmc.data.Exercise;
46
import fi.helsinki.cs.tmc.model.CourseDb;
57
import fi.helsinki.cs.tmc.model.ProjectMediator;
68
import fi.helsinki.cs.tmc.model.TmcProjectInfo;
7-
import fi.helsinki.cs.tmc.model.TmcSettings;
89
import fi.helsinki.cs.tmc.ui.TmcNotificationDisplayer;
10+
911
import java.awt.event.ActionEvent;
1012
import java.awt.event.ActionListener;
1113
import java.util.ArrayList;
@@ -16,7 +18,7 @@
1618

1719
public class CheckForUnopenedExercises implements ActionListener {
1820
public static boolean shouldRunOnStartup() {
19-
return TmcSettings.getDefault().isCheckingForUnopenedAtStartup();
21+
return ((TmcCoreSettingsImpl)TmcSettingsHolder.get()).isCheckingForUnopenedAtStartup();
2022
}
2123

2224
private static final TmcNotificationDisplayer.SingletonToken notifierToken = TmcNotificationDisplayer.createSingletonToken();

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

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

3+
import fi.helsinki.cs.tmc.core.holders.TmcSettingsHolder;
4+
import fi.helsinki.cs.tmc.coreimpl.TmcCoreSettingsImpl;
35
import fi.helsinki.cs.tmc.data.Exercise;
46
import fi.helsinki.cs.tmc.events.TmcEvent;
57
import fi.helsinki.cs.tmc.events.TmcEventBus;
68
import fi.helsinki.cs.tmc.model.CourseDb;
79
import fi.helsinki.cs.tmc.model.ProjectMediator;
810
import fi.helsinki.cs.tmc.model.ServerAccess;
911
import fi.helsinki.cs.tmc.model.TmcProjectInfo;
10-
import fi.helsinki.cs.tmc.model.TmcSettings;
1112
import fi.helsinki.cs.tmc.ui.ConvenientDialogDisplayer;
1213
import fi.helsinki.cs.tmc.utilities.BgTask;
1314
import fi.helsinki.cs.tmc.utilities.BgTaskListener;
@@ -131,7 +132,7 @@ public Void apply(Boolean yes) {
131132
}
132133

133134
private void downloadSolution(final Exercise ex, final TmcProjectInfo proj) {
134-
ServerAccess serverAccess = new ServerAccess(TmcSettings.getDefault());
135+
ServerAccess serverAccess = new ServerAccess(((TmcCoreSettingsImpl)TmcSettingsHolder.get()));
135136
CancellableCallable<byte[]> downloadTask =
136137
serverAccess.getDownloadingExerciseSolutionZipTask(ex);
137138
BgTask.start(

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
package fi.helsinki.cs.tmc.actions;
22

3+
import fi.helsinki.cs.tmc.core.holders.TmcSettingsHolder;
4+
import fi.helsinki.cs.tmc.coreimpl.TmcCoreSettingsImpl;
35
import fi.helsinki.cs.tmc.data.Exercise;
46
import fi.helsinki.cs.tmc.events.TmcEvent;
57
import fi.helsinki.cs.tmc.events.TmcEventBus;
68
import fi.helsinki.cs.tmc.model.CourseDb;
79
import fi.helsinki.cs.tmc.model.ProjectMediator;
810
import fi.helsinki.cs.tmc.model.ServerAccess;
911
import fi.helsinki.cs.tmc.model.TmcProjectInfo;
10-
import fi.helsinki.cs.tmc.model.TmcSettings;
1112
import fi.helsinki.cs.tmc.ui.ConvenientDialogDisplayer;
1213
import fi.helsinki.cs.tmc.ui.PastebinDialog;
1314
import fi.helsinki.cs.tmc.ui.PastebinResponseDialog;
@@ -50,14 +51,14 @@
5051
public final class PastebinAction extends AbstractExerciseSensitiveAction {
5152

5253
private static final Logger log = Logger.getLogger(RequestReviewAction.class.getName());
53-
private TmcSettings settings;
54+
private TmcCoreSettingsImpl settings;
5455
private CourseDb courseDb;
5556
private ProjectMediator projectMediator;
5657
private ConvenientDialogDisplayer dialogs;
5758
private TmcEventBus eventBus;
5859

5960
public PastebinAction() {
60-
this.settings = TmcSettings.getDefault();
61+
this.settings = ((TmcCoreSettingsImpl)TmcSettingsHolder.get());
6162
this.courseDb = CourseDb.getInstance();
6263
this.projectMediator = ProjectMediator.getInstance();
6364
this.dialogs = ConvenientDialogDisplayer.getDefault();

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,17 @@
11
package fi.helsinki.cs.tmc.actions;
22

3+
import fi.helsinki.cs.tmc.core.holders.TmcSettingsHolder;
4+
import fi.helsinki.cs.tmc.coreimpl.TmcCoreSettingsImpl;
35
import fi.helsinki.cs.tmc.data.Course;
46
import fi.helsinki.cs.tmc.data.CourseListUtils;
57
import fi.helsinki.cs.tmc.model.CourseDb;
68
import fi.helsinki.cs.tmc.model.ServerAccess;
7-
import fi.helsinki.cs.tmc.model.TmcSettings;
89
import fi.helsinki.cs.tmc.utilities.BgTaskListener;
910
import fi.helsinki.cs.tmc.ui.ConvenientDialogDisplayer;
1011
import fi.helsinki.cs.tmc.utilities.BgTask;
1112
import fi.helsinki.cs.tmc.utilities.BgTaskListenerList;
1213
import fi.helsinki.cs.tmc.utilities.CancellableCallable;
14+
1315
import java.util.ArrayList;
1416
import java.util.List;
1517
import java.util.logging.Level;
@@ -28,10 +30,10 @@ public final class RefreshCoursesAction {
2830
private BgTaskListenerList<List<Course>> listeners;
2931

3032
public RefreshCoursesAction() {
31-
this(TmcSettings.getDefault());
33+
this((TmcCoreSettingsImpl)TmcSettingsHolder.get());
3234
}
3335

34-
public RefreshCoursesAction(TmcSettings settings) {
36+
public RefreshCoursesAction(TmcCoreSettingsImpl settings) {
3537
this.serverAccess = new ServerAccess(settings);
3638
this.serverAccess.setSettings(settings);
3739
this.courseDb = CourseDb.getInstance();

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

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,25 @@
11
package fi.helsinki.cs.tmc.actions;
22

3+
import fi.helsinki.cs.tmc.core.holders.TmcSettingsHolder;
4+
import fi.helsinki.cs.tmc.coreimpl.TmcCoreSettingsImpl;
5+
36
import com.google.gson.Gson;
7+
48
import fi.helsinki.cs.tmc.data.Exercise;
59
import fi.helsinki.cs.tmc.events.TmcEvent;
610
import fi.helsinki.cs.tmc.events.TmcEventBus;
711
import fi.helsinki.cs.tmc.model.CourseDb;
812
import fi.helsinki.cs.tmc.model.ProjectMediator;
913
import fi.helsinki.cs.tmc.model.ServerAccess;
1014
import fi.helsinki.cs.tmc.model.TmcProjectInfo;
11-
import fi.helsinki.cs.tmc.model.TmcSettings;
1215
import fi.helsinki.cs.tmc.spyware.LoggableEvent;
1316
import fi.helsinki.cs.tmc.ui.CodeReviewRequestDialog;
1417
import fi.helsinki.cs.tmc.ui.ConvenientDialogDisplayer;
1518
import fi.helsinki.cs.tmc.utilities.BgTask;
1619
import fi.helsinki.cs.tmc.utilities.BgTaskListener;
1720
import fi.helsinki.cs.tmc.utilities.CancellableCallable;
1821
import fi.helsinki.cs.tmc.utilities.zip.RecursiveZipper;
22+
1923
import java.awt.event.ActionEvent;
2024
import java.awt.event.ActionListener;
2125
import java.net.URI;
@@ -45,14 +49,14 @@
4549
public class RequestReviewAction extends AbstractExerciseSensitiveAction {
4650

4751
private static final Logger log = Logger.getLogger(RequestReviewAction.class.getName());
48-
private TmcSettings settings;
52+
private TmcCoreSettingsImpl settings;
4953
private CourseDb courseDb;
5054
private ProjectMediator projectMediator;
5155
private ConvenientDialogDisplayer dialogs;
5256
private TmcEventBus eventBus;
5357

5458
public RequestReviewAction() {
55-
this.settings = TmcSettings.getDefault();
59+
this.settings = (TmcCoreSettingsImpl)TmcSettingsHolder.get();
5660
this.courseDb = CourseDb.getInstance();
5761
this.projectMediator = ProjectMediator.getInstance();
5862
this.dialogs = ConvenientDialogDisplayer.getDefault();

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

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

3+
import fi.helsinki.cs.tmc.core.TmcCore;
4+
import fi.helsinki.cs.tmc.core.configuration.TmcSettings;
5+
import fi.helsinki.cs.tmc.core.holders.TmcSettingsHolder;
6+
import fi.helsinki.cs.tmc.coreimpl.TmcCoreSettingsImpl;
37
import fi.helsinki.cs.tmc.data.Course;
48
import fi.helsinki.cs.tmc.events.TmcEvent;
59
import fi.helsinki.cs.tmc.events.TmcEventBus;
610
import fi.helsinki.cs.tmc.model.CourseDb;
711
import fi.helsinki.cs.tmc.model.LocalExerciseStatus;
8-
import fi.helsinki.cs.tmc.model.TmcSettings;
912
import fi.helsinki.cs.tmc.ui.PreferencesUI;
1013
import fi.helsinki.cs.tmc.ui.DownloadOrUpdateExercisesDialog;
1114
import fi.helsinki.cs.tmc.utilities.BgTaskListener;
15+
1216
import java.awt.event.ActionEvent;
1317
import java.util.List;
1418
import javax.swing.AbstractAction;
@@ -17,9 +21,11 @@ public class SaveSettingsAction extends AbstractAction {
1721

1822
private CourseDb courseDb;
1923
private TmcEventBus eventBus;
24+
private TmcCore tmcCore;
2025
public SaveSettingsAction() {
2126
this.courseDb = CourseDb.getInstance();
2227
this.eventBus = TmcEventBus.getDefault();
28+
this.tmcCore = TmcCore.get();
2329
}
2430

2531
@Override
@@ -33,7 +39,9 @@ public void actionPerformed(ActionEvent e) {
3339

3440
PreferencesUI prefUi = (PreferencesUI) e.getSource();
3541

36-
TmcSettings settings = TmcSettings.getDefault();
42+
TmcCoreSettingsImpl settings = (TmcCoreSettingsImpl) TmcSettingsHolder.get();
43+
44+
// TmcSettings settings = TmcSettings.getDefault();
3745
settings.setUsername(prefUi.getUsername());
3846
settings.setPassword(prefUi.getPassword());
3947
settings.setSavingPassword(prefUi.getShouldSavePassword());

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

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

3+
import fi.helsinki.cs.tmc.core.holders.TmcSettingsHolder;
4+
import fi.helsinki.cs.tmc.coreimpl.TmcCoreSettingsImpl;
35
import fi.helsinki.cs.tmc.model.CourseDb;
4-
import fi.helsinki.cs.tmc.model.TmcSettings;
56
import fi.helsinki.cs.tmc.tailoring.SelectedTailoring;
67
import fi.helsinki.cs.tmc.tailoring.Tailoring;
78
import fi.helsinki.cs.tmc.ui.PreferencesUI;
89
import fi.helsinki.cs.tmc.ui.PreferencesUIFactory;
10+
911
import java.awt.event.ActionEvent;
1012
import java.awt.event.ActionListener;
1113
import javax.swing.AbstractAction;
@@ -50,7 +52,7 @@ public void run() {
5052

5153
final PreferencesUI prefUI = prefUiFactory.createCurrentPreferencesUI();
5254

53-
TmcSettings settings = TmcSettings.getDefault();
55+
TmcCoreSettingsImpl settings = (TmcCoreSettingsImpl) TmcSettingsHolder.get();
5456
prefUI.setUsername(settings.getUsername());
5557
prefUI.setPassword(settings.getPassword());
5658
prefUI.setShouldSavePassword(settings.isSavingPassword());

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

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,20 @@
11
package fi.helsinki.cs.tmc.actions;
22

3+
import fi.helsinki.cs.tmc.core.TmcCore;
4+
import fi.helsinki.cs.tmc.core.holders.TmcLangsHolder;
5+
import fi.helsinki.cs.tmc.core.holders.TmcSettingsHolder;
6+
import fi.helsinki.cs.tmc.coreimpl.TmcCoreSettingsImpl;
37
import fi.helsinki.cs.tmc.data.Course;
48
import fi.helsinki.cs.tmc.events.TmcEvent;
59
import fi.helsinki.cs.tmc.events.TmcEventBus;
10+
import fi.helsinki.cs.tmc.langs.util.TaskExecutorImpl;
611
import fi.helsinki.cs.tmc.model.CourseDb;
712
import fi.helsinki.cs.tmc.model.PushEventListener;
813
import fi.helsinki.cs.tmc.model.ServerAccess;
914
import fi.helsinki.cs.tmc.spyware.SpywareFacade;
1015
import fi.helsinki.cs.tmc.ui.LoginDialog;
1116
import fi.helsinki.cs.tmc.utilities.BgTaskListener;
17+
1218
import java.util.ArrayList;
1319
import java.util.List;
1420
import java.util.logging.Level;
@@ -35,12 +41,16 @@ public void restored() {
3541
WindowManager.getDefault().invokeWhenUIReady(new Runnable() {
3642
@Override
3743
public void run() {
44+
TmcLangsHolder.set(new TaskExecutorImpl());
45+
TmcSettingsHolder.set(new TmcCoreSettingsImpl());
46+
TmcCore.setInstance(new TmcCore());
47+
3848
CheckForNewExercisesOrUpdates.startTimer();
3949
CheckForNewReviews.startTimer();
4050
ReviewEventListener.start();
4151
PushEventListener.start();
4252
SpywareFacade.start();
43-
53+
4454
Preferences prefs = NbPreferences.forModule(TmcModuleInstall.class);
4555

4656
SpecificationVersion currentVersion = getCurrentModuleVersion();

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
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;
3+
import fi.helsinki.cs.tmc.langs.abstraction.Strategy;
4+
import fi.helsinki.cs.tmc.langs.abstraction.ValidationResult;
55
import fi.helsinki.cs.tmc.ui.TestResultWindow;
66

77
import java.util.List;

0 commit comments

Comments
 (0)