@​supports ... supported.

org/w3c/css/parser/AtRuleCounterStyle.java → org/w3c/css/atrules/css/AtRuleCounterStyle.java

@@ -3,7 +3,9 @@
 //
 // (c) COPYRIGHT MIT, ERCIM, Keio, Beihang University, 2017.
 // Please first read the full copyright statement in file COPYRIGHT.html
-package org.w3c.css.parser;
+package org.w3c.css.atrules.css;
+
+import org.w3c.css.parser.AtRule;
 
 public class AtRuleCounterStyle extends AtRule {
 

org/w3c/css/parser/AtRuleFontFace.java → org/w3c/css/atrules/css/AtRuleFontFace.java

@@ -8,7 +8,9 @@
  * AtRuleFontFace.java
  * $Id$
  */
-package org.w3c.css.parser;
+package org.w3c.css.atrules.css;
+
+import org.w3c.css.parser.AtRule;
 
 /**
  * This class manages all media defines by CSS2

org/w3c/css/parser/AtRuleImport.java → org/w3c/css/atrules/css/AtRuleImport.java

@@ -7,9 +7,9 @@
  * AtRuleMedia.java
  * $Id$
  */
-package org.w3c.css.parser;
+package org.w3c.css.atrules.css;
 
-import org.w3c.css.media.AtRuleMedia;
+import org.w3c.css.parser.AtRule;
 
 /**
  * This class manages all imports

org/w3c/css/parser/AtRuleKeyframes.java → org/w3c/css/atrules/css/AtRuleKeyframes.java

@@ -3,8 +3,9 @@
 //
 // (c) COPYRIGHT MIT, ERCIM and Keio University, 2012.
 // Please first read the full copyright statement in file COPYRIGHT.html
-package org.w3c.css.parser;
+package org.w3c.css.atrules.css;
 
+import org.w3c.css.parser.AtRule;
 import org.w3c.css.util.ApplContext;
 import org.w3c.css.util.InvalidParamException;
 import org.w3c.css.values.CssIdent;

org/w3c/css/media/AtRuleMedia.java → org/w3c/css/atrules/css/AtRuleMedia.java

@@ -3,8 +3,10 @@
 // (c) COPYRIGHT MIT, ECIM and Keio University, 2011.
 // Please first read the full copyright statement in file COPYRIGHT.html
 
-package org.w3c.css.media;
+package org.w3c.css.atrules.css;
 
+import org.w3c.css.atrules.css.media.Media;
+import org.w3c.css.atrules.css.media.MediaFeature;
 import org.w3c.css.parser.AtRule;
 import org.w3c.css.util.ApplContext;
 import org.w3c.css.util.CssVersion;
@@ -60,7 +62,7 @@ public ArrayList<Media> getMediaList() {
 
     public String getCurrentMedia() {
         if (!allMedia.isEmpty()) {
-            return allMedia.get(allMedia.size() - 1).media;
+            return allMedia.get(allMedia.size()-1).getMedia();
         }
         return null;
     }
@@ -90,15 +92,15 @@ public boolean canMatch(AtRuleMedia atRule) {
     public static final AtRuleMedia getInstance(CssVersion version) {
         switch (version) {
             case CSS1:
-                return new org.w3c.css.media.css1.AtRuleMedia();
+                return new org.w3c.css.atrules.css1.AtRuleMedia();
             case CSS2:
-                return new org.w3c.css.media.css2.AtRuleMedia();
+                return new org.w3c.css.atrules.css2.AtRuleMedia();
             case CSS21:
-                return new org.w3c.css.media.css21.AtRuleMedia();
+                return new org.w3c.css.atrules.css21.AtRuleMedia();
             case CSS3:
             case CSS:
             case CSS_2015:
-                return new org.w3c.css.media.css3.AtRuleMedia();
+                return new org.w3c.css.atrules.css3.AtRuleMedia();
             default:
                 throw new IllegalArgumentException(
                         "AtRuleMedia.getInstance called with unhandled"

org/w3c/css/parser/AtRuleNamespace.java → org/w3c/css/atrules/css/AtRuleNamespace.java

@@ -7,7 +7,9 @@
  * AtRuleMedia.java
  * $Id$
  */
-package org.w3c.css.parser;
+package org.w3c.css.atrules.css;
+
+import org.w3c.css.parser.AtRule;
 
 /**
  * This class manages all imports

org/w3c/css/parser/AtRulePage.java → org/w3c/css/atrules/css/AtRulePage.java

@@ -8,8 +8,9 @@
  * AtRulePage.java
  * $Id$
  */
-package org.w3c.css.parser;
+package org.w3c.css.atrules.css;
 
+import org.w3c.css.parser.AtRule;
 import org.w3c.css.util.ApplContext;
 import org.w3c.css.util.InvalidParamException;
 

org/w3c/css/parser/AtRulePhoneticAlphabet.java → org/w3c/css/atrules/css/AtRulePhoneticAlphabet.java

@@ -8,8 +8,9 @@
  * AtRulePhoneticAlphabet.java
  * $Id$
  */
-package org.w3c.css.parser;
+package org.w3c.css.atrules.css;
 
+import org.w3c.css.parser.AtRule;
 import org.w3c.css.util.ApplContext;
 
 /**

org/w3c/css/parser/AtRulePreference.java → org/w3c/css/atrules/css/AtRulePreference.java

@@ -6,7 +6,9 @@
 // Please first read the full copyright statement at
 // http://www.w3.org/Consortium/Legal/copyright-software-19980720
 
-package org.w3c.css.parser;
+package org.w3c.css.atrules.css;
+
+import org.w3c.css.parser.AtRule;
 
 @Deprecated
 public class AtRulePreference extends AtRule {

org/w3c/css/atrules/css/AtRuleSupports.java

@@ -0,0 +1,120 @@
+// Author: Yves Lafon <ylafon@w3.org>
+//
+// (c) COPYRIGHT MIT, ERCIM, Keio, Beihang, 2018.
+// Please first read the full copyright statement in file COPYRIGHT.html
+
+package org.w3c.css.atrules.css;
+
+import org.w3c.css.atrules.css.supports.SupportsFeature;
+import org.w3c.css.parser.AtRule;
+import org.w3c.css.util.ApplContext;
+import org.w3c.css.util.InvalidParamException;
+
+import java.util.ArrayList;
+
+
+public class AtRuleSupports extends AtRule {
+
+    public ArrayList<SupportsFeature> allSupportsRule = null;
+
+    /**
+     * Adds a medium.
+     *
+     * @throws org.w3c.css.util.InvalidParamException
+     *          the medium doesn't exist
+     */
+    public void addFeature(SupportsFeature feature,
+                                      ApplContext ac) throws InvalidParamException {
+        if (allSupportsRule == null) {
+            allSupportsRule = new ArrayList<>();
+        }
+        allSupportsRule.add(feature);
+    }
+
+    /**
+     * Adds a media
+     */
+    //   public AtRuleSupports addMedia(Media m) {
+    //      allMedia.add(m);
+    //     return this;
+    // }
+
+    /**
+     * Add a media feature to the current media, like (color:1)
+     *
+     * @param feature, the CssProperty
+     * @since CSS3
+     */
+    //   public abstract void addMediaFeature(MediaFeature feature, ApplContext ac)
+    //          throws InvalidParamException;
+
+    /**
+     * Returns the at rule keyword
+     */
+    public final String keyword() {
+        return "supports";
+    }
+
+
+    public boolean isEmpty() {
+        return false;
+    }
+
+//    public ArrayList<Media> getMediaList() {
+    //       return allMedia;
+    //   }
+
+    //   public String getCurrentMedia() {
+    //      if (!allMedia.isEmpty()) {
+    //         return allMedia.get(allMedia.size()-1).getMedia();
+    //    }
+    //   return null;
+    //  }
+
+    /**
+     * The second must be exactly the same of this one
+     */
+    public boolean canApply(AtRule atRule) {
+        return false;
+    }
+
+    /**
+     * See if two rules can match (ie: one have thing in common)
+     */
+    public boolean canMatch(AtRule atRule) {
+        return false;
+    }
+
+    /**
+     * Returns a string representation of the object.
+     */
+    public String toString() {
+        StringBuilder ret = new StringBuilder();
+
+        ret.append('@');
+        ret.append(keyword());
+        if (allSupportsRule != null) {
+            for (SupportsFeature feature : allSupportsRule) {
+                ret.append(' ');
+                ret.append(feature);
+            }
+        }
+        return ret.toString();
+    }
+
+    public String lookupPrefix() {
+        return "";
+    }
+
+    /**
+     * Use to display the value part of the @media rule
+     * used where the value is used, like as an option in @import
+     *
+     * @return a String
+     */
+    //   public abstract String getValueString();
+
+}
+
+
+

