Ignore:
Timestamp:
2016-07-23T02:08:50+02:00 (8 years ago)
Author:
Don-vip
Message:

see #11390 - sonar - squid:S1610 - Java 8: Abstract classes without fields should be converted to interfaces

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Condition.java

    r10589 r10599  
    3030import org.openstreetmap.josm.tools.Utils;
    3131
    32 public abstract class Condition {
    33 
    34     public abstract boolean applies(Environment e);
    35 
    36     public static Condition createKeyValueCondition(String k, String v, Op op, Context context, boolean considerValAsKey) {
     32public interface Condition {
     33
     34    boolean applies(Environment e);
     35
     36    static Condition createKeyValueCondition(String k, String v, Op op, Context context, boolean considerValAsKey) {
    3737        switch (context) {
    3838        case PRIMITIVE:
    … …  
    5757    }
    5858
    59     public static Condition createRegexpKeyRegexpValueCondition(String k, String v, Op op) {
     59    static Condition createRegexpKeyRegexpValueCondition(String k, String v, Op op) {
    6060        return new RegexpKeyValueRegexpCondition(k, v, op);
    6161    }
    6262
    63     public static Condition createKeyCondition(String k, boolean not, KeyMatchType matchType, Context context) {
     63    static Condition createKeyCondition(String k, boolean not, KeyMatchType matchType, Context context) {
    6464        switch (context) {
    6565        case PRIMITIVE:
    … …  
    7777    }
    7878
    79     public static PseudoClassCondition createPseudoClassCondition(String id, boolean not, Context context) {
     79    static PseudoClassCondition createPseudoClassCondition(String id, boolean not, Context context) {
    8080        return PseudoClassCondition.createPseudoClassCondition(id, not, context);
    8181    }
    8282
    83     public static ClassCondition createClassCondition(String id, boolean not, Context context) {
     83    static ClassCondition createClassCondition(String id, boolean not, Context context) {
    8484        return new ClassCondition(id, not);
    8585    }
    8686
    87     public static ExpressionCondition createExpressionCondition(Expression e, Context context) {
     87    static ExpressionCondition createExpressionCondition(Expression e, Context context) {
    8888        return new ExpressionCondition(e);
    8989    }
    … …  
    9292     * This is the operation that {@link KeyValueCondition} uses to match.
    9393     */
    94     public enum Op {
     94    enum Op {
    9595        /** The value equals the given reference. */
    9696        EQ,
    … …  
    183183     * Context, where the condition applies.
    184184     */
    185     public enum Context {
     185    enum Context {
    186186        /**
    187187         * normal primitive selector, e.g. way[highway=residential]
    … …  
    200200     * Extra class for performance reasons.
    201201     */
    202     public static class SimpleKeyValueCondition extends Condition {
     202    class SimpleKeyValueCondition implements Condition {
    203203        /**
    204204         * The key to search for.
    … …  
    240240     *
    241241     */
    242     public static class KeyValueCondition extends Condition {
     242    class KeyValueCondition implements Condition {
    243243        /**
    244244         * The key to search for.
    … …  
    288288    }
    289289
    290     public static class KeyValueRegexpCondition extends KeyValueCondition {
     290    class KeyValueRegexpCondition extends KeyValueCondition {
    291291
    292292        public final Pattern pattern;
    … …  
    317317    }
    318318
    319     public static class RegexpKeyValueRegexpCondition extends KeyValueRegexpCondition {
     319    class RegexpKeyValueRegexpCondition extends KeyValueRegexpCondition {
    320320
    321321        public final Pattern keyPattern;
    … …  
    337337    }
    338338
    339     public static class RoleCondition extends Condition {
     339    class RoleCondition implements Condition {
    340340        public final String role;
    341341        public final Op op;
    … …  
    354354    }
    355355
    356     public static class IndexCondition extends Condition {
     356    class IndexCondition implements Condition {
    357357        public final String index;
    358358        public final Op op;
    … …  
    377377     * This defines how {@link KeyCondition} matches a given key.
    378378     */
    379     public enum KeyMatchType {
     379    enum KeyMatchType {
    380380        /**
    381381         * The key needs to be equal to the given label.
    … …  
    417417     * </pre>
    418418     */
    419     public static class KeyCondition extends Condition {
     419    class KeyCondition implements Condition {
    420420
    421421        /**
    … …  
    499499    }
    500500
    501     public static class ClassCondition extends Condition {
     501    class ClassCondition implements Condition {
    502502
    503503        public final String id;
    … …  
    524524     * are written in lower case with dashes between words.
    525525     */
    526     static class PseudoClasses {
     526    final class PseudoClasses {
     527
     528        private PseudoClasses() {
     529            // Hide default constructor for utilities classes
     530        }
    527531
    528532        /**
    … …  
    687691    }
    688692
    689     public static class PseudoClassCondition extends Condition {
     693    class PseudoClassCondition implements Condition {
    690694
    691695        public final Method method;
    … …  
    736740    }
    737741
    738     public static class OpenEndPseudoClassCondition extends PseudoClassCondition {
     742    class OpenEndPseudoClassCondition extends PseudoClassCondition {
    739743        public OpenEndPseudoClassCondition(boolean not) {
    740744            super(null, not);
    … …  
    747751    }
    748752
    749     public static class ExpressionCondition extends Condition {
     753    class ExpressionCondition implements Condition {
    750754
    751755        private final Expression e;
Note: See TracChangeset for help on using the changeset viewer.