Ticket #6850: patch.diff

src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java

@@ -20 +20 @@
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import java.util.Set;
+
 import javax.swing.AbstractAction;
 import javax.swing.BorderFactory;
 import javax.swing.Box;
@@ -674 +677 @@
                             JOptionPane.INFORMATION_MESSAGE);
                     return;
                 }
+                
+                Set<String> acceptedEulas = new HashSet<String>();
 
                 outer: for (int i = 0; i < lines.length; i++) {
                     ImageryInfo info = modeldef.getRow(lines[i]);
@@ -690 +695 @@
                         }
                     }
 
-                    if (info.getEulaAcceptanceRequired() != null) {
-                        if (!confirmEulaAcceptance(gui, info.getEulaAcceptanceRequired())) {
+                    String eulaURL = info.getEulaAcceptanceRequired();
+                    // If set and not already accepted, ask for EULA acceptance
+                    if (eulaURL != null && !acceptedEulas.contains(eulaURL)) {
+                        if (confirmEulaAcceptance(gui, eulaURL)) {
+                            acceptedEulas.add(eulaURL);
+                        } else {
                             continue outer;
                         }
                     }