id summary reporter owner description type status priority milestone component version resolution keywords cc 18802 MapCSS: refactor/simplify/improve simon04 simon04 "{{{ commit 1ab7320176f8a0ab4868297bd36b375855826ed1 Author: Simon Legner Date: 2020-02-23 23:11:32 +0100 Extract MapCSSTagCheckerAsserts class .../data/validation/tests/MapCSSTagChecker.java | 162 +------------------- .../validation/tests/MapCSSTagCheckerAsserts.java | 163 +++++++++++++++++++++ .../validation/tests/MapCSSTagCheckerTest.java | 6 +- 3 files changed, 168 insertions(+), 163 deletions(-) commit 7617b34a06075cd6ea41fc4da708c4f87d6be5f6 Author: Simon Legner Date: 2020-02-23 23:22:07 +0100 MapCSSTagChecker: simplify throwError/throwWarning/throwOther parsing .../data/validation/tests/MapCSSTagChecker.java | 32 +++++++--------------- 1 file changed, 10 insertions(+), 22 deletions(-) commit e17190633b0cf657690cc853cfa73da2ad5d1cb6 Author: Simon Legner Date: 2020-02-24 20:21:08 +0100 see #18749 - MapCSSTagChecker: no not persist assertions Check assertions immediately, when needed, but do not keep them. .../data/validation/tests/MapCSSTagChecker.java | 40 +++++++---- .../validation/tests/MapCSSTagCheckerAsserts.java | 82 ++++++++++++---------- .../validation/tests/MapCSSTagCheckerTest.java | 44 +++++++++--- 3 files changed, 101 insertions(+), 65 deletions(-) commit 30c41b2583c3b0fa82f6f7c33d479879c713ffa4 Author: Simon Legner Date: 2020-02-25 17:54:33 +0100 see #18749 - MapCSSTagChecker.TagCheck: use unmodifiable collections .../data/validation/tests/MapCSSTagChecker.java | 28 ++++++++++++++++++---- src/org/openstreetmap/josm/tools/Utils.java | 17 +++++++++++++ .../org/openstreetmap/josm/tools/UtilsTest.java | 22 +++++++++++++++++ 3 files changed, 62 insertions(+), 5 deletions(-) commit 88775968c3e21a62fdef7fdb46016f707dc8081a Author: Simon Legner Date: 2020-02-25 23:26:35 +0100 Extract org.openstreetmap.josm.gui.mappaint.mapcss.Declaration .../data/validation/tests/MapCSSTagChecker.java | 2 +- .../josm/gui/mappaint/mapcss/Declaration.java | 65 ++++++++++++++++++++++ .../josm/gui/mappaint/mapcss/Instruction.java | 2 +- .../josm/gui/mappaint/mapcss/MapCSSParser.jj | 2 +- .../josm/gui/mappaint/mapcss/MapCSSRule.java | 60 -------------------- 5 files changed, 68 insertions(+), 63 deletions(-) commit 01200e3a5ed79411f59158729e54de1cc7731883 Author: Simon Legner Date: 2020-02-26 00:11:37 +0100 Add MapCSSRule.matches scripts/TagInfoExtract.java | 2 +- .../josm/data/validation/tests/MapCSSTagChecker.java | 2 +- .../openstreetmap/josm/gui/mappaint/mapcss/MapCSSRule.java | 14 ++++++++++++++ .../josm/gui/mappaint/mapcss/MapCSSParserTest.java | 8 ++++---- 4 files changed, 20 insertions(+), 6 deletions(-) commit 8dd2df58103a06f37b751ebde70509aa8ce7b1e4 Author: Simon Legner Date: 2020-02-26 00:35:14 +0100 Add Selector.getConditions scripts/TagInfoExtract.java | 6 +----- .../josm/gui/mappaint/mapcss/Selector.java | 17 +++++++++++++---- 2 files changed, 14 insertions(+), 9 deletions(-) commit edc421183618289ad735ff4d05dc2ee84c013c31 Author: Simon Legner Date: 2020-02-26 01:08:32 +0100 Add Selector.getBase .../validation/tests/MapCSSTagCheckerIndex.java | 10 ++---- .../gui/mappaint/mapcss/MapCSSStyleSource.java | 41 ++++++---------------- .../josm/gui/mappaint/mapcss/Selector.java | 18 ++++++++-- 3 files changed, 29 insertions(+), 40 deletions(-) commit 45a243e2df32c2eed6a6febfa6687808759d3d88 Author: Simon Legner Date: 2020-02-26 23:03:13 +0100 Selector: merge GeneralSelector/OptimizedGeneralSelector as there is no difference - GeneralSelector extended OptimizedGeneralSelector - GeneralSelector.optimizedBaseCheck returned OptimizedGeneralSelector === this .../data/validation/tests/MapCSSTagChecker.java | 10 +-- .../validation/tests/MapCSSTagCheckerIndex.java | 2 +- .../gui/mappaint/mapcss/MapCSSStyleSource.java | 7 +- .../josm/gui/mappaint/mapcss/Selector.java | 82 +++++----------------- .../gui/mappaint/MapRendererPerformanceTest.java | 2 +- 5 files changed, 27 insertions(+), 76 deletions(-) commit 92e89d1bfd3d01ab7ae4ba142807210ada14f13d Author: Simon Legner Date: 2020-02-27 00:17:24 +0100 MapCSSRule: support list of selectors - allows to drop MapCSSTagChecker.GroupedMapCSSRule - remove code duplication in MapCSSStyleSource/MapCSSTagCheckerIndex w.r.t. MapCSSRuleIndex scripts/TagInfoExtract.java | 3 +- .../data/validation/tests/MapCSSTagChecker.java | 93 +----- .../validation/tests/MapCSSTagCheckerIndex.java | 372 +++++++++++---------- .../josm/gui/mappaint/mapcss/MapCSSParser.jj | 6 +- .../josm/gui/mappaint/mapcss/MapCSSRule.java | 17 +- .../gui/mappaint/mapcss/MapCSSStyleSource.java | 172 +++------- .../mappaint/mapcss/ChildOrParentSelectorTest.java | 2 +- 7 files changed, 276 insertions(+), 389 deletions(-) commit ebdfa3d0bb10cc0017eab130bf1f1ec9dfbc9c1a Author: Simon Legner Date: 2020-02-27 00:29:09 +0100 MapCSSStyleIndex: rename/move from index .../data/validation/tests/MapCSSTagChecker.java | 32 +++++++++++++--- .../mappaint/mapcss/MapCSSStyleIndex.java} | 43 ++-------------------- .../gui/mappaint/mapcss/MapCSSStyleSource.java | 3 +- 3 files changed, 31 insertions(+), 47 deletions(-) commit 710d40fdc99fd01bf6eb8aa8237475475e7b4d0a Author: Simon Legner Date: 2020-02-27 23:29:25 +0100 see #18749 - KeyValueRegexpCondition: do not store value as string src/org/openstreetmap/josm/gui/mappaint/mapcss/ConditionFactory.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) }}}" enhancement closed normal 20.03 Core fixed mapcss yourkit performance taylor.smock