Changeset 12542 in josm for trunk/src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java

Timestamp:

2017-07-30T17:07:42+02:00 (7 years ago)

Author:

Don-vip

Message:

partial revert of r12537

File:

• trunk/src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java

@@ -51 +51 @@
 
     private final String sender;
-    private static final Set<String> TRUSTED_SENDERS = new HashSet<>();
+    private static final Set<String> trustedSenders = new HashSet<>();
 
     static final class PropertyTableModel extends DefaultTableModel {
@@ -227 +227 @@
         tablePanel.add(propertyTable.getTableHeader(), GBC.eol().fill(GBC.HORIZONTAL));
         tablePanel.add(propertyTable, GBC.eol().fill(GBC.BOTH));
-        if (!sender.isEmpty() && !TRUSTED_SENDERS.contains(sender)) {
+        if (!sender.isEmpty() && !trustedSenders.contains(sender)) {
             final JCheckBox c = new JCheckBox();
             c.setAction(new AbstractAction(tr("Accept all tags from {0} for this session", sender)) {
                 @Override public void actionPerformed(ActionEvent e) {
                     if (c.isSelected())
-                        TRUSTED_SENDERS.add(sender);
+                        trustedSenders.add(sender);
                     else
-                        TRUSTED_SENDERS.remove(sender);
+                        trustedSenders.remove(sender);
                 }
             });
@@ -263 +263 @@
         }
         if (buttonIndex == 2) {
-            TRUSTED_SENDERS.remove(sender);
+            trustedSenders.remove(sender);
         }
         setVisible(false);
@@ -308 +308 @@
      */
     public static void addTags(String[][] keyValue, String sender, Collection<? extends OsmPrimitive> primitives) {
-        if (TRUSTED_SENDERS.contains(sender)) {
+        if (trustedSenders.contains(sender)) {
             if (Main.getLayerManager().getEditDataSet() != null) {
                 for (String[] row : keyValue) {