Add checkbox and functionality for sending diagnostics to bandicoot

Author: Redande

maven-wrapper/pom.xml

@@ -46,7 +46,7 @@
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>core</artifactId>
-            <version>0.9.9-SNAPSHOT</version>
+            <version>0.9.10-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>

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

@@ -22,12 +22,14 @@ public class SaveSettingsAction extends AbstractAction {
     private TmcEventBus eventBus;
     private TmcCore tmcCore;
     private final FixUnoptimalSettings fixUnoptimalSettings;
+    private SendDiagnostics sendDiagnostics;
 
     public SaveSettingsAction() {
         this.courseDb = CourseDb.getInstance();
         this.eventBus = TmcEventBus.getDefault();
         this.tmcCore = TmcCore.get();
         this.fixUnoptimalSettings = new FixUnoptimalSettings();
+        this.sendDiagnostics = new SendDiagnostics();
     }
 
     @Override
@@ -53,6 +55,7 @@ public void actionPerformed(ActionEvent e) {
         settings.setIsSpywareEnabled(prefUi.getSpywareEnabled());
         settings.setErrorMsgLocale(prefUi.getErrorMsgLocale());
         settings.setResolveDependencies(prefUi.getResolveProjectDependenciesEnabled());
+        settings.setSendDiagnostics(prefUi.getSendDiagnosticsEnabled());
 
         eventBus.post(new InvokedEvent());
 
@@ -62,6 +65,10 @@ public void actionPerformed(ActionEvent e) {
             fixUnoptimalSettings.undo();
         }
 
+        if (settings.getSendDiagnostics()) {
+            sendDiagnostics.run();
+        }
+
         if (prefUi.getSelectedCourseName() != null) {
             courseDb.setAvailableCourses(prefUi.getAvailableCourses());
             courseDb.setCurrentCourseName(prefUi.getSelectedCourseName());

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

@@ -0,0 +1,16 @@
+package fi.helsinki.cs.tmc.actions;
+
+import fi.helsinki.cs.tmc.core.TmcCore;
+import fi.helsinki.cs.tmc.core.domain.ProgressObserver;
+import fi.helsinki.cs.tmc.coreimpl.BridgingProgressObserver;
+import fi.helsinki.cs.tmc.utilities.BgTask;
+import java.util.concurrent.Callable;
+
+public class SendDiagnostics {
+    
+    public void run() {
+        ProgressObserver observer = new BridgingProgressObserver();
+        Callable<Void> sendDiagnostics = TmcCore.get().sendDiagnostics(observer);
+        BgTask.start("Sending diagnostics", sendDiagnostics);
+    }
+}

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

@@ -66,6 +66,7 @@ public void run() {
         prefUI.setSpywareEnabled(settings.isSpywareEnabled());
         prefUI.setErrorMsgLocale(settings.getErrorMsgLocale());
         prefUI.setResolveProjectDependenciesEnabled(settings.getResolveDependencies());
+        prefUI.setSendDiagnosticsEnabled(settings.getSendDiagnostics());
 
         ActionListener listener = new ActionListener() {
             @Override

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

@@ -35,6 +35,7 @@ public class TmcCoreSettingsImpl implements TmcSettings {
     private static final String PREF_DETAILED_SPYWARE_ENABLED = "detailedSpywareEnabled";
     private static final String PREF_ERROR_MSG_LOCALE = "errorMsgLocale";
     private static final String PREF_RESOLVE_DEPENDENCIES = "resolveDependencies";
+    private static final String PREF_SEND_DIAGNOSTICS = "sendDiagnostics";
 
     private static PersistableSettings settings = PersistableSettings.forModule(TmcSettings.class);
 
@@ -120,6 +121,16 @@ public Path getConfigRoot() {
 
         return FileUtil.toFile(tmcRoot).toPath();
     }
+
+    @Override
+    public String hostProgramName() {
+        return "netbeans";
+    }
+
+    @Override
+    public String hostProgramVersion() {
+        return System.getProperty("netbeans.buildnumber");
+    }
 
     public static class SavedEvent implements TmcEvent {}
 
@@ -249,6 +260,14 @@ public void setResolveDependencies(boolean value) {
     public boolean getResolveDependencies() {
         return settings.get(PREF_RESOLVE_DEPENDENCIES, "1").equals("1");
     }
+
+    public void setSendDiagnostics(boolean value) {
+        settings.put(PREF_SEND_DIAGNOSTICS, value ? "1" : "0");
+    }
+    
+    public boolean getSendDiagnostics() {
+        return settings.get(PREF_SEND_DIAGNOSTICS, "1").equals("1");
+    }
 
     private Locale parseLocale(String s, Locale dflt) {
         if (s.isEmpty()) {

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

@@ -75,3 +75,5 @@ PastebinDialog.cancelButton.text=&Cancel
 PreferencesPanel.restartMessage.text=Changing language requires restart
 PreferencesPanel.resolveDependencies.toolTipText=Leave this on if you want to be able to open Maven projects effortlessly.
 PreferencesPanel.resolveDependencies.text=Ensure Netbeans is configured to resolve project dependencies
+PreferencesPanel.sendDiagnostics.toolTipText=Leave this on if you want to be able to open Maven projects effortlessly.
+PreferencesPanel.sendDiagnostics.text=Automatically send crash reports and diagnostics for plugin development

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

@@ -87,6 +87,10 @@
                       <Component id="spywareEnabledCheckbox" min="-2" max="-2" attributes="0"/>
                       <EmptySpace max="32767" attributes="0"/>
                   </Group>
+                  <Group type="102" attributes="0">
+                      <Component id="sendDiagnostics" min="-2" max="-2" attributes="0"/>
+                      <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
+                  </Group>
               </Group>
           </Group>
       </Group>
@@ -136,6 +140,8 @@
               <EmptySpace max="-2" attributes="0"/>
               <Component id="resolveDependencies" min="-2" max="-2" attributes="0"/>
               <EmptySpace max="-2" attributes="0"/>
+              <Component id="sendDiagnostics" min="-2" max="-2" attributes="0"/>
+              <EmptySpace max="-2" attributes="0"/>
               <Component id="spywareEnabledCheckbox" min="-2" max="-2" attributes="0"/>
               <EmptySpace min="-2" pref="18" max="-2" attributes="0"/>
               <Component id="jSeparator3" min="-2" max="-2" attributes="0"/>
@@ -380,5 +386,19 @@
         <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="resolveDependenciesActionPerformed"/>
       </Events>
     </Component>
+    <Component class="javax.swing.JCheckBox" name="sendDiagnostics">
+      <Properties>
+        <Property name="selected" type="boolean" value="true"/>
+        <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+          <ResourceString bundle="fi/helsinki/cs/tmc/ui/Bundle.properties" key="PreferencesPanel.sendDiagnostics.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+        </Property>
+        <Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+          <ResourceString bundle="fi/helsinki/cs/tmc/ui/Bundle.properties" key="PreferencesPanel.sendDiagnostics.toolTipText" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
+        </Property>
+      </Properties>
+      <Events>
+        <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="sendDiagnosticsActionPerformed"/>
+      </Events>
+    </Component>
   </SubComponents>
 </Form>

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

@@ -254,6 +254,16 @@ public void setErrorMsgLocale(Locale locale) {
         errorMsgLocaleComboBox.setSelectedItem(new LocaleWrapper(locale));
     }
 
+    @Override
+    public boolean getSendDiagnosticsEnabled() {
+        return sendDiagnostics.isSelected();
+    }
+
+    @Override
+    public void setSendDiagnosticsEnabled(boolean value) {
+        sendDiagnostics.setSelected(value);
+    }
+
     private static class LocaleWrapper {
         private Locale locale;
         public LocaleWrapper(Locale locale) {
@@ -505,6 +515,7 @@ private void initComponents() {
         errorMsgLocaleComboBox = new javax.swing.JComboBox();
         restartMessage = new javax.swing.JLabel();
         resolveDependencies = new javax.swing.JCheckBox();
+        sendDiagnostics = new javax.swing.JCheckBox();
 
         usernameLabel.setText(org.openide.util.NbBundle.getMessage(PreferencesPanel.class, "PreferencesPanel.usernameLabel.text")); // NOI18N
 
@@ -599,6 +610,15 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
             }
         });
 
+        sendDiagnostics.setSelected(true);
+        sendDiagnostics.setText(org.openide.util.NbBundle.getMessage(PreferencesPanel.class, "PreferencesPanel.sendDiagnostics.text")); // NOI18N
+        sendDiagnostics.setToolTipText(org.openide.util.NbBundle.getMessage(PreferencesPanel.class, "PreferencesPanel.sendDiagnostics.toolTipText")); // NOI18N
+        sendDiagnostics.addActionListener(new java.awt.event.ActionListener() {
+            public void actionPerformed(java.awt.event.ActionEvent evt) {
+                sendDiagnosticsActionPerformed(evt);
+            }
+        });
+
         javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
         this.setLayout(layout);
         layout.setHorizontalGroup(
@@ -658,7 +678,10 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
                         .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
                     .addGroup(layout.createSequentialGroup()
                         .addComponent(spywareEnabledCheckbox)
-                        .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))))
+                        .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+                    .addGroup(layout.createSequentialGroup()
+                        .addComponent(sendDiagnostics)
+                        .addGap(0, 0, Short.MAX_VALUE))))
         );
         layout.setVerticalGroup(
             layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
@@ -700,6 +723,8 @@ public void actionPerformed(java.awt.event.ActionEvent evt) {
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                 .addComponent(resolveDependencies)
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                .addComponent(sendDiagnostics)
+                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                 .addComponent(spywareEnabledCheckbox)
                 .addGap(18, 18, 18)
                 .addComponent(jSeparator3, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
@@ -750,6 +775,10 @@ private void resolveDependenciesActionPerformed(java.awt.event.ActionEvent evt)
 
     }//GEN-LAST:event_resolveDependenciesActionPerformed
 
+    private void sendDiagnosticsActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_sendDiagnosticsActionPerformed
+
+    }//GEN-LAST:event_sendDiagnosticsActionPerformed
+
     // Variables declaration - do not modify//GEN-BEGIN:variables
     private javax.swing.JLabel adviceLabel;
     private javax.swing.JCheckBox checkForUnopenedExercisesCheckbox;
@@ -771,6 +800,7 @@ private void resolveDependenciesActionPerformed(java.awt.event.ActionEvent evt)
     private javax.swing.JCheckBox resolveDependencies;
     private javax.swing.JLabel restartMessage;
     private javax.swing.JCheckBox savePasswordCheckBox;
+    private javax.swing.JCheckBox sendDiagnostics;
     private javax.swing.JLabel serverAddressLabel;
     private javax.swing.JTextField serverAddressTextField;
     private javax.swing.JCheckBox spywareEnabledCheckbox;

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

@@ -32,6 +32,10 @@ public interface PreferencesUI {
 
     void setResolveProjectDependenciesEnabled(boolean value);
 
+    boolean getSendDiagnosticsEnabled();
+
+    void setSendDiagnosticsEnabled(boolean value);
+
     Locale getErrorMsgLocale();
 
     void setAvailableCourses(List<Course> courses);