mnalis/apps-android-commons
1
0
Fork 0
mirror of https://github.com/commons-app/apps-android-commons.git synced 2025-10-27 21:03:54 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge pull request #2 from johnjohndoe/avoid-indirection

Browse source 
Avoid indirection and redundant method calls.
This commit is contained in:
Nicolas Raoul 2015-09-18 21:38:13 +09:00
commit 8434cd78de
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
commons/src/main/java/org/wikimedia/commons/MediaDataExtractor.java
View file

@ -158,7 +158,7 @@ public class MediaDataExtractor {
private Node findTemplate(Element parentNode, String title) throws IOException { private Node findTemplate(Element parentNode, String title) throws IOException {
String ucTitle= Utils.capitalize(title); String ucTitle= Utils.capitalize(title);
NodeList nodes = parentNode.getChildNodes(); NodeList nodes = parentNode.getChildNodes();
for (int i = 0; i < nodes.getLength(); i++) { for (int i = 0, length = nodes.getLength(); i < length; i++) {
Node node = nodes.item(i); Node node = nodes.item(i);
if (node.getNodeName().equals("template")) { if (node.getNodeName().equals("template")) {
String foundTitle = getTemplateTitle(node); String foundTitle = getTemplateTitle(node);
@ -172,7 +172,7 @@ public class MediaDataExtractor {
private String getTemplateTitle(Node templateNode) throws IOException { private String getTemplateTitle(Node templateNode) throws IOException {
NodeList nodes = templateNode.getChildNodes(); NodeList nodes = templateNode.getChildNodes();
for (int i = 0; i < nodes.getLength(); i++) { for (int i = 0, length = nodes.getLength(); i < length; i++) {
Node node = nodes.item(i); Node node = nodes.item(i);
if (node.getNodeName().equals("title")) { if (node.getNodeName().equals("title")) {
return node.getTextContent().trim(); return node.getTextContent().trim();
@ -214,16 +214,16 @@ public class MediaDataExtractor {
private Node findTemplateParameter(Node templateNode, TemplateChildNodeComparator comparator) throws IOException { private Node findTemplateParameter(Node templateNode, TemplateChildNodeComparator comparator) throws IOException {
NodeList nodes = templateNode.getChildNodes(); NodeList nodes = templateNode.getChildNodes();
for (int i = 0; i < nodes.getLength(); i++) { for (int i = 0, length = nodes.getLength(); i < length; i++) {
Node node = nodes.item(i); Node node = nodes.item(i);
if (node.getNodeName().equals("part")) { if (node.getNodeName().equals("part")) {
NodeList childNodes = node.getChildNodes(); NodeList childNodes = node.getChildNodes();
for (int j = 0; j < childNodes.getLength(); j++) { for (int j = 0, childNodesLength = childNodes.getLength(); j < childNodesLength; j++) {
Node childNode = childNodes.item(j); Node childNode = childNodes.item(j);
if (childNode.getNodeName().equals("name")) { if (childNode.getNodeName().equals("name")) {
if (comparator.match(childNode)) { if (comparator.match(childNode)) {
// yay! Now fetch the value node. // yay! Now fetch the value node.
for (int k = j + 1; k < childNodes.getLength(); k++) { for (int k = j + 1; k < childNodesLength; k++) {
Node siblingNode = childNodes.item(k); Node siblingNode = childNodes.item(k);
if (siblingNode.getNodeName().equals("value")) { if (siblingNode.getNodeName().equals("value")) {
return siblingNode; return siblingNode;
@ -250,7 +250,7 @@ public class MediaDataExtractor {
StringBuilder localText = new StringBuilder(); StringBuilder localText = new StringBuilder();
NodeList nodes = parentNode.getChildNodes(); NodeList nodes = parentNode.getChildNodes();
for (int i = 0; i < nodes.getLength(); i++) { for (int i = 0, length = nodes.getLength(); i < length; i++) {
Node node = nodes.item(i); Node node = nodes.item(i);
if (node.getNodeName().equals("template")) { if (node.getNodeName().equals("template")) {
// process a template node // process a template node