Skip to content

Commit 6260694

Browse files
rbrirbri
committed
% cleanup
1 parent 94f7caa commit 6260694

File tree

9 files changed

+74
-148
lines changed

9 files changed

+74
-148
lines changed

‎src/main/java/com/gargoylesoftware/css/parser/selector/SyntheticElementSelector.java‎

Lines changed: 0 additions & 35 deletions
This file was deleted.

‎src/main/javacc/CSS3Parser.jj‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@ import com.gargoylesoftware.css.parser.selector.Selector;
6262
import com.gargoylesoftware.css.parser.selector.SelectorList;
6363
import com.gargoylesoftware.css.parser.selector.SelectorListImpl;
6464
import com.gargoylesoftware.css.parser.selector.SimpleSelector;
65-
import com.gargoylesoftware.css.parser.selector.SyntheticElementSelector;
6665
import com.gargoylesoftware.css.util.LangUtils;
6766

6867
/**
@@ -1091,7 +1090,7 @@ Selector simpleSelector(Selector sel, char comb) :
10911090
)*
10921091
)
10931092
|
1094-
( { simpleSel = new SyntheticElementSelector(); }
1093+
( { simpleSel = new ElementSelector(null, createLocator(token)); }
10951094
( c = hash(c, null != pseudoElementSel)
10961095
| c = _class(c, null != pseudoElementSel)
10971096
| c = attrib(c, null != pseudoElementSel)

‎src/test/java/com/gargoylesoftware/css/dom/CSSMediaRuleImplTest.java‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -58,22 +58,22 @@ public void insertRule() throws Exception {
5858
final CSSMediaRule mediaRule = (CSSMediaRule) ss.getCssRules().item(0);
5959

6060
mediaRule.insertRule(".testStyle { height: 42px; }", 0);
61-
Assert.assertEquals(".testStyle { height: 42px }", mediaRule.getCssRules().item(0).getCssText());
61+
Assert.assertEquals("*.testStyle { height: 42px }", mediaRule.getCssRules().item(0).getCssText());
6262

6363
mediaRule.insertRule(".testStyle { height: 43px; }", 0);
64-
Assert.assertEquals(".testStyle { height: 43px }", mediaRule.getCssRules().item(0).getCssText());
65-
Assert.assertEquals(".testStyle { height: 42px }", mediaRule.getCssRules().item(1).getCssText());
64+
Assert.assertEquals("*.testStyle { height: 43px }", mediaRule.getCssRules().item(0).getCssText());
65+
Assert.assertEquals("*.testStyle { height: 42px }", mediaRule.getCssRules().item(1).getCssText());
6666

6767
mediaRule.insertRule(".testStyle { height: 44px; }", 2);
68-
Assert.assertEquals(".testStyle { height: 43px }", mediaRule.getCssRules().item(0).getCssText());
69-
Assert.assertEquals(".testStyle { height: 42px }", mediaRule.getCssRules().item(1).getCssText());
70-
Assert.assertEquals(".testStyle { height: 44px }", mediaRule.getCssRules().item(2).getCssText());
68+
Assert.assertEquals("*.testStyle { height: 43px }", mediaRule.getCssRules().item(0).getCssText());
69+
Assert.assertEquals("*.testStyle { height: 42px }", mediaRule.getCssRules().item(1).getCssText());
70+
Assert.assertEquals("*.testStyle { height: 44px }", mediaRule.getCssRules().item(2).getCssText());
7171

7272
mediaRule.insertRule(".testStyle { height: 45px; }", 2);
73-
Assert.assertEquals(".testStyle { height: 43px }", mediaRule.getCssRules().item(0).getCssText());
74-
Assert.assertEquals(".testStyle { height: 42px }", mediaRule.getCssRules().item(1).getCssText());
75-
Assert.assertEquals(".testStyle { height: 45px }", mediaRule.getCssRules().item(2).getCssText());
76-
Assert.assertEquals(".testStyle { height: 44px }", mediaRule.getCssRules().item(3).getCssText());
73+
Assert.assertEquals("*.testStyle { height: 43px }", mediaRule.getCssRules().item(0).getCssText());
74+
Assert.assertEquals("*.testStyle { height: 42px }", mediaRule.getCssRules().item(1).getCssText());
75+
Assert.assertEquals("*.testStyle { height: 45px }", mediaRule.getCssRules().item(2).getCssText());
76+
Assert.assertEquals("*.testStyle { height: 44px }", mediaRule.getCssRules().item(3).getCssText());
7777
}
7878

7979
/**
@@ -89,16 +89,16 @@ public void insertRuleWithLeadingWhitespace() throws Exception {
8989
final CSSMediaRule mediaRule = (CSSMediaRule) ss.getCssRules().item(0);
9090

9191
mediaRule.insertRule(" .testStyleDef { height: 42px; }", 0);
92-
Assert.assertEquals(".testStyleDef { height: 42px }", mediaRule.getCssRules().item(0).getCssText());
92+
Assert.assertEquals("*.testStyleDef { height: 42px }", mediaRule.getCssRules().item(0).getCssText());
9393

9494
mediaRule.insertRule(" .testStyleDef { height: 43px;} ", 0);
95-
Assert.assertEquals(".testStyleDef { height: 43px }", mediaRule.getCssRules().item(0).getCssText());
96-
Assert.assertEquals(".testStyleDef { height: 42px }", mediaRule.getCssRules().item(1).getCssText());
95+
Assert.assertEquals("*.testStyleDef { height: 43px }", mediaRule.getCssRules().item(0).getCssText());
96+
Assert.assertEquals("*.testStyleDef { height: 42px }", mediaRule.getCssRules().item(1).getCssText());
9797

9898
mediaRule.insertRule("\t.testStyleDef { height: 44px; }\r\n", 0);
99-
Assert.assertEquals(".testStyleDef { height: 44px }", mediaRule.getCssRules().item(0).getCssText());
100-
Assert.assertEquals(".testStyleDef { height: 43px }", mediaRule.getCssRules().item(1).getCssText());
101-
Assert.assertEquals(".testStyleDef { height: 42px }", mediaRule.getCssRules().item(2).getCssText());
99+
Assert.assertEquals("*.testStyleDef { height: 44px }", mediaRule.getCssRules().item(0).getCssText());
100+
Assert.assertEquals("*.testStyleDef { height: 43px }", mediaRule.getCssRules().item(1).getCssText());
101+
Assert.assertEquals("*.testStyleDef { height: 42px }", mediaRule.getCssRules().item(2).getCssText());
102102
}
103103

104104
/**

‎src/test/java/com/gargoylesoftware/css/dom/CSSStyleSheetImplTest.java‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -43,22 +43,22 @@ public void insertRule() throws Exception {
4343
final CSSStyleSheetImpl ss = parseStyleSheet("");
4444

4545
ss.insertRule(".testStyle { height: 42px; }", 0);
46-
Assert.assertEquals(".testStyle { height: 42px }", ss.getCssRules().item(0).getCssText());
46+
Assert.assertEquals("*.testStyle { height: 42px }", ss.getCssRules().item(0).getCssText());
4747

4848
ss.insertRule(".testStyle { height: 43px; }", 0);
49-
Assert.assertEquals(".testStyle { height: 43px }", ss.getCssRules().item(0).getCssText());
50-
Assert.assertEquals(".testStyle { height: 42px }", ss.getCssRules().item(1).getCssText());
49+
Assert.assertEquals("*.testStyle { height: 43px }", ss.getCssRules().item(0).getCssText());
50+
Assert.assertEquals("*.testStyle { height: 42px }", ss.getCssRules().item(1).getCssText());
5151

5252
ss.insertRule(".testStyle { height: 44px; }", 2);
53-
Assert.assertEquals(".testStyle { height: 43px }", ss.getCssRules().item(0).getCssText());
54-
Assert.assertEquals(".testStyle { height: 42px }", ss.getCssRules().item(1).getCssText());
55-
Assert.assertEquals(".testStyle { height: 44px }", ss.getCssRules().item(2).getCssText());
53+
Assert.assertEquals("*.testStyle { height: 43px }", ss.getCssRules().item(0).getCssText());
54+
Assert.assertEquals("*.testStyle { height: 42px }", ss.getCssRules().item(1).getCssText());
55+
Assert.assertEquals("*.testStyle { height: 44px }", ss.getCssRules().item(2).getCssText());
5656

5757
ss.insertRule(".testStyle { height: 45px; }", 2);
58-
Assert.assertEquals(".testStyle { height: 43px }", ss.getCssRules().item(0).getCssText());
59-
Assert.assertEquals(".testStyle { height: 42px }", ss.getCssRules().item(1).getCssText());
60-
Assert.assertEquals(".testStyle { height: 45px }", ss.getCssRules().item(2).getCssText());
61-
Assert.assertEquals(".testStyle { height: 44px }", ss.getCssRules().item(3).getCssText());
58+
Assert.assertEquals("*.testStyle { height: 43px }", ss.getCssRules().item(0).getCssText());
59+
Assert.assertEquals("*.testStyle { height: 42px }", ss.getCssRules().item(1).getCssText());
60+
Assert.assertEquals("*.testStyle { height: 45px }", ss.getCssRules().item(2).getCssText());
61+
Assert.assertEquals("*.testStyle { height: 44px }", ss.getCssRules().item(3).getCssText());
6262
}
6363

6464
/**
@@ -71,16 +71,16 @@ public void insertRuleWithLeadingWhitespace() throws Exception {
7171
final CSSStyleSheetImpl ss = parseStyleSheet("");
7272

7373
ss.insertRule(" .testStyleDef { height: 42px; }", 0);
74-
Assert.assertEquals(".testStyleDef { height: 42px }", ss.getCssRules().item(0).getCssText());
74+
Assert.assertEquals("*.testStyleDef { height: 42px }", ss.getCssRules().item(0).getCssText());
7575

7676
ss.insertRule(" .testStyleDef { height: 43px;} ", 0);
77-
Assert.assertEquals(".testStyleDef { height: 43px }", ss.getCssRules().item(0).getCssText());
78-
Assert.assertEquals(".testStyleDef { height: 42px }", ss.getCssRules().item(1).getCssText());
77+
Assert.assertEquals("*.testStyleDef { height: 43px }", ss.getCssRules().item(0).getCssText());
78+
Assert.assertEquals("*.testStyleDef { height: 42px }", ss.getCssRules().item(1).getCssText());
7979

8080
ss.insertRule("\t.testStyleDef { height: 44px; }\r\n", 0);
81-
Assert.assertEquals(".testStyleDef { height: 44px }", ss.getCssRules().item(0).getCssText());
82-
Assert.assertEquals(".testStyleDef { height: 43px }", ss.getCssRules().item(1).getCssText());
83-
Assert.assertEquals(".testStyleDef { height: 42px }", ss.getCssRules().item(2).getCssText());
81+
Assert.assertEquals("*.testStyleDef { height: 44px }", ss.getCssRules().item(0).getCssText());
82+
Assert.assertEquals("*.testStyleDef { height: 43px }", ss.getCssRules().item(1).getCssText());
83+
Assert.assertEquals("*.testStyleDef { height: 42px }", ss.getCssRules().item(2).getCssText());
8484
}
8585

8686
/**

‎src/test/java/com/gargoylesoftware/css/parser/AbstractCSSParserTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@ protected CSSStyleSheet checkErrorSheet(final String input, final String errorMs
266266
}
267267

268268
protected CSSValueImpl dimension(final String dim) throws Exception {
269-
final String css = ".dim { top: " + dim + " }";
269+
final String css = "*.dim { top: " + dim + " }";
270270

271271
final CSSStyleSheet sheet = parse(css);
272272
final CSSRuleList rules = sheet.getCssRules();

0 commit comments

Comments
 (0)