Changeset 3745 in josm for trunk/src/org

Timestamp:

2010-12-27T13:56:11+01:00 (15 years ago)

Author:

bastiK

Message:

fixed #5752 - validator: warning window on upload is broken (2)

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/upload/ValidateUploadHook.java (modified) (1 diff)
• gui/dialogs/validator/ValidatorTreePanel.java (modified) (1 diff)
• gui/preferences/ValidatorPreference.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/actions/upload/ValidateUploadHook.java

@@ -58 +58 @@
             test.visit(selection);
             test.endTest();
-            if (Main.pref.getBoolean(ValidatorPreference.PREF_OTHER_UPLOAD, false)) {
+            if (Main.pref.getBoolean(ValidatorPreference.PREF_OTHER, false) && 
+                Main.pref.getBoolean(ValidatorPreference.PREF_OTHER_UPLOAD, false))
+            {
                 errors.addAll( test.getErrors() );
             }

trunk/src/org/openstreetmap/josm/gui/dialogs/validator/ValidatorTreePanel.java

@@ -148 +148 @@
         }
 
-        boolean other = Main.pref.getBoolean(ValidatorPreference.PREF_OTHER_UPLOAD, false);
+        boolean other = Main.pref.getBoolean(ValidatorPreference.PREF_OTHER, false);
         for (TestError e : errors) {
             if (e.getIgnored()) {

trunk/src/org/openstreetmap/josm/gui/preferences/ValidatorPreference.java

@@ -5 +5 @@
 
 import java.awt.GridBagLayout;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 import java.util.Collection;
 
@@ -92 +94 @@
         testPanel.add(prefOtherUpload, GBC.eol());
 
+        ActionListener otherUploadEnabled = new ActionListener() {
+            public void actionPerformed(ActionEvent e) {
+                prefOtherUpload.setEnabled(prefOther.isSelected());
+            }
+        };
+        prefOther.addActionListener(otherUploadEnabled);
+        otherUploadEnabled.actionPerformed(null);
+
         GBC a = GBC.eol().insets(-5,0,0,0);
         a.anchor = GBC.EAST;