xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Issue #1869 Format Calendar when making Constraint Mapping.

Browse source 
Former-commit-id: 2cccbc8e0d [formerly f53f702b9e] [formerly c3f48bac0a [formerly 58d020c1b09b4f5efc1fc9b558ef7defef80adba]]
Former-commit-id: c3f48bac0a
Former-commit-id: 1017dfae5b
This commit is contained in:
Ben Steffensmeier 2013-07-09 13:59:06 -05:00
parent 222965ca7f
commit 4bdec4b2bb
2 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
edexOsgi/com.raytheon.uf.common.dataquery/META-INF/MANIFEST.MF
View file

@ -12,4 +12,5 @@ Export-Package: com.raytheon.uf.common.dataquery,
com.raytheon.uf.common.dataquery.responses
Require-Bundle: com.raytheon.uf.common.serialization;bundle-version="1.12.1173",
com.raytheon.uf.common.serialization.comm;bundle-version="1.12.1173"
Import-Package: com.raytheon.uf.common.time
Import-Package: com.raytheon.uf.common.time,
com.raytheon.uf.common.time.util

13
edexOsgi/com.raytheon.uf.common.dataquery/src/com/raytheon/uf/common/dataquery/requests/RequestConstraint.java
View file

@ -25,6 +25,7 @@ import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Calendar;
import java.util.Collection;
import java.util.Date;
import java.util.EnumSet;
@ -42,6 +43,7 @@ import javax.xml.bind.annotation.XmlType;
import com.raytheon.uf.common.serialization.ISerializableObject;
import com.raytheon.uf.common.serialization.annotations.DynamicSerialize;
import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
import com.raytheon.uf.common.time.util.TimeUtil;
/**
* RequestConstraint - Constraints on a uEngine request
@ -55,9 +57,12 @@ import com.raytheon.uf.common.serialization.annotations.DynamicSerializeElement;
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Aug 21, 2007 chammack Initial Creation.
* May 27, 2009 2408 jsanchez Cast value to String.
* Sep 28, 2009 3099 bsteffen Fixed constraintCompare to convert all non-numeric objects to String
* Nov 05, 2009 3553 rjpeter Added isNull capability.
* May 27, 2009 2408 jsanchez Cast value to String.
* Sep 28, 2009 3099 bsteffen Fixed constraintCompare to convert
* all non-numeric objects to String
* Nov 05, 2009 3553 rjpeter Added isNull capability.
* Jul 09, 2013 1869 bsteffen Format Calendar when making
* Constraint Mapping.
*
* </pre>
*
@ -524,6 +529,8 @@ public class RequestConstraint implements ISerializableObject, Cloneable {
String constraintValue = null;
if (value == null) {
constraintType = ConstraintType.ISNULL;
} else if (value instanceof Calendar) {
constraintValue = TimeUtil.formatCalendar((Calendar) value);
} else {
constraintValue = value.toString();
if (value.getClass().isArray() || value instanceof Collection) {