aboutsummaryrefslogtreecommitdiffstats
path: root/server/src/org/jsoup/select/CombiningEvaluator.java
diff options
context:
space:
mode:
authorLeif Åstrand <leif@vaadin.com>2012-09-05 19:50:56 +0300
committerLeif Åstrand <leif@vaadin.com>2012-09-05 19:51:15 +0300
commit7d25670284b11c7c62ba25183f265227cb3dba83 (patch)
treec8e76eb70dd3cdd5cf59a99419635f2188b25c24 /server/src/org/jsoup/select/CombiningEvaluator.java
parent1d0c96de9595c243d88471476d21e5f248be63f7 (diff)
downloadvaadin-framework-7d25670284b11c7c62ba25183f265227cb3dba83.tar.gz
vaadin-framework-7d25670284b11c7c62ba25183f265227cb3dba83.zip
Reformat project
Diffstat (limited to 'server/src/org/jsoup/select/CombiningEvaluator.java')
-rw-r--r--server/src/org/jsoup/select/CombiningEvaluator.java30
1 files changed, 19 insertions, 11 deletions
diff --git a/server/src/org/jsoup/select/CombiningEvaluator.java b/server/src/org/jsoup/select/CombiningEvaluator.java
index a31ed2636f..c3f9a8af2e 100644
--- a/server/src/org/jsoup/select/CombiningEvaluator.java
+++ b/server/src/org/jsoup/select/CombiningEvaluator.java
@@ -1,13 +1,13 @@
package org.jsoup.select;
-import org.jsoup.helper.StringUtil;
-import org.jsoup.nodes.Element;
-
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.List;
+import org.jsoup.helper.StringUtil;
+import org.jsoup.nodes.Element;
+
/**
* Base combining (and, or) evaluator.
*/
@@ -25,9 +25,10 @@ abstract class CombiningEvaluator extends Evaluator {
}
Evaluator rightMostEvaluator() {
- return evaluators.size() > 0 ? evaluators.get(evaluators.size() - 1) : null;
+ return evaluators.size() > 0 ? evaluators.get(evaluators.size() - 1)
+ : null;
}
-
+
void replaceRightMostEvaluator(Evaluator replacement) {
evaluators.set(evaluators.size() - 1, replacement);
}
@@ -44,8 +45,9 @@ abstract class CombiningEvaluator extends Evaluator {
@Override
public boolean matches(Element root, Element node) {
for (Evaluator s : evaluators) {
- if (!s.matches(root, node))
+ if (!s.matches(root, node)) {
return false;
+ }
}
return true;
}
@@ -58,15 +60,20 @@ abstract class CombiningEvaluator extends Evaluator {
static final class Or extends CombiningEvaluator {
/**
- * Create a new Or evaluator. The initial evaluators are ANDed together and used as the first clause of the OR.
- * @param evaluators initial OR clause (these are wrapped into an AND evaluator).
+ * Create a new Or evaluator. The initial evaluators are ANDed together
+ * and used as the first clause of the OR.
+ *
+ * @param evaluators
+ * initial OR clause (these are wrapped into an AND
+ * evaluator).
*/
Or(Collection<Evaluator> evaluators) {
super();
- if (evaluators.size() > 1)
+ if (evaluators.size() > 1) {
this.evaluators.add(new And(evaluators));
- else // 0 or 1
+ } else {
this.evaluators.addAll(evaluators);
+ }
}
Or() {
@@ -80,8 +87,9 @@ abstract class CombiningEvaluator extends Evaluator {
@Override
public boolean matches(Element root, Element node) {
for (Evaluator s : evaluators) {
- if (s.matches(root, node))
+ if (s.matches(root, node)) {
return true;
+ }
}
return false;
}