Skip to content

Commit 5fbcb31

Browse files
RedandeRedande
committed
Rename snapshots-package
1 parent 2ed1b74 commit 5fbcb31

23 files changed

+60
-115
lines changed

‎build.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
<target name="-check-mavenmodules">
1212
<uptodate property="mavenmodules.uptodate"
13-
srcfile="maven-wrapper/target/nbm/maven-wrapper-1.21.nbm"
13+
srcfile="maven-wrapper/target/nbm/maven-wrapper-1.22.nbm"
1414
targetfile="mavenmodules"/>
1515
</target>
1616

‎maven-wrapper/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
<groupId>fi.helsinki.cs.tmc</groupId>
66
<artifactId>maven-wrapper</artifactId>
7-
<version>1.21</version>
7+
<version>1.22</version>
88
<packaging>nbm</packaging>
99

1010
<name>TMC Maven Wrapper</name>
@@ -46,7 +46,7 @@
4646
<dependency>
4747
<groupId>${project.groupId}</groupId>
4848
<artifactId>core</artifactId>
49-
<version>0.10.4-SNAPSHOT</version>
49+
<version>0.10.5-SNAPSHOT</version>
5050
</dependency>
5151
<dependency>
5252
<groupId>${project.groupId}</groupId>
@@ -143,7 +143,7 @@
143143
<publicPackage>org.apache.commons.*</publicPackage>
144144
<publicPackage>org.apache.oltu.oauth2.common.*</publicPackage>
145145
<publicPackage>fi.helsinki.cs.tmc.core.*</publicPackage>
146-
<publicPackage>fi.helsinki.cs.tmc.spyware.*</publicPackage>
146+
<publicPackage>fi.helsinki.cs.tmc.snapshots.*</publicPackage>
147147
<publicPackage>fi.helsinki.cs.tmc.langs.abstraction.*</publicPackage>
148148
<publicPackage>fi.helsinki.cs.tmc.langs.domain.*</publicPackage>
149149
<publicPackage>fi.helsinki.cs.tmc.langs.util.*</publicPackage>

