RenJuan/TASKPM
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Change the format of the matching results of a search in the projects view.

Browse source 
FEA: ItEr75S09ImproveBandboxFinders
This commit is contained in:
Susana Montes Pedreira 2011-07-19 15:04:19 +02:00
parent 5585d5b26e
commit 1e3201a4bd
2 changed files with 12 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrderElementsMultipleFiltersFinder.java
View file

@ -66,10 +66,7 @@ public class OrderElementsMultipleFiltersFinder extends MultipleFiltersFinder {
for (int i = 0; getListMatching().size() < 10
&& i < mapLabels.get(type).size(); i++) {
Label label = mapLabels.get(type).get(i);
String pattern = type.getName() + " :: " + label.getName();
getListMatching().add(
new FilterPair(OrderElementFilterEnum.Label, pattern,
label));
addLabel(type, label);
}
}
return getListMatching();
@ -88,10 +85,7 @@ public class OrderElementsMultipleFiltersFinder extends MultipleFiltersFinder {
for (int i = 0; getListMatching().size() < 10
&& i < mapCriterions.get(type).size(); i++) {
Criterion criterion = mapCriterions.get(type).get(i);
String pattern = type.getName() + " :: " + criterion.getName();
getListMatching().add(
new FilterPair(OrderElementFilterEnum.Criterion,
pattern, criterion));
addCriterion(type, criterion);
}
}
return getListMatching();
@ -192,14 +186,14 @@ public class OrderElementsMultipleFiltersFinder extends MultipleFiltersFinder {
}
private void addCriterion(CriterionType type, Criterion criterion) {
String pattern = type.getName() + " :: " + criterion.getName();
String pattern = criterion.getName() + " ( " + type.getName() + " )";
getListMatching().add(
new FilterPair(OrderElementFilterEnum.Criterion, pattern,
criterion));
new FilterPair(OrderElementFilterEnum.Criterion, type
.getResource().toLowerCase(), pattern, criterion));
}
private void addLabel(LabelType type, Label label) {
String pattern = type.getName() + " :: " + label.getName();
String pattern = label.getName() + " ( " + type.getName() + " )";
getListMatching().add(
new FilterPair(OrderElementFilterEnum.Label, pattern, label));
}

18
navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/OrdersMultipleFiltersFinder.java
View file

@ -74,10 +74,7 @@ public class OrdersMultipleFiltersFinder extends MultipleFiltersFinder {
for (int i = 0; getListMatching().size() < 10
&& i < mapLabels.get(type).size(); i++) {
Label label = mapLabels.get(type).get(i);
String pattern = type.getName() + " :: " + label.getName();
getListMatching().add(
new FilterPair(OrderFilterEnum.Label, pattern,
label));
addLabel(type, label);
}
}
return getListMatching();
@ -92,10 +89,7 @@ public class OrdersMultipleFiltersFinder extends MultipleFiltersFinder {
for (int i = 0; getListMatching().size() < 10
&& i < mapCriterions.get(type).size(); i++) {
Criterion criterion = mapCriterions.get(type).get(i);
String pattern = type.getName() + " :: " + criterion.getName();
getListMatching().add(
new FilterPair(OrderFilterEnum.Criterion,
pattern, criterion));
addCriterion(type, criterion);
}
}
return getListMatching();
@ -301,14 +295,14 @@ public class OrdersMultipleFiltersFinder extends MultipleFiltersFinder {
}
private void addCriterion(CriterionType type, Criterion criterion) {
String pattern = type.getName() + " :: " + criterion.getName();
String pattern = criterion.getName() + " ( " + type.getName() + " )";
getListMatching().add(
new FilterPair(OrderFilterEnum.Criterion, pattern,
criterion));
new FilterPair(OrderFilterEnum.Criterion, type.getResource()
.toLowerCase(), pattern, criterion));
}
private void addLabel(LabelType type, Label label) {
String pattern = type.getName() + " :: " + label.getName();
String pattern = label.getName() + " ( " + type.getName() + " )";
getListMatching().add(
new FilterPair(OrderFilterEnum.Label, pattern, label));
}