From 5d6bad97f489590c13b84ee6c48832518a4fdac0 Mon Sep 17 00:00:00 2001
From: fedoreno <fedoreno>
Date: Thu, 21 Apr 2016 10:25:12 +0000
Subject: [PATCH] SSDM-3519: only listabe samples search criteria typo fix
SVN: 36251
---
.../translator/search/SampleSearchCriteriaTranslator.java | 6 +++---
.../v3/as/dto/sample/search/OnlyListableSeachCriteria.js | 8 ++++----
.../api/v3/as/dto/sample/search/SampleSearchCriteria.js | 6 +++---
3 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/search/SampleSearchCriteriaTranslator.java b/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/search/SampleSearchCriteriaTranslator.java
index b1af693ab96..b9ebd67c771 100644
--- a/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/search/SampleSearchCriteriaTranslator.java
+++ b/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/translator/search/SampleSearchCriteriaTranslator.java
@@ -21,7 +21,7 @@ import java.util.Collections;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.common.search.ISearchCriteria;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.sample.search.NoSampleContainerSearchCriteria;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.sample.search.NoSampleSearchCriteria;
-import ch.ethz.sis.openbis.generic.asapi.v3.dto.sample.search.OnlyListableSeachCriteria;
+import ch.ethz.sis.openbis.generic.asapi.v3.dto.sample.search.OnlyListableSearchCriteria;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.sample.search.SampleChildrenSearchCriteria;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.sample.search.SampleContainerSearchCriteria;
import ch.ethz.sis.openbis.generic.asapi.v3.dto.sample.search.SampleParentsSearchCriteria;
@@ -52,7 +52,7 @@ public class SampleSearchCriteriaTranslator extends AbstractCompositeSearchCrite
{
return criteria instanceof SampleSearchCriteria
|| criteria instanceof NoSampleSearchCriteria
- || criteria instanceof OnlyListableSeachCriteria;
+ || criteria instanceof OnlyListableSearchCriteria;
}
@Override
@@ -71,7 +71,7 @@ public class SampleSearchCriteriaTranslator extends AbstractCompositeSearchCrite
}
return new SearchCriteriaTranslationResult(new DetailedSearchSubCriteria(entityKind, null));
- } else if (criteria instanceof OnlyListableSeachCriteria)
+ } else if (criteria instanceof OnlyListableSearchCriteria)
{
SimpleAttributeSearchFieldKind attributeFieldKind = new SimpleAttributeSearchFieldKind(SearchFieldConstants.PREFIX_ENTITY_TYPE + SearchFieldConstants.IS_LISTABLE, "listable");
DetailedSearchField createAttributeField = DetailedSearchField.createAttributeField(attributeFieldKind);
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/sample/search/OnlyListableSeachCriteria.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/sample/search/OnlyListableSeachCriteria.js
index bce2d862491..cd7239c63ba 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/sample/search/OnlyListableSeachCriteria.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/sample/search/OnlyListableSeachCriteria.js
@@ -2,11 +2,11 @@
* @author pkupczyk
*/
define([ "stjs", "as/dto/sample/search/AbstractCompositeSearchCriteria" ], function(stjs, AbstractCompositeSearchCriteria) {
- var OnlyListableSeachCriteria = function() {
+ var OnlyListableSearchCriteria = function() {
};
- stjs.extend(AbstractCompositeSearchCriteria, OnlyListableSeachCriteria, [ OnlyListableSeachCriteria ], function(constructor, prototype) {
- prototype['@type'] = 'as.dto.sample.search.OnlyListableSeachCriteria';
+ stjs.extend(AbstractCompositeSearchCriteria, OnlyListableSearchCriteria, [ OnlyListableSearchCriteria ], function(constructor, prototype) {
+ prototype['@type'] = 'as.dto.sample.search.OnlyListableSearchCriteria';
constructor.serialVersionUID = 1;
}, {});
- return OnlyListableSeachCriteria;
+ return OnlyListableSearchCriteria;
})
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/sample/search/SampleSearchCriteria.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/sample/search/SampleSearchCriteria.js
index 13d609c3518..6992f4a362e 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/sample/search/SampleSearchCriteria.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/as/dto/sample/search/SampleSearchCriteria.js
@@ -3,7 +3,7 @@
*/
define([ "require", "stjs", "as/dto/common/search/AbstractEntitySearchCriteria", "as/dto/common/search/SearchOperator", "as/dto/sample/search/SampleSearchRelation", "as/dto/space/search/SpaceSearchCriteria",
"as/dto/experiment/search/ExperimentSearchCriteria", "as/dto/experiment/search/NoExperimentSearchCriteria",
- "as/dto/sample/search/NoSampleContainerSearchCriteria", "as/dto/sample/search/OnlyListableSeachCriteria" ], function(require, stjs, AbstractEntitySearchCriteria, SearchOperator, SampleSearchRelation) {
+ "as/dto/sample/search/NoSampleContainerSearchCriteria", "as/dto/sample/search/OnlyListableSearchCriteria" ], function(require, stjs, AbstractEntitySearchCriteria, SearchOperator, SampleSearchRelation) {
var SampleSearchCriteria = function(relation) {
AbstractEntitySearchCriteria.call(this);
@@ -39,8 +39,8 @@ define([ "require", "stjs", "as/dto/common/search/AbstractEntitySearchCriteria",
return this.addCriteria(new NoSampleContainerSearchCriteria());
};
prototype.withListableOnly = function() {
- var OnlyListableSeachCriteria = require("as/dto/sample/search/OnlyListableSeachCriteria");
- return this.addCriteria(new OnlyListableSeachCriteria());
+ var OnlyListableSearchCriteria = require("as/dto/sample/search/OnlyListableSearchCriteria");
+ return this.addCriteria(new OnlyListableSearchCriteria());
};
prototype.withOrOperator = function() {
return this.withOperator(SearchOperator.OR);
--
GitLab