Update of /var/cvs/src/org/mmbase/storage/search/implementation
In directory james.mmbase.org:/tmp/cvs-serv16015
Modified Files:
BasicSearchQuery.java NodeSearchQuery.java
Log Message:
MMB-1768. Plus some other small details
See also:
http://cvs.mmbase.org/viewcvs/src/org/mmbase/storage/search/implementation
See also: http://www.mmbase.org/jira/browse/MMB-1768
Index: BasicSearchQuery.java
===================================================================
RCS file:
/var/cvs/src/org/mmbase/storage/search/implementation/BasicSearchQuery.java,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -b -r1.51 -r1.52
--- BasicSearchQuery.java 5 Jan 2009 09:32:28 -0000 1.51
+++ BasicSearchQuery.java 5 Jan 2009 14:30:12 -0000 1.52
@@ -23,10 +23,10 @@
* Basic implementation.
*
* @author Rob van Maris
- * @version $Id: BasicSearchQuery.java,v 1.51 2009/01/05 09:32:28 michiel Exp $
+ * @version $Id: BasicSearchQuery.java,v 1.52 2009/01/05 14:30:12 michiel Exp $
* @since MMBase-1.7
*/
-public class BasicSearchQuery implements SearchQuery, Cloneable {
+public class BasicSearchQuery implements SearchQuery,
org.mmbase.util.PublicCloneable<BasicSearchQuery> {
private static final Logger log =
Logging.getLoggerInstance(BasicSearchQuery.class);
/**
@@ -127,7 +127,7 @@
}
- public Object clone() {
+ public BasicSearchQuery clone() {
try {
BasicSearchQuery clone = (BasicSearchQuery) super.clone();
clone.copySteps(this);
@@ -135,7 +135,7 @@
clone.copySortOrders(this);
Constraint c = getConstraint();
if (c != null) {
- clone.setConstraint(copyConstraint(this, c));
+ clone.setConstraint(copyConstraint(clone, c));
}
return clone;
} catch (CloneNotSupportedException e) {
@@ -453,11 +453,11 @@
/**
* Add all fields of given step
*/
- public void addFields(Step step, MMObjectBuilder builder) {
+ protected void addFields(Step step, MMObjectBuilder builder) {
// http://www.mmbase.org/jira/browse/MMB-1435,
// Using fields with "ORDER_CREATE" only returns fields actually in
storage, and also in the
- // right order, which is import for microsoft JDBC.
+ // right order, which is important for microsoft JDBC.
for (CoreField field : builder.getFields(NodeManager.ORDER_CREATE)) {
if (field.inStorage()) {
Index: NodeSearchQuery.java
===================================================================
RCS file:
/var/cvs/src/org/mmbase/storage/search/implementation/NodeSearchQuery.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- NodeSearchQuery.java 8 Sep 2006 18:42:59 -0000 1.15
+++ NodeSearchQuery.java 5 Jan 2009 14:30:12 -0000 1.16
@@ -35,7 +35,7 @@
* </ul>
*
* @author Rob van Maris
- * @version $Id: NodeSearchQuery.java,v 1.15 2006/09/08 18:42:59 michiel Exp $
+ * @version $Id: NodeSearchQuery.java,v 1.16 2009/01/05 14:30:12 michiel Exp $
* @since MMBase-1.7
*/
public class NodeSearchQuery extends BasicSearchQuery implements SearchQuery {
@@ -62,7 +62,7 @@
throw new IllegalArgumentException("Invalid builder type, because
this is a virtual builder: " + builder.getClass().getName());
}
Step step = super.addStep(builder);
- addFields(step);
+ addFields(step, builder);
this.builder = builder;
}
@@ -114,8 +114,7 @@
// javadoc is inherited
public BasicStep addStep(MMObjectBuilder builder) {
- throw new UnsupportedOperationException(
- "Adding more steps to NodeSearchQuery not supported.");
+ throw new UnsupportedOperationException("Adding more steps to
NodeSearchQuery not supported.");
}
// javadoc is inherited
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
