From 7d35c60b5ed84417c08ae4d0b7c7ce13cef19b38 Mon Sep 17 00:00:00 2001
From: juanf <juanf>
Date: Fri, 16 Oct 2015 13:31:02 +0000
Subject: [PATCH] SSDM-2632 : Search with numeric properties, renamed
methods/classes
SVN: 34869
---
.../v3/dto/search/NumberFieldSearchCriteria.java | 16 ++++++++--------
...e.java => NumberGreaterOrEqualThanValue.java} | 6 +++---
...rToValue.java => NumberGreaterThanValue.java} | 6 +++---
...alue.java => NumberLessOrEqualThanValue.java} | 6 +++---
...LessToValue.java => NumberLessThanValue.java} | 6 +++---
5 files changed, 20 insertions(+), 20 deletions(-)
rename openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/search/{NumberGreaterOrEqualToValue.java => NumberGreaterOrEqualThanValue.java} (83%)
rename openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/search/{NumberGreaterToValue.java => NumberGreaterThanValue.java} (85%)
rename openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/search/{NumberLessOrEqualToValue.java => NumberLessOrEqualThanValue.java} (84%)
rename openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/search/{NumberLessToValue.java => NumberLessThanValue.java} (86%)
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/search/NumberFieldSearchCriteria.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/search/NumberFieldSearchCriteria.java
index 6a803a9a184..df338a400f6 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/search/NumberFieldSearchCriteria.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/search/NumberFieldSearchCriteria.java
@@ -34,23 +34,23 @@ public class NumberFieldSearchCriteria extends AbstractFieldSearchCriteria<Abstr
setFieldValue(new NumberEqualToValue(number));
}
- public void thatIsLessTo(Number number)
+ public void thatIsLessThan(Number number)
{
- setFieldValue(new NumberLessToValue(number));
+ setFieldValue(new NumberLessThanValue(number));
}
- public void thatIsLessOrEqualTo(Number number)
+ public void thatIsLessOrEqualThan(Number number)
{
- setFieldValue(new NumberLessOrEqualToValue(number));
+ setFieldValue(new NumberLessOrEqualThanValue(number));
}
- public void thatIsGreaterTo(Number number)
+ public void thatIsGreaterThan(Number number)
{
- setFieldValue(new NumberGreaterToValue(number));
+ setFieldValue(new NumberGreaterThanValue(number));
}
- public void thatIsGreaterOrEqualTo(Number number)
+ public void thatIsGreaterOrEqualThan(Number number)
{
- setFieldValue(new NumberGreaterOrEqualToValue(number));
+ setFieldValue(new NumberGreaterOrEqualThanValue(number));
}
}
\ No newline at end of file
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/search/NumberGreaterOrEqualToValue.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/search/NumberGreaterOrEqualThanValue.java
similarity index 83%
rename from openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/search/NumberGreaterOrEqualToValue.java
rename to openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/search/NumberGreaterOrEqualThanValue.java
index 6e0d3dffb8e..d2368f6a2b5 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/search/NumberGreaterOrEqualToValue.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/search/NumberGreaterOrEqualThanValue.java
@@ -21,13 +21,13 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author juanf
*/
-@JsonObject("dto.search.NumberGreaterOrEqualToValue")
-public class NumberGreaterOrEqualToValue extends AbstractNumberValue
+@JsonObject("dto.search.NumberGreaterOrEqualThanValue")
+public class NumberGreaterOrEqualThanValue extends AbstractNumberValue
{
private static final long serialVersionUID = 1L;
- public NumberGreaterOrEqualToValue(Number number)
+ public NumberGreaterOrEqualThanValue(Number number)
{
super(number);
}
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/search/NumberGreaterToValue.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/search/NumberGreaterThanValue.java
similarity index 85%
rename from openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/search/NumberGreaterToValue.java
rename to openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/search/NumberGreaterThanValue.java
index c03ff685432..0fb1ccedd97 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/search/NumberGreaterToValue.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/search/NumberGreaterThanValue.java
@@ -21,13 +21,13 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author juanf
*/
-@JsonObject("dto.search.NumberGreaterToValue")
-public class NumberGreaterToValue extends AbstractNumberValue
+@JsonObject("dto.search.NumberGreaterThanValue")
+public class NumberGreaterThanValue extends AbstractNumberValue
{
private static final long serialVersionUID = 1L;
- public NumberGreaterToValue(Number number)
+ public NumberGreaterThanValue(Number number)
{
super(number);
}
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/search/NumberLessOrEqualToValue.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/search/NumberLessOrEqualThanValue.java
similarity index 84%
rename from openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/search/NumberLessOrEqualToValue.java
rename to openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/search/NumberLessOrEqualThanValue.java
index 7c4cb40f3b5..3346fb91826 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/search/NumberLessOrEqualToValue.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/search/NumberLessOrEqualThanValue.java
@@ -21,13 +21,13 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author juanf
*/
-@JsonObject("dto.search.NumberLessOrEqualToValue")
-public class NumberLessOrEqualToValue extends AbstractNumberValue
+@JsonObject("dto.search.NumberLessOrEqualThanValue")
+public class NumberLessOrEqualThanValue extends AbstractNumberValue
{
private static final long serialVersionUID = 1L;
- public NumberLessOrEqualToValue(Number number)
+ public NumberLessOrEqualThanValue(Number number)
{
super(number);
}
diff --git a/openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/search/NumberLessToValue.java b/openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/search/NumberLessThanValue.java
similarity index 86%
rename from openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/search/NumberLessToValue.java
rename to openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/search/NumberLessThanValue.java
index e2d593d8dce..d28781a8965 100644
--- a/openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/search/NumberLessToValue.java
+++ b/openbis_api/source/java/ch/ethz/sis/openbis/generic/shared/api/v3/dto/search/NumberLessThanValue.java
@@ -21,13 +21,13 @@ import ch.systemsx.cisd.base.annotation.JsonObject;
/**
* @author juanf
*/
-@JsonObject("dto.search.NumberLessToValue")
-public class NumberLessToValue extends AbstractNumberValue
+@JsonObject("dto.search.NumberLessThanValue")
+public class NumberLessThanValue extends AbstractNumberValue
{
private static final long serialVersionUID = 1L;
- public NumberLessToValue(Number number)
+ public NumberLessThanValue(Number number)
{
super(number);
}
--
GitLab