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

Merge "Issue #2062 Fixed up AWIPS2_baseline portion of merge" into development

Browse source 
Former-commit-id: 2e420c0963 [formerly 3700d27fbf [formerly 18a9b41a8be832ab1e8da28c32f3b8457704915b]]
Former-commit-id: 3700d27fbf
Former-commit-id: 72bb21698c
This commit is contained in:
Dustin Johnson 2013-05-31 15:29:04 -05:00 • committed by Gerrit Code Review
commit 5d4ecc6328
5 changed files with 25 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
edexOsgi/com.raytheon.uf.common.datadelivery.registry/src/com/raytheon/uf/common/datadelivery/registry/TimeSlotConverter.java
View file

@ -31,6 +31,7 @@ import com.raytheon.uf.common.registry.ebxml.slots.SlotConverter;
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* May 15, 2012 455 jspinks Initial creation
* May 29, 2013 753 dhladky Updated the way point datasets are sent.
*
* </pre>
*
@ -68,16 +69,19 @@ public class TimeSlotConverter implements SlotConverter {
// Handle times for Point types
if (slotValue instanceof PointTime) {
PointTime pt = (PointTime)slotValue;
for (Date date: pt.getTimes()) {
List<SlotType> ptSlots = DateSlotConverter.INSTANCE.getSlots(slotName, date);
slots.add(ptSlots.get(0));
}
//TODO: This will convert to GriddedTime when I execute DR to switch
} else if (slotValue instanceof Time) {
PointTime pt = (PointTime) slotValue;
// initial datasets can have no times in them
if (pt.getTimes() != null) {
for (Date date : pt.getTimes()) {
List<SlotType> ptSlots = DateSlotConverter.INSTANCE
.getSlots(slotName, date);
slots.add(ptSlots.get(0));
}
}
// This will convert to GriddedTime when I execute DR to
} else if (slotValue instanceof Time) {
Time t = (Time)slotValue;
SimpleDateFormat df = new SimpleDateFormat(CalendarAttribute.DATE_TIME_FORMAT);

4
edexOsgi/com.raytheon.uf.common.datadelivery.registry/src/com/raytheon/uf/common/datadelivery/registry/handlers/DataSetHandler.java
View file

@ -85,6 +85,8 @@ public class DataSetHandler extends
} catch (RegistryHandlerException e1) {
throw e1;
}
} else {
throw e;
}
}
}
@ -105,6 +107,8 @@ public class DataSetHandler extends
} catch (RegistryHandlerException e1) {
throw e1;
}
} else {
throw e;
}
}
}

1
edexOsgi/com.raytheon.uf.edex.datadelivery.harvester/utility/common_static/base/datadelivery/WFSServiceConfig.xml
View file

@ -9,6 +9,7 @@
<constant name="UNKNOWN" value="unknown"/>
<constant name="NONE" value="NONE"/>
<constant name="REQUEST_HEADER" value="request"/>
<constant name="TIME_HEADER" value="time"/>
<constant name="CAP_PARAM" value="getcapabilities"/>
<constant name="DESC_PARAM" value="describefeaturetype"/>
<constant name="GET_PARAM" value="getfeature"/>

2
edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/META-INF/MANIFEST.MF
View file

@ -9,6 +9,8 @@ Require-Bundle: com.raytheon.uf.common.status;bundle-version="1.12.1174",
net.dods;bundle-version="1.0.0",
com.raytheon.uf.common.datadelivery.retrieval;bundle-version="1.0.0",
org.geotools;bundle-version="2.6.4",
org.springframework;bundle-version="2.5.6",
com.raytheon.uf.edex.core;bundle-version="1.12.1174",
javax.persistence,
com.raytheon.uf.common.datadelivery.registry;bundle-version="1.0.0",
com.raytheon.edex.common;bundle-version="1.12.1174",

7
edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/response/RetrievalTranslator.java
View file

@ -21,6 +21,7 @@ package com.raytheon.uf.edex.datadelivery.retrieval.response;
**/
import java.util.ArrayList;
import java.util.List;
import com.raytheon.uf.common.datadelivery.retrieval.xml.RetrievalAttribute;
import com.raytheon.uf.common.dataplugin.PluginDataObject;
@ -86,7 +87,7 @@ public abstract class RetrievalTranslator implements IRetrievalTranslator {
throw ie;
}
}
protected void configureFromPdoClassName(String className)
throws InstantiationException, ClassNotFoundException {
setPdoClass(className);
@ -94,7 +95,7 @@ public abstract class RetrievalTranslator implements IRetrievalTranslator {
getPdoClass(), attXML);
}
@Override
public void setAttribute(RetrievalAttribute attXML) {
this.attXML = attXML;
@ -147,6 +148,6 @@ public abstract class RetrievalTranslator implements IRetrievalTranslator {
*
* @return
*/
protected abstract ArrayList<DataTime> getTimes();
protected abstract List<DataTime> getTimes();
}