org/w3c/css/media/Media.java → org/w3c/css/atrules/css/media/Media.java

@@ -1,4 +1,4 @@
-package org.w3c.css.media;
+package org.w3c.css.atrules.css.media;
 
 
 import java.util.ArrayList;

org/w3c/css/media/MediaFeature.java → org/w3c/css/atrules/css/media/MediaFeature.java

@@ -1,4 +1,4 @@
-package org.w3c.css.media;
+package org.w3c.css.atrules.css.media;
 
 import org.w3c.css.css.StyleSheetOrigin;
 import org.w3c.css.util.ApplContext;

org/w3c/css/atrules/css/supports/SupportsFeature.java

@@ -0,0 +1,89 @@
+// Author: Yves Lafon <ylafon@w3.org>
+//
+// (c) COPYRIGHT MIT, ERCIM, Keio, Beihang, 2018.
+// Please first read the full copyright statement in file COPYRIGHT.html
+
+package org.w3c.css.atrules.css.supports;
+
+import org.w3c.css.properties.css.CssProperty;
+
+import java.util.ArrayList;
+
+public class SupportsFeature {
+    boolean and = false;
+    boolean not = false;
+    boolean or = false;
+    CssProperty property = null;
+    ArrayList<SupportsFeature> features = null;
+
+    public SupportsFeature() {
+    }
+
+    public SupportsFeature(CssProperty property) {
+        this.property = property;
+    }
+
+    public void setAnd(boolean and) {
+        this.and = and;
+    }
+
+    public boolean getAnd() {
+        return and;
+    }
+
+    public void setOr(boolean or) {
+        this.or = or;
+    }
+
+    public boolean getOr() {
+        return or;
+    }
+
+    public void setNot(boolean not) {
+        this.not = not;
+    }
+
+    public boolean getNot() {
+        return not;
+    }
+
+    public void setProperty(CssProperty property) {
+        this.property = property;
+    }
+
+    public CssProperty getProperty() {
+        return property;
+    }
+
+    public void addFeature(SupportsFeature sf) {
+        if (features == null) {
+            features = new ArrayList<SupportsFeature>();
+        }
+        features.add(sf);
+    }
+
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        boolean printAnd = false;
+
+        if (and) {
+            sb.append(" and ");
+        } else if (not) {
+            sb.append(" not ");
+        } else if (or) {
+            sb.append(" or ");
+        }
+        sb.append('(');
+        if (property != null) {
+            sb.append(property.getPropertyName());
+            sb.append(": ");
+            sb.append(property);
+        } else if (features != null) {
+            for (SupportsFeature sf : features) {
+                sb.append(sf);
+            }
+        }
+        sb.append(')');
+        return sb.toString();
+    }
+}