‎tmc-plugin/manifest.mf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ OpenIDE-Module-Requires:
66
org.openide.windows.IOProvider,
77
org.openide.windows.WindowManager
88
OpenIDE-Module-Install: fi/helsinki/cs/tmc/actions/TmcModuleInstall.class
9-
OpenIDE-Module-Specification-Version: 1.1.14
9+
OpenIDE-Module-Specification-Version: 1.1.15

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
import fi.helsinki.cs.tmc.model.CourseDb;
1515
import fi.helsinki.cs.tmc.model.ProjectMediator;
1616
import fi.helsinki.cs.tmc.model.TmcProjectInfo;
17-
import fi.helsinki.cs.tmc.spyware.LoggableEvent;
17+
import fi.helsinki.cs.tmc.snapshots.LoggableEvent;
1818
import fi.helsinki.cs.tmc.ui.CodeReviewRequestDialog;
1919
import fi.helsinki.cs.tmc.ui.ConvenientDialogDisplayer;
2020
import fi.helsinki.cs.tmc.utilities.BgTask;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
import fi.helsinki.cs.tmc.model.CourseDb;
1414
import fi.helsinki.cs.tmc.model.PushEventListener;
1515
import fi.helsinki.cs.tmc.model.ReviewDb;
16-
import fi.helsinki.cs.tmc.spyware.LoggableEvent;
16+
import fi.helsinki.cs.tmc.snapshots.LoggableEvent;
1717
import fi.helsinki.cs.tmc.ui.CodeReviewDialog;
1818
import fi.helsinki.cs.tmc.ui.TmcNotificationDisplayer;
1919
import fi.helsinki.cs.tmc.utilities.BgTask;

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ public void actionPerformed(ActionEvent e) {
5656
settings.setProjectRootDir(prefUi.getProjectDir());
5757
settings.setCheckingForUpdatesInTheBackground(prefUi.getCheckForUpdatesInTheBackground());
5858
settings.setCheckingForUnopenedAtStartup(prefUi.getCheckForUnopenedExercisesAtStartup());
59-
settings.setIsSpywareEnabled(prefUi.getSpywareEnabled());
6059
settings.setErrorMsgLocale(prefUi.getErrorMsgLocale());
6160
settings.setResolveDependencies(prefUi.getResolveProjectDependenciesEnabled());
6261
settings.setSendDiagnostics(prefUi.getSendDiagnosticsEnabled());

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import fi.helsinki.cs.tmc.exerciseSubmitter.ExerciseSubmitter;
44
import fi.helsinki.cs.tmc.model.CourseDb;
55
import fi.helsinki.cs.tmc.model.ProjectMediator;
6-
import fi.helsinki.cs.tmc.spywareLocal.SpywareFacade;
6+
import fi.helsinki.cs.tmc.snapshotsLocal.SnapshotsFacade;
77

88
import org.netbeans.api.project.Project;
99
import org.openide.nodes.Node;
@@ -37,7 +37,7 @@ protected ProjectMediator getProjectMediator() {
3737
@Override
3838
protected void performAction(Node[] nodes) {
3939
new ExerciseSubmitter().performAction(projectsFromNodes(nodes).toArray(new Project[0]));
40-
SpywareFacade.sendNow();
40+
SnapshotsFacade.sendNow();
4141
}
4242

4343
@Override

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import fi.helsinki.cs.tmc.core.holders.TmcSettingsHolder;
88
import fi.helsinki.cs.tmc.coreimpl.TmcCoreSettingsImpl;
99
import fi.helsinki.cs.tmc.langs.util.TaskExecutorImpl;
10-
import fi.helsinki.cs.tmc.spywareLocal.SpywareFacade;
10+
import fi.helsinki.cs.tmc.snapshotsLocal.SnapshotsFacade;
1111
import fi.helsinki.cs.tmc.tasks.LoginTask;
1212
import fi.helsinki.cs.tmc.utilities.BgTask;
1313
import fi.helsinki.cs.tmc.utilities.BgTaskListener;
@@ -61,7 +61,7 @@ public void run() {
6161
final CheckDiskSpace checkDiskSpace = new CheckDiskSpace((TmcCoreSettingsImpl)settings);
6262
checkDiskSpace.startCheckingPeriodically();
6363
checkDiskSpace.run();
64-
SpywareFacade.start();
64+
SnapshotsFacade.start();
6565

6666
Preferences prefs = NbPreferences.forModule(TmcModuleInstall.class);
6767

@@ -129,9 +129,9 @@ private SpecificationVersion getCurrentModuleVersion() {
129129
@Override
130130
public void close() {
131131
try {
132-
SpywareFacade.close();
132+
SnapshotsFacade.close();
133133
} catch (Exception e) {
134-
log.log(Level.WARNING, "Failed to close SpywareFacade.", e);
134+
log.log(Level.WARNING, "Failed to close SnapshotsFacade.", e);
135135
}
136136
}
137137

‎tmc-plugin/src/fi/helsinki/cs/tmc/coreimpl/TmcCoreSettingsImpl.java

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,6 @@ public class TmcCoreSettingsImpl implements TmcSettings {
3636
private static final String PREF_PROJECT_ROOT_DIR = "projectRootDir";
3737
private static final String PREF_CHECK_FOR_UPDATES_IN_BACKGROUND = "checkForUpdatesInBackground";
3838
private static final String PREF_CHECK_FOR_UNOPENED_AT_STARTUP = "checkForUnopenedAtStartup";
39-
private static final String PREF_SPYWARE_ENABLED = "spywareEnabled";
40-
private static final String PREF_DETAILED_SPYWARE_ENABLED = "detailedSpywareEnabled";
4139
private static final String PREF_ERROR_MSG_LOCALE = "errorMsgLocale";
4240
private static final String PREF_RESOLVE_DEPENDENCIES = "resolveDependencies";
4341
private static final String PREF_SEND_DIAGNOSTICS = "sendDiagnostics";
@@ -270,20 +268,6 @@ public void setCheckingForUnopenedAtStartup(boolean value) {
270268
settings.put(PREF_CHECK_FOR_UNOPENED_AT_STARTUP, value ? "1" : "0");
271269
}
272270

273-
public boolean isSpywareEnabled() {
274-
String defaultValue = tailoring.isSpywareEnabledByDefault() ? "1" : "0";
275-
return settings.get(PREF_SPYWARE_ENABLED, defaultValue).equals("1");
276-
}
277-
278-
public void setIsSpywareEnabled(boolean value) {
279-
settings.put(PREF_SPYWARE_ENABLED, value ? "1" : "0");
280-
}
281-
282-
public boolean isDetailedSpywareEnabled() {
283-
String defaultValue = tailoring.isDetailedSpywareEnabledByDefault() ? "1" : "0";
284-
return settings.get(PREF_DETAILED_SPYWARE_ENABLED, defaultValue).equals("1");
285-
}
286-
287271
public Locale getErrorMsgLocale() {
288272
Locale dflt = tailoring.getDefaultErrorMsgLocale();
289273
return parseLocale(settings.get(PREF_ERROR_MSG_LOCALE, ""), dflt);

‎tmc-plugin/src/fi/helsinki/cs/tmc/layer.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,19 +37,19 @@
3737
<folder name="Projects">
3838
<folder name="org-netbeans-modules-java-j2seproject">
3939
<folder name="Lookup">
40-
<file name="fi-helsinki-cs-tmc-spyware-eventsources-ProjectActionCaptor.instance">
40+
<file name="fi-helsinki-cs-tmc-snapshots-eventsources-ProjectActionCaptor.instance">
4141
<attr methodvalue="org.netbeans.modules.projectapi.LazyLookupProviders.forProjectServiceProvider" name="instanceCreate"/>
42-
<attr name="class" stringvalue="fi.helsinki.cs.tmc.spyware.eventsources.ProjectActionCaptor"/>
42+
<attr name="class" stringvalue="fi.helsinki.cs.tmc.snapshots.eventsources.ProjectActionCaptor"/>
4343
<attr name="service" stringvalue="org.netbeans.spi.project.ActionProvider"/>
4444
<attr name="position" intvalue="-9999999"/> <!-- Gotta be first -->
4545
</file>
4646
</folder>
4747
</folder>
4848
<folder name="org-netbeans-modules-maven">
4949
<folder name="Lookup">
50-
<file name="fi-helsinki-cs-tmc-spyware-eventsources-ProjectActionCaptor.instance">
50+
<file name="fi-helsinki-cs-tmc-snapshots-eventsources-ProjectActionCaptor.instance">
5151
<attr methodvalue="org.netbeans.modules.projectapi.LazyLookupProviders.forProjectServiceProvider" name="instanceCreate"/>
52-
<attr name="class" stringvalue="fi.helsinki.cs.tmc.spyware.eventsources.ProjectActionCaptor"/>
52+
<attr name="class" stringvalue="fi.helsinki.cs.tmc.snapshots.eventsources.ProjectActionCaptor"/>
5353
<attr name="service" stringvalue="org.netbeans.spi.project.ActionProvider"/>
5454
<attr name="position" intvalue="-9999999"/> <!-- Gotta be first -->
5555
</file>

0 commit comments

Comments
 (0)