Changeset 9078 in josm for trunk/src/org/openstreetmap/josm/gui/mappaint
- Timestamp:
- 2015-12-02T00:05:09+01:00 (9 years ago)
- Location:
- trunk/src/org/openstreetmap/josm/gui/mappaint
- Files:
-
- 12 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/mappaint/BoxTextElemStyle.java
r8958 r9078 26 26 27 27 public static class BoxProviderResult { 28 private Rectangle box;29 private boolean temporary;28 private final Rectangle box; 29 private final boolean temporary; 30 30 31 31 public BoxProviderResult(Rectangle box, boolean temporary) { … … 52 52 53 53 public static class SimpleBoxProvider implements BoxProvider { 54 private Rectangle box;54 private final Rectangle box; 55 55 56 56 /** -
trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyles.java
r8855 r9078 24 24 25 25 public class ElemStyles { 26 private List<StyleSource> styleSources;26 private final List<StyleSource> styleSources; 27 27 private boolean drawMultipolygon; 28 28 -
trunk/src/org/openstreetmap/josm/gui/mappaint/LabelCompositionStrategy.java
r8973 r9078 48 48 49 49 public static class StaticLabelCompositionStrategy extends LabelCompositionStrategy { 50 private String defaultLabel;50 private final String defaultLabel; 51 51 52 52 public StaticLabelCompositionStrategy(String defaultLabel) { … … 96 96 public static class TagLookupCompositionStrategy extends LabelCompositionStrategy { 97 97 98 private String defaultLabelTag;98 private final String defaultLabelTag; 99 99 100 100 public TagLookupCompositionStrategy(String defaultLabelTag) { -
trunk/src/org/openstreetmap/josm/gui/mappaint/LineTextElemStyle.java
r8846 r9078 12 12 public class LineTextElemStyle extends ElemStyle { 13 13 14 private TextElement text;14 private final TextElement text; 15 15 16 16 protected LineTextElemStyle(Cascade c, TextElement text) { -
trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintMenu.java
r8870 r9078 31 31 32 32 private transient StyleSource style; 33 private JCheckBoxMenuItem button;33 private final JCheckBoxMenuItem button; 34 34 35 35 MapPaintAction(StyleSource style) { -
trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java
r8937 r9078 343 343 public static class MapPaintStyleLoader extends PleaseWaitRunnable { 344 344 private boolean canceled; 345 private Collection<StyleSource> sources;345 private final Collection<StyleSource> sources; 346 346 347 347 public MapPaintStyleLoader(Collection<StyleSource> sources) { -
trunk/src/org/openstreetmap/josm/gui/mappaint/MultiCascade.java
r8846 r9078 16 16 public class MultiCascade implements StyleKeys { 17 17 18 private Map<String, Cascade> layers;18 private final Map<String, Cascade> layers; 19 19 public Range range; 20 20 -
trunk/src/org/openstreetmap/josm/gui/mappaint/StyleCache.java
r8575 r9078 47 47 */ 48 48 public static class StyleList implements Iterable<ElemStyle> { 49 private List<ElemStyle> lst;49 private final List<ElemStyle> lst; 50 50 51 51 /** -
trunk/src/org/openstreetmap/josm/gui/mappaint/StyleSource.java
r8419 r9078 33 33 public abstract class StyleSource extends SourceEntry { 34 34 35 private List<Throwable> errors = new ArrayList<>();35 private final List<Throwable> errors = new ArrayList<>(); 36 36 public File zipIcons; 37 37 -
trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/ExpressionFactory.java
r9059 r9078 967 967 public static class CondOperator implements Expression { 968 968 969 private Expression condition, firstOption, secondOption;969 private final Expression condition, firstOption, secondOption; 970 970 971 971 /** … … 996 996 public static class AndOperator implements Expression { 997 997 998 private List<Expression> args;998 private final List<Expression> args; 999 999 1000 1000 /** … … 1023 1023 public static class OrOperator implements Expression { 1024 1024 1025 private List<Expression> args;1025 private final List<Expression> args; 1026 1026 1027 1027 /** … … 1055 1055 public static class LengthFunction implements Expression { 1056 1056 1057 private Expression arg;1057 private final Expression arg; 1058 1058 1059 1059 /** -
trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Selector.java
r9059 r9078 122 122 */ 123 123 private class MatchingReferrerFinder extends AbstractVisitor { 124 private Environment e;124 private final Environment e; 125 125 126 126 /** -
trunk/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSourceHandler.java
r8846 r9078 17 17 private boolean inDoc, inRule, inCondition, inLine, inLineMod, inIcon, inArea, inScaleMax, inScaleMin; 18 18 private boolean hadLine, hadLineMod, hadIcon, hadArea; 19 private RuleElem rule = new RuleElem();20 21 private XmlStyleSource style;19 private final RuleElem rule = new RuleElem(); 20 21 private final XmlStyleSource style; 22 22 23 23 static class RuleElem { 24 private XmlCondition cond = new XmlCondition();24 private final XmlCondition cond = new XmlCondition(); 25 25 private Collection<XmlCondition> conditions; 26 26 private double scaleMax; 27 27 private double scaleMin; 28 private LinePrototype line = new LinePrototype();29 private LinemodPrototype linemod = new LinemodPrototype();30 private AreaPrototype area = new AreaPrototype();28 private final LinePrototype line = new LinePrototype(); 29 private final LinemodPrototype linemod = new LinemodPrototype(); 30 private final AreaPrototype area = new AreaPrototype(); 31 31 private IconPrototype icon = new IconPrototype(); 32 32 public void init() {
Note:
See TracChangeset
for help on using the changeset viewer.