org/w3c/css/media/css1/AtRuleMedia.java → org/w3c/css/atrules/css1/AtRuleMedia.java

@@ -3,9 +3,9 @@
 // (c) COPYRIGHT MIT, ERCIM and Keio University, 2011
 // Please first read the full copyright statement in file COPYRIGHT.html
 
-package org.w3c.css.media.css1;
+package org.w3c.css.atrules.css1;
 
-import org.w3c.css.media.MediaFeature;
+import org.w3c.css.atrules.css.media.MediaFeature;
 import org.w3c.css.parser.AtRule;
 import org.w3c.css.util.ApplContext;
 import org.w3c.css.util.InvalidParamException;
@@ -14,15 +14,15 @@
  * @spec http://www.w3.org/TR/2008/REC-CSS2-20080411/media.html#media-types
  * @since CSS2
  */
-public class AtRuleMedia extends org.w3c.css.media.AtRuleMedia {
+public class AtRuleMedia extends org.w3c.css.atrules.css.AtRuleMedia {
 
     /**
      * Adds a medium.
      *
      * @throws org.w3c.css.util.InvalidParamException
      *          the medium doesn't exist
      */
-    public org.w3c.css.media.AtRuleMedia addMedia(String restrictor, String medium,
+    public org.w3c.css.atrules.css.AtRuleMedia addMedia(String restrictor, String medium,
                                                   ApplContext ac) throws InvalidParamException {
         throw new InvalidParamException("media", medium, ac);
     }