Skip to content

Commit 925657a

Browse files
committed
Merge branch 'fix-spotbugs-useless-condition-17199185989857704409' of https://github.com/codenameone/CodenameOne into fix-spotbugs-useless-condition-17199185989857704409
2 parents cf4f710 + 1dfc954 commit 925657a

File tree

2 files changed

+3
-11
lines changed

2 files changed

+3
-11
lines changed

CodenameOne/src/com/codename1/ui/layouts/mig/Grid.java

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -258,16 +258,8 @@ public Grid(ContainerWrapper container, LC lc, AC rowConstr, AC colConstr, Map<?
258258
}
259259
} else {
260260
if (cx >= 0 && cy >= 0) {
261-
if (cy >= 0) {
262-
cellXY[0] = cx;
263-
cellXY[1] = cy;
264-
} else { // Only one coordinate is specified. Use the current row (flowx) or column (flowy) to fill in.
265-
if (lc.isFlowX()) {
266-
cellXY[0] = cx;
267-
} else {
268-
cellXY[1] = cx;
269-
}
270-
}
261+
cellXY[0] = cx;
262+
cellXY[1] = cy;
271263
}
272264
cell = getCell(cellXY[1], cellXY[0]); // Might be null
273265
}

CodenameOne/src/com/codename1/xml/XMLParser.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -697,7 +697,7 @@ protected Element parseTag(Reader is) throws IOException {
697697
c = (char) read(is);
698698
}
699699

700-
if ((char)c == '>') { // tag close char shouldn't be found here, but if the XML is slightly malformed we return the element
700+
if (c == '>') { // tag close char shouldn't be found here, but if the XML is slightly malformed we return the element
701701
notifyError(ParserCallback.ERROR_UNEXPECTED_TAG_CLOSING, tn, curAttribute.toString(), null, "Unexpected tag closing in tag " + tagName + ", attribute=" + curAttribute);
702702
if (!isEmptyTag(tn)) {
703703
parseTagContent(element, is);

0 commit comments

Comments
 (0)