xiaoyan159/vtm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Render theme positive rules building, fixes #156

Browse Source
This commit is contained in:
Emux 2016-09-03 22:42:39 +03:00
parent 164950e399
commit 3d83c188e0
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
vtm/src/org/oscim/theme/rule/RuleBuilder.java
View File

@ -1,6 +1,7 @@
/* /*
* Copyright 2014 Hannes Janetzek * Copyright 2014 Hannes Janetzek
* * Copyright 2016 devemux86
*
* This file is part of the OpenScienceMap project (http://www.opensciencemap.org). * This file is part of the OpenScienceMap project (http://www.opensciencemap.org).
* *
* This program is free software: you can redistribute it and/or modify it under the * This program is free software: you can redistribute it and/or modify it under the
@ -25,13 +26,11 @@ import org.oscim.theme.rule.Rule.PositiveRuleMultiKV;
import org.oscim.theme.rule.Rule.PositiveRuleV; import org.oscim.theme.rule.Rule.PositiveRuleV;
import org.oscim.theme.styles.RenderStyle; import org.oscim.theme.styles.RenderStyle;
import org.oscim.theme.styles.RenderStyle.StyleBuilder; import org.oscim.theme.styles.RenderStyle.StyleBuilder;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections;
public class RuleBuilder { public class RuleBuilder {
final static Logger log = LoggerFactory.getLogger(RuleBuilder.class);
private final static String[] EMPTY_KV = {}; private final static String[] EMPTY_KV = {};
@ -49,8 +48,8 @@ public class RuleBuilder {
String keys[]; String keys[];
String values[]; String values[];
ArrayList<RenderStyle> renderStyles = new ArrayList<RenderStyle>(4); ArrayList<RenderStyle> renderStyles = new ArrayList<>(4);
ArrayList<RuleBuilder> subRules = new ArrayList<RuleBuilder>(4); ArrayList<RuleBuilder> subRules = new ArrayList<>(4);
StyleBuilder<?>[] styleBuilder; StyleBuilder<?>[] styleBuilder;
private static final String STRING_NEGATION = "~"; private static final String STRING_NEGATION = "~";
@ -166,7 +165,7 @@ public class RuleBuilder {
return new NegativeRule(type, element, zoom, selector, return new NegativeRule(type, element, zoom, selector,
keys, values, rules, styles); keys, values, rules, styles);
if (numKeys == 1 && numKeys == 0) if (numKeys == 1 && numVals == 0)
return new PositiveRuleK(element, zoom, selector, keys[0], return new PositiveRuleK(element, zoom, selector, keys[0],
rules, styles); rules, styles);
@ -199,8 +198,7 @@ public class RuleBuilder {
} }
public RuleBuilder rules(RuleBuilder... rules) { public RuleBuilder rules(RuleBuilder... rules) {
for (RuleBuilder rule : rules) Collections.addAll(subRules, rules);
subRules.add(rule);
return this; return this;
} }