From 6712d62c7868052b6d3fbffa7faa3c6ec6dc6ca0 Mon Sep 17 00:00:00 2001
From: buczekp <buczekp>
Date: Wed, 16 Mar 2011 08:57:15 +0000
Subject: [PATCH] [LMS-1976] removed unused code
SVN: 20353
---
.../shared/api/v1/dto/SearchCriteria.java | 24 -------------------
1 file changed, 24 deletions(-)
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/SearchCriteria.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/SearchCriteria.java
index 5223bed2783..4a6687c6a80 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/SearchCriteria.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/SearchCriteria.java
@@ -269,22 +269,10 @@ public class SearchCriteria implements Serializable
MATCH_ALL_CLAUSES, MATCH_ANY_CLAUSES
}
- /**
- * Operators for combining {@link SearchCriteria} objects.
- *
- * @author Piotr Buczek
- */
- public static enum SubSearchCriteriaOperator
- {
- AND, OR
- }
-
private SearchOperator operator = SearchOperator.MATCH_ALL_CLAUSES;
private ArrayList<MatchClause> matchClauses = new ArrayList<MatchClause>();
- private SubSearchCriteriaOperator subSearchOperator = SubSearchCriteriaOperator.AND;
-
private ArrayList<SearchSubCriteria> subCriterias = new ArrayList<SearchSubCriteria>();
/**
@@ -320,15 +308,6 @@ public class SearchCriteria implements Serializable
matchClauses.add(criterion);
}
- /**
- * Gets the operator for combining {@link SearchSubCriteria} objects. Default value is
- * {@link SubSearchCriteriaOperator#AND}.
- */
- public SubSearchCriteriaOperator getSubSearchCriteriaOperator()
- {
- return subSearchOperator;
- }
-
/**
* Get a list of {@link SearchSubCriteria} objects for this SearchCriteria.
*/
@@ -361,7 +340,6 @@ public class SearchCriteria implements Serializable
EqualsBuilder builder = new EqualsBuilder();
builder.append(getOperator(), other.getOperator());
builder.append(getMatchClauses(), other.getMatchClauses());
- builder.append(getSubSearchCriteriaOperator(), other.getSubSearchCriteriaOperator());
builder.append(getSubCriterias(), other.getSubCriterias());
return builder.isEquals();
}
@@ -372,7 +350,6 @@ public class SearchCriteria implements Serializable
HashCodeBuilder builder = new HashCodeBuilder();
builder.append(getOperator());
builder.append(getMatchClauses());
- builder.append(getSubSearchCriteriaOperator());
builder.append(getSubCriterias());
return builder.toHashCode();
}
@@ -383,7 +360,6 @@ public class SearchCriteria implements Serializable
ToStringBuilder builder = new ToStringBuilder(this, ToStringStyle.SHORT_PREFIX_STYLE);
builder.append(getOperator());
builder.append(getMatchClauses());
- builder.append(getSubSearchCriteriaOperator());
builder.append(getSubCriterias());
return builder.toString();
}
--
GitLab