Changeset 5197

Timestamp:

Dec 14, 2009, 12:07:59 PM (13 years ago)

Author:

Martin Svensson

Message:

Fixes #1445 ServicesUtil?.getConfiguredItemQuery() doesn't remove query options that are set to 'false'

Location:

branches/2.14-stable/src

Files:

• core/net/sf/basedb/core/AbstractEntityQuery.java (modified) (1 diff)
• core/net/sf/basedb/core/query/EntityQuery.java (modified) (1 diff)
• webservices/server/net/sf/basedb/ws/server/ServicesUtil.java (modified) (1 diff)

branches/2.14-stable/src/core/net/sf/basedb/core/AbstractEntityQuery.java

@@ -331 +331 @@
   {
     return rootType;
+  }
+  /**
+    @since 2.14.2   
+  */
+  public void setIncludes(Collection<Include> includes)
+  {
+    this.includes.clear();
+    this.includes.addAll(includes);
   }
   public void include(Include... includes)

branches/2.14-stable/src/core/net/sf/basedb/core/query/EntityQuery.java

@@ -76 +76 @@
   
   /**
+    Clears the lists of includes and adds a new collection.
+    @see #include(Include...)
+    
+    @param includes The new includes to be hold in the list.
+    @since 2.14.2   
+   */
+  public void setIncludes(Collection<Include> includes);
+  
+  /**
     Specify options for which items to exclude from the result. 
 

branches/2.14-stable/src/webservices/server/net/sf/basedb/ws/server/ServicesUtil.java

@@ -69 +69 @@
     if (qOpt.getIncludeNotRemoved()) includes.add(Include.NOT_REMOVED);
     
-    query.include(includes);
+    query.setIncludes(includes);
     if (qOpt.getRestriction() != null)
     {