improved selector

Author: rbri

src/main/java/com/gargoylesoftware/css/dom/CSSStyleSheetImpl.java

@@ -390,14 +390,26 @@ public void addElementSelector(final String name, final Selector s, final CSSSty
             entries.add(selectorEntry);
         }
 
-        public void addClassSelector(final String name, final Selector s, final CSSStyleRuleImpl styleRule) {
-            List<SelectorEntry> entries = classSelectors_.get(name);
+        public void addClassSelector(final String elementName, final String className,
+                final Selector s, final CSSStyleRuleImpl styleRule) {
+            List<SelectorEntry> entries = classSelectors_.get(className);
             if (entries == null) {
                 entries = new ArrayList<SelectorEntry>();
-                classSelectors_.put(name, entries);
+                classSelectors_.put(className, entries);
             }
-            final SelectorEntry selectorEntry = new SelectorEntry(s, styleRule);
+            SelectorEntry selectorEntry = new SelectorEntry(s, styleRule);
             entries.add(selectorEntry);
+
+            if (elementName != null) {
+                final String key = elementName + "." + className;
+                entries = classSelectors_.get(key);
+                if (entries == null) {
+                    entries = new ArrayList<SelectorEntry>();
+                    classSelectors_.put(key, entries);
+                }
+                selectorEntry = new SelectorEntry(s, styleRule);
+                entries.add(selectorEntry);
+            }
         }
 
         public void addOtherSelector(final Selector s, final CSSStyleRuleImpl styleRule) {
@@ -439,10 +451,15 @@ static final class SelectorEntriesIterator implements Iterator<SelectorEntry> {
         SelectorEntriesIterator(final CSSStyleSheetRuleIndex index,
                 final String elementName, final String[] classes) {
             iterators_ = new LinkedList<Iterator<SelectorEntry>>();
+
             List<SelectorEntry> sel = index.elementSelectors_.get("*");
             if (sel != null && !sel.isEmpty()) {
                 iterators_.add(sel.iterator());
             }
+            sel = index.elementSelectors_.get(elementName);
+            if (sel != null && !sel.isEmpty()) {
+                iterators_.add(sel.iterator());
+            }
 
             if (classes != null) {
                 for (String clazz : classes) {
@@ -451,12 +468,12 @@ static final class SelectorEntriesIterator implements Iterator<SelectorEntry> {
                         iterators_.add(sel.iterator());
                     }
 
+                    sel = index.classSelectors_.get(elementName + "." + clazz);
+                    if (sel != null && !sel.isEmpty()) {
+                        iterators_.add(sel.iterator());
+                    }
                 }
             }
-            sel = index.elementSelectors_.get(elementName);
-            if (sel != null && !sel.isEmpty()) {
-                iterators_.add(sel.iterator());
-            }
 
             if (index.otherSelectors_ != null && !index.otherSelectors_.isEmpty()) {
                 iterators_.add(index.otherSelectors_.iterator());