Strolch
/
strolch
mirror of https://github.com/strolch-li/strolch.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Major] refactoring use of BooleanSelection in StrolchQuery

This commit is contained in:
Robert von Burg 2014-02-03 08:03:10 +01:00
parent e023733cf0
commit 8b76bf3d4b
5 changed files with 58 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/li/strolch/model/query/AndSelection.java
View File

@ -44,6 +44,18 @@ public class AndSelection extends BooleanSelection {
return this;
}
@Override
public AndSelection with(List<Selection> selections) {
super.with(selections);
return this;
}
@Override
public AndSelection with(Selection... selections) {
super.with(selections);
return this;
}
@Override
public void accept(QueryVisitor visitor) {
visitor.visitAnd(this);

12
src/main/java/li/strolch/model/query/BooleanSelection.java
View File

@ -54,6 +54,18 @@ public abstract class BooleanSelection implements Selection {
return this;
}
public BooleanSelection with(Selection... selections) {
for (Selection selection : selections) {
this.selections.add(selection);
}
return this;
}
public BooleanSelection with(List<Selection> selections) {
this.selections.addAll(selections);
return this;
}
@Override
public abstract void accept(QueryVisitor visitor);
}

12
src/main/java/li/strolch/model/query/OrSelection.java
View File

@ -41,6 +41,18 @@ public class OrSelection extends BooleanSelection {
return this;
}
@Override
public OrSelection with(List<Selection> selections) {
super.with(selections);
return this;
}
@Override
public OrSelection with(Selection... selections) {
super.with(selections);
return this;
}
@Override
public void accept(QueryVisitor visitor) {
visitor.visitOr(this);

4
src/main/java/li/strolch/model/query/OrderQuery.java
View File

@ -23,8 +23,4 @@ public class OrderQuery extends StrolchQuery<OrderQueryVisitor> {
public OrderQuery(Navigation navigation) {
super(navigation);
}
public void add(OrderSelection selection) {
this.selections.add(selection);
}
}

56
src/main/java/li/strolch/model/query/StrolchQuery.java
View File

@ -15,8 +15,7 @@
*/
package li.strolch.model.query;
import java.util.ArrayList;
import java.util.List;
import ch.eitchnet.utils.dbc.DBC;
/**
* @author Robert von Burg <eitch@eitchnet.ch>
@ -24,52 +23,41 @@ import java.util.List;
public abstract class StrolchQuery<T extends QueryVisitor> {
private Navigation navigation;
protected List<Selection> selections;
private Selection selection;
public StrolchQuery(Navigation navigation) {
this.navigation = navigation;
this.selections = new ArrayList<>();
}
public void addSelection(BooleanSelection selection) {
this.selections.add(selection);
public void select(Selection selection) {
DBC.PRE.assertNull("A selection is already set! Use a boolean operator to perform multiple selections",
this.selection);
this.selection = selection;
}
public void addSelection(StrolchElementSelection selection) {
this.selections.add(selection);
public AndSelection and() {
DBC.PRE.assertNull("A selection is already set! Create hierarchical boolean selections", this.selection);
AndSelection and = new AndSelection();
this.selection = and;
return and;
}
public void addSelection(ParameterSelection selection) {
this.selections.add(selection);
public OrSelection or() {
DBC.PRE.assertNull("A selection is already set! Create hierarchical boolean selections", this.selection);
OrSelection or = new OrSelection();
this.selection = or;
return or;
}
public StrolchQuery<T> select(Selection selection) {
this.selections.add(selection);
return this;
}
public StrolchQuery<T> and(Selection... selections) {
AndSelection and = new AndSelection(selections);
this.selections.add(and);
return this;
}
public StrolchQuery<T> or(Selection... selections) {
OrSelection or = new OrSelection(selections);
this.selections.add(or);
return this;
}
public StrolchQuery<T> not(Selection selection) {
NotSelection not = new NotSelection(selection);
this.selections.add(not);
return this;
public void not(Selection selection) {
DBC.PRE.assertNull("A selection is already set! Create hierarchical boolean selections", this.selection);
this.selection = new NotSelection(selection);
}
public void accept(T visitor) {
DBC.PRE.assertNotNull("No navigation set!", this.navigation);
DBC.PRE.assertNotNull("No selection defined!", this.selection);
this.navigation.accept(visitor);
for (Selection selection : this.selections) {
selection.accept(visitor);
}
this.selection.accept(visitor);
}
}