Skip to content

Commit fa37068

Browse files
rbrirbri
committed
the item() methods are gone
1 parent 452edd3 commit fa37068

25 files changed

Lines changed: 265 additions & 357 deletions

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ public String getCssText() {
6262
sb.append(getMedia().getMediaText());
6363
sb.append(" {");
6464
for (int i = 0; i < getCssRules().getLength(); i++) {
65-
final AbstractCSSRuleImpl rule = getCssRules().item(i);
65+
final AbstractCSSRuleImpl rule = getCssRules().getRules().get(i);
6666
sb.append(rule.getCssText()).append(" ");
6767
}
6868
sb.append("}");
@@ -218,7 +218,7 @@ private void readObject(final ObjectInputStream in)
218218
cssRules_ = (CSSRuleListImpl) in.readObject();
219219
if (cssRules_ != null) {
220220
for (int i = 0; i < cssRules_.getLength(); i++) {
221-
final AbstractCSSRuleImpl cssRule = cssRules_.item(i);
221+
final AbstractCSSRuleImpl cssRule = cssRules_.getRules().get(i);
222222
cssRule.setParentRule(this);
223223
cssRule.setParentStyleSheet(getParentStyleSheetImpl());
224224
}

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

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,6 @@ public int getLength() {
4141
return getRules().size();
4242
}
4343

44-
public AbstractCSSRuleImpl item(final int index) {
45-
if (index < 0 || null == rules_ || index >= rules_.size()) {
46-
return null;
47-
}
48-
return rules_.get(index);
49-
}
50-
5144
public void add(final AbstractCSSRuleImpl rule) {
5245
getRules().add(rule);
5346
}
@@ -63,12 +56,10 @@ public void delete(final int index) {
6356
@Override
6457
public String toString() {
6558
final StringBuilder sb = new StringBuilder();
66-
for (int i = 0; i < getLength(); i++) {
67-
if (i > 0) {
59+
for (AbstractCSSRuleImpl rule : rules_) {
60+
if (sb.length() > 0) {
6861
sb.append("\r\n");
6962
}
70-
71-
final AbstractCSSRuleImpl rule = item(i);
7263
sb.append(rule.toString());
7364
}
7465
return sb.toString();
@@ -90,12 +81,13 @@ private boolean equalsRules(final CSSRuleListImpl crl) {
9081
if ((crl == null) || (getLength() != crl.getLength())) {
9182
return false;
9283
}
93-
for (int i = 0; i < getLength(); i++) {
94-
final AbstractCSSRuleImpl cssRule1 = item(i);
95-
final AbstractCSSRuleImpl cssRule2 = crl.item(i);
96-
if (!LangUtils.equals(cssRule1, cssRule2)) {
84+
int i = 0;;
85+
for (AbstractCSSRuleImpl rule : rules_) {
86+
final AbstractCSSRuleImpl cssRule2 = crl.rules_.get(i);
87+
if (!LangUtils.equals(rule, cssRule2)) {
9788
return false;
9889
}
90+
i++;
9991
}
10092
return true;
10193
}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ public int insertRule(final String rule, final int index) throws DOMException {
139139
if (index != 0) {
140140
msg = DOMExceptionImpl.CHARSET_NOT_FIRST;
141141
}
142-
else if (getCssRules().item(0) instanceof CSSCharsetRuleImpl) {
142+
else if (getCssRules().getRules().get(0) instanceof CSSCharsetRuleImpl) {
143143
msg = DOMExceptionImpl.CHARSET_NOT_UNIQUE;
144144
}
145145
}
@@ -148,7 +148,7 @@ else if (r instanceof CSSImportRuleImpl) {
148148
// charset rules)
149149
if (index <= getCssRules().getLength()) {
150150
for (int i = 0; i < index; i++) {
151-
final AbstractCSSRuleImpl ri = getCssRules().item(i);
151+
final AbstractCSSRuleImpl ri = getCssRules().getRules().get(i);
152152
if (!(ri instanceof CSSCharsetRuleImpl) && !(ri instanceof CSSImportRuleImpl)) {
153153
msg = DOMExceptionImpl.IMPORT_NOT_FIRST;
154154
break;
@@ -159,7 +159,7 @@ else if (r instanceof CSSImportRuleImpl) {
159159
else {
160160
if (index <= getCssRules().getLength()) {
161161
for (int i = index; i < getCssRules().getLength(); i++) {
162-
final AbstractCSSRuleImpl ri = getCssRules().item(i);
162+
final AbstractCSSRuleImpl ri = getCssRules().getRules().get(i);
163163
if ((ri instanceof CSSCharsetRuleImpl) || (ri instanceof CSSImportRuleImpl)) {
164164
msg = DOMExceptionImpl.INSERT_BEFORE_IMPORT;
165165
break;
@@ -309,7 +309,7 @@ private void readObject(final ObjectInputStream in) throws IOException, ClassNot
309309
cssRules_ = (CSSRuleListImpl) in.readObject();
310310
if (cssRules_ != null) {
311311
for (int i = 0; i < cssRules_.getLength(); i++) {
312-
final AbstractCSSRuleImpl cssRule = cssRules_.item(i);
312+
final AbstractCSSRuleImpl cssRule = cssRules_.getRules().get(i);
313313
cssRule.setParentStyleSheet(this);
314314
}
315315
}

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

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,6 @@ public int getLength() {
4242
return getCSSStyleSheets().size();
4343
}
4444

45-
public CSSStyleSheetImpl item(final int index) {
46-
return getCSSStyleSheets().get(index);
47-
}
48-
4945
/**
5046
* Adds a CSSStyleSheet.
5147
*
@@ -92,10 +88,10 @@ private boolean equalsStyleSheets(final CSSStyleSheetListImpl ssl) {
9288
if ((ssl == null) || (getLength() != ssl.getLength())) {
9389
return false;
9490
}
95-
for (int i = 0; i < getLength(); i++) {
96-
final CSSStyleSheetImpl styleSheet1 = item(i);
97-
final CSSStyleSheetImpl styleSheet2 = ssl.item(i);
98-
if (!LangUtils.equals(styleSheet1, styleSheet2)) {
91+
int i = 0;
92+
for (CSSStyleSheetImpl styleSheet : cssStyleSheets_) {
93+
final CSSStyleSheetImpl styleSheet2 = ssl.cssStyleSheets_.get(i);
94+
if (!LangUtils.equals(styleSheet, styleSheet2)) {
9995
return false;
10096
}
10197
}

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

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -88,15 +88,6 @@ public int getLength() {
8888
return mediaQueries_.size();
8989
}
9090

91-
public String item(final int index) {
92-
final MediaQuery mq = mediaQuery(index);
93-
if (null == mq) {
94-
return null;
95-
}
96-
97-
return mq.getMedia();
98-
}
99-
10091
/**
10192
* @param index the position of the media query
10293
* @return the media query at the given pos
@@ -147,12 +138,15 @@ private boolean equalsMedia(final MediaListImpl ml) {
147138
if ((ml == null) || (getLength() != ml.getLength())) {
148139
return false;
149140
}
150-
for (int i = 0; i < getLength(); i++) {
151-
final String m1 = item(i);
152-
final String m2 = ml.item(i);
141+
142+
int i = 0;
143+
for (MediaQuery mediaQuery : mediaQueries_) {
144+
final String m1 = mediaQuery.getMedia();
145+
final String m2 = ml.mediaQuery(i).getMedia();
153146
if (!LangUtils.equals(m1, m2)) {
154147
return false;
155148
}
149+
i++;
156150
}
157151
return true;
158152
}

‎src/main/java/com/gargoylesoftware/css/parser/media/MediaQueryList.java‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,6 @@ public int getLength() {
3636
return mediaQueries_.size();
3737
}
3838

39-
public String item(final int index) {
40-
return mediaQuery(index).getMedia();
41-
}
42-
4339
public MediaQuery mediaQuery(final int index) {
4440
return mediaQueries_.get(index);
4541
}
@@ -55,12 +51,11 @@ public void add(final MediaQuery mediaQuery) {
5551
@Override
5652
public String toString() {
5753
final StringBuilder sb = new StringBuilder();
58-
final int len = getLength();
59-
for (int i = 0; i < len; i++) {
60-
sb.append(item(i));
61-
if (i < len - 1) {
54+
for (MediaQuery mediaQuery : mediaQueries_) {
55+
if (sb.length() > 0) {
6256
sb.append(", ");
6357
}
58+
sb.append(mediaQuery.getMedia());
6459
}
6560
return sb.toString();
6661
}

‎src/test/java/com/gargoylesoftware/css/DomTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ public void inheritGetStringValue() throws Exception {
145145
final CSSRuleListImpl rules = css.getCssRules();
146146
Assert.assertEquals(2, rules.getLength());
147147

148-
Assert.assertEquals("p { font-size: 2em }", rules.item(0).getCssText());
149-
Assert.assertEquals("p a:link { font-size: inherit }", rules.item(1).getCssText());
148+
Assert.assertEquals("p { font-size: 2em }", rules.getRules().get(0).getCssText());
149+
Assert.assertEquals("p a:link { font-size: inherit }", rules.getRules().get(1).getCssText());
150150
}
151151
}

‎src/test/java/com/gargoylesoftware/css/SerializableTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ public void test() throws Exception {
7272

7373
// TODO
7474
for (int i = 0; i < rules.getLength(); i++) {
75-
final AbstractCSSRuleImpl rule = rules.item(i);
75+
final AbstractCSSRuleImpl rule = rules.getRules().get(i);
7676
System.out.println(rule.getCssText());
7777
}
7878
}

‎src/test/java/com/gargoylesoftware/css/TestException.java‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -58,29 +58,29 @@ public void test() throws Exception {
5858
final CSSRuleListImpl rules = stylesheet.getCssRules();
5959
Assert.assertEquals(3, rules.getLength());
6060

61-
Assert.assertEquals("@charset \"US-ASCII\";", rules.item(0).getCssText());
62-
Assert.assertEquals("@import url(http://www.steadystate.com/primary.css);", rules.item(1).getCssText());
63-
Assert.assertEquals("P { color: blue }", rules.item(2).getCssText());
61+
Assert.assertEquals("@charset \"US-ASCII\";", rules.getRules().get(0).getCssText());
62+
Assert.assertEquals("@import url(http://www.steadystate.com/primary.css);", rules.getRules().get(1).getCssText());
63+
Assert.assertEquals("P { color: blue }", rules.getRules().get(2).getCssText());
6464

6565
stylesheet.deleteRule(1);
6666

6767
Assert.assertEquals(2, rules.getLength());
68-
Assert.assertEquals("@charset \"US-ASCII\";", rules.item(0).getCssText());
69-
Assert.assertEquals("P { color: blue }", rules.item(1).getCssText());
68+
Assert.assertEquals("@charset \"US-ASCII\";", rules.getRules().get(0).getCssText());
69+
Assert.assertEquals("P { color: blue }", rules.getRules().get(1).getCssText());
7070

71-
AbstractCSSRuleImpl rule = rules.item(1);
71+
AbstractCSSRuleImpl rule = rules.getRules().get(1);
7272
rule.setCssText("h2 { smell: strong }");
73-
Assert.assertEquals("h2 { smell: strong }", rules.item(1).getCssText());
73+
Assert.assertEquals("h2 { smell: strong }", rules.getRules().get(1).getCssText());
7474

7575
final int n = stylesheet.insertRule("@media speech { h1 { voice: male } }", 1);
7676
Assert.assertEquals(1, n);
7777

7878
Assert.assertEquals(3, rules.getLength());
79-
Assert.assertEquals("@charset \"US-ASCII\";", rules.item(0).getCssText());
80-
Assert.assertEquals("@media speech {h1 { voice: male } }", rules.item(1).getCssText());
81-
Assert.assertEquals("h2 { smell: strong }", rules.item(2).getCssText());
79+
Assert.assertEquals("@charset \"US-ASCII\";", rules.getRules().get(0).getCssText());
80+
Assert.assertEquals("@media speech {h1 { voice: male } }", rules.getRules().get(1).getCssText());
81+
Assert.assertEquals("h2 { smell: strong }", rules.getRules().get(2).getCssText());
8282

83-
rule = rules.item(1);
83+
rule = rules.getRules().get(1);
8484
((CSSMediaRuleImpl) rule).insertRule("p { voice: female }", 1);
8585
Assert.assertEquals("speech", ((CSSMediaRuleImpl) rule).getMedia().getMediaText());
8686

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ private CSSCharsetRuleImpl parseCharsetRule(final String rule) throws Exception
9393
final InputSource is = new InputSource(new StringReader(rule));
9494
final CSSStyleSheetImpl ss = new CSSOMParser().parseStyleSheet(is, null);
9595

96-
final CSSCharsetRuleImpl value = (CSSCharsetRuleImpl) ss.getCssRules().item(0);
96+
final CSSCharsetRuleImpl value = (CSSCharsetRuleImpl) ss.getCssRules().getRules().get(0);
9797
return value;
9898
}
9999
/**

0 commit comments

Comments
 (0)