Author: ssmiweve
Date: 2008-11-27 20:22:27 +0100 (Thu, 27 Nov 2008)
New Revision: 6998
Modified:
branches/2.18/search-command-control-spi/src/main/java/no/sesat/search/mode/command/AbstractSearchCommand.java
Log:
avoid AbstractSearchCommand.this on overridable methods
Modified:
branches/2.18/search-command-control-spi/src/main/java/no/sesat/search/mode/command/AbstractSearchCommand.java
===================================================================
---
branches/2.18/search-command-control-spi/src/main/java/no/sesat/search/mode/command/AbstractSearchCommand.java
2008-11-27 16:09:12 UTC (rev 6997)
+++
branches/2.18/search-command-control-spi/src/main/java/no/sesat/search/mode/command/AbstractSearchCommand.java
2008-11-27 19:22:27 UTC (rev 6998)
@@ -541,10 +541,10 @@
return datamodel.getPage().getCurrentTab();
}
public Query getQuery() {
- return AbstractSearchCommand.this.getQuery();
+ return getSearchCommandsQuery();
}
public String getDisplayQuery(){
- return
AbstractSearchCommand.this.getTransformedQuerySesamSyntax();
+ return getTransformedQuerySesamSyntax();
}
},
context
@@ -813,8 +813,10 @@
*/
protected String getTransformedQuerySesamSyntax() {
- // also normalise it
- return transformedQuerySesamSyntax.replaceAll(" +", " ");
+ // if it's been nulled then return the original query
+ return null != transformedQuerySesamSyntax
+ ? transformedQuerySesamSyntax.replaceAll(" +", " ") // also
normalise it
+ : context.getDataModel().getQuery().getString();
}
protected void updateTransformedQuerySesamSyntax(){
_______________________________________________
Kernel-commits mailing list
[email protected]
http://sesat.no/mailman/listinfo/kernel-commits
