diff options
Diffstat (limited to 'plugins/org.eclipse.osee.framework.core.message/src/org')
3 files changed, 20 insertions, 20 deletions
diff --git a/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/SearchOptions.java b/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/SearchOptions.java index 838155713bd..ca9fd6601b6 100644 --- a/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/SearchOptions.java +++ b/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/SearchOptions.java @@ -25,6 +25,7 @@ public class SearchOptions { private boolean isMatchWordOrder; private boolean isCaseSensive; private boolean isFindAllLocationsEnabled; + private boolean isSearchAll; public SearchOptions() { deletionFlag = DeletionFlag.EXCLUDE_DELETED; @@ -46,6 +47,10 @@ public class SearchOptions { return isFindAllLocationsEnabled; } + public boolean isSearchAll() { + return isSearchAll; + } + public Collection<IAttributeType> getAttributeTypeFilter() { return attributeTypeGuids; } @@ -64,10 +69,6 @@ public class SearchOptions { attributeTypeGuids.add(type); } - public boolean isAttributeTypeFiltered() { - return !attributeTypeGuids.isEmpty(); - } - public void setDeletedIncluded(DeletionFlag deletionFlag) { this.deletionFlag = deletionFlag; } @@ -84,6 +85,10 @@ public class SearchOptions { this.isFindAllLocationsEnabled = isFindAllLocationsEnabled; } + public void setIsSearchAll(boolean isSearchAll) { + this.isSearchAll = isSearchAll; + } + @Override public String toString() { return "SearchOptions [attributeTypeGuids=" + attributeTypeGuids + ", isIncludeDeleted=" + getDeletionFlag() + ", isMatchWordOrder=" + isMatchWordOrder + ", isCaseSensive=" + isCaseSensive + ", isFindAllLocationsEnabled=" + isFindAllLocationsEnabled + "]"; diff --git a/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/SearchRequest.java b/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/SearchRequest.java index ddc56ff0938..b7884dcec02 100644 --- a/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/SearchRequest.java +++ b/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/SearchRequest.java @@ -22,10 +22,6 @@ public class SearchRequest implements HasBranch { private final String rawSearch; private final SearchOptions options; - public SearchRequest(IOseeBranch branch, String rawSearch) { - this(branch, rawSearch, null); - } - public SearchRequest(IOseeBranch branch, String rawSearch, SearchOptions options) { this.branch = branch; this.rawSearch = rawSearch; diff --git a/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/internal/translation/SearchRequestTranslator.java b/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/internal/translation/SearchRequestTranslator.java index 040b0fe15f9..8213d6bebdf 100644 --- a/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/internal/translation/SearchRequestTranslator.java +++ b/plugins/org.eclipse.osee.framework.core.message/src/org/eclipse/osee/framework/core/message/internal/translation/SearchRequestTranslator.java @@ -83,19 +83,18 @@ public class SearchRequestTranslator implements ITranslator<SearchRequest> { store.put(Entry.OPTION_IS_INCLUDE_DELETED.name(), options.getDeletionFlag().areDeletedAllowed()); store.put(Entry.OPTION_FIND_ALL_LOCATIONS.name(), options.isFindAllLocationsEnabled()); - if (options.isAttributeTypeFiltered()) { - Collection<IAttributeType> types = options.getAttributeTypeFilter(); - String[] guids = new String[types.size()]; - String[] names = new String[types.size()]; - int index = 0; - for (IAttributeType type : types) { - guids[index] = String.valueOf(type.getGuid()); - names[index] = type.getName(); - index++; - } - store.put(Entry.OPTION_ATTRIBUTE_TYPE_FILTER_GUIDS.name(), guids); - store.put(Entry.OPTION_ATTRIBUTE_TYPE_FILTER_NAMES.name(), names); + Collection<IAttributeType> types = options.getAttributeTypeFilter(); + String[] guids = new String[types.size()]; + String[] names = new String[types.size()]; + int index = 0; + for (IAttributeType type : types) { + guids[index] = String.valueOf(type.getGuid()); + names[index] = type.getName(); + index++; } + store.put(Entry.OPTION_ATTRIBUTE_TYPE_FILTER_GUIDS.name(), guids); + store.put(Entry.OPTION_ATTRIBUTE_TYPE_FILTER_NAMES.name(), names); + } return store; } |