Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDerric Tubbs2013-09-24 19:10:33 +0000
committerDerric Tubbs2013-09-24 19:10:33 +0000
commitc3675fc6d03c39b831409ba620b01f1cc7d7d6e1 (patch)
tree15278095ff5d292ca8ab50e970042be97f80b32c /plugins
parent5db70852f91de5a863c8ceb60096489fe8683134 (diff)
downloadorg.eclipse.osee-c3675fc6d03c39b831409ba620b01f1cc7d7d6e1.tar.gz
org.eclipse.osee-c3675fc6d03c39b831409ba620b01f1cc7d7d6e1.tar.xz
org.eclipse.osee-c3675fc6d03c39b831409ba620b01f1cc7d7d6e1.zip
bug[ats_MPVYP]: SRE hyperlinks open in multiple documents
Change-Id: Iefae62ad4555489228fde0cef1f84bf86e37ae44 Signed-off-by: Derric Tubbs <derric.l.tubbs@boeing.com>
Diffstat (limited to 'plugins')
-rw-r--r--plugins/org.eclipse.osee.orcs.rest.client/src/org/eclipse/osee/orcs/rest/client/internal/search/PredicateFactoryImpl.java21
1 files changed, 17 insertions, 4 deletions
diff --git a/plugins/org.eclipse.osee.orcs.rest.client/src/org/eclipse/osee/orcs/rest/client/internal/search/PredicateFactoryImpl.java b/plugins/org.eclipse.osee.orcs.rest.client/src/org/eclipse/osee/orcs/rest/client/internal/search/PredicateFactoryImpl.java
index 35b8716e30c..6a1d9c08b6d 100644
--- a/plugins/org.eclipse.osee.orcs.rest.client/src/org/eclipse/osee/orcs/rest/client/internal/search/PredicateFactoryImpl.java
+++ b/plugins/org.eclipse.osee.orcs.rest.client/src/org/eclipse/osee/orcs/rest/client/internal/search/PredicateFactoryImpl.java
@@ -21,8 +21,12 @@ import org.eclipse.osee.framework.core.data.IAttributeType;
import org.eclipse.osee.framework.core.data.IRelationType;
import org.eclipse.osee.framework.core.data.IRelationTypeSide;
import org.eclipse.osee.framework.core.data.Identity;
+import org.eclipse.osee.framework.core.enums.CaseType;
+import org.eclipse.osee.framework.core.enums.MatchTokenCountType;
import org.eclipse.osee.framework.core.enums.Operator;
import org.eclipse.osee.framework.core.enums.QueryOption;
+import org.eclipse.osee.framework.core.enums.TokenDelimiterMatch;
+import org.eclipse.osee.framework.core.enums.TokenOrderType;
import org.eclipse.osee.framework.jdk.core.util.Strings;
import org.eclipse.osee.orcs.rest.model.search.Predicate;
import org.eclipse.osee.orcs.rest.model.search.SearchFlag;
@@ -99,9 +103,18 @@ public class PredicateFactoryImpl implements PredicateFactory {
public Predicate createAttributeTypeSearch(Collection<? extends IAttributeType> attributeTypes, Operator operator, Collection<String> values) {
List<String> typeIds = getLongIds(attributeTypes);
List<String> valuesList = new LinkedList<String>(values);
- SearchOp op = convertToSearchOp(operator);
- return new Predicate(SearchMethod.ATTRIBUTE_TYPE, typeIds, op, emptySearchFlagList, Strings.EMPTY_STRING,
- valuesList);
+ if (operator == Operator.EQUAL) {
+ RestSearchOptions option =
+ convertToSearchFlags(CaseType.MATCH_CASE, TokenOrderType.MATCH_ORDER,
+ MatchTokenCountType.MATCH_TOKEN_COUNT, TokenDelimiterMatch.EXACT);
+ return new Predicate(SearchMethod.ATTRIBUTE_TYPE, typeIds, SearchOp.EQUALS, option.getFlags(),
+ option.getDelimiter(), valuesList);
+ } else {
+ SearchOp op = convertToSearchOp(operator);
+ return new Predicate(SearchMethod.ATTRIBUTE_TYPE, typeIds, op, emptySearchFlagList, Strings.EMPTY_STRING,
+ valuesList);
+ }
+
}
@Override
@@ -160,7 +173,7 @@ public class PredicateFactoryImpl implements PredicateFactory {
return toReturn;
}
- private RestSearchOptions convertToSearchFlags(QueryOption[] options) {
+ private RestSearchOptions convertToSearchFlags(QueryOption... options) {
OptionConverter visitor = new OptionConverter();
visitor.accept(options);
return visitor;

Back to the top