"
+ + "| "+tr("Errors")
+ + " | "
+ + tr("Usually this should be fixed.")+" |
"
+ + "| "+tr("Warnings")
+ + " | "
+ + tr("Fix these when possible.")+" |
"
+ + "| "+tr("Other")
+ + " | "
+ + tr("Informational warnings, expect many false entries.")+" |
"
+ + "
"
+ );
+ p.add(pnlMessage, GBC.eol());
+ p.add(new JScrollPane(errorPanel), GBC.eol().fill(GBC.BOTH));
- int res = JOptionPane.showConfirmDialog(Main.parent, p,
- tr("Data with errors. Upload anyway?"),
- JOptionPane.YES_NO_OPTION,
- JOptionPane.QUESTION_MESSAGE);
- if (res == JOptionPane.NO_OPTION) {
+ ExtendedDialog ed = new ExtendedDialog(Main.parent,
+ tr("Supicious data found. Upload anyway?"),
+ new String[] {tr("Continue upload"), tr("Cancel")});
+ ed.setButtonIcons(new String[] {"ok.png", "cancel.png"});
+ ed.setContent(p);
+ ed.showDialog();
+
+ if(ed.getValue() != 1) {
OsmValidator.initializeErrorLayer();
Main.map.validatorDialog.unfurlDialog();
Main.map.validatorDialog.tree.setErrors(errors);
Main.main.getCurrentDataSet().fireSelectionChanged();
+ return false;
}
- return res == JOptionPane.YES_OPTION;
+ return true;
}
}
Index: trunk/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java (revision 4022)
+++ trunk/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java (revision 4023)
@@ -399,6 +399,6 @@
if (!ignore) {
- errors.add( new TestError(this, Severity.ERROR, tr("Illegal tag/value combinations"),
- tr("Illegal tag/value combinations"), tr("Illegal tag/value combinations"), 1272, p) );
+ errors.add( new TestError(this, Severity.ERROR, tr("Suspicious tag/value combinations"),
+ tr("Suspicious tag/value combinations"), tr("Suspicious tag/value combinations"), 1272, p) );
withErrors.put(p, "TC");
}
@@ -408,5 +408,5 @@
for (CheckerData d : checkerData) {
if (d.match(p, keys)) {
- errors.add( new TestError(this, d.getSeverity(), tr("Illegal tag/value combinations"),
+ errors.add( new TestError(this, d.getSeverity(), tr("Suspicious tag/value combinations"),
d.getDescription(), d.getDescriptionOrig(), d.getCode(), p) );
withErrors.put(p, "TC");
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/validator/ValidatorTreePanel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/validator/ValidatorTreePanel.java (revision 4022)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/validator/ValidatorTreePanel.java (revision 4023)
@@ -236,5 +236,5 @@
msg = msgErrors.getKey() + " (" + errs.size() + ")";
} else {
- msg = bag.getKey() + " - " + msgErrors.getKey() + " (" + errs.size() + ")";
+ msg = msgErrors.getKey() + " - " + bag.getKey() + " (" + errs.size() + ")";
}
DefaultMutableTreeNode messageNode = new DefaultMutableTreeNode(msg);