Changeset 12846 in josm for trunk/src/org/openstreetmap/josm/data/validation
- Timestamp:
- 2017-09-13T23:24:50+02:00 (7 years ago)
- Location:
- trunk/src/org/openstreetmap/josm/data/validation
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/data/validation/OsmValidator.java
r12841 r12846 66 66 import org.openstreetmap.josm.gui.layer.ValidatorLayer; 67 67 import org.openstreetmap.josm.gui.preferences.projection.ProjectionPreference; 68 import org.openstreetmap.josm.spi.preferences.Config; 68 69 import org.openstreetmap.josm.tools.AlphanumComparator; 69 70 import org.openstreetmap.josm.tools.Logging; … … 282 283 283 284 private static void applyPrefs(Map<String, Test> tests, boolean beforeUpload) { 284 for (String testName : Main.pref.getList(beforeUpload285 for (String testName : Config.getPref().getList(beforeUpload 285 286 ? ValidatorPrefHelper.PREF_SKIP_TESTS_BEFORE_UPLOAD : ValidatorPrefHelper.PREF_SKIP_TESTS)) { 286 287 Test test = tests.get(testName); -
trunk/src/org/openstreetmap/josm/data/validation/tests/Addresses.java
r12620 r12846 15 15 import java.util.Set; 16 16 17 import org.openstreetmap.josm.Main;18 17 import org.openstreetmap.josm.data.coor.EastNorth; 19 18 import org.openstreetmap.josm.data.osm.Node; … … 25 24 import org.openstreetmap.josm.data.validation.Test; 26 25 import org.openstreetmap.josm.data.validation.TestError; 26 import org.openstreetmap.josm.spi.preferences.Config; 27 27 import org.openstreetmap.josm.tools.Geometry; 28 28 import org.openstreetmap.josm.tools.Logging; … … 205 205 } 206 206 if (centroid == null) return; // fix #8305 207 double maxDistance = Main.pref.getDouble("validator.addresses.max_street_distance", 200.0);207 double maxDistance = Config.getPref().getDouble("validator.addresses.max_street_distance", 200.0); 208 208 boolean hasIncompleteWays = false; 209 209 for (Way streetPart : street) { -
trunk/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java
r12689 r12846 20 20 import java.util.Set; 21 21 22 import org.openstreetmap.josm.Main;23 22 import org.openstreetmap.josm.actions.MergeNodesAction; 24 23 import org.openstreetmap.josm.command.Command; … … 35 34 import org.openstreetmap.josm.data.validation.TestError; 36 35 import org.openstreetmap.josm.gui.progress.ProgressMonitor; 36 import org.openstreetmap.josm.spi.preferences.Config; 37 37 import org.openstreetmap.josm.tools.MultiMap; 38 38 … … 46 46 private static class NodeHash implements Hash<Object, Object> { 47 47 48 private final double precision = Main.pref.getDouble("validator.duplicatenodes.precision", 0.);48 private final double precision = Config.getPref().getDouble("validator.duplicatenodes.precision", 0.); 49 49 50 50 private LatLon roundCoord(LatLon coor) { -
trunk/src/org/openstreetmap/josm/data/validation/tests/LongSegment.java
r12841 r12846 9 9 import java.util.Set; 10 10 11 import org.openstreetmap.josm.Main;12 11 import org.openstreetmap.josm.data.coor.LatLon; 13 12 import org.openstreetmap.josm.data.osm.Node; … … 19 18 import org.openstreetmap.josm.data.validation.TestError; 20 19 import org.openstreetmap.josm.gui.progress.ProgressMonitor; 20 import org.openstreetmap.josm.spi.preferences.Config; 21 21 22 22 /** … … 112 112 public void startTest(ProgressMonitor monitor) { 113 113 super.startTest(monitor); 114 maxlength = Main.pref.getInt("validator.maximum.segment.length", 15_000);114 maxlength = Config.getPref().getInt("validator.maximum.segment.length", 15_000); 115 115 reported = new HashSet<>(); 116 116 visitedWays = new HashSet<>(); -
trunk/src/org/openstreetmap/josm/data/validation/tests/MapCSSTagChecker.java
r12825 r12846 2 2 package org.openstreetmap.josm.data.validation.tests; 3 3 4 import static org.openstreetmap.josm.data.validation.tests.MapCSSTagChecker.FixCommand.evaluateObject; 4 5 import static org.openstreetmap.josm.tools.I18n.tr; 5 6 … … 63 64 import org.openstreetmap.josm.io.IllegalDataException; 64 65 import org.openstreetmap.josm.io.UTFInputStreamReader; 66 import org.openstreetmap.josm.spi.preferences.Config; 65 67 import org.openstreetmap.josm.tools.CheckParameterUtil; 66 68 import org.openstreetmap.josm.tools.Logging; … … 735 737 checks.putAll(url, result.parseChecks); 736 738 // Check assertions, useful for development of local files 737 if ( Main.pref.getBoolean("validator.check_assert_local_rules", false) && Utils.isLocalUrl(url)) {739 if (Config.getPref().getBoolean("validator.check_assert_local_rules", false) && Utils.isLocalUrl(url)) { 738 740 for (String msg : checkAsserts(result.parseChecks)) { 739 741 Logging.warn(msg); … … 759 761 } 760 762 addMapCSS(i); 761 if ( Main.pref.getBoolean("validator.auto_reload_local_rules", true) && source.isLocal()) {763 if (Config.getPref().getBoolean("validator.auto_reload_local_rules", true) && source.isLocal()) { 762 764 Main.fileWatcher.registerSource(source); 763 765 } -
trunk/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java
r12841 r12846 26 26 import javax.swing.JPanel; 27 27 28 import org.openstreetmap.josm.Main;29 28 import org.openstreetmap.josm.command.ChangePropertyCommand; 30 29 import org.openstreetmap.josm.command.ChangePropertyKeyCommand; … … 49 48 import org.openstreetmap.josm.gui.widgets.EditableList; 50 49 import org.openstreetmap.josm.io.CachedFile; 50 import org.openstreetmap.josm.spi.preferences.Config; 51 51 import org.openstreetmap.josm.tools.GBC; 52 52 import org.openstreetmap.josm.tools.Logging; … … 190 190 191 191 StringBuilder errorSources = new StringBuilder(); 192 for (String source : Main.pref.getList(PREF_SOURCES, DEFAULT_SOURCES)) {192 for (String source : Config.getPref().getList(PREF_SOURCES, DEFAULT_SOURCES)) { 193 193 try ( 194 194 CachedFile cf = new CachedFile(source); … … 282 282 public static void initializePresets() { 283 283 284 if (! Main.pref.getBoolean(PREF_CHECK_VALUES, true))284 if (!Config.getPref().getBoolean(PREF_CHECK_VALUES, true)) 285 285 return; 286 286 … … 292 292 } 293 293 // TODO directionKeys are no longer in OsmPrimitive (search pattern is used instead) 294 for (String a : Main.pref.getList(ValidatorPrefHelper.PREFIX + ".knownkeys",294 for (String a : Config.getPref().getList(ValidatorPrefHelper.PREFIX + ".knownkeys", 295 295 Arrays.asList("is_in", "int_ref", "fixme", "population"))) { 296 296 additionalPresetsValueData.putVoid(a); … … 584 584 public void startTest(ProgressMonitor monitor) { 585 585 super.startTest(monitor); 586 checkKeys = Main.pref.getBoolean(PREF_CHECK_KEYS, true);586 checkKeys = Config.getPref().getBoolean(PREF_CHECK_KEYS, true); 587 587 if (isBeforeUpload) { 588 checkKeys = checkKeys && Main.pref.getBoolean(PREF_CHECK_KEYS_BEFORE_UPLOAD, true);589 } 590 591 checkValues = Main.pref.getBoolean(PREF_CHECK_VALUES, true);588 checkKeys = checkKeys && Config.getPref().getBoolean(PREF_CHECK_KEYS_BEFORE_UPLOAD, true); 589 } 590 591 checkValues = Config.getPref().getBoolean(PREF_CHECK_VALUES, true); 592 592 if (isBeforeUpload) { 593 checkValues = checkValues && Main.pref.getBoolean(PREF_CHECK_VALUES_BEFORE_UPLOAD, true);594 } 595 596 checkComplex = Main.pref.getBoolean(PREF_CHECK_COMPLEX, true);593 checkValues = checkValues && Config.getPref().getBoolean(PREF_CHECK_VALUES_BEFORE_UPLOAD, true); 594 } 595 596 checkComplex = Config.getPref().getBoolean(PREF_CHECK_COMPLEX, true); 597 597 if (isBeforeUpload) { 598 checkComplex = checkComplex && Main.pref.getBoolean(PREF_CHECK_COMPLEX_BEFORE_UPLOAD, true);599 } 600 601 checkFixmes = Main.pref.getBoolean(PREF_CHECK_FIXMES, true);598 checkComplex = checkComplex && Config.getPref().getBoolean(PREF_CHECK_COMPLEX_BEFORE_UPLOAD, true); 599 } 600 601 checkFixmes = Config.getPref().getBoolean(PREF_CHECK_FIXMES, true); 602 602 if (isBeforeUpload) { 603 checkFixmes = checkFixmes && Main.pref.getBoolean(PREF_CHECK_FIXMES_BEFORE_UPLOAD, true);603 checkFixmes = checkFixmes && Config.getPref().getBoolean(PREF_CHECK_FIXMES_BEFORE_UPLOAD, true); 604 604 } 605 605 } … … 619 619 testPanel.add(new JLabel(name+" :"), GBC.eol().insets(3, 0, 0, 0)); 620 620 621 prefCheckKeys = new JCheckBox(tr("Check property keys."), Main.pref.getBoolean(PREF_CHECK_KEYS, true));621 prefCheckKeys = new JCheckBox(tr("Check property keys."), Config.getPref().getBoolean(PREF_CHECK_KEYS, true)); 622 622 prefCheckKeys.setToolTipText(tr("Validate that property keys are valid checking against list of words.")); 623 623 testPanel.add(prefCheckKeys, GBC.std().insets(20, 0, 0, 0)); 624 624 625 625 prefCheckKeysBeforeUpload = new JCheckBox(); 626 prefCheckKeysBeforeUpload.setSelected( Main.pref.getBoolean(PREF_CHECK_KEYS_BEFORE_UPLOAD, true));626 prefCheckKeysBeforeUpload.setSelected(Config.getPref().getBoolean(PREF_CHECK_KEYS_BEFORE_UPLOAD, true)); 627 627 testPanel.add(prefCheckKeysBeforeUpload, a); 628 628 629 prefCheckComplex = new JCheckBox(tr("Use complex property checker."), Main.pref.getBoolean(PREF_CHECK_COMPLEX, true));629 prefCheckComplex = new JCheckBox(tr("Use complex property checker."), Config.getPref().getBoolean(PREF_CHECK_COMPLEX, true)); 630 630 prefCheckComplex.setToolTipText(tr("Validate property values and tags using complex rules.")); 631 631 testPanel.add(prefCheckComplex, GBC.std().insets(20, 0, 0, 0)); 632 632 633 633 prefCheckComplexBeforeUpload = new JCheckBox(); 634 prefCheckComplexBeforeUpload.setSelected( Main.pref.getBoolean(PREF_CHECK_COMPLEX_BEFORE_UPLOAD, true));634 prefCheckComplexBeforeUpload.setSelected(Config.getPref().getBoolean(PREF_CHECK_COMPLEX_BEFORE_UPLOAD, true)); 635 635 testPanel.add(prefCheckComplexBeforeUpload, a); 636 636 637 final Collection<String> sources = Main.pref.getList(PREF_SOURCES, DEFAULT_SOURCES);637 final Collection<String> sources = Config.getPref().getList(PREF_SOURCES, DEFAULT_SOURCES); 638 638 sourcesList = new EditableList(tr("TagChecker source")); 639 639 sourcesList.setItems(sources); … … 649 649 handlePrefEnable(); 650 650 651 prefCheckValues = new JCheckBox(tr("Check property values."), Main.pref.getBoolean(PREF_CHECK_VALUES, true));651 prefCheckValues = new JCheckBox(tr("Check property values."), Config.getPref().getBoolean(PREF_CHECK_VALUES, true)); 652 652 prefCheckValues.setToolTipText(tr("Validate that property values are valid checking against presets.")); 653 653 testPanel.add(prefCheckValues, GBC.std().insets(20, 0, 0, 0)); 654 654 655 655 prefCheckValuesBeforeUpload = new JCheckBox(); 656 prefCheckValuesBeforeUpload.setSelected( Main.pref.getBoolean(PREF_CHECK_VALUES_BEFORE_UPLOAD, true));656 prefCheckValuesBeforeUpload.setSelected(Config.getPref().getBoolean(PREF_CHECK_VALUES_BEFORE_UPLOAD, true)); 657 657 testPanel.add(prefCheckValuesBeforeUpload, a); 658 658 659 prefCheckFixmes = new JCheckBox(tr("Check for FIXMES."), Main.pref.getBoolean(PREF_CHECK_FIXMES, true));659 prefCheckFixmes = new JCheckBox(tr("Check for FIXMES."), Config.getPref().getBoolean(PREF_CHECK_FIXMES, true)); 660 660 prefCheckFixmes.setToolTipText(tr("Looks for nodes or ways with FIXME in any property value.")); 661 661 testPanel.add(prefCheckFixmes, GBC.std().insets(20, 0, 0, 0)); 662 662 663 663 prefCheckFixmesBeforeUpload = new JCheckBox(); 664 prefCheckFixmesBeforeUpload.setSelected( Main.pref.getBoolean(PREF_CHECK_FIXMES_BEFORE_UPLOAD, true));664 prefCheckFixmesBeforeUpload.setSelected(Config.getPref().getBoolean(PREF_CHECK_FIXMES_BEFORE_UPLOAD, true)); 665 665 testPanel.add(prefCheckFixmesBeforeUpload, a); 666 666 } … … 681 681 || prefCheckFixmesBeforeUpload.isSelected() || prefCheckComplexBeforeUpload.isSelected(); 682 682 683 Main.pref.putBoolean(PREF_CHECK_VALUES, prefCheckValues.isSelected());684 Main.pref.putBoolean(PREF_CHECK_COMPLEX, prefCheckComplex.isSelected());685 Main.pref.putBoolean(PREF_CHECK_KEYS, prefCheckKeys.isSelected());686 Main.pref.putBoolean(PREF_CHECK_FIXMES, prefCheckFixmes.isSelected());687 Main.pref.putBoolean(PREF_CHECK_VALUES_BEFORE_UPLOAD, prefCheckValuesBeforeUpload.isSelected());688 Main.pref.putBoolean(PREF_CHECK_COMPLEX_BEFORE_UPLOAD, prefCheckComplexBeforeUpload.isSelected());689 Main.pref.putBoolean(PREF_CHECK_KEYS_BEFORE_UPLOAD, prefCheckKeysBeforeUpload.isSelected());690 Main.pref.putBoolean(PREF_CHECK_FIXMES_BEFORE_UPLOAD, prefCheckFixmesBeforeUpload.isSelected());691 return Main.pref.putList(PREF_SOURCES, sourcesList.getItems());683 Config.getPref().putBoolean(PREF_CHECK_VALUES, prefCheckValues.isSelected()); 684 Config.getPref().putBoolean(PREF_CHECK_COMPLEX, prefCheckComplex.isSelected()); 685 Config.getPref().putBoolean(PREF_CHECK_KEYS, prefCheckKeys.isSelected()); 686 Config.getPref().putBoolean(PREF_CHECK_FIXMES, prefCheckFixmes.isSelected()); 687 Config.getPref().putBoolean(PREF_CHECK_VALUES_BEFORE_UPLOAD, prefCheckValuesBeforeUpload.isSelected()); 688 Config.getPref().putBoolean(PREF_CHECK_COMPLEX_BEFORE_UPLOAD, prefCheckComplexBeforeUpload.isSelected()); 689 Config.getPref().putBoolean(PREF_CHECK_KEYS_BEFORE_UPLOAD, prefCheckKeysBeforeUpload.isSelected()); 690 Config.getPref().putBoolean(PREF_CHECK_FIXMES_BEFORE_UPLOAD, prefCheckFixmesBeforeUpload.isSelected()); 691 return Config.getPref().putList(PREF_SOURCES, sourcesList.getItems()); 692 692 } 693 693 -
trunk/src/org/openstreetmap/josm/data/validation/tests/UnconnectedWays.java
r12726 r12846 33 33 import org.openstreetmap.josm.data.validation.TestError; 34 34 import org.openstreetmap.josm.gui.progress.ProgressMonitor; 35 import org.openstreetmap.josm.spi.preferences.Config; 35 36 import org.openstreetmap.josm.tools.Logging; 36 37 … … 166 167 middlenodes = new QuadBuckets<>(); 167 168 othernodes = new HashSet<>(); 168 mindist = Main.pref.getDouble(PREFIX + ".node_way_distance", 10.0);169 minmiddledist = Main.pref.getDouble(PREFIX + ".way_way_distance", 0.0);169 mindist = Config.getPref().getDouble(PREFIX + ".node_way_distance", 10.0); 170 minmiddledist = Config.getPref().getDouble(PREFIX + ".way_way_distance", 0.0); 170 171 DataSet dataSet = Main.main != null ? Main.main.getEditDataSet() : null; 171 172 dsArea = dataSet == null ? null : dataSet.getDataSourceArea();
Note:
See TracChangeset
for help on using the changeset viewer.