Changeset 10910 in josm for trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/ConditionFactory.java

Timestamp:

2016-08-28T19:00:16+02:00 (8 years ago)

Author:

Don-vip

Message:

improve javadoc, unit tests, reduce visibility of some public fields

File:

• trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/ConditionFactory.java (modified) (7 diffs)

trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/ConditionFactory.java

@@ -332 +332 @@
         final Pattern pattern;
 
+        /**
+         * Constructs a new {@code KeyValueRegexpCondition}.
+         * @param k key
+         * @param v value
+         * @param op operation
+         * @param considerValAsKey must be false
+         */
         public KeyValueRegexpCondition(String k, String v, Op op, boolean considerValAsKey) {
             super(k, v, op, considerValAsKey);
@@ -361 +368 @@
     public static class RegexpKeyValueRegexpCondition extends KeyValueRegexpCondition {
 
-        public final Pattern keyPattern;
+        final Pattern keyPattern;
 
         /**
@@ -386 +393 @@
 
     public static class RoleCondition implements Condition {
-        public final String role;
-        public final Op op;
-
+        final String role;
+        final Op op;
+
+        /**
+         * Constructs a new {@code RoleCondition}.
+         * @param role role
+         * @param op operation
+         */
         public RoleCondition(String role, Op op) {
             this.role = role;
@@ -403 +415 @@
 
     public static class IndexCondition implements Condition {
-        public final String index;
-        public final Op op;
-
+        final String index;
+        final Op op;
+
+        /**
+         * Constructs a new {@code IndexCondition}.
+         * @param index index
+         * @param op operation
+         */
         public IndexCondition(String index, Op op) {
             this.index = index;
@@ -548 +565 @@
 
         public final String id;
-        public final boolean not;
+        final boolean not;
 
         public ClassCondition(String id, boolean not) {
@@ -740 +757 @@
     public static class PseudoClassCondition implements Condition {
 
-        public final Method method;
-        public final boolean not;
+        final Method method;
+        final boolean not;
 
         protected PseudoClassCondition(Method method, boolean not) {
@@ -810 +827 @@
     public static class ExpressionCondition implements Condition {
 
-        private final Expression e;
+        final Expression e;
 
         /**