Skip to content

Commit 084b65a

Browse files
committed
Remove snapshot-collection checkbox from TMC-settings
1 parent c1eed2c commit 084b65a

File tree

5 files changed

+4
-35
lines changed

5 files changed

+4
-35
lines changed

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@ public void run() {
6767
prefUI.setProjectDir(settings.getProjectRootDir());
6868
prefUI.setCheckForUpdatesInTheBackground(settings.isCheckingForUpdatesInTheBackground());
6969
prefUI.setCheckForUnopenedExercisesAtStartup(settings.isCheckingForUnopenedAtStartup());
70-
prefUI.setSpywareEnabled(settings.isSpywareEnabled());
7170
prefUI.setErrorMsgLocale(settings.getErrorMsgLocale());
7271
prefUI.setResolveProjectDependenciesEnabled(settings.getResolveDependencies());
7372
prefUI.setSendDiagnosticsEnabled(settings.getSendDiagnostics());

tmc-plugin/src/fi/helsinki/cs/tmc/ui/Bundle.properties

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,6 @@ SuccessfulSubmissionDialog.yayLabel.text=All tests passed on the server.
3838
PreferencesPanel.checkForUpdatesInBackgroundCheckbox.text=Check for new or updated exercises regularly
3939
PreferencesPanel.checkForUnopenedExercisesCheckbox.text=Check that all active exercises are open on startup
4040
PreferencesPanel.checkForUnopenedExercisesCheckbox.toolTipText=Leave this on unless you like to close exercises after you're done with them.
41-
PreferencesPanel.spywareEnabledCheckbox.text=Send snapshots of your progress for study
42-
PreferencesPanel.spywareEnabledCheckbox.toolTipText=Regularly send snapshots of your code to the server. We respectfully ask you keep this on as this helps us understand the kinds of problems students have with exercises.
4341
PreferencesPanel.errorMsgLocaleLabel.text=Preferred error message language
4442
PreferencesPanel.errorMsgLocaleLabel.toolTipText=Some (but not nearly all) error messages in some exercises' tests have been translated.
4543
PreferencesPanel.errorMsgLocaleComboBox.toolTipText=Some (but not nearly all) error messages in some exercises' tests have been translated.

tmc-plugin/src/fi/helsinki/cs/tmc/ui/PreferencesPanel.form

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,6 @@
7575
<Group type="103" groupAlignment="0" attributes="0">
7676
<Component id="checkForUnopenedExercisesCheckbox" alignment="0" min="-2" max="-2" attributes="0"/>
7777
<Component id="checkForUpdatesInBackgroundCheckbox" alignment="0" min="-2" max="-2" attributes="0"/>
78-
<Component id="spywareEnabledCheckbox" alignment="0" min="-2" max="-2" attributes="0"/>
7978
</Group>
8079
<EmptySpace min="0" pref="0" max="32767" attributes="0"/>
8180
</Group>
@@ -127,9 +126,7 @@
127126
<Component id="resolveDependencies" min="-2" max="-2" attributes="0"/>
128127
<EmptySpace max="-2" attributes="0"/>
129128
<Component id="sendDiagnostics" min="-2" max="-2" attributes="0"/>
130-
<EmptySpace max="-2" attributes="0"/>
131-
<Component id="spywareEnabledCheckbox" min="-2" max="-2" attributes="0"/>
132-
<EmptySpace min="-2" pref="18" max="-2" attributes="0"/>
129+
<EmptySpace type="separate" min="-2" max="-2" attributes="0"/>
133130
<Component id="jSeparator3" min="-2" max="-2" attributes="0"/>
134131
<EmptySpace type="separate" max="-2" attributes="0"/>
135132
<Group type="103" groupAlignment="3" attributes="0">
@@ -214,16 +211,6 @@
214211
</Property>
215212
</Properties>
216213
</Component>
217-
<Component class="javax.swing.JCheckBox" name="spywareEnabledCheckbox">
218-
<Properties>
219-
<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
220-
<ResourceString bundle="fi/helsinki/cs/tmc/ui/Bundle.properties" key="PreferencesPanel.spywareEnabledCheckbox.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
221-
</Property>
222-
<Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
223-
<ResourceString bundle="fi/helsinki/cs/tmc/ui/Bundle.properties" key="PreferencesPanel.spywareEnabledCheckbox.toolTipText" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
224-
</Property>
225-
</Properties>
226-
</Component>
227214
<Component class="javax.swing.JSeparator" name="jSeparator2">
228215
</Component>
229216
<Component class="javax.swing.JSeparator" name="jSeparator3">

tmc-plugin/src/fi/helsinki/cs/tmc/ui/PreferencesPanel.java

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -139,12 +139,7 @@ public void setResolveProjectDependenciesEnabled(boolean value) {
139139

140140
@Override
141141
public boolean getSpywareEnabled() {
142-
return spywareEnabledCheckbox.isSelected();
143-
}
144-
145-
@Override
146-
public void setSpywareEnabled(boolean enabled) {
147-
spywareEnabledCheckbox.setSelected(enabled);
142+
return true;
148143
}
149144

150145
@Override
@@ -273,7 +268,6 @@ private void initComponents() {
273268
jSeparator1 = new javax.swing.JSeparator();
274269
checkForUpdatesInBackgroundCheckbox = new javax.swing.JCheckBox();
275270
checkForUnopenedExercisesCheckbox = new javax.swing.JCheckBox();
276-
spywareEnabledCheckbox = new javax.swing.JCheckBox();
277271
jSeparator2 = new javax.swing.JSeparator();
278272
jSeparator3 = new javax.swing.JSeparator();
279273
errorMsgLocaleLabel = new javax.swing.JLabel();
@@ -320,9 +314,6 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
320314
checkForUnopenedExercisesCheckbox.setText(org.openide.util.NbBundle.getMessage(PreferencesPanel.class, "PreferencesPanel.checkForUnopenedExercisesCheckbox.text")); // NOI18N
321315
checkForUnopenedExercisesCheckbox.setToolTipText(org.openide.util.NbBundle.getMessage(PreferencesPanel.class, "PreferencesPanel.checkForUnopenedExercisesCheckbox.toolTipText")); // NOI18N
322316

323-
spywareEnabledCheckbox.setText(org.openide.util.NbBundle.getMessage(PreferencesPanel.class, "PreferencesPanel.spywareEnabledCheckbox.text")); // NOI18N
324-
spywareEnabledCheckbox.setToolTipText(org.openide.util.NbBundle.getMessage(PreferencesPanel.class, "PreferencesPanel.spywareEnabledCheckbox.toolTipText")); // NOI18N
325-
326317
errorMsgLocaleLabel.setText(org.openide.util.NbBundle.getMessage(PreferencesPanel.class, "PreferencesPanel.errorMsgLocaleLabel.text")); // NOI18N
327318
errorMsgLocaleLabel.setToolTipText(org.openide.util.NbBundle.getMessage(PreferencesPanel.class, "PreferencesPanel.errorMsgLocaleLabel.toolTipText")); // NOI18N
328319

@@ -423,8 +414,7 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
423414
.addGroup(layout.createSequentialGroup()
424415
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
425416
.addComponent(checkForUnopenedExercisesCheckbox)
426-
.addComponent(checkForUpdatesInBackgroundCheckbox)
427-
.addComponent(spywareEnabledCheckbox))
417+
.addComponent(checkForUpdatesInBackgroundCheckbox))
428418
.addGap(0, 0, Short.MAX_VALUE))
429419
.addComponent(jSeparator4))
430420
.addContainerGap())))
@@ -465,8 +455,6 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
465455
.addComponent(resolveDependencies)
466456
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
467457
.addComponent(sendDiagnostics)
468-
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
469-
.addComponent(spywareEnabledCheckbox)
470458
.addGap(18, 18, 18)
471459
.addComponent(jSeparator3, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
472460
.addGap(18, 18, 18)
@@ -568,7 +556,6 @@ private void logoutButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-
568556
private javax.swing.JLabel selectedCourseLabel;
569557
private javax.swing.JLabel selectedOrganizationLabel;
570558
private javax.swing.JCheckBox sendDiagnostics;
571-
private javax.swing.JCheckBox spywareEnabledCheckbox;
572559
// End of variables declaration//GEN-END:variables
573560

574561
}

tmc-plugin/src/fi/helsinki/cs/tmc/ui/PreferencesUI.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,6 @@ public interface PreferencesUI {
3535
void setCheckForUpdatesInTheBackground(boolean shouldCheck);
3636

3737
void setCheckForUnopenedExercisesAtStartup(boolean shouldCheck);
38-
39-
void setSpywareEnabled(boolean enabled);
40-
38+
4139
void setErrorMsgLocale(Locale locale);
4240
}

0 commit comments

Comments
 (0)