Changeset 18623 in osm for applications/editors/josm

Timestamp:

2009-11-15T15:28:53+01:00 (15 years ago)

Author:

stoecker

Message:

cleanup mappaint error handling

File:

• applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java (modified) (4 diffs)

applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java

@@ -440 +440 @@
             }
         }
-        if(checkPaint && p.getErrors() != null)
-        {
-            for(String s: p.getErrors())
-            {
-                /* passing translated text also to original string, as we already
-                translated the stuff before. Makes the ignore file language dependend. */
-                errors.add( new TestError(this, Severity.WARNING, tr("Painting problem"),
-                s, s, PAINT, p) );
-                withErrors.add(p, "P");
+        if(checkPaint)
+        {
+            List<String> pe = p.getDataSet().getErrors(p);
+            if(pe != null)
+            {
+                for(String s: pe)
+                {
+                    /* passing translated text also to original string, as we already
+                    translated the stuff before. Makes the ignore file language dependend. */
+                    errors.add( new TestError(this, Severity.WARNING, tr("Painting problem"),
+                    s, s, PAINT, p) );
+                    withErrors.add(p, "P");
+                }
             }
         }
@@ -556 +560 @@
     public void startTest(ProgressMonitor monitor)
     {
-        super.startTest(monitor);
+        super.startTest(monitor);
         checkKeys = Main.pref.getBoolean(PREF_CHECK_KEYS, true);
         if( isBeforeUpload )
@@ -622 +626 @@
             public void actionPerformed(ActionEvent e) {
                 String source = JOptionPane.showInputDialog(
-                                Main.parent,
-                                tr("TagChecker source"),
-                                tr("TagChecker source"),
-                                JOptionPane.QUESTION_MESSAGE
-                                );
+                        Main.parent,
+                        tr("TagChecker source"),
+                        tr("TagChecker source"),
+                        JOptionPane.QUESTION_MESSAGE
+                        );
                 if (source != null)
                     ((DefaultListModel)Sources.getModel()).addElement(source);
@@ -653 +657 @@
                     {
                         JOptionPane.showMessageDialog(
-                                        Main.parent,
-                                        tr("Please select the row to edit."),
-                                        tr("Information"),
-                                        JOptionPane.INFORMATION_MESSAGE
-                                        );
+                                Main.parent,
+                                tr("Please select the row to edit."),
+                                tr("Information"),
+                                JOptionPane.INFORMATION_MESSAGE
+                                );
                     }
                 }
                 else {
-                        String source = (String)JOptionPane.showInputDialog(Main.parent,
-                                        tr("TagChecker source"),
-                                        tr("TagChecker source"),
-                                        JOptionPane.QUESTION_MESSAGE, null, null,
-                                        Sources.getSelectedValue());
+                    String source = (String)JOptionPane.showInputDialog(Main.parent,
+                            tr("TagChecker source"),
+                            tr("TagChecker source"),
+                            JOptionPane.QUESTION_MESSAGE, null, null,
+                            Sources.getSelectedValue());
                     if (source != null)
                         ((DefaultListModel)Sources.getModel()).setElementAt(source, row);