modules/graphics/src/main/java/com/sun/javafx/css/StyleMap.java

rev 9240 : 8076423: JEP 253: Prepare JavaFX UI Controls & CSS APIs for Modularization

*** 30,49 ****
  import java.util.Comparator;
  import java.util.HashMap;
  import java.util.List;
  import java.util.Map;
  
  /**
   * A map of property name to the cascading styles that match a node.
   */
  public final class StyleMap {
  
      public static final StyleMap EMPTY_MAP = 
          new StyleMap(-1, Collections.<Selector>emptyList());
  
      /** Only StyleManager creates StyleMap */
!     StyleMap(int id, List<Selector> selectors) {
          this.id = id;
          this.selectors = selectors;
      }
  
      public int getId() {
--- 30,57 ----
  import java.util.Comparator;
  import java.util.HashMap;
  import java.util.List;
  import java.util.Map;
  
+ import javafx.css.CascadingStyle;
+ import javafx.css.Declaration;
+ import javafx.css.Match;
+ import javafx.css.Rule;
+ import javafx.css.Selector;
+ import javafx.css.Style;
+ 
+ 
  /**
   * A map of property name to the cascading styles that match a node.
   */
  public final class StyleMap {
  
      public static final StyleMap EMPTY_MAP = 
          new StyleMap(-1, Collections.<Selector>emptyList());
  
      /** Only StyleManager creates StyleMap */
!     public StyleMap(int id, List<Selector> selectors) {
          this.id = id;
          this.selectors = selectors;
      }
  
      public int getId() {
*** 83,101 ****
                  final Rule rule = selector.getRule();
  
                  for (int d = 0, dmax = rule.getDeclarations().size(); d < dmax; d++) {
                      final Declaration decl = rule.getDeclarations().get(d);
  
-                     final CascadingStyle s = new CascadingStyle(
-                             new Style(match.selector, decl),
-                             match.pseudoClasses,
-                             match.specificity,
                              // ordinal increments at declaration level since
                              // there may be more than one declaration for the
                              // same attribute within a selector or within a stylesheet
!                             ordinal++
!                     );
  
                      cascadingStyleList.add(s);
  
                  }
              }
--- 91,104 ----
                  final Rule rule = selector.getRule();
  
                  for (int d = 0, dmax = rule.getDeclarations().size(); d < dmax; d++) {
                      final Declaration decl = rule.getDeclarations().get(d);
  
                      // ordinal increments at declaration level since
                      // there may be more than one declaration for the
                      // same attribute within a selector or within a stylesheet
!                     final CascadingStyle s = new CascadingStyle(decl, match, ordinal++);
  
                      cascadingStyleList.add(s);
  
                  }
              }