Changeset 2401

Timestamp:

05/23/08 11:20:13 (7 months ago)

Author:

jmoore

Message:

ticket:975 Renamed boolean methods to and(),or(),not() from r2387

Location:

trunk/components

Files:

• blitz/resources/omero/API.ice (modified) (1 diff)
• common/src/ome/api/Search.java (modified) (4 diffs)
• server/src/ome/services/SearchBean.java (modified) (3 diffs)
• server/src/ome/services/search/Complement.java (modified) (1 diff)
• server/src/ome/services/search/Intersection.java (modified) (1 diff)
• server/src/ome/services/search/Union.java (modified) (1 diff)
• server/test/ome/server/itests/search/SearchTest.java (modified) (10 diffs)

trunk/components/blitz/resources/omero/API.ice

@@ -478 +478 @@
         void clearQueries() throws ServerError;
 
-        void union() throws ServerError;
-        void intersection() throws ServerError;
-        void complement() throws ServerError;
+        void and() throws ServerError;
+        void or() throws ServerError;
+        void not() throws ServerError;
 
 

trunk/components/common/src/ome/api/Search.java

@@ -458 +458 @@
     /**
      * Delegates to {@link IQuery#findAllByQuery(String, Parameters)} method to
-     * take advantage of the {@link #intersection()}, {@link #union()}, and
-     * {@link #complement()} methods, or queue-semantics.
+     * take advantage of the {@link #and()}, {@link #or()}, and
+     * {@link #not()} methods, or queue-semantics.
      * 
      * @param query
@@ -506 +506 @@
      * will return both Images and Datasets together.
      * 
-     * Calling this method overrides a previous setting of
-     * {@link #intersection()} or {@link #complement()}. If there is no active
-     * queries (i.e. {@link #activeQueries()} > 0), then an
-     * {@link ApiUsageException} will be thrown.
-     */
-    void union();
+     * Calling this method overrides a previous setting of {@link #and()} or
+     * {@link #not()}. If there is no active queries (i.e.
+     * {@link #activeQueries()} > 0), then an {@link ApiUsageException} will be
+     * thrown.
+     */
+    void or();
 
     /**
@@ -530 +530 @@
      * 
      * <p>
-     * Calling this method overrides a previous setting of {@link #union()} or
-     * {@link #complement()}. If there is no active queries (i.e.
+     * Calling this method overrides a previous setting of {@link #or()} or
+     * {@link #not()}. If there is no active queries (i.e.
      * {@link #activeQueries()} > 0), then an {@link ApiUsageException} will be
      * thrown.
      * </p>
      */
-    void intersection();
+    void and();
 
     /**
@@ -554 +554 @@
      * will return all the Images <em>not</em> annotated with TagAnnotation.
      * <p>
-     * Calling this method overrides a previous setting of {@link #union()} or
-     * {@link #intersection()}. If there is no active queries (i.e.
+     * Calling this method overrides a previous setting of {@link #or()} or
+     * {@link #and()}. If there is no active queries (i.e.
      * {@link #activeQueries()} > 0), then an {@link ApiUsageException} will be
      * thrown.
      * </p>
      */
-    void complement();
+    void not();
 
     /**

trunk/components/server/src/ome/services/SearchBean.java

@@ -219 +219 @@
     @Transactional
     @RolesAllowed("user")
-    public void union() {
+    public void or() {
         actions.union();
     }
@@ -225 +225 @@
     @Transactional
     @RolesAllowed("user")
-    public void intersection() {
+    public void and() {
         actions.intersection();
     }
@@ -231 +231 @@
     @Transactional
     @RolesAllowed("user")
-    public void complement() {
+    public void not() {
         actions.complement();
     }

trunk/components/server/src/ome/services/search/Complement.java

@@ -27 +27 @@
  * @author Josh Moore, josh at glencoesoftware.com
  * @since 3.0-Beta3
- * @see ome.api.Search#intersection()
+ * @see ome.api.Search#and()
  */
 public class Complement extends SearchAction {

trunk/components/server/src/ome/services/search/Intersection.java

@@ -27 +27 @@
  * @author Josh Moore, josh at glencoesoftware.com
  * @since 3.0-Beta3
- * @see ome.api.Search#intersection()
+ * @see ome.api.Search#and()
  */
 public class Intersection extends SearchAction {

trunk/components/server/src/ome/services/search/Union.java

@@ -27 +27 @@
  * @author Josh Moore, josh at glencoesoftware.com
  * @since 3.0-Beta3
- * @see ome.api.Search#union()
+ * @see ome.api.Search#or()
  */
 public class Union extends SearchAction {

trunk/components/server/test/ome/server/itests/search/SearchTest.java

@@ -537 +537 @@
         // A + B
         search.byFullText(uuid1);
-        search.union();
+        search.or();
         search.byFullText(uuid2);
         assertResults(search, 2);
@@ -543 +543 @@
         // A & B
         search.byFullText(uuid1);
-        search.intersection();
+        search.and();
         search.byFullText(uuid2);
         assertResults(search, 0);
@@ -549 +549 @@
         // A - B
         search.byFullText(uuid1);
-        search.complement();
+        search.not();
         search.byFullText(uuid2);
         assertResults(search, 1);
@@ -555 +555 @@
         // A + B - B = A
         search.byFullText(uuid1);
-        search.union();
+        search.or();
         search.byFullText(uuid2);
-        search.complement();
+        search.not();
         search.byFullText(uuid2);
         assertResults(search, 1);
@@ -564 +564 @@
         search.onlyType(Event.class);
         search.byFullText("root");
-        search.intersection();
+        search.and();
         search.byHqlQuery("select e from Event e where e.id = 0", null);
         assertResults(search, 1);
@@ -1867 +1867 @@
 
     /**
-     * Attempts to solve #975 by using the {@link Search#union()} method.
+     * Attempts to solve #975 by using the {@link Search#or()} method.
      */
     @Test(groups = "ticket:975")
@@ -1894 +1894 @@
         // checking via intersection
         search.bySomeMustNone(q, null, null);
-        search.intersection();
+        search.and();
         search.byAnnotatedWith(new TagAnnotation());
 
@@ -1902 +1902 @@
 
     /**
-     * Attempts to solve #975 by using the {@link Search#union()} method.
+     * Attempts to solve #975 by using the {@link Search#or()} method.
      */
     @Test(groups = "ticket:975")
@@ -1931 +1931 @@
         // checking via intersection
         search.bySomeMustNone(q, null, null);
-        search.intersection();
+        search.and();
         search.byAnnotatedWith(new TagAnnotation(), new FileAnnotation());
 
@@ -1969 +1969 @@
         search.onlyType(Image.class);
         search.bySomeMustNone(new String[] { "an*" }, null, null);
-        search.intersection();
+        search.and();
         search.byAnnotatedWith(new TagAnnotation());