Changeset 31839 in osm for applications/editors/josm/plugins/mapillary

Timestamp:

2015-12-16T17:17:03+01:00 (9 years ago)

Author:

floscher

Message:

[mapillary] Make GUI components of MapillaryUploadDialog private and add Getters for them

Location:

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary

Files:

• actions/MapillaryUploadAction.java (modified) (1 diff)
• gui/MapillaryUploadDialog.java (modified) (2 diffs)

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/actions/MapillaryUploadAction.java

@@ -55 +55 @@
     if (pane.getValue() != null
         && (int) pane.getValue() == JOptionPane.OK_OPTION
-        && dialog.delete != null
-        && dialog.sequence.isSelected()) {
+        && dialog.getDelete() != null
+        && dialog.getSequence().isSelected()) {
       UploadUtils.uploadSequence(
           MapillaryLayer.getInstance().getData().getSelectedImage().getSequence(),
-          dialog.delete.isSelected()
+          dialog.getDelete().isSelected()
       );
     }

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/gui/MapillaryUploadDialog.java

@@ -26 +26 @@
   private static final long serialVersionUID = 2517368588113991767L;
 
-  /** Button group for upload options. */
-  public ButtonGroup group;
   /** Upload the whole sequence. */
-  public JRadioButton sequence;
+  private JRadioButton sequence;
   /** Whether the images must be deleted after upload or not */
-  public JCheckBox delete;
+  private JCheckBox delete;
 
   /**
@@ -39 +37 @@
     setLayout(new BoxLayout(this, BoxLayout.PAGE_AXIS));
     if (MapillaryUser.getUsername() != null) {
-      this.group = new ButtonGroup();
+      ButtonGroup group = new ButtonGroup();
       this.sequence = new JRadioButton(tr("Upload selected sequence"));
-      if (MapillaryLayer.getInstance().getData().getSelectedImage() == null
-          || !(MapillaryLayer.getInstance().getData().getSelectedImage() instanceof MapillaryImportedImage))
+      if (!(MapillaryLayer.getInstance().getData().getSelectedImage() instanceof MapillaryImportedImage)) {
         this.sequence.setEnabled(false);
-      this.group.add(this.sequence);
+      }
+      group.add(this.sequence);
       add(this.sequence);
-      this.group.setSelected(this.sequence.getModel(), true);
+      group.setSelected(this.sequence.getModel(), true);
       this.delete = new JCheckBox(tr("Delete after upload"));
-      this.delete.setSelected(Main.pref.getBoolean(
-          "mapillary.delete-after-upload", true));
+      this.delete.setSelected(Main.pref.getBoolean("mapillary.delete-after-upload", true));
       add(this.delete);
-    } else
-      this.add(new JLabel(
-          "Go to setting and log in to Mapillary before uploading."));
+    } else {
+      this.add(new JLabel(tr("Go to setting and log in to Mapillary before uploading.")));
+    }
+  }
+
+  /**
+   * @return the delete checkbox of the dialog
+   */
+  public JCheckBox getDelete() {
+    return delete;
+  }
+
+  /**
+   * @return the sequence radio button of the dialog
+   */
+  public JRadioButton getSequence() {
+    return sequence;
   }
 }