Skip to content

Commit ae1c128

Browse files
rbrirbri
committed
get rid of all the w3c dependencies
1 parent 3d43f4f commit ae1c128

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+1026
-2549
lines changed

‎src/main/java/com/gargoylesoftware/css/dom/AbstractCSSRuleImpl.java‎

Lines changed: 21 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,18 +16,25 @@
1616

1717
import java.io.Serializable;
1818

19-
import org.w3c.dom.css.CSSRule;
20-
import org.w3c.dom.css.CSSStyleSheet;
21-
2219
import com.gargoylesoftware.css.parser.AbstractLocatable;
2320

2421
/**
2522
* @author Ronald Brill
2623
*/
2724
public abstract class AbstractCSSRuleImpl extends AbstractLocatable implements Serializable {
2825

26+
public enum CSSRuleType {
27+
MEDIA_RULE,
28+
PAGE_RULE,
29+
IMPORT_RULE,
30+
FONT_FACE_RULE,
31+
CHARSET_RULE,
32+
STYLE_RULE,
33+
UNKNOWN_RULE
34+
}
35+
2936
private CSSStyleSheetImpl parentStyleSheet_;
30-
private CSSRule parentRule_;
37+
private AbstractCSSRuleImpl parentRule_;
3138

3239
protected CSSStyleSheetImpl getParentStyleSheetImpl() {
3340
return parentStyleSheet_;
@@ -37,11 +44,11 @@ public void setParentStyleSheet(final CSSStyleSheetImpl parentStyleSheet) {
3744
parentStyleSheet_ = parentStyleSheet;
3845
}
3946

40-
public void setParentRule(final CSSRule parentRule) {
47+
public void setParentRule(final AbstractCSSRuleImpl parentRule) {
4148
parentRule_ = parentRule;
4249
}
4350

44-
public AbstractCSSRuleImpl(final CSSStyleSheetImpl parentStyleSheet, final CSSRule parentRule) {
51+
public AbstractCSSRuleImpl(final CSSStyleSheetImpl parentStyleSheet, final AbstractCSSRuleImpl parentRule) {
4552
super();
4653
parentStyleSheet_ = parentStyleSheet;
4754
parentRule_ = parentRule;
@@ -51,11 +58,16 @@ public AbstractCSSRuleImpl() {
5158
super();
5259
}
5360

54-
public CSSStyleSheet getParentStyleSheet() {
61+
public abstract CSSRuleType getType();
62+
63+
public abstract String getCssText();
64+
public abstract void setCssText(String text);
65+
66+
public CSSStyleSheetImpl getParentStyleSheet() {
5567
return parentStyleSheet_;
5668
}
5769

58-
public CSSRule getParentRule() {
70+
public AbstractCSSRuleImpl getParentRule() {
5971
return parentRule_;
6072
}
6173

@@ -64,7 +76,7 @@ public boolean equals(final Object obj) {
6476
if (this == obj) {
6577
return true;
6678
}
67-
if (!(obj instanceof CSSRule)) {
79+
if (!(obj instanceof AbstractCSSRuleImpl)) {
6880
return false;
6981
}
7082
return super.equals(obj);

‎src/main/java/com/gargoylesoftware/css/dom/CSSCharsetRuleImpl.java‎

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -18,37 +18,33 @@
1818
import java.io.StringReader;
1919

2020
import org.w3c.dom.DOMException;
21-
import org.w3c.dom.css.CSSCharsetRule;
22-
import org.w3c.dom.css.CSSRule;
2321

2422
import com.gargoylesoftware.css.parser.CSSException;
2523
import com.gargoylesoftware.css.parser.CSSOMParser;
2624
import com.gargoylesoftware.css.parser.InputSource;
2725
import com.gargoylesoftware.css.util.LangUtils;
2826

2927
/**
30-
* Implementation of {@link CSSCharsetRule}.
28+
* Implementation of {@link AbstractCSSRuleImpl}.
3129
*
3230
* @author Ronald Brill
3331
*/
34-
public class CSSCharsetRuleImpl extends AbstractCSSRuleImpl implements CSSCharsetRule {
32+
public class CSSCharsetRuleImpl extends AbstractCSSRuleImpl {
3533

3634
private String encoding_;
3735

3836
public CSSCharsetRuleImpl(
3937
final CSSStyleSheetImpl parentStyleSheet,
40-
final CSSRule parentRule,
38+
final AbstractCSSRuleImpl parentRule,
4139
final String encoding) {
4240
super(parentStyleSheet, parentRule);
4341
encoding_ = encoding;
4442
}
4543

46-
@Override
47-
public short getType() {
48-
return CHARSET_RULE;
44+
public CSSRuleType getType() {
45+
return CSSRuleType.CHARSET_RULE;
4946
}
5047

51-
@Override
5248
public void setCssText(final String cssText) throws DOMException {
5349
final CSSStyleSheetImpl parentStyleSheet = getParentStyleSheetImpl();
5450
if (parentStyleSheet != null && parentStyleSheet.isReadOnly()) {
@@ -60,10 +56,10 @@ public void setCssText(final String cssText) throws DOMException {
6056
try {
6157
final InputSource is = new InputSource(new StringReader(cssText));
6258
final CSSOMParser parser = new CSSOMParser();
63-
final CSSRule r = parser.parseRule(is);
59+
final AbstractCSSRuleImpl r = parser.parseRule(is);
6460

6561
// The rule must be a charset rule
66-
if (r.getType() == CSSRule.CHARSET_RULE) {
62+
if (r.getType() == CSSRuleType.CHARSET_RULE) {
6763
encoding_ = ((CSSCharsetRuleImpl) r).encoding_;
6864
}
6965
else {
@@ -86,12 +82,10 @@ public void setCssText(final String cssText) throws DOMException {
8682
}
8783
}
8884

89-
@Override
9085
public String getEncoding() {
9186
return encoding_;
9287
}
9388

94-
@Override
9589
public void setEncoding(final String encoding) throws DOMException {
9690
encoding_ = encoding;
9791
}
@@ -101,10 +95,10 @@ public boolean equals(final Object obj) {
10195
if (this == obj) {
10296
return true;
10397
}
104-
if (!(obj instanceof CSSCharsetRule)) {
98+
if (!(obj instanceof CSSCharsetRuleImpl)) {
10599
return false;
106100
}
107-
final CSSCharsetRule ccr = (CSSCharsetRule) obj;
101+
final CSSCharsetRuleImpl ccr = (CSSCharsetRuleImpl) obj;
108102
return super.equals(obj)
109103
&& LangUtils.equals(getEncoding(), ccr.getEncoding());
110104
}
@@ -121,7 +115,6 @@ public String toString() {
121115
return getCssText();
122116
}
123117

124-
@Override
125118
public String getCssText() {
126119
final StringBuilder sb = new StringBuilder();
127120

‎src/main/java/com/gargoylesoftware/css/dom/CSSFontFaceRuleImpl.java‎

Lines changed: 10 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,6 @@
1818
import java.io.StringReader;
1919

2020
import org.w3c.dom.DOMException;
21-
import org.w3c.dom.css.CSSFontFaceRule;
22-
import org.w3c.dom.css.CSSRule;
23-
import org.w3c.dom.css.CSSStyleDeclaration;
2421

2522
import com.gargoylesoftware.css.parser.CSSException;
2623
import com.gargoylesoftware.css.parser.CSSOMParser;
@@ -32,36 +29,33 @@
3229
*
3330
* @author Ronald Brill
3431
*/
35-
public class CSSFontFaceRuleImpl extends AbstractCSSRuleImpl implements CSSFontFaceRule {
32+
public class CSSFontFaceRuleImpl extends AbstractCSSRuleImpl {
3633

3734
private CSSStyleDeclarationImpl style_;
3835

39-
public CSSFontFaceRuleImpl(final CSSStyleSheetImpl parentStyleSheet, final CSSRule parentRule) {
36+
public CSSFontFaceRuleImpl(final CSSStyleSheetImpl parentStyleSheet, final AbstractCSSRuleImpl parentRule) {
4037
super(parentStyleSheet, parentRule);
4138
}
4239

43-
@Override
44-
public short getType() {
45-
return FONT_FACE_RULE;
40+
public CSSRuleType getType() {
41+
return CSSRuleType.FONT_FACE_RULE;
4642
}
4743

4844
/**
4945
* {@inheritDoc}
5046
*/
51-
@Override
5247
public String getCssText() {
5348
final StringBuilder sb = new StringBuilder();
5449
sb.append("@font-face {");
5550

56-
final CSSStyleDeclaration style = getStyle();
51+
final CSSStyleDeclarationImpl style = getStyle();
5752
if (null != style) {
5853
sb.append(style.getCssText());
5954
}
6055
sb.append("}");
6156
return sb.toString();
6257
}
6358

64-
@Override
6559
public void setCssText(final String cssText) throws DOMException {
6660
final CSSStyleSheetImpl parentStyleSheet = getParentStyleSheetImpl();
6761
if (parentStyleSheet != null && parentStyleSheet.isReadOnly()) {
@@ -73,10 +67,10 @@ public void setCssText(final String cssText) throws DOMException {
7367
try {
7468
final InputSource is = new InputSource(new StringReader(cssText));
7569
final CSSOMParser parser = new CSSOMParser();
76-
final CSSRule r = parser.parseRule(is);
70+
final AbstractCSSRuleImpl r = parser.parseRule(is);
7771

7872
// The rule must be a font face rule
79-
if (r.getType() == CSSRule.FONT_FACE_RULE) {
73+
if (r.getType() == CSSRuleType.FONT_FACE_RULE) {
8074
style_ = ((CSSFontFaceRuleImpl) r).style_;
8175
}
8276
else {
@@ -99,8 +93,7 @@ public void setCssText(final String cssText) throws DOMException {
9993
}
10094
}
10195

102-
@Override
103-
public CSSStyleDeclaration getStyle() {
96+
public CSSStyleDeclarationImpl getStyle() {
10497
return style_;
10598
}
10699

@@ -113,10 +106,10 @@ public boolean equals(final Object obj) {
113106
if (this == obj) {
114107
return true;
115108
}
116-
if (!(obj instanceof CSSFontFaceRule)) {
109+
if (!(obj instanceof CSSFontFaceRuleImpl)) {
117110
return false;
118111
}
119-
final CSSFontFaceRule cffr = (CSSFontFaceRule) obj;
112+
final CSSFontFaceRuleImpl cffr = (CSSFontFaceRuleImpl) obj;
120113
return super.equals(obj)
121114
&& LangUtils.equals(getStyle(), cffr.getStyle());
122115
}

‎src/main/java/com/gargoylesoftware/css/dom/CSSImportRuleImpl.java‎

Lines changed: 15 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,6 @@
1818
import java.io.StringReader;
1919

2020
import org.w3c.dom.DOMException;
21-
import org.w3c.dom.css.CSSImportRule;
22-
import org.w3c.dom.css.CSSRule;
23-
import org.w3c.dom.css.CSSStyleSheet;
24-
import org.w3c.dom.stylesheets.MediaList;
2521

2622
import com.gargoylesoftware.css.parser.CSSException;
2723
import com.gargoylesoftware.css.parser.CSSOMParser;
@@ -35,38 +31,36 @@
3531
*
3632
* @author Ronald Brill
3733
*/
38-
public class CSSImportRuleImpl extends AbstractCSSRuleImpl implements CSSImportRule {
34+
public class CSSImportRuleImpl extends AbstractCSSRuleImpl {
3935

4036
private String href_;
41-
private MediaList media_;
37+
private MediaListImpl media_;
4238

4339
public void setHref(final String href) {
4440
href_ = href;
4541
}
4642

47-
public void setMedia(final MediaList media) {
43+
public void setMedia(final MediaListImpl media) {
4844
media_ = media;
4945
}
5046

5147
public CSSImportRuleImpl(
5248
final CSSStyleSheetImpl parentStyleSheet,
53-
final CSSRule parentRule,
49+
final AbstractCSSRuleImpl parentRule,
5450
final String href,
55-
final MediaList media) {
51+
final MediaListImpl media) {
5652
super(parentStyleSheet, parentRule);
5753
href_ = href;
5854
media_ = media;
5955
}
6056

61-
@Override
62-
public short getType() {
63-
return IMPORT_RULE;
57+
public CSSRuleType getType() {
58+
return CSSRuleType.IMPORT_RULE;
6459
}
6560

6661
/**
6762
* {@inheritDoc}
6863
*/
69-
@Override
7064
public String getCssText() {
7165
final StringBuilder sb = new StringBuilder();
7266
sb.append("@import");
@@ -76,15 +70,14 @@ public String getCssText() {
7670
sb.append(" url(").append(href).append(")");
7771
}
7872

79-
final MediaList ml = getMedia();
73+
final MediaListImpl ml = getMedia();
8074
if (null != ml && ml.getLength() > 0) {
81-
sb.append(" ").append(((MediaListImpl) getMedia()).getMediaText());
75+
sb.append(" ").append(getMedia().getMediaText());
8276
}
8377
sb.append(";");
8478
return sb.toString();
8579
}
8680

87-
@Override
8881
public void setCssText(final String cssText) throws DOMException {
8982
final CSSStyleSheetImpl parentStyleSheet = getParentStyleSheetImpl();
9083
if (parentStyleSheet != null && parentStyleSheet.isReadOnly()) {
@@ -96,10 +89,10 @@ public void setCssText(final String cssText) throws DOMException {
9689
try {
9790
final InputSource is = new InputSource(new StringReader(cssText));
9891
final CSSOMParser parser = new CSSOMParser();
99-
final CSSRule r = parser.parseRule(is);
92+
final AbstractCSSRuleImpl r = parser.parseRule(is);
10093

10194
// The rule must be an import rule
102-
if (r.getType() == CSSRule.IMPORT_RULE) {
95+
if (r.getType() == CSSRuleType.IMPORT_RULE) {
10396
href_ = ((CSSImportRuleImpl) r).href_;
10497
media_ = ((CSSImportRuleImpl) r).media_;
10598
}
@@ -123,18 +116,15 @@ public void setCssText(final String cssText) throws DOMException {
123116
}
124117
}
125118

126-
@Override
127119
public String getHref() {
128120
return href_;
129121
}
130122

131-
@Override
132-
public MediaList getMedia() {
123+
public MediaListImpl getMedia() {
133124
return media_;
134125
}
135126

136-
@Override
137-
public CSSStyleSheet getStyleSheet() {
127+
public CSSStyleSheetImpl getStyleSheet() {
138128
return null;
139129
}
140130

@@ -148,10 +138,10 @@ public boolean equals(final Object obj) {
148138
if (this == obj) {
149139
return true;
150140
}
151-
if (!(obj instanceof CSSImportRule)) {
141+
if (!(obj instanceof CSSImportRuleImpl)) {
152142
return false;
153143
}
154-
final CSSImportRule cir = (CSSImportRule) obj;
144+
final CSSImportRuleImpl cir = (CSSImportRuleImpl) obj;
155145
return super.equals(obj)
156146
&& LangUtils.equals(getHref(), cir.getHref())
157147
&& LangUtils.equals(getMedia(), cir.getMedia());

0 commit comments

Comments
 (0)